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

package/esm/ComboBox/v3/parts/controls/styled.js

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

package/esm/ComboBox/v3/parts/controls-input/ControlsInput.js

@@ -17,9 +17,11 @@ const ControlsInput = () => {
     focusOptionIdx,
     inputRef
   } = useContext(ComboBoxContext);
-  const onInputKeyDown = useKeyboardNavigation();
   const {
-    span,
+    onInputKeyDown
+  } = useKeyboardNavigation();
+  const {
+    spanReference,
     width,
     spanReferenceText,
     showPlaceholder,
@@ -28,7 +30,7 @@ const ControlsInput = () => {
     handleOnFocus
   } = useControlsInput();
   return /*#__PURE__*/_jsx(StyledInputWrapper, {}, void 0, /*#__PURE__*/jsx(StyledInputWidthReference, {
-    ref: span,
+    ref: spanReference,
     children: spanReferenceText
   }), /*#__PURE__*/_jsx(StyledInputPlaceHolder, {}, void 0, /*#__PURE__*/_jsx(SimpleTruncatedTooltipText, {
     value: showPlaceholder

package/esm/ComboBox/v3/parts/controls-input/styled.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const StyledInput = /*#__PURE__*/styled.input.withConfig({
   componentId: "sc-1ue5xik-0"
-})(["font-size:13px;line-height:13px;border:none;padding:0;outline:none;&:focus{outline:none;}"]);
+})(["font-size:13px;line-height:13px;border:none;padding:0;outline:none;color:", ";&:focus{outline:none;}"], props => props.theme.colors.neutral[700]);
 const StyledInputPlaceHolder = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-1ue5xik-1"
 })(["font-style:italic;color:", ";position:absolute;display:flex;align-items:center;width:100%;user-select:none;height:28px;"], props => props.theme.colors.neutral[500]);

package/esm/ComboBox/v3/parts/controls-input/useControlsInput.js

@@ -2,7 +2,7 @@ import 'core-js/modules/web.dom-collections.iterator.js';
 import 'core-js/modules/es.string.replace.js';
 import { useContext, useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
-import { findInCircularList, isSelectedValueEmpty } from '../../utils/listHelper.js';
+import { isSelectedValueEmpty } from '../../utils/listHelper.js';
 
 const useControlsInput = () => {
   var _inputRef$current, _inputRef$current2, _inputRef$current3;
@@ -10,23 +10,23 @@ const useControlsInput = () => {
   const {
     props: {
       selectedValues,
-      options,
       placeholder,
       onFilter
     },
     setShowPopover,
     setCurrentOption,
     inputRef,
-    listRef,
+    wrapperListRef,
     setHasFocus,
-    setShowSelectedValue
+    setShowSelectedValue,
+    setShowSelectedOptions
   } = useContext(ComboBoxContext);
-  const [width, setWidth] = useState();
-  const span = useRef(null);
+  const [width, setWidth] = useState(1);
+  const spanReference = useRef(null);
   useEffect(() => {
-    var _span$current;
+    var _spanReference$curren;
 
-    setWidth(((_span$current = span.current) === null || _span$current === void 0 ? void 0 : _span$current.offsetWidth) || 1);
+    setWidth(((_spanReference$curren = spanReference.current) === null || _spanReference$curren === void 0 ? void 0 : _spanReference$curren.offsetWidth) || 1);
   }, [(_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value]);
   useEffect(() => {
     setShowSelectedValue(true);
@@ -34,31 +34,29 @@ const useControlsInput = () => {
   // and refresh selected values and update filter outside value.
 
   const handleOnChange = useCallback(e => {
-    if (e.target.value) setShowSelectedValue(false);
+    setShowSelectedOptions(false);
+    if (e.currentTarget.value) setShowSelectedValue(false);
     setShowPopover(true);
-    onFilter(e.target.value);
-  }, [onFilter, setShowPopover, setShowSelectedValue]);
+    onFilter(e.currentTarget.value);
+  }, [onFilter, setShowPopover, setShowSelectedOptions, setShowSelectedValue]);
   const handleOnBlur = useCallback(() => {
+    setHasFocus(false);
     setTimeout(() => {
-      var _listRef$current;
+      var _wrapperListRef$curre;
 
-      if (!(listRef !== null && listRef !== void 0 && (_listRef$current = listRef.current) !== null && _listRef$current !== void 0 && _listRef$current.contains(document.activeElement))) {
+      if (!(wrapperListRef !== null && wrapperListRef !== void 0 && (_wrapperListRef$curre = wrapperListRef.current) !== null && _wrapperListRef$curre !== void 0 && _wrapperListRef$curre.contains(document.activeElement))) {
         setShowPopover(false);
       }
 
       setCurrentOption('');
-      setHasFocus(false);
       setShowSelectedValue(true);
       onFilter('');
       if (inputRef.current) inputRef.current.value = '';
-    }, 100);
-  }, [setHasFocus, setCurrentOption, listRef, onFilter, inputRef, setShowPopover, setShowSelectedValue]);
+    });
+  }, [setHasFocus, setCurrentOption, wrapperListRef, onFilter, inputRef, setShowPopover, setShowSelectedValue]);
   const handleOnFocus = useCallback(() => {
     setHasFocus(true);
-    setShowPopover(true);
-    const firstItem = findInCircularList(options, -1, opt => !['section', 'separator'].includes(opt.type));
-    setCurrentOption(options[firstItem] ? options[firstItem].dsId : '');
-  }, [setHasFocus, options, setCurrentOption, setShowPopover]);
+  }, [setHasFocus]);
   const showPlaceholder = !((_inputRef$current2 = inputRef.current) !== null && _inputRef$current2 !== void 0 && _inputRef$current2.value) && isSelectedValueEmpty(selectedValues) ? placeholder : null;
   const spanReferenceText = (_inputRef$current3 = inputRef.current) === null || _inputRef$current3 === void 0 ? void 0 : _inputRef$current3.value.replace(/\s/g, '\u00a0');
   return useMemo(() => ({
@@ -68,8 +66,8 @@ const useControlsInput = () => {
     showPlaceholder,
     spanReferenceText,
     width,
-    span
-  }), [handleOnFocus, handleOnBlur, handleOnChange, spanReferenceText, showPlaceholder, width, span]);
+    spanReference
+  }), [handleOnFocus, handleOnBlur, handleOnChange, spanReferenceText, showPlaceholder, width, spanReference]);
 };
 
 export { useControlsInput };

package/esm/ComboBox/v3/parts/dropdown-indicator/DropdownIndicator.js

@@ -18,9 +18,6 @@ const DropdownIndicator = () => {
     "aria-expanded": showPopover,
     "aria-haspopup": "listbox",
     buttonType: "text",
-    style: {
-      height: '100%'
-    },
     icon: _ChevronSmallDown || (_ChevronSmallDown = /*#__PURE__*/_jsx(ChevronSmallDown, {})),
     tabIndex: -1
   });

package/esm/ComboBox/v3/parts/dropdown-indicator/styled.js

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

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

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

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

@@ -1,21 +1,41 @@
+import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLiteral';
 import styled from 'styled-components';
+import { css } from '@elliemae/ds-system';
 import DSButton from '@elliemae/ds-button';
 import DSSeparator from '@elliemae/ds-separator';
 
+var _templateObject;
+
+const selectedStyle = isSelected => css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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.div.withConfig({
   componentId: "sc-dazbzt-0"
-})(["display:flex;justify-content:space-between;padding:0px 16px;height:28px;"]);
-const ActionButtons = /*#__PURE__*/styled.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(DSSeparator).withConfig({
-  componentId: "sc-dazbzt-2"
+  componentId: "sc-dazbzt-1"
 })(["height:50%;width:auto;"]);
 const StyledButton = /*#__PURE__*/styled(DSButton).withConfig({
-  componentId: "sc-dazbzt-3"
+  componentId: "sc-dazbzt-2"
 })(["padding:0 ", ";align-items:center;"], props => props.theme.space.xxs);
-const StyledSelectedItems = /*#__PURE__*/styled.div.withConfig({
+const StyledGeneralSelectionButton = /*#__PURE__*/styled(DSButton).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(StyledGeneralSelectionButton).withConfig({
   componentId: "sc-dazbzt-4"
+})(["&:hover:not([disabled]){background-color:transparent;color:", ";}"], props => props.theme.colors.brand['700']);
+const StyledShowAllButton = /*#__PURE__*/styled(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.div.withConfig({
+  componentId: "sc-dazbzt-6"
 })(["display:flex;align-items:center;"]);
+const StyledNoOptionsSelected = /*#__PURE__*/styled.div.withConfig({
+  componentId: "sc-dazbzt-7"
+})(["padding:0 ", ";"], props => props.theme.space.xxs);
 
-export { ActionButtons, StyledButton, StyledHeaderListWrapper, StyledSelectedItems, StyledSeparator };
+export { StyledButton, StyledButtonSelection, StyledHeaderListWrapper, StyledNoOptionsSelected, StyledSelectedItems, StyledSeparator, StyledShowAllButton };

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

@@ -0,0 +1,69 @@
+import { useContext, useCallback, useEffect, useMemo } from 'react';
+import { ComboBoxContext } from '../../ComboBoxCTX.js';
+
+const useHeaderListHandlers = () => {
+  const {
+    props: {
+      onSelectAll,
+      onFilter,
+      onClearAll,
+      selectedValues
+    },
+    inputRef,
+    showSelectedOptions,
+    setShowSelectedOptions,
+    setShowPopover
+  } = useContext(ComboBoxContext);
+  const multiSelectedValues = selectedValues;
+  const handleOnBlurSelectAll = useCallback(e => {
+    if (!onClearAll || multiSelectedValues.length === 0) {
+      e.preventDefault();
+      inputRef.current.focus();
+    }
+  }, [inputRef, onClearAll, multiSelectedValues]);
+  const handleOnBlurClearAll = 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 = useCallback(() => {
+    onSelectAll();
+    inputRef.current.focus();
+  }, [onSelectAll, inputRef, setShowPopover]);
+  const handleClickOnClearAll = useCallback(e => {
+    setShowSelectedOptions(false);
+    e.preventDefault();
+    e.stopPropagation();
+    onClearAll();
+    inputRef.current.focus();
+  }, [inputRef, setShowSelectedOptions, onClearAll]);
+  const handleOnMouseDown = useCallback(e => {
+    e.preventDefault();
+  }, []);
+  const handleToggle = useCallback(() => {
+    inputRef.current.value = '';
+    onFilter('');
+    setShowSelectedOptions(!showSelectedOptions);
+    inputRef.current.focus();
+  }, [setShowSelectedOptions, inputRef, onFilter, showSelectedOptions]);
+  const handleKeyDown = useCallback(e => {
+    if (e.key === 'Escape') {
+      setShowPopover(false);
+    }
+  }, [setShowPopover]);
+  useEffect(() => {
+    if (multiSelectedValues.length === 0) {
+      setShowSelectedOptions(false);
+    }
+  }, [multiSelectedValues, setShowSelectedOptions]);
+  return useMemo(() => ({
+    handleKeyDown,
+    handleToggle,
+    handleOnMouseDown,
+    handleClickOnClearAll,
+    handleClickOnSelectAll,
+    handleOnBlurClearAll,
+    handleOnBlurSelectAll
+  }), [handleKeyDown, handleToggle, handleOnMouseDown, handleClickOnClearAll, handleClickOnSelectAll, handleOnBlurClearAll, handleOnBlurSelectAll]);
+};
+
+export { useHeaderListHandlers };

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

@@ -1,20 +1,22 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import { useContext, useCallback } from 'react';
-import { getOptions } from '../../utils/listHelper.js';
-import { StyledListWrapper, StyledList } from './styled.js';
+import { useContext, useMemo, useCallback } from 'react';
+import { StyledListWrapper, StyledVirtualListWrapper, StyledList } from './styled.js';
 import { ComboboxDataTestid } from '../../ComboboxDataTestids.js';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { HeaderList } from '../header-list/HeaderList.js';
 import { useOnElementResize } from '../../utils/hooks/useOnElementResize.js';
 import { EmptyState } from '../empty-state/index.js';
+import { useItemRenderer } from './useItemRenderer.js';
 import { useMenuList } from './useMenuList.js';
-import { jsxs } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 
 var _HeaderList, _EmptyState;
 
 const MenuList = () => {
   const {
     props: {
+      menuMinWidth,
+      menuMaxHeight,
       inline,
       options,
       selectedValues
@@ -23,36 +25,48 @@ const MenuList = () => {
     inputRef,
     listRef,
     showPopover,
+    wrapperListRef,
     controlsWrapperRef,
     virtualListHelpers: {
       totalSize
     }
   } = useContext(ComboBoxContext);
   const multiple = Array.isArray(selectedValues);
-  const {
-    ItemRenderer
-  } = useMenuList();
+  const withHeader = !inline && multiple && options.length > 0;
+  const ItemRenderer = useItemRenderer();
+  useMenuList();
   useOnElementResize(controlsWrapperRef);
-  const listWidth = inline ? '100%' : "".concat(referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth, "px");
-  const selectableOptions = getOptions(options);
-  const handleOnClick = useCallback(() => {
-    inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.focus();
+  const listWidth = useMemo(() => menuMinWidth || "".concat(referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth), [menuMinWidth, referenceElement]);
+  const handleOnFocus = useCallback(() => {
+    var _inputRef$current;
+
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
   }, [inputRef]);
   return /*#__PURE__*/jsxs(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(HeaderList, {}))), selectableOptions.length > 0 ? /*#__PURE__*/_jsx(StyledList, {
+    children: [withHeader && (_HeaderList || (_HeaderList = /*#__PURE__*/_jsx(HeaderList, {}))), options.length > 0 ? /*#__PURE__*/jsx(StyledVirtualListWrapper, {
       tabIndex: -1,
-      "aria-expanded": showPopover,
-      onFocus: handleOnClick,
-      "data-testid": ComboboxDataTestid.LIST,
-      style: {
-        height: totalSize
-      }
-    }, void 0, ItemRenderer) : _EmptyState || (_EmptyState = /*#__PURE__*/_jsx(EmptyState, {}))]
+      inline: inline,
+      maxHeight: menuMaxHeight,
+      ref: listRef,
+      withHeader: withHeader,
+      children: /*#__PURE__*/_jsx(StyledList, {
+        tabIndex: -1,
+        "aria-expanded": showPopover,
+        onFocus: handleOnFocus,
+        "data-testid": ComboboxDataTestid.LIST,
+        style: {
+          height: totalSize,
+          margin: inline ? '0px' : '8px 0px'
+        }
+      }, void 0, ItemRenderer)
+    }) : _EmptyState || (_EmptyState = /*#__PURE__*/_jsx(EmptyState, {}))]
   });
 };
 

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

@@ -2,9 +2,23 @@ import styled from 'styled-components';
 
 const StyledListWrapper = /*#__PURE__*/styled.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.ul.withConfig({
   componentId: "sc-1uedyf-1"
-})(["position:relative;padding:0;margin:0;"]);
+})(["position:relative;padding:0;"]);
+const StyledVirtualListWrapper = /*#__PURE__*/styled.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");
+});
 
-export { StyledList, StyledListWrapper };
+export { StyledList, StyledListWrapper, StyledVirtualListWrapper };