@carbon/react 1.54.0 → 1.55.0-rc.0

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

@@ -0,0 +1,196 @@
+/**
+ * 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 PropTypes from 'prop-types';
+import { PropsWithChildren } from 'react';
+export interface CodeSnippetProps {
+    /**
+     * Specify how the trigger should align with the tooltip
+     */
+    align?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right' | 'left' | 'right';
+    /**
+     * Specify a label to be read by screen readers on the containing textbox
+     * node
+     */
+    ['aria-label']?: string;
+    /**
+     * Deprecated, please use `aria-label` instead.
+     * Specify a label to be read by screen readers on the containing textbox
+     * node
+     */
+    ariaLabel?: string;
+    /**
+     * Specify an optional className to be applied to the container node
+     */
+    className?: string;
+    /**
+     * Specify the description for the Copy Button
+     */
+    copyButtonDescription?: string;
+    /**
+     * Optional text to copy. If not specified, the `children` node's `innerText`
+     * will be used as the copy value.
+     */
+    copyText?: string;
+    /**
+     * Specify whether or not the CodeSnippet should be disabled
+     */
+    disabled?: boolean;
+    /**
+     * Specify the string displayed when the snippet is copied
+     */
+    feedback?: string;
+    /**
+     * Specify the time it takes for the feedback message to timeout
+     */
+    feedbackTimeout?: number;
+    /**
+     * Specify whether or not a copy button should be used/rendered.
+     */
+    hideCopyButton?: boolean;
+    /**
+     * Specify whether you are using the light variant of the Code Snippet,
+     * typically used for inline snippet to display an alternate color
+     */
+    light?: boolean;
+    /**
+     * Specify the maximum number of rows to be shown when in collapsed view
+     */
+    maxCollapsedNumberOfRows?: number;
+    /**
+     * Specify the maximum number of rows to be shown when in expanded view
+     */
+    maxExpandedNumberOfRows?: number;
+    /**
+     * Specify the minimum number of rows to be shown when in collapsed view
+     */
+    minCollapsedNumberOfRows?: number;
+    /**
+     * Specify the minimum number of rows to be shown when in expanded view
+     */
+    minExpandedNumberOfRows?: number;
+    /**
+     * An optional handler to listen to the `onClick` even fired by the Copy
+     * Button
+     */
+    onClick?: (e: MouseEvent) => void;
+    /**
+     * Specify a string that is displayed when the Code Snippet has been
+     * interacted with to show more lines
+     */
+    showLessText?: string;
+    /**
+     * Specify a string that is displayed when the Code Snippet text is more
+     * than 15 lines
+     */
+    showMoreText?: string;
+    /**
+     * Provide the type of Code Snippet
+     */
+    type?: 'single' | 'inline' | 'multi';
+    /**
+     * Specify whether or not to wrap the text.
+     */
+    wrapText?: boolean;
+}
+declare function CodeSnippet({ align, className, type, children, disabled, feedback, feedbackTimeout, onClick, ['aria-label']: ariaLabel, ariaLabel: deprecatedAriaLabel, copyText, copyButtonDescription, light, showMoreText, showLessText, hideCopyButton, wrapText, maxCollapsedNumberOfRows, maxExpandedNumberOfRows, minCollapsedNumberOfRows, minExpandedNumberOfRows, ...rest }: PropsWithChildren<CodeSnippetProps>): import("react/jsx-runtime").JSX.Element;
+declare namespace CodeSnippet {
+    var propTypes: {
+        /**
+         * Specify how the trigger should align with the tooltip
+         */
+        align: PropTypes.Requireable<string>;
+        /**
+         * Specify a label to be read by screen readers on the containing textbox
+         * node
+         */
+        "aria-label": PropTypes.Requireable<string>;
+        /**
+         * Deprecated, please use `aria-label` instead.
+         * Specify a label to be read by screen readers on the containing textbox
+         * node
+         */
+        ariaLabel: (props: any, propName: any, componentName: any, ...rest: any[]) => any;
+        /**
+         * Provide the content of your CodeSnippet as a node or string
+         */
+        children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        /**
+         * Specify an optional className to be applied to the container node
+         */
+        className: PropTypes.Requireable<string>;
+        /**
+         * Specify the description for the Copy Button
+         */
+        copyButtonDescription: PropTypes.Requireable<string>;
+        /**
+         * Optional text to copy. If not specified, the `children` node's `innerText`
+         * will be used as the copy value.
+         */
+        copyText: PropTypes.Requireable<string>;
+        /**
+         * Specify whether or not the CodeSnippet should be disabled
+         */
+        disabled: PropTypes.Requireable<boolean>;
+        /**
+         * Specify the string displayed when the snippet is copied
+         */
+        feedback: PropTypes.Requireable<string>;
+        /**
+         * Specify the time it takes for the feedback message to timeout
+         */
+        feedbackTimeout: PropTypes.Requireable<number>;
+        /**
+         * Specify whether or not a copy button should be used/rendered.
+         */
+        hideCopyButton: PropTypes.Requireable<boolean>;
+        /**
+         * Specify whether you are using the light variant of the Code Snippet,
+         * typically used for inline snippet to display an alternate color
+         */
+        light: (props: any, propName: any, componentName: any, ...rest: any[]) => any;
+        /**
+         * Specify the maximum number of rows to be shown when in collapsed view
+         */
+        maxCollapsedNumberOfRows: PropTypes.Requireable<number>;
+        /**
+         * Specify the maximum number of rows to be shown when in expanded view
+         */
+        maxExpandedNumberOfRows: PropTypes.Requireable<number>;
+        /**
+         * Specify the minimum number of rows to be shown when in collapsed view
+         */
+        minCollapsedNumberOfRows: PropTypes.Requireable<number>;
+        /**
+         * Specify the minimum number of rows to be shown when in expanded view
+         */
+        minExpandedNumberOfRows: PropTypes.Requireable<number>;
+        /**
+         * An optional handler to listen to the `onClick` even fired by the Copy
+         * Button
+         */
+        onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * Specify a string that is displayed when the Code Snippet has been
+         * interacted with to show more lines
+         */
+        showLessText: PropTypes.Requireable<string>;
+        /**
+         * Specify a string that is displayed when the Code Snippet text is more
+         * than 15 lines
+         */
+        showMoreText: PropTypes.Requireable<string>;
+        /**
+         * Provide the type of Code Snippet
+         */
+        type: PropTypes.Requireable<string>;
+        /**
+         * Specify whether or not to wrap the text.
+         */
+        wrapText: PropTypes.Requireable<boolean>;
+    };
+}
+export default CodeSnippet;

package/lib/components/CodeSnippet/CodeSnippet.js

@@ -36,7 +36,7 @@ const rowHeightInPixels = 16;
 const defaultMaxCollapsedNumberOfRows = 15;
 const defaultMaxExpandedNumberOfRows = 0;
 const defaultMinCollapsedNumberOfRows = 3;
-const defaultMinExpandedNumberOfRows = 0;
+const defaultMinExpandedNumberOfRows = 16;
 function CodeSnippet(_ref) {
   let {
     align = 'bottom',
@@ -67,9 +67,9 @@ function CodeSnippet(_ref) {
   const {
     current: uid
   } = React.useRef(uniqueId["default"]());
-  const codeContentRef = React.useRef();
-  const codeContainerRef = React.useRef();
-  const innerCodeRef = React.useRef();
+  const codeContentRef = React.useRef(null);
+  const codeContainerRef = React.useRef(null);
+  const innerCodeRef = React.useRef(null);
   const [hasLeftOverflow, setHasLeftOverflow] = React.useState(false);
   const [hasRightOverflow, setHasRightOverflow] = React.useState(false);
   const getCodeRef = React.useCallback(() => {
@@ -78,15 +78,17 @@ function CodeSnippet(_ref) {
     }
     if (type === 'multi') {
       return codeContentRef;
+    } else {
+      return innerCodeRef;
     }
   }, [type]);
   const prefix = usePrefix.usePrefix();
   const getCodeRefDimensions = React.useCallback(() => {
     const {
-      clientWidth: codeClientWidth,
-      scrollLeft: codeScrollLeft,
-      scrollWidth: codeScrollWidth
-    } = getCodeRef().current;
+      clientWidth: codeClientWidth = 0,
+      scrollLeft: codeScrollLeft = 0,
+      scrollWidth: codeScrollWidth = 0
+    } = getCodeRef().current || {};
     return {
       horizontalOverflow: codeScrollWidth > codeClientWidth,
       codeClientWidth,
@@ -113,7 +115,7 @@ function CodeSnippet(_ref) {
       if (codeContentRef?.current && type === 'multi') {
         const {
           height
-        } = innerCodeRef.current.getBoundingClientRect();
+        } = codeContentRef.current.getBoundingClientRect();
         if (maxCollapsedNumberOfRows > 0 && (maxExpandedNumberOfRows <= 0 || maxExpandedNumberOfRows > maxCollapsedNumberOfRows) && height > maxCollapsedNumberOfRows * rowHeightInPixels) {
           setShouldShowMoreLessBtn(true);
         } else {
@@ -127,13 +129,13 @@ function CodeSnippet(_ref) {
         handleScroll();
       }
     }
-  }, [type, maxCollapsedNumberOfRows, maxExpandedNumberOfRows, minExpandedNumberOfRows, rowHeightInPixels]);
+  });
   React.useEffect(() => {
     handleScroll();
   }, [handleScroll]);
   const handleCopyClick = evt => {
     if (copyText || innerCodeRef?.current) {
-      copy__default["default"](copyText ?? innerCodeRef?.current?.innerText);
+      copy__default["default"](copyText ?? innerCodeRef?.current?.innerText ?? '');
     }
     if (onClick) {
       onClick(evt);
@@ -167,12 +169,11 @@ function CodeSnippet(_ref) {
       feedback: feedback,
       feedbackTimeout: feedbackTimeout
     }), /*#__PURE__*/React__default["default"].createElement("code", {
-      "aria-live": "assertive",
       id: uid,
       ref: innerCodeRef
     }, children));
   }
-  let containerStyle = {};
+  const containerStyle = {};
   if (type === 'multi') {
     const styles = {};
     if (expandedCode) {
@@ -198,16 +199,16 @@ function CodeSnippet(_ref) {
     className: codeSnippetClasses
   }), /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
     ref: codeContainerRef,
-    role: type === 'single' || type === 'multi' ? 'textbox' : null,
-    tabIndex: (type === 'single' || type === 'multi') && !disabled ? 0 : null,
+    role: type === 'single' || type === 'multi' ? 'textbox' : undefined,
+    tabIndex: (type === 'single' || type === 'multi') && !disabled ? 0 : undefined,
     className: `${prefix}--snippet-container`,
     "aria-label": deprecatedAriaLabel || ariaLabel || 'code-snippet',
-    "aria-readonly": type === 'single' || type === 'multi' ? true : null,
-    "aria-multiline": type === 'multi' ? true : null,
-    onScroll: type === 'single' && handleScroll || null
+    "aria-readonly": type === 'single' || type === 'multi' ? true : undefined,
+    "aria-multiline": type === 'multi' ? true : undefined,
+    onScroll: type === 'single' && handleScroll || undefined
   }, containerStyle), /*#__PURE__*/React__default["default"].createElement("pre", {
     ref: codeContentRef,
-    onScroll: type === 'multi' && handleScroll || null
+    onScroll: type === 'multi' && handleScroll || undefined
   }, /*#__PURE__*/React__default["default"].createElement("code", {
     ref: innerCodeRef
   }, children))), hasLeftOverflow && /*#__PURE__*/React__default["default"].createElement("div", {

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

@@ -0,0 +1,10 @@
+/**
+ * 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 CodeSnippet from './CodeSnippet';
+export default CodeSnippet;
+export { CodeSnippet };
+export { default as CodeSnippetSkeleton } from './CodeSnippet.Skeleton';

package/lib/components/ComboBox/ComboBox.d.ts

@@ -6,7 +6,7 @@
  */
 import Downshift from 'downshift';
 import { ReactNodeLike } from 'prop-types';
-import { type ComponentProps, type ReactNode, type ComponentType, type ReactElement, type RefAttributes, type PropsWithChildren, type PropsWithoutRef, type InputHTMLAttributes, type MouseEvent } from 'react';
+import { type ComponentProps, type ReactNode, type ComponentType, type ReactElement, type RefAttributes, type PropsWithChildren, type PropsWithRef, type InputHTMLAttributes, type MouseEvent } from 'react';
 import { ListBoxSize } from '../ListBox';
 type ExcludedAttributes = 'id' | 'onChange' | 'onClick' | 'type' | 'size';
 interface OnChangeData<ItemType> {
@@ -159,7 +159,7 @@ export interface ComboBoxProps<ItemType> extends Omit<InputHTMLAttributes<HTMLIn
      */
     warnText?: ReactNode;
 }
-type ComboboxComponentProps<ItemType> = PropsWithoutRef<PropsWithChildren<ComboBoxProps<ItemType>> & RefAttributes<HTMLInputElement>>;
+type ComboboxComponentProps<ItemType> = PropsWithRef<PropsWithChildren<ComboBoxProps<ItemType>> & RefAttributes<HTMLInputElement>>;
 interface ComboBoxComponent {
     <ItemType>(props: ComboboxComponentProps<ItemType>): ReactElement | null;
 }

package/lib/components/ComboBox/ComboBox.js

@@ -42,9 +42,11 @@ const {
   keyDownArrowUp,
   keyDownEscape,
   clickButton,
+  clickItem,
   blurButton,
   changeInput,
-  blurInput
+  blurInput,
+  unknown
 } = Downshift__default["default"].stateChangeTypes;
 const defaultItemToString = item => {
   if (typeof item === 'string') {
@@ -206,15 +208,16 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
     switch (type) {
       case keyDownArrowDown:
       case keyDownArrowUp:
-        setHighlightedIndex(changes.highlightedIndex);
+        if (changes.isOpen) {
+          updateHighlightedIndex(getHighlightedIndex(changes));
+        } else {
+          setHighlightedIndex(changes.highlightedIndex);
+        }
         break;
       case blurButton:
       case keyDownEscape:
         setHighlightedIndex(changes.highlightedIndex);
         break;
-      case clickButton:
-        setHighlightedIndex(changes.highlightedIndex);
-        break;
       case changeInput:
         updateHighlightedIndex(getHighlightedIndex(changes));
         break;
@@ -229,6 +232,11 @@ const ComboBox = /*#__PURE__*/React.forwardRef((props, ref) => {
           }
         }
         break;
+      case clickButton:
+      case clickItem:
+      case unknown:
+        setHighlightedIndex(getHighlightedIndex(changes));
+        break;
     }
   };
   const handleToggleClick = isOpen => event => {

package/lib/components/ComboButton/index.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Copyright IBM Corp. 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 from 'react';
+import { IconButton } from '../IconButton';
+import Button from '../Button';
+import { Menu } from '../Menu';
+interface ComboButtonProps {
+    /**
+     * A collection of `MenuItems` to be rendered as additional actions for this `ComboButton`.
+     */
+    children: React.ComponentProps<typeof Menu>['children'];
+    /**
+     * Additional CSS class names.
+     */
+    className?: string;
+    /**
+     * Specify whether the `ComboButton` should be disabled, or not.
+     */
+    disabled?: boolean;
+    /**
+     * Provide the label to be rendered on the primary action button.
+     */
+    label: React.ComponentProps<typeof Button>['title'];
+    /**
+     * Experimental property. Specify how the menu should align with the button element
+     */
+    menuAlignment?: React.ComponentProps<typeof Menu>['menuAlignment'];
+    /**
+     * Provide an optional function to be called when the primary action element is clicked.
+     */
+    onClick?: React.ComponentProps<typeof Button>['onClick'];
+    /**
+     * Specify the size of the buttons and menu.
+     */
+    size?: 'sm' | 'md' | 'lg';
+    /**
+     * Specify how the trigger tooltip should be aligned.
+     */
+    tooltipAlignment?: React.ComponentProps<typeof IconButton>['align'];
+    /**
+     * Optional method that takes in a message `id` and returns an
+     * internationalized string.
+     */
+    translateWithId?: (id: string) => string;
+}
+declare const ComboButton: React.ForwardRefExoticComponent<ComboButtonProps & React.RefAttributes<HTMLDivElement>>;
+export { ComboButton, type ComboButtonProps };

package/lib/components/ComboButton/index.js

@@ -80,10 +80,12 @@ const ComboButton = /*#__PURE__*/React__default["default"].forwardRef(function C
     }
   }
   function handleOpen() {
-    menuRef.current.style.inlineSize = `${width}px`;
-    menuRef.current.style.minInlineSize = `${width}px`;
-    if (menuAlignment !== 'bottom' && menuAlignment !== 'top') {
-      menuRef.current.style.inlineSize = `fit-content`;
+    if (menuRef.current) {
+      menuRef.current.style.inlineSize = `${width}px`;
+      menuRef.current.style.minInlineSize = `${width}px`;
+      if (menuAlignment !== 'bottom' && menuAlignment !== 'top') {
+        menuRef.current.style.inlineSize = `fit-content`;
+      }
     }
   }
   const containerClasses = cx__default["default"](`${prefix}--combo-button__container`, `${prefix}--combo-button__container--${size}`, {
@@ -95,7 +97,7 @@ const ComboButton = /*#__PURE__*/React__default["default"].forwardRef(function C
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: containerClasses,
     ref: ref,
-    "aria-owns": open ? id : null
+    "aria-owns": open ? id : undefined
   }), /*#__PURE__*/React__default["default"].createElement("div", {
     className: primaryActionClasses
   }, /*#__PURE__*/React__default["default"].createElement(Button["default"], {
@@ -113,7 +115,7 @@ const ComboButton = /*#__PURE__*/React__default["default"].forwardRef(function C
     "aria-expanded": open,
     onClick: handleTriggerClick,
     onMouseDown: handleTriggerMousedown,
-    "aria-controls": open ? id : null
+    "aria-controls": open ? id : undefined
   }, _ChevronDown || (_ChevronDown = /*#__PURE__*/React__default["default"].createElement(iconsReact.ChevronDown, null))), /*#__PURE__*/React__default["default"].createElement(Menu.Menu, {
     containerRef: containerRef,
     menuAlignment: menuAlignment,
@@ -144,7 +146,7 @@ ComboButton.propTypes = {
    */
   disabled: PropTypes__default["default"].bool,
   /**
-   * Provide the label to be renderd on the primary action button.
+   * Provide the label to be rendered on the primary action button.
    */
   label: PropTypes__default["default"].string.isRequired,
   /**

package/lib/components/ComposedModal/ComposedModal.js

@@ -253,11 +253,11 @@ const ComposedModal = /*#__PURE__*/React__default["default"].forwardRef(function
     }
   }, [open, selectorPrimaryFocus, isOpen]);
 
-  // Slug is always size `lg`
+  // Slug is always size `sm`
   let normalizedSlug;
   if (slug && slug['type']?.displayName === 'Slug') {
     normalizedSlug = /*#__PURE__*/React__default["default"].cloneElement(slug, {
-      size: 'lg'
+      size: 'sm'
     });
   }
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {

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

@@ -22,11 +22,7 @@ export interface TableBatchActionProps extends React.ButtonHTMLAttributes<HTMLBu
     renderIcon?: React.ElementType;
 }
 declare const TableBatchAction: {
-    ({ renderIcon, iconDescription, ...props }: {
-        [x: string]: any;
-        renderIcon?: import("@carbon/icons-react").CarbonIconType | undefined;
-        iconDescription?: string | undefined;
-    }): import("react/jsx-runtime").JSX.Element;
+    ({ renderIcon, iconDescription, ...props }: TableBatchActionProps): import("react/jsx-runtime").JSX.Element;
     propTypes: {
         /**
          * Specify if the button is an icon-only button

package/lib/components/Dropdown/Dropdown.js

@@ -36,7 +36,8 @@ const {
   ToggleButtonKeyDownArrowUp,
   ToggleButtonKeyDownHome,
   ToggleButtonKeyDownEnd,
-  ItemMouseMove
+  ItemMouseMove,
+  MenuMouseLeave
 } = Downshift.useSelect.stateChangeTypes;
 const defaultItemToString = item => {
   if (typeof item === 'string') {
@@ -121,6 +122,7 @@ const Dropdown = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref) =
         }
         return changes;
       case ItemMouseMove:
+      case MenuMouseLeave:
         return {
           ...changes,
           highlightedIndex: state.highlightedIndex

package/lib/components/Modal/Modal.js

@@ -237,11 +237,11 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
     };
   }, []);
 
-  // Slug is always size `lg`
+  // Slug is always size `sm`
   let normalizedSlug;
   if (slug && slug['type']?.displayName === 'Slug') {
     normalizedSlug = /*#__PURE__*/React__default["default"].cloneElement(slug, {
-      size: 'lg'
+      size: 'sm'
     });
   }
   const modalButton = /*#__PURE__*/React__default["default"].createElement("div", {

package/lib/components/MultiSelect/FilterableMultiSelect.js

@@ -149,6 +149,9 @@ const FilterableMultiSelect = /*#__PURE__*/React__default["default"].forwardRef(
     if (onMenuChange) {
       onMenuChange(nextIsOpen);
     }
+    if (!isOpen) {
+      setHighlightedIndex(0);
+    }
   }
   function handleOnOuterClick() {
     handleOnMenuChange(false);
@@ -172,6 +175,34 @@ const FilterableMultiSelect = /*#__PURE__*/React__default["default"].forwardRef(
         break;
       case stateChangeTypes.keyDownEscape:
         handleOnMenuChange(false);
+        setHighlightedIndex(0);
+        break;
+      case stateChangeTypes.changeInput:
+        setHighlightedIndex(0);
+        break;
+      case stateChangeTypes.keyDownEnter:
+        if (!isOpen) {
+          setHighlightedIndex(0);
+        }
+        break;
+      case stateChangeTypes.clickItem:
+        if (isOpen) {
+          const sortedItems = sortItems(filterItems(items, {
+            itemToString: itemToString$1,
+            inputValue
+          }), {
+            selectedItems: {
+              top: changes.selectedItems,
+              fixed: [],
+              'top-after-reopen': topItems
+            }[selectionFeedback],
+            itemToString: itemToString$1,
+            compareItems,
+            locale
+          });
+          const sortedSelectedIndex = sortedItems.indexOf(changes.selectedItem);
+          setHighlightedIndex(sortedSelectedIndex);
+        }
         break;
     }
   }

package/lib/components/MultiSelect/MultiSelect.js

@@ -48,9 +48,11 @@ const {
   ToggleButtonKeyDownEscape,
   ToggleButtonKeyDownSpaceButton,
   ItemMouseMove,
+  MenuMouseLeave,
   ToggleButtonClick,
-  ToggleButtonKeyDownHome,
-  ToggleButtonKeyDownEnd
+  ToggleButtonKeyDownPageDown,
+  ToggleButtonKeyDownPageUp,
+  FunctionSetHighlightedIndex
 } = Downshift.useSelect.stateChangeTypes;
 const defaultItemToString = item => {
   if (typeof item === 'string') {
@@ -146,7 +148,8 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
     getMenuProps,
     getItemProps,
     selectedItem,
-    highlightedIndex
+    highlightedIndex,
+    setHighlightedIndex
   } = Downshift.useSelect(selectProps);
   const toggleButtonProps = getToggleButtonProps({
     onFocus: () => {
@@ -165,6 +168,7 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
           setItemsCleared(true);
         }
         if ((match.match(e, keys.Space) || match.match(e, keys.ArrowDown) || match.match(e, keys.Enter)) && !isOpen) {
+          setHighlightedIndex(0);
           setItemsCleared(false);
           setIsOpenWrapper(true);
         }
@@ -248,7 +252,6 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
       setTopItems(controlledSelectedItems);
     }
     switch (type) {
-      case ItemClick:
       case ToggleButtonKeyDownSpaceButton:
       case ToggleButtonKeyDownEnter:
         if (changes.selectedItem === undefined) {
@@ -268,11 +271,38 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
         break;
       case ToggleButtonClick:
         setIsOpenWrapper(changes.isOpen || false);
-        break;
+        return {
+          ...changes,
+          highlightedIndex: 0
+        };
+      case ItemClick:
+        setHighlightedIndex(changes.selectedItem);
+        onItemChange(changes.selectedItem);
+        return {
+          ...changes,
+          highlightedIndex: state.highlightedIndex
+        };
+      case MenuMouseLeave:
+        return {
+          ...changes,
+          highlightedIndex: state.highlightedIndex
+        };
+      case FunctionSetHighlightedIndex:
+        if (!isOpen) {
+          return {
+            ...changes,
+            highlightedIndex: 0
+          };
+        } else {
+          return {
+            ...changes,
+            highlightedIndex: props.items.indexOf(highlightedIndex)
+          };
+        }
       case ToggleButtonKeyDownArrowDown:
       case ToggleButtonKeyDownArrowUp:
-      case ToggleButtonKeyDownHome:
-      case ToggleButtonKeyDownEnd:
+      case ToggleButtonKeyDownPageDown:
+      case ToggleButtonKeyDownPageUp:
         if (highlightedIndex > -1) {
           const itemArray = document.querySelectorAll(`li.${prefix}--list-box__menu-item[role="option"]`);
           props.scrollIntoView(itemArray[highlightedIndex]);