@elliemae/ds-form 2.0.0-rc.1 → 2.0.0-rc.13

package/cjs/ComboBox/v3/parts/header-list/HeaderList.js

@@ -4,63 +4,52 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
+var lodash = require('lodash');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var styled = require('./styled.js');
 var listHelper = require('../../utils/listHelper.js');
 var ComboboxDataTestids = require('../../ComboboxDataTestids.js');
+var useHeaderListHandlers = require('./useHeaderListHandlers.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 _StyledSeparator;
+var _StyledSeparator, _StyledNoOptionsSelec, _StyledSeparator2;
 
 const HeaderList = () => {
+  var _inputRef$current;
+
   const {
     props: {
       onSelectAll,
       onClearAll,
+      withToggle,
       selectedValues,
       options
     },
-    inputRef,
-    setShowPopover
+    showSelectedOptions,
+    inputRef
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
+  const isSelectAllSupplied = onSelectAll !== lodash.noop;
+  const isClearAllSupplied = onClearAll !== lodash.noop;
   const multiSelectedValues = selectedValues;
   const selectableOptions = listHelper.getSelectableOptions(options);
-
-  const handleOnBlurSelectAll = e => {
-    if (!onClearAll || multiSelectedValues.length === 0) {
-      e.preventDefault();
-      inputRef.current.focus();
-    }
-  };
-
-  const handleOnBlurClearAll = e => {
-    e.preventDefault();
-    inputRef.current.focus();
-  };
-
-  const handleClickOnSelectAll = () => {
-    onSelectAll();
-    inputRef.current.focus();
-    setShowPopover(false);
-  };
-
-  const handleClickOnClearAll = React.useCallback(e => {
-    e.preventDefault();
-    e.stopPropagation();
-    onClearAll();
-    inputRef.current.focus();
-  }, [inputRef, onClearAll]);
-  const handleOnMouseDown = React.useCallback(e => {
-    e.preventDefault();
-  }, []);
+  const {
+    handleKeyDown,
+    handleClickOnClearAll,
+    handleClickOnSelectAll,
+    handleOnBlurClearAll,
+    handleOnBlurSelectAll,
+    handleOnMouseDown,
+    handleToggle
+  } = useHeaderListHandlers.useHeaderListHandlers();
   return /*#__PURE__*/_jsx__default["default"](styled.StyledHeaderListWrapper, {
+    onKeyDown: handleKeyDown,
     onMouseDown: handleOnMouseDown
-  }, void 0, /*#__PURE__*/_jsx__default["default"](styled.StyledSelectedItems, {}, void 0, "".concat(multiSelectedValues.length, " Selected")), /*#__PURE__*/_jsx__default["default"](styled.ActionButtons, {}, void 0, onSelectAll && /*#__PURE__*/_jsx__default["default"](styled.StyledButton, {
-    disabled: selectableOptions.length === multiSelectedValues.length,
-    tabIndex: 0,
+  }, void 0, /*#__PURE__*/_jsx__default["default"](styled.StyledSelectedItems, {}, void 0, isSelectAllSupplied && /*#__PURE__*/_jsx__default["default"](styled.StyledButton, {
+    disabled: (inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value) !== '' || selectableOptions.length === multiSelectedValues.length,
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECT_ALL_BUTTON,
     buttonType: "text",
     labelText: "All",
@@ -68,21 +57,56 @@ const HeaderList = () => {
     onMouseDown: handleOnMouseDown,
     onBlur: handleOnBlurSelectAll,
     onClick: handleClickOnSelectAll
-  }), onSelectAll && onClearAll && (_StyledSeparator || (_StyledSeparator = /*#__PURE__*/_jsx__default["default"](styled.StyledSeparator, {
+  }), isSelectAllSupplied && isClearAllSupplied && (_StyledSeparator || (_StyledSeparator = /*#__PURE__*/_jsx__default["default"](styled.StyledSeparator, {
     orientation: "vertical",
     position: "center",
     type: "group-level",
     margin: "none"
-  }))), onClearAll && /*#__PURE__*/_jsx__default["default"](styled.StyledButton, {
+  }))), isClearAllSupplied && /*#__PURE__*/_jsx__default["default"](styled.StyledButton, {
     disabled: multiSelectedValues.length === 0,
     tabIndex: 0,
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.CLEAR_ALL_BUTTON,
     buttonType: "text",
-    labelText: "Clear",
     size: "s",
+    labelText: "Clear",
     onMouseDown: handleOnMouseDown,
     onBlur: handleOnBlurClearAll,
     onClick: handleClickOnClearAll
+  })), /*#__PURE__*/_jsx__default["default"](styled.StyledSelectedItems, {}, void 0, withToggle ? /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: multiSelectedValues.length > 0 ? /*#__PURE__*/_jsx__default["default"](styled.StyledButtonSelection, {
+      buttonType: "text",
+      disabled: !showSelectedOptions && selectableOptions.length === multiSelectedValues.length,
+      onClick: handleToggle,
+      labelText: !showSelectedOptions ? "".concat(multiSelectedValues.length, " SELECTED") : 'SHOW ALL',
+      size: "s"
+    }) : _StyledNoOptionsSelec || (_StyledNoOptionsSelec = /*#__PURE__*/_jsx__default["default"](styled.StyledNoOptionsSelected, {}, void 0, "0 SELECTED"))
+  }) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/_jsx__default["default"](styled.StyledShowAllButton, {
+      buttonType: "text",
+      "data-testid": ComboboxDataTestids.ComboboxDataTestid.SHOW_ALL_BUTTON,
+      tabIndex: !showSelectedOptions ? -1 : 0,
+      onClick: showSelectedOptions ? handleToggle : lodash.noop,
+      labelText: "SHOW ALL",
+      isSelected: !showSelectedOptions,
+      size: "s",
+      style: {
+        fontWeight: showSelectedOptions ? '300' : '600'
+      }
+    }), _StyledSeparator2 || (_StyledSeparator2 = /*#__PURE__*/_jsx__default["default"](styled.StyledSeparator, {
+      orientation: "vertical",
+      position: "center",
+      type: "group-level",
+      margin: "none"
+    })), /*#__PURE__*/_jsx__default["default"](styled.StyledButtonSelection, {
+      tabIndex: showSelectedOptions ? -1 : 0,
+      "data-testid": ComboboxDataTestids.ComboboxDataTestid.SHOW_SELECTED_OPTIONS_BUTTON,
+      disabled: multiSelectedValues.length === 0 || !showSelectedOptions && selectableOptions.length === multiSelectedValues.length,
+      buttonType: "text",
+      isSelected: showSelectedOptions,
+      onClick: !showSelectedOptions ? handleToggle : lodash.noop,
+      labelText: "".concat(multiSelectedValues.length, " SELECTED"),
+      size: "s"
+    })]
   })));
 };
 

package/cjs/ComboBox/v3/parts/header-list/styled.js

@@ -2,34 +2,57 @@
 
 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 DSButton = require('@elliemae/ds-button');
 var DSSeparator = require('@elliemae/ds-separator');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var _taggedTemplateLiteral__default = /*#__PURE__*/_interopDefaultLegacy(_taggedTemplateLiteral);
 var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 var DSButton__default = /*#__PURE__*/_interopDefaultLegacy(DSButton);
 var DSSeparator__default = /*#__PURE__*/_interopDefaultLegacy(DSSeparator);
 
+var _templateObject;
+
+const selectedStyle = isSelected => dsSystem.css(_templateObject || (_templateObject = _taggedTemplateLiteral__default["default"](["\n  & span {\n    border-bottom: 2px solid ", ";\n  }\n  cursor: ", ";\n"])), props => isSelected ? props.theme.colors.brand[700] : '#FFF', isSelected && 'default');
+
 const StyledHeaderListWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-dazbzt-0"
-})(["display:flex;justify-content:space-between;padding:0px 16px;height:28px;"]);
-const ActionButtons = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-dazbzt-1"
-})(["display:inline-flex;align-items:center;color:", ";"], props => props.theme.colors.neutral[500]);
+})(["display:flex;position:fixed;top:0;z-index:10;justify-content:space-between;padding:0px 12px 0px 12px;width:100%;height:28px;background-color:#fff;box-shadow:0 4px 2px -4px ", ";overflow-x:hidden;& button{font-size:13px;}"], props => props.theme.colors.neutral[700]);
 const StyledSeparator = /*#__PURE__*/styled__default["default"](DSSeparator__default["default"]).withConfig({
-  componentId: "sc-dazbzt-2"
+  componentId: "sc-dazbzt-1"
 })(["height:50%;width:auto;"]);
 const StyledButton = /*#__PURE__*/styled__default["default"](DSButton__default["default"]).withConfig({
-  componentId: "sc-dazbzt-3"
+  componentId: "sc-dazbzt-2"
 })(["padding:0 ", ";align-items:center;"], props => props.theme.space.xxs);
-const StyledSelectedItems = /*#__PURE__*/styled__default["default"].div.withConfig({
+const StyledGeneralSelectionButton = /*#__PURE__*/styled__default["default"](DSButton__default["default"]).withConfig({
+  componentId: "sc-dazbzt-3"
+})(["border-radius:0px;padding:0 ", ";margin:0;align-items:center;", " transition:unset;"], props => props.theme.space.xxs, _ref => {
+  let {
+    isSelected
+  } = _ref;
+  return selectedStyle(isSelected);
+});
+const StyledButtonSelection = /*#__PURE__*/styled__default["default"](StyledGeneralSelectionButton).withConfig({
   componentId: "sc-dazbzt-4"
+})(["&:hover:not([disabled]){background-color:transparent;color:", ";}"], props => props.theme.colors.brand['700']);
+const StyledShowAllButton = /*#__PURE__*/styled__default["default"](StyledGeneralSelectionButton).withConfig({
+  componentId: "sc-dazbzt-5"
+})(["color:", ";&:hover:not([disabled]){background-color:transparent;color:", ";}"], props => props.theme.colors.neutral['700'], props => props.theme.colors.neutral['700']);
+const StyledSelectedItems = /*#__PURE__*/styled__default["default"].div.withConfig({
+  componentId: "sc-dazbzt-6"
 })(["display:flex;align-items:center;"]);
+const StyledNoOptionsSelected = /*#__PURE__*/styled__default["default"].div.withConfig({
+  componentId: "sc-dazbzt-7"
+})(["padding:0 ", ";"], props => props.theme.space.xxs);
 
-exports.ActionButtons = ActionButtons;
 exports.StyledButton = StyledButton;
+exports.StyledButtonSelection = StyledButtonSelection;
 exports.StyledHeaderListWrapper = StyledHeaderListWrapper;
+exports.StyledNoOptionsSelected = StyledNoOptionsSelected;
 exports.StyledSelectedItems = StyledSelectedItems;
 exports.StyledSeparator = StyledSeparator;
+exports.StyledShowAllButton = StyledShowAllButton;

package/cjs/ComboBox/v3/parts/header-list/useHeaderListHandlers.js

@@ -0,0 +1,73 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var ComboBoxCTX = require('../../ComboBoxCTX.js');
+
+const useHeaderListHandlers = () => {
+  const {
+    props: {
+      onSelectAll,
+      onFilter,
+      onClearAll,
+      selectedValues
+    },
+    inputRef,
+    showSelectedOptions,
+    setShowSelectedOptions,
+    setShowPopover
+  } = React.useContext(ComboBoxCTX.ComboBoxContext);
+  const multiSelectedValues = selectedValues;
+  const handleOnBlurSelectAll = React.useCallback(e => {
+    if (!onClearAll || multiSelectedValues.length === 0) {
+      e.preventDefault();
+      inputRef.current.focus();
+    }
+  }, [inputRef, onClearAll, multiSelectedValues]);
+  const handleOnBlurClearAll = React.useCallback(e => {// since ux change order from the action buttons this is unneccesary. will comment until review finish
+    // e.preventDefault();
+    // inputRef.current.focus();
+  }, [inputRef]);
+  const handleClickOnSelectAll = React.useCallback(() => {
+    onSelectAll();
+    inputRef.current.focus();
+  }, [onSelectAll, inputRef, setShowPopover]);
+  const handleClickOnClearAll = React.useCallback(e => {
+    setShowSelectedOptions(false);
+    e.preventDefault();
+    e.stopPropagation();
+    onClearAll();
+    inputRef.current.focus();
+  }, [inputRef, setShowSelectedOptions, onClearAll]);
+  const handleOnMouseDown = React.useCallback(e => {
+    e.preventDefault();
+  }, []);
+  const handleToggle = React.useCallback(() => {
+    inputRef.current.value = '';
+    onFilter('');
+    setShowSelectedOptions(!showSelectedOptions);
+    inputRef.current.focus();
+  }, [setShowSelectedOptions, inputRef, onFilter, showSelectedOptions]);
+  const handleKeyDown = React.useCallback(e => {
+    if (e.key === 'Escape') {
+      setShowPopover(false);
+    }
+  }, [setShowPopover]);
+  React.useEffect(() => {
+    if (multiSelectedValues.length === 0) {
+      setShowSelectedOptions(false);
+    }
+  }, [multiSelectedValues, setShowSelectedOptions]);
+  return React.useMemo(() => ({
+    handleKeyDown,
+    handleToggle,
+    handleOnMouseDown,
+    handleClickOnClearAll,
+    handleClickOnSelectAll,
+    handleOnBlurClearAll,
+    handleOnBlurSelectAll
+  }), [handleKeyDown, handleToggle, handleOnMouseDown, handleClickOnClearAll, handleClickOnSelectAll, handleOnBlurClearAll, handleOnBlurSelectAll]);
+};
+
+exports.useHeaderListHandlers = useHeaderListHandlers;

package/cjs/ComboBox/v3/parts/menu-list/MenuList.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var listHelper = require('../../utils/listHelper.js');
 var styled = require('./styled.js');
 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');
 
@@ -23,6 +23,8 @@ var _HeaderList, _EmptyState;
 const MenuList = () => {
   const {
     props: {
+      menuMinWidth,
+      menuMaxHeight,
       inline,
       options,
       selectedValues
@@ -31,36 +33,48 @@ const MenuList = () => {
     inputRef,
     listRef,
     showPopover,
+    wrapperListRef,
     controlsWrapperRef,
     virtualListHelpers: {
       totalSize
     }
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const multiple = Array.isArray(selectedValues);
-  const {
-    ItemRenderer
-  } = useMenuList.useMenuList();
+  const withHeader = !inline && multiple && options.length > 0;
+  const ItemRenderer = useItemRenderer.useItemRenderer();
+  useMenuList.useMenuList();
   useOnElementResize.useOnElementResize(controlsWrapperRef);
-  const listWidth = inline ? '100%' : "".concat(referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth, "px");
-  const selectableOptions = listHelper.getOptions(options);
-  const handleOnClick = React.useCallback(() => {
-    inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.focus();
+  const listWidth = React.useMemo(() => menuMinWidth || "".concat(referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth), [menuMinWidth, referenceElement]);
+  const handleOnFocus = React.useCallback(() => {
+    var _inputRef$current;
+
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
   }, [inputRef]);
   return /*#__PURE__*/jsxRuntime.jsxs(styled.StyledListWrapper, {
+    tabIndex: -1,
+    ref: wrapperListRef,
+    inline: inline,
     onMouseDown: e => e.preventDefault(),
-    ref: listRef,
-    width: listWidth,
+    minWidth: listWidth,
     id: "combo-listbox",
     role: "listbox",
-    children: [!inline && multiple && options.length > 0 && (_HeaderList || (_HeaderList = /*#__PURE__*/_jsx__default["default"](HeaderList.HeaderList, {}))), selectableOptions.length > 0 ? /*#__PURE__*/_jsx__default["default"](styled.StyledList, {
+    children: [withHeader && (_HeaderList || (_HeaderList = /*#__PURE__*/_jsx__default["default"](HeaderList.HeaderList, {}))), options.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(styled.StyledVirtualListWrapper, {
       tabIndex: -1,
-      "aria-expanded": showPopover,
-      onFocus: handleOnClick,
-      "data-testid": ComboboxDataTestids.ComboboxDataTestid.LIST,
-      style: {
-        height: totalSize
-      }
-    }, void 0, ItemRenderer) : _EmptyState || (_EmptyState = /*#__PURE__*/_jsx__default["default"](index.EmptyState, {}))]
+      inline: inline,
+      maxHeight: menuMaxHeight,
+      ref: listRef,
+      withHeader: withHeader,
+      children: /*#__PURE__*/_jsx__default["default"](styled.StyledList, {
+        tabIndex: -1,
+        "aria-expanded": showPopover,
+        onFocus: handleOnFocus,
+        "data-testid": ComboboxDataTestids.ComboboxDataTestid.LIST,
+        style: {
+          height: totalSize,
+          margin: inline ? '0px' : '8px 0px'
+        }
+      }, void 0, ItemRenderer)
+    }) : _EmptyState || (_EmptyState = /*#__PURE__*/_jsx__default["default"](index.EmptyState, {}))]
   });
 };
 

package/cjs/ComboBox/v3/parts/menu-list/styled.js

@@ -10,10 +10,25 @@ var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
 const StyledListWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-1uedyf-0"
-})(["width:", ";overflow-y:auto;max-height:300px;"], props => props.width);
+})(["min-width:", ";"], props => props.inline ? '100%' : "".concat(props.minWidth, "px"));
 const StyledList = /*#__PURE__*/styled__default["default"].ul.withConfig({
   componentId: "sc-1uedyf-1"
-})(["position:relative;padding:0;margin:0;"]);
+})(["position:relative;padding:0;"]);
+const StyledVirtualListWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
+  componentId: "sc-1uedyf-2"
+})(["overflow-y:auto;margin-top:", ";max-height:", ";"], _ref => {
+  let {
+    withHeader
+  } = _ref;
+  return withHeader ? '28px' : '';
+}, _ref2 => {
+  let {
+    maxHeight,
+    inline
+  } = _ref2;
+  return inline ? '' : "".concat(!maxHeight ? '400' : maxHeight, "px");
+});
 
 exports.StyledList = StyledList;
 exports.StyledListWrapper = StyledListWrapper;
+exports.StyledVirtualListWrapper = StyledVirtualListWrapper;

package/cjs/ComboBox/v3/parts/menu-list/useItemRenderer.js

@@ -0,0 +1,105 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+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 dsForm = require('@elliemae/ds-form');
+var ComboBoxCTX = require('../../ComboBoxCTX.js');
+var listHelper = require('../../utils/listHelper.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 }; }
+
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const useItemRenderer = () => {
+  const {
+    props: {
+      options,
+      onChange,
+      selectedValues,
+      onFilter
+    },
+    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) => {
+    var _inputRef$current;
+
+    if (!multiple) {
+      setShowPopover(false);
+      if (inputRef.current) inputRef.current.value = '';
+    } else if (inputRef.current) {
+      onFilter(inputRef.current.value);
+    }
+
+    onChange(option);
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+    e.stopPropagation();
+    e.preventDefault();
+  }, [onFilter, onChange, setShowPopover, multiple, inputRef]);
+  const handleOnMouseDown = React.useCallback(e => {
+    e.preventDefault();
+  }, []);
+  const ItemRenderer = React.useMemo(() => 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 === 'section') {
+      return /*#__PURE__*/jsxRuntime.jsx(dsForm.Section, _objectSpread({
+        label: option.label
+      }, generalProps));
+    }
+
+    if (option.type === 'separator') {
+      return /*#__PURE__*/jsxRuntime.jsx(dsForm.Separator, _objectSpread({}, generalProps));
+    }
+
+    if (option.type === '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)
+      }));
+    }
+
+    return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
+  }), [options, focusOptionIdx, selectedValues, inputRef, virtualItems]);
+  return ItemRenderer;
+};
+
+exports.useItemRenderer = useItemRenderer;

package/cjs/ComboBox/v3/parts/menu-list/useMenuList.js

@@ -2,103 +2,60 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-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 dsForm = require('@elliemae/ds-form');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
-var listHelper = require('../../utils/listHelper.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 }; }
-
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 const useMenuList = () => {
+  var _inputRef$current;
+
   const {
     props: {
-      options,
-      onChange,
+      inline,
       selectedValues,
-      onFilter
+      onMenuOpen,
+      options
     },
     inputRef,
-    setShowPopover,
-    focusOptionIdx,
-    virtualListHelpers: {
-      virtualItems
-    }
+    setCurrentOption,
+    scrollOptionIntoView,
+    hasFocus,
+    showPopover
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const multiple = Array.isArray(selectedValues);
-  const CBItem = multiple ? dsForm.MultiMenuItem : dsForm.SingleMenuItem;
-  const handleClick = React.useCallback((option, e) => {
-    if (!multiple) {
-      setShowPopover(false);
-      inputRef.current.value = '';
-    } else {
-      onFilter(inputRef.current.value);
-    }
-
-    onChange(option);
-    inputRef.current.focus();
-    e.stopPropagation();
-    e.preventDefault();
-  }, [onFilter, onChange, setShowPopover, multiple, inputRef]);
-  const handleOnMouseDown = React.useCallback(e => {
-    e.preventDefault();
-  }, []);
-  const ItemRenderer = React.useMemo(() => 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
+  React.useEffect(() => {
+    const getFirstOption = () => {
+      for (let i = 0; i < options.length; i += 1) if (!['section', 'separator'].includes(options[i].type)) {
+        setCurrentOption(options[i].dsId);
+        break;
+      }
     };
 
-    if (option.type === 'section') {
-      return /*#__PURE__*/jsxRuntime.jsx(dsForm.Section, _objectSpread({
-        label: option.label
-      }, generalProps));
-    }
-
-    if (option.type === 'separator') {
-      return /*#__PURE__*/jsxRuntime.jsx(dsForm.Separator, _objectSpread({}, generalProps));
-    }
-
-    if (option.type === '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)
-      }));
-    }
-
-    return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
-  }), [options, focusOptionIdx, selectedValues, inputRef, virtualItems]);
-  return React.useMemo(() => ({
-    ItemRenderer
-  }), [ItemRenderer]);
+    if (showPopover || inline) {
+      onMenuOpen();
+
+      if (inputRef.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);
+        } else {
+          getFirstOption();
+        }
+      } else {
+        const singleSelectedValue = selectedValues;
+
+        if (singleSelectedValue) {
+          setCurrentOption(selectedValues.dsId);
+          scrollOptionIntoView(selectedValues.dsId);
+        } else {
+          getFirstOption();
+        }
+      }
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [showPopover, inline, hasFocus, (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value]);
 };
 
 exports.useMenuList = useMenuList;