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

package/esm/combobox/parts/DropdownIndicator.js

@@ -1,5 +1,4 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLiteral';
 import { useContext, useMemo, useCallback } from 'react';
 import { styled } from '@elliemae/ds-system';
 import { DSButtonV2 } from '@elliemae/ds-button';
@@ -7,20 +6,30 @@ import { ChevronSmallDown } from '@elliemae/ds-icons';
 import { ComboBoxContext } from '../ComboBoxCTX.js';
 import { ComboboxDataTestid } from '../ComboboxDataTestids.js';
 
-var _templateObject;
-const StyledDropDownButton = styled(DSButtonV2)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &:focus::after {\n    border: none;\n  }\n  &:hover:not(:disabled) {\n    background-color: transparent;\n  }\n\n  & svg {\n    fill: ", ";\n  }\n"])), _ref => {
+const StyledDropDownButton = styled(DSButtonV2)`
+  &:focus::after {
+    border: none;
+  }
+  &:hover:not(:disabled) {
+    background-color: transparent;
+  }
+
+  & svg {
+    fill: ${_ref => {
   let {
     theme,
     disabled
   } = _ref;
   return disabled ? theme.colors.neutral['400'] : theme.colors.brand['700'];
-});
+}};
+  }
+`;
 const DropdownIndicator = () => {
   const {
     props: {
       disabled
     },
-    showPopover
+    menuState
   } = useContext(ComboBoxContext);
   const colorButton = useMemo(() => disabled ? ['neutral', 400] : ['brand-primary', 700], [disabled]);
   const handleOnClick = useCallback(e => {
@@ -32,7 +41,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);
-    if (innerRef !== null && innerRef !== void 0 && innerRef.current) innerRef.current.blur();
-  }, [innerRef, setShowPopover]);
+    setMenuState(false, 'blur');
+    if (innerRef?.current) innerRef.current.blur();
+  }, [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/container/styled.js

@@ -1,22 +1,27 @@
-import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLiteral';
 import { styled } from '@elliemae/ds-system';
 import { DSComboBoxName, DSComboboxSlots } from '../../theming.js';
 
-var _templateObject, _templateObject2;
 const StyledContainer = styled('div', {
   name: DSComboBoxName,
   slot: DSComboboxSlots.CONTAINER
-})(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  cursor: ", ";\n"])), _ref => {
+})`
+  position: relative;
+  cursor: ${_ref => {
   let {
     disabled
   } = _ref;
   return disabled ? 'not-allowed' : 'default';
-});
-const StyledPopperWrapper = styled('div')(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  cursor: ", ";\n  overflow: auto;\n"])), _ref2 => {
+}};
+`;
+const StyledPopperWrapper = styled('div')`
+  position: relative;
+  cursor: ${_ref2 => {
   let {
     disabled
   } = _ref2;
   return disabled ? 'not-allowed' : 'default';
-});
+}};
+  overflow: auto;
+`;
 
 export { StyledContainer, StyledPopperWrapper };

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,50 +25,41 @@ const Controls = () => {
       innerRef
     },
     selectedOptionsRef,
-    setShowPopover,
+    setMenuState,
     setFocusOptionIdx,
     hasFocus,
     listRef,
     focusOptionIdx,
-    showPopover,
+    menuState,
     controlsWrapperRef
   } = useContext(ComboBoxContext);
   const handleOnClick = useCallback(() => {
-    var _innerRef$current2;
-
     if (disabled) return;
 
-    if (hasFocus && showPopover && !inline) {
-      var _innerRef$current;
-
-      setShowPopover(false);
+    if (hasFocus && menuState && !inline) {
+      setMenuState(false);
       setFocusOptionIdx('');
-      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.blur();
+      innerRef.current?.blur();
       return;
     }
 
-    (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
-    setShowPopover(true);
+    innerRef.current?.focus();
+    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);
+      innerRef.current?.focus();
+      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 +84,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/styled.js

@@ -1,58 +1,94 @@
-import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLiteral';
 import { css, styled } from '@elliemae/ds-system';
 import { Grid } from '@elliemae/ds-grid';
 import { DSComboBoxName, DSComboboxSlots } from '../../theming.js';
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
-const normalBorder = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  border: 1px solid ", ";\n"])), _ref => {
+const normalBorder = css`
+  border: 1px solid ${_ref => {
   let {
     hasError,
     theme
   } = _ref;
   return hasError ? theme.colors.danger[900] : theme.colors.neutral[400];
-});
-const focusBorder = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  outline: 2px solid ", ";\n  outline-offset: -2px;\n"])), _ref2 => {
+}};
+`;
+const focusBorder = css`
+  outline: 2px solid ${_ref2 => {
   let {
     theme
   } = _ref2;
   return theme.colors.brand[700];
-});
-const hoverBorder = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  border: 1px solid ", ";\n"])), _ref3 => {
+}};
+  outline-offset: -2px;
+`;
+const hoverBorder = css`
+  border: 1px solid ${_ref3 => {
   let {
     theme
   } = _ref3;
   return theme.colors.brand[700];
-});
+}};
+`;
 const StyledControlsWrapper = styled(Grid, {
   name: DSComboBoxName,
   slot: DSComboboxSlots.INPUT_WRAPPER
-})(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  background: ", ";\n  position: relative;\n  border-radius: 2px;\n  min-width: ", ";\n  align-items: center;\n  align-content: center;\n  height: 28px;\n  padding-left: 8px;\n  margin: ", ";\n  ", "\n  &:hover {\n    ", "\n  }\n  &:focus-within {\n    ", "\n  }\n"])), _ref4 => {
+})`
+  background: ${_ref4 => {
   let {
     disabled,
     theme
   } = _ref4;
   return disabled ? theme.colors.neutral['080'] : '#ffffff';
-}, _ref5 => {
+}};
+  position: relative;
+  border-radius: 2px;
+  min-width: ${_ref5 => {
   let {
     minWidth,
     inline
   } = _ref5;
-  return inline || !minWidth ? '' : "".concat(minWidth, "px");
-}, _ref6 => {
+  return inline || !minWidth ? '' : `${minWidth}px`;
+}};
+  align-items: center;
+  align-content: center;
+  height: 28px;
+  padding-left: 8px;
+  margin: ${_ref6 => {
   let {
     inline
   } = _ref6;
   return inline ? '10px 16px' : '';
-}, normalBorder, hoverBorder, focusBorder);
-const StyledSelection = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: 13px;\n  margin-right: 3px;\n  display: flex;\n"])));
-const StyledHeaderActionsWrapper = styled(Grid)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  height: 100%;\n  .em-ds-button--text:focus::after {\n    border: none;\n  }\n"])));
-const StyleDropdownIndicator = styled.div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral([""])));
-const StyleHeaderActionsSeparator = styled.span(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  align-self: stretch;\n  margin: 4px 0px;\n  width: 1px;\n  background-color: ", ";\n"])), _ref7 => {
+}};
+  ${normalBorder}
+  &:hover {
+    ${hoverBorder}
+  }
+  &:focus-within {
+    ${focusBorder}
+  }
+`;
+const StyledSelection = styled.div`
+  font-size: 13px;
+  margin-right: 3px;
+  display: flex;
+`;
+const StyledHeaderActionsWrapper = styled(Grid)`
+  height: 100%;
+  .em-ds-button--text:focus::after {
+    border: none;
+  }
+`;
+const StyleDropdownIndicator = styled.div``;
+const StyleHeaderActionsSeparator = styled.span`
+  align-self: stretch;
+  margin: 4px 0px;
+  width: 1px;
+  background-color: ${_ref7 => {
   let {
     theme,
     disabled
   } = _ref7;
   return disabled ? theme.colors.neutral['400'] : theme.colors.neutral['500'];
-});
+}};
+`;
 
 export { StyleDropdownIndicator, StyleHeaderActionsSeparator, StyledControlsWrapper, StyledHeaderActionsWrapper, StyledSelection };

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
 
@@ -17,33 +17,25 @@ const useOnPillsNavigation = () => {
   const onKeyDownPills = useCallback(e => {
     if ((e.key === 'ArrowLeft' || e.key === 'ArrowRight' || e.key === 'ArrowUp' || e.key === 'ArrowDown') && inputValue === '') {
       if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
-        var _innerRef$current;
-
-        (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
-        setShowPopover(true);
+        innerRef.current?.focus();
+        setMenuState(true, 'open', e);
         return;
       }
 
       if (e.key === 'ArrowLeft') {
-        var _selectedOptionsRef$c;
-
-        const removablePills = (_selectedOptionsRef$c = selectedOptionsRef.current) === null || _selectedOptionsRef$c === void 0 ? void 0 : _selectedOptionsRef$c.querySelectorAll(REMOVABLE_PILL_SELECTOR);
+        const removablePills = selectedOptionsRef.current?.querySelectorAll(REMOVABLE_PILL_SELECTOR);
 
         if (hasFocus && removablePills) {
-          var _removablePills;
-
-          (_removablePills = removablePills[removablePills.length - 1]) === null || _removablePills === void 0 ? void 0 : _removablePills.focus();
+          removablePills[removablePills.length - 1]?.focus();
         }
       }
 
       if (e.key === 'ArrowRight') {
-        var _innerRef$current2;
-
         e.preventDefault();
-        (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
+        innerRef.current?.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/styled.js

@@ -1,19 +1,53 @@
-import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLiteral';
 import { styled } from '@elliemae/ds-system';
 import { DSComboBoxName, DSComboboxSlots } from '../../theming.js';
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 const StyledInput = styled('input', {
   name: DSComboBoxName,
   slot: DSComboboxSlots.INPUT
-})(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  font-size: 13px;\n  line-height: 13px;\n  border: none;\n  padding: 0;\n  outline: none;\n  color: ", ";\n  &:focus {\n    outline: none;\n  }\n  ", "\n  &::placeholder {\n    color: transparent;\n  }\n"])), props => props.theme.colors.neutral[700], _ref => {
+})`
+  font-size: 13px;
+  line-height: 13px;
+  border: none;
+  padding: 0;
+  outline: none;
+  color: ${props => props.theme.colors.neutral[700]};
+  &:focus {
+    outline: none;
+  }
+  ${_ref => {
   let {
     withoutCaret
   } = _ref;
   return withoutCaret && 'caret-color: transparent;';
-});
-const StyledInputPlaceHolder = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  font-style: italic;\n  color: ", ";\n  position: absolute;\n  display: flex;\n  align-items: center;\n  width: 100%;\n  user-select: none;\n  height: 28px;\n  font-size: 13px;\n  & span::after {\n    content: '';\n    padding: 1px;\n  }\n"])), props => props.theme.colors.neutral[500]);
-const StyledInputWidthReference = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  visibility: hidden;\n  position: absolute;\n  top: -9999px;\n"])));
-const StyledInputWrapper = styled('div')(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  position: relative;\n  align-items: center;\n  display: flex;\n"])));
+}}
+  &::placeholder {
+    color: transparent;
+  }
+`;
+const StyledInputPlaceHolder = styled.div`
+  font-style: italic;
+  color: ${props => props.theme.colors.neutral[500]};
+  position: absolute;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  user-select: none;
+  height: 28px;
+  font-size: 13px;
+  & span::after {
+    content: '';
+    padding: 1px;
+  }
+`;
+const StyledInputWidthReference = styled.span`
+  visibility: hidden;
+  position: absolute;
+  top: -9999px;
+`;
+const StyledInputWrapper = styled('div')`
+  position: relative;
+  align-items: center;
+  display: flex;
+`;
 
 export { StyledInput, StyledInputPlaceHolder, StyledInputWidthReference, StyledInputWrapper };

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

@@ -1,5 +1,3 @@
-import 'core-js/modules/web.dom-collections.iterator.js';
-import 'core-js/modules/es.string.replace.js';
 import { useContext, useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { useMaskedOnChange } from './useMaskedOnChange.js';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
@@ -15,6 +13,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
@@ -23,18 +22,16 @@ const useControlsInput = () => {
   const showPlaceholder = !inputValue && isSelectedValueEmpty(selectedValues) ? placeholder : null;
   const spanReferenceText = inputValue.replace(/\s/g, '\u00a0');
   useEffect(() => {
-    var _spanReference$curren;
-
-    setWidth((_spanReference$curren = spanReference.current) !== null && _spanReference$curren !== void 0 && _spanReference$curren.offsetWidth ? spanReference.current.offsetWidth + 2 : 1);
+    setWidth(spanReference.current?.offsetWidth ? spanReference.current.offsetWidth + 2 : 1);
   }, [inputValue]); // if we se an input mask we configure inside here the proper mask
   // or a stardard combobox onchange event
 
   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]);

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

@@ -5,7 +5,7 @@ import 'core-js/modules/esnext.async-iterator.filter.js';
 import 'core-js/modules/esnext.iterator.filter.js';
 import { useContext, useCallback } from 'react';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
-import { getOptions, getSuggestedValueOnChange, findInCircularList, getLastValueSelected } from '../../utils/listHelper.js';
+import { getOptions, scrollIfNeeded, getSuggestedValueOnChange, findInCircularList, getLastValueSelected } from '../../utils/listHelper.js';
 import { MENU_OPTION_TYPES, INTERNAL_MENU_OPTION_TYPES } from '../../constants.js';
 
 const isOptionFocuseable = opt => !['section', 'separator'].includes(opt.type) && !opt.disabled;
@@ -26,12 +26,12 @@ const useKeyboardNavigation = () => {
       withoutPortal
     },
     inputValue,
-    showPopover,
+    menuState,
     focusOptionIdx,
     listRef,
     selectAllCheckboxRef,
     toggleSelectionButtonRef,
-    setShowPopover,
+    setMenuState,
     setInputValue,
     scrollOptionIntoView,
     setFocusOptionIdx
@@ -44,17 +44,12 @@ const useKeyboardNavigation = () => {
     // =============================================================================
     // CUSTOM KEYS
     // =============================================================================
-    if (onKeyDown && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === MENU_OPTION_TYPES.OPTION) onKeyDown(e, currentItem);
+    if (onKeyDown && currentItem?.type === MENU_OPTION_TYPES.OPTION) onKeyDown(e, currentItem);
 
-    if (['ArrowDown', 'ArrowUp', 'Enter', 'Spacebar'].includes(e.key) || e.keyCode >= 48 && e.keyCode <= 90) {
-      setShowPopover(true);
+    if ((['ArrowDown', 'ArrowUp', 'Enter', 'Spacebar'].includes(e.key) || e.keyCode >= 48 && e.keyCode <= 90) && !menuState) {
+      setMenuState(true);
       window.requestAnimationFrame(() => {
-        if (listRef.current && window.scrollY < listRef.current.offsetHeight) {
-          window.scrollTo({
-            top: listRef.current.offsetHeight,
-            behavior: 'smooth'
-          });
-        }
+        if (listRef.current) scrollIfNeeded(listRef.current);
       });
     } // =============================================================================
     // ESCAPE
@@ -69,13 +64,13 @@ const useKeyboardNavigation = () => {
         setInputValue('');
       }
 
-      if (!inline) setShowPopover(false);
+      if (!inline) setMenuState(false, 'close', e);
     } // =============================================================================
     // ENTER KEY TO CREATE ELEMENTS
     // =============================================================================
 
 
-    if (e.key === 'Enter' && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === INTERNAL_MENU_OPTION_TYPES.CREATABLE && onCreate) {
+    if (e.key === 'Enter' && currentItem?.type === INTERNAL_MENU_OPTION_TYPES.CREATABLE && onCreate) {
       onCreate(inputValue); // blank active item to force search last one
 
       setFocusOptionIdx('');
@@ -91,12 +86,12 @@ const useKeyboardNavigation = () => {
       e.preventDefault();
       e.stopPropagation();
 
-      if (focusOptionIdx !== '' && (showPopover || inline) && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === MENU_OPTION_TYPES.OPTION && !currentItem.disabled) {
+      if (focusOptionIdx !== '' && (menuState || inline) && currentItem?.type === MENU_OPTION_TYPES.OPTION && !currentItem.disabled) {
         if (onFilter) onFilter(allOptions, '');
         setInputValue('');
 
         if (!multiple) {
-          setShowPopover(false);
+          setMenuState(false, 'selectOption', e);
         }
 
         onChange(getSuggestedValueOnChange(currentItem, selectedValues), currentItem, e);
@@ -104,7 +99,7 @@ const useKeyboardNavigation = () => {
     }
 
     if (e.key === 'Enter' && e.altKey) {
-      setShowPopover(false);
+      setMenuState(false, 'selectOption', e);
     }
 
     if (e.key === 'a' && e.ctrlKey && multiple && onSelectAll) {
@@ -118,7 +113,7 @@ const useKeyboardNavigation = () => {
       e.preventDefault();
       e.stopPropagation();
 
-      if ((showPopover || inline) && selectableOptions.length) {
+      if ((menuState || inline) && selectableOptions.length) {
         const nextItemIndexIndex = findInCircularList(filteredOptions, currentItemIndex, isOptionFocuseable);
 
         if (nextItemIndexIndex > -1) {
@@ -135,12 +130,12 @@ const useKeyboardNavigation = () => {
       const prevItemIndex = findInCircularList(filteredOptions, currentItemIndex, isOptionFocuseable, -1);
 
       if (prevItemIndex > -1) {
-        if (showPopover || inline) {
+        if (menuState || inline) {
           setFocusOptionIdx(filteredOptions[prevItemIndex].dsId);
           scrollOptionIntoView(filteredOptions[prevItemIndex].dsId);
         } else {
           // open menu and search last item to focused
-          setShowPopover(true);
+          setMenuState(true, 'open', e);
           const lastItemIndex = findInCircularList(filteredOptions, 0, isOptionFocuseable, -1);
           setFocusOptionIdx(filteredOptions[lastItemIndex].dsId);
           setTimeout(() => {
@@ -163,22 +158,18 @@ const useKeyboardNavigation = () => {
       if (onFilter) onFilter(allOptions, inputValue);
     }
 
-    if (e.key === 'Tab' && !inline && !withoutPortal) {
-      var _selectAllCheckboxRef;
-
-      const element = (_selectAllCheckboxRef = selectAllCheckboxRef.current) !== null && _selectAllCheckboxRef !== void 0 ? _selectAllCheckboxRef : toggleSelectionButtonRef.current;
+    if (e.key === 'Tab' && !inline && menuState) {
+      const element = selectAllCheckboxRef.current ?? toggleSelectionButtonRef.current;
 
       if (element) {
         e.preventDefault();
         element.focus();
+      } else {
+        setMenuState(false, 'blur', e);
       }
     }
-
-    if (e.key === 'Tab' && !multiple && showPopover) {
-      setShowPopover(false);
-    }
   }, // eslint-disable-next-line react-hooks/exhaustive-deps
-  [onKeyDown, currentItem, onCreate, multiple, inputValue, inline, withoutPortal, setShowPopover, onCancel, onFilter, setInputValue, listRef, focusOptionIdx, showPopover, selectableOptions.length, filteredOptions, currentItemIndex, setFocusOptionIdx, selectedValues, onChange, selectAllCheckboxRef, toggleSelectionButtonRef]);
+  [onKeyDown, currentItem, onCreate, multiple, inputValue, inline, withoutPortal, setMenuState, onCancel, onFilter, setInputValue, listRef, focusOptionIdx, menuState, selectableOptions.length, filteredOptions, currentItemIndex, setFocusOptionIdx, selectedValues, onChange, selectAllCheckboxRef, toggleSelectionButtonRef]);
   return {
     onInputKeyDown
   };