@elliemae/ds-controlled-form 2.3.0-next.5 → 2.3.0-next.9

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

@@ -7,19 +7,23 @@ import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { StyledControlsWrapper, StyledSelection, StyledHeaderActionsWrapper, StyleHeaderActionsSeparator } from './styled.js';
 import { MultiSelectedValuesContainer } from '../multi-selected-values-container/MultiSelectedValuesContainer.js';
 import { ControlsInput } from '../controls-input/ControlsInput.js';
-import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { useOnPillsNavigation } from './useOnPillsNavigation.js';
+import { SelectedValuesAllyMsg } from '../a11y-messages/SelectedValuesAllyMsg.js';
+import { FocusMenuItem } from '../a11y-messages/FocusMenuItem.js';
+import { jsxs } from 'react/jsx-runtime';
 
-var _MultiSelectedValuesC, _ControlsInput, _StyledHeaderActionsW;
+var _SelectedValuesAllyMs, _FocusMenuItem, _MultiSelectedValuesC, _ControlsInput, _StyleHeaderActionsSe, _DropdownIndicator;
 
 const Controls = () => {
   const {
     props: {
       inline,
+      disabled,
       inputMinWidth,
       hasError,
-      selectedValues
+      selectedValues,
+      innerRef
     },
-    inputRef,
     selectedOptionsRef,
     setShowPopover,
     showPopover,
@@ -28,17 +32,17 @@ const Controls = () => {
   } = useContext(ComboBoxContext);
   const handleOnClick = useCallback(() => {
     if (hasFocus && showPopover && !inline) {
-      var _inputRef$current;
+      var _innerRef$current;
 
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.blur();
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.blur();
     } else if (hasFocus) {
       setShowPopover(true);
     } else {
-      var _inputRef$current2;
+      var _innerRef$current2;
 
-      (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
     }
-  }, [hasFocus, setShowPopover, showPopover, inputRef, inline]);
+  }, [hasFocus, setShowPopover, showPopover, innerRef, inline]);
 
   const handleOnMouseDown = e => {
     if (hasFocus || inline) {
@@ -46,28 +50,35 @@ const Controls = () => {
     }
   };
 
+  const {
+    onKeyDownPills
+  } = useOnPillsNavigation();
   const cols = !inline ? ['minmax(0px,max-content)', 'minmax(20px, auto)', '29px'] : ['minmax(0px, auto)'];
   return /*#__PURE__*/jsxs(StyledControlsWrapper, {
     ref: controlsWrapperRef,
     cols: cols,
+    disabled: disabled,
     minWidth: inputMinWidth,
     hasError: hasError,
     hasFocus: hasFocus,
     inline: inline,
     onClick: handleOnClick,
     onMouseDown: handleOnMouseDown,
-    children: [!inline && /*#__PURE__*/jsx(StyledSelection, {
+    onKeyDown: onKeyDownPills,
+    children: [!inline && /*#__PURE__*/jsxs(StyledSelection, {
       ref: selectedOptionsRef,
-      "data-testid": ComboboxDataTestid.SELECTED_VALUES,
-      children: Array.isArray(selectedValues) ? _MultiSelectedValuesC || (_MultiSelectedValuesC = /*#__PURE__*/_jsx(MultiSelectedValuesContainer, {})) : /*#__PURE__*/jsx(Fragment, {
-        children: selectedValues && /*#__PURE__*/_jsx(DSPillV2, {
-          size: "s",
-          labelTruncated: true,
-          label: selectedValues.label,
-          type: "value"
-        }, selectedValues.value)
-      })
-    }), _ControlsInput || (_ControlsInput = /*#__PURE__*/_jsx(ControlsInput, {})), !inline && (_StyledHeaderActionsW || (_StyledHeaderActionsW = /*#__PURE__*/_jsx(StyledHeaderActionsWrapper, {}, void 0, /*#__PURE__*/_jsx(StyleHeaderActionsSeparator, {}), /*#__PURE__*/_jsx(DropdownIndicator, {}))))]
+      children: [_SelectedValuesAllyMs || (_SelectedValuesAllyMs = /*#__PURE__*/_jsx(SelectedValuesAllyMsg, {})), _FocusMenuItem || (_FocusMenuItem = /*#__PURE__*/_jsx(FocusMenuItem, {})), Array.isArray(selectedValues) ? _MultiSelectedValuesC || (_MultiSelectedValuesC = /*#__PURE__*/_jsx(MultiSelectedValuesContainer, {})) : /*#__PURE__*/_jsx("div", {
+        "data-testid": ComboboxDataTestid.SELECTED_VALUES
+      }, void 0, selectedValues && /*#__PURE__*/_jsx(DSPillV2, {
+        size: "s",
+        labelTruncated: true,
+        label: selectedValues.label,
+        type: "value"
+      }, selectedValues.value))]
+    }), _ControlsInput || (_ControlsInput = /*#__PURE__*/_jsx(ControlsInput, {})), !inline && /*#__PURE__*/_jsx(StyledHeaderActionsWrapper, {
+      justifyContent: "center",
+      cols: ['auto', 'auto']
+    }, void 0, _StyleHeaderActionsSe || (_StyleHeaderActionsSe = /*#__PURE__*/_jsx(StyleHeaderActionsSeparator, {})), _DropdownIndicator || (_DropdownIndicator = /*#__PURE__*/_jsx(DropdownIndicator, {})))]
   });
 };
 

package/esm/controlled-combobox/parts/controls/styled.js

@@ -4,38 +4,50 @@ import { css } from '@elliemae/ds-system';
 import { Grid } from '@elliemae/ds-grid';
 
 var _templateObject, _templateObject2;
-const normalBorder = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  border: 1px solid ", ";\n"])), props => props.hasError ? props.theme.colors.danger[900] : props.theme.colors.neutral[400]);
-const focusBorder = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border: 2px solid ", ";\n"])), _ref => {
+const normalBorder = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  border: 1px solid ", ";\n"])), _ref => {
   let {
+    hasError,
     theme
   } = _ref;
+  return hasError ? theme.colors.danger[900] : theme.colors.neutral[400];
+});
+const focusBorder = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border: 2px solid ", ";\n"])), _ref2 => {
+  let {
+    theme
+  } = _ref2;
   return theme.colors.brand[700];
 });
 const StyledControlsWrapper = /*#__PURE__*/styled(Grid).withConfig({
   componentId: "sc-z30aed-0"
-})(["background:transparent;position:relative;border-radius:2px;min-width:", ";align-items:center;align-content:center;height:28px;padding-left:8px;margin:", ";&::after{display:block;content:' ';position:absolute;top:0;left:0;right:0;bottom:0;border-radius:2px;", " pointer-events:none;z-index:7;}"], _ref2 => {
+})(["background:", ";position:relative;border-radius:2px;min-width:", ";align-items:center;align-content:center;height:28px;padding-left:8px;margin:", ";&::after{display:block;content:' ';position:absolute;top:0;left:0;right:0;bottom:0;border-radius:2px;", " pointer-events:none;z-index:7;}"], _ref3 => {
+  let {
+    disabled,
+    theme
+  } = _ref3;
+  return disabled ? theme.colors.neutral['200'] : '#ffffff';
+}, _ref4 => {
   let {
     minWidth,
     inline
-  } = _ref2;
+  } = _ref4;
   return inline ? '' : "".concat(minWidth, "px");
-}, _ref3 => {
+}, _ref5 => {
   let {
     inline
-  } = _ref3;
+  } = _ref5;
   return inline ? '10px 16px' : 'none';
-}, _ref4 => {
+}, _ref6 => {
   let {
     hasFocus
-  } = _ref4;
+  } = _ref6;
   return hasFocus ? focusBorder : normalBorder;
 });
 const StyledSelection = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-z30aed-1"
 })(["font-size:13px;margin-right:3px;line-height:13px;display:flex;"]);
-const StyledHeaderActionsWrapper = /*#__PURE__*/styled.div.withConfig({
+const StyledHeaderActionsWrapper = /*#__PURE__*/styled(Grid).withConfig({
   componentId: "sc-z30aed-2"
-})(["align-items:center;align-self:stretch;display:flex;box-sizing:border-box;height:28px;.em-ds-button--text:focus::after{border:none;}"]);
+})(["height:100%;.em-ds-button--text:focus::after{border:none;}"]);
 const StyleDropdownIndicator = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-z30aed-3"
 })([""]);

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

@@ -0,0 +1,47 @@
+import { useContext, useCallback } from 'react';
+import { ComboBoxContext } from '../../ComboBoxCTX.js';
+
+/* eslint-disable max-lines */
+const useOnPillsNavigation = () => {
+  const {
+    props: {
+      innerRef
+    },
+    setShowPopover,
+    pillGroupRef
+  } = useContext(ComboBoxContext);
+  const REMOVABLE_PILL_SELECTOR = '.ds-pill-wrapper-removable button';
+  const onKeyDownPills = useCallback(e => {
+    var _innerRef$current;
+
+    if ((e.key === 'ArrowLeft' || e.key === 'ArrowRight' || e.key === 'ArrowUp' || e.key === 'ArrowDown') && ((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) === '') {
+      if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+        innerRef.current.focus();
+        setShowPopover(true);
+        return;
+      }
+
+      if (e.key === 'ArrowLeft') {
+        var _pillGroupRef$current;
+
+        const removablePills = (_pillGroupRef$current = pillGroupRef.current) === null || _pillGroupRef$current === void 0 ? void 0 : _pillGroupRef$current.querySelectorAll(REMOVABLE_PILL_SELECTOR);
+
+        if (document.activeElement === innerRef.current && removablePills) {
+          var _removablePills;
+
+          (_removablePills = removablePills[removablePills.length - 1]) === null || _removablePills === void 0 ? void 0 : _removablePills.focus();
+        }
+      }
+
+      if (e.key === 'ArrowRight') {
+        e.preventDefault();
+        innerRef.current.focus();
+      }
+    }
+  }, [innerRef, pillGroupRef, setShowPopover]);
+  return {
+    onKeyDownPills
+  };
+};
+
+export { useOnPillsNavigation };

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

@@ -11,11 +11,11 @@ import { jsx } from 'react/jsx-runtime';
 const ControlsInput = () => {
   const {
     props: {
-      autoFocus
+      autoFocus,
+      disabled,
+      innerRef
     },
-    showPopover,
-    focusOptionIdx,
-    inputRef
+    focusOptionIdx
   } = useContext(ComboBoxContext);
   const {
     onInputKeyDown
@@ -37,17 +37,17 @@ const ControlsInput = () => {
   })), /*#__PURE__*/jsx(StyledInput, {
     "data-testid": ComboboxDataTestid.INPUT,
     autoFocus: autoFocus,
-    "aria-labelledby": "combo-label",
-    "aria-controls": "combo-listbox",
+    id: "combo-input",
     "aria-owns": "combo-listbox",
     "aria-activedescendant": focusOptionIdx,
-    "aria-expanded": showPopover,
-    "aria-haspopup": "listbox",
+    "aria-expanded": "false",
+    "aria-haspopup": "true",
     role: "combobox",
+    disabled: disabled,
     style: {
       width
     },
-    ref: inputRef,
+    ref: innerRef,
     type: "text",
     onKeyDown: onInputKeyDown,
     onChange: handleOnChange,

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

@@ -1,21 +1,22 @@
 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 { noop } from 'lodash';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { isSelectedValueEmpty } from '../../utils/listHelper.js';
 
 const useControlsInput = () => {
-  var _inputRef$current, _inputRef$current2, _inputRef$current3;
+  var _innerRef$current, _innerRef$current2, _innerRef$current3;
 
   const {
     props: {
       selectedValues,
+      innerRef,
       placeholder,
       onFilter
     },
     setShowPopover,
     setCurrentOption,
-    inputRef,
     wrapperListRef,
     setHasFocus,
     setShowSelectedOptions
@@ -26,17 +27,22 @@ const useControlsInput = () => {
     var _spanReference$curren;
 
     setWidth(((_spanReference$curren = spanReference.current) === null || _spanReference$curren === void 0 ? void 0 : _spanReference$curren.offsetWidth) || 1);
-  }, [(_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value]); // When writting open popover
+  }, [(_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value]); // When writting open popover
   // and refresh selected values and update filter outside value.
 
   const handleOnChange = useCallback(e => {
+    if (onFilter === noop && innerRef.current) {
+      innerRef.current.value = '';
+      return;
+    }
+
     setShowSelectedOptions(false);
     setShowPopover(true);
     onFilter(e.currentTarget.value);
-  }, [onFilter, setShowPopover, setShowSelectedOptions]);
+  }, [onFilter, innerRef, setShowPopover, setShowSelectedOptions]);
   const handleOnBlur = useCallback(() => {
     setHasFocus(false);
-    if (inputRef.current) inputRef.current.value = '';
+    if (innerRef.current) innerRef.current.value = '';
     setTimeout(() => {
       var _wrapperListRef$curre;
 
@@ -47,12 +53,12 @@ const useControlsInput = () => {
       setCurrentOption('');
       onFilter('');
     });
-  }, [setHasFocus, setCurrentOption, wrapperListRef, onFilter, inputRef, setShowPopover]);
+  }, [setHasFocus, setCurrentOption, wrapperListRef, onFilter, innerRef, setShowPopover]);
   const handleOnFocus = useCallback(() => {
     setHasFocus(true);
   }, [setHasFocus]);
-  const showPlaceholder = !((_inputRef$current2 = inputRef.current) !== null && _inputRef$current2 !== void 0 && _inputRef$current2.value) && isSelectedValueEmpty(selectedValues) ? placeholder : null;
-  const spanReferenceText = (_inputRef$current3 = inputRef.current) === null || _inputRef$current3 === void 0 ? void 0 : _inputRef$current3.value.replace(/\s/g, '\u00a0');
+  const showPlaceholder = !((_innerRef$current2 = innerRef.current) !== null && _innerRef$current2 !== void 0 && _innerRef$current2.value) && isSelectedValueEmpty(selectedValues) ? placeholder : null;
+  const spanReferenceText = (_innerRef$current3 = innerRef.current) === null || _innerRef$current3 === void 0 ? void 0 : _innerRef$current3.value.replace(/\s/g, '\u00a0');
   return useMemo(() => ({
     handleOnFocus,
     handleOnBlur,

package/esm/controlled-combobox/parts/dropdown-indicator/DropdownIndicator.js

@@ -9,19 +9,22 @@ var _ChevronSmallDown;
 
 const DropdownIndicator = () => {
   const {
+    props: {
+      disabled
+    },
     showPopover
   } = useContext(ComboBoxContext);
   return /*#__PURE__*/_jsx(StyledDropDownButton, {
     "data-testid": ComboboxDataTestid.DROPDOWN,
     "aria-controls": "combo-listbox",
     "aria-labelledby": "combo-label",
+    disabled: disabled,
     "aria-expanded": showPopover,
     "aria-haspopup": "listbox",
     "aria-hidden": true,
-    buttonType: "text",
-    icon: _ChevronSmallDown || (_ChevronSmallDown = /*#__PURE__*/_jsx(ChevronSmallDown, {})),
+    buttonType: "icon",
     tabIndex: -1
-  });
+  }, void 0, _ChevronSmallDown || (_ChevronSmallDown = /*#__PURE__*/_jsx(ChevronSmallDown, {})));
 };
 
 export { DropdownIndicator as default };

package/esm/controlled-combobox/parts/dropdown-indicator/styled.js

@@ -1,8 +1,8 @@
 import styled from 'styled-components';
-import DSButton from '@elliemae/ds-button';
+import { DSButtonV2 } from '@elliemae/ds-button';
 
-const StyledDropDownButton = /*#__PURE__*/styled(DSButton).withConfig({
+const StyledDropDownButton = /*#__PURE__*/styled(DSButtonV2).withConfig({
   componentId: "sc-14dzwqd-0"
-})(["box-sizing:border-box;width:100;& svg{fill:", ";}"], props => props.theme.colors.brand['700']);
+})(["&:focus::after{border:none;}& svg{fill:", ";}"], props => props.theme.colors.brand['700']);
 
 export { StyledDropDownButton };

package/esm/controlled-combobox/parts/header-list/HeaderList.js

@@ -16,10 +16,10 @@ const HeaderList = () => {
     props: {
       onSelectAll,
       onClearAll,
-      selectedValues
+      selectedValues,
+      innerRef
     },
     showSelectedOptions,
-    inputRef,
     selectAllCheckboxRef,
     toggleSelectionButtonRef
   } = useContext(ComboBoxContext);
@@ -47,9 +47,9 @@ const HeaderList = () => {
     onBlur: () => {
       if (multiSelectedValues.length === 0) {
         setTimeout(() => {
-          var _inputRef$current;
+          var _innerRef$current;
 
-          return (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+          return (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
         });
       }
     },
@@ -57,9 +57,9 @@ const HeaderList = () => {
   })), /*#__PURE__*/_jsx(StyledSelectedItems, {}, void 0, multiSelectedValues.length > 0 ? /*#__PURE__*/_jsx(StyledButtonSelection, {
     onBlur: () => {
       setTimeout(() => {
-        var _inputRef$current2;
+        var _innerRef$current2;
 
-        return (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+        return (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
       });
     },
     buttonType: "text",

package/esm/controlled-combobox/parts/header-list/useHeaderListHandlers.js

@@ -9,9 +9,9 @@ const useHeaderListHandlers = () => {
       selectedValues,
       options,
       onSelectAll,
-      onClearAll
+      onClearAll,
+      innerRef
     },
-    inputRef,
     showSelectedOptions,
     setShowSelectedOptions,
     setShowPopover
@@ -40,10 +40,10 @@ const useHeaderListHandlers = () => {
     }
   }, [checkboxStatus, onSelectAll, onClearAll]);
   const handleToggle = useCallback(() => {
-    if (inputRef.current) inputRef.current.value = '';
+    if (innerRef.current) innerRef.current.value = '';
     onFilter('');
     setShowSelectedOptions(!showSelectedOptions);
-  }, [setShowSelectedOptions, inputRef, onFilter, showSelectedOptions]);
+  }, [setShowSelectedOptions, innerRef, onFilter, showSelectedOptions]);
   const handleKeyDown = useCallback(e => {
     if (e.key === 'Escape') {
       setShowPopover(false);

package/esm/controlled-combobox/parts/menu-list/MenuList.js

@@ -1,5 +1,5 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import { useContext, useMemo, useCallback } from 'react';
+import { useContext, useMemo } from 'react';
 import { noop } from 'lodash';
 import { StyledListWrapper, StyledVirtualListWrapper, StyledList } from './styled.js';
 import { ComboboxDataTestid } from '../../ComboboxDataTestids.js';
@@ -14,7 +14,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 var _HeaderList, _EmptyState;
 
 const MenuList = () => {
-  var _inputRef$current;
+  var _innerRef$current;
 
   const {
     props: {
@@ -23,12 +23,11 @@ const MenuList = () => {
       onCreate,
       inline,
       options,
-      selectedValues
+      selectedValues,
+      innerRef
     },
     referenceElement,
-    inputRef,
     listRef,
-    showPopover,
     wrapperListRef,
     controlsWrapperRef,
     virtualListHelpers
@@ -38,16 +37,18 @@ const MenuList = () => {
   } = virtualListHelpers;
   const isOnCreatedSupplied = onCreate !== noop;
   const multiple = Array.isArray(selectedValues);
-  const withHeader = !inline && multiple && options.length > 0 && ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value) === '';
+  const withHeader = !inline && multiple && options.length > 0 && ((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) === '';
   const ItemRenderer = useItemRenderer();
   useMenuList();
   const {
     width
   } = useOnElementResize(controlsWrapperRef);
   const listWidth = useMemo(() => menuMinWidth || "".concat(referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth), // eslint-disable-next-line react-hooks/exhaustive-deps
-  [menuMinWidth, referenceElement, width]);
-  const handleOnFocus = useCallback(() => {// inputRef.current?.focus();
-  }, [inputRef]);
+  [menuMinWidth, referenceElement, width]); // validate funcionality with ux
+  // const handleOnFocus = useCallback(() => {
+  //   // innerRef.current?.focus();
+  // }, [innerRef]);
+
   return /*#__PURE__*/jsxs(StyledListWrapper, {
     ref: wrapperListRef,
     inline: inline,
@@ -61,9 +62,6 @@ const MenuList = () => {
       children: /*#__PURE__*/_jsx(StyledList, {
         id: "combo-listbox",
         role: "listbox",
-        tabIndex: -1,
-        "aria-expanded": showPopover,
-        onFocus: handleOnFocus,
         "data-testid": ComboboxDataTestid.LIST,
         style: {
           height: totalSize,

package/esm/controlled-combobox/parts/menu-list/styled.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const StyledListWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-g2fmft-0"
-})(["min-width:", ";"], props => props.inline ? '100%' : "".concat(props.minWidth, "px"));
+})(["min-width:", ";background-color:#ffffff;"], props => props.inline ? '100%' : "".concat(props.minWidth, "px"));
 const StyledList = /*#__PURE__*/styled.ul.withConfig({
   componentId: "sc-g2fmft-1"
 })(["position:relative;padding:0;"]);

package/esm/controlled-combobox/parts/menu-list/useItemRenderer.js

@@ -29,9 +29,9 @@ const useItemRenderer = () => {
       onCreate,
       onChange,
       selectedValues,
-      onFilter
+      onFilter,
+      innerRef
     },
-    inputRef,
     setShowPopover,
     focusOptionIdx,
     virtualListHelpers
@@ -43,9 +43,9 @@ const useItemRenderer = () => {
   const CBItem = multiple ? MultiMenuItem : SingleMenuItem;
   const handleClick = useCallback((option, e) => {
     if (option.type === 'creatable') {
-      if (inputRef.current) {
-        onCreate(inputRef.current.value);
-        inputRef.current.value = '';
+      if (innerRef.current) {
+        onCreate(innerRef.current.value);
+        innerRef.current.value = '';
         onFilter('');
       }
 
@@ -53,16 +53,16 @@ const useItemRenderer = () => {
     }
 
     if (!multiple) {
-      setShowPopover(false);
-      if (inputRef.current) inputRef.current.value = '';
-    } else if (inputRef.current) {
-      onFilter(inputRef.current.value);
+      if (!option.disabled) setShowPopover(false);
+      if (innerRef.current) innerRef.current.value = '';
+    } else if (innerRef.current) {
+      onFilter(innerRef.current.value);
     }
 
     onChange(option);
     e.stopPropagation();
     e.preventDefault();
-  }, [onFilter, onChange, setShowPopover, multiple, inputRef]);
+  }, [onFilter, onChange, setShowPopover, multiple, innerRef]);
   const handleOnMouseDown = useCallback(e => {
     e.preventDefault();
   }, []);
@@ -125,7 +125,7 @@ const useItemRenderer = () => {
     }
 
     return /*#__PURE__*/jsx(Fragment, {});
-  }), [options, focusOptionIdx, selectedValues, inputRef, virtualItems]);
+  }), [options, focusOptionIdx, selectedValues, innerRef, virtualItems]);
   return ItemRenderer;
 };
 

package/esm/controlled-combobox/parts/menu-list/useMenuList.js

@@ -2,16 +2,16 @@ import { useContext, useEffect } from 'react';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 
 const useMenuList = () => {
-  var _inputRef$current2;
+  var _innerRef$current2;
 
   const {
     props: {
       inline,
       selectedValues,
       onMenuOpen,
-      options
+      options,
+      innerRef
     },
-    inputRef,
     setCurrentOption,
     scrollOptionIntoView,
     hasFocus,
@@ -26,18 +26,16 @@ const useMenuList = () => {
     };
 
     if (showPopover || inline) {
-      var _inputRef$current;
+      var _innerRef$current;
 
       if (onMenuOpen) onMenuOpen();
 
-      if (((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value) !== '') {
+      if (((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) !== '') {
         getFirstOption();
       } else if (Array.isArray(selectedValues)) {
-        const multiSelectedValues = selectedValues;
-
-        if (multiSelectedValues.length > 0) {
-          setCurrentOption(multiSelectedValues[multiSelectedValues.length - 1].dsId);
-          scrollOptionIntoView(multiSelectedValues[multiSelectedValues.length - 1].dsId);
+        if (selectedValues && selectedValues.length > 0) {
+          setCurrentOption(selectedValues[selectedValues.length - 1].dsId);
+          scrollOptionIntoView(selectedValues[selectedValues.length - 1].dsId);
         } else {
           getFirstOption();
         }
@@ -45,15 +43,15 @@ const useMenuList = () => {
         const singleSelectedValue = selectedValues;
 
         if (singleSelectedValue) {
-          setCurrentOption(selectedValues.dsId);
-          scrollOptionIntoView(selectedValues.dsId);
+          setCurrentOption(singleSelectedValue.dsId);
+          scrollOptionIntoView(singleSelectedValue.dsId);
         } else {
           getFirstOption();
         }
       }
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  }, [showPopover, inline, hasFocus, (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.value]);
+  }, [showPopover, inline, hasFocus, (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.value]);
 };
 
 export { useMenuList };