From c1ca3958d2f0a2f8b0df66c8428a861a6162f84d Mon Sep 17 00:00:00 2001
From: Kyle Albert <5498623+kalbert312@users.noreply.github.com>
Date: Thu, 16 Apr 2020 21:38:20 -0400
Subject: [PATCH] [carbon-components-react] Update types to 7.10.3 (partial)
 (#43925)

* Update Accordion.

* Update Breadcrumb.

* Accordion: inherit html ul attrs.

* CheckBox Skeleton.

* Update Copy.

* Update CodeSnippet.

* Update ComposedModal.

* Update ContentSwitcher.

* Update CopyButton.

* Update DataTableSkeleton.

* Update DatePicker.

* Update DatePickerInput.

* Update ListBox.

* Update Dropdown.

* Add ErrorBoundary.

* Update FileUploader.

* Update FormLabel.

* Update Icon.

* Update InlineCheckbox.

* Update InlineLoading.

* Update Link.

* Update Loading.

* Update Modal.

* Update ModalWrapper.

* Update MultiSelect.

* Update Notification.

* Update NumberInput.

* Update OverflowMenu.

* Update Pagination.

* Update ProgressIndicator.

* Update RadioButton.

* Update RadioButtoGroup.

* Update RadioTile.

* Update Search.

* Update SearchLayoutButton.

* Update Select.

* Update SelectItem.

* Update Slider.

* Update Switch.

* Update Tab.

* Update Tabs.

* Update Tab. Update Tests.

* Update TextArea.

* Update TextInput.

* Update Tile.

* Update ToggleSkeleton.

* Update ToggleSmall.

* Update Toolbar.

* Update Tooltip.

* Update Toolbar and ToolbarSearch deprecation.

* Update TooltipDefinition.

* Update TooltipIcon.

* Update ComboBox.

* Update StructuredList.

* Fix error.

* Fix dtslint errors.

* Fix dtslint errors.

* ComboBox seems to have problems with undefined and controlled state so adding null here because it seems to fix my issue.

Co-authored-by: Kyle Albert <kyle.albert@us.ibm.com>
---
 .../carbon-components-react-tests.tsx         | 17 +++-
 types/carbon-components-react/index.d.ts      | 13 +--
 .../Accordion/Accordion.Skeleton.d.ts         |  9 +-
 .../lib/components/Accordion/Accordion.d.ts   |  9 +-
 .../Breadcrumb/Breadcrumb.Skeleton.d.ts       |  7 +-
 .../components/Breadcrumb/BreadcrumbItem.d.ts |  4 +-
 .../Checkbox/Checkbox.Skeleton.d.ts           | 10 +--
 .../CodeSnippet/CodeSnippet.Skeleton.d.ts     |  2 +-
 .../components/CodeSnippet/CodeSnippet.d.ts   |  3 +-
 .../lib/components/CodeSnippet/index.d.ts     |  1 +
 .../lib/components/ComboBox/ComboBox.d.ts     | 18 +++-
 .../ComposedModal/ComposedModal.d.ts          | 14 +--
 .../ContentSwitcher/ContentSwitcher.d.ts      |  8 +-
 .../components/ContentSwitcher/Switch.d.ts    | 15 ----
 .../lib/components/ContentSwitcher/index.d.ts |  2 -
 .../lib/components/Copy/Copy.d.ts             |  4 +-
 .../lib/components/CopyButton/CopyButton.d.ts | 11 ++-
 .../DataTableSkeleton/DataTableSkeleton.d.ts  | 11 ++-
 .../DatePicker/DatePicker.Skeleton.d.ts       |  6 +-
 .../lib/components/DatePicker/DatePicker.d.ts |  9 +-
 .../DatePickerInput/DatePickerInput.d.ts      | 11 ++-
 .../Dropdown/Dropdown.Skeleton.d.ts           |  5 +-
 .../lib/components/Dropdown/Dropdown.d.ts     |  3 +
 .../ErrorBoundary/ErrorBoundary.d.ts          | 10 +++
 .../ErrorBoundary/ErrorBoundaryContext.d.ts   |  7 ++
 .../lib/components/ErrorBoundary/index.d.ts   |  4 +
 .../FileUploader/FileUploader.Skeleton.d.ts   |  7 +-
 .../components/FileUploader/FileUploader.d.ts | 35 +++-----
 .../FileUploaderDropContainer.d.ts            | 90 ++++++++++---------
 .../FileUploader/FileUploaderItem.d.ts        |  6 +-
 .../lib/components/FileUploader/index.d.ts    |  4 +
 .../lib/components/FormLabel/FormLabel.d.ts   |  2 +-
 .../lib/components/Icon/Icon.Skeleton.d.ts    |  6 +-
 .../lib/components/Icon/Icon.d.ts             | 21 ++---
 .../InlineCheckbox/InlineCheckbox.d.ts        |  4 +-
 .../InlineLoading/InlineLoading.d.ts          |  2 +-
 .../lib/components/Link/Link.d.ts             |  2 +
 .../lib/components/ListBox/ListBox.d.ts       |  5 +-
 .../lib/components/ListBox/ListBoxField.d.ts  |  4 +-
 .../components/ListBox/ListBoxPropTypes.d.ts  |  1 +
 .../lib/components/Loading/Loading.d.ts       |  2 +-
 .../lib/components/Modal/Modal.d.ts           | 12 ++-
 .../components/ModalWrapper/ModalWrapper.d.ts |  2 +-
 .../MultiSelect/FilterableMultiSelect.d.ts    |  3 +-
 .../components/MultiSelect/MultiSelect.d.ts   | 15 ++--
 .../components/Notification/Notification.d.ts | 14 +--
 .../Notification/a11yIconWarningSolid.d.ts    |  7 +-
 .../NumberInput/NumberInput.Skeleton.d.ts     |  6 +-
 .../components/NumberInput/NumberInput.d.ts   | 16 +++-
 .../components/OverflowMenu/OverflowMenu.d.ts | 23 +++--
 .../lib/components/OverflowMenu/index.d.ts    |  2 +-
 .../Pagination/Pagination.Skeleton.d.ts       |  7 +-
 .../lib/components/Pagination/Pagination.d.ts |  3 +-
 .../ProgressIndicator.Skeleton.d.ts           |  4 +-
 .../ProgressIndicator/ProgressIndicator.d.ts  | 13 ++-
 .../RadioButton/RadioButton.Skeleton.d.ts     |  8 +-
 .../components/RadioButton/RadioButton.d.ts   |  9 +-
 .../RadioButtonGroup/RadioButtonGroup.d.ts    |  2 +
 .../lib/components/RadioTile/RadioTile.d.ts   | 14 +--
 .../components/Search/Search.Skeleton.d.ts    |  8 +-
 .../lib/components/Search/Search.d.ts         | 15 ++--
 .../SearchLayoutButton.d.ts                   |  4 +-
 .../components/Select/Select.Skeleton.d.ts    |  6 +-
 .../lib/components/Select/Select.d.ts         | 26 ++++--
 .../lib/components/SelectItem/SelectItem.d.ts |  2 +-
 .../components/Slider/Slider.Skeleton.d.ts    |  6 +-
 .../lib/components/Slider/Slider.d.ts         |  2 +-
 .../StructuredList.Skeleton.d.ts              |  3 +-
 .../StructuredList/StructuredList.d.ts        |  3 +
 .../lib/components/Switch/Switch.d.ts         | 21 ++++-
 .../lib/components/Tab/Tab.d.ts               | 11 ++-
 .../lib/components/Tabs/Tabs.Skeleton.d.ts    |  7 +-
 .../lib/components/Tabs/Tabs.d.ts             |  2 +
 .../lib/components/Tag/Tag.Skeleton.d.ts      |  7 +-
 .../lib/components/Tag/Tag.d.ts               | 17 +++-
 .../TextArea/TextArea.Skeleton.d.ts           |  6 +-
 .../lib/components/TextArea/TextArea.d.ts     |  4 +-
 .../TextInput/ControlledPasswordInput.d.ts    | 13 +--
 .../components/TextInput/PasswordInput.d.ts   | 12 ++-
 .../TextInput/TextInput.Skeleton.d.ts         |  6 +-
 .../lib/components/TextInput/TextInput.d.ts   | 10 ++-
 .../lib/components/TextInput/index.d.ts       | 10 +--
 .../lib/components/TextInput/props.d.ts       | 19 ++--
 .../lib/components/Tile/Tile.d.ts             | 26 ++++--
 .../components/Toggle/Toggle.Skeleton.d.ts    | 10 +--
 .../ToggleSmall/ToggleSmall.Skeleton.d.ts     | 10 +--
 .../components/ToggleSmall/ToggleSmall.d.ts   |  3 +-
 .../lib/components/Toolbar/Toolbar.d.ts       | 35 +++++++-
 .../ToolbarSearch/ToolbarSearch.d.ts          |  6 ++
 .../lib/components/Tooltip/Tooltip.d.ts       | 14 ++-
 .../TooltipDefinition/TooltipDefinition.d.ts  |  6 +-
 .../components/TooltipIcon/TooltipIcon.d.ts   |  6 +-
 .../typings/shared.d.ts                       |  4 +
 .../typings/translation.d.ts                  |  4 +-
 94 files changed, 558 insertions(+), 350 deletions(-)
 delete mode 100644 types/carbon-components-react/lib/components/ContentSwitcher/Switch.d.ts
 create mode 100644 types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundary.d.ts
 create mode 100644 types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundaryContext.d.ts
 create mode 100644 types/carbon-components-react/lib/components/ErrorBoundary/index.d.ts

diff --git a/types/carbon-components-react/carbon-components-react-tests.tsx b/types/carbon-components-react/carbon-components-react-tests.tsx
index 5902cf8eea..29e011f47d 100644
--- a/types/carbon-components-react/carbon-components-react-tests.tsx
+++ b/types/carbon-components-react/carbon-components-react-tests.tsx
@@ -15,6 +15,7 @@ import {
     TableBatchActions,
     TableHeader,
     TableRow,
+    Tag,
     TileGroup,
     TooltipDefinition,
     TextArea,
@@ -325,12 +326,12 @@ const tooltipDefHasTriggerClassName = (
 // Tabs
 const tabCanBeDisabled = (
     <Tab
-        handleTabAnchorFocus={() => { }}
         handleTabClick={() => { }}
         handleTabKeyDown={() => { }}
         href="#"
         tabIndex={0}
         disabled
+        selected={false}
     />
 );
 
@@ -344,6 +345,19 @@ const SliderHasOnChange = (
     />
 );
 
+// Tag
+const ChipTagFilterUndef = (
+    <Tag />
+);
+
+const ChipTagFalse = (
+    <Tag filter={false}/>
+);
+
+const FilterTag = (
+    <Tag filter onClose={() => {}}/>
+);
+
 // TextArea
 const textAreaWithDefaultRef = (
     <TextArea labelText="" />
@@ -453,7 +467,6 @@ const multiSelect = (
     initialSelectedItems={['one']}
     items={['one', 'two']}
     light
-    placeholder="Filter"
     titleText="Choose an item"
     itemToString={item => item}
     onChange={({ selectedItems }) => {}}
diff --git a/types/carbon-components-react/index.d.ts b/types/carbon-components-react/index.d.ts
index 25907c66f6..a7e5ea8c0c 100644
--- a/types/carbon-components-react/index.d.ts
+++ b/types/carbon-components-react/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for carbon-components-react 7.7
+// Type definitions for carbon-components-react 7.10
 // Project: https://github.com/carbon-design-system/carbon/tree/master/packages/react
 // Definitions by: Kyle Albert <https://github.com/kalbert312>
 //                 Sebastien Gregoire <https://github.com/sgregoire>
@@ -30,9 +30,8 @@ import _DatePickerSkeleton from "./lib/components/DatePicker/DatePicker.Skeleton
 import _DatePickerInput from "./lib/components/DatePickerInput";
 import _Dropdown from "./lib/components/Dropdown";
 import _DropdownSkeleton from "./lib/components/Dropdown/Dropdown.Skeleton";
-import _FileUploader from "./lib/components/FileUploader";
-import _FileUploaderItem from "./lib/components/FileUploader/FileUploaderItem";
-import _FileUploaderDropContainer from "./lib/components/FileUploader/FileUploaderDropContainer";
+import _ErrorBoundary from "./lib/components/ErrorBoundary/ErrorBoundary";
+import _FileUploader, { FileUploaderButton, FileUploaderItem, FileUploaderDropContainer } from "./lib/components/FileUploader";
 import _FileUploaderSkeleton from "./lib/components/FileUploader/FileUploader.Skeleton";
 import _Form from "./lib/components/Form";
 import _FormGroup from "./lib/components/FormGroup";
@@ -116,6 +115,7 @@ export * from "./lib/components/DataTableSkeleton";
 export * from "./lib/components/DatePicker";
 export * from "./lib/components/DatePickerInput";
 export * from "./lib/components/Dropdown";
+export * from "./lib/components/ErrorBoundary";
 export * from "./lib/components/FileUploader";
 export * from "./lib/components/Form";
 export * from "./lib/components/FormGroup";
@@ -213,9 +213,10 @@ export {
 export { _DatePicker as DatePicker };
 export { _DatePickerInput as DatePickerInput };
 export { _Dropdown as Dropdown };
+export { _ErrorBoundary as ErrorBoundary };
+export { ErrorBoundaryContext } from "./lib/components/ErrorBoundary/ErrorBoundaryContext";
 export { _FileUploader as FileUploader };
-export { _FileUploaderItem as FileUploaderItem };
-export { _FileUploaderDropContainer as FileUploaderDropContainer };
+export { FileUploaderItem, FileUploaderDropContainer };
 export { Filename, FileUploaderButton } from "./lib/components/FileUploader";
 export { _Form as Form };
 export { _FormGroup as FormGroup };
diff --git a/types/carbon-components-react/lib/components/Accordion/Accordion.Skeleton.d.ts b/types/carbon-components-react/lib/components/Accordion/Accordion.Skeleton.d.ts
index d1d1a9429d..82472b2951 100644
--- a/types/carbon-components-react/lib/components/Accordion/Accordion.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Accordion/Accordion.Skeleton.d.ts
@@ -1,8 +1,15 @@
 import * as React from "react";
+import { ReactAttr } from "../../../typings/shared";
 
-export interface AccordionSkeletonProps {
+interface InheritedProps extends ReactAttr<HTMLUListElement> { }
+
+export interface AccordionSkeletonProps extends InheritedProps {
+    align?: "end" | "start";
     count?: number,
     open?: boolean,
+    /**
+     * @deprecated
+     */
     uid?: any,
 }
 
diff --git a/types/carbon-components-react/lib/components/Accordion/Accordion.d.ts b/types/carbon-components-react/lib/components/Accordion/Accordion.d.ts
index 6be639b098..362b863c54 100644
--- a/types/carbon-components-react/lib/components/Accordion/Accordion.d.ts
+++ b/types/carbon-components-react/lib/components/Accordion/Accordion.d.ts
@@ -1,12 +1,11 @@
 import * as React from "react";
 import { ReactAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    children?: ReactAttr["children"],
-    className?: ReactAttr["className"],
-}
+interface InheritedProps extends ReactAttr<HTMLUListElement> { }
 
-export interface AccordionProps extends InheritedProps { }
+export interface AccordionProps extends InheritedProps {
+    align?: "end" | "start";
+}
 
 declare const Accordion: React.FC<AccordionProps>;
 
diff --git a/types/carbon-components-react/lib/components/Breadcrumb/Breadcrumb.Skeleton.d.ts b/types/carbon-components-react/lib/components/Breadcrumb/Breadcrumb.Skeleton.d.ts
index 9f21d81c0e..a6d0a98b53 100644
--- a/types/carbon-components-react/lib/components/Breadcrumb/Breadcrumb.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Breadcrumb/Breadcrumb.Skeleton.d.ts
@@ -1,7 +1,10 @@
 import * as React from "react";
+import { ReactDivAttr } from "../../../typings/shared";
 
-export interface BreadcrumbSkeletonProps { }
+interface InheritedProps extends ReactDivAttr { }
 
-declare class BreadcrumbSkeleton extends React.Component<BreadcrumbSkeletonProps> { }
+export interface BreadcrumbSkeletonProps extends InheritedProps { }
+
+declare const BreadcrumbSkeleton: React.FC<BreadcrumbSkeletonProps>;
 
 export default BreadcrumbSkeleton;
diff --git a/types/carbon-components-react/lib/components/Breadcrumb/BreadcrumbItem.d.ts b/types/carbon-components-react/lib/components/Breadcrumb/BreadcrumbItem.d.ts
index 1e458c4113..cbf037d83f 100644
--- a/types/carbon-components-react/lib/components/Breadcrumb/BreadcrumbItem.d.ts
+++ b/types/carbon-components-react/lib/components/Breadcrumb/BreadcrumbItem.d.ts
@@ -1,8 +1,8 @@
 import * as React from "react";
-import { ReactDivAttr } from "../../../typings/shared";
+import { ReactLIAttr } from "../../../typings/shared";
 import { LinkProps } from "../Link";
 
-interface InheritedProps extends ReactDivAttr {
+interface InheritedProps extends ReactLIAttr {
     href?: LinkProps["href"],
 }
 
diff --git a/types/carbon-components-react/lib/components/Checkbox/Checkbox.Skeleton.d.ts b/types/carbon-components-react/lib/components/Checkbox/Checkbox.Skeleton.d.ts
index 1504cc89d6..d9d0765571 100644
--- a/types/carbon-components-react/lib/components/Checkbox/Checkbox.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Checkbox/Checkbox.Skeleton.d.ts
@@ -1,10 +1,10 @@
 import * as React from "react";
-import { ReactLabelAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-export interface CheckboxSkeletonProps {
-    id?: ReactLabelAttr["htmlFor"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
-declare class CheckboxSkeleton extends React.Component<CheckboxSkeletonProps> { }
+export interface CheckboxSkeletonProps extends InheritedProps { }
+
+declare const CheckboxSkeleton: React.FC<CheckboxSkeletonProps>;
 
 export default CheckboxSkeleton;
diff --git a/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.Skeleton.d.ts b/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.Skeleton.d.ts
index 51609b3282..d1b83765a1 100644
--- a/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.Skeleton.d.ts
@@ -7,6 +7,6 @@ export interface CodeSnippetSkeletonProps extends InheritedProps {
     type?: "multi" | "single",
 }
 
-declare class CodeSnippetSkeleton extends React.Component<CodeSnippetSkeletonProps> { }
+declare const CodeSnippetSkeleton: React.FC<CodeSnippetSkeletonProps>;
 
 export default CodeSnippetSkeleton;
diff --git a/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.d.ts b/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.d.ts
index 9d36cc5022..dfe8e68077 100644
--- a/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.d.ts
+++ b/types/carbon-components-react/lib/components/CodeSnippet/CodeSnippet.d.ts
@@ -23,6 +23,7 @@ export interface CodeSnippetInlineProps extends SharedProps, InheritedInlineProp
 }
 
 export type AllCodeSnippetProps = CodeSnippetDivProps | CodeSnippetInlineProps;
-declare class CodeSnippet extends React.Component<AllCodeSnippetProps> { }
+
+declare const CodeSnippet: React.FC<AllCodeSnippetProps>;
 
 export default CodeSnippet;
diff --git a/types/carbon-components-react/lib/components/CodeSnippet/index.d.ts b/types/carbon-components-react/lib/components/CodeSnippet/index.d.ts
index 7a8d602f77..c911c68542 100644
--- a/types/carbon-components-react/lib/components/CodeSnippet/index.d.ts
+++ b/types/carbon-components-react/lib/components/CodeSnippet/index.d.ts
@@ -1,3 +1,4 @@
 export * from "./CodeSnippet";
 export * from "./CodeSnippet.Skeleton";
 export { default } from "./CodeSnippet";
+export { default as CodeSnippetSkeleton } from "./CodeSnippet.Skeleton";
diff --git a/types/carbon-components-react/lib/components/ComboBox/ComboBox.d.ts b/types/carbon-components-react/lib/components/ComboBox/ComboBox.d.ts
index b0102e7b41..548ea0c5df 100644
--- a/types/carbon-components-react/lib/components/ComboBox/ComboBox.d.ts
+++ b/types/carbon-components-react/lib/components/ComboBox/ComboBox.d.ts
@@ -1,10 +1,19 @@
 import * as React from "react";
-import { DownshiftTypedProps, InternationalProps, ReactInputAttr, RequiresIdProps, ThemeProps, ValidityProps } from "../../../typings/shared";
+import {
+    DownshiftTypedProps,
+    InternationalProps,
+    ReactInputAttr,
+    RequiresIdProps,
+    ThemeProps,
+    ValidityProps,
+    Direction
+} from "../../../typings/shared";
 import { ListBoxProps } from "../ListBox";
 import { ListBoxMenuIconTranslationKey } from "../ListBox/ListBoxMenuIcon";
 import { ListBoxSelectionTranslationKey } from "../ListBox/ListBoxSelection";
+import { ListBoxSize } from "../ListBox/ListBoxPropTypes";
 
-type ExcludedAttributes = "id" | "onChange" | "placeholder" | "ref";
+type ExcludedAttributes = "id" | "onChange" | "placeholder" | "ref" | "size";
 interface InheritedProps<ItemType> extends
     Omit<ReactInputAttr, ExcludedAttributes>,
     DownshiftTypedProps<ItemType>,
@@ -20,14 +29,17 @@ interface InheritedProps<ItemType> extends
 
 export interface ComboBoxProps<ItemType = string, CustomElementProps = Extract<ItemType, object>>
 extends InheritedProps<ItemType> {
+    direction?: Extract<Direction, "bottom" | "top">,
     downshiftProps?: any, // TODO
     helperText?: React.ReactNode,
     initialSelectedItem?: ItemType;
     items: ItemType[],
     itemToElement?: CustomElementProps extends object ? React.ComponentType<CustomElementProps> : never,
-    onChange?(data: { selectedItem?: ItemType }): void,
+    onChange?(data: { selectedItem?: ItemType | null }): void,
     onInputChange?(inputValue?: string): void,
+    selectedItem?: ItemType | null,
     shouldFilterItem?(item: ItemType, itemToString?: ComboBoxProps<ItemType>["itemToString"], inputValue?: string): void,
+    size?: ListBoxSize,
     titleText?: React.ReactNode,
 }
 
diff --git a/types/carbon-components-react/lib/components/ComposedModal/ComposedModal.d.ts b/types/carbon-components-react/lib/components/ComposedModal/ComposedModal.d.ts
index c856770f1f..85bbf0fdca 100644
--- a/types/carbon-components-react/lib/components/ComposedModal/ComposedModal.d.ts
+++ b/types/carbon-components-react/lib/components/ComposedModal/ComposedModal.d.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactDivAttr } from "../../../typings/shared";
+import { EmbeddedIconProps, ReactDivAttr, CarbonSize } from "../../../typings/shared";
 import { ButtonProps } from "../Button";
 
 // ComposedModal
@@ -12,6 +12,7 @@ export interface ComposedModalProps extends ComposedModalInheritedProps {
     onClose?(): boolean | void,
     open?: boolean,
     selectedPrimaryFocus?: string,
+    size?: CarbonSize,
 }
 
 declare class ComposedModal extends React.Component<ComposedModalProps> { }
@@ -24,7 +25,7 @@ interface ModalHeaderInheritedProps extends
 { }
 
 export interface ModalHeaderProps extends ModalHeaderInheritedProps {
-    buttonOnClick?(): void,
+    buttonOnClick?(event: React.MouseEvent<HTMLButtonElement>): void,
     closeClassName?: string,
     closeIconClassName?: string,
     closeModal?(): void,
@@ -40,16 +41,19 @@ export declare class ModalHeader extends React.Component<ModalHeaderProps> { }
 
 interface ModalBodyInheritedProps extends ReactDivAttr { }
 
-export interface ModalBodyProps extends ModalBodyInheritedProps { }
+export interface ModalBodyProps extends ModalBodyInheritedProps {
+    hasForm?: boolean;
+    hasScrollingContent?: boolean;
+}
 
-export declare class ModalBody extends React.Component<ModalBodyProps> { }
+export declare const ModalBody: React.FC<ModalBodyProps>;
 
 // Footer
 
 interface ModalFooterInheritedProps extends ReactDivAttr { }
 
 export interface ModalFooterProps extends ModalFooterInheritedProps {
-    closeModal?(): void,
+    closeModal?: ButtonProps["onClick"];
     primaryClassName?: string,
     primaryButtonText?: string,
     primaryButtonDisabled?: string,
diff --git a/types/carbon-components-react/lib/components/ContentSwitcher/ContentSwitcher.d.ts b/types/carbon-components-react/lib/components/ContentSwitcher/ContentSwitcher.d.ts
index 2092a1180b..1f644eb564 100644
--- a/types/carbon-components-react/lib/components/ContentSwitcher/ContentSwitcher.d.ts
+++ b/types/carbon-components-react/lib/components/ContentSwitcher/ContentSwitcher.d.ts
@@ -1,15 +1,13 @@
 import * as React from "react";
 import { ReactDivAttr } from "../../../typings/shared";
-import { SwitchProps } from "./Switch";
 
-interface InheritedProps extends Omit<ReactDivAttr, "onChange"> {
-    onChange: NonNullable<SwitchProps["onClick"]>,
-}
+interface InheritedProps extends Omit<ReactDivAttr, "role"> { }
 
 export interface ContentSwitcherProps extends InheritedProps {
     selectedIndex?: number,
+    selectionMode?: "automatic" | "manual";
 }
 
-declare const ContentSwitcher: React.FC<ContentSwitcherProps>;
+declare class ContentSwitcher extends React.Component<ContentSwitcherProps> {}
 
 export default ContentSwitcher;
diff --git a/types/carbon-components-react/lib/components/ContentSwitcher/Switch.d.ts b/types/carbon-components-react/lib/components/ContentSwitcher/Switch.d.ts
deleted file mode 100644
index df41a6c1e5..0000000000
--- a/types/carbon-components-react/lib/components/ContentSwitcher/Switch.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from "react";
-import { ReactButtonAttr } from "../../../typings/shared";
-
-interface InheritedProps extends Omit<ReactButtonAttr, "onClick"> { }
-
-export interface SwitchProps extends InheritedProps {
-    index?: number,
-    onClick(event: React.MouseEvent<HTMLButtonElement>, index?: SwitchProps["index"]): void,
-    selected?: boolean,
-    text: string,
-}
-
-declare const Switch: React.RefForwardingComponent<HTMLButtonElement, SwitchProps>;
-
-export default Switch;
diff --git a/types/carbon-components-react/lib/components/ContentSwitcher/index.d.ts b/types/carbon-components-react/lib/components/ContentSwitcher/index.d.ts
index 3d82c10802..7b6c8a3ad3 100644
--- a/types/carbon-components-react/lib/components/ContentSwitcher/index.d.ts
+++ b/types/carbon-components-react/lib/components/ContentSwitcher/index.d.ts
@@ -1,4 +1,2 @@
 export * from "./ContentSwitcher";
-export * from "./Switch";
-export { default as Switch } from "./Switch";
 export { default } from "./ContentSwitcher";
diff --git a/types/carbon-components-react/lib/components/Copy/Copy.d.ts b/types/carbon-components-react/lib/components/Copy/Copy.d.ts
index c996e2dc4d..b94d8af0eb 100644
--- a/types/carbon-components-react/lib/components/Copy/Copy.d.ts
+++ b/types/carbon-components-react/lib/components/Copy/Copy.d.ts
@@ -7,12 +7,12 @@ export interface FeedbackProps {
 }
 
 interface InheritedProps extends
-    Omit<ReactButtonAttr, "type">,
+    Omit<ReactButtonAttr, "aria-live" | "type">,
     FeedbackProps
 { }
 
 export interface CopyProps extends InheritedProps { }
 
-declare class Copy extends React.Component<CopyProps> { }
+declare const Copy: React.FC<CopyProps>;
 
 export default Copy;
diff --git a/types/carbon-components-react/lib/components/CopyButton/CopyButton.d.ts b/types/carbon-components-react/lib/components/CopyButton/CopyButton.d.ts
index c76ddc2fc6..01171e8874 100644
--- a/types/carbon-components-react/lib/components/CopyButton/CopyButton.d.ts
+++ b/types/carbon-components-react/lib/components/CopyButton/CopyButton.d.ts
@@ -1,15 +1,14 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactButtonAttr } from "../../../typings/shared";
-import { FeedbackProps } from "../Copy";
+import { EmbeddedIconProps } from "../../../typings/shared";
+import { CopyProps } from "../Copy";
 
 interface InheritedProps extends
-    ReactButtonAttr,
-    EmbeddedIconProps,
-    FeedbackProps
+    CopyProps,
+    EmbeddedIconProps
 { }
 
 export interface CopyButtonProps extends InheritedProps { }
 
-declare class CopyButton extends React.Component<CopyButtonProps> { }
+declare const CopyButton: React.FC<CopyButtonProps>;
 
 export default CopyButton;
diff --git a/types/carbon-components-react/lib/components/DataTableSkeleton/DataTableSkeleton.d.ts b/types/carbon-components-react/lib/components/DataTableSkeleton/DataTableSkeleton.d.ts
index 134fd7c5ff..c02cc26c51 100644
--- a/types/carbon-components-react/lib/components/DataTableSkeleton/DataTableSkeleton.d.ts
+++ b/types/carbon-components-react/lib/components/DataTableSkeleton/DataTableSkeleton.d.ts
@@ -1,17 +1,16 @@
 import * as React from "react";
-import { ShapeOf } from "../../../typings/shared";
 
 interface InheritedProps extends React.TableHTMLAttributes<HTMLTableElement> { }
 
-export interface HeaderType {
-    key?: string;
-    header?: React.ReactNode;
-}
+// export interface HeaderType {
+//     key?: string;
+//     header?: React.ReactNode;
+// }
 
 export interface DataTableSkeletonProps extends InheritedProps {
     compact?: boolean;
     columnCount?: number;
-    headers?: ReadonlyArray<string> | ReadonlyArray<ShapeOf<HeaderType>>;
+    // headers?: ReadonlyArray<string> | ReadonlyArray<ShapeOf<HeaderType>>; // doesn't seem to be used anymore but prop type is still there so leaving this commented out.
     rowCount?: number;
     zebra?: boolean;
 }
diff --git a/types/carbon-components-react/lib/components/DatePicker/DatePicker.Skeleton.d.ts b/types/carbon-components-react/lib/components/DatePicker/DatePicker.Skeleton.d.ts
index e266cb13fc..2dc3f26bf0 100644
--- a/types/carbon-components-react/lib/components/DatePicker/DatePicker.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/DatePicker/DatePicker.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactAttr } from "../../../typings/shared";
+import { ReactAttr, ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactAttr["id"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface DatePickerSkeletonProps extends InheritedProps {
     range?: boolean,
diff --git a/types/carbon-components-react/lib/components/DatePicker/DatePicker.d.ts b/types/carbon-components-react/lib/components/DatePicker/DatePicker.d.ts
index 925a0852fc..a1e00d932b 100644
--- a/types/carbon-components-react/lib/components/DatePicker/DatePicker.d.ts
+++ b/types/carbon-components-react/lib/components/DatePicker/DatePicker.d.ts
@@ -1,5 +1,5 @@
 import { key as LocaleKey } from "flatpickr/dist/types/locale";
-import { DateOption, Hook } from "flatpickr/dist/types/options";
+import { BaseOptions, DateOption, Hook } from "flatpickr/dist/types/options";
 import * as React from "react";
 import { ReactDivAttr, ThemeProps } from "../../../typings/shared";
 
@@ -13,11 +13,12 @@ export interface DatePickerProps extends InheritedProps {
     dateFormat?: string,
     datePickerType?: "range" | "single" | "simple",
     locale?: LocaleKey,
-    maxDate?: DateOption,
-    minDate?: DateOption,
+    maxDate?: BaseOptions["maxDate"],
+    minDate?: BaseOptions["minDate"],
     onChange?: Hook,
+    onClose?: BaseOptions["onClose"],
     short?: boolean,
-    value?: DateOption | DateOption[],
+    value?: DateOption | readonly DateOption[],
 }
 
 declare class DatePicker extends React.Component<DatePickerProps> { }
diff --git a/types/carbon-components-react/lib/components/DatePickerInput/DatePickerInput.d.ts b/types/carbon-components-react/lib/components/DatePickerInput/DatePickerInput.d.ts
index 6833827457..249737f82b 100644
--- a/types/carbon-components-react/lib/components/DatePickerInput/DatePickerInput.d.ts
+++ b/types/carbon-components-react/lib/components/DatePickerInput/DatePickerInput.d.ts
@@ -1,8 +1,14 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactInputAttr, RequiresIdProps, ValidityProps } from "../../../typings/shared";
+import {
+    EmbeddedIconProps,
+    ReactInputAttr,
+    RequiresIdProps,
+    ValidityProps,
+    CarbonInputSize
+} from "../../../typings/shared";
 
 interface InheritedProps extends
-    Omit<ReactInputAttr, "className" | "id">,
+    Omit<ReactInputAttr, "className" | "id" | "size">,
     EmbeddedIconProps,
     RequiresIdProps,
     ValidityProps
@@ -13,6 +19,7 @@ export interface DatePickerInputProps extends InheritedProps {
     labelText: NonNullable<React.ReactNode>,
     openCalendar?: React.MouseEventHandler,
     pattern?: string,
+    size?: Extract<CarbonInputSize, "sm" | "xl">,
 }
 
 declare class DatePickerInput extends React.Component<DatePickerInputProps> { }
diff --git a/types/carbon-components-react/lib/components/Dropdown/Dropdown.Skeleton.d.ts b/types/carbon-components-react/lib/components/Dropdown/Dropdown.Skeleton.d.ts
index 56ad4cabd3..22b632b2c3 100644
--- a/types/carbon-components-react/lib/components/Dropdown/Dropdown.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Dropdown/Dropdown.Skeleton.d.ts
@@ -1,6 +1,9 @@
 import * as React from "react";
+import { ReactDivAttr } from "../../../typings/shared";
 
-export interface DropdownSkeletonProps {
+interface InheritedProps extends ReactDivAttr { }
+
+export interface DropdownSkeletonProps extends InheritedProps {
     inline?: boolean,
 }
 
diff --git a/types/carbon-components-react/lib/components/Dropdown/Dropdown.d.ts b/types/carbon-components-react/lib/components/Dropdown/Dropdown.d.ts
index 49692b5219..4dc6697bf1 100644
--- a/types/carbon-components-react/lib/components/Dropdown/Dropdown.d.ts
+++ b/types/carbon-components-react/lib/components/Dropdown/Dropdown.d.ts
@@ -19,6 +19,7 @@ interface InheritedProps<ItemType> extends
 {
     ariaLabel: React.AriaAttributes["aria-label"],
     disabled?: ReactInputAttr["disabled"],
+    size?: ListBoxProps["size"],
     type?: ListBoxProps["type"],
 }
 
@@ -27,6 +28,8 @@ export interface OnChangeData<ItemType = string> {
 }
 
 export interface DropdownProps<ItemType = string> extends InheritedProps<ItemType> {
+    direction?: "bottom" | "top",
+    downshiftProps?: any; // TODO
     initialSelectedItem?: ItemType,
     inline?: boolean,
     helperText?: React.ReactNode,
diff --git a/types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundary.d.ts b/types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundary.d.ts
new file mode 100644
index 0000000000..7f3d5117be
--- /dev/null
+++ b/types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundary.d.ts
@@ -0,0 +1,10 @@
+import * as React from "react";
+
+export interface ErrorBoundaryProps {
+    children?: React.ReactNode,
+    fallback?: React.ReactNode,
+}
+
+declare class ErrorBoundary extends React.Component<ErrorBoundaryProps> { }
+
+export default ErrorBoundary;
diff --git a/types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundaryContext.d.ts b/types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundaryContext.d.ts
new file mode 100644
index 0000000000..0cfb101a97
--- /dev/null
+++ b/types/carbon-components-react/lib/components/ErrorBoundary/ErrorBoundaryContext.d.ts
@@ -0,0 +1,7 @@
+import * as React from "react";
+
+export interface ErrorBoundaryContextValue {
+    log: React.ComponentLifecycle<unknown, unknown>["componentDidCatch"],
+}
+
+export declare const ErrorBoundaryContext: React.Context<ErrorBoundaryContextValue>;
diff --git a/types/carbon-components-react/lib/components/ErrorBoundary/index.d.ts b/types/carbon-components-react/lib/components/ErrorBoundary/index.d.ts
new file mode 100644
index 0000000000..acdfe467b0
--- /dev/null
+++ b/types/carbon-components-react/lib/components/ErrorBoundary/index.d.ts
@@ -0,0 +1,4 @@
+export * from "./ErrorBoundaryContext";
+export * from "./ErrorBoundary";
+export { default as ErrorBoundary } from "./ErrorBoundary";
+export { ErrorBoundaryContext } from "./ErrorBoundaryContext";
diff --git a/types/carbon-components-react/lib/components/FileUploader/FileUploader.Skeleton.d.ts b/types/carbon-components-react/lib/components/FileUploader/FileUploader.Skeleton.d.ts
index 6280197a56..338c110fef 100644
--- a/types/carbon-components-react/lib/components/FileUploader/FileUploader.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/FileUploader/FileUploader.Skeleton.d.ts
@@ -1,7 +1,10 @@
 import * as React from "react";
+import { ReactDivAttr } from "../../../typings/shared";
 
-export interface FileUploaderSkeletonProps { }
+interface InheritedProps extends ReactDivAttr { }
 
-declare class FileUploaderSkeleton extends React.Component<FileUploaderSkeletonProps> { }
+export interface FileUploaderSkeletonProps extends InheritedProps{ }
+
+declare const FileUploaderSkeleton: React.FC<FileUploaderSkeletonProps>;
 
 export default FileUploaderSkeleton;
diff --git a/types/carbon-components-react/lib/components/FileUploader/FileUploader.d.ts b/types/carbon-components-react/lib/components/FileUploader/FileUploader.d.ts
index b10d709d25..1a1f1f4230 100644
--- a/types/carbon-components-react/lib/components/FileUploader/FileUploader.d.ts
+++ b/types/carbon-components-react/lib/components/FileUploader/FileUploader.d.ts
@@ -1,18 +1,18 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactDivAttr, ReactInputAttr, ReactLabelAttr } from "../../../typings/shared";
+import { EmbeddedIconProps, ReactInputAttr, ReactLabelAttr, ReactAttr } from "../../../typings/shared";
 import { ButtonKind } from "../Button";
 
 interface SharedProps {
-    accept?: string[],
+    accept?: readonly string[],
     buttonKind?: ButtonKind,
     disabled?: ReactInputAttr["disabled"],
     disableLabelChanges?: boolean,
-    labelText?: React.ReactNode,
     listFiles?: boolean,
     multiple?: boolean,
 }
 
 export type FileStatus = "complete" | "edit" | "uploading";
+export type FileUploaderSize = "default" | "field" | "small";
 
 // FileUploaderButton
 
@@ -23,37 +23,28 @@ interface FileUploaderButtonInheritedProps extends
     onChange?(event: React.ChangeEvent<HTMLInputElement>): void,
 }
 
-export interface FileUploaderButtonProps extends FileUploaderButtonInheritedProps { }
+export interface FileUploaderButtonProps extends FileUploaderButtonInheritedProps {
+    labelText?: React.ReactNode,
+    size?: FileUploaderSize,
+}
 
 export declare class FileUploaderButton extends React.Component<FileUploaderButtonProps> { }
 
 // Filename
 
-interface FilenameDivInheritedProps extends ReactDivAttr { }
-interface FilenameIconInheritedProps extends
-    React.SVGAttributes<SVGSVGElement>,
-    EmbeddedIconProps
-{ }
-
-export interface FilenameDivProps extends FilenameDivInheritedProps {
-    status: Extract<FileStatus, "uploading">,
-}
+interface FilenameIconInheritedProps extends React.SVGAttributes<SVGSVGElement>, EmbeddedIconProps { }
 
 export interface FilenameIconProps extends FilenameIconInheritedProps {
-    status: Extract<FileStatus, "complete" | "edit">,
+    invalid?: boolean,
+    status?: FileStatus,
 }
 
-export interface FilenameEmptyProps extends FilenameDivInheritedProps {
-    status?: null;
-}
-
-export type AllFilenameProps = FilenameDivProps | FilenameIconProps | FilenameEmptyProps;
-export declare class Filename extends React.Component<AllFilenameProps> { }
+export declare const Filename: React.FC<FilenameIconProps>;
 
 // FileUploader
 
 interface FileUploaderInheritedProps extends
-    Omit<ReactLabelAttr, "onChange">,
+    Omit<ReactAttr, "onChange">,
     EmbeddedIconProps,
     SharedProps
 {
@@ -64,6 +55,8 @@ export interface FileUploaderProps extends FileUploaderInheritedProps {
     buttonLabel?: string,
     filenameStatus?: FileStatus, // required but has default value
     labelDescription?: string,
+    labelTitle?: string,
+    size?: FileUploaderSize,
 }
 
 export declare class FileUploader extends React.Component<FileUploaderProps> { }
diff --git a/types/carbon-components-react/lib/components/FileUploader/FileUploaderDropContainer.d.ts b/types/carbon-components-react/lib/components/FileUploader/FileUploaderDropContainer.d.ts
index 665c8a1546..6a1c233859 100644
--- a/types/carbon-components-react/lib/components/FileUploader/FileUploaderDropContainer.d.ts
+++ b/types/carbon-components-react/lib/components/FileUploader/FileUploaderDropContainer.d.ts
@@ -5,58 +5,60 @@ interface FileUploaderDropContainerInheritedProps extends ReactAttr<HTMLLabelEle
 }
 
 export interface FileUploaderDropContainerProps extends FileUploaderDropContainerInheritedProps {
-  /**
-   * Provide a custom className to be applied to the container node
-   */
-  className?: string;
+    /**
+     * Provide a custom className to be applied to the container node
+     */
+    className?: string;
 
-  /**
-   * Provide a unique id for the underlying <input> node
-   */
-  id?: string;
+    /**
+     * Provide a unique id for the underlying <input> node
+     */
+    id?: string;
 
-  /**
-   * Provide the label text to be read by screen readers when interacting with
-   * this control
-   */
-  // Required but has a default value
-  labelText?: string;
+    /**
+     * Provide the label text to be read by screen readers when interacting with
+     * this control
+     */
+    // Required but has a default value
+    labelText?: string;
 
-  /**
-   * Specify if the component should accept multiple files to upload
-   */
-  multiple?: boolean;
+    /**
+     * Specify if the component should accept multiple files to upload
+     */
+    multiple?: boolean;
 
-  /**
-   * Provide a name for the underlying <input> node
-   */
-  name?: string;
+    /**
+     * Provide a name for the underlying <input> node
+     */
+    name?: string;
 
-  /**
-   * Provide an accessibility role for the <FileUploaderButton>
-   */
-  role?: string;
+    /**
+     * Provide an accessibility role for the <FileUploaderButton>
+     */
+    role?: string;
 
-  /**
-   * Provide a custom tabIndex value for the <FileUploaderButton>
-   */
-  tabIndex?: number;
+    /**
+     * Provide a custom tabIndex value for the <FileUploaderButton>
+     */
+    tabIndex?: number;
 
-  /**
-   * Specify whether file input is disabled
-   */
-  disabled?: boolean;
+    /**
+     * Specify whether file input is disabled
+     */
+    disabled?: boolean;
 
-  /**
-   * Specify the types of files that this input should be able to receive
-   */
-  accept?: string[];
+    /**
+     * Specify the types of files that this input should be able to receive
+     */
+    accept?: readonly string[];
 
-  /**
-   * Event handler that is called after files are added to the uploader
-   * The event handler signature looks like `onAddFiles(evt, { addedFiles })`
-   */
-  onAddFiles?: (event: React.MouseEvent<HTMLElement>, content: {addedFiles: string[]}) => void;
+    /**
+     * Event handler that is called after files are added to the uploader
+     * The event handler signature looks like `onAddFiles(evt, { addedFiles })`
+     */
+    onAddFiles?: (event: React.MouseEvent<HTMLElement>, content: { addedFiles: string[] }) => void;
 }
 
-export default class FileUploaderDropContainer extends React.Component<FileUploaderDropContainerProps> { }
+declare const FileUploaderDropContainer: React.FC<FileUploaderDropContainerProps>;
+
+export default FileUploaderDropContainer;
diff --git a/types/carbon-components-react/lib/components/FileUploader/FileUploaderItem.d.ts b/types/carbon-components-react/lib/components/FileUploader/FileUploaderItem.d.ts
index d198d390f1..d196fd27ff 100644
--- a/types/carbon-components-react/lib/components/FileUploader/FileUploaderItem.d.ts
+++ b/types/carbon-components-react/lib/components/FileUploader/FileUploaderItem.d.ts
@@ -9,7 +9,7 @@ import { FileStatus } from "./FileUploader";
 interface FileUploaderItemInheritedProps extends
     ReactAttr<HTMLSpanElement>,
     EmbeddedIconProps,
-    Omit<ValidityProps, "invalidText"> {
+    Pick<ValidityProps, "invalid"> {
 }
 
 export interface FileUploaderItemProps extends FileUploaderItemInheritedProps {
@@ -46,4 +46,6 @@ export interface FileUploaderItemProps extends FileUploaderItemInheritedProps {
     errorBody?: NonNullable<React.ReactNode>;
 }
 
-export default class FileUploaderItem extends React.Component<FileUploaderItemProps> { }
+declare const FileUploaderItem: React.FC<FileUploaderItemProps>;
+
+export default FileUploaderItem;
diff --git a/types/carbon-components-react/lib/components/FileUploader/index.d.ts b/types/carbon-components-react/lib/components/FileUploader/index.d.ts
index 740bf7f467..335fa8f7e6 100644
--- a/types/carbon-components-react/lib/components/FileUploader/index.d.ts
+++ b/types/carbon-components-react/lib/components/FileUploader/index.d.ts
@@ -2,4 +2,8 @@ export * from "./FileUploader";
 export * from "./FileUploaderItem";
 export * from "./FileUploaderDropContainer";
 export * from "./FileUploader.Skeleton";
+
+export { default as FileUploaderSkeleton } from "./FileUploader.Skeleton";
+export { default as FileUploaderItem } from "./FileUploaderItem";
+export { default as FileUploaderDropContainer } from "./FileUploaderDropContainer";
 export { default } from './FileUploader';
diff --git a/types/carbon-components-react/lib/components/FormLabel/FormLabel.d.ts b/types/carbon-components-react/lib/components/FormLabel/FormLabel.d.ts
index 2c19a0caec..bc32a4c547 100644
--- a/types/carbon-components-react/lib/components/FormLabel/FormLabel.d.ts
+++ b/types/carbon-components-react/lib/components/FormLabel/FormLabel.d.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ReactLabelAttr } from "../../../typings/shared";
 
-interface InheritedProps extends Omit<ReactLabelAttr, "htmlFor"> { }
+interface InheritedProps extends ReactLabelAttr { }
 
 export interface FormLabelProps extends InheritedProps { }
 
diff --git a/types/carbon-components-react/lib/components/Icon/Icon.Skeleton.d.ts b/types/carbon-components-react/lib/components/Icon/Icon.Skeleton.d.ts
index 113242702a..3488e84461 100644
--- a/types/carbon-components-react/lib/components/Icon/Icon.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Icon/Icon.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactAttr } from "../../../typings/shared";
+import { ReactAttr, ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    style?: ReactAttr["style"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface IconSkeletonProps extends InheritedProps { }
 
diff --git a/types/carbon-components-react/lib/components/Icon/Icon.d.ts b/types/carbon-components-react/lib/components/Icon/Icon.d.ts
index ed875dab85..bafa189c9e 100644
--- a/types/carbon-components-react/lib/components/Icon/Icon.d.ts
+++ b/types/carbon-components-react/lib/components/Icon/Icon.d.ts
@@ -1,17 +1,12 @@
 import * as React from "react";
 
-type SVGAttr = React.SVGAttributes<SVGSVGElement>;
+export function findIcon<T extends { name?: string }>(name: string, iconsObj?: readonly T[]): false | T;
+export function setIconsList<T extends { name?: string }>(list: readonly T[]): void;
+export function getSvgData<R = unknown>(iconName: string): R;
+export function svgShapes<D = unknown>(svgData: D): Array<React.ReactNode | React.ReactNodeArray>;
+export function isPrefixed(name: string): boolean;
 
-interface SVGInheritedProps {
-    className?: SVGAttr["className"],
-    fill?: SVGAttr["fill"],
-    fillRule?: SVGAttr["fillRule"],
-    height?: SVGAttr["height"],
-    role?: SVGAttr["role"],
-    style?: SVGAttr["style"],
-    viewBox?: SVGAttr["viewBox"],
-    width?: SVGAttr["width"],
-}
+interface InheritedProps extends React.SVGAttributes<SVGSVGElement> { }
 
 export interface IconData {
     width?: string;
@@ -20,11 +15,11 @@ export interface IconData {
     svgData: any;
 }
 
-export interface IconProps extends SVGInheritedProps {
+export interface IconProps extends InheritedProps {
     description: string,
     icon?: IconData,
     iconRef?: React.Ref<HTMLElement>,
-    iconTitle?: string
+    iconTitle?: string,
 }
 
 declare const Icon: React.FC<IconProps>;
diff --git a/types/carbon-components-react/lib/components/InlineCheckbox/InlineCheckbox.d.ts b/types/carbon-components-react/lib/components/InlineCheckbox/InlineCheckbox.d.ts
index 1e7d3f001f..274edc0e7b 100644
--- a/types/carbon-components-react/lib/components/InlineCheckbox/InlineCheckbox.d.ts
+++ b/types/carbon-components-react/lib/components/InlineCheckbox/InlineCheckbox.d.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ReactInputAttr, RequiresIdProps } from "../../../typings/shared";
+import { ReactInputAttr, RequiresIdProps, ForwardRefReturn } from "../../../typings/shared";
 
 type ExcludedAttributes = "aria-label" | "className" | "id" | "onChange" | "ref" | "type";
 
@@ -16,6 +16,6 @@ export interface InlineCheckboxProps extends InheritedProps {
     onChange?(checked: boolean, id: string, event: React.ChangeEvent<HTMLInputElement>): void,
 }
 
-declare const InlineCheckbox: React.RefForwardingComponent<HTMLInputElement, InlineCheckboxProps>;
+declare const InlineCheckbox: ForwardRefReturn<HTMLInputElement, InlineCheckboxProps>;
 
 export default InlineCheckbox;
diff --git a/types/carbon-components-react/lib/components/InlineLoading/InlineLoading.d.ts b/types/carbon-components-react/lib/components/InlineLoading/InlineLoading.d.ts
index d408bb7811..1e94dbbadd 100644
--- a/types/carbon-components-react/lib/components/InlineLoading/InlineLoading.d.ts
+++ b/types/carbon-components-react/lib/components/InlineLoading/InlineLoading.d.ts
@@ -5,7 +5,7 @@ interface InheritedProps extends ReactDivAttr, EmbeddedIconProps { }
 
 export type InlineLoadingStatus = 'active' | 'error' | 'finished' | 'inactive';
 export interface InlineLoadingProps extends InheritedProps {
-    description?: string;
+    description?: React.ReactNode;
     onSuccess?(): void;
     /**
      * @deprecated
diff --git a/types/carbon-components-react/lib/components/Link/Link.d.ts b/types/carbon-components-react/lib/components/Link/Link.d.ts
index 4d3cad4360..fa8ec04b9c 100644
--- a/types/carbon-components-react/lib/components/Link/Link.d.ts
+++ b/types/carbon-components-react/lib/components/Link/Link.d.ts
@@ -5,6 +5,8 @@ interface InheritedProps extends ReactAnchorAttr { }
 
 export interface LinkProps extends InheritedProps {
     disabled?: boolean,
+    inline?: boolean,
+    visited?: boolean,
 }
 
 declare const Link: React.FC<LinkProps>;
diff --git a/types/carbon-components-react/lib/components/ListBox/ListBox.d.ts b/types/carbon-components-react/lib/components/ListBox/ListBox.d.ts
index abef43797b..07b3c3e3ee 100644
--- a/types/carbon-components-react/lib/components/ListBox/ListBox.d.ts
+++ b/types/carbon-components-react/lib/components/ListBox/ListBox.d.ts
@@ -4,15 +4,16 @@ import { ListBoxFieldComponent } from "./ListBoxField";
 import { ListBoxMenuComponent } from "./ListBoxMenu";
 import { ListBoxMenuIconComponent } from "./ListBoxMenuIcon";
 import { ListBoxMenuItemComponent } from "./ListBoxMenuItem";
-import { ListBoxType } from "./ListBoxPropTypes";
+import { ListBoxSize, ListBoxType } from "./ListBoxPropTypes";
 import { ListBoxSelectionComponent } from "./ListBoxSelection";
 
-type ExcludedAttributes = "onKeyDown" | "onKeyPress" | "ref" | "role" | "tabIndex";
+type ExcludedAttributes = "onKeyDown" | "onKeyPress" | "ref";
 interface InheritedProps extends Omit<ReactDivAttr, ExcludedAttributes> { }
 
 export interface ListBoxProps extends InheritedProps {
     disabled?: boolean, // required but has default value
     innerRef?: React.Ref<HTMLDivElement>, // required but has default value
+    size?: ListBoxSize,
     type?: ListBoxType, // required but has default value
 }
 
diff --git a/types/carbon-components-react/lib/components/ListBox/ListBoxField.d.ts b/types/carbon-components-react/lib/components/ListBox/ListBoxField.d.ts
index 8e3fd6d005..5547cd1984 100644
--- a/types/carbon-components-react/lib/components/ListBox/ListBoxField.d.ts
+++ b/types/carbon-components-react/lib/components/ListBox/ListBoxField.d.ts
@@ -1,10 +1,8 @@
 import * as React from "react";
-import { InternationalProps, ReactDivAttr, RequiresIdProps } from "../../../typings/shared";
+import { ReactDivAttr, RequiresIdProps } from "../../../typings/shared";
 
-export type ListBoxFieldTranslationKey = "close.menu" | "open.menu";
 interface InheritedProps extends
     Omit<ReactDivAttr, "id">,
-    InternationalProps<ListBoxFieldTranslationKey>,
     RequiresIdProps
 { }
 
diff --git a/types/carbon-components-react/lib/components/ListBox/ListBoxPropTypes.d.ts b/types/carbon-components-react/lib/components/ListBox/ListBoxPropTypes.d.ts
index 6498569c20..c5096bdef5 100644
--- a/types/carbon-components-react/lib/components/ListBox/ListBoxPropTypes.d.ts
+++ b/types/carbon-components-react/lib/components/ListBox/ListBoxPropTypes.d.ts
@@ -1 +1,2 @@
+export type ListBoxSize = "sm" | "xl";
 export type ListBoxType = "default" | "inline";
diff --git a/types/carbon-components-react/lib/components/Loading/Loading.d.ts b/types/carbon-components-react/lib/components/Loading/Loading.d.ts
index f9fd31fe9b..a40ccb09e5 100644
--- a/types/carbon-components-react/lib/components/Loading/Loading.d.ts
+++ b/types/carbon-components-react/lib/components/Loading/Loading.d.ts
@@ -13,6 +13,6 @@ export interface LoadingProps extends InheritedProps {
     withOverlay?: boolean,
 }
 
-declare class Loading extends React.Component<LoadingProps> { }
+declare const Loading: React.FC<LoadingProps>;
 
 export default Loading;
diff --git a/types/carbon-components-react/lib/components/Modal/Modal.d.ts b/types/carbon-components-react/lib/components/Modal/Modal.d.ts
index 1570fec5f0..9bde77a304 100644
--- a/types/carbon-components-react/lib/components/Modal/Modal.d.ts
+++ b/types/carbon-components-react/lib/components/Modal/Modal.d.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactDivAttr } from "../../../typings/shared";
+import { EmbeddedIconProps, ReactDivAttr, CarbonSize } from "../../../typings/shared";
 
-type ExcludedAttributes = "role" | "tabIndex" | "onBlur" | "onClick" | "onKeyDown" | "onTransitionEnd" | "ref";
+type ExcludedAttributes = "role" | "onBlur" | "onClick" | "onKeyDown" | "onTransitionEnd" | "ref";
 interface InheritedProps extends
     Omit<ReactDivAttr, ExcludedAttributes>,
     EmbeddedIconProps
@@ -9,7 +9,12 @@ interface InheritedProps extends
 
 export interface ModalProps extends InheritedProps {
     danger?: boolean,
+    /**
+     * @deprecated
+     */
     focusTrap?: boolean,
+    hasForm?: boolean,
+    hasScrollingContent?: boolean,
     modalAriaLabel?: string,
     modalHeading?: React.ReactNode,
     modalLabel?: React.ReactNode,
@@ -22,7 +27,8 @@ export interface ModalProps extends InheritedProps {
     primaryButtonText?: string,
     secondaryButtonText?: string,
     selectorPrimaryFocus?: string,
-    selectorsFloatingMenus?: string[],
+    selectorsFloatingMenus?: readonly string[],
+    size?: CarbonSize,
     shouldSubmitOnEnter?: boolean,
 }
 
diff --git a/types/carbon-components-react/lib/components/ModalWrapper/ModalWrapper.d.ts b/types/carbon-components-react/lib/components/ModalWrapper/ModalWrapper.d.ts
index e682e7fb97..3923b320e1 100644
--- a/types/carbon-components-react/lib/components/ModalWrapper/ModalWrapper.d.ts
+++ b/types/carbon-components-react/lib/components/ModalWrapper/ModalWrapper.d.ts
@@ -15,7 +15,7 @@ export interface TriggerProps {
 
 export interface ModalWrapperProps extends InheritedProps, TriggerProps {
     handleOpen?(e: React.MouseEvent<HTMLElement>): void,
-    handleSubmit?(): boolean,
+    handleSubmit(): boolean,
     shouldCloseAfterSubmit?: boolean,
     status?: string,
 }
diff --git a/types/carbon-components-react/lib/components/MultiSelect/FilterableMultiSelect.d.ts b/types/carbon-components-react/lib/components/MultiSelect/FilterableMultiSelect.d.ts
index b2668fc2fd..9e668db4b0 100644
--- a/types/carbon-components-react/lib/components/MultiSelect/FilterableMultiSelect.d.ts
+++ b/types/carbon-components-react/lib/components/MultiSelect/FilterableMultiSelect.d.ts
@@ -11,8 +11,9 @@ interface FilterItemsExtra<T> {
 
 export interface FilterableMultiSelectProps<T extends ListBoxBaseItemType = string> extends InheritedProps<T> {
     filterItems?(items: ReadonlyArray<T>, extra: FilterItemsExtra<T>): T[],
+    placeholder: string;
 }
 
-declare class FilterableMultiSelect <T extends ListBoxBaseItemType = string>extends React.Component<FilterableMultiSelectProps<T>> { }
+declare class FilterableMultiSelect<T extends ListBoxBaseItemType = string> extends React.Component<FilterableMultiSelectProps<T>> { }
 
 export default FilterableMultiSelect;
diff --git a/types/carbon-components-react/lib/components/MultiSelect/MultiSelect.d.ts b/types/carbon-components-react/lib/components/MultiSelect/MultiSelect.d.ts
index 0955814fc6..f678f98152 100644
--- a/types/carbon-components-react/lib/components/MultiSelect/MultiSelect.d.ts
+++ b/types/carbon-components-react/lib/components/MultiSelect/MultiSelect.d.ts
@@ -4,32 +4,35 @@ import { ListBoxProps } from "../ListBox";
 import { ListBoxMenuIconTranslationKey } from "../ListBox/ListBoxMenuIcon";
 import FilterableMultiSelect from "./FilterableMultiSelect";
 import { MultiSelectSortingProps } from "./MultiSelectPropTypes";
+import { ListBoxSize } from "../ListBox/ListBoxPropTypes";
+import { ListBoxSelectionTranslationKey } from "../ListBox/ListBoxSelection";
 
 interface InheritedProps<T extends ListBoxBaseItemType = string> extends
     DownshiftTypedProps<T>,
-    InternationalProps<ListBoxMenuIconTranslationKey>,
+    InternationalProps<ListBoxMenuIconTranslationKey | ListBoxSelectionTranslationKey>,
     MultiSelectSortingProps<T>,
     RequiresIdProps,
     ThemeProps,
     ValidityProps
 {
     disabled?: ListBoxProps["disabled"],
+    size?: ListBoxSize,
     type?: ListBoxProps["type"],
 }
 
 export interface MultiSelectProps<T extends ListBoxBaseItemType = string> extends InheritedProps<T> {
+    direction?: "bottom" | "top",
     downshiftProps?: any, // TODO
-    initialSelectedItems?: T[],
-    items: T[],
+    initialSelectedItems?: readonly T[],
+    items: readonly T[],
     inline?: boolean,
     label?: React.ReactNode,
     locale?: string,
+    onChange: ({ selectedItems }: { selectedItems: T[] }) => void,
     open?: boolean,
     selectionFeedback?: "fixed" | "top" | "top-after-reopen",
-    useTitleInItem?: boolean,
-    placeholder: string,
     titleText?: string,
-    onChange: ({ selectedItems }: { selectedItems: T[] }) => void,
+    useTitleInItem?: boolean,
 }
 
 declare class MultiSelect<T extends ListBoxBaseItemType = string> extends React.Component<MultiSelectProps<T>> {
diff --git a/types/carbon-components-react/lib/components/Notification/Notification.d.ts b/types/carbon-components-react/lib/components/Notification/Notification.d.ts
index 02a9eeebc8..84bf7fb30f 100644
--- a/types/carbon-components-react/lib/components/Notification/Notification.d.ts
+++ b/types/carbon-components-react/lib/components/Notification/Notification.d.ts
@@ -35,7 +35,7 @@ interface NotificationActionButtonInheritedProps extends ButtonProps { }
 
 export interface NotificationActionButtonProps extends NotificationActionButtonInheritedProps { }
 
-export declare class NotificationActionButton extends React.Component<NotificationActionButtonProps> { }
+export declare const NotificationActionButton: React.FC<NotificationActionButtonProps>;
 
 // NotificationButton
 
@@ -53,7 +53,7 @@ export interface NotificationButtonProps extends NotificationButtonInheritedProp
     name?: string,
 }
 
-export declare class NotificationButton extends React.Component<NotificationButtonProps> { }
+export declare const NotificationButton: React.FC<NotificationButtonProps>;
 
 // NotificationTextDetail
 
@@ -67,7 +67,7 @@ interface NotificationTextDetailInheritedProps extends
 
 export interface NotificationTextDetailsProps extends NotificationTextDetailInheritedProps { }
 
-export declare class NotificationTextDetails extends React.Component<NotificationTextDetailsProps> { }
+export declare const NotificationTextDetails: React.FC<NotificationTextDetailsProps>;
 
 // ToastNotification
 
@@ -81,11 +81,12 @@ interface ToastNotificationInheritedProps extends
 { }
 
 export interface ToastNotificationProps extends ToastNotificationInheritedProps {
-    kind?: NotificationKind;
+    kind?: NotificationKind; // required but has default value
+    statusIconDescription?: string,
     timeout?: number;
 }
 
-export declare class ToastNotification extends React.Component<ToastNotificationProps> { }
+export declare const ToastNotification: React.FC<ToastNotificationProps>;
 
 // Inline Notification
 
@@ -100,6 +101,7 @@ interface InlineNotificationInheritedProps extends
 export interface InlineNotificationProps extends InlineNotificationInheritedProps {
     actions?: React.ReactNode;
     kind: NotificationKind;
+    statusIconDescription?: string,
 }
 
-export declare class InlineNotification extends React.Component<InlineNotificationProps> { }
+export declare const InlineNotification: React.FC<InlineNotificationProps>;
diff --git a/types/carbon-components-react/lib/components/Notification/a11yIconWarningSolid.d.ts b/types/carbon-components-react/lib/components/Notification/a11yIconWarningSolid.d.ts
index 4904974ec4..9086854cf7 100644
--- a/types/carbon-components-react/lib/components/Notification/a11yIconWarningSolid.d.ts
+++ b/types/carbon-components-react/lib/components/Notification/a11yIconWarningSolid.d.ts
@@ -1,10 +1,5 @@
 import * as React from "react";
 
-export interface a11yWarningIconProps {
-    notificationType: string,
-    prefix: string,
-}
-
-declare const a11yWarningIcon: React.FC<a11yWarningIconProps>;
+declare const a11yWarningIcon: (prefix: string, notificationType: string) => React.ReactNode;
 
 export default a11yWarningIcon;
diff --git a/types/carbon-components-react/lib/components/NumberInput/NumberInput.Skeleton.d.ts b/types/carbon-components-react/lib/components/NumberInput/NumberInput.Skeleton.d.ts
index 4ece30a106..186a345822 100644
--- a/types/carbon-components-react/lib/components/NumberInput/NumberInput.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/NumberInput/NumberInput.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactAttr["id"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface NumberInputSkeletonProps extends InheritedProps {
     hideLabel?: boolean,
diff --git a/types/carbon-components-react/lib/components/NumberInput/NumberInput.d.ts b/types/carbon-components-react/lib/components/NumberInput/NumberInput.d.ts
index e33e51008f..4f2b90c4e3 100644
--- a/types/carbon-components-react/lib/components/NumberInput/NumberInput.d.ts
+++ b/types/carbon-components-react/lib/components/NumberInput/NumberInput.d.ts
@@ -1,7 +1,16 @@
 import * as React from "react";
-import { EmbeddedIconProps, InternationalProps, ReactInputAttr, RequiresIdProps, ThemeProps, ValidityProps, RefForwardingProps } from "../../../typings/shared";
+import {
+    EmbeddedIconProps,
+    InternationalProps,
+    ReactInputAttr,
+    RequiresIdProps,
+    ThemeProps,
+    ValidityProps,
+    RefForwardingProps,
+    CarbonInputSize
+} from "../../../typings/shared";
 
-type ExcludedAttributes = "aria-label" | "id" | "ref";
+type ExcludedAttributes = "aria-label" | "id" | "ref" | "size";
 export type NumberInputTranslationKey = "decrement.number" | "increment.number";
 interface InheritedProps extends
     Omit<ReactInputAttr, ExcludedAttributes>,
@@ -17,10 +26,11 @@ interface InheritedProps extends
 
 export interface NumberInputProps extends InheritedProps {
     allowEmpty?: boolean,
-    helperText?: string,
+    helperText?: React.ReactNode,
     hideLabel?: boolean,
     label?: React.ReactNode,
     isMobile?: boolean,
+    size?: Extract<CarbonInputSize, "sm" | "xl">,
 }
 
 declare class NumberInput extends React.Component<NumberInputProps> { }
diff --git a/types/carbon-components-react/lib/components/OverflowMenu/OverflowMenu.d.ts b/types/carbon-components-react/lib/components/OverflowMenu/OverflowMenu.d.ts
index f730004ce6..a3ec507391 100644
--- a/types/carbon-components-react/lib/components/OverflowMenu/OverflowMenu.d.ts
+++ b/types/carbon-components-react/lib/components/OverflowMenu/OverflowMenu.d.ts
@@ -1,21 +1,32 @@
 import * as React from "react";
-import { Direction, EmbeddedIconProps, MenuOffsetData, ReactAttr, ReactDivAttr, RenderIconProps } from "../../../typings/shared";
+import {
+    Direction,
+    EmbeddedIconProps,
+    MenuOffsetData,
+    ReactAttr,
+    RenderIconProps,
+    ReactButtonAttr, ThemeProps, ForwardRefReturn
+} from "../../../typings/shared";
+
+type GetMenuOffsetFn = ((menuBody: HTMLElement, direction: Direction, trigger?: HTMLElement, flip?: boolean) => (MenuOffsetData | undefined));
+export declare const getMenuOffset: GetMenuOffsetFn;
 
 type ExcludedAttributes = "aria-expanded" | "aria-haspopup" | "aria-label" | "onBlur" | "onClick" | "onKeyDown" | "onKeyPress" | "role";
 interface InheritedProps extends
-    Omit<ReactDivAttr, ExcludedAttributes>,
+    Omit<ReactButtonAttr, ExcludedAttributes>,
     EmbeddedIconProps,
-    RenderIconProps
+    RenderIconProps,
+    ThemeProps
 {
     ariaLabel?: React.AriaAttributes["aria-label"],
     onClick?(e: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>): void,
 }
 
-export type MenuOffsetValue = MenuOffsetData | ((menuBody: HTMLElement, direction: Direction, trigger?: HTMLElement, flip?: boolean) => (MenuOffsetData | undefined));
+export type MenuOffsetValue = MenuOffsetData | GetMenuOffsetFn;
 
 export interface OverflowMenuProps extends InheritedProps {
     direction?: Extract<Direction, "bottom" | "top">,
-    iconClass?: ReactAttr["className"]
+    iconClass?: ReactAttr["className"],
     flipped?: boolean,
     menuOffset?: MenuOffsetValue,
     menuOffsetFlip?: MenuOffsetValue,
@@ -25,6 +36,6 @@ export interface OverflowMenuProps extends InheritedProps {
     open?: boolean,
 }
 
-declare const OverflowMenu: React.RefForwardingComponent<HTMLDivElement, OverflowMenuProps>;
+declare const OverflowMenu: ForwardRefReturn<HTMLButtonElement, OverflowMenuProps>;
 
 export default OverflowMenu;
diff --git a/types/carbon-components-react/lib/components/OverflowMenu/index.d.ts b/types/carbon-components-react/lib/components/OverflowMenu/index.d.ts
index 970adcecac..a2cb2e6864 100644
--- a/types/carbon-components-react/lib/components/OverflowMenu/index.d.ts
+++ b/types/carbon-components-react/lib/components/OverflowMenu/index.d.ts
@@ -1,2 +1,2 @@
-export * from "./OverflowMenu";
+export { MenuOffsetValue, OverflowMenuProps } from "./OverflowMenu";
 export { default } from "./OverflowMenu";
diff --git a/types/carbon-components-react/lib/components/Pagination/Pagination.Skeleton.d.ts b/types/carbon-components-react/lib/components/Pagination/Pagination.Skeleton.d.ts
index 69481ffee7..3fd80ea371 100644
--- a/types/carbon-components-react/lib/components/Pagination/Pagination.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Pagination/Pagination.Skeleton.d.ts
@@ -1,7 +1,10 @@
 import * as React from "react";
+import { ReactDivAttr } from "../../../typings/shared";
 
-export interface PaginationSkeletonProps { }
+interface InheritedProps extends ReactDivAttr { }
 
-declare class PaginationSkeleton extends React.Component<PaginationSkeletonProps> { }
+export interface PaginationSkeletonProps extends InheritedProps { }
+
+declare const PaginationSkeleton: React.FC<PaginationSkeletonProps>;
 
 export default PaginationSkeleton;
diff --git a/types/carbon-components-react/lib/components/Pagination/Pagination.d.ts b/types/carbon-components-react/lib/components/Pagination/Pagination.d.ts
index 4e3472af59..cae8c1d307 100644
--- a/types/carbon-components-react/lib/components/Pagination/Pagination.d.ts
+++ b/types/carbon-components-react/lib/components/Pagination/Pagination.d.ts
@@ -19,7 +19,8 @@ export interface PaginationProps extends InheritedProps {
     pageNumberText?: string,
     pageRangeText?(current: number, total: number): string,
     pageSize?: number,
-    pageSizes: number[],
+    pageSizes: readonly number[],
+    pageText?(page: number): string,
     pagesUnknown?: boolean,
     totalItems?: number,
 }
diff --git a/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.Skeleton.d.ts b/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.Skeleton.d.ts
index 750d44dd0f..c1ac845733 100644
--- a/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.Skeleton.d.ts
@@ -1,9 +1,9 @@
 import * as React from "react";
 
-interface InheritedProps { }
+interface InheritedProps extends React.HTMLAttributes<HTMLUListElement> { }
 
 export interface ProgressIndicatorSkeletonProps extends InheritedProps { }
 
-declare class ProgressIndicatorSkeleton extends React.Component<ProgressIndicatorSkeletonProps> { }
+declare const ProgressIndicatorSkeleton: React.FC<ProgressIndicatorSkeletonProps>;
 
 export default ProgressIndicatorSkeleton;
diff --git a/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.d.ts b/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.d.ts
index 8be9790f98..cc423ff4f0 100644
--- a/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.d.ts
+++ b/types/carbon-components-react/lib/components/ProgressIndicator/ProgressIndicator.d.ts
@@ -1,9 +1,15 @@
 import * as React from "react";
-import { ReactAttr, ReactInputAttr, ValidityProps } from "../../../typings/shared";
+import { ReactAttr, ReactInputAttr, ValidityProps, InternationalProps } from "../../../typings/shared";
 
 // ProgressStep
 
-interface ProgressStepInheritedProps {
+export type ProgressStepTranslationKey =
+    "carbon.progress-step.complete"
+    | "carbon.progress-step.incomplete"
+    | "carbon.progress-step.current"
+    | "carbon.progress-step.invalid";
+
+interface ProgressStepInheritedProps extends InternationalProps<ProgressStepTranslationKey> {
     className?: ReactAttr["className"],
     disabled?: ReactInputAttr["disabled"],
     invalid?: ValidityProps["invalid"],
@@ -16,7 +22,7 @@ export interface RenderLabelProps {
 export interface ProgressStepProps extends ProgressStepInheritedProps {
     complete?: boolean, // provided by parent
     current?: boolean,
-    description?: boolean,
+    description?: string,
     index?: number, // provided by parent
     label: NonNullable<React.ReactNode>,
     onClick?(e?: React.MouseEvent<HTMLDivElement>): void, // provided by parent
@@ -35,6 +41,7 @@ interface ProgressIndicatorInheritedProps extends Omit<ReactAttr<HTMLUListElemen
 export interface ProgressIndicatorProps extends ProgressIndicatorInheritedProps {
     currentIndex?: number,
     onChange?(index: number): void,
+    vertical?: boolean,
 }
 
 export declare class ProgressIndicator extends React.Component<ProgressIndicatorProps> { }
diff --git a/types/carbon-components-react/lib/components/RadioButton/RadioButton.Skeleton.d.ts b/types/carbon-components-react/lib/components/RadioButton/RadioButton.Skeleton.d.ts
index 065f5b44be..053b25220a 100644
--- a/types/carbon-components-react/lib/components/RadioButton/RadioButton.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/RadioButton/RadioButton.Skeleton.d.ts
@@ -1,12 +1,10 @@
 import * as React from "react";
-import { ReactLabelAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactLabelAttr["htmlFor"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface RadioButtonSkeletonProps extends InheritedProps { }
 
-declare class RadioButtonSkeleton extends React.Component<RadioButtonSkeletonProps> { }
+declare const RadioButtonSkeleton: React.FC<RadioButtonSkeletonProps>;
 
 export default RadioButtonSkeleton;
diff --git a/types/carbon-components-react/lib/components/RadioButton/RadioButton.d.ts b/types/carbon-components-react/lib/components/RadioButton/RadioButton.d.ts
index 1be46d36b7..9dafd56798 100644
--- a/types/carbon-components-react/lib/components/RadioButton/RadioButton.d.ts
+++ b/types/carbon-components-react/lib/components/RadioButton/RadioButton.d.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ReactInputAttr } from "../../../typings/shared";
+import { ReactInputAttr, ForwardRefReturn } from "../../../typings/shared";
 
 type ExcludedAttributes = "onChange" | "ref" | "type";
 interface InheritedProps extends Omit<ReactInputAttr, ExcludedAttributes> { }
@@ -9,12 +9,15 @@ export type RadioButtonValue = string | number;
 export interface RadioButtonProps extends InheritedProps {
     defaultChecked?: boolean,
     hideLabel?: boolean,
-    labelPosition?: string,
+    /**
+     * top/bottom are deprecated
+     */
+    labelPosition?: "bottom" | "left" | "right" | "top",
     labelText?: React.ReactNode, // required but has default value
     onChange?(value: RadioButtonProps["value"], name: RadioButtonProps["name"], event: React.ChangeEvent<HTMLInputElement>): void, // required but has default value
     value?: RadioButtonValue, // required but has default value
 }
 
-declare const RadioButton: React.RefForwardingComponent<HTMLInputElement, RadioButtonProps>;
+declare const RadioButton: ForwardRefReturn<HTMLInputElement, RadioButtonProps>;
 
 export default RadioButton;
diff --git a/types/carbon-components-react/lib/components/RadioButtonGroup/RadioButtonGroup.d.ts b/types/carbon-components-react/lib/components/RadioButtonGroup/RadioButtonGroup.d.ts
index 29b9ef11ea..b1b015808e 100644
--- a/types/carbon-components-react/lib/components/RadioButtonGroup/RadioButtonGroup.d.ts
+++ b/types/carbon-components-react/lib/components/RadioButtonGroup/RadioButtonGroup.d.ts
@@ -11,7 +11,9 @@ interface InheritedProps {
 
 export interface RadioButtonGroupProps extends InheritedProps {
     defaultSelected?: RadioButtonValue,
+    labelPosition?: "left" | "right",
     onChange?(newSelection: RadioButtonValue, name: RadioButtonGroupProps["name"], event: React.ChangeEvent<HTMLInputElement>): void, // required but has default value
+    orientation?: "horizontal" | "vertical",
     valueSelected?: RadioButtonValue,
 }
 
diff --git a/types/carbon-components-react/lib/components/RadioTile/RadioTile.d.ts b/types/carbon-components-react/lib/components/RadioTile/RadioTile.d.ts
index 7283765e35..5e2ec4bd94 100644
--- a/types/carbon-components-react/lib/components/RadioTile/RadioTile.d.ts
+++ b/types/carbon-components-react/lib/components/RadioTile/RadioTile.d.ts
@@ -1,12 +1,14 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactInputAttr } from "../../../typings/shared";
+import { EmbeddedIconProps, ReactInputAttr, ThemeProps } from "../../../typings/shared";
 import { RadioButtonValue } from "../RadioButton";
 
 type ExcludedAttributes = "onChange" | "type" | "value";
-interface InheritedProps extends
-    Omit<ReactInputAttr, ExcludedAttributes>,
-    EmbeddedIconProps
-{ }
+interface InheritedProps extends Omit<ReactInputAttr, ExcludedAttributes>, ThemeProps {
+    /**
+     * @deprecated
+     */
+    iconDescription?: EmbeddedIconProps["iconDescription"],
+}
 
 export type RadioTileChangeEvent = React.ChangeEvent<HTMLInputElement> | React.KeyboardEvent<HTMLLabelElement>;
 
@@ -16,6 +18,6 @@ export interface RadioTileProps extends InheritedProps {
     value: RadioButtonValue,
 }
 
-declare class RadioTile extends React.Component<RadioTileProps> { }
+declare const RadioTile: React.FC<RadioTileProps>;
 
 export default RadioTile;
diff --git a/types/carbon-components-react/lib/components/Search/Search.Skeleton.d.ts b/types/carbon-components-react/lib/components/Search/Search.Skeleton.d.ts
index 1fdd327fea..c06dc7aebb 100644
--- a/types/carbon-components-react/lib/components/Search/Search.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Search/Search.Skeleton.d.ts
@@ -1,12 +1,10 @@
 import * as React from "react";
-import { ReactLabelAttr, SizingProps } from "../../../typings/shared";
+import { SizingProps, ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps extends SizingProps {
-    id?: ReactLabelAttr["htmlFor"],
-}
+interface InheritedProps extends ReactDivAttr, SizingProps { }
 
 export interface SearchSkeletonProps extends InheritedProps { }
 
-declare class SearchSkeleton extends React.Component<SearchSkeletonProps> { }
+declare const SearchSkeleton: React.FC<SearchSkeletonProps>;
 
 export default SearchSkeleton;
diff --git a/types/carbon-components-react/lib/components/Search/Search.d.ts b/types/carbon-components-react/lib/components/Search/Search.d.ts
index 55f22d8a1b..3c73fa6c30 100644
--- a/types/carbon-components-react/lib/components/Search/Search.d.ts
+++ b/types/carbon-components-react/lib/components/Search/Search.d.ts
@@ -1,17 +1,20 @@
 import * as React from "react";
-import { ReactInputAttr, SizingProps } from "../../../typings/shared";
+import { ReactInputAttr, CarbonInputSize, SizingProps } from "../../../typings/shared";
 
-type ExcludedAttributes = "defaultValue" | "placeholder" | "ref" | "value";
-interface InheritedProps extends
-    Omit<ReactInputAttr, ExcludedAttributes>,
-    SizingProps
-{ }
+type ExcludedAttributes = "defaultValue" | "placeholder" | "ref" | "size" | "value";
+interface InheritedProps extends Omit<ReactInputAttr, ExcludedAttributes> {
+    /**
+     * @deprecated
+     */
+    small?: SizingProps["small"],
+}
 
 export interface SearchProps extends InheritedProps {
     closeButtonLabelText?: string,
     defaultValue?: string | number,
     labelText: NonNullable<React.ReactNode>,
     placeHolderText?: string,
+    size?: CarbonInputSize,
     value?: string | number,
 }
 
diff --git a/types/carbon-components-react/lib/components/SearchLayoutButton/SearchLayoutButton.d.ts b/types/carbon-components-react/lib/components/SearchLayoutButton/SearchLayoutButton.d.ts
index 9c882ed949..813ab479a4 100644
--- a/types/carbon-components-react/lib/components/SearchLayoutButton/SearchLayoutButton.d.ts
+++ b/types/carbon-components-react/lib/components/SearchLayoutButton/SearchLayoutButton.d.ts
@@ -1,10 +1,8 @@
 import * as React from "react";
 
-interface InheritedProps { }
-
 export type SearchLayoutButtonFormat = "grid" | "list";
 
-export interface SearchLayoutButtonProps extends InheritedProps {
+export interface SearchLayoutButtonProps {
     format?: SearchLayoutButtonFormat,
     iconDescriptionGrid?: string,
     iconDescriptionList?: string,
diff --git a/types/carbon-components-react/lib/components/Select/Select.Skeleton.d.ts b/types/carbon-components-react/lib/components/Select/Select.Skeleton.d.ts
index 2d6511c572..2c583f5787 100644
--- a/types/carbon-components-react/lib/components/Select/Select.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Select/Select.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactLabelAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactLabelAttr["htmlFor"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface SelectSkeletonProps extends InheritedProps {
     hideLabel?: boolean,
diff --git a/types/carbon-components-react/lib/components/Select/Select.d.ts b/types/carbon-components-react/lib/components/Select/Select.d.ts
index c8f8470724..fca9c91c66 100644
--- a/types/carbon-components-react/lib/components/Select/Select.d.ts
+++ b/types/carbon-components-react/lib/components/Select/Select.d.ts
@@ -1,14 +1,25 @@
 import * as React from "react";
-import { EmbeddedIconProps, RequiresIdProps, ThemeProps, ValidityProps } from "../../../typings/shared";
-
-type ExcludedAttributes = "aria-invalid" | "id" | "ref";
-interface InheritedProps extends
-    Omit<React.SelectHTMLAttributes<HTMLSelectElement>, ExcludedAttributes>,
+import {
     EmbeddedIconProps,
     RequiresIdProps,
     ThemeProps,
+    ValidityProps,
+    ForwardRefReturn,
+    CarbonInputSize
+} from "../../../typings/shared";
+
+type ExcludedAttributes = "aria-invalid" | "id" | "ref" | "size";
+interface InheritedProps extends
+    Omit<React.SelectHTMLAttributes<HTMLSelectElement>, ExcludedAttributes>,
+    RequiresIdProps,
+    ThemeProps,
     ValidityProps
-{ }
+{
+    /**
+     * @deprecated
+     */
+    iconDescription?: EmbeddedIconProps["iconDescription"],
+}
 
 export interface SelectProps extends InheritedProps {
     defaultValue?: any,
@@ -17,8 +28,9 @@ export interface SelectProps extends InheritedProps {
     inline?: boolean,
     labelText?: React.ReactNode,
     noLabel?: boolean,
+    size?: Extract<CarbonInputSize, "sm" | "xl">,
 }
 
-declare const Select: React.RefForwardingComponent<HTMLSelectElement, SelectProps>;
+declare const Select: ForwardRefReturn<HTMLSelectElement, SelectProps>;
 
 export default Select;
diff --git a/types/carbon-components-react/lib/components/SelectItem/SelectItem.d.ts b/types/carbon-components-react/lib/components/SelectItem/SelectItem.d.ts
index ec2fe54d2c..25d674620d 100644
--- a/types/carbon-components-react/lib/components/SelectItem/SelectItem.d.ts
+++ b/types/carbon-components-react/lib/components/SelectItem/SelectItem.d.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 
 interface InheritedProps extends Omit<React.OptionHTMLAttributes<HTMLOptionElement>, "value"> {
-    value: any,
+    value: unknown,
 }
 
 export interface SelectItemProps extends InheritedProps {
diff --git a/types/carbon-components-react/lib/components/Slider/Slider.Skeleton.d.ts b/types/carbon-components-react/lib/components/Slider/Slider.Skeleton.d.ts
index 053ab42259..1ac7b1f383 100644
--- a/types/carbon-components-react/lib/components/Slider/Slider.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Slider/Slider.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactAttr["id"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface SliderSkeletonProps extends InheritedProps {
     hideLabel?: boolean,
diff --git a/types/carbon-components-react/lib/components/Slider/Slider.d.ts b/types/carbon-components-react/lib/components/Slider/Slider.d.ts
index 49b0be8f91..a302290aa5 100644
--- a/types/carbon-components-react/lib/components/Slider/Slider.d.ts
+++ b/types/carbon-components-react/lib/components/Slider/Slider.d.ts
@@ -21,7 +21,7 @@ export interface SliderProps extends InheritedProps {
     minLabel?: string,
     onRelease?(data: { value: SliderProps["value"] }): void,
     step?: number,
-    stepMuliplier?: number, // typo exists in source
+    stepMultiplier?: number,
     value: number,
     onChange: (value: SliderOnChangeArg) => void
 }
diff --git a/types/carbon-components-react/lib/components/StructuredList/StructuredList.Skeleton.d.ts b/types/carbon-components-react/lib/components/StructuredList/StructuredList.Skeleton.d.ts
index f30d591cab..4a26411ac2 100644
--- a/types/carbon-components-react/lib/components/StructuredList/StructuredList.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/StructuredList/StructuredList.Skeleton.d.ts
@@ -1,6 +1,7 @@
 import * as React from "react";
+import { ReactAttr } from "../../../typings/shared";
 
-interface InheritedProps { }
+interface InheritedProps extends ReactAttr { }
 
 export interface StructuredListSkeletonProps extends InheritedProps {
     border?: boolean,
diff --git a/types/carbon-components-react/lib/components/StructuredList/StructuredList.d.ts b/types/carbon-components-react/lib/components/StructuredList/StructuredList.d.ts
index ece914348d..09ed9235bd 100644
--- a/types/carbon-components-react/lib/components/StructuredList/StructuredList.d.ts
+++ b/types/carbon-components-react/lib/components/StructuredList/StructuredList.d.ts
@@ -8,6 +8,9 @@ interface StructureListWrapperInheritedProps extends Omit<ReactAttr, "aria-label
 }
 
 export interface StructuredListProps extends StructureListWrapperInheritedProps {
+    /**
+     * @deprecated
+     */
     border?: boolean,
     selection?: boolean,
 }
diff --git a/types/carbon-components-react/lib/components/Switch/Switch.d.ts b/types/carbon-components-react/lib/components/Switch/Switch.d.ts
index 4f9a46772d..94291a01f1 100644
--- a/types/carbon-components-react/lib/components/Switch/Switch.d.ts
+++ b/types/carbon-components-react/lib/components/Switch/Switch.d.ts
@@ -1,3 +1,22 @@
-import { Switch } from "../ContentSwitcher";
+import * as React from "react";
+import { ReactButtonAttr, ForwardRefReturn } from "../../../typings/shared";
+
+interface InheritedProps extends Omit<ReactButtonAttr, "onClick" | "onKeyDown" | "name"> { }
+
+export interface SwitchProps extends InheritedProps {
+    index?: number,
+    name?: string | number;
+    onClick(data: { index: SwitchProps["index"], name: SwitchProps["name"], text: SwitchProps["text"] }): void,
+    onKeyDown(data: {
+        index: SwitchProps["index"],
+        name: SwitchProps["name"],
+        text: SwitchProps["text"],
+        key: React.KeyboardEvent["key"] | React.KeyboardEvent["which"]
+    }): void,
+    selected?: boolean,
+    text: string,
+}
+
+declare const Switch: ForwardRefReturn<HTMLButtonElement, SwitchProps>;
 
 export default Switch;
diff --git a/types/carbon-components-react/lib/components/Tab/Tab.d.ts b/types/carbon-components-react/lib/components/Tab/Tab.d.ts
index af28447296..a7cc7f0766 100644
--- a/types/carbon-components-react/lib/components/Tab/Tab.d.ts
+++ b/types/carbon-components-react/lib/components/Tab/Tab.d.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ReactAnchorAttr, ReactAttr, ReactLIAttr } from "../../../typings/shared";
 
-type ExcludedAttributes = "role" | "tabIndex";
+type ExcludedAttributes = "aria-controls" | "aria-selected" | "aria-disabled" | "role" | "tabIndex";
 interface InheritedProps extends Omit<ReactLIAttr, ExcludedAttributes> {
     href: NonNullable<ReactAnchorAttr["href"]>,
     tabIndex: NonNullable<ReactAttr["tabIndex"]>,
@@ -16,15 +16,14 @@ export interface TabCustomAnchorProvidedProps {
 }
 
 export interface TabProps extends InheritedProps {
-    handleTabAnchorFocus(index: TabProps["index"]): void,
-    handleTabClick(index: TabProps["index"], label: TabProps["label"], event: React.MouseEvent<HTMLLIElement>): void,
-    handleTabKeyDown(index: TabProps["index"], label: TabProps["label"], event: React.KeyboardEvent<HTMLLIElement>): void,
+    disabled?: boolean;
+    handleTabClick(index: TabProps["index"], event: React.MouseEvent<HTMLLIElement>): void,
+    handleTabKeyDown(index: TabProps["index"], event: React.KeyboardEvent<HTMLLIElement>): void,
     index?: number,
     label?: React.ReactNode,
     renderAnchor?: React.FC<TabCustomAnchorProvidedProps>,
     role?: string, // marked as required, but render code overwrites it currently
-    selected?: boolean, // required but has default value
-    disabled?: boolean;
+    selected: boolean,
 }
 
 declare class Tab extends React.Component<TabProps> { }
diff --git a/types/carbon-components-react/lib/components/Tabs/Tabs.Skeleton.d.ts b/types/carbon-components-react/lib/components/Tabs/Tabs.Skeleton.d.ts
index 9546c32c05..ea0c6d6c69 100644
--- a/types/carbon-components-react/lib/components/Tabs/Tabs.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Tabs/Tabs.Skeleton.d.ts
@@ -1,7 +1,10 @@
 import * as React from "react";
+import { ReactDivAttr } from "../../../typings/shared";
 
-export interface TabsSkeletonProps { }
+interface InheritedProps extends ReactDivAttr { }
 
-declare class TabsSkeleton extends React.Component<TabsSkeletonProps> { }
+export interface TabsSkeletonProps extends InheritedProps { }
+
+declare const TabsSkeleton: React.FC<TabsSkeletonProps>;
 
 export default TabsSkeleton;
diff --git a/types/carbon-components-react/lib/components/Tabs/Tabs.d.ts b/types/carbon-components-react/lib/components/Tabs/Tabs.d.ts
index bead764ea7..23ca38f91b 100644
--- a/types/carbon-components-react/lib/components/Tabs/Tabs.d.ts
+++ b/types/carbon-components-react/lib/components/Tabs/Tabs.d.ts
@@ -8,8 +8,10 @@ interface InheritedProps extends ReactDivAttr, EmbeddedIconProps {
 export interface TabsProps extends InheritedProps {
     onSelectionChange?(index: number): void,
     selected?: number,
+    selectionMode?: "automatic" | "manual",
     tabContentClassName?: ReactAttr["className"],
     triggerHref: string,
+    type?: "container" | "default";
 }
 
 declare class Tabs extends React.Component<TabsProps> { }
diff --git a/types/carbon-components-react/lib/components/Tag/Tag.Skeleton.d.ts b/types/carbon-components-react/lib/components/Tag/Tag.Skeleton.d.ts
index a12ae57e11..9c86b81a10 100644
--- a/types/carbon-components-react/lib/components/Tag/Tag.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Tag/Tag.Skeleton.d.ts
@@ -1,7 +1,10 @@
 import * as React from "react";
+import { ReactAttr } from "../../../typings/shared";
 
-export interface TagSkeletonProps { }
+interface InheritedProps extends ReactAttr<HTMLSpanElement> { }
 
-declare class TagSkeleton extends React.Component<TagSkeletonProps> { }
+export interface TagSkeletonProps extends InheritedProps { }
+
+declare const TagSkeleton: React.FC<TagSkeletonProps>;
 
 export default TagSkeleton;
diff --git a/types/carbon-components-react/lib/components/Tag/Tag.d.ts b/types/carbon-components-react/lib/components/Tag/Tag.d.ts
index 4f8dfc2835..a7734cd301 100644
--- a/types/carbon-components-react/lib/components/Tag/Tag.d.ts
+++ b/types/carbon-components-react/lib/components/Tag/Tag.d.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ReactAttr } from "../../../typings/shared";
 
-interface InheritedProps extends ReactAttr<HTMLSpanElement> { }
+interface InheritedProps extends ReactAttr { }
 
 export type TagTypeName =
     "red"
@@ -17,10 +17,19 @@ export type TagTypeName =
 
 export declare const types: TagTypeName[];
 
-export interface TagProps extends InheritedProps {
-    type: TagTypeName,
+interface SharedProps {
+    type?: TagTypeName,
 }
 
-declare const Tag: React.FC<TagProps>;
+export interface FilterTagProps extends InheritedProps, SharedProps {
+    filter: true,
+    onClose(event: React.MouseEvent<HTMLButtonElement>): void,
+}
+
+export interface ChipTagProps extends InheritedProps, SharedProps {
+    filter?: false,
+}
+
+declare const Tag: React.FC<ChipTagProps | FilterTagProps>;
 
 export default Tag;
diff --git a/types/carbon-components-react/lib/components/TextArea/TextArea.Skeleton.d.ts b/types/carbon-components-react/lib/components/TextArea/TextArea.Skeleton.d.ts
index b4f4561183..63deb71700 100644
--- a/types/carbon-components-react/lib/components/TextArea/TextArea.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/TextArea/TextArea.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactLabelAttr } from "../../../typings/shared";
+import { ReactLabelAttr, ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactLabelAttr["htmlFor"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface TextAreaSkeletonProps extends InheritedProps {
     hideLabel?: boolean,
diff --git a/types/carbon-components-react/lib/components/TextArea/TextArea.d.ts b/types/carbon-components-react/lib/components/TextArea/TextArea.d.ts
index 59b99875ac..48f56a17e8 100644
--- a/types/carbon-components-react/lib/components/TextArea/TextArea.d.ts
+++ b/types/carbon-components-react/lib/components/TextArea/TextArea.d.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { RefForwardingProps, ThemeProps, ValidityProps } from "../../../typings/shared";
+import { RefForwardingProps, ThemeProps, ValidityProps, ForwardRefReturn } from "../../../typings/shared";
 
 type ExcludedAttributes = "aria-invalid" | "aria-describedby" | "defaultValue" | "value";
 interface InheritedProps extends
@@ -17,6 +17,6 @@ export interface TextAreaProps extends InheritedProps {
     value?: string | number,
 }
 
-declare const TextArea: React.RefForwardingComponent<HTMLTextAreaElement, TextAreaProps>;
+declare const TextArea: ForwardRefReturn<HTMLTextAreaElement, TextAreaProps>;
 
 export default TextArea;
diff --git a/types/carbon-components-react/lib/components/TextInput/ControlledPasswordInput.d.ts b/types/carbon-components-react/lib/components/TextInput/ControlledPasswordInput.d.ts
index fef752b62a..191cfd0c30 100644
--- a/types/carbon-components-react/lib/components/TextInput/ControlledPasswordInput.d.ts
+++ b/types/carbon-components-react/lib/components/TextInput/ControlledPasswordInput.d.ts
@@ -1,11 +1,12 @@
-import * as React from "react";
-import { EmbeddedTooltipProps, RefForwardingProps } from "../../../typings/shared";
-import { TextInputInheritedProps } from "./props";
+import { EmbeddedTooltipProps, ForwardRefReturn } from "../../../typings/shared";
+import { TextInputSharedProps } from "./props";
 
-interface InheritedProps extends TextInputInheritedProps, EmbeddedTooltipProps { }
+interface InheritedProps extends TextInputSharedProps, EmbeddedTooltipProps { }
 
-export interface ControlledPasswordInputProps extends InheritedProps { }
+export interface ControlledPasswordInputProps extends InheritedProps {
+    size?: string,
+}
 
-declare const ControlledPasswordInput: React.RefForwardingComponent<HTMLInputElement, ControlledPasswordInputProps>;
+declare const ControlledPasswordInput: ForwardRefReturn<HTMLInputElement, ControlledPasswordInputProps>;
 
 export default ControlledPasswordInput;
diff --git a/types/carbon-components-react/lib/components/TextInput/PasswordInput.d.ts b/types/carbon-components-react/lib/components/TextInput/PasswordInput.d.ts
index 0c8445b1e6..2f13f628e6 100644
--- a/types/carbon-components-react/lib/components/TextInput/PasswordInput.d.ts
+++ b/types/carbon-components-react/lib/components/TextInput/PasswordInput.d.ts
@@ -1,11 +1,15 @@
 import * as React from "react";
 import { EmbeddedTooltipProps } from "../../../typings/shared";
-import { TextInputInheritedProps } from "./props";
+import { TextInputSharedProps } from "./props";
 
-interface InheritedProps extends TextInputInheritedProps, EmbeddedTooltipProps { }
+interface InheritedProps extends TextInputSharedProps, EmbeddedTooltipProps { }
 
-export interface PasswordInputProps extends InheritedProps { }
+export interface PasswordInputProps extends InheritedProps {
+    hidePasswordLabel?: string,
+    showPasswordLabel?: string,
+    size?: string,
+}
 
-declare const PasswordInput: React.RefForwardingComponent<HTMLInputElement, PasswordInputProps>;
+declare const PasswordInput: React.FC<PasswordInputProps>;
 
 export default PasswordInput;
diff --git a/types/carbon-components-react/lib/components/TextInput/TextInput.Skeleton.d.ts b/types/carbon-components-react/lib/components/TextInput/TextInput.Skeleton.d.ts
index 876d81154a..8bd54b5e7d 100644
--- a/types/carbon-components-react/lib/components/TextInput/TextInput.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/TextInput/TextInput.Skeleton.d.ts
@@ -1,9 +1,7 @@
 import * as React from "react";
-import { ReactLabelAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactLabelAttr["htmlFor"],
-}
+interface InheritedProps extends ReactDivAttr { }
 
 export interface TextInputSkeletonProps extends InheritedProps {
     hideLabel?: boolean,
diff --git a/types/carbon-components-react/lib/components/TextInput/TextInput.d.ts b/types/carbon-components-react/lib/components/TextInput/TextInput.d.ts
index c2cbc840c1..39a476e233 100644
--- a/types/carbon-components-react/lib/components/TextInput/TextInput.d.ts
+++ b/types/carbon-components-react/lib/components/TextInput/TextInput.d.ts
@@ -1,11 +1,13 @@
-import * as React from "react";
 import ControlledPasswordInput from "./ControlledPasswordInput";
 import PasswordInput from "./PasswordInput";
-import { TextInputInheritedProps } from "./props";
+import { TextInputSharedProps } from "./props";
+import { ForwardRefReturn, CarbonInputSize } from "../../../typings/shared";
 
-export interface TextInputProps extends TextInputInheritedProps { }
+export interface TextInputProps extends TextInputSharedProps {
+    size?: Extract<CarbonInputSize, "sm" | "xl">,
+}
 
-interface TextInputFC extends React.RefForwardingComponent<HTMLInputElement, TextInputProps> {
+interface TextInputFC extends ForwardRefReturn<HTMLInputElement, TextInputProps> {
     readonly ControlledPasswordInput: typeof ControlledPasswordInput,
     readonly PasswordInput: typeof PasswordInput,
 }
diff --git a/types/carbon-components-react/lib/components/TextInput/index.d.ts b/types/carbon-components-react/lib/components/TextInput/index.d.ts
index ce37378b78..39d6fc392c 100644
--- a/types/carbon-components-react/lib/components/TextInput/index.d.ts
+++ b/types/carbon-components-react/lib/components/TextInput/index.d.ts
@@ -1,14 +1,8 @@
-import ControlledPasswordInput from "./ControlledPasswordInput";
-import PasswordInput from "./PasswordInput";
-
 export * from "./TextInput";
 export * from "./TextInput.Skeleton";
 export * from "./ControlledPasswordInput";
 export * from "./PasswordInput";
 
-export {
-    ControlledPasswordInput,
-    PasswordInput
-};
-
+export { default as ControlledPasswordInput } from "./ControlledPasswordInput";
+export { default as PasswordInput } from "./PasswordInput";
 export { default } from "./TextInput";
diff --git a/types/carbon-components-react/lib/components/TextInput/props.d.ts b/types/carbon-components-react/lib/components/TextInput/props.d.ts
index 3f9e25d935..bc6ff1dbf2 100644
--- a/types/carbon-components-react/lib/components/TextInput/props.d.ts
+++ b/types/carbon-components-react/lib/components/TextInput/props.d.ts
@@ -1,15 +1,24 @@
 import * as React from "react";
-import { ReactInputAttr, RequiresIdProps, ThemeProps, ValidityProps, RefForwardingProps } from "../../../typings/shared";
+import {
+    ReactInputAttr,
+    RequiresIdProps,
+    ThemeProps,
+    ValidityProps,
+    RefForwardingProps,
+    CarbonInputSize
+} from "../../../typings/shared";
 
-type ExcludedAttributes = "aria-describedby" | "aria-invalid" | "defaultValue" | "id" | "value";
-export interface TextInputInheritedProps extends
+type ExcludedAttributes = "defaultValue" | "id" | "size" | "value";
+interface TextInputInheritedProps extends
     Omit<ReactInputAttr, ExcludedAttributes>,
     RequiresIdProps,
     ThemeProps,
     ValidityProps,
     RefForwardingProps<HTMLInputElement>
-{
-    defaultValue?: TextInputInheritedProps["value"],
+{ }
+
+export interface TextInputSharedProps extends TextInputInheritedProps {
+    defaultValue?: TextInputSharedProps["value"],
     helperText?: React.ReactNode,
     hideLabel?: boolean,
     labelText: NonNullable<React.ReactNode>,
diff --git a/types/carbon-components-react/lib/components/Tile/Tile.d.ts b/types/carbon-components-react/lib/components/Tile/Tile.d.ts
index 5997c8b472..a63958a8f9 100644
--- a/types/carbon-components-react/lib/components/Tile/Tile.d.ts
+++ b/types/carbon-components-react/lib/components/Tile/Tile.d.ts
@@ -1,9 +1,15 @@
 import * as React from "react";
-import { EmbeddedIconProps, ReactAnchorAttr, ReactDivAttr, ReactInputAttr, ReactLabelAttr } from "../../../typings/shared";
+import {
+    EmbeddedIconProps,
+    ReactAnchorAttr,
+    ReactDivAttr,
+    ReactLabelAttr,
+    ThemeProps, ReactButtonAttr
+} from "../../../typings/shared";
 
 // Tile
 
-interface TileInheritedProps extends ReactDivAttr { }
+interface TileInheritedProps extends ReactDivAttr, ThemeProps { }
 
 export interface TileProps extends TileInheritedProps { }
 
@@ -22,14 +28,19 @@ export declare class ClickableTile extends React.Component<ClickableTileProps> {
 type SelectedTileExcludedAttributes = "onChange" | "onClick" | "onKeyDown";
 interface SelectableTileInheritedProps extends
     Omit<ReactLabelAttr, SelectedTileExcludedAttributes>,
-    EmbeddedIconProps
+    ThemeProps
 {
-    onChange?: ReactInputAttr["onChange"],
+    /**
+     * @deprecated
+     */
+    iconDescription?: EmbeddedIconProps["iconDescription"],
 }
 
 export interface SelectableTileProps extends SelectableTileInheritedProps {
     handleClick?(e: React.MouseEvent<HTMLLabelElement>): void,
     handleKeyDown?(e: React.KeyboardEvent<HTMLLabelElement>): void,
+    onChange(e: React.KeyboardEvent<HTMLLabelElement> | React.MouseEvent<HTMLLabelElement>): void,
+    selected?: boolean,
     value: string | number,
 }
 
@@ -37,13 +48,16 @@ export declare class SelectableTile extends React.Component<SelectableTileProps>
 
 // ExpandableTile
 
-interface ExpandableTileInheritedProps extends Omit<ReactDivAttr, "onClick"> { }
+interface ExpandableTileInheritedProps extends Omit<ReactButtonAttr, "onClick">, ThemeProps { }
 
 export interface ExpandableTileProps extends ExpandableTileInheritedProps {
     expanded?: boolean,
-    handleClick?(e: React.MouseEvent<HTMLDivElement>): void,
+    handleClick?(e: React.MouseEvent<HTMLButtonElement>): void,
+    onBeforeClick?(e: React.MouseEvent<HTMLButtonElement>): void,
     tileCollapsedIconText?: string,
     tileExpandedIconText?: string,
+    tileMaxHeight?: number,
+    tilePadding?: number,
 }
 
 export declare class ExpandableTile extends React.Component<ExpandableTileProps> { }
diff --git a/types/carbon-components-react/lib/components/Toggle/Toggle.Skeleton.d.ts b/types/carbon-components-react/lib/components/Toggle/Toggle.Skeleton.d.ts
index 5895541588..82b46cbf24 100644
--- a/types/carbon-components-react/lib/components/Toggle/Toggle.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/Toggle/Toggle.Skeleton.d.ts
@@ -1,12 +1,12 @@
 import * as React from "react";
-import { ReactAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactAttr["id"],
+interface InheritedProps extends ReactDivAttr { }
+
+export interface ToggleSkeletonProps extends InheritedProps {
+    labelText?: string,
 }
 
-export interface ToggleSkeletonProps extends InheritedProps { }
-
 declare class ToggleSkeleton extends React.Component<ToggleSkeletonProps> { }
 
 export default ToggleSkeleton;
diff --git a/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.Skeleton.d.ts b/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.Skeleton.d.ts
index b93920a5c7..e3eadf4877 100644
--- a/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.Skeleton.d.ts
+++ b/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.Skeleton.d.ts
@@ -1,12 +1,12 @@
 import * as React from "react";
-import { ReactAttr } from "../../../typings/shared";
+import { ReactDivAttr } from "../../../typings/shared";
 
-interface InheritedProps {
-    id?: ReactAttr["id"],
+interface InheritedProps extends ReactDivAttr { }
+
+export interface ToggleSmallSkeletonProps extends InheritedProps {
+    labelText?: string,
 }
 
-export interface ToggleSmallSkeletonProps extends InheritedProps { }
-
 declare class ToggleSmallSkeleton extends React.Component<ToggleSmallSkeletonProps> { }
 
 export default ToggleSmallSkeleton;
diff --git a/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.d.ts b/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.d.ts
index cfb2704eca..4bfb884613 100644
--- a/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.d.ts
+++ b/types/carbon-components-react/lib/components/ToggleSmall/ToggleSmall.d.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ReactInputAttr, RequiresIdProps } from "../../../typings/shared";
 
-type ExcludedAttributes = "aria-label" | "id" | "type";
+type ExcludedAttributes = "aria-label" | "id" | "onChange" | "onKeyUp" | "type";
 interface InheritedProps extends
     Omit<ReactInputAttr, ExcludedAttributes>,
     RequiresIdProps
@@ -14,6 +14,7 @@ export interface ToggleSmallProps extends InheritedProps {
     labelA?: string, // required but has default value
     labelB?: string, // required but has default value
     labelText?: string,
+    onChange(e: React.KeyboardEvent<HTMLInputElement> | React.ChangeEvent<HTMLInputElement>): void, // this looks to be required because the built-in onKeyUp handler calls it unguarded
     onToggle?(checked: boolean, id: ToggleSmallProps["id"], event: React.ChangeEvent<HTMLInputElement> | React.KeyboardEvent<HTMLInputElement>): void,
     toggled?: boolean,
 }
diff --git a/types/carbon-components-react/lib/components/Toolbar/Toolbar.d.ts b/types/carbon-components-react/lib/components/Toolbar/Toolbar.d.ts
index 1c65608654..ff10d205ad 100644
--- a/types/carbon-components-react/lib/components/Toolbar/Toolbar.d.ts
+++ b/types/carbon-components-react/lib/components/Toolbar/Toolbar.d.ts
@@ -1,12 +1,18 @@
 import * as React from "react";
-import { ReactAttr, ReactDivAttr } from "../../../typings/shared";
+import { ReactAttr, ReactDivAttr, ForwardRefReturn } from "../../../typings/shared";
 
 // Toolbar
 
 interface ToolbarInheritedProps extends ReactDivAttr { }
 
+/**
+ * @deprecated
+ */
 export interface ToolbarProps extends ToolbarInheritedProps { }
 
+/**
+ * @deprecated
+ */
 declare const Toolbar: React.FC<ToolbarProps>;
 
 // ToolbarItem
@@ -15,20 +21,32 @@ interface ToolbarItemInheritedProps {
     children?: ReactAttr["children"],
 }
 
+/**
+ * @deprecated
+ */
 export interface ToolbarItemProps extends ToolbarItemInheritedProps {
     placeholderText?: string,
     type?: string,
 }
 
+/**
+ * @deprecated
+ */
 export declare const ToolbarItem: React.FC<ToolbarItemProps>;
 
 // ToolbarTitle
 
+/**
+ * @deprecated
+ */
 export interface ToolbarTitleProps {
     title?: string,
 }
 
-export declare const ToolbarTitle: React.RefForwardingComponent<HTMLLIElement, ToolbarTitleProps>;
+/**
+ * @deprecated
+ */
+export declare const ToolbarTitle: ForwardRefReturn<HTMLLIElement, ToolbarTitleProps>;
 
 // ToolbarOption
 
@@ -36,12 +54,21 @@ interface ToolbarOptionInheritedProps {
     children?: ReactAttr["children"],
 }
 
+/**
+ * @deprecated
+ */
 export interface ToolbarOptionProps extends ToolbarOptionInheritedProps { }
 
-export declare const ToolbarOption: React.RefForwardingComponent<HTMLLIElement, ToolbarOptionProps>;
+/**
+ * @deprecated
+ */
+export declare const ToolbarOption: ForwardRefReturn<HTMLLIElement, ToolbarOptionProps>;
 
 // ToolbarDivider
 
-export declare const ToolbarDivider: React.RefForwardingComponent<HTMLHRElement>;
+/**
+ * @deprecated
+ */
+export declare const ToolbarDivider: ForwardRefReturn<HTMLHRElement>;
 
 export default Toolbar;
diff --git a/types/carbon-components-react/lib/components/ToolbarSearch/ToolbarSearch.d.ts b/types/carbon-components-react/lib/components/ToolbarSearch/ToolbarSearch.d.ts
index 8834ca6d75..21e8380282 100644
--- a/types/carbon-components-react/lib/components/ToolbarSearch/ToolbarSearch.d.ts
+++ b/types/carbon-components-react/lib/components/ToolbarSearch/ToolbarSearch.d.ts
@@ -6,12 +6,18 @@ interface InheritedProps extends
     SizingProps
 { }
 
+/**
+ * @deprecated
+ */
 export interface ToolbarSearchProps extends InheritedProps {
     labelId?: ReactAttr['id'];
     labelText?: React.ReactNode;
     placeHolderText?: string;
 }
 
+/**
+ * @deprecated
+ */
 declare class ToolbarSearch extends React.Component<ToolbarSearchProps> { }
 
 export default ToolbarSearch;
diff --git a/types/carbon-components-react/lib/components/Tooltip/Tooltip.d.ts b/types/carbon-components-react/lib/components/Tooltip/Tooltip.d.ts
index da4f05412b..f98f17e07d 100644
--- a/types/carbon-components-react/lib/components/Tooltip/Tooltip.d.ts
+++ b/types/carbon-components-react/lib/components/Tooltip/Tooltip.d.ts
@@ -1,5 +1,12 @@
 import * as React from "react";
-import { Direction, EmbeddedIconProps, MenuOffsetData, ReactAttr, ReactDivAttr } from "../../../typings/shared";
+import {
+    Direction,
+    EmbeddedIconProps,
+    MenuOffsetData,
+    ReactAttr,
+    ReactDivAttr,
+    ForwardRefReturn
+} from "../../../typings/shared";
 
 type ExcludedAttributes = "onBlur" | "onChange" | "onContextMenu" | "onFocus" | "onMouseOut" | "onMouseOver" | "role";
 interface InheritedProps extends
@@ -17,14 +24,15 @@ export interface TooltipProps extends InheritedProps {
         | ((menuBody: HTMLElement, menuDirection: TooltipProps['direction']) => Required<MenuOffsetData> | undefined);
     onChange?(event: TooltipOnChangeEvent<HTMLDivElement>, data: { open: boolean }): void; // optional/required depending on static carbon lib config
     open?: boolean;
-    renderIcon?: React.RefForwardingComponent<any, any>;
+    renderIcon?: ForwardRefReturn<unknown, unknown>;
     showIcon?: boolean;
+    tooltipBodyId?: ReactAttr['id'];
     tooltipId?: ReactAttr['id'];
     triggerClassName?: ReactAttr['className'];
     triggerId?: ReactAttr['id'];
     triggerText?: React.ReactNode;
 }
 
-declare const Tooltip: React.RefForwardingComponent<any, TooltipProps>;
+declare const Tooltip: ForwardRefReturn<unknown, TooltipProps>;
 
 export default Tooltip;
diff --git a/types/carbon-components-react/lib/components/TooltipDefinition/TooltipDefinition.d.ts b/types/carbon-components-react/lib/components/TooltipDefinition/TooltipDefinition.d.ts
index 633aac7d15..884c0193cb 100644
--- a/types/carbon-components-react/lib/components/TooltipDefinition/TooltipDefinition.d.ts
+++ b/types/carbon-components-react/lib/components/TooltipDefinition/TooltipDefinition.d.ts
@@ -1,7 +1,9 @@
 import * as React from "react";
-import { Direction, ReactDivAttr, TooltipAlignment } from "../../../typings/shared";
+import { Direction, ReactDivAttr, TooltipAlignment, ReactButtonAttr } from "../../../typings/shared";
 
-interface InheritedProps extends ReactDivAttr { }
+interface InheritedProps extends Omit<ReactDivAttr, "onFocus"> {
+    onFocus?: ReactButtonAttr["onFocus"],
+}
 
 export interface TooltipDefinitionProps extends InheritedProps {
     direction?: Extract<Direction, "bottom" | "top">, // required but has default value
diff --git a/types/carbon-components-react/lib/components/TooltipIcon/TooltipIcon.d.ts b/types/carbon-components-react/lib/components/TooltipIcon/TooltipIcon.d.ts
index 0d5be535e1..d2186ed16c 100644
--- a/types/carbon-components-react/lib/components/TooltipIcon/TooltipIcon.d.ts
+++ b/types/carbon-components-react/lib/components/TooltipIcon/TooltipIcon.d.ts
@@ -1,14 +1,14 @@
 import * as React from "react";
-import { Direction, ReactDivAttr, RequiresChildrenProps, TooltipAlignment } from "../../../typings/shared";
+import { Direction, ReactButtonAttr, RequiresChildrenProps, TooltipAlignment } from "../../../typings/shared";
 
 interface InheritedProps extends
-    Omit<ReactDivAttr, "children">,
+    Omit<ReactButtonAttr, "children">,
     RequiresChildrenProps
 { }
 
 export interface TooltipIconProps extends InheritedProps {
     align?: TooltipAlignment,
-    direction?: Extract<Direction, "bottom" | "top">, // required but has default value
+    direction?: Direction, // required but has default value, should be bottom/top but the prop type has left/right
     tooltipText: string,
 }
 
diff --git a/types/carbon-components-react/typings/shared.d.ts b/types/carbon-components-react/typings/shared.d.ts
index 65bedba476..2d752d55f1 100644
--- a/types/carbon-components-react/typings/shared.d.ts
+++ b/types/carbon-components-react/typings/shared.d.ts
@@ -16,6 +16,8 @@ export type Direction = "bottom" | "left" | "right" | "top";
 export type ListBoxBaseItemType = object | string;
 export type TooltipAlignment = "center" | "end" | "start";
 export type TooltipPosition = Direction;
+export type CarbonSize = "lg" | "sm" | "xs";
+export type CarbonInputSize = "sm" | "lg" | "xl";
 
 export interface DownshiftTypedProps<ItemType> {
     itemToString?(item: ItemType): string,
@@ -75,3 +77,5 @@ export interface SideNavSizingProps {
 export interface RefForwardingProps<T = HTMLElement> {
     ref?: React.RefObject<T>;
 }
+
+export type ForwardRefReturn<T, P = {}> = React.FC<P & React.ClassAttributes<T>>;
diff --git a/types/carbon-components-react/typings/translation.d.ts b/types/carbon-components-react/typings/translation.d.ts
index fffded7de1..e47d7adbcd 100644
--- a/types/carbon-components-react/typings/translation.d.ts
+++ b/types/carbon-components-react/typings/translation.d.ts
@@ -4,18 +4,18 @@ import {
     TableHeaderTranslationKey,
     TableToolbarTranslationKey,
 } from '../lib/components/DataTable';
-import { ListBoxFieldTranslationKey } from '../lib/components/ListBox/ListBoxField';
 import { ListBoxMenuIconTranslationKey } from '../lib/components/ListBox/ListBoxMenuIcon';
 import { ListBoxSelectionTranslationKey } from '../lib/components/ListBox/ListBoxSelection';
 import { NumberInputTranslationKey } from '../lib/components/NumberInput';
 import { SideNavTranslationKey } from '../lib/components/UIShell/SideNav';
+import { ProgressStepTranslationKey } from "../lib/components/ProgressIndicator";
 
 export type CarbonTranslationKey =
     DataTableTranslationKey
-    | ListBoxFieldTranslationKey
     | ListBoxMenuIconTranslationKey
     | ListBoxSelectionTranslationKey
     | NumberInputTranslationKey
+    | ProgressStepTranslationKey
     | SideNavTranslationKey
     | TableBatchActionsTranslationKey
     | TableHeaderTranslationKey