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

package/cjs/controlled-date-time-picker/parts/Styleds.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var styled = require('styled-components');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var DSButton = require('@elliemae/ds-button');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -14,10 +14,10 @@ var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 const ResettedInput = /*#__PURE__*/styled__default["default"].input.withConfig({
   componentId: "sc-1t4k08s-0"
 })(["border:none;box-shadow:none;background:none;text-align:center;height:100%;display:flex;align-items:center;:focus{outline:none;}padding-top:2px;"]);
-const StyledSeparator = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledSeparator = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-1"
 })(["padding-top:2px;margin:auto;"]);
-const StyledColonSeparator = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledColonSeparator = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-2"
 })(["padding-bottom:1px;margin:auto;"]);
 const Styled2DigitsInput = /*#__PURE__*/styled__default["default"](ResettedInput).withConfig({
@@ -36,7 +36,7 @@ const StyledMin4DigitsInput = /*#__PURE__*/styled__default["default"](ResettedIn
   } = _ref2;
   return disabled ? "color: #616b7f;" : "";
 });
-const StyledInputsWrapperGrid = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledInputsWrapperGrid = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-5"
 })(["width:max-content;align-items:center;", " border-color:", ";border-radius:2px;padding-left:", ";padding-right:", ";position:relative;", ""], _ref3 => {
   let {
@@ -75,7 +75,7 @@ const StyledDateInputsWrapperGrid = /*#__PURE__*/styled__default["default"].div.
 const StyledTimeInputsWrapperGrid = /*#__PURE__*/styled__default["default"].div.withConfig({
   componentId: "sc-1t4k08s-7"
 })(["display:grid;grid-template-columns:24px min-content 24px min-content 24px min-content 24px;grid-template-rows:min-content;padding:6px 0;gap:0px 0px;align-items:center;input,p{margin:0;}"]);
-const StyledPickersIconsWrapperGrid = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledPickersIconsWrapperGrid = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-8"
 })(["position:relative;", ":before{content:'';position:absolute;top:0px;left:-1px;width:100%;height:100%;border-radius:2px;z-index:-1;", "}"], _ref8 => {
   let {
@@ -90,7 +90,7 @@ const StyledPickersIconsWrapperGrid = /*#__PURE__*/styled__default["default"](Gr
   } = _ref9;
   return isControllerOnly ? "" : "\n    border-left: 1px solid ".concat(hasError ? theme.colors.danger[900] : theme.colors.neutral[200], "\n    ");
 });
-const StyledFocusWithIn = /*#__PURE__*/styled__default["default"](Grid.Grid).withConfig({
+const StyledFocusWithIn = /*#__PURE__*/styled__default["default"](dsGrid.Grid).withConfig({
   componentId: "sc-1t4k08s-9"
 })(["position:relative;&:focus-within{&:after{display:block;content:' ';position:absolute;top:-5px;left:-2px;width:calc(100% + 4px);height:calc(100% + 10px);border:2px solid ", ";border-radius:2px;pointer-events:none;}}"], _ref10 => {
   let {

package/cjs/controlled-date-time-picker/parts/TimeInputs/TimeInputs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 var React = require('react');
-var Grid = require('@elliemae/ds-grid');
+var dsGrid = require('@elliemae/ds-grid');
 var ControlledDateTimePickerCTX = require('../../ControlledDateTimePickerCTX.js');
 var HHInput = require('./HHInput.js');
 var MinutesInput = require('./MinutesInput.js');
@@ -49,7 +49,7 @@ const TimeInputs = () => {
     meridiemInputRef,
     ariaCurrentValueForInputs
   } = React.useContext(ControlledDateTimePickerCTX.ControlledDateTimePickerContext);
-  return /*#__PURE__*/_jsx__default["default"](Grid.Grid, {
+  return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
     cols: [config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.smallInputWidth, config.fixedValues.separatorWidth, config.fixedValues.smallInputWidth]
   }, void 0, /*#__PURE__*/_jsx__default["default"](Styleds.StyledFocusWithIn, {}, void 0, /*#__PURE__*/_jsx__default["default"](HHInput.HHInput, {
     value: hours,

package/esm/controlled-checkbox/ControlledCheckbox.js

@@ -1,68 +1,80 @@
+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 _jsx from '@babel/runtime/helpers/esm/jsx';
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutProperties';
 import { useRef, useCallback } from 'react';
-import { describe } from 'react-desc';
+import { describe, useMemoMergePropsWithDefault, useGetGlobalAttributes } from '@elliemae/ds-props-helpers';
 import { SimpleTruncatedTooltipText } from '@elliemae/ds-truncated-tooltip-text';
-import { propTypes } from './propTypes.js';
 import { StyledContainer, StyledCheckBox, StyledInput, StyledLabel } from './styles.js';
-import { useValidateProps } from './config/useValidateProps.js';
+import { propTypes, defaultProps } from './react-desc-prop-types.js';
 import { setMultipleRefs } from './utils/setMultipleRefs.js';
+import { useValidateProps } from './config/useValidateProps.js';
 import { jsx } from 'react/jsx-runtime';
 
+const _excluded = ["id", "disabled", "readOnly", "label", "aria-label", "aria-controls", "onKeyDown", "className"];
+
+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 DSControlledCheckbox = props => {
+  const propsWithDefault = useMemoMergePropsWithDefault(props, defaultProps);
   useValidateProps(props, propTypes);
-  const checkboxRef = useRef();
+  const checkboxRef = 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,
+    'data-testid': dataTestid = 'ds-checkbox-container'
+  } = propsWithDefault;
   const handleOnKeyDown = useCallback(e => {
     if (checkboxRef.current && e.key === 'Enter') {
       checkboxRef.current.click();
     }
   }, []);
+
+  const _useGetGlobalAttribut = useGetGlobalAttributes(propsWithDefault, {
+    onKeyDown: handleOnKeyDown
+  }),
+        {
+    id,
+    disabled,
+    readOnly,
+    label: globalLabel,
+    'aria-label': ariaLabel,
+    'aria-controls': ariaControls,
+    onKeyDown,
+    className
+  } = _useGetGlobalAttribut,
+        restGlobals = _objectWithoutProperties(_useGetGlobalAttribut, _excluded);
+
   return /*#__PURE__*/_jsx(StyledContainer, {
-    "data-testid": "ds-checkbox-container"
+    "data-testid": dataTestid,
+    className: className
   }, void 0, /*#__PURE__*/_jsx(StyledCheckBox, {
-    checked: props.checked,
+    checked: checked,
     hasError: hasError,
     disabled: disabled,
     readOnly: readOnly
-  }, void 0, /*#__PURE__*/jsx(StyledInput, {
-    disabled: disabled,
+  }, void 0, /*#__PURE__*/jsx(StyledInput, _objectSpread(_objectSpread({}, restGlobals), {}, {
+    "data-testid": "ds-checkbox",
+    id: id,
     ref: ref => 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(StyledLabel, {
+    "aria-label": ariaLabel || legacyAriaLabel || label,
+    "aria-controls": ariaControls || legacyAriaControls,
+    tabIndex: tabIndex
+  }))), label && /*#__PURE__*/_jsx(StyledLabel, {
     htmlFor: id,
     disabled: disabled,
     readOnly: readOnly,

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

@@ -7,11 +7,11 @@ const throwError = message => {
 const useValidateProps = (props, propTypes) => {
   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/esm/controlled-checkbox/react-desc-prop-types.js

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

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

@@ -1,5 +1,5 @@
 /* eslint-disable max-params */
-const handleCheckMarkColor = (_ref, disabled, readOnly, hasError, checked, isHovering) => {
+const handleCheckMarkColor = (_ref, checked, isHovering, disabled, readOnly, hasError) => {
   let {
     colors
   } = _ref;
@@ -22,14 +22,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/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

@@ -14,7 +14,7 @@ const defaultProps = {
   onClearAll: noop,
   onSelectAll: noop,
   onCreate: noop,
-  withToggle: false,
+  onBlur: noop,
   withoutPortal: true,
   zIndex: 10,
   onChange: noop,
@@ -32,15 +32,12 @@ const defaultContext = {
   setHasFocus: noop,
   pillGroupRef: /*#__PURE__*/createRef(),
   setReferenceElement: noop,
-  inputRef: /*#__PURE__*/createRef(),
   listRef: /*#__PURE__*/createRef(),
   wrapperListRef: /*#__PURE__*/createRef(),
   controlsWrapperRef: /*#__PURE__*/createRef(),
   selectedOptionsRef: /*#__PURE__*/createRef(),
   selectAllCheckboxRef: /*#__PURE__*/createRef(),
   toggleSelectionButtonRef: /*#__PURE__*/createRef(),
-  showSelectedValue: false,
-  setShowSelectedValue: noop,
   focusOptionIdx: '',
   setCurrentOption: noop,
   showSelectedOptions: false,

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,43 @@
-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 { useState, useRef, useCallback, useMemo } from 'react';
-import { noop } from 'lodash';
-import { v4 } from 'uuid';
+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 { useRef, useState, useCallback, useMemo } from 'react';
 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 defaultPropsWithInnerRef = _objectSpread(_objectSpread({}, defaultProps), {}, {
+    innerRef: useRef(null)
+  });
+
+  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultPropsWithInnerRef);
+  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 +50,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,8 +62,6 @@ const useComboBox = props => {
     virtualListHelpers,
     showPopover,
     referenceElement,
-    inputRef,
-    showSelectedValue,
     listRef,
     focusOptionIdx,
     selectedOptionsRef,
@@ -129,10 +76,9 @@ const useComboBox = props => {
     setHasFocus,
     setCurrentOption,
     scrollOptionIntoView,
-    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, 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,39 @@
+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)) {
+      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 'No Option Selected';
+  }, [selectedValues]);
+  return /*#__PURE__*/_jsx(StyledA11ySelectedValues, {
+    id: "combobox-selected-items",
+    "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';