@carbon/react 1.91.0-rc.0 → 1.92.0-rc.0

package/lib/components/Dropdown/Dropdown.js

@@ -255,7 +255,8 @@ const Dropdown = /*#__PURE__*/React.forwardRef(({
   const handleFocus = evt => {
     setIsFocused(evt.type === 'focus' && !selectedItem ? true : false);
   };
-  const mergedRef = mergeRefs.default(toggleButtonProps.ref, ref);
+  const buttonRef = React.useRef(null);
+  const mergedRef = mergeRefs.mergeRefs(toggleButtonProps.ref, ref, buttonRef);
   const [currTimer, setCurrTimer] = React.useState();
   const [isTyping, setIsTyping] = React.useState(false);
   const onKeyDownHandler = React.useCallback(evt => {
@@ -291,7 +292,7 @@ const Dropdown = /*#__PURE__*/React.forwardRef(({
           // NOTE: does not prevent click
           evt.preventDefault();
           // focus on the element as per readonly input behavior
-          mergedRef?.current?.focus();
+          buttonRef.current?.focus();
         },
         onKeyDown: evt => {
           const selectAccessKeys = ['ArrowDown', 'ArrowUp', ' ', 'Enter'];
@@ -306,7 +307,6 @@ const Dropdown = /*#__PURE__*/React.forwardRef(({
         onKeyDown: onKeyDownHandler
       };
     }
-    // eslint-disable-next-line  react-hooks/exhaustive-deps -- https://github.com/carbon-design-system/carbon/issues/20071
   }, [readOnly, onKeyDownHandler]);
   const menuProps = React.useMemo(() => getMenuProps({
     ref: enableFloatingStyles || autoAlign ? refs.setFloating : null

package/lib/components/ExpandableSearch/ExpandableSearch.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2021
+ * Copyright IBM Corp. 2021, 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.

package/lib/components/ExpandableSearch/ExpandableSearch.js

@@ -65,7 +65,7 @@ const ExpandableSearch = /*#__PURE__*/React.forwardRef(function ExpandableSearch
   return /*#__PURE__*/React.createElement(Search.default, _rollupPluginBabelHelpers.extends({}, props, {
     defaultValue: defaultValue,
     isExpanded: expanded,
-    ref: mergeRefs.default(searchRef, forwardedRef),
+    ref: mergeRefs.mergeRefs(searchRef, forwardedRef),
     className: classes,
     onBlur: events.composeEventHandlers([onBlur, handleBlur]),
     onChange: events.composeEventHandlers([onChange, handleChange]),

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

@@ -17,6 +17,7 @@ export interface FeatureFlagsProps {
     enableDialogElement?: boolean;
     enableV12DynamicFloatingStyles?: boolean;
     enableEnhancedFileUploader?: boolean;
+    enablePresence?: boolean;
 }
 /**
  * Our FeatureFlagContext is used alongside the FeatureFlags component to enable
@@ -28,7 +29,7 @@ declare const FeatureFlagContext: React.Context<any>;
  * along with the current `FeatureFlagContext` to provide consumers to check if
  * a feature flag is enabled or disabled in a given React tree
  */
-declare function FeatureFlags({ children, flags, enableV12TileDefaultIcons, enableV12TileRadioIcons, enableV12Overflowmenu, enableTreeviewControllable, enableExperimentalFocusWrapWithoutSentinels, enableDialogElement, enableV12DynamicFloatingStyles, enableEnhancedFileUploader, }: FeatureFlagsProps): JSX.Element;
+declare function FeatureFlags({ children, flags, enableV12TileDefaultIcons, enableV12TileRadioIcons, enableV12Overflowmenu, enableTreeviewControllable, enableExperimentalFocusWrapWithoutSentinels, enableDialogElement, enableV12DynamicFloatingStyles, enableEnhancedFileUploader, enablePresence, }: FeatureFlagsProps): JSX.Element;
 declare namespace FeatureFlags {
     var propTypes: {
         children: PropTypes.Requireable<PropTypes.ReactNodeLike>;

package/lib/components/FeatureFlags/index.js

@@ -34,7 +34,8 @@ function FeatureFlags({
   enableExperimentalFocusWrapWithoutSentinels = false,
   enableDialogElement = false,
   enableV12DynamicFloatingStyles = false,
-  enableEnhancedFileUploader = false
+  enableEnhancedFileUploader = false,
+  enablePresence = false
 }) {
   const parentScope = React.useContext(FeatureFlagContext);
   const [prevParentScope, setPrevParentScope] = React.useState(parentScope);
@@ -47,6 +48,7 @@ function FeatureFlags({
     'enable-dialog-element': enableDialogElement,
     'enable-v12-dynamic-floating-styles': enableV12DynamicFloatingStyles,
     'enable-enhanced-file-uploader': enableEnhancedFileUploader,
+    'enable-presence': enablePresence,
     ...flags
   };
   const [scope, updateScope] = React.useState(() => {

package/lib/components/FileUploader/FileUploader.js

@@ -19,10 +19,10 @@ var Button = require('../Button/Button.js');
 var keys = require('../../internal/keyboard/keys.js');
 var match = require('../../internal/keyboard/match.js');
 var usePrefix = require('../../internal/usePrefix.js');
-require('../Text/index.js');
+var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
 var useId = require('../../internal/useId.js');
 var index = require('../FeatureFlags/index.js');
-var Text = require('../Text/Text.js');
 
 // eslint-disable-next-line react/display-name -- https://github.com/carbon-design-system/carbon/issues/20071
 const FileUploader = /*#__PURE__*/React.forwardRef(({

package/lib/components/FileUploader/FileUploaderItem.js

@@ -19,10 +19,10 @@ var match = require('../../internal/keyboard/match.js');
 var useId = require('../../internal/useId.js');
 var usePrefix = require('../../internal/usePrefix.js');
 var noopFn = require('../../internal/noopFn.js');
-require('../Text/index.js');
+var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
 require('../Tooltip/DefinitionTooltip.js');
 var Tooltip = require('../Tooltip/Tooltip.js');
-var Text = require('../Text/Text.js');
 
 function FileUploaderItem({
   uuid,

package/lib/components/FluidTextInput/FluidPasswordInput.js

@@ -7,13 +7,32 @@
 
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var PropTypes = require('prop-types');
-require('react');
-require('classnames');
+var React = require('react');
+var cx = require('classnames');
 require('../TextInput/ControlledPasswordInput.js');
-require('../TextInput/PasswordInput.js');
+var PasswordInput = require('../TextInput/PasswordInput.js');
+var usePrefix = require('../../internal/usePrefix.js');
+var FormContext = require('../FluidForm/FormContext.js');
 
-({
+const FluidPasswordInput = ({
+  className,
+  ...other
+}) => {
+  const prefix = usePrefix.usePrefix();
+  const classNames = cx(className, `${prefix}--text-input--fluid`);
+  return /*#__PURE__*/React.createElement(FormContext.FormContext.Provider, {
+    value: {
+      isFluid: true
+    }
+  }, /*#__PURE__*/React.createElement(PasswordInput.default, _rollupPluginBabelHelpers.extends({
+    className: classNames
+  }, other)));
+};
+FluidPasswordInput.propTypes = {
   /**
    * Specify an optional className to be applied to the outer FluidForm wrapper
    */
@@ -90,4 +109,6 @@ require('../TextInput/PasswordInput.js');
    * Whether or not the component is readonly
    */
   readOnly: PropTypes.bool
-});
+};
+
+exports.default = FluidPasswordInput;

package/lib/components/FluidTextInput/index.js

@@ -10,11 +10,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var FluidTextInput = require('./FluidTextInput.js');
-require('./FluidPasswordInput.js');
+var FluidPasswordInput = require('./FluidPasswordInput.js');
 var FluidTextInput_Skeleton = require('./FluidTextInput.Skeleton.js');
 
 
 
 exports.FluidTextInput = FluidTextInput.default;
 exports.default = FluidTextInput.default;
+exports.FluidPasswordInput = FluidPasswordInput.default;
 exports.FluidTextInputSkeleton = FluidTextInput_Skeleton.default;

package/lib/components/FormLabel/FormLabel.js

@@ -14,8 +14,8 @@ var PropTypes = require('prop-types');
 var React = require('react');
 var cx = require('classnames');
 var usePrefix = require('../../internal/usePrefix.js');
-require('../Text/index.js');
 var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
 
 function FormLabel({
   className: customClassName,

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React, { type HTMLAttributes } from 'react';
-import { type ListBoxSize, type ListBoxType } from '.';
+import { type ListBoxSize, type ListBoxType } from './ListBoxPropTypes';
 type ExcludedAttributes = 'onKeyDown' | 'onKeyPress' | 'ref';
 export interface ListBoxProps extends Omit<HTMLAttributes<HTMLDivElement>, ExcludedAttributes> {
     /**

package/lib/components/ListBox/ListBox.js

@@ -14,11 +14,10 @@ var cx = require('classnames');
 var React = require('react');
 var PropTypes = require('prop-types');
 var deprecate = require('../../prop-types/deprecate.js');
-require('./index.js');
+var ListBoxPropTypes = require('./ListBoxPropTypes.js');
 var usePrefix = require('../../internal/usePrefix.js');
 require('../FluidForm/FluidForm.js');
 var FormContext = require('../FluidForm/FormContext.js');
-var ListBoxPropTypes = require('./ListBoxPropTypes.js');
 
 const handleOnKeyDown = event => {
   if (event.keyCode === 27) {

package/lib/components/ListItem/ListItem.js

@@ -14,8 +14,8 @@ var PropTypes = require('prop-types');
 var React = require('react');
 var cx = require('classnames');
 var usePrefix = require('../../internal/usePrefix.js');
-require('../Text/index.js');
 var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
 
 function ListItem({
   className,

package/lib/components/Menu/MenuItem.js

@@ -22,9 +22,9 @@ var Menu = require('./Menu.js');
 var MenuContext = require('./MenuContext.js');
 require('../LayoutDirection/LayoutDirection.js');
 var useLayoutDirection = require('../LayoutDirection/useLayoutDirection.js');
-require('../Text/index.js');
-var defaultItemToString = require('../../internal/defaultItemToString.js');
 var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
+var defaultItemToString = require('../../internal/defaultItemToString.js');
 
 var _Checkmark, _CaretLeft, _CaretRight;
 const MenuItem = /*#__PURE__*/React.forwardRef(function MenuItem({

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

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2023
+ * Copyright IBM Corp. 2023, 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.

package/lib/components/MenuButton/index.js

@@ -88,7 +88,7 @@ const MenuButton = /*#__PURE__*/React.forwardRef(({
     middleware: middlewares,
     whileElementsMounted: react.autoUpdate
   });
-  const ref = mergeRefs.default(forwardRef, triggerRef);
+  const ref = mergeRefs.mergeRefs(forwardRef, triggerRef);
   const {
     open,
     handleClick: hookOnClick,

package/lib/components/Modal/Modal.js

@@ -24,13 +24,15 @@ var requiredIfGivenPropIsTruthy = require('../../prop-types/requiredIfGivenPropI
 var wrapFocus = require('../../internal/wrapFocus.js');
 var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
 var useId = require('../../internal/useId.js');
+var useMergedRefs = require('../../internal/useMergedRefs.js');
 var usePrefix = require('../../internal/usePrefix.js');
 var usePreviousValue = require('../../internal/usePreviousValue.js');
 var keys = require('../../internal/keyboard/keys.js');
 var match = require('../../internal/keyboard/match.js');
 var index$2 = require('../IconButton/index.js');
 var noopFn = require('../../internal/noopFn.js');
-require('../Text/index.js');
+var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
 var index = require('../FeatureFlags/index.js');
 var events = require('../../tools/events.js');
 var deprecate = require('../../prop-types/deprecate.js');
@@ -38,12 +40,40 @@ var Dialog = require('../Dialog/Dialog.js');
 var index$1 = require('../AILabel/index.js');
 var utils = require('../../internal/utils.js');
 var warning = require('../../internal/warning.js');
+var ModalPresence = require('./ModalPresence.js');
 var debounce = require('../../node_modules/es-toolkit/dist/compat/function/debounce.js');
-var Text = require('../Text/Text.js');
 
 const ModalSizes = ['xs', 'sm', 'md', 'lg'];
 const invalidOutsideClickMessage = '`<Modal>` prop `preventCloseOnClickOutside` should not be `false` when ' + '`passiveModal` is `false`. Transactional, non-passive Modals should ' + 'not be dissmissable by clicking outside. ' + 'See: https://carbondesignsystem.com/components/modal/usage/#transactional-modal';
 const Modal = /*#__PURE__*/React.forwardRef(function Modal({
+  open,
+  ...props
+}, ref) {
+  const id = useId.useId();
+  const enablePresence = index.useFeatureFlag('enable-presence');
+  const hasPresenceContext = Boolean(React.useContext(ModalPresence.ModalPresenceContext));
+  const hasPresenceOptIn = enablePresence || hasPresenceContext;
+  const exclusivePresenceContext = ModalPresence.useExclusiveModalPresenceContext(id);
+
+  // if opt in and not exclusive to a presence context, wrap with presence
+  if (hasPresenceOptIn && !exclusivePresenceContext) {
+    return /*#__PURE__*/React.createElement(ModalPresence.ModalPresence, {
+      open: open ?? false,
+      _presenceId: id
+      // do not auto enable styles for opt-in by feature flag
+      ,
+      _autoEnablePresence: hasPresenceContext
+    }, /*#__PURE__*/React.createElement(ModalDialog, _rollupPluginBabelHelpers.extends({
+      open: true,
+      ref: ref
+    }, props)));
+  }
+  return /*#__PURE__*/React.createElement(ModalDialog, _rollupPluginBabelHelpers.extends({
+    ref: ref,
+    open: open
+  }, props));
+});
+const ModalDialog = /*#__PURE__*/React.forwardRef(function ModalDialog({
   'aria-label': ariaLabelProp,
   children,
   className,
@@ -54,7 +84,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   passiveModal = false,
   secondaryButtonText,
   primaryButtonText,
-  open,
+  open: externalOpen,
   onRequestClose = noopFn.noopFn,
   onRequestSubmit = noopFn.noopFn,
   onSecondarySubmit,
@@ -87,7 +117,6 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   const endTrap = React.useRef(null);
   const wrapFocusTimeout = React.useRef(null);
   const [isScrollable, setIsScrollable] = React.useState(false);
-  const prevOpen = usePreviousValue.usePreviousValue(open);
   const modalInstanceId = `modal-${useId.useId()}`;
   const modalLabelId = `${prefix}--modal-header__label--${modalInstanceId}`;
   const modalHeadingId = `${prefix}--modal-header__heading--${modalInstanceId}`;
@@ -97,6 +126,13 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     [`${prefix}--btn--loading`]: loadingStatus !== 'inactive'
   });
   const loadingActive = loadingStatus !== 'inactive';
+  const presenceContext = React.useContext(ModalPresence.ModalPresenceContext);
+  const mergedRefs = useMergedRefs.useMergedRefs([ref, presenceContext?.presenceRef]);
+  const enablePresence = index.useFeatureFlag('enable-presence') || presenceContext?.autoEnablePresence;
+
+  // always mark as open when mounted with presence
+  const open = externalOpen || enablePresence;
+  const prevOpen = usePreviousValue.usePreviousValue(open);
   const focusTrapWithoutSentinels = index.useFeatureFlag('enable-experimental-focus-wrap-without-sentinels');
   const enableDialogElement = index.useFeatureFlag('enable-dialog-element');
   process.env.NODE_ENV !== "production" ? warning.warning(!(focusTrapWithoutSentinels && enableDialogElement), '`<Modal>` detected both `focusTrapWithoutSentinels` and ' + '`enableDialogElement` feature flags are enabled. The native dialog ' + 'element handles focus, so `enableDialogElement` must be off for ' + '`focusTrapWithoutSentinels` to have any effect.') : void 0;
@@ -192,7 +228,8 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   const onSecondaryButtonClick = onSecondarySubmit ? onSecondarySubmit : onRequestClose;
   const modalClasses = cx(`${prefix}--modal`, {
     [`${prefix}--modal-tall`]: !passiveModal,
-    'is-visible': open,
+    'is-visible': enablePresence || open,
+    [`${prefix}--modal--enable-presence`]: presenceContext?.autoEnablePresence,
     [`${prefix}--modal--danger`]: danger,
     [`${prefix}--modal--slug`]: slug,
     [`${prefix}--modal--decorator`]: decorator
@@ -256,14 +293,25 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     }
   }, [open, prefix, enableDialogElement]);
   React.useEffect(() => {
-    if (!enableDialogElement && prevOpen && !open && launcherButtonRef) {
+    if (!enableDialogElement && !enablePresence && prevOpen && !open && launcherButtonRef) {
       setTimeout(() => {
         if ('current' in launcherButtonRef) {
           launcherButtonRef.current?.focus();
         }
       });
     }
-  }, [open, prevOpen, launcherButtonRef, enableDialogElement]);
+  }, [open, prevOpen, launcherButtonRef, enableDialogElement, enablePresence]);
+  // Focus launcherButtonRef on unmount
+  React.useEffect(() => {
+    const launcherButton = launcherButtonRef?.current;
+    return () => {
+      if (enablePresence && launcherButton) {
+        setTimeout(() => {
+          launcherButton.focus();
+        });
+      }
+    };
+  }, [enablePresence, launcherButtonRef]);
   React.useEffect(() => {
     if (!enableDialogElement) {
       const initialFocus = focusContainerElement => {
@@ -335,7 +383,8 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     role: isAlertDialog ? 'alertdialog' : '',
     "aria-describedby": isAlertDialog ? modalBodyId : '',
     className: containerClasses,
-    "aria-label": ariaLabel
+    "aria-label": ariaLabel,
+    "data-exiting": presenceContext?.isExiting || undefined
   }, /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--modal-header`
   }, modalLabel && /*#__PURE__*/React.createElement(Text.Text, {
@@ -462,7 +511,8 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     onBlur: handleBlur,
     className: modalClasses,
     role: "presentation",
-    ref: ref
+    ref: mergedRefs,
+    "data-exiting": presenceContext?.isExiting || undefined
   }), modalBody);
 });
 Modal.propTypes = {

package/lib/components/Modal/ModalPresence.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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, { type PropsWithChildren } from 'react';
+import { type PresenceContext } from '../../internal/usePresenceContext';
+export interface ModalPresenceProps {
+    /**
+     * Specify whether the Modal is currently open
+     */
+    open: boolean;
+    /**
+     * Internal property for backwards compatibility. Specify whether the Modal should opt in to presence mode.
+     */
+    _autoEnablePresence?: boolean;
+    /**
+     * Internal property to predefine the presence context's id for exclusivity.
+     */
+    _presenceId?: string;
+}
+export declare const ModalPresence: ({ open, _presenceId: presenceId, _autoEnablePresence: autoEnablePresence, children, }: PropsWithChildren<ModalPresenceProps>) => import("react/jsx-runtime").JSX.Element | null;
+interface ModalPresenceContextProps extends PresenceContext {
+    autoEnablePresence: boolean;
+}
+export declare const ModalPresenceContext: React.Context<ModalPresenceContextProps | undefined>;
+/**
+ * Handles occurrences where only a single modal must consume a context.
+ */
+export declare const useExclusiveModalPresenceContext: (id: string) => ModalPresenceContextProps | undefined;
+export {};

package/lib/components/Modal/ModalPresence.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+var React = require('react');
+var usePresenceContext = require('../../internal/usePresenceContext.js');
+
+const ModalPresence = ({
+  open,
+  _presenceId: presenceId,
+  _autoEnablePresence: autoEnablePresence = true,
+  children
+}) => {
+  const [isPresent, context] = usePresenceContext.usePresenceContext(open, presenceId);
+  const contextValue = React.useMemo(() => ({
+    autoEnablePresence,
+    ...context
+  }), [autoEnablePresence, context]);
+  if (!isPresent) return null;
+  return /*#__PURE__*/React.createElement(ModalPresenceContext.Provider, {
+    value: contextValue
+  }, children);
+};
+const ModalPresenceContext = /*#__PURE__*/React.createContext(undefined);
+
+/**
+ * Handles occurrences where only a single modal must consume a context.
+ */
+const useExclusiveModalPresenceContext = id => {
+  const ctx = React.useContext(ModalPresenceContext);
+  return ctx?.isPresenceExclusive(id) ? ctx : undefined;
+};
+
+exports.ModalPresence = ModalPresence;
+exports.ModalPresenceContext = ModalPresenceContext;
+exports.useExclusiveModalPresenceContext = useExclusiveModalPresenceContext;

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

@@ -5,5 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import Modal, { type ModalProps } from './Modal';
+import { ModalPresence, type ModalPresenceProps } from './ModalPresence';
 export default Modal;
-export { Modal, type ModalProps };
+export { Modal, ModalPresence, type ModalProps, type ModalPresenceProps };

package/lib/components/Modal/index.js

@@ -10,6 +10,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var Modal = require('./Modal.js');
+require('react');
 
 
 

package/lib/components/MultiSelect/FilterableMultiSelect.js

@@ -625,14 +625,14 @@ const FilterableMultiSelect = /*#__PURE__*/React.forwardRef(function FilterableM
       setIsFocused(evt?.type === 'focus' ? true : false);
     }
   };
-  const mergedRef = mergeRefs.default(textInput, inputProp.ref);
+  const mergedRef = mergeRefs.mergeRefs(textInput, inputProp.ref);
   const readOnlyEventHandlers = readOnly ? {
     onClick: evt => {
       // NOTE: does not prevent click
       evt.preventDefault();
       // focus on the element as per readonly input behavior
-      if (mergedRef.current !== undefined) {
-        mergedRef.current.focus();
+      if (textInput.current) {
+        textInput.current.focus();
       }
     },
     onKeyDown: evt => {

package/lib/components/MultiSelect/MultiSelect.js

@@ -235,7 +235,8 @@ const MultiSelect = /*#__PURE__*/React.forwardRef(({
       }
     }
   });
-  const mergedRef = mergeRefs.default(toggleButtonProps.ref, ref);
+  const toggleButtonRef = React.useRef(null);
+  const mergedRef = mergeRefs.mergeRefs(toggleButtonProps.ref, ref, toggleButtonRef);
   const selectedItems = selectedItem;
 
   /**
@@ -390,8 +391,8 @@ const MultiSelect = /*#__PURE__*/React.forwardRef(({
       // NOTE: does not prevent click
       evt.preventDefault();
       // focus on the element as per readonly input behavior
-      if (mergedRef.current !== undefined) {
-        mergedRef.current.focus();
+      if (toggleButtonRef.current) {
+        toggleButtonRef.current.focus();
       }
     },
     onKeyDown: evt => {

package/lib/components/Notification/Notification.js

@@ -13,7 +13,8 @@ var React = require('react');
 var deprecate = require('../../prop-types/deprecate.js');
 var cx = require('classnames');
 var iconsReact = require('@carbon/icons-react');
-require('../Text/index.js');
+var Text = require('../Text/Text.js');
+require('../Text/TextDirection.js');
 var Button = require('../Button/Button.js');
 require('../Button/Button.Skeleton.js');
 var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
@@ -27,7 +28,6 @@ var wrapFocus = require('../../internal/wrapFocus.js');
 var index = require('../FeatureFlags/index.js');
 var warning = require('../../internal/warning.js');
 var deprecateValuesWithin = require('../../prop-types/deprecateValuesWithin.js');
-var Text = require('../Text/Text.js');
 
 /**
  * Conditionally call a callback when the escape key is pressed

package/lib/components/NumberInput/NumberInput.d.ts

@@ -17,6 +17,26 @@ export declare const translationIds: {
 type TranslationKey = keyof typeof translationIds;
 type ExcludedAttributes = 'defaultValue' | 'id' | 'min' | 'max' | 'onChange' | 'onClick' | 'size' | 'step' | 'value';
 export interface NumberInputProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, ExcludedAttributes>, TranslateWithId<TranslationKey> {
+    /**
+     * Optional validation function that is called with the input value and locale.
+     * This is called before other validations, giving consumers the ability
+     * to short-circuit or extend validation without replacing built-in rules
+     * @example
+     * // Using the built-in separator validation
+     * <NumberInput validate={validateNumberSeparators} />
+     *
+     * // Combining with custom validation
+     * <NumberInput
+     *   validate={(value, locale) => {
+     *     return validateNumberSeparators(value, locale) && customValidation(value)
+     *   }}
+     * />
+     * - Return `false` to immediately fail validation.
+     * - Return `true` to pass this validation, but still run other checks (min, max, required, etc.).
+     * - Return `undefined` to defer entirely to built-in validation logic.
+     *
+     */
+    validate?: (value: string, locale: string) => boolean | undefined;
     /**
      * `true` to allow empty string.
      */
@@ -186,16 +206,6 @@ export interface NumberInputProps extends Omit<React.InputHTMLAttributes<HTMLInp
      */
     warnText?: ReactNode;
 }
+export declare const validateNumberSeparators: (input: string, locale: string) => boolean;
 declare const NumberInput: React.ForwardRefExoticComponent<NumberInputProps & React.RefAttributes<HTMLInputElement>>;
-export interface Label {
-    disabled?: boolean;
-    hideLabel?: boolean;
-    id?: string;
-    label?: ReactNode;
-}
-export interface HelperTextProps {
-    id?: string;
-    description?: ReactNode;
-    disabled?: boolean;
-}
 export { NumberInput };