@elliemae/ds-controlled-form 2.3.1-rc.0 → 2.3.2-next.0

package/cjs/combobox/parts/menu-list/useItemRenderer.js

@@ -0,0 +1,153 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _jsx = require('@babel/runtime/helpers/jsx');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+var React = require('react');
+var dsGrid = require('@elliemae/ds-grid');
+var dsForm = require('@elliemae/ds-form');
+var ComboBoxCTX = require('../../ComboBoxCTX.js');
+var styled = require('./styled.js');
+var listHelper = require('../../utils/listHelper.js');
+var ComboboxDataTestids = require('../../ComboboxDataTestids.js');
+var constants = require('../../constants.js');
+var jsxRuntime = require('react/jsx-runtime');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+
+var _StyledCreatableLabel;
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+const useItemRenderer = () => {
+  const {
+    props: {
+      options,
+      onCreate,
+      onChange,
+      selectedValues,
+      onFilter,
+      innerRef
+    },
+    setShowPopover,
+    inputValue,
+    focusOptionIdx,
+    setInputValue,
+    virtualListHelpers
+  } = React.useContext(ComboBoxCTX.ComboBoxContext);
+  const multiple = Array.isArray(selectedValues);
+  const CBItem = multiple ? dsForm.MultiMenuItem : dsForm.SingleMenuItem;
+  const handleClick = React.useCallback((option, e) => {
+    if (option.type === constants.INTERNAL_MENU_OPTION_TYPES.CREATABLE && onCreate && onFilter) {
+      if (inputValue) {
+        onCreate(inputValue);
+        setInputValue('');
+        onFilter('');
+      }
+
+      return;
+    }
+
+    if (!option.disabled) {
+      var _innerRef$current;
+
+      if (!multiple) {
+        setShowPopover(false);
+      }
+
+      if (onFilter) onFilter('');
+      setInputValue('');
+      onChange(option); // if we are focus in the header list we go back to the input
+
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
+    } // prevent for loosing focus on input control
+
+
+    e.stopPropagation();
+    e.preventDefault();
+  }, [onFilter, onChange, setShowPopover, multiple, innerRef]); // prevent blur from controls input
+
+  const handleOnMouseDown = React.useCallback(e => {
+    e.preventDefault();
+  }, []);
+  return React.useMemo(() => {
+    if (!virtualListHelpers) {
+      return null;
+    }
+
+    return virtualListHelpers.virtualItems.map(vItem => {
+      const option = options[vItem.index];
+      const generalProps = {
+        wrapperStyles: {
+          position: 'absolute',
+          top: vItem.start,
+          left: 0,
+          width: '100%'
+        },
+        key: "".concat(option.dsId),
+        innerRef: vItem.measureRef
+      };
+
+      if (option.type === constants.MENU_OPTION_TYPES.SECTION) {
+        return /*#__PURE__*/jsxRuntime.jsx(dsForm.Section, _objectSpread({
+          label: option.label
+        }, generalProps));
+      }
+
+      if (option.type === constants.MENU_OPTION_TYPES.SEPARATOR) {
+        return /*#__PURE__*/jsxRuntime.jsx(dsForm.Separator, _objectSpread({}, generalProps));
+      }
+
+      if (option.type === constants.MENU_OPTION_TYPES.OPTION) {
+        return /*#__PURE__*/jsxRuntime.jsx(CBItem, _objectSpread(_objectSpread({}, generalProps), {}, {
+          value: option.value,
+          label: option.label,
+          dataTestid: ComboboxDataTestids.ComboboxDataTestid.OPTION,
+          disabled: option.disabled,
+          onClick: e => handleClick(option, e),
+          onMouseDown: handleOnMouseDown,
+          isActive: option.dsId === focusOptionIdx,
+          isSelected: listHelper.isSelected(selectedValues, option),
+          tabIndex: -1
+        }));
+      }
+
+      if (option.type === constants.INTERNAL_MENU_OPTION_TYPES.CREATABLE) {
+        return /*#__PURE__*/jsxRuntime.jsx(dsForm.SingleMenuItem, _objectSpread(_objectSpread({
+          dataTestid: ComboboxDataTestids.ComboboxDataTestid.OPTION,
+          isActive: option.dsId === focusOptionIdx
+        }, generalProps), {}, {
+          render: _ref => {
+            let {
+              label
+            } = _ref;
+            return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
+              cols: ['min-content', 'auto'],
+              height: "16px",
+              gutter: "xxs",
+              alignItems: "center"
+            }, void 0, _StyledCreatableLabel || (_StyledCreatableLabel = /*#__PURE__*/_jsx__default["default"](styled.StyledCreatableLabel, {}, void 0, "Add:")), /*#__PURE__*/_jsx__default["default"]("span", {}, void 0, label));
+          },
+          label: option.label,
+          onClick: e => handleClick(option, e)
+        }));
+      }
+
+      return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
+    });
+  }, [options, focusOptionIdx, selectedValues, innerRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems]);
+};
+
+exports.useItemRenderer = useItemRenderer;

package/cjs/combobox/parts/menu-list/useMenuListSetFocusOption.js

@@ -0,0 +1,51 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var ComboBoxCTX = require('../../ComboBoxCTX.js');
+
+/* eslint-disable complexity */
+const useMenuListSetFocusOption = () => {
+  const {
+    props: {
+      selectedValues,
+      options
+    },
+    setFocusOptionIdx,
+    hasFocus,
+    focusOptionIdx,
+    inputValue,
+    scrollOptionIntoView
+  } = React.useContext(ComboBoxCTX.ComboBoxContext);
+  const getFirstOption = React.useCallback(() => {
+    for (let i = 0; i < options.length; i += 1) if (!['section', 'separator'].includes(options[i].type) && !options[i].disabled) {
+      setFocusOptionIdx(options[i].dsId);
+      break;
+    }
+  }, [options, setFocusOptionIdx]);
+  React.useEffect(() => {
+    scrollOptionIntoView(focusOptionIdx); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [focusOptionIdx]);
+  React.useEffect(() => {
+    if (options.length === 0) {
+      setFocusOptionIdx('');
+    }
+
+    if (hasFocus && inputValue === '') {
+      if (Array.isArray(selectedValues)) {
+        if (selectedValues && selectedValues.length > 0) {
+          setFocusOptionIdx(selectedValues[selectedValues.length - 1].dsId);
+          return;
+        }
+      } else if (selectedValues) {
+        setFocusOptionIdx(selectedValues.dsId);
+        return;
+      }
+    }
+
+    if (hasFocus) getFirstOption();
+  }, [getFirstOption, inputValue, selectedValues, hasFocus, setFocusOptionIdx, options.length]);
+};
+
+exports.useMenuListSetFocusOption = useMenuListSetFocusOption;

package/cjs/{controlled-combobox → combobox}/parts/multi-selected-values-container/MultiSelectedValuesContainer.js

@@ -10,7 +10,6 @@ var dsPills = require('@elliemae/ds-pills');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var useGroupPills = require('./useGroupPills.js');
 var ComboboxDataTestids = require('../../ComboboxDataTestids.js');
-var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,53 +19,41 @@ const MultiSelectedValuesContainer = () => {
   const {
     props: {
       selectedValues,
+      disabled,
       onChange,
       innerRef
     },
-    pillGroupRef,
-    showPopover,
-    setShowPopover
-  } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const multiSelectedValue = selectedValues;
-  const correctPillsToShow = useGroupPills.useGroupPills() || 1;
-  const handleClickOnPills = React.useCallback(e => {
-    if (!showPopover) {
-      var _innerRef$current;
-
-      setShowPopover(true);
-      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
-    }
+    pillGroupRef
+  } = React.useContext(ComboBoxCTX.ComboBoxContext); // this is always an array because logic in controls component
 
-    e.stopPropagation();
-  }, [setShowPopover, innerRef, showPopover]);
-  const pills = React.useMemo(() => /*#__PURE__*/_jsx__default["default"]("div", {
+  const multiSelectedValue = selectedValues;
+  const correctPillsToShow = useGroupPills.useGroupPills();
+  return React.useMemo(() => /*#__PURE__*/_jsx__default["default"]("div", {
     style: {
       width: 'max-content'
     },
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECTED_VALUES
   }, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {
-    onClick: handleClickOnPills,
     innerRef: pillGroupRef
   }, void 0, multiSelectedValue.length > 0 && multiSelectedValue.slice(0, correctPillsToShow).map(option => /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
     size: "s",
     label: option.label,
-    type: "removable",
+    disabled: disabled,
+    type: disabled ? 'value' : 'removable',
     tabIndex: -1,
     onRemove: () => {
-      var _innerRef$current2;
+      var _innerRef$current;
 
       onChange(option);
-      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
     }
   }, option.value)), multiSelectedValue.length > 0 && correctPillsToShow !== multiSelectedValue.length && /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
     size: "s",
     labelTruncated: false,
     label: "+".concat(multiSelectedValue.length - correctPillsToShow),
-    type: "value"
-  }, "grouped"))), [pillGroupRef, innerRef, onChange, handleClickOnPills, multiSelectedValue, correctPillsToShow]);
-  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
-    children: pills
-  });
+    type: "value",
+    disabled: disabled
+  }, "grouped"))), [pillGroupRef, multiSelectedValue, correctPillsToShow, disabled, onChange, innerRef]);
 };
 
 exports.MultiSelectedValuesContainer = MultiSelectedValuesContainer;

package/cjs/{controlled-combobox → combobox}/parts/multi-selected-values-container/useGroupPills.js

@@ -9,7 +9,7 @@ require('core-js/modules/esnext.async-iterator.for-each.js');
 require('core-js/modules/esnext.iterator.constructor.js');
 require('core-js/modules/esnext.iterator.for-each.js');
 var React = require('react');
-var useOnElementResize = require('../../utils/hooks/useOnElementResize.js');
+var dsUtilities = require('@elliemae/ds-utilities');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 
 const getGroupedPillWidth = remainingPills => {
@@ -22,6 +22,7 @@ const useGroupPills = () => {
   const {
     props: {
       selectedValues,
+      disabled,
       innerRef
     },
     selectedOptionsRef,
@@ -32,10 +33,10 @@ const useGroupPills = () => {
   const [pillsToShow, setPillsToShow] = React.useState(multiSelectedValues.length);
   const {
     width
-  } = useOnElementResize.useOnElementResize(controlsWrapperRef);
+  } = dsUtilities.useOnElementResize(controlsWrapperRef);
   const {
     width: widthInput
-  } = useOnElementResize.useOnElementResize(innerRef || null);
+  } = dsUtilities.useOnElementResize(innerRef || null);
   React.useEffect(() => {
     if (multiSelectedValues.length !== pillsToShow) {
       setPillsToShow(multiSelectedValues.length);
@@ -48,7 +49,7 @@ const useGroupPills = () => {
       let lastPillFit = -1;
       let currentWidth = 0;
       const referenceWidth = selectedOptionsRef.current.offsetWidth;
-      const pills = [...selectedOptionsRef.current.querySelectorAll('.ds-pill-wrapper-removable')];
+      const pills = [...selectedOptionsRef.current.querySelectorAll(disabled ? '.ds-pill-wrapper-value' : '.ds-pill-wrapper-removable')];
       const pillsWidth = pills.map(pill => pill === null || pill === void 0 ? void 0 : pill.offsetWidth);
       pillsWidth.forEach((pillWidth, idx) => {
         currentWidth += pillWidth;
@@ -68,8 +69,8 @@ const useGroupPills = () => {
 
       if (pillGroupRef.current) pillGroupRef.current.style.width = 'fit-content';
     }
-  }, [selectedOptionsRef, innerRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput]);
-  return pillsToShow;
+  }, [selectedOptionsRef, innerRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput, disabled]);
+  return pillsToShow || 1;
 };
 
 exports.useGroupPills = useGroupPills;

package/cjs/combobox/parts/styled.js

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
+var dsSystem = require('@elliemae/ds-system');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _taggedTemplateLiteral__default = /*#__PURE__*/_interopDefaultLegacy(_taggedTemplateLiteral);
+
+var _templateObject;
+const StyledA11ySelectedValues = dsSystem.styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral__default["default"](["\n  width: 1px;\n  height: 1px;\n  position: absolute;\n  clip: rect(1px, 1px, 1px, 1px);\n"])));
+
+exports.StyledA11ySelectedValues = StyledA11ySelectedValues;

package/cjs/{controlled-combobox → combobox}/react-desc-prop-types.js

@@ -17,26 +17,29 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function noop() {}
 const ComboboxPropTypes = _objectSpread(_objectSpread({}, dsPropsHelpers.globalAttributesPropTypes), {}, {
-  placeholder: dsPropsHelpers.PropTypes.string.description('input s placeholder value').defaultValue(''),
+  placeholder: dsPropsHelpers.PropTypes.string.description("input's placeholder value").defaultValue(''),
   options: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.array, dsPropsHelpers.PropTypes.object]).isRequired.description('List of options').defaultValue([]),
-  selectedValues: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.arrayOf(dsPropsHelpers.PropTypes.object), dsPropsHelpers.PropTypes.object]).description('Array of option or single option selected'),
+  selectedValues: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.arrayOf(dsPropsHelpers.PropTypes.object), dsPropsHelpers.PropTypes.object]).isRequired.description('Array of option or single option selected'),
   disabled: dsPropsHelpers.PropTypes.bool.description('wheter or not the input is disabled').defaultValue('false'),
   autoFocus: dsPropsHelpers.PropTypes.bool.description('Whether the combo box uses auto focus or not').defaultValue('false'),
   hasError: dsPropsHelpers.PropTypes.bool.description('Whether the combo box has error or not').defaultValue('false'),
-  onChange: dsPropsHelpers.PropTypes.func.description('function triggered when an option is selected it will send the options selected').defaultValue(''),
-  onSelectAll: dsPropsHelpers.PropTypes.func.description('function triggered when ALL button is selected from the header menu list').defaultValue(''),
+  onChange: dsPropsHelpers.PropTypes.func.isRequired.description('function triggered when an option is selected it will send the options selected').defaultValue('() => {}'),
+  onSelectAll: dsPropsHelpers.PropTypes.func.description('function triggered when ALL button is selected from the header menu list').defaultValue('() => {}'),
   onFilter: dsPropsHelpers.PropTypes.func.description('function triggered when user type in the combobox input').defaultValue(''),
   onCreate: dsPropsHelpers.PropTypes.func.description('function triggered when user select "create" a new item whenever is not a match in the all option list').defaultValue(''),
   onClearAll: dsPropsHelpers.PropTypes.func.description('function triggered when user select CLEAR button from the header menu list').defaultValue(''),
-  onCancel: dsPropsHelpers.PropTypes.func.description('function triggered when user press ESC key').defaultValue(''),
-  onMenuOpen: dsPropsHelpers.PropTypes.func.description('function triggered when user open the menu list').defaultValue(''),
+  onCancel: dsPropsHelpers.PropTypes.func.description('function triggered when user press ESC key').defaultValue('() => {}'),
+  onMenuOpen: dsPropsHelpers.PropTypes.func.description('function triggered when user open the menu list').defaultValue('() => {}'),
+  onMenuClose: dsPropsHelpers.PropTypes.func.description('function triggered when user close the menu list').defaultValue('() => {}'),
   inputMinWidth: dsPropsHelpers.PropTypes.any.description('Minimum width for the combo box input controller').defaultValue(undefined),
   menuMinWidth: dsPropsHelpers.PropTypes.any.description('Minimum width for the dropdown menu').defaultValue(undefined),
   menuMaxHeight: dsPropsHelpers.PropTypes.any.description('Maximum height for the dropdown menu').defaultValue(undefined),
   withoutPortal: dsPropsHelpers.PropTypes.bool.description('Whether the combobox menu is rendered in a portal or not').defaultValue(false),
   zIndex: dsPropsHelpers.PropTypes.number.description('The z-index of the combobox menu').defaultValue(10),
-  innerRef: dsPropsHelpers.PropTypes.object.description('ref to the component s container')
+  innerRef: dsPropsHelpers.PropTypes.object.description('ref to the components container')
 });
 
 exports.ComboboxPropTypes = ComboboxPropTypes;
+exports.noop = noop;

package/cjs/combobox/sharedTypes.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var constants = require('./constants.js');
+
+const isSeparator = el => (el === null || el === void 0 ? void 0 : el.type) === constants.MENU_OPTION_TYPES.separator;
+
+exports.isSeparator = isSeparator;

package/cjs/{controlled-combobox → combobox}/utils/hooks/useKeyboardNavigation.js

@@ -8,6 +8,7 @@ require('core-js/modules/esnext.iterator.find.js');
 var React = require('react');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var listHelper = require('../listHelper.js');
+var constants = require('../../constants.js');
 
 const isOptionFocuseable = opt => !['section', 'separator'].includes(opt.type) && !opt.disabled;
 
@@ -23,45 +24,62 @@ const useKeyboardNavigation = () => {
       options,
       selectedValues,
       onFilter,
-      withoutPortal,
-      innerRef
+      withoutPortal
     },
     setShowPopover,
+    setInputValue,
+    inputValue,
     showPopover,
     focusOptionIdx,
-    setCurrentOption,
-    scrollOptionIntoView,
+    setFocusOptionIdx,
     selectAllCheckboxRef,
     toggleSelectionButtonRef
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const multiple = Array.isArray(selectedValues);
+  const selectableOptions = listHelper.getOptions(options);
   const currentItemIndex = options.findIndex(opt => opt.dsId === focusOptionIdx);
   const currentItem = options.find(item => item.dsId === focusOptionIdx);
   const selectOption = React.useCallback(() => {
-    if (multiple) {
-      if (innerRef.current) onFilter(innerRef.current.value);
-    } else {
-      onFilter('');
-      if (innerRef.current) innerRef.current.value = '';
-    }
-
     const selectedOption = options.find(item => item.dsId === focusOptionIdx);
-    onChange(selectedOption);
-    if (!selectedOption.disabled && !multiple) setShowPopover(false);
-  }, [multiple, options, focusOptionIdx, setShowPopover, onFilter, innerRef, onChange]);
+
+    if (!selectedOption.disabled) {
+      if (onFilter) onFilter('');
+      setInputValue('');
+      onChange(selectedOption);
+      if (!multiple) setShowPopover(false);
+    }
+  }, [multiple, options, setInputValue, focusOptionIdx, setShowPopover, onFilter, onChange]);
   const onInputKeyDown = React.useCallback(e => {
-    const targetElement = e.target; // =============================================================================
+    // =============================================================================
     // CUSTOM KEYS
     // =============================================================================
+    if (onKeyDown) onKeyDown(e, currentItem);
+
+    if (!['Escape', 'Tab', 'ArrowLeft', 'ArrowRight'].includes(e.key)) {
+      setShowPopover(true);
+    } // =============================================================================
+    // ESCAPE
+    // =============================================================================
 
-    onKeyDown(e, currentItem); // =============================================================================
+
+    if (e.key === 'Escape') {
+      if (onCancel) onCancel();
+
+      if (inputValue) {
+        if (onFilter) onFilter('');
+        setInputValue('');
+      }
+
+      if (!inline) setShowPopover(false);
+    } // =============================================================================
     // ENTER KEY TO CREATE ELEMENTS
     // =============================================================================
 
-    if (e.key === 'Enter' && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === 'creatable') {
-      onCreate(targetElement.value);
-      onFilter('');
-      if (innerRef.current) innerRef.current.value = '';
+
+    if (e.key === 'Enter' && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === constants.INTERNAL_MENU_OPTION_TYPES.CREATABLE && onCreate) {
+      onCreate(inputValue);
+      if (onFilter) onFilter('');
+      setInputValue('');
       return;
     } // =============================================================================
     // Enter and space on selection
@@ -72,9 +90,7 @@ const useKeyboardNavigation = () => {
       e.preventDefault();
       e.stopPropagation();
 
-      if (!showPopover && !inline) {
-        setShowPopover(true);
-      } else {
+      if (focusOptionIdx !== '' && showPopover) {
         selectOption();
       }
     }
@@ -84,9 +100,9 @@ const useKeyboardNavigation = () => {
     }
 
     if (e.key === 'a' && e.ctrlKey && multiple) {
-      onSelectAll();
+      if (onSelectAll) onSelectAll();
     } // =============================================================================
-    // ARROWS UP AND DOWN
+    // ARROWS UP AND DOWN: LOGIC TO CALCULATE NEXT OR PREV ITEM TO PSEUDOFOCUS FROM INPUT
     // =============================================================================
 
 
@@ -94,60 +110,40 @@ const useKeyboardNavigation = () => {
       e.preventDefault();
       e.stopPropagation();
 
-      if (showPopover || inline) {
+      if ((showPopover || inline) && selectableOptions.length) {
         const nextItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable);
-        setCurrentOption(options[nextItemIndex].dsId);
-        scrollOptionIntoView(options[nextItemIndex].dsId);
-      } else {
-        setShowPopover(true);
+        setFocusOptionIdx(options[nextItemIndex].dsId);
       }
     }
 
     if (e.key === 'ArrowUp') {
       e.preventDefault();
       e.stopPropagation();
+      if (!selectableOptions.length) return;
+      const prevItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable, -1);
 
       if (showPopover || inline) {
-        const nextItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable, -1);
-        setCurrentOption(options[nextItemIndex].dsId);
-        scrollOptionIntoView(options[nextItemIndex].dsId);
+        setFocusOptionIdx(options[prevItemIndex].dsId);
       } else {
         setShowPopover(true);
         setTimeout(() => {
           const nextItemIndex = listHelper.findInCircularList(options, 0, isOptionFocuseable, -1);
-          setCurrentOption(options[nextItemIndex].dsId);
-          scrollOptionIntoView(options[nextItemIndex].dsId);
+          setFocusOptionIdx(options[nextItemIndex].dsId);
         });
       }
     } // =============================================================================
-    // ESCAPE
-    // =============================================================================
-
-
-    if (e.key === 'Escape') {
-      var _innerRef$current;
-
-      if (onCancel) onCancel();
-
-      if (innerRef.current && ((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) !== '') {
-        onFilter('');
-        innerRef.current.value = '';
-      }
-
-      if (!inline) setShowPopover(false);
-    } // =============================================================================
     // BACKSPACE
     // =============================================================================
 
 
-    if (e.key === 'Backspace' && targetElement.value.length <= 0 && !inline) {
-      if (multiple && !targetElement.value) {
+    if (e.key === 'Backspace' && inputValue.length <= 0 && !inline) {
+      if (multiple && !inputValue) {
         if (selectedValues.length > 0) onChange(selectedValues[selectedValues.length - 1]);
       } else {
         onChange(null);
       }
 
-      onFilter('');
+      if (onFilter) onFilter('');
     }
 
     if (e.key === 'Tab' && !inline && !withoutPortal) {
@@ -159,10 +155,11 @@ const useKeyboardNavigation = () => {
         e.preventDefault();
         element.focus();
       }
-    } // if (e.key === 'Tab' && multiple) {
+    } // waiting for validation from ux
+    // if (e.key === 'Tab' && multiple) {
     // }
 
-  }, [currentItemIndex, options, currentItem, innerRef, multiple, showPopover, selectedValues, inline, scrollOptionIntoView, onKeyDown, onSelectAll, onChange, onCreate, onFilter, setCurrentOption, setShowPopover, selectOption, onCancel, selectAllCheckboxRef, toggleSelectionButtonRef, withoutPortal]);
+  }, [onKeyDown, currentItem, onCreate, multiple, inputValue, inline, withoutPortal, setShowPopover, onCancel, onFilter, setInputValue, focusOptionIdx, showPopover, selectOption, onSelectAll, selectableOptions.length, options, currentItemIndex, setFocusOptionIdx, selectedValues, onChange, selectAllCheckboxRef, toggleSelectionButtonRef]);
   return {
     onInputKeyDown
   };

package/cjs/{controlled-combobox → combobox}/utils/listHelper.js

@@ -7,9 +7,10 @@ require('core-js/modules/esnext.iterator.constructor.js');
 require('core-js/modules/esnext.iterator.filter.js');
 require('core-js/modules/esnext.async-iterator.some.js');
 require('core-js/modules/esnext.iterator.some.js');
+var constants = require('../constants.js');
 
-const getSelectableOptions = options => options.filter(option => option.type === 'option' && !option.disabled);
-const getOptions = options => options.filter(option => option.type === 'option');
+const getSelectableOptions = options => options.filter(option => option.type === constants.MENU_OPTION_TYPES.OPTION && !option.disabled);
+const getOptions = options => options.filter(option => option.type === constants.MENU_OPTION_TYPES.OPTION);
 const isSelectedValueEmpty = value => Array.isArray(value) ? value.length === 0 : !value;
 const isSelectedValueMultiple = value => Array.isArray(value);
 const isSelected = (value, activeOption) => {
@@ -24,7 +25,7 @@ const isSelected = (value, activeOption) => {
 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/cjs/{controlled-date-range-picker → date-range-picker}/config/useRangePickerLogic.js

@@ -10,11 +10,11 @@ require('core-js/modules/esnext.iterator.filter.js');
 require('core-js/modules/esnext.async-iterator.for-each.js');
 require('core-js/modules/esnext.iterator.for-each.js');
 var React = require('react');
-require('../../controlled-date-time-picker/ControlledDateTimePicker.js');
+require('../../date-time-picker/ControlledDateTimePicker.js');
 require('core-js/modules/esnext.async-iterator.map.js');
 require('core-js/modules/esnext.iterator.map.js');
 require('core-js/modules/es.string.replace.js');
-var dateHelpers = require('../../controlled-date-time-picker/utils/dateHelpers.js');
+var dateHelpers = require('../../date-time-picker/utils/dateHelpers.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }