@carbon/react 1.99.0 → 1.100.0

package/lib/components/Text/TextDirection.js

@@ -25,9 +25,7 @@ const TextDirection = ({
   }, [dir]);
   React.useEffect(() => {
     savedCallback.current = getTextDirection;
-    // TODO: Is this `useEffect` supposed to have a dependency on
-    // `getTextDirection`?
-  });
+  }, [getTextDirection]);
   return /*#__PURE__*/React.createElement(TextDirectionContext.TextDirectionContext.Provider, {
     value: value
   }, children);

package/lib/components/Text/TextDirectionContext.d.ts

@@ -1,14 +1,14 @@
 /**
- * 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.
  */
-import { type MutableRefObject } from 'react';
+import { type RefObject } from 'react';
 export type TextDir = 'ltr' | 'rtl' | 'auto' | string;
 export type GetTextDirection = (text: string | string[] | undefined) => TextDir;
 export interface TextDirectionContextType {
     direction: TextDir;
-    getTextDirection: MutableRefObject<GetTextDirection | undefined>;
+    getTextDirection: RefObject<GetTextDirection | undefined>;
 }
 export declare const TextDirectionContext: import("react").Context<TextDirectionContextType>;

package/lib/components/TextArea/TextArea.js

@@ -148,9 +148,7 @@ const TextArea = frFn((props, forwardRef) => {
             setTimeout(() => {
               setTextCount(0);
             }, 0);
-            return;
-          }
-          if (enableCounter && typeof maxCount !== 'undefined' && textareaRef.current !== null) {
+          } else if (enableCounter && typeof maxCount !== 'undefined' && textareaRef.current !== null) {
             const matchedWords = evt.target?.value?.match(/\p{L}+/gu);
             if (matchedWords && matchedWords.length <= maxCount) {
               textareaRef.current.removeAttribute('maxLength');

package/lib/components/TextInput/ControlledPasswordInput.d.ts

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

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

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2019, 2025
+ * Copyright IBM Corp. 2019, 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/Tile/Tile.js

@@ -384,11 +384,8 @@ const ExpandableTile = /*#__PURE__*/React.forwardRef(({
   hasRoundedCorners,
   ...rest
 }, forwardRef) => {
-  const [isTileMaxHeight, setIsTileMaxHeight] = React.useState(tileMaxHeight);
-  const [isTilePadding, setIsTilePadding] = React.useState(tilePadding);
-  const [prevExpanded, setPrevExpanded] = React.useState(expanded);
-  const [prevTileMaxHeight, setPrevTileMaxHeight] = React.useState(tileMaxHeight);
-  const [prevTilePadding, setPrevTilePadding] = React.useState(tilePadding);
+  const [measuredAboveHeight, setMeasuredAboveHeight] = React.useState(0);
+  const [measuredPadding, setMeasuredPadding] = React.useState(0);
   const [isExpanded, setIsExpanded] = React.useState(expanded);
   const [interactive, setInteractive] = React.useState(true);
   const aboveTheFold = React.useRef(null);
@@ -398,105 +395,74 @@ const ExpandableTile = /*#__PURE__*/React.forwardRef(({
   const tile = React.useRef(null);
   const ref = useMergedRefs.useMergedRefs([forwardRef, tile]);
   const prefix = usePrefix.usePrefix();
-  if (expanded !== prevExpanded) {
+  React.useEffect(() => {
     setIsExpanded(expanded);
-    setPrevExpanded(expanded);
-    setMaxHeight();
-  }
-  if (tileMaxHeight !== prevTileMaxHeight) {
-    setIsTileMaxHeight(tileMaxHeight);
-    setPrevTileMaxHeight(tileMaxHeight);
-  }
-  if (tilePadding !== prevTilePadding) {
-    setIsTilePadding(tilePadding);
-    setPrevTilePadding(tilePadding);
-  }
-  function setMaxHeight() {
-    if (isExpanded && tileContent.current) {
-      setIsTileMaxHeight(tileContent.current.getBoundingClientRect()?.height);
-    }
-    if (aboveTheFold.current) {
-      setIsTileMaxHeight(aboveTheFold.current.getBoundingClientRect().height);
-    }
-  }
-  function handleClick(evt) {
-    evt?.persist?.();
-    setIsExpanded(!isExpanded);
-    setMaxHeight();
-  }
-  function handleKeyUp(evt) {
+  }, [expanded]);
+  const handleClick = () => {
+    setIsExpanded(prev => !prev);
+  };
+  const handleKeyUp = evt => {
     if (evt.target !== tile.current && evt.target !== chevronInteractiveRef.current) {
       if (match.matches(evt, [keys.Enter, keys.Space])) {
         evt.preventDefault();
       }
     }
-  }
-  function getChildren() {
-    return React.Children.toArray(children);
-  }
+  };
   const classNames = cx(`${prefix}--tile`, `${prefix}--tile--expandable`, {
     [`${prefix}--tile--is-expanded`]: isExpanded,
     [`${prefix}--tile--light`]: light
   }, className);
-  const interactiveClassNames = cx(`${prefix}--tile`, `${prefix}--tile--expandable`, `${prefix}--tile--expandable--interactive`, {
-    [`${prefix}--tile--is-expanded`]: isExpanded,
-    [`${prefix}--tile--light`]: light,
+  const interactiveClassNames = cx(classNames, `${prefix}--tile--expandable--interactive`, {
     [`${prefix}--tile--slug`]: slug,
     [`${prefix}--tile--slug-rounded`]: slug && hasRoundedCorners,
     [`${prefix}--tile--decorator`]: decorator,
     [`${prefix}--tile--decorator-rounded`]: decorator && hasRoundedCorners
-  }, className);
+  });
   const chevronInteractiveClassNames = cx(`${prefix}--tile__chevron`, `${prefix}--tile__chevron--interactive`);
-  const childrenAsArray = getChildren();
+  const childrenAsArray = React.Children.toArray(children);
   useIsomorphicEffect.default(() => {
     if (!tile.current || !aboveTheFold.current) {
       return;
     }
-    const getStyle = window.getComputedStyle(tile.current, null);
-    const {
-      current: node
-    } = aboveTheFold;
-    const {
-      height
-    } = node.getBoundingClientRect();
-    const paddingTop = parseInt(getStyle.getPropertyValue('padding-top'), 10);
-    const paddingBottom = parseInt(getStyle.getPropertyValue('padding-bottom'), 10);
-    setIsTileMaxHeight(height);
-    setIsTilePadding(paddingTop + paddingBottom);
-  }, [isTileMaxHeight]);
+    const style = window.getComputedStyle(tile.current);
+    const paddingTop = parseInt(style.getPropertyValue('padding-top'), 10) || 0;
+    const paddingBottom = parseInt(style.getPropertyValue('padding-bottom'), 10) || 0;
+    setMeasuredPadding(paddingTop + paddingBottom);
+    setMeasuredAboveHeight(aboveTheFold.current.scrollHeight);
+  }, []);
   useIsomorphicEffect.default(() => {
     if (!aboveTheFold.current || !belowTheFold.current) {
       return;
     }
-
-    // Interactive elements or elements that are given a role should be treated
-    // the same because elements with a role can not be rendered inside a `button`
-    if (!useNoInteractiveChildren.getInteractiveContent(belowTheFold.current) && !useNoInteractiveChildren.getRoleContent(belowTheFold.current) && !useNoInteractiveChildren.getInteractiveContent(aboveTheFold.current) && !useNoInteractiveChildren.getRoleContent(aboveTheFold.current) && !(slug || decorator)) {
-      setInteractive(false);
-    }
-  }, [slug, decorator]);
+    const hasInteractive = Boolean(useNoInteractiveChildren.getInteractiveContent(aboveTheFold.current)) || Boolean(useNoInteractiveChildren.getRoleContent(aboveTheFold.current)) || Boolean(useNoInteractiveChildren.getInteractiveContent(belowTheFold.current)) || Boolean(useNoInteractiveChildren.getRoleContent(belowTheFold.current)) || Boolean(slug || decorator);
+    setInteractive(hasInteractive);
+  }, [slug, decorator, children]);
   useIsomorphicEffect.default(() => {
     if (!tile.current) {
       return;
     }
     if (isExpanded) {
       tile.current.style.maxHeight = '';
-    } else {
-      tile.current.style.maxHeight = isTileMaxHeight + isTilePadding + 'px';
+      return;
     }
-  }, [isExpanded, isTileMaxHeight, isTilePadding]);
+    const measured = measuredAboveHeight || aboveTheFold.current?.scrollHeight || 0;
+    const baseHeight = tileMaxHeight > 0 ? tileMaxHeight : measured;
+    const pad = tilePadding > 0 ? tilePadding : measuredPadding;
+    tile.current.style.maxHeight = `${baseHeight + pad}px`;
+  }, [isExpanded, tileMaxHeight, tilePadding, measuredAboveHeight, measuredPadding]);
   React.useEffect(() => {
     if (!aboveTheFold.current) {
       return;
     }
-    const resizeObserver = new ResizeObserver(entries => {
-      const [aboveTheFold] = entries;
-      setIsTileMaxHeight(aboveTheFold.contentRect.height);
+    const resizeObserver = new ResizeObserver(() => {
+      if (aboveTheFold.current) {
+        setMeasuredAboveHeight(aboveTheFold.current.scrollHeight);
+      }
     });
     resizeObserver.observe(aboveTheFold.current);
     return () => resizeObserver.disconnect();
-  }, [isTileMaxHeight, isTilePadding]);
-  const belowTheFoldId = useId.useId('expandable-tile-interactive');
+  }, []);
+  const belowTheFoldId = useId.useId(interactive ? 'expandable-tile-interactive' : 'expandable-tile');
 
   // AILabel is always size `xs`
   const candidate = slug ?? decorator;
@@ -531,6 +497,7 @@ const ExpandableTile = /*#__PURE__*/React.forwardRef(({
     type: "button",
     ref: ref,
     className: classNames,
+    "aria-controls": belowTheFoldId,
     "aria-expanded": isExpanded,
     title: isExpanded ? tileExpandedIconText : tileCollapsedIconText
   }, rest, {
@@ -546,6 +513,7 @@ const ExpandableTile = /*#__PURE__*/React.forwardRef(({
     className: `${prefix}--tile__chevron`
   }, /*#__PURE__*/React.createElement("span", null, isExpanded ? tileExpandedLabel : tileCollapsedLabel), _ChevronDown2 || (_ChevronDown2 = /*#__PURE__*/React.createElement(iconsReact.ChevronDown, null))), /*#__PURE__*/React.createElement("div", {
     ref: belowTheFold,
+    id: belowTheFoldId,
     className: `${prefix}--tile-content`
   }, childrenAsArray[1])));
 });

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

@@ -1,14 +1,20 @@
 /**
- * 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 ToggleSkeletonProps {
     'aria-label'?: string;
     className?: string;
 }
-declare const ToggleSkeleton: React.FC<ToggleSkeletonProps>;
+declare const ToggleSkeleton: {
+    ({ className, ...rest }: ToggleSkeletonProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        'aria-label': PropTypes.Requireable<string>;
+        className: PropTypes.Requireable<string>;
+    };
+};
 export default ToggleSkeleton;
 export { ToggleSkeleton };

package/lib/components/Toggletip/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/Toggletip/index.js

@@ -188,7 +188,6 @@ Toggletip.propTypes = {
  * `ToggletipButton` controls the visibility of the Toggletip through mouse
  * clicks and keyboard interactions.
  */
-
 const ToggletipButton = /*#__PURE__*/React.forwardRef(function ToggletipButton({
   children,
   className: customClassName,
@@ -229,15 +228,18 @@ ToggletipButton.propTypes = {
   label: PropTypes.string
 };
 ToggletipButton.displayName = 'ToggletipButton';
+const frFn = React.forwardRef;
+
 /**
  * `ToggletipContent` is a wrapper around `PopoverContent`. It places the
  * `children` passed in as a prop inside of `PopoverContent` so that they will
  * be rendered inside of the popover for this component.
  */
-const ToggletipContent = /*#__PURE__*/React.forwardRef(function ToggletipContent({
-  children,
-  className: customClassName
-}, ref) {
+const ToggletipContent = frFn((props, ref) => {
+  const {
+    children,
+    className: customClassName
+  } = props;
   const toggletip = useToggletip();
   const prefix = usePrefix.usePrefix();
   return /*#__PURE__*/React.createElement(index.PopoverContent, _rollupPluginBabelHelpers.extends({

package/lib/components/Tooltip/DefinitionTooltip.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';
 import { PopoverAlignment } from '../Popover';
 export interface DefinitionTooltipProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'id' | 'classname' | 'children' | 'type'> {
@@ -54,5 +55,55 @@ export interface DefinitionTooltipProps extends Omit<React.ButtonHTMLAttributes<
      */
     triggerClassName?: string;
 }
-declare const DefinitionTooltip: React.FC<DefinitionTooltipProps>;
+declare const DefinitionTooltip: {
+    ({ align, autoAlign, className, children, definition, defaultOpen, id, openOnHover, tooltipText, triggerClassName, ...rest }: DefinitionTooltipProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Specify how the trigger should align with the tooltip
+         */
+        align: PropTypes.Requireable<string>;
+        /**
+         * Will auto-align the popover. This prop is currently experimental and is
+         * subject to future changes. Requires React v17+
+         * @see https://github.com/carbon-design-system/carbon/issues/18714
+         */
+        autoAlign: PropTypes.Requireable<boolean>;
+        /**
+         * The `children` prop will be used as the value that is being defined
+         */
+        children: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        /**
+         * Specify an optional className to be applied to the container node
+         */
+        className: PropTypes.Requireable<string>;
+        /**
+         * Specify whether the tooltip should be open when it first renders
+         */
+        defaultOpen: PropTypes.Requireable<boolean>;
+        /**
+         * The `definition` prop is used as the content inside of the tooltip that
+         * appears when a user interacts with the element rendered by the `children`
+         * prop
+         */
+        definition: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        /**
+         * Provide a value that will be assigned as the id of the tooltip
+         */
+        id: PropTypes.Requireable<string>;
+        /**
+         * Specifies whether or not the `DefinitionTooltip` should open on hover or not
+         */
+        openOnHover: PropTypes.Requireable<boolean>;
+        /**
+         * [Deprecated in v11] Please use the `definition` prop instead.
+         *
+         * Provide the text that will be displayed in the tooltip when it is rendered.
+         */
+        tooltipText: (props: Record<string, any>, propName: string, componentName: string, ...rest: any[]) => any;
+        /**
+         * The CSS class name of the trigger element
+         */
+        triggerClassName: PropTypes.Requireable<string>;
+    };
+};
 export { DefinitionTooltip };

package/lib/components/Tooltip/Tooltip.js

@@ -189,6 +189,8 @@ const Tooltip = /*#__PURE__*/React.forwardRef(({
     }, label || description))
   );
 });
+
+// @ts-expect-error - `propTypes` isn't typed.
 Tooltip.propTypes = {
   /**
    * Specify how the trigger should align with the tooltip

package/lib/components/TreeView/TreeNode.d.ts

@@ -1,10 +1,10 @@
 /**
- * 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.
  */
-import React, { type ComponentType, type FunctionComponent } from 'react';
+import React, { type ElementType } from 'react';
 type UncontrolledOnToggle = (event: React.MouseEvent | React.KeyboardEvent, node: Pick<TreeNodeProps, 'id' | 'label' | 'value' | 'isExpanded'>) => void;
 type ControlledOnToggle = (isExpanded: TreeNodeProps['isExpanded']) => void;
 export type TreeNodeProps = {
@@ -78,7 +78,7 @@ export type TreeNodeProps = {
     /**
      * A component used to render an icon.
      */
-    renderIcon?: ComponentType | FunctionComponent;
+    renderIcon?: ElementType;
     /**
      * **Note:** this is controlled by the parent TreeView component, do not set manually.
      * Array containing all selected node IDs in the tree
@@ -178,7 +178,7 @@ declare const TreeNode: React.ForwardRefExoticComponent<{
     /**
      * A component used to render an icon.
      */
-    renderIcon?: ComponentType | FunctionComponent;
+    renderIcon?: ElementType;
     /**
      * **Note:** this is controlled by the parent TreeView component, do not set manually.
      * Array containing all selected node IDs in the tree

package/lib/components/UIShell/Header.d.ts

@@ -1,10 +1,11 @@
 /**
- * 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, { ReactNode } from 'react';
+import PropTypes from 'prop-types';
+import { ReactNode } from 'react';
 export interface HeaderProps {
     children?: ReactNode;
     /**
@@ -20,5 +21,21 @@ export interface HeaderProps {
      */
     className?: string;
 }
-declare const Header: React.FC<HeaderProps>;
+declare const Header: {
+    ({ className: customClassName, children, ...rest }: HeaderProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * Optionally provide aria-label
+         */
+        'aria-label': PropTypes.Requireable<string>;
+        /**
+         * Optionally provide aria-labelledby
+         */
+        'aria-labelledby': PropTypes.Requireable<string>;
+        /**
+         * Optionally provide a custom class name that is applied to the underlying header
+         */
+        className: PropTypes.Requireable<string>;
+    };
+};
 export default Header;

package/lib/components/UIShell/HeaderGlobalAction.d.ts

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -55,5 +55,5 @@ export interface HeaderGlobalActionProps {
  *
  * Note: children passed to this component should be an Icon.
  */
-declare const HeaderGlobalAction: React.FC<HeaderGlobalActionProps>;
+declare const HeaderGlobalAction: React.ForwardRefExoticComponent<HeaderGlobalActionProps & React.RefAttributes<HTMLButtonElement>>;
 export default HeaderGlobalAction;

package/lib/components/UIShell/HeaderName.js

@@ -28,7 +28,7 @@ function HeaderName({
     className: className
   }), prefix && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: `${selectorPrefix}--header__name--prefix`
-  }, prefix), "\xA0"), children);
+  }, prefix), "\xA0"), /*#__PURE__*/React.createElement("span", null, children));
 }
 HeaderName.propTypes = {
   /**

package/lib/components/UIShell/Link.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/UIShell/Link.js

@@ -16,24 +16,24 @@ var deprecate = require('../../prop-types/deprecate.js');
 
 // First define the component without generics
 
-const LinkBase = ({
-  element,
-  as: BaseComponent,
-  // Captured here to prevent it from being passed into the created element.
-  // See https://github.com/carbon-design-system/carbon/issues/3970
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars -- https://github.com/carbon-design-system/carbon/issues/20452
-  isSideNavExpanded: _isSideNavExpanded,
-  ...rest
-}, ref) => {
+const frFn = React.forwardRef;
+const Link = frFn((props, ref) => {
+  const {
+    element,
+    as: BaseComponent,
+    // Captured here to prevent it from being passed into the created element.
+    // See https://github.com/carbon-design-system/carbon/issues/3970
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars -- https://github.com/carbon-design-system/carbon/issues/20452
+    isSideNavExpanded: _isSideNavExpanded,
+    ...rest
+  } = props;
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any -- https://github.com/carbon-design-system/carbon/issues/20452
   const BaseComponentAsAny = BaseComponent ?? element ?? 'a';
   return /*#__PURE__*/React.createElement(BaseComponentAsAny, _rollupPluginBabelHelpers.extends({
     ref: ref
   }, rest));
-};
-
-// Use forwardRef with the non-generic function
-const Link = /*#__PURE__*/React.forwardRef(LinkBase);
+});
 
 /**
  * Link is a custom component that allows us to supporting rendering elements

package/lib/components/UIShell/SideNav.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.
@@ -9,7 +9,7 @@ export interface SideNavProps {
     expanded?: boolean | undefined;
     defaultExpanded?: boolean | undefined;
     isChildOfHeader?: boolean | undefined;
-    onToggle?: (event: FocusEvent<HTMLElement> | KeyboardEvent<HTMLElement> | boolean, value: boolean) => void | undefined;
+    onToggle?: (event: FocusEvent<HTMLElement> | KeyboardEvent<HTMLElement> | boolean, value: boolean) => void;
     href?: string | undefined;
     isFixedNav?: boolean | undefined;
     isRail?: boolean | undefined;
@@ -17,9 +17,8 @@ export interface SideNavProps {
     addFocusListeners?: boolean | undefined;
     addMouseListeners?: boolean | undefined;
     onOverlayClick?: MouseEventHandler<HTMLDivElement> | undefined;
-    onSideNavBlur?: () => void | undefined;
+    onSideNavBlur?: () => void;
     enterDelayMs?: number;
-    inert?: boolean;
 }
 interface SideNavContextData {
     isRail?: boolean | undefined;

package/lib/components/UIShell/SideNav.js

@@ -28,28 +28,30 @@ var useMatchMedia = require('../../internal/useMatchMedia.js');
 // import SideNavFooter from './SideNavFooter';
 
 const SideNavContext = /*#__PURE__*/React.createContext({});
-function SideNavRenderFunction({
-  expanded: expandedProp,
-  defaultExpanded = false,
-  isChildOfHeader = true,
-  'aria-label': ariaLabel,
-  'aria-labelledby': ariaLabelledBy,
-  children,
-  onToggle,
-  className: customClassName,
-  // TO-DO: comment back in when footer is added for rails
-  // translateById: t = (id) => translations[id],
-  href,
-  isFixedNav = false,
-  isRail,
-  isPersistent = true,
-  addFocusListeners = true,
-  addMouseListeners = true,
-  onOverlayClick,
-  onSideNavBlur,
-  enterDelayMs = 100,
-  ...other
-}, ref) {
+const frFn = React.forwardRef;
+const SideNav = frFn((props, ref) => {
+  const {
+    expanded: expandedProp,
+    defaultExpanded = false,
+    isChildOfHeader = true,
+    'aria-label': ariaLabel,
+    'aria-labelledby': ariaLabelledBy,
+    children,
+    onToggle,
+    className: customClassName,
+    // TO-DO: comment back in when footer is added for rails
+    // translateById: t = (id) => translations[id],
+    href,
+    isFixedNav = false,
+    isRail,
+    isPersistent = true,
+    addFocusListeners = true,
+    addMouseListeners = true,
+    onOverlayClick,
+    onSideNavBlur,
+    enterDelayMs = 100,
+    ...other
+  } = props;
   const prefix = usePrefix.usePrefix();
   const {
     current: controlled
@@ -159,6 +161,16 @@ function SideNavRenderFunction({
   });
   const lgMediaQuery = `(min-width: ${layout.breakpoints.lg.width})`;
   const isLg = useMatchMedia.useMatchMedia(lgMediaQuery);
+  const inertEnabled = !isRail ? !(expanded || isLg) : false;
+  React.useEffect(() => {
+    const node = sideNavRef.current;
+    if (!node) return;
+    if (inertEnabled) {
+      node.setAttribute('inert', '');
+    } else {
+      node.removeAttribute('inert');
+    }
+  }, [inertEnabled]);
   return /*#__PURE__*/React.createElement(SideNavContext.Provider, {
     value: {
       isRail
@@ -172,11 +184,9 @@ function SideNavRenderFunction({
   }), /*#__PURE__*/React.createElement("nav", _rollupPluginBabelHelpers.extends({
     tabIndex: -1,
     ref: navRef,
-    className: `${prefix}--side-nav__navigation ${className}`,
-    inert: !isRail ? !(expanded || isLg) : undefined
+    className: `${prefix}--side-nav__navigation ${className}`
   }, accessibilityLabel, eventHandlers, other), childrenToRender));
-}
-const SideNav = /*#__PURE__*/React.forwardRef(SideNavRenderFunction);
+});
 SideNav.displayName = 'SideNav';
 SideNav.propTypes = {
   /**