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

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]).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,13 @@ const useKeyboardNavigation = () => {
       options,
       selectedValues,
       onFilter,
-      withoutPortal
+      withoutPortal,
+      innerRef
     },
     setShowPopover,
     showPopover,
     setShowSelectedValue,
     focusOptionIdx,
-    inputRef,
     setCurrentOption,
     scrollOptionIntoView,
     selectAllCheckboxRef,
@@ -40,16 +40,17 @@ 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 = '';
+      if (innerRef.current) innerRef.current.value = '';
       setShowSelectedValue(true);
     }
 
-    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, setShowSelectedValue, onChange]);
   const onInputKeyDown = React.useCallback(e => {
     const targetElement = e.target; // =============================================================================
     // CUSTOM KEYS
@@ -62,7 +63,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 +72,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'Enter' || e.keyCode === 32 && e.altKey) {
       e.preventDefault();
+      e.stopPropagation();
 
       if (!showPopover && !inline) {
         setShowPopover(true);
@@ -92,6 +94,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'ArrowDown') {
       e.preventDefault();
+      e.stopPropagation();
 
       if (showPopover || inline) {
         const nextItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable);
@@ -104,6 +107,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'ArrowUp') {
       e.preventDefault();
+      e.stopPropagation();
 
       if (showPopover || inline) {
         const nextItemIndex = listHelper.findInCircularList(options, currentItemIndex, isOptionFocuseable, -1);
@@ -123,13 +127,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);
@@ -158,10 +162,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, setShowSelectedValue, 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/esm/controlled-combobox/ComboBox.js

@@ -1,17 +1,14 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
 import 'react';
-import { describe } from 'react-desc';
-import { useMemoMergePropsWithDefault, useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
+import { describe } from '@elliemae/ds-props-helpers';
 import { useComboBox } from './config/useComboBox.js';
 import { Container } from './parts/container/Container.js';
-import { propTypes } from './propTypes.js';
-import { defaultProps, ComboBoxContext } from './ComboBoxCTX.js';
+import { ComboBoxContext } from './ComboBoxCTX.js';
+import { ComboboxPropTypes } from './react-desc-prop-types.js';
 
 var _Container;
 
 const DSComboBox = props => {
-  const propsWithDefault = useMemoMergePropsWithDefault(props, defaultProps);
-  useValidateTypescriptPropTypes(propsWithDefault, propTypes);
   const ctx = useComboBox(props);
   return /*#__PURE__*/_jsx(ComboBoxContext.Provider, {
     value: ctx
@@ -19,6 +16,6 @@ const DSComboBox = props => {
 };
 
 const DSComboBoxWithSchema = describe(DSComboBox);
-DSComboBoxWithSchema.propTypes = propTypes;
+DSComboBoxWithSchema.propTypes = ComboboxPropTypes;
 
 export { DSComboBox, DSComboBoxWithSchema };

package/esm/controlled-combobox/ComboBoxCTX.js

@@ -1,4 +1,4 @@
-import { createContext, createRef } from 'react';
+import { createRef, createContext } from 'react';
 import { noop } from 'lodash';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -14,13 +14,14 @@ const defaultProps = {
   onClearAll: noop,
   onSelectAll: noop,
   onCreate: noop,
-  withToggle: false,
+  onBlur: noop,
   withoutPortal: true,
   zIndex: 10,
   onChange: noop,
   onKeyDown: noop,
   onFilter: noop,
-  onMenuOpen: noop
+  onMenuOpen: noop,
+  innerRef: /*#__PURE__*/createRef()
 };
 const defaultContext = {
   props: defaultProps,
@@ -32,7 +33,6 @@ const defaultContext = {
   setHasFocus: noop,
   pillGroupRef: /*#__PURE__*/createRef(),
   setReferenceElement: noop,
-  inputRef: /*#__PURE__*/createRef(),
   listRef: /*#__PURE__*/createRef(),
   wrapperListRef: /*#__PURE__*/createRef(),
   controlsWrapperRef: /*#__PURE__*/createRef(),

package/esm/controlled-combobox/ComboboxDataTestids.js

@@ -7,7 +7,8 @@ const ComboboxDataTestid = {
   DROPDOWN: 'combobox-dropdown-btn',
   OPTION: 'combobox-option',
   SELECT_ALL_CHECKBOX: 'combobox-select-all-checkbox',
-  SHOW_SELECTED_OPTIONS_TOGGLE: 'combobox-selected-options-toggle'
+  SHOW_SELECTED_OPTIONS_TOGGLE: 'combobox-selected-options-toggle',
+  ALLY_SELECTED_VALUES: 'combobox-ally-selected-values'
 };
 
 export { ComboboxDataTestid };

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

@@ -1,93 +1,40 @@
-import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
-import 'core-js/modules/web.dom-collections.iterator.js';
-import 'core-js/modules/esnext.async-iterator.for-each.js';
-import 'core-js/modules/esnext.iterator.constructor.js';
-import 'core-js/modules/esnext.iterator.for-each.js';
-import 'core-js/modules/esnext.async-iterator.find.js';
-import 'core-js/modules/esnext.iterator.find.js';
 import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
 import 'core-js/modules/esnext.iterator.filter.js';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import 'core-js/modules/web.dom-collections.iterator.js';
 import { useState, useRef, useCallback, useMemo } from 'react';
-import { noop } from 'lodash';
-import { v4 } from 'uuid';
 import { useVirtual } from 'react-virtual';
-import { useGetComboBoxWithDefaultsProps } from './useGetPropsWithDefault.js';
+import { useMemoMergePropsWithDefault, useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
+import { defaultProps } from '../ComboBoxCTX.js';
+import { ComboboxPropTypes } from '../react-desc-prop-types.js';
+import { useCorrectOptions } from './useCorrectOptions.js';
 
 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(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 = useMemoMergePropsWithDefault(props, defaultProps);
+  useValidateTypescriptPropTypes(propsWithDefaults, ComboboxPropTypes);
   const [showPopover, setShowPopover] = useState(false);
   const [referenceElement, setReferenceElement] = useState(null);
   const [showSelectedValue, setShowSelectedValue] = useState(false);
   const [showSelectedOptions, setShowSelectedOptions] = useState(false);
   const [hasFocus, setHasFocus] = useState(false);
   const [focusOptionIdx, setCurrentOption] = useState('');
-  const inputRef = useRef(null);
   const listRef = useRef(null);
   const wrapperListRef = useRef(null);
   const selectedOptionsRef = useRef(null);
   const controlsWrapperRef = useRef(null);
   const selectAllCheckboxRef = useRef(null);
   const toggleSelectionButtonRef = useRef(null);
-  const pillGroupRef = useRef(null);
-  const propsWithDefaults = useGetComboBoxWithDefaultsProps(props);
-  const {
-    options,
-    selectedValues,
-    onCreate
-  } = propsWithDefaults; // ---------------------------------------------------------------------------
+  const pillGroupRef = useRef(null); // ---------------------------------------------------------------------------
   // Menu Options with/out selected filter
   // ---------------------------------------------------------------------------
 
-  const selectedValuesWithSections = useCallback(() => {
-    var _items2;
-
-    const multiSelectedValue = selectedValues;
-    const items = [];
-    options.forEach(option => {
-      const isSelectedValue = multiSelectedValue.find(item => item.dsId === option.dsId);
-
-      if (isSelectedValue) {
-        items.push(option);
-      }
-
-      if (option.type === 'section') {
-        var _items;
-
-        if (((_items = items[items.length - 1]) === null || _items === void 0 ? void 0 : _items.type) === 'section') {
-          items[items.length - 1] = option;
-        } else {
-          items.push(option);
-        }
-      }
-    });
-
-    if (((_items2 = items[items.length - 1]) === null || _items2 === void 0 ? void 0 : _items2.type) === 'section') {
-      items.pop();
-    }
-
-    return items;
-  }, [options, selectedValues]);
-  const correctOptions = useMemo(() => {
-    if (showSelectedOptions && Array.isArray(selectedValues) && selectedValues.length > 0) {
-      return selectedValuesWithSections();
-    }
-
-    if (onCreate !== noop && inputRef.current && inputRef.current.value !== '') {
-      var _inputRef$current;
-
-      const creatableUuid = v4();
-      const creatableItem = {
-        dsId: "creatable-".concat(creatableUuid),
-        label: (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value,
-        type: 'creatable'
-      };
-      return [creatableItem, ...options];
-    }
-
-    return options;
-  }, [options, onCreate, selectedValuesWithSections, selectedValues, showSelectedOptions]); // ===========================================================================
+  const correctOptions = useCorrectOptions(propsWithDefaults, showSelectedOptions); // ===========================================================================
   // Virtualization setup
   // ===========================================================================
 
@@ -100,11 +47,10 @@ const useComboBox = props => {
   // Scroll into view function
   // ===========================================================================
 
-  const scrollOptionIntoView = useCallback(function (dsId) {
-    let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+  const scrollOptionIntoView = useCallback(dsId => {
+    virtualListHelpers.scrollToIndex(correctOptions.findIndex(opt => opt.dsId === dsId), {
       align: 'center'
-    };
-    virtualListHelpers.scrollToIndex(correctOptions.findIndex(opt => opt.dsId === dsId), opts);
+    });
   }, [correctOptions, virtualListHelpers]);
   const ctx = useMemo(() => ({
     props: _objectSpread(_objectSpread({}, propsWithDefaults), {}, {
@@ -113,7 +59,6 @@ const useComboBox = props => {
     virtualListHelpers,
     showPopover,
     referenceElement,
-    inputRef,
     showSelectedValue,
     listRef,
     focusOptionIdx,
@@ -132,7 +77,7 @@ const useComboBox = props => {
     setShowSelectedValue,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, correctOptions, propsWithDefaults, virtualListHelpers, focusOptionIdx, showSelectedValue, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, inputRef, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, hasFocus, listRef]);
+  }), [scrollOptionIntoView, correctOptions, propsWithDefaults, virtualListHelpers, focusOptionIdx, showSelectedValue, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, hasFocus, listRef]);
   return ctx;
 };
 

package/esm/controlled-combobox/config/useCorrectOptions.js

@@ -0,0 +1,73 @@
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
+import 'core-js/modules/esnext.async-iterator.find.js';
+import 'core-js/modules/esnext.iterator.find.js';
+import 'core-js/modules/web.dom-collections.iterator.js';
+import { useCallback, useMemo } from 'react';
+import { v4 } from 'uuid';
+import { noop } from 'lodash';
+
+const useCorrectOptions = (propsWithDefaults, showSelectedOptions) => {
+  const {
+    options,
+    selectedValues,
+    onCreate,
+    innerRef
+  } = propsWithDefaults;
+  const selectedValuesWithSections = useCallback(() => {
+    var _items2;
+
+    const multiSelectedValue = selectedValues;
+    const items = [];
+    options.forEach(option => {
+      const isSelectedValue = multiSelectedValue.find(item => item.dsId === option.dsId);
+
+      if (isSelectedValue) {
+        items.push(option);
+      }
+
+      if (option.type === 'section') {
+        var _items;
+
+        if (((_items = items[items.length - 1]) === null || _items === void 0 ? void 0 : _items.type) === 'section') {
+          items[items.length - 1] = option;
+        } else {
+          items.push(option);
+        }
+      }
+    });
+
+    if (((_items2 = items[items.length - 1]) === null || _items2 === void 0 ? void 0 : _items2.type) === 'section') {
+      items.pop();
+    }
+
+    return items;
+  }, [options, selectedValues]);
+  const correctOptions = useMemo(() => {
+    if (showSelectedOptions && Array.isArray(selectedValues) && selectedValues.length > 0) {
+      return selectedValuesWithSections();
+    }
+
+    if (onCreate !== noop && innerRef.current && innerRef.current.value !== '' && options.findIndex(option => {
+      var _innerRef$current;
+
+      return option.type === 'option' && option.label === (innerRef === null || innerRef === void 0 ? void 0 : (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value);
+    }) === -1) {
+      var _innerRef$current2;
+
+      const creatableUuid = v4();
+      const creatableItem = {
+        dsId: "creatable-".concat(creatableUuid),
+        label: (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.value,
+        type: 'creatable'
+      };
+      return [creatableItem, ...options];
+    }
+
+    return options;
+  }, [options, onCreate, innerRef, selectedValuesWithSections, selectedValues, showSelectedOptions]);
+  return correctOptions;
+};
+
+export { useCorrectOptions };

package/esm/controlled-combobox/parts/a11y-messages/FocusMenuItem.js

@@ -0,0 +1,38 @@
+import _jsx from '@babel/runtime/helpers/esm/jsx';
+import 'core-js/modules/esnext.async-iterator.find.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.find.js';
+import { useContext, useMemo } from 'react';
+import { ComboBoxContext } from '../../ComboBoxCTX.js';
+import { StyledA11ySelectedValues } from './styled.js';
+import { getSelectableOptions } from '../../utils/listHelper.js';
+import { jsx, Fragment } from 'react/jsx-runtime';
+
+const FocusMenuItem = () => {
+  const {
+    props: {
+      options
+    },
+    focusOptionIdx,
+    showPopover
+  } = useContext(ComboBoxContext);
+  const selectabledOptions = getSelectableOptions(options);
+  const focusOption = options.find(option => option.dsId === focusOptionIdx);
+  const focusSelectableOptionIdx = selectabledOptions.findIndex(option => option.dsId === focusOptionIdx);
+  const msg = useMemo(() => {
+    if (showPopover) {
+      return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
+        "aria-live": "polite",
+        "aria-atomic": "false",
+        "aria-relevant": "additions text"
+      }, void 0, "option ".concat(focusOption === null || focusOption === void 0 ? void 0 : focusOption.label, " focused.").concat(focusSelectableOptionIdx + 1, " of ").concat(selectabledOptions.length, " "));
+    }
+
+    return /*#__PURE__*/jsx(Fragment, {});
+  }, [showPopover, focusOption, focusSelectableOptionIdx, selectabledOptions]);
+  return /*#__PURE__*/jsx(Fragment, {
+    children: msg
+  });
+};
+
+export { FocusMenuItem };

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

@@ -0,0 +1,34 @@
+import _jsx from '@babel/runtime/helpers/esm/jsx';
+import 'core-js/modules/esnext.async-iterator.map.js';
+import 'core-js/modules/esnext.iterator.map.js';
+import { useContext, useMemo } from 'react';
+import { ComboBoxContext } from '../../ComboBoxCTX.js';
+import { StyledA11ySelectedValues } from './styled.js';
+import { ComboboxDataTestid } from '../../ComboboxDataTestids.js';
+
+const SelectedValuesAllyMsg = () => {
+  const {
+    props: {
+      selectedValues
+    }
+  } = useContext(ComboBoxContext);
+  const msg = useMemo(() => {
+    if (Array.isArray(selectedValues)) {
+      return "Options selected: ".concat(selectedValues.map(item => item.label).join(', '));
+    }
+
+    if (selectedValues) {
+      return "Option selected: ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.label);
+    }
+
+    return '';
+  }, [selectedValues]);
+  return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
+    "data-testid": ComboboxDataTestid.ALLY_SELECTED_VALUES,
+    "aria-live": "polite",
+    "aria-atomic": "false",
+    "aria-relevant": "additions text"
+  }, void 0, msg);
+};
+
+export { SelectedValuesAllyMsg };

package/esm/controlled-combobox/parts/a11y-messages/index.js

@@ -1,2 +1,2 @@
-export { MultiAllyMessages } from './MultiAllyMessages.js';
-export { SingleAllyMessages } from './SingleAllyMessages.js';
+export { SelectedValuesAllyMsg } from './SelectedValuesAllyMsg.js';
+export { FocusMenuItem } from './FocusMenuItem.js';

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

@@ -1,5 +1,13 @@
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.filter.js';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import _jsx from '@babel/runtime/helpers/esm/jsx';
+import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutProperties';
 import { useContext, useCallback } from 'react';
+import { useGetGlobalAttributes } from '@elliemae/ds-props-helpers';
 import { DSPopperJS } from '@elliemae/ds-popperjs';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { StyledPopperWrapper, StyledContainerInline, StyledContainerWithPopper } from './styled.js';
@@ -9,38 +17,53 @@ import { jsxs, Fragment } from 'react/jsx-runtime';
 
 var _Controls, _MenuList, _MenuList2;
 
+const _excluded = ["placeholder", "onKeyDown", "onChange"];
+
+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(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 Container = () => {
   const {
-    props: {
-      inline,
-      startPlacementPreference,
-      placementOrderPreference,
-      withoutPortal,
-      zIndex
-    },
+    props,
     showPopover,
-    inputRef,
+    innerRef,
     setReferenceElement,
     setShowPopover,
     referenceElement
   } = useContext(ComboBoxContext);
+  const {
+    inline,
+    disabled,
+    startPlacementPreference,
+    placementOrderPreference,
+    withoutPortal,
+    zIndex
+  } = props;
   const handleCloseMenu = useCallback(() => {
     setShowPopover(false);
-    if (inputRef.current) inputRef.current.blur();
-  }, [inputRef, setShowPopover]);
+    if (innerRef.current) innerRef.current.blur();
+  }, [innerRef, setShowPopover]);
   const handleMouseDown = useCallback(e => {
     e.preventDefault();
   }, []);
   const handleOnClickContainer = useCallback(() => {
-    setShowPopover(!showPopover);
-  }, [setShowPopover, showPopover]);
+    if (!disabled) setShowPopover(!showPopover);
+  }, [setShowPopover, disabled, showPopover]);
   const StyledContainer = inline ? StyledContainerInline : StyledContainerWithPopper;
+  const globalAttributes = useGetGlobalAttributes(props, {
+    onClick: handleOnClickContainer
+  }); // Removing possible collisionable props
+
+  const rest = _objectWithoutProperties(globalAttributes, _excluded);
+
   return /*#__PURE__*/jsxs(Fragment, {
-    children: [/*#__PURE__*/jsxs(StyledContainer, {
+    children: [/*#__PURE__*/jsxs(StyledContainer, _objectSpread(_objectSpread({
       ref: setReferenceElement,
-      onClick: handleOnClickContainer,
+      onClick: handleOnClickContainer
+    }, rest), {}, {
       children: [_Controls || (_Controls = /*#__PURE__*/_jsx(Controls, {})), inline ? _MenuList || (_MenuList = /*#__PURE__*/_jsx(MenuList, {})) : null]
-    }), !inline ? /*#__PURE__*/_jsx(DSPopperJS, {
+    })), !inline ? /*#__PURE__*/_jsx(DSPopperJS, {
       customOffset: [0, 5],
       closeContextMenu: handleCloseMenu,
       referenceElement: referenceElement,

package/esm/controlled-combobox/parts/container/styled.js

@@ -1,13 +1,16 @@
 import styled from 'styled-components';
 
-const StyledContainerWithPopper = /*#__PURE__*/styled.div.withConfig({
+const StyledGenericContainer = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-16uoof1-0"
-})(["width:100%;height:28px;position:relative;"]);
-const StyledContainerInline = /*#__PURE__*/styled.div.withConfig({
+})(["position:relative;"]);
+const StyledContainerWithPopper = /*#__PURE__*/styled(StyledGenericContainer).withConfig({
   componentId: "sc-16uoof1-1"
-})(["width:100%;position:relative;"]);
-const StyledPopperWrapper = /*#__PURE__*/styled.div.withConfig({
+})(["width:100%;height:28px;"]);
+const StyledContainerInline = /*#__PURE__*/styled(StyledGenericContainer).withConfig({
   componentId: "sc-16uoof1-2"
-})(["background:#fff;overflow:auto;position:relative;"]);
+})(["width:100%;"]);
+const StyledPopperWrapper = /*#__PURE__*/styled(StyledGenericContainer).withConfig({
+  componentId: "sc-16uoof1-3"
+})(["overflow:auto;"]);
 
 export { StyledContainerInline, StyledContainerWithPopper, StyledPopperWrapper };