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

package/cjs/controlled-autocomplete/parts/controls/styled.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');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,7 +20,7 @@ const focusBorder = dsSystem.css(_templateObject2 || (_templateObject2 = _tagged
   } = _ref;
   return theme.colors.brand[700];
 });
-const StyledControlsWrapper = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledControlsWrapper = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-xlhlqm-0"
 })(["background:transparent;position:relative;border-radius:2px;min-width:", ";align-items:center;align-content:center;height:28px;padding-left:8px;::after{display:block;content:' ';position:absolute;top:0;left:0;right:0;bottom:0;border-radius:2px;", " pointer-events:none;z-index:7;}:focus-within{::after{", "}}"], _ref2 => {
   let {

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
 var dsCircularProgressIndicator = require('@elliemae/ds-circular-progress-indicator');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var styled = require('./styled.js');
 var AutocompleteDataTestids = require('../../AutocompleteDataTestids.js');
 var AutocompleteCTX = require('../../AutocompleteCTX.js');
@@ -57,7 +57,7 @@ const MenuList = () => {
     minWidth: listWidth,
     id: "combo-listbox",
     role: "listbox",
-    children: isLoading && ((_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.value) !== '' ? /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+    children: isLoading && ((_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.value) !== '' ? /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
       justifyContent: "center",
       alignItems: "center",
       style: {

package/cjs/controlled-checkbox/ControlledCheckbox.js

@@ -2,75 +2,85 @@
 
 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 _jsx = require('@babel/runtime/helpers/jsx');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var React = require('react');
-var reactDesc = require('react-desc');
+var dsPropsHelpers = require('@elliemae/ds-props-helpers');
 var dsTruncatedTooltipText = require('@elliemae/ds-truncated-tooltip-text');
-var propTypes = require('./propTypes.js');
 var styles = require('./styles.js');
-var useValidateProps = require('./config/useValidateProps.js');
+var reactDescPropTypes = require('./react-desc-prop-types.js');
 var setMultipleRefs = require('./utils/setMultipleRefs.js');
+var useValidateProps = require('./config/useValidateProps.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 _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
+
+const _excluded = ["id", "disabled", "readOnly", "label", "aria-label", "aria-controls", "onKeyDown"];
+
+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 DSControlledCheckbox = props => {
-  useValidateProps.useValidateProps(props, propTypes.propTypes);
-  const checkboxRef = React.useRef();
+  const propsWithDefault = dsPropsHelpers.useMemoMergePropsWithDefault(props, reactDescPropTypes.defaultProps);
+  useValidateProps.useValidateProps(props, reactDescPropTypes.propTypes);
+  const checkboxRef = React.useRef(null);
   const {
-    autoFocus,
     checked,
-    ariaControls,
-    ariaLabel,
-    disabled,
-    id,
     label,
     hasError,
-    onChange,
-    onFocus,
-    onBlur,
-    value,
-    readOnly,
-    name,
     innerRef,
-    tabIndex
-  } = props;
+    tabIndex,
+    ariaLabel: legacyAriaLabel,
+    ariaControls: legacyAriaControls
+  } = propsWithDefault;
   const handleOnKeyDown = React.useCallback(e => {
     if (checkboxRef.current && e.key === 'Enter') {
       checkboxRef.current.click();
     }
   }, []);
+
+  const _useGetGlobalAttribut = dsPropsHelpers.useGetGlobalAttributes(propsWithDefault, {
+    onKeyDown: handleOnKeyDown
+  }),
+        {
+    id,
+    disabled,
+    readOnly,
+    label: globalLabel,
+    'aria-label': ariaLabel,
+    'aria-controls': ariaControls,
+    onKeyDown
+  } = _useGetGlobalAttribut,
+        restGlobals = _objectWithoutProperties__default["default"](_useGetGlobalAttribut, _excluded);
+
   return /*#__PURE__*/_jsx__default["default"](styles.StyledContainer, {
     "data-testid": "ds-checkbox-container"
   }, void 0, /*#__PURE__*/_jsx__default["default"](styles.StyledCheckBox, {
-    checked: props.checked,
+    checked: checked,
     hasError: hasError,
     disabled: disabled,
     readOnly: readOnly
-  }, void 0, /*#__PURE__*/jsxRuntime.jsx(styles.StyledInput, {
-    disabled: disabled,
+  }, void 0, /*#__PURE__*/jsxRuntime.jsx(styles.StyledInput, _objectSpread(_objectSpread({}, restGlobals), {}, {
+    id: id,
     ref: ref => setMultipleRefs.setMultipleRefs([checkboxRef, innerRef])(ref),
     onKeyDown: handleOnKeyDown,
     type: "checkbox",
     checked: checked !== 'mixed' ? checked : undefined,
-    "aria-controls": ariaControls,
-    "aria-checked": checked,
-    "aria-disabled": disabled,
-    "aria-invalid": hasError,
-    "aria-readonly": readOnly,
-    "aria-label": ariaLabel || label,
-    onFocus: onFocus,
-    onBlur: onBlur,
-    name: name,
-    value: value,
-    onChange: onChange,
-    id: id,
-    "data-testid": "ds-checkbox",
-    autoFocus: autoFocus,
-    tabIndex: tabIndex || 0
-  })), label && /*#__PURE__*/_jsx__default["default"](styles.StyledLabel, {
+    "aria-label": ariaLabel || legacyAriaLabel || label,
+    "aria-controls": ariaControls || legacyAriaControls,
+    tabIndex: tabIndex
+  }))), label && /*#__PURE__*/_jsx__default["default"](styles.StyledLabel, {
     htmlFor: id,
     disabled: disabled,
     readOnly: readOnly,
@@ -81,8 +91,8 @@ const DSControlledCheckbox = props => {
   })));
 };
 
-const DSControlledCheckboxWithSchema = reactDesc.describe(DSControlledCheckbox);
-DSControlledCheckboxWithSchema.propTypes = propTypes.propTypes;
+const DSControlledCheckboxWithSchema = dsPropsHelpers.describe(DSControlledCheckbox);
+DSControlledCheckboxWithSchema.propTypes = reactDescPropTypes.propTypes;
 
 exports.DSControlledCheckbox = DSControlledCheckbox;
 exports.DSControlledCheckboxWithSchema = DSControlledCheckboxWithSchema;

package/cjs/controlled-checkbox/config/useValidateProps.js

@@ -11,11 +11,11 @@ const throwError = message => {
 const useValidateProps = (props, propTypes) => {
   dsPropsHelpers.useValidateTypescriptPropTypes(props, propTypes);
 
-  if (typeof props.label === 'undefined' && typeof props.ariaLabel === 'undefined') {
+  if (typeof props.label === 'undefined' && typeof props['aria-label'] === 'undefined') {
     throwError("Please provide a label or ariaLabel property to use this component.");
   }
 
-  if (props.checked === 'mixed' && typeof props.ariaControls === 'undefined') {
+  if (props.checked === 'mixed' && typeof props['aria-controls'] === 'undefined') {
     throwError("Please provide an ariaControls property to use a checkbox mixed state. \n      This property must be a string containing all the ids that this mixed checkbox is controlling.");
   }
 };

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

@@ -0,0 +1,32 @@
+'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 defaultProps = {
+  hasError: false,
+  tabIndex: undefined,
+  checked: false
+};
+const propTypes = _objectSpread(_objectSpread({}, dsPropsHelpers.globalAttributesPropTypes), {}, {
+  label: dsPropsHelpers.PropTypes.string.description('Checkbox Label property. This label is also going to be used as an aria-label for screen readers.'),
+  hasError: dsPropsHelpers.PropTypes.bool.description('Whether the checkbox has error or not.'),
+  innerRef: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.func, dsPropsHelpers.PropTypes.object]).description('Checkbox input ref.')
+});
+
+exports.defaultProps = defaultProps;
+exports.propTypes = propTypes;

package/cjs/controlled-checkbox/utils/styleHelpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 /* eslint-disable max-params */
-const handleCheckMarkColor = (_ref, disabled, readOnly, hasError, checked, isHovering) => {
+const handleCheckMarkColor = (_ref, checked, isHovering, disabled, readOnly, hasError) => {
   let {
     colors
   } = _ref;
@@ -26,14 +26,14 @@ const handleCheckmark = function (theme, checked, disabled, readOnly, hasError)
   let isHovering = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
 
   if (checked === 'mixed') {
-    return "&:before {\n      position: absolute;\n    content: '';\n    top: 6px;\n    left: 3px;\n    background: ".concat(handleCheckMarkColor(theme, disabled, readOnly, hasError, checked, isHovering), ";\n    width: ").concat(theme.space.xxs, ";\n    height: 2px;\n    }");
+    return "&:before {\n      position: absolute;\n    content: '';\n    top: 6px;\n    left: 3px;\n    background: ".concat(handleCheckMarkColor(theme, checked, isHovering, disabled, readOnly, hasError), ";\n    width: ").concat(theme.space.xxs, ";\n    height: 2px;\n    }");
   }
 
   if (checked) {
-    return "&:before {\n      position: absolute;\n      content: '';\n          top: 3px;\n          left: 2px;\n          border-left: 2px solid ".concat(handleCheckMarkColor(theme, disabled, readOnly, hasError, checked, isHovering), ";\n          border-bottom: 2px solid ").concat(handleCheckMarkColor(theme, disabled, readOnly, hasError, checked, isHovering), ";\n          height: 5px;\n          width: 10px;\n          transform: rotate(-45deg);\n    }");
+    return "&:before {\n      position: absolute;\n      content: '';\n          top: 3px;\n          left: 2px;\n          border-left: 2px solid ".concat(handleCheckMarkColor(theme, checked, isHovering, disabled, readOnly, hasError), ";\n          border-bottom: 2px solid ").concat(handleCheckMarkColor(theme, checked, isHovering, disabled, readOnly, hasError), ";\n          height: 5px;\n          width: 10px;\n          transform: rotate(-45deg);\n    }");
   }
 
-  return undefined;
+  return '';
 };
 const handleBackgroundColor = (_ref2, disabled) => {
   let {

package/cjs/controlled-combobox/ComboBoxCTX.js

@@ -24,8 +24,7 @@ const defaultProps = {
   onChange: lodash.noop,
   onKeyDown: lodash.noop,
   onFilter: lodash.noop,
-  onMenuOpen: lodash.noop,
-  innerRef: /*#__PURE__*/React.createRef()
+  onMenuOpen: lodash.noop
 };
 const defaultContext = {
   props: defaultProps,
@@ -43,8 +42,6 @@ const defaultContext = {
   selectedOptionsRef: /*#__PURE__*/React.createRef(),
   selectAllCheckboxRef: /*#__PURE__*/React.createRef(),
   toggleSelectionButtonRef: /*#__PURE__*/React.createRef(),
-  showSelectedValue: false,
-  setShowSelectedValue: lodash.noop,
   focusOptionIdx: '',
   setCurrentOption: lodash.noop,
   showSelectedOptions: false,

package/cjs/controlled-combobox/config/useComboBox.js

@@ -24,11 +24,14 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 useComboBox = props => {
-  const propsWithDefaults = dsPropsHelpers.useMemoMergePropsWithDefault(props, ComboBoxCTX.defaultProps);
+  const defaultPropsWithInnerRef = _objectSpread(_objectSpread({}, ComboBoxCTX.defaultProps), {}, {
+    innerRef: React.useRef(null)
+  });
+
+  const propsWithDefaults = dsPropsHelpers.useMemoMergePropsWithDefault(props, defaultPropsWithInnerRef);
   dsPropsHelpers.useValidateTypescriptPropTypes(propsWithDefaults, reactDescPropTypes.ComboboxPropTypes);
   const [showPopover, setShowPopover] = React.useState(false);
   const [referenceElement, setReferenceElement] = React.useState(null);
-  const [showSelectedValue, setShowSelectedValue] = React.useState(false);
   const [showSelectedOptions, setShowSelectedOptions] = React.useState(false);
   const [hasFocus, setHasFocus] = React.useState(false);
   const [focusOptionIdx, setCurrentOption] = React.useState('');
@@ -67,7 +70,6 @@ const useComboBox = props => {
     virtualListHelpers,
     showPopover,
     referenceElement,
-    showSelectedValue,
     listRef,
     focusOptionIdx,
     selectedOptionsRef,
@@ -82,10 +84,9 @@ const useComboBox = props => {
     setHasFocus,
     setCurrentOption,
     scrollOptionIntoView,
-    setShowSelectedValue,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, correctOptions, propsWithDefaults, virtualListHelpers, focusOptionIdx, showSelectedValue, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, hasFocus, listRef]);
+  }), [scrollOptionIntoView, correctOptions, propsWithDefaults, virtualListHelpers, focusOptionIdx, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, hasFocus, listRef]);
   return ctx;
 };
 

package/cjs/controlled-combobox/parts/a11y-messages/SelectedValuesAllyMsg.js

@@ -22,16 +22,21 @@ const SelectedValuesAllyMsg = () => {
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const msg = React.useMemo(() => {
     if (Array.isArray(selectedValues)) {
-      return "Options selected: ".concat(selectedValues.map(item => item.label).join(', '));
+      if (selectedValues.length > 0) {
+        return "Options selected: ".concat(selectedValues.map(item => item.label).join(', '));
+      }
+
+      return 'No Options Selected';
     }
 
     if (selectedValues) {
       return "Option selected: ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.label);
     }
 
-    return '';
+    return 'No Option Selected';
   }, [selectedValues]);
   return /*#__PURE__*/_jsx__default["default"](styled.StyledA11ySelectedValues, {
+    id: "combobox-selected-items",
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.ALLY_SELECTED_VALUES,
     "aria-live": "polite",
     "aria-atomic": "false",

package/cjs/controlled-combobox/parts/container/Container.js

@@ -37,45 +37,31 @@ const Container = () => {
   const {
     props,
     showPopover,
-    innerRef,
     setReferenceElement,
-    setShowPopover,
     referenceElement
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const {
     inline,
-    disabled,
     startPlacementPreference,
     placementOrderPreference,
     withoutPortal,
     zIndex
   } = props;
-  const handleCloseMenu = React.useCallback(() => {
-    setShowPopover(false);
-    if (innerRef.current) innerRef.current.blur();
-  }, [innerRef, setShowPopover]);
   const handleMouseDown = React.useCallback(e => {
     e.preventDefault();
   }, []);
-  const handleOnClickContainer = React.useCallback(() => {
-    if (!disabled) setShowPopover(!showPopover);
-  }, [setShowPopover, disabled, showPopover]);
   const StyledContainer = inline ? styled.StyledContainerInline : styled.StyledContainerWithPopper;
-  const globalAttributes = dsPropsHelpers.useGetGlobalAttributes(props, {
-    onClick: handleOnClickContainer
-  }); // Removing possible collisionable props
+  const globalAttributes = dsPropsHelpers.useGetGlobalAttributes(props); // Removing possible collisionable props
 
   const rest = _objectWithoutProperties__default["default"](globalAttributes, _excluded);
 
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs(StyledContainer, _objectSpread(_objectSpread({
-      ref: setReferenceElement,
-      onClick: handleOnClickContainer
+      ref: setReferenceElement
     }, rest), {}, {
       children: [_Controls || (_Controls = /*#__PURE__*/_jsx__default["default"](Controls.Controls, {})), inline ? _MenuList || (_MenuList = /*#__PURE__*/_jsx__default["default"](MenuList.MenuList, {})) : null]
     })), !inline ? /*#__PURE__*/_jsx__default["default"](dsPopperjs.DSPopperJS, {
       customOffset: [0, 5],
-      closeContextMenu: handleCloseMenu,
       referenceElement: referenceElement,
       showPopover: showPopover,
       startPlacementPreference: startPlacementPreference,

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

@@ -49,6 +49,7 @@ const Controls = () => {
       var _innerRef$current2;
 
       (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
+      setShowPopover(true);
     }
   }, [hasFocus, setShowPopover, showPopover, innerRef, inline]);
 

package/cjs/controlled-combobox/parts/controls/styled.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');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,7 +26,7 @@ const focusBorder = dsSystem.css(_templateObject2 || (_templateObject2 = _tagged
   } = _ref2;
   return theme.colors.brand[700];
 });
-const StyledControlsWrapper = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledControlsWrapper = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-z30aed-0"
 })(["background:", ";position:relative;border-radius:2px;min-width:", ";align-items:center;align-content:center;height:28px;padding-left:8px;margin:", ";&::after{display:block;content:' ';position:absolute;top:0;left:0;right:0;bottom:0;border-radius:2px;", " pointer-events:none;z-index:7;}"], _ref3 => {
   let {
@@ -54,7 +54,7 @@ const StyledControlsWrapper = /*#__PURE__*/styled__default["default"](Grid.Grid)
 const StyledSelection = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-z30aed-1"
 })(["font-size:13px;margin-right:3px;line-height:13px;display:flex;"]);
-const StyledHeaderActionsWrapper = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledHeaderActionsWrapper = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-z30aed-2"
 })(["height:100%;.em-ds-button--text:focus::after{border:none;}"]);
 const StyleDropdownIndicator = /*#__PURE__*/styled__default["default"].div.withConfig({

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

@@ -23,7 +23,8 @@ const ControlsInput = () => {
       disabled,
       innerRef
     },
-    focusOptionIdx
+    focusOptionIdx,
+    showPopover
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const {
     onInputKeyDown
@@ -46,10 +47,11 @@ const ControlsInput = () => {
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.INPUT,
     autoFocus: autoFocus,
     id: "combo-input",
-    "aria-owns": "combo-listbox",
+    "aria-controls": "combo-listbox",
     "aria-activedescendant": focusOptionIdx,
-    "aria-expanded": "false",
+    "aria-expanded": showPopover,
     "aria-haspopup": "true",
+    "aria-describedby": "combobox-selected-items",
     role: "combobox",
     disabled: disabled,
     style: {

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

@@ -21,6 +21,7 @@ const useControlsInput = () => {
     },
     setShowPopover,
     setCurrentOption,
+    showSelectedOptions,
     wrapperListRef,
     setHasFocus,
     setShowSelectedOptions
@@ -52,12 +53,13 @@ const useControlsInput = () => {
 
       if (!(wrapperListRef !== null && wrapperListRef !== void 0 && (_wrapperListRef$curre = wrapperListRef.current) !== null && _wrapperListRef$curre !== void 0 && _wrapperListRef$curre.contains(document.activeElement))) {
         setShowPopover(false);
+        if (showSelectedOptions) setShowSelectedOptions(false);
       }
 
       setCurrentOption('');
       onFilter('');
     });
-  }, [setHasFocus, setCurrentOption, wrapperListRef, onFilter, innerRef, setShowPopover]);
+  }, [setHasFocus, showSelectedOptions, setShowSelectedOptions, setCurrentOption, wrapperListRef, onFilter, innerRef, setShowPopover]);
   const handleOnFocus = React.useCallback(() => {
     setHasFocus(true);
   }, [setHasFocus]);

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

@@ -37,6 +37,7 @@ const HeaderList = () => {
   const {
     handleKeyDown,
     handleOnMouseDown,
+    handleFilterSelectionBtnOnBlur,
     handleToggle,
     checkboxStatus,
     handleSelectAllCheckboxChange
@@ -46,9 +47,9 @@ const HeaderList = () => {
     onMouseDown: handleOnMouseDown
   }, void 0, /*#__PURE__*/_jsx__default["default"](styled.StyledSelectAllCheckbox, {}, void 0, isSelectAllSupplied && isClearAllSupplied && /*#__PURE__*/_jsx__default["default"](dsControlledForm.DSControlledCheckbox, {
     checked: checkboxStatus,
-    ariaControls: checkboxStatus === 'mixed' ? multiSelectedValues.map(item => item.dsId).join(' ') : '',
+    "aria-controls": checkboxStatus === 'mixed' ? multiSelectedValues.map(item => item.dsId).join(' ') : '',
     name: "select-all-checkbox",
-    ariaLabel: "Select/Unselect All Items",
+    "aria-label": "Select/Unselect All Items",
     id: "select-all-checkbox",
     onChange: handleSelectAllCheckboxChange,
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECT_ALL_CHECKBOX,
@@ -63,13 +64,7 @@ const HeaderList = () => {
     },
     innerRef: selectAllCheckboxRef
   })), /*#__PURE__*/_jsx__default["default"](styled.StyledSelectedItems, {}, void 0, multiSelectedValues.length > 0 ? /*#__PURE__*/_jsx__default["default"](styled.StyledButtonSelection, {
-    onBlur: () => {
-      setTimeout(() => {
-        var _innerRef$current2;
-
-        return (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
-      });
-    },
+    onBlur: handleFilterSelectionBtnOnBlur,
     buttonType: "text",
     onClick: handleToggle,
     labelText: !showSelectedOptions ? "SHOW SELECTED [".concat(multiSelectedValues.length, "]") : 'SHOW ALL',

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

@@ -53,6 +53,12 @@ const useHeaderListHandlers = () => {
       setShowPopover(false);
     }
   }, [setShowPopover]);
+  const handleFilterSelectionBtnOnBlur = React.useCallback(() => {
+    var _innerRef$current;
+
+    if (showSelectedOptions) setShowSelectedOptions(false);
+    (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
+  }, [setShowSelectedOptions, showSelectedOptions, innerRef]);
   React.useEffect(() => {
     if (multiSelectedValues.length === 0) {
       setShowSelectedOptions(false);
@@ -61,10 +67,11 @@ const useHeaderListHandlers = () => {
   return React.useMemo(() => ({
     handleKeyDown,
     handleToggle,
+    handleFilterSelectionBtnOnBlur,
     handleOnMouseDown,
     handleSelectAllCheckboxChange,
     checkboxStatus
-  }), [handleKeyDown, handleToggle, handleOnMouseDown, checkboxStatus, handleSelectAllCheckboxChange]);
+  }), [handleKeyDown, handleFilterSelectionBtnOnBlur, handleToggle, handleOnMouseDown, checkboxStatus, handleSelectAllCheckboxChange]);
 };
 
 exports.useHeaderListHandlers = useHeaderListHandlers;

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,7 +18,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-var _HeaderList, _EmptyState;
+var _HeaderList, _StyledNoResultsWrapp;
 
 const MenuList = () => {
   var _innerRef$current;
@@ -40,9 +39,6 @@ const MenuList = () => {
     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 && ((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) === '';
@@ -52,12 +48,8 @@ const MenuList = () => {
     width
   } = 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]); // validate funcionality with ux
-  // const handleOnFocus = useCallback(() => {
-  //   // innerRef.current?.focus();
-  // }, [innerRef]);
-
-  return /*#__PURE__*/jsxRuntime.jsxs(styled.StyledListWrapper, {
+  [menuMinWidth, referenceElement, width]);
+  const list = React.useMemo(() => /*#__PURE__*/jsxRuntime.jsxs(styled.StyledListWrapper, {
     ref: wrapperListRef,
     inline: inline,
     onMouseDown: e => e.preventDefault(),
@@ -72,11 +64,16 @@ const MenuList = () => {
         role: "listbox",
         "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

@@ -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;