[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>
2026-08-12 13:00:19 +00:00 · 2020-04-16 18:38:20 -07:00
parent 5f0c754abc
commit c1ca3958d2
94 changed files with 558 additions and 350 deletions
@@ -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 }) => {}}
@@ -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 };
@@ -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,
 }

@@ -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>;

@@ -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;
@@ -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"],
 }

@@ -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;
@@ -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;
@@ -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;
@@ -1,3 +1,4 @@
 export * from "./CodeSnippet";
 export * from "./CodeSnippet.Skeleton";
 export { default } from "./CodeSnippet";
+export { default as CodeSnippetSkeleton } from "./CodeSnippet.Skeleton";
@@ -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,
 }

@@ -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,
@@ -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;
@@ -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;
@@ -1,4 +1,2 @@
 export * from "./ContentSwitcher";
-export * from "./Switch";
-export { default as Switch } from "./Switch";
 export { default } from "./ContentSwitcher";
@@ -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;
@@ -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;
@@ -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;
 }
@@ -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,
@@ -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> { }
@@ -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> { }
@@ -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,
 }

@@ -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,
@@ -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;
@@ -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>;
@@ -0,0 +1,4 @@
+export * from "./ErrorBoundaryContext";
+export * from "./ErrorBoundary";
+export { default as ErrorBoundary } from "./ErrorBoundary";
+export { ErrorBoundaryContext } from "./ErrorBoundaryContext";
@@ -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;
@@ -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> { }
@@ -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;
@@ -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;
@@ -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';
@@ -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 { }

@@ -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 { }

@@ -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>;
@@ -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;
@@ -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
@@ -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>;
@@ -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
 }

@@ -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
 { }

@@ -1 +1,2 @@
+export type ListBoxSize = "sm" | "xl";
 export type ListBoxType = "default" | "inline";
@@ -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;
@@ -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,
 }

@@ -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,
 }
@@ -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;
@@ -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>> {
@@ -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>;
@@ -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;
@@ -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,
@@ -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> { }
@@ -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;
@@ -1,2 +1,2 @@
-export * from "./OverflowMenu";
+export { MenuOffsetValue, OverflowMenuProps } from "./OverflowMenu";
 export { default } from "./OverflowMenu";
@@ -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;
@@ -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,
 }
@@ -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;
@@ -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> { }
@@ -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;
@@ -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;
@@ -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,
 }

@@ -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;
@@ -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;
@@ -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,
 }

@@ -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,
@@ -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,
@@ -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;
@@ -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 {
@@ -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,
@@ -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
 }
@@ -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,
@@ -8,6 +8,9 @@ interface StructureListWrapperInheritedProps extends Omit<ReactAttr, "aria-label
 }

 export interface StructuredListProps extends StructureListWrapperInheritedProps {
+    /**
+     * @deprecated
+     */
    border?: boolean,
    selection?: boolean,
 }
@@ -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;
@@ -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> { }
@@ -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;
@@ -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> { }
@@ -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;
@@ -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;
@@ -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,
@@ -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;
@@ -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;
@@ -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;
@@ -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,
@@ -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,
 }
@@ -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";
@@ -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>,
@@ -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> { }
@@ -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;
@@ -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;
@@ -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,
 }
@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -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,
 }

@@ -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>>;
@@ -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