@carbon/react 1.99.0 → 1.100.0-rc.0

package/lib/components/FluidTextArea/FluidTextArea.Skeleton.d.ts

@@ -1,15 +1,23 @@
 /**
- * Copyright IBM Corp. 2024
+ * Copyright IBM Corp. 2024, 2025
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import PropTypes from 'prop-types';
 export interface FluidTextAreaSkeletonProps {
     /**
      * Specify an optional className to be applied to the outer FluidForm wrapper
      */
     className?: string;
 }
-declare const FluidTextAreaSkeleton: React.FC<FluidTextAreaSkeletonProps>;
+declare const FluidTextAreaSkeleton: {
+    ({ className, ...other }: FluidTextAreaSkeletonProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Specify an optional className to be applied to the outer FluidForm wrapper
+         */
+        className: PropTypes.Requireable<string>;
+    };
+};
 export default FluidTextAreaSkeleton;

package/lib/components/FluidTextArea/FluidTextArea.d.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import PropTypes from 'prop-types';
 import React from 'react';
 export interface FluidTextAreaProps {
     /**
@@ -96,5 +97,98 @@ export interface FluidTextAreaProps {
      */
     readOnly?: boolean;
 }
-declare const FluidTextArea: React.FC<FluidTextAreaProps>;
+declare const FluidTextArea: {
+    ({ className, ...other }: FluidTextAreaProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Provide a custom className that is applied directly to the underlying
+         * `<textarea>` node
+         */
+        className: PropTypes.Requireable<string>;
+        /**
+         * Specify the `cols` attribute for the underlying `<textarea>` node
+         */
+        cols: PropTypes.Requireable<number>;
+        /**
+         * Optionally provide the default value of the `<textarea>`
+         */
+        defaultValue: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
+        /**
+         * Specify whether the control is disabled
+         */
+        disabled: PropTypes.Requireable<boolean>;
+        /**
+         * Specify whether to display the character counter
+         */
+        enableCounter: PropTypes.Requireable<boolean>;
+        /**
+         * Provide text that is used alongside the control label for additional help
+         */
+        helperText: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Specify whether you want the underlying label to be visually hidden
+         */
+        hideLabel: PropTypes.Requireable<boolean>;
+        /**
+         * Provide a unique identifier for the control
+         */
+        id: PropTypes.Requireable<string>;
+        /**
+         * Specify whether the control is currently invalid
+         */
+        invalid: PropTypes.Requireable<boolean>;
+        /**
+         * Provide the text that is displayed when the control is in an invalid state
+         */
+        invalidText: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Provide the text that will be read by a screen reader when visiting this
+         * control
+         */
+        labelText: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        /**
+         * `true` to use the light version. For use on $ui-01 backgrounds only.
+         * Don't use this to make tile background color same as container background color.
+         */
+        light: (props: Record<string, any>, propName: string, componentName: string, ...rest: any[]) => any;
+        /**
+         * Max character count allowed for the textarea. This is needed in order for enableCounter to display
+         */
+        maxCount: PropTypes.Requireable<number>;
+        /**
+         * Optionally provide an `onChange` handler that is called whenever `<textarea>`
+         * is updated
+         */
+        onChange: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Optionally provide an `onClick` handler that is called whenever the
+         * `<textarea>` is clicked
+         */
+        onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Specify the placeholder attribute for the `<textarea>`
+         */
+        placeholder: PropTypes.Requireable<string>;
+        /**
+         * Specify the rows attribute for the `<textarea>`
+         */
+        rows: PropTypes.Requireable<number>;
+        /**
+         * Provide the current value of the `<textarea>`
+         */
+        value: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
+        /**
+         * Specify whether the control is currently in warning state
+         */
+        warn: PropTypes.Requireable<boolean>;
+        /**
+         * Provide the text that is displayed when the control is in warning state
+         */
+        warnText: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Whether or not the component is readonly
+         */
+        readOnly: PropTypes.Requireable<boolean>;
+    };
+};
 export default FluidTextArea;

package/lib/components/FluidTextInput/FluidPasswordInput.d.ts

@@ -1,9 +1,10 @@
 /**
- * Copyright IBM Corp. 2016, 2023
+ * Copyright IBM Corp. 2016, 2025
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import PropTypes from 'prop-types';
 import React from 'react';
 export interface FluidPasswordInputProps {
     /**
@@ -83,5 +84,85 @@ export interface FluidPasswordInputProps {
      */
     readOnly?: boolean;
 }
-declare const FluidPasswordInput: React.FC<FluidPasswordInputProps>;
+declare const FluidPasswordInput: {
+    ({ className, ...other }: FluidPasswordInputProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Specify an optional className to be applied to the outer FluidForm wrapper
+         */
+        className: PropTypes.Requireable<string>;
+        /**
+         * Optionally provide the default value of the `<input>`
+         */
+        defaultValue: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
+        /**
+         * Specify whether the `<input>` should be disabled
+         */
+        disabled: PropTypes.Requireable<boolean>;
+        /**
+         * "Hide password" tooltip text on password visibility toggle
+         */
+        hidePasswordLabel: PropTypes.Requireable<string>;
+        /**
+         * Specify a custom `id` for the `<input>`
+         */
+        id: PropTypes.Validator<string>;
+        /**
+         * Specify whether the control is currently invalid
+         */
+        invalid: PropTypes.Requireable<boolean>;
+        /**
+         * Provide the text that is displayed when the control is in an invalid state
+         */
+        invalidText: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Specify whether the control is a password input
+         */
+        isPassword: PropTypes.Requireable<boolean>;
+        /**
+         * Provide the text that will be read by a screen reader when visiting this
+         * control
+         */
+        labelText: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        /**
+         * Optionally provide an `onChange` handler that is called whenever `<input>`
+         * is updated
+         */
+        onChange: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Optionally provide an `onClick` handler that is called whenever the
+         * `<input>` is clicked
+         */
+        onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Callback function that is called whenever the toggle password visibility
+         * button is clicked
+         */
+        onTogglePasswordVisibility: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Specify the placeholder attribute for the `<input>`
+         */
+        placeholder: PropTypes.Requireable<string>;
+        /**
+         * "Show password" tooltip text on password visibility toggle
+         */
+        showPasswordLabel: PropTypes.Requireable<string>;
+        /**
+         * Specify the value of the `<input>`
+         */
+        value: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
+        /**
+         * Specify whether the control is currently in warning state
+         */
+        warn: PropTypes.Requireable<boolean>;
+        /**
+         * Provide the text that is displayed when the control is in warning state
+         */
+        warnText: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Whether or not the component is readonly
+         */
+        readOnly: PropTypes.Requireable<boolean>;
+    };
+};
 export default FluidPasswordInput;

package/lib/components/FluidTextInput/FluidTextInput.Skeleton.d.ts

@@ -1,15 +1,23 @@
 /**
- * Copyright IBM Corp. 2016, 2023
+ * Copyright IBM Corp. 2016, 2025
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import PropTypes from 'prop-types';
 export interface FluidTextInputSkeletonProps {
     /**
      * Specify an optional className to be applied to the outer FluidForm wrapper
      */
     className?: string;
 }
-declare const FluidTextInputSkeleton: React.FC<FluidTextInputSkeletonProps>;
+declare const FluidTextInputSkeleton: {
+    ({ className, ...other }: FluidTextInputSkeletonProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Specify an optional className to be applied to the outer FluidForm wrapper
+         */
+        className: PropTypes.Requireable<string>;
+    };
+};
 export default FluidTextInputSkeleton;

package/lib/components/Grid/GridContext.d.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import PropTypes from 'prop-types';
 import React from 'react';
 export type GridMode = 'flexbox' | 'css-grid';
 export interface GridSettingContext {
@@ -31,7 +32,24 @@ export interface GridSettingsProps {
      */
     subgrid?: boolean;
 }
-export declare const GridSettings: React.FC<GridSettingsProps>;
+export declare const GridSettings: {
+    ({ children, mode, subgrid, }: GridSettingsProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Pass in components which will be rendered within the `GridSettings`
+         * component
+         */
+        children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Specify the gutter mode for the GridContext
+         */
+        mode: PropTypes.Validator<NonNullable<GridMode>>;
+        /**
+         * Specify whether subgrid should be enabled
+         */
+        subgrid: PropTypes.Requireable<boolean>;
+    };
+};
 /**
  * Helper function for accessing the GridContext value
  */

package/lib/components/IconButton/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2025
+ * Copyright IBM Corp. 2016, 2026
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/lib/components/Link/Link.js

@@ -76,7 +76,10 @@ const LinkBase = /*#__PURE__*/React.forwardRef(({
   }, /*#__PURE__*/React.createElement(Icon, null)));
 });
 const Link = LinkBase;
+
+// @ts-expect-error - `displayName` isn't typed.
 Link.displayName = 'Link';
+// @ts-expect-error - `propTypes` isn't typed.
 Link.propTypes = {
   /**
    * Provide a custom element or component to render the top-level node for the

package/lib/components/ListBox/ListBoxField.d.ts

@@ -4,13 +4,46 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { type HTMLAttributes } from 'react';
+import { type HTMLAttributes } from 'react';
+import PropTypes from 'prop-types';
 export interface ListBoxFieldProps extends HTMLAttributes<HTMLDivElement> {
     /**
      * Specify if the parent <ListBox> is disabled
      */
     disabled?: boolean;
 }
-export type ListBoxFieldComponent = React.FC<ListBoxFieldProps>;
+/**
+ * `ListBoxField` is responsible for creating the containing node for valid
+ * elements inside of a field. It also provides a11y-related attributes like
+ * `role` to make sure a user can focus the given field.
+ */
+declare function ListBoxField({ children, disabled, tabIndex, ...rest }: ListBoxFieldProps): import("react/jsx-runtime").JSX.Element;
+declare namespace ListBoxField {
+    var propTypes: {
+        /**
+         * Typically set by `getToggleButtonProps`, this should specify whether the
+         * field has a popup.
+         */
+        'aria-haspopup': PropTypes.Requireable<NonNullable<string | boolean | null | undefined>>;
+        /**
+         * Provide the contents of your ListBoxField
+         */
+        children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Specify if the parent <ListBox> is disabled
+         */
+        disabled: PropTypes.Requireable<boolean>;
+        /**
+         * The role for the component, should be set by `getToggleButtonProps` coming
+         * from Downshift
+         */
+        role: PropTypes.Requireable<string>;
+        /**
+         * Optional prop to specify the tabIndex of the <ListBox> trigger button
+         */
+        tabIndex: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
+    };
+}
+export type ListBoxFieldComponent = typeof ListBoxField;
 declare const _default: ListBoxFieldComponent;
 export default _default;

package/lib/components/ListBox/ListBoxMenuIcon.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import PropTypes from 'prop-types';
 import type { TranslateWithId } from '../../types/common';
 declare const translationIds: {
     readonly 'close.menu': "close.menu";
@@ -18,10 +18,23 @@ export interface ListBoxMenuIconProps extends TranslateWithId<TranslationKey> {
      */
     isOpen: boolean;
 }
-export type ListBoxMenuIconComponent = React.FC<ListBoxMenuIconProps>;
+export type ListBoxMenuIconComponent = typeof ListBoxMenuIcon;
 /**
  * `ListBoxMenuIcon` is used to orient the icon up or down depending on the
  * state of the menu for a given `ListBox`
  */
-declare const ListBoxMenuIcon: ListBoxMenuIconComponent;
+declare const ListBoxMenuIcon: {
+    ({ isOpen, translateWithId: t, }: ListBoxMenuIconProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Specify whether the menu is currently open, which will influence the
+         * direction of the menu icon
+         */
+        isOpen: PropTypes.Validator<boolean>;
+        /**
+         * Translates component strings using your i18n tool.
+         */
+        translateWithId: PropTypes.Requireable<(...args: any[]) => any>;
+    };
+};
 export default ListBoxMenuIcon;

package/lib/components/ListBox/ListBoxMenuItem.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2025
+ * Copyright IBM Corp. 2016, 2026
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/lib/components/ListBox/ListBoxSelection.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import PropTypes from 'prop-types';
 import { KeyboardEvent, MouseEvent } from 'react';
 import type { TranslateWithId } from '../../types/common';
 export interface ListBoxSelectionProps extends TranslateWithId<TranslationKey> {
@@ -32,7 +32,7 @@ export interface ListBoxSelectionProps extends TranslateWithId<TranslationKey> {
      */
     selectionCount?: number;
 }
-export type ListBoxSelectionComponent = React.FC<ListBoxSelectionProps>;
+export type ListBoxSelectionComponent = typeof ListBoxSelection;
 declare const translationIds: {
     readonly 'clear.all': "clear.all";
     readonly 'clear.selection': "clear.selection";
@@ -43,5 +43,36 @@ type TranslationKey = keyof typeof translationIds;
  * addition to conditionally rendering a badge if the control has more than one
  * selection.
  */
-declare const ListBoxSelection: ListBoxSelectionComponent;
+declare const ListBoxSelection: {
+    ({ clearSelection, selectionCount, translateWithId: t, disabled, onClearSelection, readOnly, }: ListBoxSelectionProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Specify a function to be invoked when a user interacts with the clear
+         * selection element.
+         */
+        clearSelection: PropTypes.Validator<(...args: any[]) => any>;
+        /**
+         * Specify whether or not the clear selection element should be disabled
+         */
+        disabled: PropTypes.Requireable<boolean>;
+        /**
+         * Specify an optional `onClearSelection` handler that is called when the underlying
+         * element is cleared
+         */
+        onClearSelection: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Whether or not the Dropdown is readonly
+         */
+        readOnly: PropTypes.Requireable<boolean>;
+        /**
+         * Specify an optional `selectionCount` value that will be used to determine
+         * whether the selection should display a badge or a single clear icon.
+         */
+        selectionCount: PropTypes.Requireable<number>;
+        /**
+         * Translates component strings using your i18n tool.
+         */
+        translateWithId: PropTypes.Requireable<(...args: any[]) => any>;
+    };
+};
 export default ListBoxSelection;

package/lib/components/Menu/MenuItem.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { ComponentProps, FC, KeyboardEvent, LiHTMLAttributes, MouseEvent, ReactNode } from 'react';
+import React, { type ComponentProps, type ElementType, type KeyboardEvent, type LiHTMLAttributes, type MouseEvent, type ReactNode } from 'react';
 export interface MenuItemProps extends LiHTMLAttributes<HTMLLIElement> {
     /**
      * Optionally provide another Menu to create a submenu. props.children can't be used to specify the content of the MenuItem itself. Use props.label instead.
@@ -33,7 +33,7 @@ export interface MenuItemProps extends LiHTMLAttributes<HTMLLIElement> {
     /**
      * A component used to render an icon.
      */
-    renderIcon?: FC;
+    renderIcon?: ElementType;
     /**
      * Provide a shortcut for the action of this MenuItem. Note that the component will only render it as a hint but not actually register the shortcut.
      */

package/lib/components/MultiSelect/FilterableMultiSelect.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type UseComboboxProps, type UseMultipleSelectionProps } from 'downshift';
-import React, { type FunctionComponent, type ReactElement, type ReactNode } from 'react';
+import React, { type ReactElement, type ReactNode } from 'react';
 import { type MultiSelectSortingProps } from './MultiSelectPropTypes';
 import { type ListBoxMenuIconTranslationKey, type ListBoxSelectionTranslationKey, type ListBoxSize, type ListBoxType } from '../ListBox';
 import type { TranslateWithId } from '../../types/common';
@@ -93,7 +93,7 @@ export interface FilterableMultiSelectProps<ItemType> extends MultiSelectSorting
      * Function to render items as custom components instead of strings.
      * Defaults to null and is overridden by a getter
      */
-    itemToElement?: FunctionComponent<ItemType>;
+    itemToElement?: (item: ItemType) => ReactNode;
     /**
      * Helper function passed to downshift that allows the library to render
      * a given item to a string label.

package/lib/components/MultiSelect/FilterableMultiSelect.js

@@ -35,6 +35,7 @@ var react = require('@floating-ui/react');
 var index = require('../AILabel/index.js');
 var defaultItemToString = require('../../internal/defaultItemToString.js');
 var utils = require('../../internal/utils.js');
+var useNormalizedInputProps = require('../../internal/useNormalizedInputProps.js');
 var ListBoxPropTypes = require('../ListBox/ListBoxPropTypes.js');
 
 const {
@@ -73,7 +74,7 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
   hideLabel,
   id,
   initialSelectedItems = [],
-  invalid,
+  invalid = false,
   invalidText,
   items,
   itemToElement: ItemToElement,
@@ -95,7 +96,7 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
   sortItems = sorting.defaultSortItems,
   translateWithId,
   useTitleInItem,
-  warn,
+  warn = false,
   warnText,
   slug,
   inputProps
@@ -239,15 +240,23 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
     return sortedReal;
     // eslint-disable-next-line  react-hooks/exhaustive-deps -- https://github.com/carbon-design-system/carbon/issues/20452
   }, [items, inputValue, controlledSelectedItems, topItems, selectionFeedback, itemToString, compareItems, locale, sortItems, nonSelectAllItems]);
+  const normalizedProps = useNormalizedInputProps.useNormalizedInputProps({
+    id,
+    disabled,
+    readOnly,
+    invalid,
+    warn
+  });
   const inline = type === 'inline';
-  const showWarning = !invalid && warn;
+  const showWarning = normalizedProps.warn;
+  const showHelperText = !normalizedProps.warn && !normalizedProps.invalid;
   const wrapperClasses = cx(`${prefix}--multi-select__wrapper`, `${prefix}--multi-select--filterable__wrapper`, `${prefix}--list-box__wrapper`, containerClassName, {
     [`${prefix}--multi-select__wrapper--inline`]: inline,
     [`${prefix}--list-box__wrapper--inline`]: inline,
-    [`${prefix}--multi-select__wrapper--inline--invalid`]: inline && invalid,
-    [`${prefix}--list-box__wrapper--inline--invalid`]: inline && invalid,
+    [`${prefix}--multi-select__wrapper--inline--invalid`]: inline && normalizedProps.invalid,
+    [`${prefix}--list-box__wrapper--inline--invalid`]: inline && normalizedProps.invalid,
     [`${prefix}--list-box--up`]: direction === 'top',
-    [`${prefix}--list-box__wrapper--fluid--invalid`]: isFluid && invalid,
+    [`${prefix}--list-box__wrapper--fluid--invalid`]: isFluid && normalizedProps.invalid,
     [`${prefix}--list-box__wrapper--slug`]: slug,
     [`${prefix}--list-box__wrapper--decorator`]: decorator,
     [`${prefix}--autoalign`]: autoAlign
@@ -521,8 +530,8 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
   // eslint-disable-next-line @typescript-eslint/no-explicit-any -- https://github.com/carbon-design-system/carbon/issues/20452
   item => !item.isSelectAll).length;
   const className = cx(`${prefix}--multi-select`, `${prefix}--combo-box`, `${prefix}--multi-select--filterable`, {
-    [`${prefix}--multi-select--invalid`]: invalid,
-    [`${prefix}--multi-select--invalid--focused`]: invalid && inputFocused,
+    [`${prefix}--multi-select--invalid`]: normalizedProps.invalid,
+    [`${prefix}--multi-select--invalid--focused`]: inputFocused && normalizedProps.invalid,
     [`${prefix}--multi-select--open`]: isOpen,
     [`${prefix}--multi-select--inline`]: inline,
     [`${prefix}--multi-select--selected`]: controlledSelectedItems?.length > 0,
@@ -554,7 +563,7 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
   });
   const inputProp = getInputProps(getDropdownProps({
     'aria-controls': isOpen ? menuId : undefined,
-    'aria-describedby': helperText && !invalid && !warn ? helperId : undefined,
+    'aria-describedby': helperText && showHelperText ? helperId : undefined,
     'aria-haspopup': 'listbox',
     // Remove excess aria `aria-labelledby`. HTML <label for>
     // provides this aria information.
@@ -649,9 +658,9 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
     light: light,
     ref: ref,
     id: id,
-    invalid: invalid,
+    invalid: normalizedProps.invalid,
     invalidText: invalidText,
-    warn: warn,
+    warn: normalizedProps.warn,
     warnText: warnText,
     isOpen: !readOnly && isOpen,
     size: size
@@ -675,7 +684,7 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
     ref: mergedRef
   }, readOnlyEventHandlers, {
     readOnly: readOnly
-  })), invalid && /*#__PURE__*/React.createElement(iconsReact.WarningFilled, {
+  })), normalizedProps.invalid && /*#__PURE__*/React.createElement(iconsReact.WarningFilled, {
     className: `${prefix}--list-box__invalid-icon`
   }), showWarning && /*#__PURE__*/React.createElement(iconsReact.WarningAltFilled, {
     className: `${prefix}--list-box__invalid-icon ${prefix}--list-box__invalid-icon--warning`
@@ -744,7 +753,7 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
       disabled: disabled,
       tabIndex: -1
     })));
-  }) : null)), !inline && !invalid && !warn ? helper : null);
+  }) : null)), !inline && showHelperText ? helper : null);
 });
 FilterableMultiSelect.displayName = 'FilterableMultiSelect';
 FilterableMultiSelect.propTypes = {