@carbon/react 1.100.0 → 1.101.0-rc.0

package/es/components/TextInput/TextInput.js

@@ -141,19 +141,19 @@ const TextInput = /*#__PURE__*/forwardRef(({
     as: "div",
     className: counterClasses
   }, `${textCount}/${maxCount}`) : null;
-  const label = labelText ? /*#__PURE__*/React.createElement(Text, {
+  const label = typeof labelText !== 'undefined' && labelText !== null && /*#__PURE__*/React.createElement(Text, {
     as: "label",
     htmlFor: id,
     className: labelClasses
-  }, labelText) : null;
+  }, labelText);
   const labelWrapper = /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--text-input__label-wrapper`
   }, label, counter);
-  const helper = helperText ? /*#__PURE__*/React.createElement(Text, {
+  const helper = typeof helperText !== 'undefined' && helperText !== null && /*#__PURE__*/React.createElement(Text, {
     as: "div",
     id: normalizedProps.helperId,
     className: helperTextClasses
-  }, helperText) : null;
+  }, helperText);
   const input = /*#__PURE__*/React.createElement("input", getTextInputProps({
     sharedTextInputProps,
     invalid: normalizedProps.invalid,

package/es/components/TimePicker/TimePicker.js

@@ -98,10 +98,10 @@ const TimePicker = frFn((props, ref) => {
     [`${prefix}--visually-hidden`]: hideLabel,
     [`${prefix}--label--disabled`]: disabled
   });
-  const label = labelText ? /*#__PURE__*/React.createElement("label", {
+  const label = typeof labelText !== 'undefined' && labelText !== null && /*#__PURE__*/React.createElement("label", {
     htmlFor: id,
     className: labelClasses
-  }, labelText) : null;
+  }, labelText);
   function getInternalPickerSelects() {
     const readOnlyEventHandlers = {
       onMouseDown: evt => {

package/es/components/Tooltip/DefinitionTooltip.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/es/components/Tooltip/DefinitionTooltip.js

@@ -48,8 +48,9 @@ const DefinitionTooltip = ({
       setOpen(false);
     },
     onMouseEnter: () => {
-      // eslint-disable-next-line  @typescript-eslint/no-unused-expressions -- https://github.com/carbon-design-system/carbon/issues/20452
-      openOnHover ? setOpen(true) : null;
+      if (openOnHover) {
+        setOpen(true);
+      }
     },
     onFocus: () => {
       setOpen(true);

package/es/internal/useId.js

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, { useState, useLayoutEffect, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { setupGetInstanceId } from '../tools/setupGetInstanceId.js';
-import { canUseDOM } from './environment.js';
+import useIsomorphicEffect from './useIsomorphicEffect.js';
 import { useIdPrefix } from './useIdPrefix.js';
 
 // This file was heavily inspired by:
@@ -46,7 +46,6 @@ const _React = {
   ...React
 };
 const instanceId = setupGetInstanceId();
-const useIsomorphicLayoutEffect = canUseDOM ? useLayoutEffect : useEffect;
 let serverHandoffCompleted = false;
 const defaultId = 'id';
 
@@ -64,7 +63,7 @@ function useCompatibleId(prefix = defaultId) {
     }
     return null;
   });
-  useIsomorphicLayoutEffect(() => {
+  useIsomorphicEffect(() => {
     if (id === null) {
       setId(`${contextPrefix ? `${contextPrefix}-` : ``}${prefix}-${instanceId()}`);
     }

package/es/internal/usePresence.js

@@ -5,8 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useState, useCallback, useLayoutEffect } from 'react';
+import { useState, useCallback } from 'react';
 import { usePrefix } from './usePrefix.js';
+import useIsomorphicEffect from './useIsomorphicEffect.js';
 
 const usePresence = (ref, isOpen) => {
   const prefix = usePrefix();
@@ -25,7 +26,7 @@ const usePresence = (ref, isOpen) => {
   const handleAnimationEnd = useCallback(() => {
     setExitState('finished');
   }, []);
-  useLayoutEffect(() => {
+  useIsomorphicEffect(() => {
     if (!ref.current || !isExiting) return;
 
     // resolve for JSDOM

package/es/internal/useResizeObserver.d.ts

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

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { useState, useRef, useEffect, useLayoutEffect } from 'react';
+import { useState, useRef, useEffect } from 'react';
+import useIsomorphicEffect from './useIsomorphicEffect.js';
 
 const useResizeObserver = ({
   ref,
@@ -16,7 +17,7 @@ const useResizeObserver = ({
   const entriesToHandle = useRef(null);
   const cb = useRef(onResize);
   useEffect(() => {
-    // ref for onResize removes it as dependency from useLayoutEffect
+    // ref for onResize removes it as dependency from useIsomorphicEffect
     // This significantly reduces repeated calls if a function is redefined on every
     // render
     cb.current = onResize;
@@ -37,7 +38,7 @@ const useResizeObserver = ({
     getInitialSize();
     // eslint-disable-next-line  react-hooks/exhaustive-deps -- https://github.com/carbon-design-system/carbon/issues/20452
   }, [width, height]);
-  useLayoutEffect(() => {
+  useIsomorphicEffect(() => {
     if (!ref?.current) {
       return;
     }
@@ -48,9 +49,7 @@ const useResizeObserver = ({
       const entry = entriesToHandle.current[0];
       setWidth(entry.contentRect.width);
       setHeight(entry.contentRect.height);
-
-      // eslint-disable-next-line  @typescript-eslint/no-unused-expressions -- https://github.com/carbon-design-system/carbon/issues/20452
-      cb.current && cb.current(entry.contentRect);
+      cb.current?.(entry.contentRect);
     };
     const observer = new ResizeObserver(entries => {
       // always update entriesToHandle
@@ -66,7 +65,6 @@ const useResizeObserver = ({
     return () => {
       observer.disconnect();
     };
-    // eslint-disable-next-line  react-hooks/exhaustive-deps -- https://github.com/carbon-design-system/carbon/issues/20452
   }, []);
   return {
     width,

package/es/tools/events.d.ts

@@ -14,4 +14,4 @@ import type { SyntheticEvent } from 'react';
  * @param handlers - An array of event handler functions.
  * @returns A composite event handler.
  */
-export declare const composeEventHandlers: <E extends SyntheticEvent = SyntheticEvent<Element, Event>>(handlers: (((event: E, ...args: any[]) => void) | undefined)[]) => (event: E, ...args: any[]) => void;
+export declare const composeEventHandlers: <E extends SyntheticEvent = SyntheticEvent>(handlers: (((event: E, ...args: any[]) => void) | undefined)[]) => (event: E, ...args: any[]) => void;

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

@@ -25,20 +25,9 @@ const AILabelContent = /*#__PURE__*/React.forwardRef(function AILabelContent({
 }, ref // eslint-disable-line @typescript-eslint/no-unused-vars -- https://github.com/carbon-design-system/carbon/issues/20452
 ) {
   const prefix = usePrefix.usePrefix();
-  const hasAILabelActions = React.Children.toArray(children).some(child => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- https://github.com/carbon-design-system/carbon/issues/20452
-    const item = child;
-    // TODO: Is there supposed to be a `return` here? If so, this issue would
-    // have been caught by ESLint. It's concerning that this code is 7 months
-    // old and no one has noticed any issues with it. It also makes me question
-    // whether the code is necessary.
-    // https://github.com/carbon-design-system/carbon/issues/18991
-    // eslint-disable-next-line  @typescript-eslint/no-unused-expressions -- https://github.com/carbon-design-system/carbon/issues/20452
-    item.type === AILabelActions;
-  });
   const aiLabelContentClasses = cx(className, {
     [`${prefix}--ai-label-content`]: true,
-    [`${prefix}--ai-label-content--with-actions`]: hasAILabelActions
+    [`${prefix}--ai-label-content--with-actions`]: false
   });
   return /*#__PURE__*/React.createElement(index.ToggletipContent, {
     className: aiLabelContentClasses

package/lib/components/Checkbox/Checkbox.js

@@ -46,11 +46,12 @@ const Checkbox = /*#__PURE__*/React.forwardRef(({
   const showWarning = !readOnly && !invalid && warn;
   const showHelper = !invalid && !warn;
   const checkboxGroupInstanceId = useId.useId();
-  const helperId = !helperText ? undefined : `checkbox-helper-text-${checkboxGroupInstanceId}`;
-  const helper = helperText ? /*#__PURE__*/React.createElement("div", {
+  const hasHelper = typeof helperText !== 'undefined' && helperText !== null;
+  const helperId = !hasHelper ? undefined : `checkbox-helper-text-${checkboxGroupInstanceId}`;
+  const helper = hasHelper && /*#__PURE__*/React.createElement("div", {
     id: helperId,
     className: `${prefix}--form__helper-text`
-  }, helperText) : null;
+  }, helperText);
   const wrapperClasses = cx(`${prefix}--form-item`, `${prefix}--checkbox-wrapper`, className, {
     [`${prefix}--checkbox-wrapper--readonly`]: readOnly,
     [`${prefix}--checkbox-wrapper--invalid`]: !readOnly && invalid,
@@ -110,6 +111,7 @@ const Checkbox = /*#__PURE__*/React.forwardRef(({
     className: `${prefix}--checkbox-label`,
     title: title
   }, /*#__PURE__*/React.createElement(Text.Text, {
+    as: "div",
     className: innerLabelClasses
   }, labelText, slug ? normalizedDecorator : decorator ? /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--checkbox-wrapper-inner--decorator`

package/lib/components/CheckboxGroup/CheckboxGroup.js

@@ -42,11 +42,12 @@ const CheckboxGroup = ({
   const showWarning = !readOnly && !invalid && warn;
   const showHelper = !invalid && !warn;
   const checkboxGroupInstanceId = useId.useId();
-  const helperId = !helperText ? undefined : `checkbox-group-helper-text-${checkboxGroupInstanceId}`;
-  const helper = helperText ? /*#__PURE__*/React.createElement("div", {
+  const hasHelper = typeof helperText !== 'undefined' && helperText !== null;
+  const helperId = !hasHelper ? undefined : `checkbox-group-helper-text-${checkboxGroupInstanceId}`;
+  const helper = hasHelper && /*#__PURE__*/React.createElement("div", {
     id: helperId,
     className: `${prefix}--form__helper-text`
-  }, helperText) : null;
+  }, helperText);
   const fieldsetClasses = cx(`${prefix}--checkbox-group`, className, {
     [`${prefix}--checkbox-group--${orientation}`]: orientation === 'horizontal',
     [`${prefix}--checkbox-group--readonly`]: readOnly,

package/lib/components/CodeSnippet/CodeSnippet.d.ts

@@ -111,7 +111,7 @@ declare namespace CodeSnippet {
         /**
          * Specify how the trigger should align with the tooltip
          */
-        align: PropTypes.Requireable<string> | PropTypes.Validator<string>;
+        align: PropTypes.Requireable<import("@floating-ui/utils").Placement | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-bottom" | "left-top" | "right-bottom" | "right-top"> | PropTypes.Validator<import("@floating-ui/utils").Placement | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-bottom" | "left-top" | "right-bottom" | "right-top">;
         /**
          * Specify a label to be read by screen readers on the containing textbox
          * node

package/lib/components/ComboBox/ComboBox.js

@@ -27,6 +27,7 @@ var useId = require('../../internal/useId.js');
 var mergeRefs = require('../../tools/mergeRefs.js');
 var deprecate = require('../../prop-types/deprecate.js');
 var usePrefix = require('../../internal/usePrefix.js');
+var useNormalizedInputProps = require('../../internal/useNormalizedInputProps.js');
 require('../FluidForm/FluidForm.js');
 var FormContext = require('../FluidForm/FormContext.js');
 var react = require('@floating-ui/react');
@@ -251,8 +252,7 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
   React.useEffect(() => {
     if (prevInputValue.current !== inputValue) {
       prevInputValue.current = inputValue;
-      // eslint-disable-next-line  @typescript-eslint/no-unused-expressions -- https://github.com/carbon-design-system/carbon/issues/20452
-      onInputChange && onInputChange(inputValue);
+      onInputChange?.(inputValue);
     }
     // eslint-disable-next-line  react-hooks/exhaustive-deps -- https://github.com/carbon-design-system/carbon/issues/20452
   }, [inputValue]);
@@ -427,11 +427,19 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
       event?.persist?.();
     }
   };
-  const showWarning = !invalid && warn;
+  const normalizedProps = useNormalizedInputProps.useNormalizedInputProps({
+    id,
+    readOnly,
+    disabled: disabled || false,
+    invalid: invalid || false,
+    invalidText,
+    warn: warn || false,
+    warnText
+  });
   const className = cx(`${prefix}--combo-box`, {
     [`${prefix}--combo-box--invalid--focused`]: invalid && isFocused,
     [`${prefix}--list-box--up`]: direction === 'top',
-    [`${prefix}--combo-box--warning`]: showWarning,
+    [`${prefix}--combo-box--warning`]: normalizedProps.warn,
     [`${prefix}--combo-box--readonly`]: readOnly,
     [`${prefix}--autoalign`]: enableFloatingStyles
   });
@@ -601,7 +609,7 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
   // The input should be described by the appropriate message text id
   // when both the message is supplied *and* when the component is in
   // the matching state (invalid, warn, etc).
-  const ariaDescribedBy = invalid && invalidText && invalidTextId || warn && warnText && warnTextId || helperText && !isFluid && helperTextId || undefined;
+  const ariaDescribedBy = normalizedProps.invalid && invalidText && invalidTextId || normalizedProps.warn && warnText && warnTextId || helperText && !isFluid && helperTextId || undefined;
 
   // Memoize the value of getMenuProps to avoid an infinite loop
   const menuProps = React.useMemo(() => getMenuProps({
@@ -629,13 +637,13 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
     onBlur: handleFocus,
     className: className,
     disabled: disabled,
-    invalid: invalid,
+    invalid: normalizedProps.invalid,
     invalidText: invalidText,
     invalidTextId: invalidTextId,
     isOpen: isOpen,
     light: light,
     size: size,
-    warn: warn,
+    warn: normalizedProps.warn,
     ref: enableFloatingStyles ? refs.setReference : null,
     warnText: warnText,
     warnTextId: warnTextId
@@ -737,9 +745,9 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
   }), rest, readOnlyEventHandlers, {
     readOnly: readOnly,
     "aria-describedby": ariaDescribedBy
-  })), 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, {
+  }), normalizedProps.warn && /*#__PURE__*/React.createElement(iconsReact.WarningAltFilled, {
     className: `${prefix}--list-box__invalid-icon ${prefix}--list-box__invalid-icon--warning`
   }), inputValue && /*#__PURE__*/React.createElement(ListBoxSelection.default, {
     clearSelection: () => {
@@ -788,7 +796,7 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
     }, modifiedItemProps), itemToElement ? itemToElement(item) : itemToString(item), isEqual(currentSelectedItem, item) && /*#__PURE__*/React.createElement(iconsReact.Checkmark, {
       className: `${prefix}--list-box__menu-item__selected-icon`
     }));
-  }) : null)), helperText && !invalid && !warn && !isFluid && /*#__PURE__*/React.createElement(Text.Text, {
+  }) : null)), helperText && !normalizedProps.invalid && !normalizedProps.warn && !isFluid && /*#__PURE__*/React.createElement(Text.Text, {
     as: "div",
     id: helperTextId,
     className: helperClasses

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

@@ -20,6 +20,7 @@ require('../Menu/MenuItem.js');
 var useAttachedMenu = require('../../internal/useAttachedMenu.js');
 var useId = require('../../internal/useId.js');
 var usePrefix = require('../../internal/usePrefix.js');
+var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
 var react = require('@floating-ui/react');
 var index = require('../FeatureFlags/index.js');
 var mergeRefs = require('../../tools/mergeRefs.js');
@@ -96,7 +97,7 @@ const ComboButton = /*#__PURE__*/React.forwardRef(function ComboButton({
     handleMousedown: handleTriggerMousedown,
     handleClose
   } = useAttachedMenu.useAttachedMenu(containerRef);
-  React.useLayoutEffect(() => {
+  useIsomorphicEffect.default(() => {
     const updatedFloatingStyles = {
       ...floatingStyles,
       visibility: middlewareData.hide?.referenceHidden ? 'hidden' : 'visible'

package/lib/components/ComposedModal/ComposedModal.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var useResizeObserver = require('../../internal/useResizeObserver.js');
-var reactIs = require('react-is');
 var PropTypes = require('prop-types');
 var index = require('../Layer/index.js');
 var ModalHeader = require('./ModalHeader.js');
@@ -263,29 +262,25 @@ const ComposedModalDialog = /*#__PURE__*/React.forwardRef(function ComposedModal
   const containerClass = cx(`${prefix}--modal-container`, size && `${prefix}--modal-container--${size}`, isFullWidth && `${prefix}--modal-container--full-width`, containerClassName);
 
   // Generate aria-label based on Modal Header label if one is not provided (L253)
+  //
+  // TODO: Confirm whether `ModalHeader` `label` should allow `ReactNode`. If
+  // so, define how to derive a string for `aria-label`.
   let generatedAriaLabel;
   const childrenWithProps = React.Children.toArray(children).map(child => {
-    switch (true) {
-      case reactIs.isElement(child) && child.type === /*#__PURE__*/React.createElement(ModalHeader.ModalHeader).type:
-        {
-          const el = child;
-          generatedAriaLabel = el.props.label;
-          return /*#__PURE__*/React.cloneElement(el, {
-            closeModal
-          });
-        }
-      case reactIs.isElement(child) && child.type === /*#__PURE__*/React.createElement(ModalFooter.ModalFooter).type:
-        {
-          const el = child;
-          return /*#__PURE__*/React.cloneElement(el, {
-            closeModal,
-            inputref: button,
-            danger
-          });
-        }
-      default:
-        return child;
+    if (utils.isComponentElement(child, ModalHeader.ModalHeader)) {
+      generatedAriaLabel = child.props.label;
+      return /*#__PURE__*/React.cloneElement(child, {
+        closeModal
+      });
+    }
+    if (utils.isComponentElement(child, ModalFooter.ModalFooter)) {
+      return /*#__PURE__*/React.cloneElement(child, {
+        closeModal,
+        inputref: button,
+        danger
+      });
     }
+    return child;
   });
 
   // Modals without a footer are considered passive and carry limitations as

package/lib/components/ComposedModal/ModalHeader.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2023
+ * 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.
@@ -40,7 +40,7 @@ export interface ModalHeaderProps extends DivProps {
     /**
      * Specify an optional label to be displayed
      */
-    label?: ReactNode;
+    label?: string;
     /**
      * Specify an optional className to be applied to the modal header label
      */

package/lib/components/ComposedModal/ModalHeader.js

@@ -96,7 +96,7 @@ ModalHeader.propTypes = {
   /**
    * Specify an optional label to be displayed
    */
-  label: PropTypes.node,
+  label: PropTypes.string,
   /**
    * Specify an optional className to be applied to the modal header label
    */

package/lib/components/Copy/Copy.d.ts

@@ -50,7 +50,7 @@ declare namespace Copy {
         /**
          * Specify how the trigger should align with the tooltip
          */
-        align: PropTypes.Requireable<string> | PropTypes.Validator<string>;
+        align: PropTypes.Requireable<import("@floating-ui/utils").Placement | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-bottom" | "left-top" | "right-bottom" | "right-top"> | PropTypes.Validator<import("@floating-ui/utils").Placement | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-bottom" | "left-top" | "right-bottom" | "right-top">;
         /**
          * **Experimental**: Will attempt to automatically align the tooltip. Requires
          * React v17+

package/lib/components/CopyButton/CopyButton.d.ts

@@ -51,7 +51,7 @@ declare namespace CopyButton {
         /**
          * Specify how the trigger should align with the tooltip
          */
-        align: PropTypes.Requireable<string> | PropTypes.Validator<string>;
+        align: PropTypes.Requireable<import("@floating-ui/utils").Placement | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-bottom" | "left-top" | "right-bottom" | "right-top"> | PropTypes.Validator<import("@floating-ui/utils").Placement | "top-left" | "top-right" | "bottom-left" | "bottom-right" | "left-bottom" | "left-top" | "right-bottom" | "right-top">;
         /**
          * **Experimental**: Will attempt to automatically align the tooltip. Requires
          * React v17+

package/lib/components/DataTable/DataTable.d.ts

@@ -51,6 +51,7 @@ export interface DataTableHeader {
     header: ReactNode;
     slug?: ReactElement;
     decorator?: ReactElement;
+    isSortable?: boolean;
 }
 export interface DataTableRenderProps<RowType, ColTypes extends any[]> {
     /**
@@ -435,6 +436,7 @@ export declare const DataTable: {
         headers: PropTypes.Validator<(PropTypes.InferProps<{
             key: PropTypes.Validator<string>;
             header: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+            isSortable: PropTypes.Requireable<boolean>;
         }> | null | undefined)[]>;
         /**
          * Specify whether the table should be able to be sorted by its headers

package/lib/components/DataTable/DataTable.js

@@ -98,7 +98,7 @@ const DataTable = props => {
     render,
     translateWithId: t = defaultTranslateWithId,
     size,
-    isSortable: isSortableProp,
+    isSortable,
     useZebraStyles,
     useStaticWidth,
     stickyHeader,
@@ -137,7 +137,7 @@ const DataTable = props => {
   const getHeaderProps = ({
     header,
     onClick,
-    isSortable = isSortableProp,
+    isSortable: headerIsSortable,
     ...rest
   }) => {
     const {
@@ -153,7 +153,7 @@ const DataTable = props => {
       ...rest,
       key,
       sortDirection,
-      isSortable,
+      isSortable: headerIsSortable ?? header.isSortable ?? isSortable,
       isSortHeader: sortHeaderKey === key,
       slug,
       decorator,
@@ -312,7 +312,7 @@ const DataTable = props => {
     return {
       useZebraStyles,
       size: size ?? 'lg',
-      isSortable: isSortableProp,
+      isSortable,
       useStaticWidth,
       stickyHeader,
       overflowMenuOnHover: overflowMenuOnHover ?? false,
@@ -602,7 +602,8 @@ DataTable.propTypes = {
    */
   headers: PropTypes.arrayOf(PropTypes.shape({
     key: PropTypes.string.isRequired,
-    header: PropTypes.node.isRequired
+    header: PropTypes.node.isRequired,
+    isSortable: PropTypes.bool
   })).isRequired,
   /**
    * Specify whether the table should be able to be sorted by its headers

package/lib/components/DataTable/Table.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/DataTable/Table.js

@@ -74,12 +74,18 @@ const Table = ({
     [`${prefix}--data-table--visible-overflow-menu`]: !overflowMenuOnHover
   });
   const toggleTableBodyAlignmentClass = React.useCallback((alignTop = false) => {
-    // eslint-disable-next-line  @typescript-eslint/no-unused-expressions -- https://github.com/carbon-design-system/carbon/issues/20452
-    alignTop ? tableRef.current?.classList.add(`${prefix}--data-table--top-aligned-body`) : tableRef.current?.classList.remove(`${prefix}--data-table--top-aligned-body`);
+    if (alignTop) {
+      tableRef.current?.classList.add(`${prefix}--data-table--top-aligned-body`);
+    } else {
+      tableRef.current?.classList.remove(`${prefix}--data-table--top-aligned-body`);
+    }
   }, [prefix]);
   const toggleTableHeaderAlignmentClass = React.useCallback((alignTop = false) => {
-    // eslint-disable-next-line  @typescript-eslint/no-unused-expressions -- https://github.com/carbon-design-system/carbon/issues/20452
-    alignTop ? tableRef.current?.classList.add(`${prefix}--data-table--top-aligned-header`) : tableRef.current?.classList.remove(`${prefix}--data-table--top-aligned-header`);
+    if (alignTop) {
+      tableRef.current?.classList.add(`${prefix}--data-table--top-aligned-header`);
+    } else {
+      tableRef.current?.classList.remove(`${prefix}--data-table--top-aligned-header`);
+    }
   }, [prefix]);
   const setTableAlignment = React.useCallback(() => {
     if (experimentalAutoAlign) {

package/lib/components/DataTable/state/sorting.d.ts

@@ -43,7 +43,8 @@ export declare const getNextSortDirection: (prevHeader: string, currentHeader: s
  * @param state - Current table state.
  * @param key - Header key to sort by.
  */
-export declare const getNextSortState: <ColTypes extends any[]>(props: Props, state: State<ColTypes>, { key }: {
+export declare const getNextSortState: <ColTypes extends any[]>(// eslint-disable-line @typescript-eslint/no-explicit-any -- https://github.com/carbon-design-system/carbon/issues/20452
+props: Props, state: State<ColTypes>, { key }: {
     key: string;
 }) => Pick<State<ColTypes>, "sortHeaderKey" | "sortDirection" | "rowIds">;
 /**
@@ -54,5 +55,6 @@ export declare const getNextSortState: <ColTypes extends any[]>(props: Props, st
  * @param key - Header key to sort by.
  * @param sortDirection - Sort direction to apply.
  */
-export declare const getSortedState: <ColTypes extends any[]>({ locale, sortRow }: Props, { rowIds, cellsById, initialRowOrder }: State<ColTypes>, key: string, sortDirection: DataTableSortState) => Pick<State<ColTypes>, "rowIds" | "sortDirection" | "sortHeaderKey">;
+export declare const getSortedState: <ColTypes extends any[]>(// eslint-disable-line @typescript-eslint/no-explicit-any -- https://github.com/carbon-design-system/carbon/issues/20452
+{ locale, sortRow }: Props, { rowIds, cellsById, initialRowOrder }: State<ColTypes>, key: string, sortDirection: DataTableSortState) => Pick<State<ColTypes>, "rowIds" | "sortDirection" | "sortHeaderKey">;
 export {};

package/lib/components/FileUploader/FileUploaderItem.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/FileUploader/FileUploaderItem.js

@@ -19,6 +19,7 @@ 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');
+var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
 var Text = require('../Text/Text.js');
 require('../Text/TextDirection.js');
 require('../Tooltip/DefinitionTooltip.js');
@@ -62,7 +63,7 @@ function FileUploaderItem({
     setIsEllipsisApplied(isActive);
     return isActive;
   };
-  React.useLayoutEffect(() => {
+  useIsomorphicEffect.default(() => {
     isEllipsisActive(textRef.current);
   }, [prefix, name]);
   return /*#__PURE__*/React.createElement("span", _rollupPluginBabelHelpers.extends({