@carbon/react 1.83.0-rc.0 → 1.84.0-rc.0

package/lib/components/TreeView/TreeView.js

@@ -27,20 +27,19 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const TreeView = _ref => {
-  let {
-    active: prespecifiedActive,
-    children,
-    className,
-    hideLabel = false,
-    label,
-    multiselect = false,
-    onActivate,
-    onSelect,
-    selected: preselected,
-    size = 'sm',
-    ...rest
-  } = _ref;
+const TreeView = ({
+  active: prespecifiedActive,
+  children,
+  className,
+  hideLabel = false,
+  label,
+  multiselect = false,
+  onActivate,
+  onSelect,
+  selected: preselected,
+  size = 'sm',
+  ...rest
+}) => {
   const enableTreeviewControllable = index.useFeatureFlag('enable-treeview-controllable');
   const {
     current: treeId
@@ -75,8 +74,7 @@ const TreeView = _ref => {
       item.tabIndex = -1;
     });
   }
-  function handleTreeSelect(event) {
-    let node = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  function handleTreeSelect(event, node = {}) {
     const nodeId = node.id;
     if (multiselect && (event.metaKey || event.ctrlKey)) {
       if (!selected.includes(nodeId)) {
@@ -121,24 +119,33 @@ const TreeView = _ref => {
     }
   }
   let focusTarget = false;
-  const nodesWithProps = React__default["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["default"].isValidElement(node)) {
-      return /*#__PURE__*/React__default["default"].cloneElement(node, sharedNodeProps);
-    }
-  });
+  function enhanceTreeNodes(children) {
+    return React__default["default"].Children.map(children, child => {
+      if (! /*#__PURE__*/React__default["default"].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__default["default"].cloneElement(child, sharedNodeProps);
+      }
+      const newChildren = enhanceTreeNodes(child.props.children);
+      return /*#__PURE__*/React__default["default"].cloneElement(child, {
+        children: newChildren
+      });
+    });
+  }
+  const nodesWithProps = enhanceTreeNodes(children);
   function handleKeyDown(event) {
     event.stopPropagation();
     if (match.matches(event, [keys.ArrowUp, keys.ArrowDown, keys.Home, keys.End])) {

package/lib/components/UIShell/Content.js

@@ -20,13 +20,12 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const Content = _ref => {
-  let {
-    className: customClassName,
-    children,
-    tagName = 'main',
-    ...rest
-  } = _ref;
+const Content = ({
+  className: customClassName,
+  children,
+  tagName = 'main',
+  ...rest
+}) => {
   const prefix = usePrefix.usePrefix();
   const className = cx__default["default"](`${prefix}--content`, customClassName);
   return /*#__PURE__*/React__default["default"].createElement(tagName, {

package/lib/components/UIShell/Header.js

@@ -22,12 +22,11 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const Header = _ref => {
-  let {
-    className: customClassName,
-    children,
-    ...rest
-  } = _ref;
+const Header = ({
+  className: customClassName,
+  children,
+  ...rest
+}) => {
   const prefix = usePrefix.usePrefix();
   const className = cx__default["default"](`${prefix}--header`, customClassName);
   return /*#__PURE__*/React__default["default"].createElement("header", _rollupPluginBabelHelpers["extends"]({}, rest, {

package/lib/components/UIShell/HeaderContainer.js

@@ -21,12 +21,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-function HeaderContainer(_ref) {
-  let {
-    render: Children,
-    isSideNavExpanded = false,
-    ...rest
-  } = _ref;
+function HeaderContainer({
+  render: Children,
+  isSideNavExpanded = false,
+  ...rest
+}) {
   //state for expandable sidenav
   const [isSideNavExpandedState, setIsSideNavExpandedState] = React.useState(isSideNavExpanded);
   useEvent.useWindowEvent('keydown', event => {

package/lib/components/UIShell/HeaderGlobalAction.js

@@ -32,19 +32,18 @@ var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
  *
  * Note: children passed to this component should be an Icon.
  */
-const HeaderGlobalAction = /*#__PURE__*/React__default["default"].forwardRef(function HeaderGlobalAction(_ref, ref) {
-  let {
-    'aria-label': ariaLabel,
-    'aria-labelledby': ariaLabelledBy,
-    children,
-    className: customClassName,
-    onClick,
-    tooltipHighContrast = true,
-    tooltipDropShadow,
-    isActive,
-    tooltipAlignment,
-    ...rest
-  } = _ref;
+const HeaderGlobalAction = /*#__PURE__*/React__default["default"].forwardRef(function HeaderGlobalAction({
+  'aria-label': ariaLabel,
+  'aria-labelledby': ariaLabelledBy,
+  children,
+  className: customClassName,
+  onClick,
+  tooltipHighContrast = true,
+  tooltipDropShadow,
+  isActive,
+  tooltipAlignment,
+  ...rest
+}, ref) {
   const prefix = usePrefix.usePrefix();
   const className = cx__default["default"]({
     [customClassName]: !!customClassName,

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

@@ -7,5 +7,5 @@
 /**
  * Generic container for `HeaderGlobalAction` components
  */
-declare const HeaderGlobalBar: (props: import("../../types/common").ReactAttr<"div">) => React.ReactElement<any>;
+declare const HeaderGlobalBar: (props: import("react").HTMLAttributes<"div">) => React.ReactElement<any>;
 export default HeaderGlobalBar;

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

@@ -1,17 +1,10 @@
 /**
- * Copyright IBM Corp. 2016, 2023
+ * Copyright IBM Corp. 2016, 2025
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { type JSX } from 'react';
-import PropTypes from 'prop-types';
-/**
- * `HeaderMenu` is used to render submenu's in the `Header`. Most often children
- * will be a `HeaderMenuItem`. It handles certain keyboard events to help
- * with managing focus. It also passes along refs to each child so that it can
- * help manage focus state of its children.
- */
+import React, { type FocusEvent, type KeyboardEvent, type MouseEvent, type ReactNode, type Ref } from 'react';
 export interface HeaderMenuProps {
     /**
      * Required props for the accessibility label of the menu
@@ -25,7 +18,7 @@ export interface HeaderMenuProps {
     /**
      * Provide a custom ref handler for the menu button
      */
-    focusRef?: React.Ref<any>;
+    focusRef?: Ref<any>;
     /**
      * Applies selected styles to the item if a user sets this to true and `aria-current !== 'page'`.
      */
@@ -43,21 +36,21 @@ export interface HeaderMenuProps {
      * Optionally provide an onBlur handler that is called when the underlying
      * button fires it's onblur event
      */
-    onBlur?: (event: React.FocusEvent<HTMLLIElement>) => void;
+    onBlur?: (event: FocusEvent<HTMLLIElement>) => void;
     /**
      * Optionally provide an onClick handler that is called when the underlying
      * button fires it's onclick event
      */
-    onClick?: (event: React.MouseEvent<HTMLLIElement, MouseEvent>) => void;
+    onClick?: (event: MouseEvent<HTMLLIElement>) => void;
     /**
      * Optionally provide an onKeyDown handler that is called when the underlying
      * button fires it's onkeydown event
      */
-    onKeyDown?: (event: React.KeyboardEvent<HTMLLIElement>) => void;
+    onKeyDown?: (event: KeyboardEvent<HTMLLIElement>) => void;
     /**
      * Optional component to render instead of string
      */
-    renderMenuContent?: () => JSX.Element;
+    renderMenuContent?: () => ReactNode;
     /**
      * Optionally provide a tabIndex for the underlying menu button
      */
@@ -65,102 +58,7 @@ export interface HeaderMenuProps {
     /**
      * The children should be a series of `HeaderMenuItem` components.
      */
-    children?: React.ReactNode;
-}
-interface HeaderMenuState {
-    expanded: boolean;
-    selectedIndex: number | null;
-}
-declare class HeaderMenu extends React.Component<HeaderMenuProps, HeaderMenuState> {
-    static propTypes: {
-        /**
-         * Optionally provide a custom class to apply to the underlying `<li>` node
-         */
-        className: PropTypes.Requireable<string>;
-        /**
-         * Provide a custom ref handler for the menu button
-         */
-        focusRef: PropTypes.Requireable<(...args: any[]) => any>;
-        /**
-         * Applies selected styles to the item if a user sets this to true and `aria-current !== 'page'`.
-         */
-        isActive: PropTypes.Requireable<boolean>;
-        /**
-         * Applies selected styles to the item if a user sets this to true and `aria-current !== 'page'`.
-         * @deprecated Please use `isActive` instead. This will be removed in the next major release.
-         */
-        isCurrentPage: (props: any, propName: any, componentName: any, ...rest: any[]) => any;
-        /**
-         * Provide a label for the link text
-         */
-        menuLinkName: PropTypes.Validator<string>;
-        /**
-         * Optionally provide an onBlur handler that is called when the underlying
-         * button fires it's onblur event
-         */
-        onBlur: PropTypes.Requireable<(...args: any[]) => any>;
-        /**
-         * Optionally provide an onClick handler that is called when the underlying
-         * button fires it's onclick event
-         */
-        onClick: PropTypes.Requireable<(...args: any[]) => any>;
-        /**
-         * Optionally provide an onKeyDown handler that is called when the underlying
-         * button fires it's onkeydown event
-         */
-        onKeyDown: PropTypes.Requireable<(...args: any[]) => any>;
-        /**
-         * Optional component to render instead of string
-         */
-        renderMenuContent: PropTypes.Requireable<(...args: any[]) => any>;
-        /**
-         * Optionally provide a tabIndex for the underlying menu button
-         */
-        tabIndex: PropTypes.Requireable<number>;
-    };
-    static contextType: React.Context<string>;
-    _subMenus: React.RefObject<HTMLUListElement | null>;
-    private items;
-    private menuButtonRef;
-    constructor(props: any);
-    /**
-     * Toggle the expanded state of the menu on click.
-     */
-    handleOnClick: (e: any) => void;
-    /**
-     * Keyboard event handler for the entire menu.
-     */
-    handleOnKeyDown: (event: any) => void;
-    /**
-     * Handle our blur event from our underlying menuitems. Will mostly be used
-     * for closing our menu in response to a user clicking off or tabbing out of
-     * the menu or menubar.
-     */
-    handleOnBlur: (event: any) => void;
-    /**
-     * ref handler for our menu button. If we are supplied a `focusRef` prop, we also
-     * forward along the node.
-     *
-     * This is useful when this component is a child in a
-     * menu or menubar as it will allow the parent to explicitly focus the menu
-     * button node when that child should receive focus.
-     */
-    handleMenuButtonRef: (node: any) => void;
-    /**
-     * Handles individual menuitem refs. We assign them to a class instance
-     * property so that we can properly manage focus of our children.
-     */
-    handleItemRef: (index: any) => (node: any) => void;
-    handleMenuClose: (event: any) => void;
-    render(): import("react/jsx-runtime").JSX.Element;
-    /**
-     * We capture the `ref` for each child inside of `this.items` to properly
-     * manage focus. In addition to this focus management, all items receive a
-     * `tabIndex: -1` so the user won't hit a large number of items in their tab
-     * sequence when they might not want to go through all the items.
-     */
-    _renderMenuItem: (item: React.ReactNode, index: number) => React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
+    children?: ReactNode;
 }
-declare const HeaderMenuForwardRef: React.ForwardRefExoticComponent<HeaderMenuProps & React.RefAttributes<unknown>>;
-export { HeaderMenu };
-export default HeaderMenuForwardRef;
+export declare const HeaderMenu: React.ForwardRefExoticComponent<HeaderMenuProps & React.RefAttributes<HTMLLIElement>>;
+export default HeaderMenu;