@carbon/react 1.43.0-rc.0 → 1.44.0-rc.0

package/lib/components/ComboBox/ComboBox.js

@@ -362,6 +362,18 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
         if (match.match(event, keys.End) && event.code !== 'Numpad1') {
           event.target.setSelectionRange(event.target.value.length, event.target.value.length);
         }
+        if (event.altKey && event.key == 'ArrowDown') {
+          event.preventDownshiftDefault = true;
+          if (!isOpen) {
+            toggleMenu();
+          }
+        }
+        if (event.altKey && event.key == 'ArrowUp') {
+          event.preventDownshiftDefault = true;
+          if (isOpen) {
+            toggleMenu();
+          }
+        }
       }
     });
     const handleFocus = evt => {

package/lib/components/ComboButton/index.js

@@ -78,7 +78,7 @@ const ComboButton = /*#__PURE__*/React__default["default"].forwardRef(function C
     }
   }
   function handleOpen() {
-    menuRef.current.style.width = `${width}px`;
+    menuRef.current.style.inlineSize = `${width}px`;
   }
   const containerClasses = cx__default["default"](`${prefix}--combo-button__container`, `${prefix}--combo-button__container--${size}`, {
     [`${prefix}--combo-button__container--open`]: open
@@ -110,6 +110,7 @@ const ComboButton = /*#__PURE__*/React__default["default"].forwardRef(function C
     ref: menuRef,
     id: id,
     label: t('carbon.combo-button.additional-actions'),
+    mode: "basic",
     size: size,
     open: open,
     onClose: handleClose,

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

@@ -4,7 +4,7 @@ export interface ModalBodyProps extends HTMLAttributes<HTMLDivElement> {
     children?: ReactNode;
     /**
      * Provide whether the modal content has a form element.
-     * If `true` is used here, non-form child content should have `bx--modal-content__regular-content` class.
+     * If `true` is used here, non-form child content should have `cds--modal-content__regular-content` class.
      */
     hasForm?: boolean;
     /**
@@ -15,11 +15,11 @@ export interface ModalBodyProps extends HTMLAttributes<HTMLDivElement> {
 export declare const ModalBody: React.ForwardRefExoticComponent<ModalBodyProps & React.RefAttributes<HTMLDivElement>>;
 export interface ComposedModalProps extends HTMLAttributes<HTMLDivElement> {
     /**
-     * Specify the aria-label for bx--modal-container
+     * Specify the aria-label for cds--modal-container
      */
     'aria-label'?: string;
     /**
-     * Specify the aria-labelledby for bx--modal-container
+     * Specify the aria-labelledby for cds--modal-container
      */
     'aria-labelledby'?: string;
     /**

package/lib/components/ComposedModal/ComposedModal.js

@@ -66,7 +66,7 @@ ModalBody.propTypes = {
   className: PropTypes__default["default"].string,
   /**
    * Provide whether the modal content has a form element.
-   * If `true` is used here, non-form child content should have `bx--modal-content__regular-content` class.
+   * If `true` is used here, non-form child content should have `cds--modal-content__regular-content` class.
    */
   hasForm: PropTypes__default["default"].bool,
   /**
@@ -241,11 +241,11 @@ const ComposedModal = /*#__PURE__*/React__default["default"].forwardRef(function
 });
 ComposedModal.propTypes = {
   /**
-   * Specify the aria-label for bx--modal-container
+   * Specify the aria-label for cds--modal-container
    */
   ['aria-label']: PropTypes__default["default"].string,
   /**
-   * Specify the aria-labelledby for bx--modal-container
+   * Specify the aria-labelledby for cds--modal-container
    */
   ['aria-labelledby']: PropTypes__default["default"].string,
   /**

package/lib/components/ContextMenu/useContextMenu.js

@@ -44,7 +44,8 @@ function useContextMenu() {
     open,
     x: position[0],
     y: position[1],
-    onClose
+    onClose,
+    mode: 'full'
   };
 }
 

package/lib/components/DataTableSkeleton/DataTableSkeleton.js

@@ -73,7 +73,7 @@ const DataTableSkeleton = _ref => {
   }, rest), /*#__PURE__*/React__default["default"].createElement("thead", null, /*#__PURE__*/React__default["default"].createElement("tr", null, columnsArray.map(i => /*#__PURE__*/React__default["default"].createElement("th", {
     key: i
   }, headers ? /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "bx--table-header-label"
+    className: "cds--table-header-label"
   }, headers[i]?.header) : _span2 || (_span2 = /*#__PURE__*/React__default["default"].createElement("span", null)))))), /*#__PURE__*/React__default["default"].createElement("tbody", null, rows)));
 };
 DataTableSkeleton.propTypes = {

package/lib/components/Dropdown/Dropdown.js

@@ -287,6 +287,9 @@ const Dropdown = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref) =
       item,
       index: index$1
     });
+    if (item !== null && typeof item === 'object' && Object.prototype.hasOwnProperty.call(item, 'id')) {
+      itemProps.id = item['id'];
+    }
     const title = isObject && 'text' in item && itemToElement ? item.text : itemToString(item);
     return /*#__PURE__*/React__default["default"].createElement(index["default"].MenuItem, _rollupPluginBabelHelpers["extends"]({
       key: itemProps.id,
@@ -314,7 +317,7 @@ Dropdown.propTypes = {
    */
   ariaLabel: deprecate["default"](PropTypes__default["default"].string, 'This prop syntax has been deprecated. Please use the new `aria-label`.'),
   /**
-   * Provide a custom className to be applied on the bx--dropdown node
+   * Provide a custom className to be applied on the cds--dropdown node
    */
   className: PropTypes__default["default"].string,
   /**

package/lib/components/Link/Link.d.ts

@@ -6,6 +6,11 @@
  */
 import React, { AnchorHTMLAttributes, AriaAttributes, ComponentType, HTMLAttributeAnchorTarget } from 'react';
 export interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
+    /**
+     * Provide a custom element or component to render the top-level node for the
+     * component.
+     */
+    as?: string | undefined;
     /**
      * @description Indicates the element that represents the
      *   current item within a container or set of related

package/lib/components/Link/Link.js

@@ -23,6 +23,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 const Link = /*#__PURE__*/React__default["default"].forwardRef(function Link(_ref, ref) {
   let {
+    as: BaseComponent,
     children,
     className: customClassName,
     href,
@@ -43,7 +44,7 @@ const Link = /*#__PURE__*/React__default["default"].forwardRef(function Link(_re
   });
   const rel = target === '_blank' ? 'noopener' : undefined;
   const linkProps = {
-    className,
+    className: BaseComponent ? undefined : className,
     rel,
     target
   };
@@ -56,7 +57,8 @@ const Link = /*#__PURE__*/React__default["default"].forwardRef(function Link(_re
     linkProps.role = 'link';
     linkProps['aria-disabled'] = true;
   }
-  return /*#__PURE__*/React__default["default"].createElement("a", _rollupPluginBabelHelpers["extends"]({
+  const BaseComponentAsAny = BaseComponent ?? 'a';
+  return /*#__PURE__*/React__default["default"].createElement(BaseComponentAsAny, _rollupPluginBabelHelpers["extends"]({
     ref: ref
   }, linkProps, rest), children, !inline && Icon && /*#__PURE__*/React__default["default"].createElement("div", {
     className: `${prefix}--link__icon`
@@ -64,6 +66,11 @@ const Link = /*#__PURE__*/React__default["default"].forwardRef(function Link(_re
 });
 Link.displayName = 'Link';
 Link.propTypes = {
+  /**
+   * Provide a custom element or component to render the top-level node for the
+   * component.
+   */
+  as: PropTypes__default["default"].string,
   /**
    * Provide the content for the Link
    */

package/lib/components/Menu/Menu.js

@@ -16,6 +16,7 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var useMergedRefs = require('../../internal/useMergedRefs.js');
 var usePrefix = require('../../internal/usePrefix.js');
+var warning = require('../../internal/warning.js');
 var MenuContext = require('./MenuContext.js');
 var useLayoutDirection = require('../LayoutDirection/useLayoutDirection.js');
 var match = require('../../internal/keyboard/match.js');
@@ -34,6 +35,7 @@ const Menu = /*#__PURE__*/React__default["default"].forwardRef(function Menu(_re
     children,
     className,
     label,
+    mode = 'full',
     onClose,
     onOpen,
     open,
@@ -47,10 +49,14 @@ const Menu = /*#__PURE__*/React__default["default"].forwardRef(function Menu(_re
   const focusReturn = React.useRef(null);
   const context = React.useContext(MenuContext.MenuContext);
   const isRoot = context.state.isRoot;
+  if (context.state.mode === 'basic' && !isRoot) {
+    process.env.NODE_ENV !== "production" ? warning.warning(false, 'Nested menus are not supported when the menu is in "basic" mode.') : void 0;
+  }
   const menuSize = isRoot ? size : context.state.size;
   const [childState, childDispatch] = React.useReducer(MenuContext.menuReducer, {
     ...context.state,
     isRoot: false,
+    mode,
     size,
     requestCloseRoot: isRoot ? handleClose : context.state.requestCloseRoot
   });
@@ -255,6 +261,14 @@ Menu.propTypes = {
    * A label describing the Menu.
    */
   label: PropTypes__default["default"].string,
+  /**
+   * The mode of this menu. Defaults to full.
+   * `full` supports nesting and selectable menu items, but no icons.
+   * `basic` supports icons but no nesting or selectable menu items.
+   *
+   * **This prop is not intended for use and will be set by the respective implementation (like useContextMenu, MenuButton, and ComboButton).**
+   */
+  mode: PropTypes__default["default"].oneOf(['full', 'basic']),
   /**
    * Provide an optional function to be called when the Menu should be closed.
    */

package/lib/components/Menu/MenuContext.js

@@ -17,6 +17,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 const menuDefaultState = {
   isRoot: true,
+  mode: 'full',
   hasIcons: false,
   size: null,
   items: [],

package/lib/components/Menu/MenuItem.js

@@ -17,6 +17,7 @@ var iconsReact = require('@carbon/icons-react');
 var useControllableState = require('../../internal/useControllableState.js');
 var useMergedRefs = require('../../internal/useMergedRefs.js');
 var usePrefix = require('../../internal/usePrefix.js');
+var warning = require('../../internal/warning.js');
 var Menu = require('./Menu.js');
 var MenuContext = require('./MenuContext.js');
 require('../Text/index.js');
@@ -153,6 +154,14 @@ const MenuItem = /*#__PURE__*/React__default["default"].forwardRef(function Menu
       setRtl(false);
     }
   }, [direction]);
+  const iconsAllowed = context.state.mode === 'basic' || rest.role === 'menuitemcheckbox' || rest.role === 'menuitemradio';
+  React.useEffect(() => {
+    if (iconsAllowed && IconElement && !context.state.hasIcons) {
+      context.dispatch({
+        type: 'enableIcons'
+      });
+    }
+  }, [iconsAllowed, IconElement, context.state.hasIcons, context]);
   return /*#__PURE__*/React__default["default"].createElement("li", _rollupPluginBabelHelpers["extends"]({
     role: "menuitem"
   }, rest, {
@@ -168,7 +177,7 @@ const MenuItem = /*#__PURE__*/React__default["default"].forwardRef(function Menu
     onKeyDown: handleKeyDown
   }), /*#__PURE__*/React__default["default"].createElement("div", {
     className: `${prefix}--menu-item__icon`
-  }, IconElement && /*#__PURE__*/React__default["default"].createElement(IconElement, null)), /*#__PURE__*/React__default["default"].createElement(Text.Text, {
+  }, iconsAllowed && IconElement && /*#__PURE__*/React__default["default"].createElement(IconElement, null)), /*#__PURE__*/React__default["default"].createElement(Text.Text, {
     as: "div",
     className: `${prefix}--menu-item__label`
   }, label), shortcut && !hasChildren && /*#__PURE__*/React__default["default"].createElement("div", {
@@ -212,7 +221,7 @@ MenuItem.propTypes = {
    */
   onClick: PropTypes__default["default"].func,
   /**
-   * This prop is not intended for use. The only supported icons are Checkmarks to depict single- and multi-selects. This prop is used by MenuItemSelectable and MenuItemRadioGroup automatically.
+   * Only applicable if the parent menu is in `basic` mode. Sets the menu item's icon.
    */
   renderIcon: PropTypes__default["default"].oneOfType([PropTypes__default["default"].func, PropTypes__default["default"].object]),
   /**
@@ -231,6 +240,9 @@ const MenuItemSelectable = /*#__PURE__*/React__default["default"].forwardRef(fun
   } = _ref2;
   const prefix = usePrefix.usePrefix();
   const context = React.useContext(MenuContext.MenuContext);
+  if (context.state.mode === 'basic') {
+    process.env.NODE_ENV !== "production" ? warning.warning(false, 'MenuItemSelectable is not supported when the menu is in "basic" mode.') : void 0;
+  }
   const [checked, setChecked] = useControllableState.useControllableState({
     value: selected,
     onChange,
@@ -256,7 +268,7 @@ const MenuItemSelectable = /*#__PURE__*/React__default["default"].forwardRef(fun
     className: classNames,
     role: "menuitemcheckbox",
     "aria-checked": checked,
-    renderIcon: checked && iconsReact.Checkmark,
+    renderIcon: checked ? iconsReact.Checkmark : undefined,
     onClick: handleClick
   }));
 });
@@ -328,6 +340,9 @@ const MenuItemRadioGroup = /*#__PURE__*/React__default["default"].forwardRef(fun
   } = _ref4;
   const prefix = usePrefix.usePrefix();
   const context = React.useContext(MenuContext.MenuContext);
+  if (context.state.mode === 'basic') {
+    process.env.NODE_ENV !== "production" ? warning.warning(false, 'MenuItemRadioGroup is not supported when the menu is in "basic" mode.') : void 0;
+  }
   const [selection, setSelection] = useControllableState.useControllableState({
     value: selectedItem,
     onChange,
@@ -359,7 +374,7 @@ const MenuItemRadioGroup = /*#__PURE__*/React__default["default"].forwardRef(fun
     label: itemToString(item),
     role: "menuitemradio",
     "aria-checked": item === selection,
-    renderIcon: item === selection && iconsReact.Checkmark,
+    renderIcon: item === selection ? iconsReact.Checkmark : undefined,
     onClick: e => {
       handleClick(item, e);
     }

package/lib/components/MenuButton/index.js

@@ -67,6 +67,7 @@ const MenuButton = /*#__PURE__*/React__default["default"].forwardRef(function Me
   function handleOpen() {
     menuRef.current.style.inlineSize = `${width}px`;
   }
+  const containerClasses = cx__default["default"](`${prefix}--menu-button__container`, className);
   const triggerClasses = cx__default["default"](`${prefix}--menu-button__trigger`, {
     [`${prefix}--menu-button__trigger--open`]: open
   });
@@ -74,7 +75,7 @@ const MenuButton = /*#__PURE__*/React__default["default"].forwardRef(function Me
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     ref: ref,
     "aria-owns": open ? id : null,
-    className: className
+    className: containerClasses
   }), /*#__PURE__*/React__default["default"].createElement(Button["default"], {
     className: triggerClasses,
     size: size,
@@ -90,6 +91,7 @@ const MenuButton = /*#__PURE__*/React__default["default"].forwardRef(function Me
     ref: menuRef,
     id: id,
     label: label,
+    mode: "basic",
     size: size,
     open: open,
     onClose: handleClose,

package/lib/components/Slug/index.js

@@ -113,7 +113,7 @@ const Slug = /*#__PURE__*/React__default["default"].forwardRef(function Slug(_re
       onRevertClick(evt);
     }
   };
-  const ariaLabel = `${aiText} - ${slugLabel}`;
+  const ariaLabel = !aiTextLabel ? `${aiText} - ${slugLabel}` : `${aiText} - ${aiTextLabel}`;
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: slugClasses,
     ref: ref,

package/lib/components/UIShell/SideNav.js

@@ -180,7 +180,7 @@ function SideNavRenderFunction(_ref, ref) {
     tabIndex: -1,
     ref: navRef,
     className: `${prefix}--side-nav__navigation ${className}`,
-    inert: !isRail && (expanded || isLg ? undefined : -1)
+    inert: !isRail ? expanded || isLg ? undefined : -1 : undefined
   }, accessibilityLabel, eventHandlers, other), childrenToRender));
 }
 const SideNav = /*#__PURE__*/React__default["default"].forwardRef(SideNavRenderFunction);

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

@@ -0,0 +1,38 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import React, { ReactNode } from 'react';
+interface BaseSwitcherProps {
+    /**
+     * expects to receive <SwitcherItem />
+     */
+    children: ReactNode;
+    /**
+     * Optionally provide a custom class to apply to the underlying `<ul>` node
+     */
+    className?: string;
+    /**
+     * Specify whether the panel is expanded
+     */
+    expanded?: boolean;
+}
+interface SwitcherWithAriaLabel extends BaseSwitcherProps {
+    'aria-label': string;
+    'aria-labelledby'?: never;
+}
+interface SwitcherWithAriaLabelledBy extends BaseSwitcherProps {
+    'aria-label'?: never;
+    'aria-labelledby': string;
+}
+type SwitcherProps = SwitcherWithAriaLabel | SwitcherWithAriaLabelledBy;
+declare const Switcher: React.ForwardRefExoticComponent<SwitcherProps & React.RefAttributes<HTMLUListElement>>;
+export default Switcher;

package/lib/components/UIShell/Switcher.js

@@ -12,10 +12,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var cx = require('classnames');
-var PropTypes = require('prop-types');
-var AriaPropTypes = require('../../prop-types/AriaPropTypes.js');
 var usePrefix = require('../../internal/usePrefix.js');
 var useMergedRefs = require('../../internal/useMergedRefs.js');
+var PropTypes = require('prop-types');
+var AriaPropTypes = require('../../prop-types/AriaPropTypes.js');
+var getDisplayName = require('../../prop-types/tools/getDisplayName.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,7 +24,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 
-const Switcher = /*#__PURE__*/React__default["default"].forwardRef(function Switcher(props, forwardRef) {
+const Switcher = /*#__PURE__*/React.forwardRef(function Switcher(props, forwardRef) {
   const switcherRef = React.useRef(null);
   const ref = useMergedRefs.useMergedRefs([switcherRef, forwardRef]);
   const prefix = usePrefix.usePrefix();
@@ -39,7 +40,7 @@ const Switcher = /*#__PURE__*/React__default["default"].forwardRef(function Swit
     'aria-labelledby': ariaLabelledBy
   };
   const className = cx__default["default"](`${prefix}--switcher`, {
-    [customClassName]: !!customClassName
+    [customClassName || '']: !!customClassName
   });
   const handleSwitcherItemFocus = _ref => {
     let {
@@ -64,13 +65,14 @@ const Switcher = /*#__PURE__*/React__default["default"].forwardRef(function Swit
           return enabledIndices[nextIndex];
       }
     })();
-    const switcherItem = switcherRef.current.children[nextValidIndex].children[0];
-    switcherItem?.focus();
+    const switcherItem = switcherRef.current?.children[nextValidIndex]?.children[0];
+    if (switcherItem) {
+      switcherItem.focus();
+    }
   };
-  const childrenWithProps = React__default["default"].Children.toArray(children).map((child, index) => {
-    // handleSwitcherItemFocus should only be passed down if the child is a SwitcherItem
-    // SwitcherDivider, for example, does not accept a handleSwitcherItemFocus prop
-    if (child.type?.displayName === 'SwitcherItem') {
+  const childrenWithProps = React__default["default"].Children.map(children, (child, index) => {
+    // only setup click handlers if onChange event is passed
+    if ( /*#__PURE__*/React__default["default"].isValidElement(child) && child.type && getDisplayName["default"](child.type) === 'Switcher') {
       return /*#__PURE__*/React__default["default"].cloneElement(child, {
         handleSwitcherItemFocus,
         index,
@@ -108,6 +110,5 @@ Switcher.propTypes = {
    */
   expanded: PropTypes__default["default"].bool
 };
-var Switcher$1 = Switcher;
 
-exports["default"] = Switcher$1;
+exports["default"] = Switcher;

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

@@ -0,0 +1,9 @@
+import React from 'react';
+interface SwitcherDividerProps {
+    /**
+     * Optionally provide a custom class to apply to the underlying `<li>` node
+     */
+    className?: string;
+}
+declare const SwitcherDivider: React.FC<SwitcherDividerProps>;
+export default SwitcherDivider;

package/lib/components/UIShell/SwitcherDivider.js

@@ -27,11 +27,11 @@ const SwitcherDivider = _ref => {
     ...other
   } = _ref;
   const prefix = usePrefix.usePrefix();
-  const className = cx__default["default"](`${prefix}--switcher__item--divider`, {
-    [customClassName]: !!customClassName
+  const classNames = cx__default["default"](`${prefix}--switcher__item--divider`, {
+    [customClassName || '']: !!customClassName
   });
   return /*#__PURE__*/React__default["default"].createElement("hr", _rollupPluginBabelHelpers["extends"]({}, other, {
-    className: className
+    className: classNames
   }));
 };
 SwitcherDivider.propTypes = {
@@ -40,6 +40,5 @@ SwitcherDivider.propTypes = {
    */
   className: PropTypes__default["default"].string
 };
-var SwitcherDivider$1 = SwitcherDivider;
 
-exports["default"] = SwitcherDivider$1;
+exports["default"] = SwitcherDivider;

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

@@ -0,0 +1,49 @@
+import React from 'react';
+interface BaseSwitcherItemProps {
+    /**
+     * Specify the text content for the link
+     */
+    children: React.ReactNode;
+    /**
+     * Optionally provide a custom class to apply to the underlying `<li>` node
+     */
+    className?: string;
+    /**
+     * event handlers
+     */
+    handleSwitcherItemFocus?: (event: {
+        currentIndex: number;
+        direction: number;
+    }) => void;
+    /**
+     * Specify the index of the SwitcherItem
+     */
+    index?: number;
+    /**
+     * event handlers
+     */
+    onKeyDown?: (event: KeyboardEvent) => void;
+    /**
+     * Specify the tab index of the Link
+     */
+    tabIndex?: number;
+    /**
+     * Specify whether the panel is expanded
+     */
+    expanded?: boolean;
+    /**
+     * Specify whether the panel is selected
+     */
+    isSelected?: boolean;
+}
+interface SwitcherItemWithAriaLabel extends BaseSwitcherItemProps {
+    'aria-label': string;
+    'aria-labelledby'?: never;
+}
+interface SwitcherItemWithAriaLabelledBy extends BaseSwitcherItemProps {
+    'aria-label'?: never;
+    'aria-labelledby': string;
+}
+type SwitcherItemProps = SwitcherItemWithAriaLabel | SwitcherItemWithAriaLabelledBy;
+declare const SwitcherItem: React.ForwardRefExoticComponent<SwitcherItemProps & React.RefAttributes<React.ElementType<any>>>;
+export default SwitcherItem;

package/lib/components/UIShell/SwitcherItem.js

@@ -13,9 +13,9 @@ var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelper
 var React = require('react');
 var cx = require('classnames');
 var PropTypes = require('prop-types');
-var AriaPropTypes = require('../../prop-types/AriaPropTypes.js');
 var Link = require('./Link.js');
 var usePrefix = require('../../internal/usePrefix.js');
+var AriaPropTypes = require('../../prop-types/AriaPropTypes.js');
 var match = require('../../internal/keyboard/match.js');
 var keys = require('../../internal/keyboard/keys.js');
 
@@ -25,8 +25,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 
-const SwitcherItem = /*#__PURE__*/React__default["default"].forwardRef(function SwitcherItem(_ref, ref) {
-  let {
+const SwitcherItem = /*#__PURE__*/React.forwardRef(function SwitcherItem(props, forwardRef) {
+  const {
     'aria-label': ariaLabel,
     'aria-labelledby': ariaLabelledBy,
     className: customClassName,
@@ -38,10 +38,10 @@ const SwitcherItem = /*#__PURE__*/React__default["default"].forwardRef(function
     handleSwitcherItemFocus,
     onKeyDown = () => {},
     ...rest
-  } = _ref;
+  } = props;
   const prefix = usePrefix.usePrefix();
-  const className = cx__default["default"](`${prefix}--switcher__item`, {
-    [customClassName]: !!customClassName
+  const classNames = cx__default["default"](`${prefix}--switcher__item`, {
+    [customClassName || '']: !!customClassName
   });
   const accessibilityLabel = {
     'aria-label': ariaLabel,
@@ -54,36 +54,33 @@ const SwitcherItem = /*#__PURE__*/React__default["default"].forwardRef(function
     if (match.match(evt, keys.ArrowDown)) {
       evt.preventDefault();
       handleSwitcherItemFocus?.({
-        currentIndex: index,
+        currentIndex: index || -1,
         direction: 1
       });
     }
     if (match.match(evt, keys.ArrowUp)) {
       evt.preventDefault();
       handleSwitcherItemFocus?.({
-        currentIndex: index,
+        currentIndex: index || -1,
         direction: -1
       });
     }
   }
   return /*#__PURE__*/React__default["default"].createElement("li", {
-    className: className
+    className: classNames
   }, /*#__PURE__*/React__default["default"].createElement(Link["default"], _rollupPluginBabelHelpers["extends"]({
     onKeyDown: evt => {
       setTabFocus(evt);
       onKeyDown(evt);
-    }
+    },
+    ref: forwardRef
   }, rest, {
-    ref: ref,
     className: linkClassName,
     tabIndex: tabIndex
   }, accessibilityLabel), children));
 });
 SwitcherItem.displayName = 'SwitcherItem';
 SwitcherItem.propTypes = {
-  /**
-   * Required props for accessibility label on the underlying menuitem
-   */
   ...AriaPropTypes.AriaLabelPropType,
   /**
    * Specify the text content for the link
@@ -110,6 +107,5 @@ SwitcherItem.propTypes = {
    */
   tabIndex: PropTypes__default["default"].number
 };
-var SwitcherItem$1 = SwitcherItem;
 
-exports["default"] = SwitcherItem$1;
+exports["default"] = SwitcherItem;