@elliemae/ds-controlled-form 2.4.2-rc.1 → 2.4.2-rc.11

package/esm/autocomplete/parts/container/Container.js

@@ -2,19 +2,21 @@ import _jsx from '@babel/runtime/helpers/esm/jsx';
 import 'core-js/modules/esnext.async-iterator.filter.js';
 import 'core-js/modules/esnext.iterator.constructor.js';
 import 'core-js/modules/esnext.iterator.filter.js';
-import React, { useContext, useEffect, useCallback } from 'react';
+import React, { useContext, useEffect, useCallback, useMemo } from 'react';
 import { DSPopperJS } from '@elliemae/ds-popperjs';
 import { AutocompleteContext } from '../../AutocompleteCTX.js';
-import { StyledContainerWithPopper, StyledPopperWrapper } from './styled.js';
+import { StyledContainer, StyledPopperWrapper } from './styled.js';
 import { MenuList } from '../menu-list/MenuList.js';
 import { useKeyboardNavigation } from './useKeyboardNavigation.js';
 import { AutocompleteDataTestid } from '../../AutocompleteDataTestids.js';
-import { jsxs } from 'react/jsx-runtime';
+import { A11yFocusedOption } from '../A11yFocusedOption.js';
+import { jsxs, Fragment } from 'react/jsx-runtime';
 
-var _StyledPopperWrapper;
+var _A11yFocusedOption, _StyledPopperWrapper;
 const Container = () => {
   const {
     props: {
+      id,
       startPlacementPreference,
       children,
       filter,
@@ -23,6 +25,7 @@ const Container = () => {
     showPopover,
     setReferenceElement,
     setShowPopover,
+    focusOptionIdx,
     referenceElement
   } = useContext(AutocompleteContext);
   useEffect(() => {
@@ -38,32 +41,41 @@ const Container = () => {
   const handleCloseMenu = useCallback(() => {
     setShowPopover(false);
   }, [setShowPopover]);
-  const input = React.Children.only(children);
   const {
     onInputKeyDown
   } = useKeyboardNavigation();
-  return /*#__PURE__*/jsxs(StyledContainerWithPopper, {
-    ref: setReferenceElement,
-    role: "combobox",
-    "aria-autocomplete": "list",
-    "aria-controls": "autocomplete-listbox",
-    "aria-expanded": showPopover,
-    onKeyDown: onInputKeyDown,
-    "data-testid": AutocompleteDataTestid.CONTAINER,
-    children: [input, filter && /*#__PURE__*/_jsx(DSPopperJS, {
-      customOffset: [0, 5],
-      closeContextMenu: handleCloseMenu,
-      referenceElement: referenceElement,
-      showPopover: showPopover,
-      startPlacementPreference: startPlacementPreference,
-      placementOrderPreference: placementOrderPreference,
-      withoutPortal: true,
-      withoutArrow: true,
-      withoutAnimation: true,
-      zIndex: 10
-    }, void 0, _StyledPopperWrapper || (_StyledPopperWrapper = /*#__PURE__*/_jsx(StyledPopperWrapper, {
-      tabIndex: -1
-    }, void 0, /*#__PURE__*/_jsx(MenuList, {}))))]
+  const input = React.Children.only(children);
+  const childrenWithProps = /*#__PURE__*/React.isValidElement(input) ? /*#__PURE__*/React.cloneElement(input, {
+    'aria-activedescendant': focusOptionIdx
+  }) : input;
+  const idList = useMemo(() => "".concat(id ? "".concat(id, "-") : '', "listbox"), [id]);
+  return /*#__PURE__*/jsxs(Fragment, {
+    children: [_A11yFocusedOption || (_A11yFocusedOption = /*#__PURE__*/_jsx(A11yFocusedOption, {})), /*#__PURE__*/jsxs(StyledContainer, {
+      id: id,
+      ref: setReferenceElement,
+      role: "combobox",
+      "aria-autocomplete": "list",
+      "aria-controls": "autocomplete-listbox",
+      "aria-expanded": showPopover,
+      "aria-haspopup": "listbox",
+      "aria-owns": idList,
+      onKeyDown: onInputKeyDown,
+      "data-testid": AutocompleteDataTestid.CONTAINER,
+      children: [childrenWithProps, filter && /*#__PURE__*/_jsx(DSPopperJS, {
+        customOffset: [0, 5],
+        closeContextMenu: handleCloseMenu,
+        referenceElement: referenceElement,
+        showPopover: showPopover,
+        startPlacementPreference: startPlacementPreference,
+        placementOrderPreference: placementOrderPreference,
+        withoutPortal: true,
+        withoutArrow: true,
+        withoutAnimation: true,
+        zIndex: 10
+      }, void 0, _StyledPopperWrapper || (_StyledPopperWrapper = /*#__PURE__*/_jsx(StyledPopperWrapper, {
+        tabIndex: -1
+      }, void 0, /*#__PURE__*/_jsx(MenuList, {}))))]
+    })]
   });
 };
 

package/esm/autocomplete/parts/container/styled.js

@@ -1,10 +1,10 @@
 import styled from 'styled-components';
 
-const StyledContainerWithPopper = /*#__PURE__*/styled.div.withConfig({
+const StyledContainer = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-xupfk9-0"
 })(["width:100%;height:28px;position:relative;"]);
 const StyledPopperWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-xupfk9-1"
 })(["background:#fff;overflow:auto;position:relative;"]);
 
-export { StyledContainerWithPopper, StyledPopperWrapper };
+export { StyledContainer, StyledPopperWrapper };

package/esm/autocomplete/parts/menu-list/MenuList.js

@@ -1,5 +1,5 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import { useContext, useCallback } from 'react';
+import { useContext, useCallback, useMemo } from 'react';
 import { StyledListWrapper, StyledVirtualListWrapper, StyledList } from './styled.js';
 import { AutocompleteDataTestid } from '../../AutocompleteDataTestids.js';
 import { AutocompleteContext } from '../../AutocompleteCTX.js';
@@ -9,7 +9,8 @@ import { jsx } from 'react/jsx-runtime';
 const MenuList = () => {
   const {
     props: {
-      options
+      options,
+      id
     },
     referenceElement,
     inputRef,
@@ -25,11 +26,12 @@ const MenuList = () => {
 
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
   }, [inputRef]);
+  const idList = useMemo(() => "".concat(id ? "".concat(id, "-") : '', "listbox"), [id]);
   return /*#__PURE__*/_jsx(StyledListWrapper, {
     tabIndex: -1,
     onMouseDown: e => e.preventDefault(),
     minWidth: referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth,
-    id: "autocomplete-listbox",
+    id: idList,
     role: "listbox"
   }, void 0, options.length > 0 && /*#__PURE__*/jsx(StyledVirtualListWrapper, {
     tabIndex: -1,

package/esm/autocomplete/parts/styled.js

@@ -0,0 +1 @@
+

package/esm/autocomplete/utils/listHelper.js

@@ -9,7 +9,7 @@ const isSelectedValueMultiple = value => Array.isArray(value);
 const findInCircularList = function (list, from, criteria) {
   let step = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
 
-  for (let i = (from + step + list.length) % list.length; i !== from; i = (i + step + list.length) % list.length) {
+  for (let i = (from + step + list.length) % list.length; i !== from && from > -1; i = (i + step + list.length) % list.length) {
     if (criteria(list[i])) return i;
   }
 

package/esm/checkbox/ControlledCheckbox.js

@@ -9,7 +9,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutPr
 import { useRef, useCallback } from 'react';
 import { describe, useMemoMergePropsWithDefault, useGetGlobalAttributes, useGetXstyledProps } from '@elliemae/ds-props-helpers';
 import { SimpleTruncatedTooltipText } from '@elliemae/ds-truncated-tooltip-text';
-import { StyledContainer, StyledCheckBox, StyledInputMixed, StyledInput, StyledLabel } from './styles.js';
+import { StyledContainer, StyledCheckBox, StyledInputMixed, StyledInput, StyledLabel, StyledWrapLabel } from './styles.js';
 import { propTypes, defaultProps } from './react-desc-prop-types.js';
 import { setMultipleRefs } from './utils/setMultipleRefs.js';
 import { useValidateProps } from './config/useValidateProps.js';
@@ -98,7 +98,7 @@ const DSControlledCheckbox = props => {
       checked: checked,
       "data-testid": "ds-checkbox-label",
       wrapLabel: wrapLabel
-    }, void 0, wrapLabel ? label : /*#__PURE__*/_jsx(SimpleTruncatedTooltipText, {
+    }, void 0, wrapLabel ? /*#__PURE__*/_jsx(StyledWrapLabel, {}, void 0, label) : /*#__PURE__*/_jsx(SimpleTruncatedTooltipText, {
       value: label
     }))]
   }));

package/esm/checkbox/react-desc-prop-types.js

@@ -18,7 +18,8 @@ const defaultProps = {
 const propTypes = _objectSpread(_objectSpread({}, globalAttributesPropTypes), {}, {
   label: PropTypes.string.description('Checkbox Label property. This label is also going to be used as an aria-label for screen readers.'),
   hasError: PropTypes.bool.description('Whether the checkbox has error or not.'),
-  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Checkbox input ref.')
+  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Checkbox input ref.'),
+  wrapLabel: PropTypes.bool.description('Whether to wrap or truncate the label')
 });
 
 export { defaultProps, propTypes };

package/esm/checkbox/styles.js

@@ -3,7 +3,7 @@ import { styled, css } from '@elliemae/ds-system';
 import { handleBackgroundColor, handleCheckmark } from './utils/styleHelpers.js';
 import { DSCheckboxName, DSCheckboxSlots } from './exported-related/theming.js';
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 const StyledContainer = styled('div', {
   name: DSCheckboxName,
   slot: DSCheckboxSlots.CONTAINER
@@ -93,7 +93,7 @@ const StyledLabel = styled('label', {
     wrapLabel,
     theme
   } = _ref11;
-  return wrapLabel ? 'padding: 8px' : "padding-left: ".concat(theme.space.xxs);
+  return wrapLabel ? 'padding: 8px 0px 8px 8px;' : "padding-left: ".concat(theme.space.xxs);
 }, _ref12 => {
   let {
     theme,
@@ -103,5 +103,6 @@ const StyledLabel = styled('label', {
   } = _ref12;
   return disabled && checked !== true || readOnly ? theme.colors.neutral[500] : theme.colors.neutral[800];
 });
+const StyledWrapLabel = styled('span')(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral([""])));
 
-export { StyledCheckBox, StyledContainer, StyledInput, StyledInputMixed, StyledLabel };
+export { StyledCheckBox, StyledContainer, StyledInput, StyledInputMixed, StyledLabel, StyledWrapLabel };

package/esm/combobox/ComboBoxCTX.js

@@ -12,12 +12,14 @@ const defaultProps = {
   useMask: noop,
   innerRef: /*#__PURE__*/createRef(),
   startPlacementPreference: 'bottom-start',
-  placementOrderPreference: ['bottom-start', 'bottom-end'] // override in useCombobox to avoid ref duplications when more than one cb is used
+  placementOrderPreference: ['bottom-start', 'bottom-end'],
+  noOptionsMessage: 'No Matches Found',
+  filteredOptions: [] // override in useCombobox to avoid ref duplications when more than one cb is used
 
 };
 const defaultContext = {
   props: defaultProps,
-  showPopover: false,
+  menuState: false,
   hasFocus: false,
   referenceElement: null,
   inputValue: '',
@@ -36,7 +38,8 @@ const defaultContext = {
   setInputValue: noop,
   setReferenceElement: noop,
   setFocusOptionIdx: noop,
-  setShowSelectedOptions: noop
+  setShowSelectedOptions: noop,
+  setMenuState: noop
 };
 /** Context for cross component communication */
 

package/esm/combobox/config/useComboBox.js

@@ -5,7 +5,7 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import { useRef, useState, useCallback, useEffect, useMemo } from 'react';
+import { useRef, useState, useMemo, useCallback, useEffect } from 'react';
 import { useVirtual } from 'react-virtual';
 import { useMemoMergePropsWithDefault, useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
 import { defaultProps } from '../ComboBoxCTX.js';
@@ -36,8 +36,18 @@ const useComboBox = props => {
   const toggleSelectionButtonRef = useRef(null);
   const pillGroupRef = useRef(null);
   const {
-    selectedValues
-  } = propsWithDefaults; // ---------------------------------------------------------------------------
+    selectedValues,
+    isMenuOpen,
+    onMenuChange
+  } = propsWithDefaults;
+  const menuState = useMemo(() => {
+    if (isMenuOpen !== undefined) return isMenuOpen;
+    return showPopover;
+  }, [showPopover, isMenuOpen]);
+  const setMenuState = useCallback((newState, reason, e) => {
+    if (onMenuChange !== undefined) onMenuChange(newState, reason, e);
+    setShowPopover(newState);
+  }, [onMenuChange]); // ---------------------------------------------------------------------------
   // Options with creatable option + filtered by selected
   // ---------------------------------------------------------------------------
 
@@ -91,7 +101,7 @@ const useComboBox = props => {
       filteredOptions: correctOptions
     }),
     virtualListHelpers,
-    showPopover,
+    menuState,
     referenceElement,
     listRef,
     focusOptionIdx,
@@ -100,6 +110,7 @@ const useComboBox = props => {
     selectAllCheckboxRef,
     inputValue,
     setInputValue,
+    setMenuState,
     hasFocus,
     toggleSelectionButtonRef,
     pillGroupRef,
@@ -111,7 +122,7 @@ const useComboBox = props => {
     scrollOptionIntoView,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, correctOptions, hasFocus, propsWithDefaults, virtualListHelpers, inputValue, focusOptionIdx, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, listRef]);
+  }), [scrollOptionIntoView, setMenuState, correctOptions, hasFocus, propsWithDefaults, virtualListHelpers, inputValue, focusOptionIdx, wrapperListRef, showSelectedOptions, menuState, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, listRef]);
   return ctx;
 };
 

package/esm/combobox/parts/A11yFocusedOption.js

@@ -5,28 +5,36 @@ import 'core-js/modules/esnext.iterator.find.js';
 import { useContext, useMemo } from 'react';
 import { ComboBoxContext } from '../ComboBoxCTX.js';
 import { StyledA11ySelectedValues } from './styled.js';
-import { getSelectableOptions } from '../utils/listHelper.js';
+import { getSelectableOptions, isSelected } from '../utils/listHelper.js';
 import { isSeparator } from '../sharedTypes.js';
 
 const A11yFocusedOption = () => {
   const {
     props: {
-      filteredOptions
+      filteredOptions,
+      selectedValues
     },
     focusOptionIdx,
-    showPopover
+    menuState
   } = useContext(ComboBoxContext);
   const selectabledOptions = getSelectableOptions(filteredOptions);
-  const focusOption = filteredOptions.find(option => !isSeparator(option) && option.dsId === focusOptionIdx);
+  const focusOption = filteredOptions.find(option => option.dsId === focusOptionIdx);
+  const isFocusOptionSelected = (focusOption === null || focusOption === void 0 ? void 0 : focusOption.type) === 'option' && isSelected(selectedValues, focusOption);
   const focusSelectableOptionIdx = selectabledOptions.findIndex(option => option.dsId === focusOptionIdx);
+  const navigationContext = 'Use up and down to choose options,press enter to choose focused option, press Escape to excuse dropdown menu';
   return useMemo(() => {
-    if (!isSeparator(focusOption) && showPopover && focusOption) return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
+    if (!isSeparator(focusOption) && menuState && focusOption && focusOption.type === 'option') return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
       "aria-live": "polite",
       "aria-atomic": "false",
       "aria-relevant": "additions text"
-    }, void 0, "option ".concat(focusOption === null || focusOption === void 0 ? void 0 : focusOption.label, " focused.").concat(focusSelectableOptionIdx + 1, " of ").concat(selectabledOptions.length, " "));
+    }, menuState, "option ".concat(focusOption === null || focusOption === void 0 ? void 0 : focusOption.label, " ").concat(isFocusOptionSelected ? 'selected and ' : '', "focused .").concat(focusSelectableOptionIdx + 1, " of ").concat(selectabledOptions.length, ". ").concat(navigationContext, " "));
+    if ((focusOption === null || focusOption === void 0 ? void 0 : focusOption.type) === 'creatable') return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
+      "aria-live": "assertive",
+      "aria-atomic": "false",
+      "aria-relevant": "additions text"
+    }, menuState, "Press enter to Add: ".concat(focusOption === null || focusOption === void 0 ? void 0 : focusOption.label, ". ").concat(navigationContext));
     return null;
-  }, [showPopover, focusOption, focusSelectableOptionIdx, selectabledOptions]);
+  }, [focusOption, menuState, isFocusOptionSelected, focusSelectableOptionIdx, selectabledOptions.length]);
 };
 
 export { A11yFocusedOption };

package/esm/combobox/parts/A11ySelectedValues.js

@@ -19,8 +19,6 @@ const A11ySelectedValues = () => {
       if (selectedValues.length > 0) {
         msg = "Options selected: ".concat(selectedValues.map(item => item.label).join(', '));
       }
-
-      msg = 'No Options Selected';
     } else if (selectedValues) {
       msg = "Option selected: ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.label);
     }

package/esm/combobox/parts/DropdownIndicator.js

@@ -20,7 +20,7 @@ const DropdownIndicator = () => {
     props: {
       disabled
     },
-    showPopover
+    menuState
   } = useContext(ComboBoxContext);
   const colorButton = useMemo(() => disabled ? ['neutral', 400] : ['brand-primary', 700], [disabled]);
   const handleOnClick = useCallback(e => {
@@ -32,7 +32,7 @@ const DropdownIndicator = () => {
     "aria-controls": "combo-listbox",
     "aria-labelledby": "combo-label",
     disabled: disabled,
-    "aria-expanded": showPopover,
+    "aria-expanded": menuState,
     "aria-haspopup": "listbox",
     "aria-hidden": true,
     buttonType: "icon",

package/esm/combobox/parts/container/Container.js

@@ -28,15 +28,13 @@ const Container = () => {
 
   const {
     props,
-    setShowPopover,
-    showPopover,
+    setMenuState,
+    menuState,
     setReferenceElement,
     referenceElement
   } = useContext(ComboBoxContext);
   const {
     inline,
-    onMenuOpen,
-    onMenuClose,
     innerRef,
     startPlacementPreference,
     placementOrderPreference,
@@ -52,20 +50,19 @@ const Container = () => {
     e.preventDefault();
   }, []);
   const handleCloseMenu = useCallback(() => {
-    setShowPopover(false);
+    setMenuState(false, 'blur');
     if (innerRef !== null && innerRef !== void 0 && innerRef.current) innerRef.current.blur();
-  }, [innerRef, setShowPopover]);
+  }, [innerRef, setMenuState]);
   useEffect(() => {
-    const closeMenuOnWindowBlur = () => setShowPopover(false);
+    const closeMenuOnWindowBlur = () => {
+      setMenuState(false, 'blur');
+    };
 
     window.addEventListener('blur', closeMenuOnWindowBlur);
     return () => {
       window.removeEventListener('blur', closeMenuOnWindowBlur);
     };
-  }, [setShowPopover]);
-  useEffect(() => {
-    if (onMenuOpen && showPopover) onMenuOpen();else if (onMenuClose && !showPopover) onMenuClose();
-  }, [showPopover, onMenuOpen, onMenuClose]);
+  }, [setMenuState]);
   return useMemo(() => /*#__PURE__*/jsx(StyledContainer, _objectSpread(_objectSpread(_objectSpread({
     "data-testid": ComboboxDataTestid.CONTAINER,
     ref: setReferenceElement
@@ -76,7 +73,7 @@ const Container = () => {
       children: [_Controls2 || (_Controls2 = /*#__PURE__*/_jsx(Controls, {})), /*#__PURE__*/_jsx(DSPopperJS, {
         customOffset: [0, 5],
         referenceElement: referenceElement,
-        showPopover: showPopover,
+        showPopover: menuState,
         closeContextMenu: handleCloseMenu,
         startPlacementPreference: startPlacementPreference,
         placementOrderPreference: placementOrderPreference,
@@ -89,7 +86,7 @@ const Container = () => {
         onMouseDown: handleMouseDown
       }, void 0, _MenuList2 || (_MenuList2 = /*#__PURE__*/_jsx(MenuList, {})))))]
     })
-  })), [inline, setReferenceElement, globalsAttrs, referenceElement, showPopover, xStyledProps, handleCloseMenu, startPlacementPreference, placementOrderPreference, withoutPortal, zIndex, handleMouseDown]);
+  })), [inline, setReferenceElement, globalsAttrs, referenceElement, menuState, xStyledProps, handleCloseMenu, startPlacementPreference, placementOrderPreference, withoutPortal, zIndex, handleMouseDown]);
 };
 
 export { Container };

package/esm/combobox/parts/controls/Controls.js

@@ -4,6 +4,7 @@ import { DropdownIndicator } from '../DropdownIndicator.js';
 import { ComboboxDataTestid } from '../../ComboboxDataTestids.js';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { StyledControlsWrapper, StyledSelection, StyledHeaderActionsWrapper, StyleHeaderActionsSeparator } from './styled.js';
+import { scrollIfNeeded } from '../../utils/listHelper.js';
 import { MultiSelectedValuesContainer } from '../multi-selected-values-container/MultiSelectedValuesContainer.js';
 import { ControlsInput } from '../controls-input/ControlsInput.js';
 import { useOnPillsNavigation } from './useOnPillsNavigation.js';
@@ -12,7 +13,7 @@ import { A11ySelectedValues } from '../A11ySelectedValues.js';
 import { RemovableSelectedValuePill } from '../multi-selected-values-container/RemovableSelectedValuePill.js';
 import { jsxs } from 'react/jsx-runtime';
 
-var _A11ySelectedValues, _A11yFocusedOption, _MultiSelectedValuesC, _ControlsInput, _DropdownIndicator;
+var _A11ySelectedValues, _MultiSelectedValuesC, _A11yFocusedOption, _ControlsInput, _DropdownIndicator;
 const Controls = () => {
   const {
     props: {
@@ -24,12 +25,12 @@ const Controls = () => {
       innerRef
     },
     selectedOptionsRef,
-    setShowPopover,
+    setMenuState,
     setFocusOptionIdx,
     hasFocus,
     listRef,
     focusOptionIdx,
-    showPopover,
+    menuState,
     controlsWrapperRef
   } = useContext(ComboBoxContext);
   const handleOnClick = useCallback(() => {
@@ -37,37 +38,34 @@ const Controls = () => {
 
     if (disabled) return;
 
-    if (hasFocus && showPopover && !inline) {
+    if (hasFocus && menuState && !inline) {
       var _innerRef$current;
 
-      setShowPopover(false);
+      setMenuState(false);
       setFocusOptionIdx('');
       (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.blur();
       return;
     }
 
     (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
-    setShowPopover(true);
+    setMenuState(true);
     window.requestAnimationFrame(() => {
-      if (listRef.current && window.scrollY < listRef.current.scrollHeight) {
-        window.scrollTo({
-          top: listRef.current.scrollHeight,
-          behavior: 'smooth'
-        });
-      }
+      window.requestAnimationFrame(() => {
+        if (listRef.current) scrollIfNeeded(listRef.current);
+      });
     }); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [disabled, listRef, hasFocus, showPopover, inline, innerRef, setShowPopover, focusOptionIdx]); // this callback prevent to toggle the menu when clicking or removing pills
+  }, [disabled, listRef, hasFocus, menuState, inline, innerRef, setMenuState, focusOptionIdx]); // this callback prevent to toggle the menu when clicking or removing pills
 
   const handleOnPillsClick = useCallback(e => {
-    if (showPopover || disabled) {
+    if (menuState || disabled) {
       e.stopPropagation();
     } else {
       var _innerRef$current3;
 
       (_innerRef$current3 = innerRef.current) === null || _innerRef$current3 === void 0 ? void 0 : _innerRef$current3.focus();
-      setShowPopover(true);
+      setMenuState(true);
     }
-  }, [showPopover, innerRef, disabled, setShowPopover]); // callback to prevent onBlur on the input when clicking in all the wrapper
+  }, [menuState, innerRef, disabled, setMenuState]); // callback to prevent onBlur on the input when clicking in all the wrapper
 
   const handleOnMouseDown = useCallback(e => {
     if (document.activeElement === innerRef.current || inline) {
@@ -92,12 +90,12 @@ const Controls = () => {
     children: [!inline && /*#__PURE__*/jsxs(StyledSelection, {
       ref: selectedOptionsRef,
       onClick: handleOnPillsClick,
-      children: [_A11ySelectedValues || (_A11ySelectedValues = /*#__PURE__*/_jsx(A11ySelectedValues, {})), _A11yFocusedOption || (_A11yFocusedOption = /*#__PURE__*/_jsx(A11yFocusedOption, {})), Array.isArray(selectedValues) ? _MultiSelectedValuesC || (_MultiSelectedValuesC = /*#__PURE__*/_jsx(MultiSelectedValuesContainer, {})) : /*#__PURE__*/_jsx("div", {
+      children: [_A11ySelectedValues || (_A11ySelectedValues = /*#__PURE__*/_jsx(A11ySelectedValues, {})), Array.isArray(selectedValues) ? _MultiSelectedValuesC || (_MultiSelectedValuesC = /*#__PURE__*/_jsx(MultiSelectedValuesContainer, {})) : /*#__PURE__*/_jsx("div", {
         "data-testid": ComboboxDataTestid.SELECTED_VALUES
       }, void 0, selectedValues && /*#__PURE__*/_jsx(RemovableSelectedValuePill, {
         pill: selectedValues
       }))]
-    }), _ControlsInput || (_ControlsInput = /*#__PURE__*/_jsx(ControlsInput, {})), !inline && /*#__PURE__*/_jsx(StyledHeaderActionsWrapper, {
+    }), _A11yFocusedOption || (_A11yFocusedOption = /*#__PURE__*/_jsx(A11yFocusedOption, {})), _ControlsInput || (_ControlsInput = /*#__PURE__*/_jsx(ControlsInput, {})), !inline && /*#__PURE__*/_jsx(StyledHeaderActionsWrapper, {
       justifyContent: "center",
       cols: ['min-content', 'min-content']
     }, void 0, /*#__PURE__*/_jsx(StyleHeaderActionsSeparator, {

package/esm/combobox/parts/controls/useOnPillsNavigation.js

@@ -9,7 +9,7 @@ const useOnPillsNavigation = () => {
     },
     inputValue,
     hasFocus,
-    setShowPopover,
+    setMenuState,
     selectedOptionsRef
   } = useContext(ComboBoxContext); // todo: constant must be defined on pills component
 
@@ -20,7 +20,7 @@ const useOnPillsNavigation = () => {
         var _innerRef$current;
 
         (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
-        setShowPopover(true);
+        setMenuState(true, 'open', e);
         return;
       }
 
@@ -43,7 +43,7 @@ const useOnPillsNavigation = () => {
         (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
       }
     }
-  }, [inputValue, hasFocus, innerRef, selectedOptionsRef, setShowPopover]);
+  }, [inputValue, innerRef, setMenuState, selectedOptionsRef, hasFocus]);
   return {
     onKeyDownPills
   };

package/esm/combobox/parts/controls-input/ControlsInput.js

@@ -19,7 +19,7 @@ const ControlsInput = () => {
     },
     focusOptionIdx,
     inputValue,
-    showPopover
+    menuState
   } = useContext(ComboBoxContext);
   const {
     onInputKeyDown
@@ -44,7 +44,7 @@ const ControlsInput = () => {
     placeholder: placeholder,
     "aria-controls": "combo-listbox",
     "aria-activedescendant": focusOptionIdx,
-    "aria-expanded": showPopover,
+    "aria-expanded": menuState,
     "aria-haspopup": "listbox",
     "aria-describedby": "combobox-selected-items",
     role: "combobox",

package/esm/combobox/parts/controls-input/useControlsInput.js

@@ -15,6 +15,7 @@ const useControlsInput = () => {
     },
     setHasFocus,
     inputValue,
+    setMenuState,
     setInputValue
   } = useContext(ComboBoxContext);
   const [width, setWidth] = useState(1); // use span reference to calculate the real width for the input
@@ -32,9 +33,9 @@ const useControlsInput = () => {
   const handleOnChange = useMaskedOnChange();
   const handleOnBlur = useCallback(() => {
     setInputValue('');
-    if (onFilter) onFilter(allOptions, inputValue);
+    if (onFilter) onFilter(allOptions);
     setHasFocus(false);
-  }, [setInputValue, onFilter, allOptions, inputValue, setHasFocus]);
+  }, [setInputValue, onFilter, allOptions, setHasFocus]);
   const handleOnFocus = useCallback(() => {
     setHasFocus(true);
   }, [setHasFocus]);