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

package/cjs/controlled-combobox/ComboBox.js

@@ -4,12 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('react');
-var reactDesc = require('react-desc');
 var dsPropsHelpers = require('@elliemae/ds-props-helpers');
 var useComboBox = require('./config/useComboBox.js');
 var Container = require('./parts/container/Container.js');
-var propTypes = require('./propTypes.js');
 var ComboBoxCTX = require('./ComboBoxCTX.js');
+var reactDescPropTypes = require('./react-desc-prop-types.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -18,16 +17,14 @@ var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var _Container;
 
 const DSComboBox = props => {
-  const propsWithDefault = dsPropsHelpers.useMemoMergePropsWithDefault(props, ComboBoxCTX.defaultProps);
-  dsPropsHelpers.useValidateTypescriptPropTypes(propsWithDefault, propTypes.propTypes);
   const ctx = useComboBox.useComboBox(props);
   return /*#__PURE__*/_jsx__default["default"](ComboBoxCTX.ComboBoxContext.Provider, {
     value: ctx
   }, void 0, _Container || (_Container = /*#__PURE__*/_jsx__default["default"](Container.Container, {})));
 };
 
-const DSComboBoxWithSchema = reactDesc.describe(DSComboBox);
-DSComboBoxWithSchema.propTypes = propTypes.propTypes;
+const DSComboBoxWithSchema = dsPropsHelpers.describe(DSComboBox);
+DSComboBoxWithSchema.propTypes = reactDescPropTypes.ComboboxPropTypes;
 
 exports.DSComboBox = DSComboBox;
 exports.DSComboBoxWithSchema = DSComboBoxWithSchema;

package/cjs/controlled-combobox/ComboBoxCTX.js

@@ -18,13 +18,14 @@ const defaultProps = {
   onClearAll: lodash.noop,
   onSelectAll: lodash.noop,
   onCreate: lodash.noop,
-  withToggle: false,
+  onBlur: lodash.noop,
   withoutPortal: true,
   zIndex: 10,
   onChange: lodash.noop,
   onKeyDown: lodash.noop,
   onFilter: lodash.noop,
-  onMenuOpen: lodash.noop
+  onMenuOpen: lodash.noop,
+  innerRef: /*#__PURE__*/React.createRef()
 };
 const defaultContext = {
   props: defaultProps,
@@ -36,7 +37,6 @@ const defaultContext = {
   setHasFocus: lodash.noop,
   pillGroupRef: /*#__PURE__*/React.createRef(),
   setReferenceElement: lodash.noop,
-  inputRef: /*#__PURE__*/React.createRef(),
   listRef: /*#__PURE__*/React.createRef(),
   wrapperListRef: /*#__PURE__*/React.createRef(),
   controlsWrapperRef: /*#__PURE__*/React.createRef(),

package/cjs/controlled-combobox/ComboboxDataTestids.js

@@ -11,7 +11,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'
 };
 
 exports.ComboboxDataTestid = ComboboxDataTestid;

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

@@ -4,18 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('core-js/modules/web.dom-collections.iterator.js');
-require('core-js/modules/esnext.async-iterator.for-each.js');
-require('core-js/modules/esnext.iterator.constructor.js');
-require('core-js/modules/esnext.iterator.for-each.js');
-require('core-js/modules/esnext.async-iterator.find.js');
-require('core-js/modules/esnext.iterator.find.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 lodash = require('lodash');
-var uuid = require('uuid');
 var reactVirtual = require('react-virtual');
-var useGetPropsWithDefault = require('./useGetPropsWithDefault.js');
+var dsPropsHelpers = require('@elliemae/ds-props-helpers');
+var ComboBoxCTX = require('../ComboBoxCTX.js');
+var reactDescPropTypes = require('../react-desc-prop-types.js');
+var useCorrectOptions = require('./useCorrectOptions.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,77 +24,25 @@ 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);
+  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('');
-  const inputRef = React.useRef(null);
   const listRef = React.useRef(null);
   const wrapperListRef = React.useRef(null);
   const selectedOptionsRef = React.useRef(null);
   const controlsWrapperRef = React.useRef(null);
   const selectAllCheckboxRef = React.useRef(null);
   const toggleSelectionButtonRef = React.useRef(null);
-  const pillGroupRef = React.useRef(null);
-  const propsWithDefaults = useGetPropsWithDefault.useGetComboBoxWithDefaultsProps(props);
-  const {
-    options,
-    selectedValues,
-    onCreate
-  } = propsWithDefaults; // ---------------------------------------------------------------------------
+  const pillGroupRef = React.useRef(null); // ---------------------------------------------------------------------------
   // Menu Options with/out selected filter
   // ---------------------------------------------------------------------------
 
-  const selectedValuesWithSections = React.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 = React.useMemo(() => {
-    if (showSelectedOptions && Array.isArray(selectedValues) && selectedValues.length > 0) {
-      return selectedValuesWithSections();
-    }
-
-    if (onCreate !== lodash.noop && inputRef.current && inputRef.current.value !== '') {
-      var _inputRef$current;
-
-      const creatableUuid = uuid.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.useCorrectOptions(propsWithDefaults, showSelectedOptions); // ===========================================================================
   // Virtualization setup
   // ===========================================================================
 
@@ -108,11 +55,10 @@ const useComboBox = props => {
   // Scroll into view function
   // ===========================================================================
 
-  const scrollOptionIntoView = React.useCallback(function (dsId) {
-    let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+  const scrollOptionIntoView = React.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 = React.useMemo(() => ({
     props: _objectSpread(_objectSpread({}, propsWithDefaults), {}, {
@@ -121,7 +67,6 @@ const useComboBox = props => {
     virtualListHelpers,
     showPopover,
     referenceElement,
-    inputRef,
     showSelectedValue,
     listRef,
     focusOptionIdx,
@@ -140,7 +85,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/cjs/controlled-combobox/config/useCorrectOptions.js

@@ -0,0 +1,77 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+require('core-js/modules/esnext.async-iterator.find.js');
+require('core-js/modules/esnext.iterator.find.js');
+require('core-js/modules/web.dom-collections.iterator.js');
+var React = require('react');
+var uuid = require('uuid');
+var lodash = require('lodash');
+
+const useCorrectOptions = (propsWithDefaults, showSelectedOptions) => {
+  const {
+    options,
+    selectedValues,
+    onCreate,
+    innerRef
+  } = propsWithDefaults;
+  const selectedValuesWithSections = React.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 = React.useMemo(() => {
+    if (showSelectedOptions && Array.isArray(selectedValues) && selectedValues.length > 0) {
+      return selectedValuesWithSections();
+    }
+
+    if (onCreate !== lodash.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 = uuid.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;
+};
+
+exports.useCorrectOptions = useCorrectOptions;

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

@@ -0,0 +1,46 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _jsx = require('@babel/runtime/helpers/jsx');
+require('core-js/modules/esnext.async-iterator.find.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.find.js');
+var React = require('react');
+var ComboBoxCTX = require('../../ComboBoxCTX.js');
+var styled = require('./styled.js');
+var listHelper = require('../../utils/listHelper.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);
+
+const FocusMenuItem = () => {
+  const {
+    props: {
+      options
+    },
+    focusOptionIdx,
+    showPopover
+  } = React.useContext(ComboBoxCTX.ComboBoxContext);
+  const selectabledOptions = listHelper.getSelectableOptions(options);
+  const focusOption = options.find(option => option.dsId === focusOptionIdx);
+  const focusSelectableOptionIdx = selectabledOptions.findIndex(option => option.dsId === focusOptionIdx);
+  const msg = React.useMemo(() => {
+    if (showPopover) {
+      return /*#__PURE__*/_jsx__default["default"](styled.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__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
+  }, [showPopover, focusOption, focusSelectableOptionIdx, selectabledOptions]);
+  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: msg
+  });
+};
+
+exports.FocusMenuItem = FocusMenuItem;

package/cjs/controlled-combobox/parts/a11y-messages/{MultiAllyMessages.js → SelectedValuesAllyMsg.js}

@@ -7,27 +7,36 @@ require('core-js/modules/esnext.async-iterator.map.js');
 require('core-js/modules/esnext.iterator.map.js');
 var React = require('react');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
-var listHelper = require('../../utils/listHelper.js');
 var styled = require('./styled.js');
+var ComboboxDataTestids = require('../../ComboboxDataTestids.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-const MultiAllyMessages = () => {
+const SelectedValuesAllyMsg = () => {
   const {
     props: {
-      options,
       selectedValues
     }
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const selectableOptions = listHelper.getSelectableOptions(options);
-  const multipleSelectedValues = selectedValues;
+  const msg = React.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__default["default"](styled.StyledA11ySelectedValues, {
+    "data-testid": ComboboxDataTestids.ComboboxDataTestid.ALLY_SELECTED_VALUES,
     "aria-live": "polite",
     "aria-atomic": "false",
     "aria-relevant": "additions text"
-  }, void 0, "Options selected: ".concat(multipleSelectedValues.map(item => item.label).join(', '), ". ").concat(multipleSelectedValues.length, " of ").concat(selectableOptions.length));
+  }, void 0, msg);
 };
 
-exports.MultiAllyMessages = MultiAllyMessages;
+exports.SelectedValuesAllyMsg = SelectedValuesAllyMsg;

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

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var MultiAllyMessages = require('./MultiAllyMessages.js');
-var SingleAllyMessages = require('./SingleAllyMessages.js');
+var SelectedValuesAllyMsg = require('./SelectedValuesAllyMsg.js');
+var FocusMenuItem = require('./FocusMenuItem.js');
 
 
 
-exports.MultiAllyMessages = MultiAllyMessages.MultiAllyMessages;
-exports.SingleAllyMessages = SingleAllyMessages.SingleAllyMessages;
+exports.SelectedValuesAllyMsg = SelectedValuesAllyMsg.SelectedValuesAllyMsg;
+exports.FocusMenuItem = FocusMenuItem.FocusMenuItem;

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

@@ -2,8 +2,16 @@
 
 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 _jsx = require('@babel/runtime/helpers/jsx');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var React = require('react');
+var dsPropsHelpers = require('@elliemae/ds-props-helpers');
 var dsPopperjs = require('@elliemae/ds-popperjs');
 var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var styled = require('./styled.js');
@@ -13,42 +21,59 @@ 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);
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 
 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__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 Container = () => {
   const {
-    props: {
-      inline,
-      startPlacementPreference,
-      placementOrderPreference,
-      withoutPortal,
-      zIndex
-    },
+    props,
     showPopover,
-    inputRef,
+    innerRef,
     setReferenceElement,
     setShowPopover,
     referenceElement
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
+  const {
+    inline,
+    disabled,
+    startPlacementPreference,
+    placementOrderPreference,
+    withoutPortal,
+    zIndex
+  } = props;
   const handleCloseMenu = React.useCallback(() => {
     setShowPopover(false);
-    if (inputRef.current) inputRef.current.blur();
-  }, [inputRef, setShowPopover]);
+    if (innerRef.current) innerRef.current.blur();
+  }, [innerRef, setShowPopover]);
   const handleMouseDown = React.useCallback(e => {
     e.preventDefault();
   }, []);
   const handleOnClickContainer = React.useCallback(() => {
-    setShowPopover(!showPopover);
-  }, [setShowPopover, showPopover]);
+    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 rest = _objectWithoutProperties__default["default"](globalAttributes, _excluded);
+
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/jsxRuntime.jsxs(StyledContainer, {
+    children: [/*#__PURE__*/jsxRuntime.jsxs(StyledContainer, _objectSpread(_objectSpread({
       ref: setReferenceElement,
-      onClick: handleOnClickContainer,
+      onClick: handleOnClickContainer
+    }, 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, {
+    })), !inline ? /*#__PURE__*/_jsx__default["default"](dsPopperjs.DSPopperJS, {
       customOffset: [0, 5],
       closeContextMenu: handleCloseMenu,
       referenceElement: referenceElement,

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

@@ -8,15 +8,18 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 
-const StyledContainerWithPopper = /*#__PURE__*/styled__default["default"].div.withConfig({
+const StyledGenericContainer = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-16uoof1-0"
-})(["width:100%;height:28px;position:relative;"]);
-const StyledContainerInline = /*#__PURE__*/styled__default["default"].div.withConfig({
+})(["position:relative;"]);
+const StyledContainerWithPopper = /*#__PURE__*/styled__default["default"](StyledGenericContainer).withConfig({
   componentId: "sc-16uoof1-1"
-})(["width:100%;position:relative;"]);
-const StyledPopperWrapper = /*#__PURE__*/styled__default["default"].div.withConfig({
+})(["width:100%;height:28px;"]);
+const StyledContainerInline = /*#__PURE__*/styled__default["default"](StyledGenericContainer).withConfig({
   componentId: "sc-16uoof1-2"
-})(["background:#fff;overflow:auto;position:relative;"]);
+})(["width:100%;"]);
+const StyledPopperWrapper = /*#__PURE__*/styled__default["default"](StyledGenericContainer).withConfig({
+  componentId: "sc-16uoof1-3"
+})(["overflow:auto;"]);
 
 exports.StyledContainerInline = StyledContainerInline;
 exports.StyledContainerWithPopper = StyledContainerWithPopper;

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

@@ -11,23 +11,27 @@ var ComboBoxCTX = require('../../ComboBoxCTX.js');
 var styled = require('./styled.js');
 var MultiSelectedValuesContainer = require('../multi-selected-values-container/MultiSelectedValuesContainer.js');
 var ControlsInput = require('../controls-input/ControlsInput.js');
+var useOnPillsNavigation = require('./useOnPillsNavigation.js');
+var SelectedValuesAllyMsg = require('../a11y-messages/SelectedValuesAllyMsg.js');
+var FocusMenuItem = require('../a11y-messages/FocusMenuItem.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 _MultiSelectedValuesC, _ControlsInput, _StyledHeaderActionsW;
+var _SelectedValuesAllyMs, _FocusMenuItem, _MultiSelectedValuesC, _ControlsInput, _StyleHeaderActionsSe, _DropdownIndicator;
 
 const Controls = () => {
   const {
     props: {
       inline,
+      disabled,
       inputMinWidth,
       hasError,
-      selectedValues
+      selectedValues,
+      innerRef
     },
-    inputRef,
     selectedOptionsRef,
     setShowPopover,
     showPopover,
@@ -36,17 +40,17 @@ const Controls = () => {
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const handleOnClick = React.useCallback(() => {
     if (hasFocus && showPopover && !inline) {
-      var _inputRef$current;
+      var _innerRef$current;
 
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.blur();
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.blur();
     } else if (hasFocus) {
       setShowPopover(true);
     } else {
-      var _inputRef$current2;
+      var _innerRef$current2;
 
-      (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
     }
-  }, [hasFocus, setShowPopover, showPopover, inputRef, inline]);
+  }, [hasFocus, setShowPopover, showPopover, innerRef, inline]);
 
   const handleOnMouseDown = e => {
     if (hasFocus || inline) {
@@ -54,28 +58,35 @@ const Controls = () => {
     }
   };
 
+  const {
+    onKeyDownPills
+  } = useOnPillsNavigation.useOnPillsNavigation();
   const cols = !inline ? ['minmax(0px,max-content)', 'minmax(20px, auto)', '29px'] : ['minmax(0px, auto)'];
   return /*#__PURE__*/jsxRuntime.jsxs(styled.StyledControlsWrapper, {
     ref: controlsWrapperRef,
     cols: cols,
+    disabled: disabled,
     minWidth: inputMinWidth,
     hasError: hasError,
     hasFocus: hasFocus,
     inline: inline,
     onClick: handleOnClick,
     onMouseDown: handleOnMouseDown,
-    children: [!inline && /*#__PURE__*/jsxRuntime.jsx(styled.StyledSelection, {
+    onKeyDown: onKeyDownPills,
+    children: [!inline && /*#__PURE__*/jsxRuntime.jsxs(styled.StyledSelection, {
       ref: selectedOptionsRef,
-      "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECTED_VALUES,
-      children: Array.isArray(selectedValues) ? _MultiSelectedValuesC || (_MultiSelectedValuesC = /*#__PURE__*/_jsx__default["default"](MultiSelectedValuesContainer.MultiSelectedValuesContainer, {})) : /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
-        children: selectedValues && /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
-          size: "s",
-          labelTruncated: true,
-          label: selectedValues.label,
-          type: "value"
-        }, selectedValues.value)
-      })
-    }), _ControlsInput || (_ControlsInput = /*#__PURE__*/_jsx__default["default"](ControlsInput.ControlsInput, {})), !inline && (_StyledHeaderActionsW || (_StyledHeaderActionsW = /*#__PURE__*/_jsx__default["default"](styled.StyledHeaderActionsWrapper, {}, void 0, /*#__PURE__*/_jsx__default["default"](styled.StyleHeaderActionsSeparator, {}), /*#__PURE__*/_jsx__default["default"](DropdownIndicator, {}))))]
+      children: [_SelectedValuesAllyMs || (_SelectedValuesAllyMs = /*#__PURE__*/_jsx__default["default"](SelectedValuesAllyMsg.SelectedValuesAllyMsg, {})), _FocusMenuItem || (_FocusMenuItem = /*#__PURE__*/_jsx__default["default"](FocusMenuItem.FocusMenuItem, {})), Array.isArray(selectedValues) ? _MultiSelectedValuesC || (_MultiSelectedValuesC = /*#__PURE__*/_jsx__default["default"](MultiSelectedValuesContainer.MultiSelectedValuesContainer, {})) : /*#__PURE__*/_jsx__default["default"]("div", {
+        "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECTED_VALUES
+      }, void 0, selectedValues && /*#__PURE__*/_jsx__default["default"](dsPills.DSPillV2, {
+        size: "s",
+        labelTruncated: true,
+        label: selectedValues.label,
+        type: "value"
+      }, selectedValues.value))]
+    }), _ControlsInput || (_ControlsInput = /*#__PURE__*/_jsx__default["default"](ControlsInput.ControlsInput, {})), !inline && /*#__PURE__*/_jsx__default["default"](styled.StyledHeaderActionsWrapper, {
+      justifyContent: "center",
+      cols: ['auto', 'auto']
+    }, void 0, _StyleHeaderActionsSe || (_StyleHeaderActionsSe = /*#__PURE__*/_jsx__default["default"](styled.StyleHeaderActionsSeparator, {})), _DropdownIndicator || (_DropdownIndicator = /*#__PURE__*/_jsx__default["default"](DropdownIndicator, {})))]
   });
 };