@elliemae/ds-controlled-form 2.3.0-next.0 → 2.3.0-next.13

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

@@ -10,7 +10,6 @@ var ComboboxDataTestids = require('../../ComboboxDataTestids.js');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var HeaderList = require('../header-list/HeaderList.js');
 var useOnElementResize = require('../../utils/hooks/useOnElementResize.js');
-var index = require('../empty-state/index.js');
 var useItemRenderer = require('./useItemRenderer.js');
 var useMenuList = require('./useMenuList.js');
 var jsxRuntime = require('react/jsx-runtime');
@@ -19,10 +18,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-var _HeaderList, _EmptyState;
+var _HeaderList, _StyledNoResultsWrapp;
 
 const MenuList = () => {
-  var _inputRef$current;
+  var _innerRef$current;
 
   const {
     props: {
@@ -31,22 +30,18 @@ const MenuList = () => {
       onCreate,
       inline,
       options,
-      selectedValues
+      selectedValues,
+      innerRef
     },
     referenceElement,
-    inputRef,
     listRef,
-    showPopover,
     wrapperListRef,
     controlsWrapperRef,
     virtualListHelpers
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const {
-    totalSize
-  } = virtualListHelpers;
   const isOnCreatedSupplied = onCreate !== lodash.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.useItemRenderer();
   useMenuList.useMenuList();
   const {
@@ -54,9 +49,7 @@ const MenuList = () => {
   } = useOnElementResize.useOnElementResize(controlsWrapperRef);
   const listWidth = React.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 = React.useCallback(() => {// inputRef.current?.focus();
-  }, [inputRef]);
-  return /*#__PURE__*/jsxRuntime.jsxs(styled.StyledListWrapper, {
+  const list = React.useMemo(() => /*#__PURE__*/jsxRuntime.jsxs(styled.StyledListWrapper, {
     ref: wrapperListRef,
     inline: inline,
     onMouseDown: e => e.preventDefault(),
@@ -69,16 +62,18 @@ const MenuList = () => {
       children: /*#__PURE__*/_jsx__default["default"](styled.StyledList, {
         id: "combo-listbox",
         role: "listbox",
-        tabIndex: -1,
-        "aria-expanded": showPopover,
-        onFocus: handleOnFocus,
         "data-testid": ComboboxDataTestids.ComboboxDataTestid.LIST,
         style: {
-          height: totalSize,
+          height: virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.totalSize,
           margin: inline ? '0px' : '8px 0px'
         }
       }, void 0, ItemRenderer)
-    }) : _EmptyState || (_EmptyState = /*#__PURE__*/_jsx__default["default"](index.EmptyState, {}))]
+    }) : _StyledNoResultsWrapp || (_StyledNoResultsWrapp = /*#__PURE__*/_jsx__default["default"](styled.StyledNoResultsWrapper, {
+      id: "id-no-results"
+    }, void 0, "No matches found"))]
+  }), [ItemRenderer, inline, isOnCreatedSupplied, listRef, listWidth, menuMaxHeight, options.length, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.totalSize, withHeader, wrapperListRef]);
+  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: list
   });
 };
 

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

@@ -10,7 +10,7 @@ var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
 const StyledListWrapper = /*#__PURE__*/styled__default["default"].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__default["default"].ul.withConfig({
   componentId: "sc-g2fmft-1"
 })(["position:relative;padding:0;"]);
@@ -30,8 +30,12 @@ const StyledVirtualListWrapper = /*#__PURE__*/styled__default["default"].div.wit
 const StyledCreatableLabel = /*#__PURE__*/styled__default["default"].span.withConfig({
   componentId: "sc-g2fmft-3"
 })(["font-weight:bold;font-style:italic;"]);
+const StyledNoResultsWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
+  componentId: "sc-g2fmft-4"
+})(["padding:16px;"]);
 
 exports.StyledCreatableLabel = StyledCreatableLabel;
 exports.StyledList = StyledList;
 exports.StyledListWrapper = StyledListWrapper;
+exports.StyledNoResultsWrapper = StyledNoResultsWrapper;
 exports.StyledVirtualListWrapper = StyledVirtualListWrapper;

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

@@ -12,7 +12,7 @@ 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 Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var dsForm = require('@elliemae/ds-form');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var styled = require('./styled.js');
@@ -38,23 +38,20 @@ const useItemRenderer = () => {
       onCreate,
       onChange,
       selectedValues,
-      onFilter
+      onFilter,
+      innerRef
     },
-    inputRef,
     setShowPopover,
     focusOptionIdx,
     virtualListHelpers
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const {
-    virtualItems
-  } = virtualListHelpers;
   const multiple = Array.isArray(selectedValues);
   const CBItem = multiple ? dsForm.MultiMenuItem : dsForm.SingleMenuItem;
   const handleClick = React.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('');
       }
 
@@ -62,20 +59,20 @@ 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 = React.useCallback(e => {
     e.preventDefault();
   }, []);
-  const ItemRenderer = React.useMemo(() => virtualItems.map(vItem => {
+  const ItemRenderer = React.useMemo(() => virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems.map(vItem => {
     const option = options[vItem.index];
     const generalProps = {
       wrapperStyles: {
@@ -121,7 +118,7 @@ const useItemRenderer = () => {
           let {
             label
           } = _ref;
-          return /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+          return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
             cols: ['min-content', 'auto'],
             height: "16px",
             gutter: "xxs",
@@ -134,7 +131,7 @@ const useItemRenderer = () => {
     }
 
     return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
-  }), [options, focusOptionIdx, selectedValues, inputRef, virtualItems]);
+  }), [options, focusOptionIdx, selectedValues, innerRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems]);
   return ItemRenderer;
 };
 

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

@@ -6,16 +6,16 @@ var React = require('react');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 
 const useMenuList = () => {
-  var _inputRef$current2;
+  var _innerRef$current2;
 
   const {
     props: {
       inline,
       selectedValues,
       onMenuOpen,
-      options
+      options,
+      innerRef
     },
-    inputRef,
     setCurrentOption,
     scrollOptionIntoView,
     hasFocus,
@@ -30,18 +30,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();
         }
@@ -49,15 +47,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]);
 };
 
 exports.useMenuList = useMenuList;

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

@@ -6,52 +6,66 @@ var _jsx = require('@babel/runtime/helpers/jsx');
 require('core-js/modules/esnext.async-iterator.map.js');
 require('core-js/modules/esnext.iterator.map.js');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
 var dsPills = require('@elliemae/ds-pills');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var useGroupPills = require('./useGroupPills.js');
-var MultiAllyMessages = require('../a11y-messages/MultiAllyMessages.js');
-require('styled-components');
+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 }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
-
-var _MultiAllyMessages;
 
 const MultiSelectedValuesContainer = () => {
-  var _inputRef$current;
-
   const {
     props: {
-      selectedValues
+      selectedValues,
+      onChange,
+      innerRef
     },
-    inputRef,
-    pillGroupRef
+    pillGroupRef,
+    showPopover,
+    setShowPopover
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const multiSelectedValue = selectedValues;
-  const pillsToShow = useGroupPills.useGroupPills();
-  const correctPillsToShow = pillsToShow || 1;
-  const pills = React.useMemo(() => /*#__PURE__*/_jsx__default["default"](Grid__default["default"], {
+  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();
+    }
+
+    e.stopPropagation();
+  }, [setShowPopover, innerRef, showPopover]);
+  const pills = 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: "value"
+    type: "removable",
+    tabIndex: -1,
+    onRemove: () => {
+      var _innerRef$current2;
+
+      onChange(option);
+      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.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, multiSelectedValue, correctPillsToShow]);
-  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [multiSelectedValue.length > 0 && !((_inputRef$current = inputRef.current) !== null && _inputRef$current !== void 0 && _inputRef$current.value) && (_MultiAllyMessages || (_MultiAllyMessages = /*#__PURE__*/_jsx__default["default"](MultiAllyMessages.MultiAllyMessages, {}))), pills]
+  }, "grouped"))), [pillGroupRef, innerRef, onChange, handleClickOnPills, multiSelectedValue, correctPillsToShow]);
+  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: pills
   });
 };
 

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

@@ -21,9 +21,9 @@ const getGroupedPillWidth = remainingPills => {
 const useGroupPills = () => {
   const {
     props: {
-      selectedValues
+      selectedValues,
+      innerRef
     },
-    inputRef,
     selectedOptionsRef,
     controlsWrapperRef,
     pillGroupRef
@@ -35,7 +35,7 @@ const useGroupPills = () => {
   } = useOnElementResize.useOnElementResize(controlsWrapperRef);
   const {
     width: widthInput
-  } = useOnElementResize.useOnElementResize(inputRef || null);
+  } = useOnElementResize.useOnElementResize(innerRef || null);
   React.useEffect(() => {
     if (multiSelectedValues.length !== pillsToShow) {
       setPillsToShow(multiSelectedValues.length);
@@ -48,7 +48,7 @@ const useGroupPills = () => {
       let lastPillFit = -1;
       let currentWidth = 0;
       const referenceWidth = selectedOptionsRef.current.offsetWidth;
-      const pills = [...selectedOptionsRef.current.querySelectorAll('.ds-pill-wrapper-value')];
+      const pills = [...selectedOptionsRef.current.querySelectorAll('.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,7 +68,7 @@ const useGroupPills = () => {
 
       if (pillGroupRef.current) pillGroupRef.current.style.width = 'fit-content';
     }
-  }, [selectedOptionsRef, inputRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput]);
+  }, [selectedOptionsRef, innerRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput]);
   return pillsToShow;
 };
 

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

@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+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 _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var dsPropsHelpers = require('@elliemae/ds-props-helpers');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+
+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 ComboboxPropTypes = _objectSpread(_objectSpread({}, dsPropsHelpers.globalAttributesPropTypes), {}, {
+  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'),
+  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(''),
+  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(''),
+  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')
+});
+
+exports.ComboboxPropTypes = ComboboxPropTypes;

package/cjs/controlled-combobox/utils/hooks/useKeyboardNavigation.js

@@ -9,7 +9,7 @@ var React = require('react');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var listHelper = require('../listHelper.js');
 
-const isOptionFocuseable = opt => !['section', 'separator'].includes(opt.type);
+const isOptionFocuseable = opt => !['section', 'separator'].includes(opt.type) && !opt.disabled;
 
 const useKeyboardNavigation = () => {
   const {
@@ -23,13 +23,12 @@ const useKeyboardNavigation = () => {
       options,
       selectedValues,
       onFilter,
-      withoutPortal
+      withoutPortal,
+      innerRef
     },
     setShowPopover,
     showPopover,
-    setShowSelectedValue,
     focusOptionIdx,
-    inputRef,
     setCurrentOption,
     scrollOptionIntoView,
     selectAllCheckboxRef,
@@ -40,16 +39,16 @@ const useKeyboardNavigation = () => {
   const currentItem = options.find(item => item.dsId === focusOptionIdx);
   const selectOption = React.useCallback(() => {
     if (multiple) {
-      if (inputRef.current) onFilter(inputRef.current.value);
+      if (innerRef.current) onFilter(innerRef.current.value);
     } else {
       onFilter('');
-      if (inputRef.current) inputRef.current.value = '';
-      setShowSelectedValue(true);
+      if (innerRef.current) innerRef.current.value = '';
     }
 
-    onChange(options.find(item => item.dsId === focusOptionIdx));
-    setShowPopover(multiple ? true : !showPopover);
-  }, [multiple, options, focusOptionIdx, setShowPopover, showPopover, onFilter, inputRef, setShowSelectedValue, onChange]);
+    const selectedOption = options.find(item => item.dsId === focusOptionIdx);
+    onChange(selectedOption);
+    if (!selectedOption.disabled && !multiple) setShowPopover(false);
+  }, [multiple, options, focusOptionIdx, setShowPopover, onFilter, innerRef, onChange]);
   const onInputKeyDown = React.useCallback(e => {
     const targetElement = e.target; // =============================================================================
     // CUSTOM KEYS
@@ -62,7 +61,7 @@ const useKeyboardNavigation = () => {
     if (e.key === 'Enter' && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === 'creatable') {
       onCreate(targetElement.value);
       onFilter('');
-      if (inputRef.current) inputRef.current.value = '';
+      if (innerRef.current) innerRef.current.value = '';
       return;
     } // =============================================================================
     // Enter and space on selection
@@ -71,6 +70,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'Enter' || e.keyCode === 32 && e.altKey) {
       e.preventDefault();
+      e.stopPropagation();
 
       if (!showPopover && !inline) {
         setShowPopover(true);
@@ -92,6 +92,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'ArrowDown') {
       e.preventDefault();
+      e.stopPropagation();
 
       if (showPopover || inline) {
         const nextItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable);
@@ -104,6 +105,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'ArrowUp') {
       e.preventDefault();
+      e.stopPropagation();
 
       if (showPopover || inline) {
         const nextItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable, -1);
@@ -123,13 +125,13 @@ const useKeyboardNavigation = () => {
 
 
     if (e.key === 'Escape') {
-      var _inputRef$current;
+      var _innerRef$current;
 
       if (onCancel) onCancel();
 
-      if (inputRef.current && ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value) !== '') {
+      if (innerRef.current && ((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) !== '') {
         onFilter('');
-        inputRef.current.value = '';
+        innerRef.current.value = '';
       }
 
       if (!inline) setShowPopover(false);
@@ -146,7 +148,6 @@ const useKeyboardNavigation = () => {
       }
 
       onFilter('');
-      setShowSelectedValue(true);
     }
 
     if (e.key === 'Tab' && !inline && !withoutPortal) {
@@ -158,10 +159,10 @@ const useKeyboardNavigation = () => {
         e.preventDefault();
         element.focus();
       }
-    }
+    } // if (e.key === 'Tab' && multiple) {
+    // }
 
-    if (e.key === 'Tab' && inline) ;
-  }, [currentItemIndex, options, currentItem, inputRef, multiple, showPopover, selectedValues, inline, scrollOptionIntoView, onKeyDown, onSelectAll, onChange, onCreate, onFilter, setCurrentOption, setShowPopover, setShowSelectedValue, selectOption, onCancel, selectAllCheckboxRef, toggleSelectionButtonRef, withoutPortal]);
+  }, [currentItemIndex, options, currentItem, innerRef, multiple, showPopover, selectedValues, inline, scrollOptionIntoView, onKeyDown, onSelectAll, onChange, onCreate, onFilter, setCurrentOption, setShowPopover, selectOption, onCancel, selectAllCheckboxRef, toggleSelectionButtonRef, withoutPortal]);
   return {
     onInputKeyDown
   };

package/cjs/controlled-combobox/utils/listHelper.js

@@ -8,8 +8,8 @@ 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');
 
-const getSelectableOptions = options => options ? options.filter(option => option.type === 'option' && !option.disabled) : [];
-const getOptions = options => options ? options.filter(option => option.type === 'option') : [];
+const getSelectableOptions = options => options.filter(option => option.type === 'option' && !option.disabled);
+const getOptions = options => options.filter(option => option.type === 'option');
 const isSelectedValueEmpty = value => Array.isArray(value) ? value.length === 0 : !value;
 const isSelectedValueMultiple = value => Array.isArray(value);
 const isSelected = (value, activeOption) => {

package/cjs/controlled-date-time-picker/parts/ControlledDateTimePickerContent.js

@@ -10,7 +10,7 @@ require('core-js/modules/esnext.iterator.for-each.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var ControlledDateTimePickerCTX = require('../ControlledDateTimePickerCTX.js');
 var Styleds = require('./Styleds.js');
 var DateInputs = require('./DateInputs/DateInputs.js');
@@ -72,7 +72,7 @@ const ControlledDateTimePickerContent = () => {
       isControllerOnly: isControllerOnly,
       disabled: disabled
     }, dataAttrs), {}, {
-      children: [hideDate ? null : _DateInputs || (_DateInputs = /*#__PURE__*/_jsx__default["default"](DateInputs.DateInputs, {})), hideTime ? null : _TimeInputs || (_TimeInputs = /*#__PURE__*/_jsx__default["default"](TimeInputs.TimeInputs, {})), withAnyRightController ? /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+      children: [hideDate ? null : _DateInputs || (_DateInputs = /*#__PURE__*/_jsx__default["default"](DateInputs.DateInputs, {})), hideTime ? null : _TimeInputs || (_TimeInputs = /*#__PURE__*/_jsx__default["default"](TimeInputs.TimeInputs, {})), withAnyRightController ? /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
         cols: rightControlCols
       }, void 0, shouldPreserveClearableSpace ? _ClearButton || (_ClearButton = /*#__PURE__*/_jsx__default["default"](ClearButton.ClearButton, {})) : null, withAnyPicker ? _PickersIcons || (_PickersIcons = /*#__PURE__*/_jsx__default["default"](PickersIcons.PickersIcons, {})) : null) : null]
     }))

package/cjs/controlled-date-time-picker/parts/DateInputs/DateInputs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var ControlledDateTimePickerCTX = require('../../ControlledDateTimePickerCTX.js');
 var MMInput = require('./MMInput.js');
 var DDInput = require('./DDInput.js');
@@ -45,7 +45,7 @@ const DateInputs = () => {
     yearInputRef,
     ariaCurrentValueForInputs
   } = React.useContext(ControlledDateTimePickerCTX.ControlledDateTimePickerContext);
-  return /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+  return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
     cols: [config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.largeInputWidth]
   }, void 0, /*#__PURE__*/_jsx__default["default"](Styleds.StyledFocusWithIn, {}, void 0, /*#__PURE__*/_jsx__default["default"](MMInput.MMInput, {
     onChange: onMonthChange,

package/cjs/controlled-date-time-picker/parts/Pickers/Calendar/Styleds.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
 var styled = require('styled-components');
 var dsSystem = require('@elliemae/ds-system');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var DSButton = require('@elliemae/ds-button');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -127,7 +127,7 @@ const StyledDayBtn = /*#__PURE__*/styled__default["default"](DSButton.DSButtonV2
   } = _ref17;
   return theme.colors.brand[200];
 }, focusBorder);
-const StyledWeekDaysListWrapper = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledWeekDaysListWrapper = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-18gg4kd-7"
 })(["font-size:", ";text-align:center;", ";", ";.dayWrapper.selectedDay,.dayWrapper.startRangeDay,.dayWrapper.endRangeDay{", "{color:", ";font-weight:", ";}&:not(.disabledDay),&:not(.outOfRangeDay){", "{background-color:", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";background-color:", ";&:before{background-color:", ";}}}&.focusedDay{", "{color:", ";border-color:", ";}}&.outOfRangeDay.focusedDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.disabledDay,.dayWrapper.outOfRangeDay{", "{color:", ";", " &:before{background-color:", ";}}&.focusedDay{", "{&:after{border:2px solid ", ";}}}}.dayWrapper.focusedDay{", "{", " color:", ";&:after{border:2px solid ", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.notCurrentMonth{", "{color:", ";}&.focusedDay{", "{color:", ";}&.disabledDay,&.outOfRangeDay{", "{color:", ";}&.inRangeDay,&.startRangeDay,&.endRangeDay{", "{color:", ";}}}}&.selectedDay,&.startRangeDay,&.endRangeDay{", "{color:", ";}}}.dayWrapper.inRangeDay{", " &.disabledDay,&.outOfRangeDay{", "{color:", ";background-color:", ";&:before{background-color:", ";}}&.focusedDay{", "{border-color:", ";}}}}.dayWrapper.startRangeDay{", " &.focusedDay{", "{color:", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.endRangeDay{", " &.focusedDay{", "{color:", ";}}&.disabledDay,&.outOfRangeDay{", "{color:", ";&:before{background-color:", ";}}}}.dayWrapper.endRangeDay.startRangeDay{background-color:transparent;box-shadow:none;}"], _ref18 => {
   let {

package/cjs/controlled-date-time-picker/parts/Pickers/TimeWheel/Styleds.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
 var styled = require('styled-components');
 var dsSystem = require('@elliemae/ds-system');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var DSButton = require('@elliemae/ds-button');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -84,7 +84,7 @@ const StyledTimePickerContainer = /*#__PURE__*/styled__default["default"].div.wi
   } = _ref8;
   return showShadow && !isControllerOnly ? "\n  box-shadow: 0 6px 20px 0 rgb(0 0 0 / 24%), 0 8px 17px 0 rgb(0 0 0 / 19%);\n  " : '';
 });
-const StyledTimePickerHead = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledTimePickerHead = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1nsw31l-3"
 })(["width:100%;grid-area:TimePickerHead;justify-content:center;align-items:center;background:", ";"], _ref9 => {
   let {