@carbon/react 1.82.1 → 1.83.0

package/es/components/Toggle/Toggle.js

@@ -6,7 +6,7 @@
  */
 
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useRef } from 'react';
+import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { useControllableState } from '../../internal/useControllableState.js';
@@ -69,7 +69,7 @@ function Toggle(_ref) {
   return (
     /*#__PURE__*/
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-    React__default.createElement("div", {
+    React.createElement("div", {
       className: wrapperClasses,
       onClick: !labelText ? e => {
         // the underlying <button> can only be activated by keyboard as it is visually hidden;
@@ -82,7 +82,7 @@ function Toggle(_ref) {
           buttonElement.current.focus();
         }
       } : undefined
-    }, /*#__PURE__*/React__default.createElement("button", _extends({}, other, {
+    }, /*#__PURE__*/React.createElement("button", _extends({}, other, {
       ref: buttonElement,
       id: id,
       className: `${prefix}--toggle__button`,
@@ -92,26 +92,26 @@ function Toggle(_ref) {
       "aria-labelledby": ariaLabelledby ?? (labelText ? labelId : undefined),
       disabled: disabled,
       onClick: handleClick
-    })), /*#__PURE__*/React__default.createElement(LabelComponent, {
+    })), /*#__PURE__*/React.createElement(LabelComponent, {
       id: labelId,
       htmlFor: ariaLabelledby ? undefined : id,
       className: `${prefix}--toggle__label`
-    }, labelText && /*#__PURE__*/React__default.createElement(Text, {
+    }, labelText && /*#__PURE__*/React.createElement(Text, {
       className: labelTextClasses
-    }, labelText), /*#__PURE__*/React__default.createElement("div", {
+    }, labelText), /*#__PURE__*/React.createElement("div", {
       className: appearanceClasses
-    }, /*#__PURE__*/React__default.createElement("div", {
+    }, /*#__PURE__*/React.createElement("div", {
       className: switchClasses
-    }, isSm && /*#__PURE__*/React__default.createElement("svg", {
+    }, isSm && /*#__PURE__*/React.createElement("svg", {
       "aria-hidden": "true",
       focusable: "false",
       className: `${prefix}--toggle__check`,
       width: "6px",
       height: "5px",
       viewBox: "0 0 6 5"
-    }, _path || (_path = /*#__PURE__*/React__default.createElement("path", {
+    }, _path || (_path = /*#__PURE__*/React.createElement("path", {
       d: "M2.2 2.7L5 0 6 1 2.2 5 0 2.7 1 1.5z"
-    })))), renderSideLabel && /*#__PURE__*/React__default.createElement(Text, {
+    })))), renderSideLabel && /*#__PURE__*/React.createElement(Text, {
       className: `${prefix}--toggle__text`,
       "aria-hidden": "true"
     }, sideLabel))))

package/es/components/ToggleSmall/ToggleSmall.Skeleton.js

@@ -7,7 +7,7 @@
 
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
-import React__default, { useContext } from 'react';
+import React, { useContext } from 'react';
 import cx from 'classnames';
 import { PrefixContext } from '../../internal/usePrefix.js';
 
@@ -20,25 +20,25 @@ const ToggleSmallSkeleton = _ref => {
     ...rest
   } = _ref;
   const prefix = useContext(PrefixContext);
-  return /*#__PURE__*/React__default.createElement("div", _extends({
+  return /*#__PURE__*/React.createElement("div", _extends({
     className: cx(`${prefix}--form-item`, className)
-  }, rest), /*#__PURE__*/React__default.createElement("input", {
+  }, rest), /*#__PURE__*/React.createElement("input", {
     type: "checkbox",
     id: id,
     className: `${prefix}--toggle ${prefix}--toggle--small ${prefix}--skeleton`
-  }), /*#__PURE__*/React__default.createElement("label", {
+  }), /*#__PURE__*/React.createElement("label", {
     className: `${prefix}--toggle__label ${prefix}--skeleton`,
     htmlFor: id
-  }, labelText && /*#__PURE__*/React__default.createElement("span", {
+  }, labelText && /*#__PURE__*/React.createElement("span", {
     className: `${prefix}--toggle__label-text`
-  }, labelText), /*#__PURE__*/React__default.createElement("span", {
+  }, labelText), /*#__PURE__*/React.createElement("span", {
     className: `${prefix}--toggle__appearance`
-  }, /*#__PURE__*/React__default.createElement("svg", {
+  }, /*#__PURE__*/React.createElement("svg", {
     className: `${prefix}--toggle__check`,
     width: "6px",
     height: "5px",
     viewBox: "0 0 6 5"
-  }, _path || (_path = /*#__PURE__*/React__default.createElement("path", {
+  }, _path || (_path = /*#__PURE__*/React.createElement("path", {
     d: "M2.2403 2.7299L4.9245 0 6 1.1117 2.2384 5 0 2.6863 1.0612 1.511z"
   }))))));
 };

package/es/components/Toggletip/index.js

@@ -8,7 +8,7 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default, { useRef, useState, useContext } from 'react';
+import React, { useRef, useState, useContext } from 'react';
 import { Popover, PopoverContent } from '../Popover/index.js';
 import { Escape } from '../../internal/keyboard/keys.js';
 import { match } from '../../internal/keyboard/match.js';
@@ -29,7 +29,7 @@ function ToggletipLabel(_ref) {
   const prefix = usePrefix();
   const className = cx(`${prefix}--toggletip-label`, customClassName);
   const BaseComponentAsAny = BaseComponent;
-  return /*#__PURE__*/React__default.createElement(BaseComponentAsAny, _extends({
+  return /*#__PURE__*/React.createElement(BaseComponentAsAny, _extends({
     className: className
   }, rest), children);
 }
@@ -51,7 +51,7 @@ ToggletipLabel.propTypes = {
 };
 // Used to coordinate accessibility props between button and content along with
 // the actions to open and close the toggletip
-const ToggletipContext = /*#__PURE__*/React__default.createContext(undefined);
+const ToggletipContext = /*#__PURE__*/React.createContext(undefined);
 function useToggletip() {
   return useContext(ToggletipContext);
 }
@@ -135,9 +135,9 @@ function Toggletip(_ref2) {
       actions.close();
     }
   });
-  return /*#__PURE__*/React__default.createElement(ToggletipContext.Provider, {
+  return /*#__PURE__*/React.createElement(ToggletipContext.Provider, {
     value: value
-  }, /*#__PURE__*/React__default.createElement(Popover, _extends({
+  }, /*#__PURE__*/React.createElement(Popover, _extends({
     align: align,
     as: as,
     caret: true,
@@ -209,7 +209,7 @@ Toggletip.propTypes = {
  * clicks and keyboard interactions.
  */
 
-const ToggletipButton = /*#__PURE__*/React__default.forwardRef(function ToggletipButton(_ref4, ref) {
+const ToggletipButton = /*#__PURE__*/React.forwardRef(function ToggletipButton(_ref4, ref) {
   let {
     children,
     className: customClassName,
@@ -222,11 +222,11 @@ const ToggletipButton = /*#__PURE__*/React__default.forwardRef(function Toggleti
   const className = cx(`${prefix}--toggletip-button`, customClassName);
   const ComponentToggle = BaseComponent ?? 'button';
   if (ComponentToggle !== 'button') {
-    return /*#__PURE__*/React__default.createElement(ComponentToggle, _extends({}, toggletip?.onClick, {
+    return /*#__PURE__*/React.createElement(ComponentToggle, _extends({}, toggletip?.onClick, {
       className: className
     }, rest), children);
   }
-  return /*#__PURE__*/React__default.createElement("button", _extends({}, toggletip?.buttonProps, {
+  return /*#__PURE__*/React.createElement("button", _extends({}, toggletip?.buttonProps, {
     "aria-label": label,
     type: "button",
     className: className,
@@ -254,19 +254,19 @@ ToggletipButton.displayName = 'ToggletipButton';
  * `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__default.forwardRef(function ToggletipContent(_ref5, ref) {
+const ToggletipContent = /*#__PURE__*/React.forwardRef(function ToggletipContent(_ref5, ref) {
   let {
     children,
     className: customClassName
   } = _ref5;
   const toggletip = useToggletip();
   const prefix = usePrefix();
-  return /*#__PURE__*/React__default.createElement(PopoverContent, _extends({
+  return /*#__PURE__*/React.createElement(PopoverContent, _extends({
     className: customClassName
   }, toggletip?.contentProps, {
     ref: ref,
     "aria-live": "polite"
-  }), /*#__PURE__*/React__default.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--toggletip-content`
   }, children));
 });
@@ -293,7 +293,7 @@ function ToggletipActions(_ref6) {
   } = _ref6;
   const prefix = usePrefix();
   const className = cx(`${prefix}--toggletip-actions`, customClassName);
-  return /*#__PURE__*/React__default.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     className: className
   }, children);
 }

package/es/components/Tooltip/DefinitionTooltip.js

@@ -8,7 +8,7 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default, { useState } from 'react';
+import React, { useState } from 'react';
 import { Popover, PopoverContent } from '../Popover/index.js';
 import { Escape } from '../../internal/keyboard/keys.js';
 import { match } from '../../internal/keyboard/match.js';
@@ -39,7 +39,7 @@ const DefinitionTooltip = _ref => {
       setOpen(false);
     }
   }
-  return /*#__PURE__*/React__default.createElement(Popover, {
+  return /*#__PURE__*/React.createElement(Popover, {
     align: align,
     className: className,
     autoAlign: autoAlign,
@@ -55,7 +55,7 @@ const DefinitionTooltip = _ref => {
       setOpen(true);
     },
     open: isOpen
-  }, /*#__PURE__*/React__default.createElement("button", _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement("button", _extends({}, rest, {
     className: cx(`${prefix}--definition-term`, triggerClassName),
     "aria-controls": tooltipId,
     "aria-expanded": isOpen,
@@ -69,7 +69,7 @@ const DefinitionTooltip = _ref => {
     },
     onKeyDown: onKeyDown,
     type: "button"
-  }), children), /*#__PURE__*/React__default.createElement(PopoverContent, {
+  }), children), /*#__PURE__*/React.createElement(PopoverContent, {
     className: `${prefix}--definition-tooltip`,
     id: tooltipId
   }, tooltipText ?? definition));

package/es/components/Tooltip/Tooltip.d.ts

@@ -54,6 +54,9 @@ interface TooltipBaseProps {
     /**
      * Provide the label to be rendered inside of the Tooltip. The label will use
      * `aria-labelledby` and will fully describe the child node that is provided.
+     * If the child already has an `aria-label`, the tooltip will not apply
+     * `aria-labelledby`. If the child has its own `aria-labelledby`, that value
+     * will be kept. Otherwise, the tooltip will use its own ID to label the child.
      * This means that if you have text in the child node, that it will not be
      * announced to the screen reader.
      *

package/es/components/Tooltip/Tooltip.js

@@ -8,7 +8,7 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default, { useRef, useState, useCallback, useEffect } from 'react';
+import React, { useRef, useState, useCallback, useEffect } from 'react';
 import { Popover, PopoverContent } from '../Popover/index.js';
 import { Escape, Enter, Space } from '../../internal/keyboard/keys.js';
 import { match } from '../../internal/keyboard/match.js';
@@ -22,7 +22,7 @@ import useIsomorphicEffect from '../../internal/useIsomorphicEffect.js';
  * Event types that trigger a "drag" to stop.
  */
 const DRAG_STOP_EVENT_TYPES = new Set(['mouseup', 'touchend', 'touchcancel']);
-const Tooltip = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
+const Tooltip = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
     as,
     align = 'top',
@@ -45,7 +45,22 @@ const Tooltip = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
   const [isPointerIntersecting, setIsPointerIntersecting] = useState(false);
   const id = useId('tooltip');
   const prefix = usePrefix();
-  const child = React__default.Children.only(children);
+  const child = React.Children.only(children);
+  const {
+    'aria-label': ariaLabel,
+    'aria-labelledby': ariaLabelledBy,
+    'aria-describedby': ariaDescribedBy
+  } = child?.props ?? {};
+  const hasLabel = !!label;
+  const hasAriaLabel = typeof ariaLabel === 'string' ? ariaLabel.trim() !== '' : false;
+
+  // An `aria-label` takes precedence over `aria-describedby`, but when it's
+  // needed and the user doesn't specify one, the fallback `id` is used.
+  const labelledBy = hasAriaLabel ? null : hasLabel ? ariaLabelledBy ?? id : undefined;
+
+  // If `aria-label` is present, use any provided `aria-describedby`.
+  // If not, fallback to child's `aria-describedby` or the tooltip `id` if needed.
+  const describedBy = hasAriaLabel ? ariaDescribedBy : ariaDescribedBy ?? (!hasLabel && !ariaLabelledBy ? id : undefined);
   const triggerProps = {
     onFocus: () => !focusByMouse && setOpen(true),
     onBlur: () => {
@@ -58,7 +73,9 @@ const Tooltip = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
     onMouseLeave,
     onMouseDown,
     onMouseMove: onMouseMove,
-    onTouchStart: onDragStart
+    onTouchStart: onDragStart,
+    'aria-labelledby': labelledBy,
+    'aria-describedby': describedBy
   };
   function getChildEventHandlers(childProps) {
     const eventHandlerFunctions = Object.keys(triggerProps).filter(prop => prop.startsWith('on'));
@@ -73,11 +90,6 @@ const Tooltip = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
     });
     return eventHandlers;
   }
-  if (label) {
-    triggerProps['aria-labelledby'] = id;
-  } else {
-    triggerProps['aria-describedby'] = id;
-  }
   const onKeyDown = useCallback(event => {
     if (open && match(event, Escape)) {
       event.stopPropagation();
@@ -151,7 +163,7 @@ const Tooltip = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
       });
     };
   }, [isDragging, onDragStop]);
-  return /*#__PURE__*/React__default.createElement(Popover, _extends({
+  return /*#__PURE__*/React.createElement(Popover, _extends({
     as: as,
     ref: ref
   }, rest, {
@@ -162,12 +174,12 @@ const Tooltip = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
     onKeyDown: onKeyDown,
     onMouseLeave: onMouseLeave,
     open: open
-  }), /*#__PURE__*/React__default.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--tooltip-trigger__wrapper`
-  }, child !== undefined ? /*#__PURE__*/React__default.cloneElement(child, {
+  }, child !== undefined ? /*#__PURE__*/React.cloneElement(child, {
     ...triggerProps,
     ...getChildEventHandlers(child.props)
-  }) : null), /*#__PURE__*/React__default.createElement(PopoverContent, {
+  }) : null), /*#__PURE__*/React.createElement(PopoverContent, {
     "aria-hidden": open ? 'false' : 'true',
     className: `${prefix}--tooltip-content`,
     id: id,

package/es/components/TreeView/TreeNode.js

@@ -9,7 +9,7 @@ import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js
 import { CaretDown } from '@carbon/icons-react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default, { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { ArrowLeft, ArrowRight, Enter, Space } from '../../internal/keyboard/keys.js';
 import { matches, match } from '../../internal/keyboard/match.js';
 import { useControllableState } from '../../internal/useControllableState.js';
@@ -17,7 +17,7 @@ import { usePrefix } from '../../internal/usePrefix.js';
 import { uniqueId } from '../../tools/uniqueId.js';
 import { useFeatureFlag } from '../FeatureFlags/index.js';
 
-const TreeNode = /*#__PURE__*/React__default.forwardRef((_ref, forwardedRef) => {
+const TreeNode = /*#__PURE__*/React.forwardRef((_ref, forwardedRef) => {
   let {
     active,
     children,
@@ -70,19 +70,28 @@ const TreeNode = /*#__PURE__*/React__default.forwardRef((_ref, forwardedRef) =>
       forwardedRef.current = element;
     }
   };
-  const nodesWithProps = React__default.Children.map(children, node => {
-    if (/*#__PURE__*/React__default.isValidElement(node)) {
-      return /*#__PURE__*/React__default.cloneElement(node, {
-        active,
-        depth: depth + 1,
-        disabled: disabled || node.props.disabled,
-        onTreeSelect,
-        onNodeFocusEvent,
-        selected,
-        tabIndex: !node.props.disabled && -1 || null
+  function enhanceTreeNodes(children) {
+    return React.Children.map(children, node => {
+      if (! /*#__PURE__*/React.isValidElement(node)) return node;
+      const isTreeNode = node.type.displayName === 'TreeNode';
+      if (isTreeNode) {
+        return /*#__PURE__*/React.cloneElement(node, {
+          active,
+          depth: depth + 1,
+          disabled: disabled || node.props.disabled,
+          onTreeSelect,
+          onNodeFocusEvent,
+          selected,
+          tabIndex: node.props.disabled ? null : -1
+        });
+      }
+      const newChildren = enhanceTreeNodes(node.props.children);
+      return /*#__PURE__*/React.cloneElement(node, {
+        children: newChildren
       });
-    }
-  });
+    });
+  }
+  const nodesWithProps = enhanceTreeNodes(children);
   const isActive = active === id;
   const isSelected = selected.includes(id);
   const treeNodeClasses = cx(className, `${prefix}--tree-node`, {
@@ -282,52 +291,52 @@ const TreeNode = /*#__PURE__*/React__default.forwardRef((_ref, forwardedRef) =>
   };
   if (!children) {
     if (href) {
-      return /*#__PURE__*/React__default.createElement("li", {
+      return /*#__PURE__*/React.createElement("li", {
         role: "none"
-      }, /*#__PURE__*/React__default.createElement("a", _extends({}, treeNodeProps, {
+      }, /*#__PURE__*/React.createElement("a", _extends({}, treeNodeProps, {
         ref: setRefs,
         href: !disabled ? href : undefined
-      }), /*#__PURE__*/React__default.createElement("div", {
+      }), /*#__PURE__*/React.createElement("div", {
         className: `${prefix}--tree-node__label`,
         ref: currentNodeLabel
-      }, Icon && /*#__PURE__*/React__default.createElement(Icon, {
+      }, Icon && /*#__PURE__*/React.createElement(Icon, {
         className: `${prefix}--tree-node__icon`
       }), label)));
     } else {
-      return /*#__PURE__*/React__default.createElement("li", _extends({}, treeNodeProps, {
+      return /*#__PURE__*/React.createElement("li", _extends({}, treeNodeProps, {
         ref: setRefs
-      }), /*#__PURE__*/React__default.createElement("div", {
+      }), /*#__PURE__*/React.createElement("div", {
         className: `${prefix}--tree-node__label`,
         ref: currentNodeLabel
-      }, Icon && /*#__PURE__*/React__default.createElement(Icon, {
+      }, Icon && /*#__PURE__*/React.createElement(Icon, {
         className: `${prefix}--tree-node__icon`
       }), label));
     }
   }
   if (href) {
-    return /*#__PURE__*/React__default.createElement("li", {
+    return /*#__PURE__*/React.createElement("li", {
       role: "none",
       className: `${prefix}--tree-node-link-parent`
-    }, /*#__PURE__*/React__default.createElement("a", _extends({}, treeNodeProps, {
+    }, /*#__PURE__*/React.createElement("a", _extends({}, treeNodeProps, {
       "aria-expanded": !!expanded,
       ref: setRefs,
       href: !disabled ? href : undefined
-    }), /*#__PURE__*/React__default.createElement("div", {
+    }), /*#__PURE__*/React.createElement("div", {
       className: `${prefix}--tree-node__label`,
       ref: currentNodeLabel
-    }, /*#__PURE__*/React__default.createElement("span", {
+    }, /*#__PURE__*/React.createElement("span", {
       className: `${prefix}--tree-parent-node__toggle`
       // @ts-ignore
       ,
       disabled: disabled,
       onClick: handleToggleClick
-    }, /*#__PURE__*/React__default.createElement(CaretDown, {
+    }, /*#__PURE__*/React.createElement(CaretDown, {
       className: toggleClasses
-    })), /*#__PURE__*/React__default.createElement("span", {
+    })), /*#__PURE__*/React.createElement("span", {
       className: `${prefix}--tree-node__label__details`
-    }, Icon && /*#__PURE__*/React__default.createElement(Icon, {
+    }, Icon && /*#__PURE__*/React.createElement(Icon, {
       className: `${prefix}--tree-node__icon`
-    }), label))), /*#__PURE__*/React__default.createElement("ul", {
+    }), label))), /*#__PURE__*/React.createElement("ul", {
       id: `${id}-subtree`,
       role: "group",
       className: cx(`${prefix}--tree-node__children`, {
@@ -335,25 +344,25 @@ const TreeNode = /*#__PURE__*/React__default.forwardRef((_ref, forwardedRef) =>
       })
     }, nodesWithProps));
   } else {
-    return /*#__PURE__*/React__default.createElement("li", _extends({}, treeNodeProps, {
+    return /*#__PURE__*/React.createElement("li", _extends({}, treeNodeProps, {
       "aria-expanded": !!expanded,
       ref: setRefs
-    }), /*#__PURE__*/React__default.createElement("div", {
+    }), /*#__PURE__*/React.createElement("div", {
       className: `${prefix}--tree-node__label`,
       ref: currentNodeLabel
-    }, /*#__PURE__*/React__default.createElement("span", {
+    }, /*#__PURE__*/React.createElement("span", {
       className: `${prefix}--tree-parent-node__toggle`
       // @ts-ignore
       ,
       disabled: disabled,
       onClick: handleToggleClick
-    }, /*#__PURE__*/React__default.createElement(CaretDown, {
+    }, /*#__PURE__*/React.createElement(CaretDown, {
       className: toggleClasses
-    })), /*#__PURE__*/React__default.createElement("span", {
+    })), /*#__PURE__*/React.createElement("span", {
       className: `${prefix}--tree-node__label__details`
-    }, Icon && /*#__PURE__*/React__default.createElement(Icon, {
+    }, Icon && /*#__PURE__*/React.createElement(Icon, {
       className: `${prefix}--tree-node__icon`
-    }), label)), /*#__PURE__*/React__default.createElement("ul", {
+    }), label)), /*#__PURE__*/React.createElement("ul", {
       id: `${id}-subtree`,
       role: "group",
       className: cx(`${prefix}--tree-node__children`, {

package/es/components/TreeView/TreeView.js

@@ -8,7 +8,7 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default, { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { ArrowUp, ArrowDown, Home, End } from '../../internal/keyboard/keys.js';
 import { matches, match } from '../../internal/keyboard/match.js';
 import { useControllableState } from '../../internal/useControllableState.js';
@@ -111,24 +111,33 @@ const TreeView = _ref => {
     }
   }
   let focusTarget = false;
-  const nodesWithProps = React__default.Children.map(children, _node => {
-    const node = _node;
-    const sharedNodeProps = {
-      active,
-      depth: 0,
-      onNodeFocusEvent: handleFocusEvent,
-      onTreeSelect: handleTreeSelect,
-      selected,
-      tabIndex: !node.props.disabled && -1 || undefined
-    };
-    if (!focusTarget && !node.props.disabled) {
-      sharedNodeProps.tabIndex = 0;
-      focusTarget = true;
-    }
-    if (/*#__PURE__*/React__default.isValidElement(node)) {
-      return /*#__PURE__*/React__default.cloneElement(node, sharedNodeProps);
-    }
-  });
+  function enhanceTreeNodes(children) {
+    return React.Children.map(children, child => {
+      if (! /*#__PURE__*/React.isValidElement(child)) return child;
+      const isTreeNode = child.type.displayName === 'TreeNode';
+      if (isTreeNode) {
+        const node = child;
+        const sharedNodeProps = {
+          active,
+          depth: 0,
+          onNodeFocusEvent: handleFocusEvent,
+          onTreeSelect: handleTreeSelect,
+          selected,
+          tabIndex: node.props.disabled ? undefined : -1
+        };
+        if (!focusTarget && !node.props.disabled) {
+          sharedNodeProps.tabIndex = 0;
+          focusTarget = true;
+        }
+        return /*#__PURE__*/React.cloneElement(child, sharedNodeProps);
+      }
+      const newChildren = enhanceTreeNodes(child.props.children);
+      return /*#__PURE__*/React.cloneElement(child, {
+        children: newChildren
+      });
+    });
+  }
+  const nodesWithProps = enhanceTreeNodes(children);
   function handleKeyDown(event) {
     event.stopPropagation();
     if (matches(event, [ArrowUp, ArrowDown, Home, End])) {
@@ -211,11 +220,11 @@ const TreeView = _ref => {
   }, []);
   useActiveAndSelectedOnMount();
   const labelId = `${treeId}__label`;
-  const TreeLabel = () => !hideLabel ? /*#__PURE__*/React__default.createElement("label", {
+  const TreeLabel = () => !hideLabel ? /*#__PURE__*/React.createElement("label", {
     id: labelId,
     className: `${prefix}--label`
   }, label) : null;
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(TreeLabel, null), /*#__PURE__*/React__default.createElement("ul", _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TreeLabel, null), /*#__PURE__*/React.createElement("ul", _extends({}, rest, {
     "aria-label": hideLabel ? label : undefined,
     "aria-labelledby": !hideLabel ? labelId : undefined,
     "aria-multiselectable": multiselect || undefined,

package/es/components/UIShell/Content.js

@@ -7,7 +7,7 @@
 
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default from 'react';
+import React from 'react';
 import { usePrefix } from '../../internal/usePrefix.js';
 
 const Content = _ref => {
@@ -19,7 +19,7 @@ const Content = _ref => {
   } = _ref;
   const prefix = usePrefix();
   const className = cx(`${prefix}--content`, customClassName);
-  return /*#__PURE__*/React__default.createElement(tagName, {
+  return /*#__PURE__*/React.createElement(tagName, {
     ...rest,
     className
   }, children);

package/es/components/UIShell/Header.js

@@ -8,7 +8,7 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default from 'react';
+import React from 'react';
 import { AriaLabelPropType } from '../../prop-types/AriaPropTypes.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
@@ -20,7 +20,7 @@ const Header = _ref => {
   } = _ref;
   const prefix = usePrefix();
   const className = cx(`${prefix}--header`, customClassName);
-  return /*#__PURE__*/React__default.createElement("header", _extends({}, rest, {
+  return /*#__PURE__*/React.createElement("header", _extends({}, rest, {
     className: className
   }), children);
 };

package/es/components/UIShell/HeaderContainer.js

@@ -7,7 +7,7 @@
 
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
-import React__default, { useState, useCallback } from 'react';
+import React, { useState, useCallback } from 'react';
 import { Escape } from '../../internal/keyboard/keys.js';
 import { match } from '../../internal/keyboard/match.js';
 import { useWindowEvent } from '../../internal/useEvent.js';
@@ -28,7 +28,7 @@ function HeaderContainer(_ref) {
   const handleHeaderMenuButtonClick = useCallback(() => {
     setIsSideNavExpandedState(prevIsSideNavExpanded => !prevIsSideNavExpanded);
   }, [setIsSideNavExpandedState]);
-  return /*#__PURE__*/React__default.createElement(Children, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(Children, _extends({}, rest, {
     isSideNavExpanded: isSideNavExpandedState,
     onClickSideNavExpand: handleHeaderMenuButtonClick
   }));

package/es/components/UIShell/HeaderGlobalAction.js

@@ -7,7 +7,7 @@
 
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import cx from 'classnames';
-import React__default from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { AriaLabelPropType } from '../../prop-types/AriaPropTypes.js';
 import Button from '../Button/Button.js';
@@ -22,7 +22,7 @@ import { usePrefix } from '../../internal/usePrefix.js';
  *
  * Note: children passed to this component should be an Icon.
  */
-const HeaderGlobalAction = /*#__PURE__*/React__default.forwardRef(function HeaderGlobalAction(_ref, ref) {
+const HeaderGlobalAction = /*#__PURE__*/React.forwardRef(function HeaderGlobalAction(_ref, ref) {
   let {
     'aria-label': ariaLabel,
     'aria-labelledby': ariaLabelledBy,
@@ -45,7 +45,7 @@ const HeaderGlobalAction = /*#__PURE__*/React__default.forwardRef(function Heade
     'aria-label': ariaLabel,
     'aria-labelledby': ariaLabelledBy
   };
-  return /*#__PURE__*/React__default.createElement(Button, _extends({}, rest, accessibilityLabel, {
+  return /*#__PURE__*/React.createElement(Button, _extends({}, rest, accessibilityLabel, {
     className: className,
     onClick: onClick,
     type: "button",