@elliemae/ds-controlled-form 2.4.2-rc.0 → 2.4.2-rc.12

package/cjs/autocomplete/config/useAutocomplete.js

@@ -35,7 +35,6 @@ const useAutocomplete = props => {
   const [focusOptionIdx, setCurrentOption] = React.useState('');
   const inputRef = React.useRef(null);
   const listRef = React.useRef(null);
-  const selectedOptionsRef = React.useRef(null);
   const {
     options,
     filter
@@ -74,12 +73,11 @@ const useAutocomplete = props => {
     inputRef,
     listRef,
     focusOptionIdx,
-    selectedOptionsRef,
     setCurrentOption,
     scrollOptionIntoView,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, propsWithDefault, virtualListHelpers, focusOptionIdx, showPopover, referenceElement, inputRef, selectedOptionsRef, listRef]);
+  }), [scrollOptionIntoView, propsWithDefault, virtualListHelpers, focusOptionIdx, showPopover, referenceElement, inputRef, listRef]);
   return ctx;
 };
 

package/cjs/autocomplete/parts/A11yFocusedOption.js

@@ -0,0 +1,43 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _jsx = require('@babel/runtime/helpers/jsx');
+var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
+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 dsSystem = require('@elliemae/ds-system');
+var AutocompleteCTX = require('../AutocompleteCTX.js');
+var listHelper = require('../utils/listHelper.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var _taggedTemplateLiteral__default = /*#__PURE__*/_interopDefaultLegacy(_taggedTemplateLiteral);
+
+var _templateObject;
+const isSeparator = el => (el === null || el === void 0 ? void 0 : el.type) === 'separator';
+const StyledA11ySelectedValues = dsSystem.styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral__default["default"](["\n  width: 1px;\n  height: 1px;\n  position: absolute;\n  clip: rect(1px, 1px, 1px, 1px);\n"])));
+const A11yFocusedOption = () => {
+  const {
+    props: {
+      options
+    },
+    focusOptionIdx,
+    showPopover
+  } = React.useContext(AutocompleteCTX.AutocompleteContext);
+  return React.useMemo(() => {
+    const selectabledOptions = listHelper.getSelectableOptions(options);
+    const focusOption = options.find(option => !isSeparator(option) && option.dsId === focusOptionIdx);
+    const focusSelectableOptionIdx = selectabledOptions.findIndex(option => option.dsId === focusOptionIdx);
+    return /*#__PURE__*/_jsx__default["default"](StyledA11ySelectedValues, {
+      "aria-live": "polite"
+    }, void 0, !isSeparator(focusOption) && showPopover && focusOption && "option ".concat(focusOption.label, " focused.").concat(focusSelectableOptionIdx + 1, " of ").concat(selectabledOptions.length, "\n           "));
+  }, [options, showPopover, focusOptionIdx]);
+};
+
+exports.A11yFocusedOption = A11yFocusedOption;
+exports.StyledA11ySelectedValues = StyledA11ySelectedValues;
+exports.isSeparator = isSeparator;

package/cjs/autocomplete/parts/container/Container.js

@@ -13,6 +13,7 @@ var styled = require('./styled.js');
 var MenuList = require('../menu-list/MenuList.js');
 var useKeyboardNavigation = require('./useKeyboardNavigation.js');
 var AutocompleteDataTestids = require('../../AutocompleteDataTestids.js');
+var A11yFocusedOption = require('../A11yFocusedOption.js');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -20,10 +21,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _StyledPopperWrapper;
+var _A11yFocusedOption, _StyledPopperWrapper;
 const Container = () => {
   const {
     props: {
+      id,
       startPlacementPreference,
       children,
       filter,
@@ -32,6 +34,7 @@ const Container = () => {
     showPopover,
     setReferenceElement,
     setShowPopover,
+    focusOptionIdx,
     referenceElement
   } = React.useContext(AutocompleteCTX.AutocompleteContext);
   React.useEffect(() => {
@@ -47,32 +50,41 @@ const Container = () => {
   const handleCloseMenu = React.useCallback(() => {
     setShowPopover(false);
   }, [setShowPopover]);
-  const input = React__default["default"].Children.only(children);
   const {
     onInputKeyDown
   } = useKeyboardNavigation.useKeyboardNavigation();
-  return /*#__PURE__*/jsxRuntime.jsxs(styled.StyledContainerWithPopper, {
-    ref: setReferenceElement,
-    role: "combobox",
-    "aria-autocomplete": "list",
-    "aria-controls": "autocomplete-listbox",
-    "aria-expanded": showPopover,
-    onKeyDown: onInputKeyDown,
-    "data-testid": AutocompleteDataTestids.AutocompleteDataTestid.CONTAINER,
-    children: [input, filter && /*#__PURE__*/_jsx__default["default"](dsPopperjs.DSPopperJS, {
-      customOffset: [0, 5],
-      closeContextMenu: handleCloseMenu,
-      referenceElement: referenceElement,
-      showPopover: showPopover,
-      startPlacementPreference: startPlacementPreference,
-      placementOrderPreference: placementOrderPreference,
-      withoutPortal: true,
-      withoutArrow: true,
-      withoutAnimation: true,
-      zIndex: 10
-    }, void 0, _StyledPopperWrapper || (_StyledPopperWrapper = /*#__PURE__*/_jsx__default["default"](styled.StyledPopperWrapper, {
-      tabIndex: -1
-    }, void 0, /*#__PURE__*/_jsx__default["default"](MenuList.MenuList, {}))))]
+  const input = React__default["default"].Children.only(children);
+  const childrenWithProps = /*#__PURE__*/React__default["default"].isValidElement(input) ? /*#__PURE__*/React__default["default"].cloneElement(input, {
+    'aria-activedescendant': focusOptionIdx
+  }) : input;
+  const idList = React.useMemo(() => "".concat(id ? "".concat(id, "-") : '', "listbox"), [id]);
+  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [_A11yFocusedOption || (_A11yFocusedOption = /*#__PURE__*/_jsx__default["default"](A11yFocusedOption.A11yFocusedOption, {})), /*#__PURE__*/jsxRuntime.jsxs(styled.StyledContainer, {
+      id: id,
+      ref: setReferenceElement,
+      role: "combobox",
+      "aria-autocomplete": "list",
+      "aria-controls": "autocomplete-listbox",
+      "aria-expanded": showPopover,
+      "aria-haspopup": "listbox",
+      "aria-owns": idList,
+      onKeyDown: onInputKeyDown,
+      "data-testid": AutocompleteDataTestids.AutocompleteDataTestid.CONTAINER,
+      children: [childrenWithProps, filter && /*#__PURE__*/_jsx__default["default"](dsPopperjs.DSPopperJS, {
+        customOffset: [0, 5],
+        closeContextMenu: handleCloseMenu,
+        referenceElement: referenceElement,
+        showPopover: showPopover,
+        startPlacementPreference: startPlacementPreference,
+        placementOrderPreference: placementOrderPreference,
+        withoutPortal: true,
+        withoutArrow: true,
+        withoutAnimation: true,
+        zIndex: 10
+      }, void 0, _StyledPopperWrapper || (_StyledPopperWrapper = /*#__PURE__*/_jsx__default["default"](styled.StyledPopperWrapper, {
+        tabIndex: -1
+      }, void 0, /*#__PURE__*/_jsx__default["default"](MenuList.MenuList, {}))))]
+    })]
   });
 };
 

package/cjs/autocomplete/parts/container/styled.js

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

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

@@ -17,7 +17,8 @@ var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 const MenuList = () => {
   const {
     props: {
-      options
+      options,
+      id
     },
     referenceElement,
     inputRef,
@@ -33,11 +34,12 @@ const MenuList = () => {
 
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
   }, [inputRef]);
+  const idList = React.useMemo(() => "".concat(id ? "".concat(id, "-") : '', "listbox"), [id]);
   return /*#__PURE__*/_jsx__default["default"](styled.StyledListWrapper, {
     tabIndex: -1,
     onMouseDown: e => e.preventDefault(),
     minWidth: referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.offsetWidth,
-    id: "autocomplete-listbox",
+    id: idList,
     role: "listbox"
   }, void 0, options.length > 0 && /*#__PURE__*/jsxRuntime.jsx(styled.StyledVirtualListWrapper, {
     tabIndex: -1,

package/cjs/autocomplete/parts/styled.js

@@ -0,0 +1,2 @@
+'use strict';
+

package/cjs/autocomplete/utils/listHelper.js

@@ -13,7 +13,7 @@ const isSelectedValueMultiple = value => Array.isArray(value);
 const findInCircularList = function (list, from, criteria) {
   let step = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
 
-  for (let i = (from + step + list.length) % list.length; i !== from; i = (i + step + list.length) % list.length) {
+  for (let i = (from + step + list.length) % list.length; i !== from && from > -1; i = (i + step + list.length) % list.length) {
     if (criteria(list[i])) return i;
   }
 

package/cjs/checkbox/ControlledCheckbox.js

@@ -25,7 +25,7 @@ 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", "className"];
+const _excluded = ["id", "disabled", "readOnly", "label", "aria-label", "aria-controls", "onKeyDown", "className", "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; }
 
@@ -41,10 +41,8 @@ const DSControlledCheckbox = props => {
     hasError,
     innerRef,
     wrapLabel,
-    tabIndex,
     ariaLabel: legacyAriaLabel,
-    ariaControls: legacyAriaControls,
-    'data-testid': dataTestid = 'ds-checkbox-container'
+    ariaControls: legacyAriaControls
   } = propsWithDefault;
 
   const _useGetGlobalAttribut = dsPropsHelpers.useGetGlobalAttributes(propsWithDefault),
@@ -56,10 +54,12 @@ const DSControlledCheckbox = props => {
     'aria-label': ariaLabel,
     'aria-controls': ariaControls,
     onKeyDown: userOnKeyDown,
-    className
+    className,
+    onChange
   } = _useGetGlobalAttribut,
         restGlobals = _objectWithoutProperties__default["default"](_useGetGlobalAttribut, _excluded);
 
+  const xstyledProps = dsPropsHelpers.useGetXstyledProps(propsWithDefault);
   const handleOnKeyDown = React.useCallback(e => {
     if (checkboxRef.current && e.key === 'Enter') {
       checkboxRef.current.click();
@@ -67,35 +67,51 @@ const DSControlledCheckbox = props => {
 
     if (userOnKeyDown) userOnKeyDown(e);
   }, [userOnKeyDown]);
-  return /*#__PURE__*/_jsx__default["default"](styles.StyledContainer, {
-    "data-testid": dataTestid,
+  return /*#__PURE__*/jsxRuntime.jsxs(styles.StyledContainer, _objectSpread(_objectSpread({
+    "data-testid": "ds-checkbox-container",
     className: className
-  }, void 0, /*#__PURE__*/_jsx__default["default"](styles.StyledCheckBox, {
-    checked: checked,
-    hasError: hasError,
-    disabled: disabled,
-    readOnly: readOnly
-  }, void 0, /*#__PURE__*/jsxRuntime.jsx(styles.StyledInput, _objectSpread(_objectSpread({}, restGlobals), {}, {
-    "data-testid": "ds-checkbox",
-    id: id,
-    ref: ref => setMultipleRefs.setMultipleRefs([checkboxRef, innerRef])(ref),
-    onKeyDown: handleOnKeyDown,
-    type: "checkbox",
-    checked: checked !== 'mixed' ? checked : undefined,
-    "aria-label": ariaLabel || legacyAriaLabel || label,
-    "aria-controls": ariaControls || legacyAriaControls,
-    tabIndex: tabIndex,
-    disabled: disabled,
-    readOnly: readOnly
-  }))), label && /*#__PURE__*/_jsx__default["default"](styles.StyledLabel, {
-    htmlFor: id,
-    disabled: disabled,
-    readOnly: readOnly,
-    checked: checked,
-    "data-testid": "ds-checkbox-label"
-  }, void 0, wrapLabel ? label : /*#__PURE__*/_jsx__default["default"](dsTruncatedTooltipText.SimpleTruncatedTooltipText, {
-    value: label
-  })));
+  }, xstyledProps), {}, {
+    children: [/*#__PURE__*/_jsx__default["default"](styles.StyledCheckBox, {
+      checked: checked,
+      hasError: hasError,
+      disabled: disabled,
+      readOnly: readOnly
+    }, void 0, ariaControls || legacyAriaControls ? /*#__PURE__*/jsxRuntime.jsx(styles.StyledInputMixed, _objectSpread(_objectSpread({
+      role: "checkbox",
+      "data-testid": "ds-checkbox",
+      id: id,
+      ref: ref => setMultipleRefs.setMultipleRefs([checkboxRef, innerRef])(ref),
+      onKeyDown: handleOnKeyDown,
+      "aria-label": ariaLabel || legacyAriaLabel || label,
+      "aria-controls": ariaControls || legacyAriaControls,
+      disabled: disabled,
+      readOnly: readOnly,
+      onClick: onChange,
+      "aria-checked": checked
+    }, restGlobals), {}, {
+      tabIndex: 0
+    })) : /*#__PURE__*/jsxRuntime.jsx(styles.StyledInput, _objectSpread({
+      "data-testid": "ds-checkbox",
+      id: id,
+      ref: ref => setMultipleRefs.setMultipleRefs([checkboxRef, innerRef])(ref),
+      onKeyDown: handleOnKeyDown,
+      type: "checkbox",
+      checked: checked,
+      "aria-label": ariaLabel || legacyAriaLabel || label,
+      disabled: disabled,
+      readOnly: readOnly,
+      onChange: onChange
+    }, restGlobals))), label && /*#__PURE__*/_jsx__default["default"](styles.StyledLabel, {
+      htmlFor: id,
+      disabled: disabled,
+      readOnly: readOnly,
+      checked: checked,
+      "data-testid": "ds-checkbox-label",
+      wrapLabel: wrapLabel
+    }, void 0, wrapLabel ? /*#__PURE__*/_jsx__default["default"](styles.StyledWrapLabel, {}, void 0, label) : /*#__PURE__*/_jsx__default["default"](dsTruncatedTooltipText.SimpleTruncatedTooltipText, {
+      value: label
+    }))]
+  }));
 };
 
 const DSControlledCheckboxWithSchema = dsPropsHelpers.describe(DSControlledCheckbox);

package/cjs/checkbox/exported-related/data-test-ids.js

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const DSCheckboxDataTestIds = {
+  CONTAINER: 'ds-checkbox-container',
+  INPUT: 'ds-checkbox'
+};
+
+exports.DSCheckboxDataTestIds = DSCheckboxDataTestIds;

package/cjs/checkbox/exported-related/index.js

@@ -0,0 +1,12 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var dataTestIds = require('./data-test-ids.js');
+var theming = require('./theming.js');
+
+
+
+exports.DSCheckboxDataTestIds = dataTestIds.DSCheckboxDataTestIds;
+exports.DSCheckboxName = theming.DSCheckboxName;
+exports.DSCheckboxSlots = theming.DSCheckboxSlots;

package/cjs/checkbox/exported-related/theming.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const DSCheckboxName = 'ds-checkbox';
+const DSCheckboxSlots = {
+  CONTAINER: 'root',
+  INPUT: 'input',
+  LABEL: 'label'
+};
+
+exports.DSCheckboxName = DSCheckboxName;
+exports.DSCheckboxSlots = DSCheckboxSlots;

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

@@ -25,9 +25,9 @@ const defaultProps = {
 };
 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.'),
-  wrapLabel: dsPropsHelpers.PropTypes.bool.description('Whether to wrap or truncate label'),
   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.')
+  innerRef: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.func, dsPropsHelpers.PropTypes.object]).description('Checkbox input ref.'),
+  wrapLabel: dsPropsHelpers.PropTypes.bool.description('Whether to wrap or truncate the label')
 });
 
 exports.defaultProps = defaultProps;

package/cjs/checkbox/styles.js

@@ -2,24 +2,26 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var styled = require('styled-components');
+var _taggedTemplateLiteral = require('@babel/runtime/helpers/taggedTemplateLiteral');
+var dsSystem = require('@elliemae/ds-system');
 var styleHelpers = require('./utils/styleHelpers.js');
+var theming = require('./exported-related/theming.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
+var _taggedTemplateLiteral__default = /*#__PURE__*/_interopDefaultLegacy(_taggedTemplateLiteral);
 
-const StyledContainer = /*#__PURE__*/styled__default["default"].div.withConfig({
-  componentId: "sc-flv7d2-0"
-})(["display:inline-grid;grid-template-rows:min-content;grid-template-columns:", " auto;align-items:center;"], _ref => {
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+const StyledContainer = dsSystem.styled('div', {
+  name: theming.DSCheckboxName,
+  slot: theming.DSCheckboxSlots.CONTAINER
+})(_templateObject || (_templateObject = _taggedTemplateLiteral__default["default"](["\n  display: inline-grid;\n  grid-template-rows: min-content;\n  grid-template-columns: ", " auto;\n  align-items: center;\n"])), _ref => {
   let {
     theme
   } = _ref;
   return theme.space.xs;
 });
-const StyledCheckBox = /*#__PURE__*/styled__default["default"].span.withConfig({
-  componentId: "sc-flv7d2-1"
-})(["width:", ";height:", ";border:1px solid ", ";border-radius:2px;position:relative;background:", ";", " &:focus-within{", ";&:hover{", "}}&:hover{background:", ";", ";}"], _ref2 => {
+const StyledCheckBox = dsSystem.styled('span')(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral__default["default"](["\n  width: ", ";\n  height: ", ";\n  border: 1px solid ", ";\n  border-radius: 2px;\n  position: relative;\n  background: ", ";\n  ", "\n  &:focus-within {\n    ", ";\n    &:hover {\n      ", "\n    }\n  }\n  &:hover {\n    background: ", ";\n    ", ";\n  }\n"])), _ref2 => {
   let {
     theme
   } = _ref2;
@@ -82,16 +84,24 @@ const StyledCheckBox = /*#__PURE__*/styled__default["default"].span.withConfig({
   } = _ref10;
   return !hasError && !disabled && !readOnly ? " border: 1px solid  ".concat(theme.colors.brand[600]) : undefined;
 });
-const StyledInput = /*#__PURE__*/styled__default["default"].input.withConfig({
-  componentId: "sc-flv7d2-2"
-})(["&:hover{cursor:pointer;}&:disabled{cursor:not-allowed;}height:100%;position:absolute;top:0;left:0;opacity:0;"]);
-const StyledLabel = /*#__PURE__*/styled__default["default"].label.withConfig({
-  componentId: "sc-flv7d2-3"
-})(["&:hover{cursor:pointer;}padding-left:", ";color:", ";font-size:13px;line-height:13px;display:inherit;"], _ref11 => {
+const checkboxStyles = dsSystem.css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral__default["default"](["\n  &:hover {\n    cursor: pointer;\n  }\n  &:disabled {\n    cursor: not-allowed;\n  }\n  width: 100%;\n  height: 100%;\n  position: absolute;\n  top: 0;\n  left: 0;\n  opacity: 0;\n"])));
+const StyledInput = dsSystem.styled('input', {
+  name: theming.DSCheckboxName,
+  slot: theming.DSCheckboxSlots.INPUT
+})(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral__default["default"](["\n  ", "\n"])), checkboxStyles);
+const StyledInputMixed = dsSystem.styled('div', {
+  name: theming.DSCheckboxName,
+  slot: theming.DSCheckboxSlots.INPUT
+})(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral__default["default"](["\n  ", "\n"])), checkboxStyles);
+const StyledLabel = dsSystem.styled('label', {
+  name: theming.DSCheckboxName,
+  slot: theming.DSCheckboxSlots.LABEL
+})(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral__default["default"](["\n  &:hover {\n    cursor: pointer;\n  }\n  ", ";\n\n  color: ", ";\n  font-size: 13px;\n  line-height: 13px;\n  display: inherit;\n"])), _ref11 => {
   let {
+    wrapLabel,
     theme
   } = _ref11;
-  return theme.space.xxs;
+  return wrapLabel ? 'padding: 8px 0px 8px 8px;' : "padding-left: ".concat(theme.space.xxs);
 }, _ref12 => {
   let {
     theme,
@@ -101,8 +111,11 @@ const StyledLabel = /*#__PURE__*/styled__default["default"].label.withConfig({
   } = _ref12;
   return disabled && checked !== true || readOnly ? theme.colors.neutral[500] : theme.colors.neutral[800];
 });
+const StyledWrapLabel = dsSystem.styled('span')(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral__default["default"]([""])));
 
 exports.StyledCheckBox = StyledCheckBox;
 exports.StyledContainer = StyledContainer;
 exports.StyledInput = StyledInput;
+exports.StyledInputMixed = StyledInputMixed;
 exports.StyledLabel = StyledLabel;
+exports.StyledWrapLabel = StyledWrapLabel;

package/cjs/combobox/ComboBoxCTX.js

@@ -10,18 +10,20 @@ function noop() {}
 const defaultProps = {
   hasError: false,
   inline: false,
-  withoutPortal: true,
+  withoutPortal: false,
   zIndex: 10,
   disabled: false,
   useMask: noop,
   innerRef: /*#__PURE__*/React.createRef(),
   startPlacementPreference: 'bottom-start',
-  placementOrderPreference: ['bottom-start', 'bottom-end'] // override in useCombobox to avoid ref duplications when more than one cb is used
+  placementOrderPreference: ['bottom-start', 'bottom-end'],
+  noOptionsMessage: 'No Matches Found',
+  filteredOptions: [] // override in useCombobox to avoid ref duplications when more than one cb is used
 
 };
 const defaultContext = {
   props: defaultProps,
-  showPopover: false,
+  menuState: false,
   hasFocus: false,
   referenceElement: null,
   inputValue: '',
@@ -40,7 +42,8 @@ const defaultContext = {
   setInputValue: noop,
   setReferenceElement: noop,
   setFocusOptionIdx: noop,
-  setShowSelectedOptions: noop
+  setShowSelectedOptions: noop,
+  setMenuState: noop
 };
 /** Context for cross component communication */
 

package/cjs/combobox/ComboboxDataTestids.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const ComboboxDataTestid = {
   MULTISELECT: {
-    SELECT_ALL_CHECKBOX: 'combobox-select-all-checkbox',
+    HEADER_LIST: 'combobox-header-list',
     SHOW_SELECTED_OPTIONS_TOGGLE: 'combobox-selected-options-toggle'
   },
   CONTROLS_WRAPPER: 'combobox-controls-wrapper',

package/cjs/combobox/config/useComboBox.js

@@ -44,8 +44,18 @@ const useComboBox = props => {
   const toggleSelectionButtonRef = React.useRef(null);
   const pillGroupRef = React.useRef(null);
   const {
-    selectedValues
-  } = propsWithDefaults; // ---------------------------------------------------------------------------
+    selectedValues,
+    isMenuOpen,
+    onMenuChange
+  } = propsWithDefaults;
+  const menuState = React.useMemo(() => {
+    if (isMenuOpen !== undefined) return isMenuOpen;
+    return showPopover;
+  }, [showPopover, isMenuOpen]);
+  const setMenuState = React.useCallback((newState, reason, e) => {
+    if (onMenuChange !== undefined) onMenuChange(newState, reason, e);
+    setShowPopover(newState);
+  }, [onMenuChange]); // ---------------------------------------------------------------------------
   // Options with creatable option + filtered by selected
   // ---------------------------------------------------------------------------
 
@@ -74,17 +84,19 @@ const useComboBox = props => {
 
   const [focusOptionIdx, setFocusOptionIdx] = React.useState('');
   React.useEffect(() => {
-    // we are updating the focus option only when we have focus on the input and
-    // we are in the selected option view or we are typing to force first option always
+    // this code calculate the option to be focused when opening the menu
+    // when losing focus we remove the focused one
+    // when focus adquired again getFirstOption calculate the correct one
+    if (!hasFocus) setFocusOptionIdx('');
+
     if (hasFocus && (focusOptionIdx === '' || inputValue !== '' || showSelectedOptions)) {
       const focusedValue = listHelper.getFirstOption(correctOptions, selectedValues, inputValue);
       setFocusOptionIdx(focusedValue);
       scrollOptionIntoView(focusedValue, {
         align: 'center'
       });
-    }
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-    if (!hasFocus) setFocusOptionIdx(''); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [showPopover, hasFocus, correctOptions, selectedValues, inputValue]);
   React.useEffect(() => {
     if (!showPopover) {
@@ -97,7 +109,7 @@ const useComboBox = props => {
       filteredOptions: correctOptions
     }),
     virtualListHelpers,
-    showPopover,
+    menuState,
     referenceElement,
     listRef,
     focusOptionIdx,
@@ -106,6 +118,7 @@ const useComboBox = props => {
     selectAllCheckboxRef,
     inputValue,
     setInputValue,
+    setMenuState,
     hasFocus,
     toggleSelectionButtonRef,
     pillGroupRef,
@@ -117,7 +130,7 @@ const useComboBox = props => {
     scrollOptionIntoView,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, correctOptions, hasFocus, propsWithDefaults, virtualListHelpers, inputValue, focusOptionIdx, wrapperListRef, showSelectedOptions, showPopover, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, listRef]);
+  }), [scrollOptionIntoView, setMenuState, correctOptions, hasFocus, propsWithDefaults, virtualListHelpers, inputValue, focusOptionIdx, wrapperListRef, showSelectedOptions, menuState, pillGroupRef, referenceElement, selectedOptionsRef, controlsWrapperRef, selectAllCheckboxRef, toggleSelectionButtonRef, listRef]);
   return ctx;
 };
 

package/cjs/combobox/index.js

@@ -3,9 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var ComboBox = require('./ComboBox.js');
+var theming = require('./theming.js');
+var ComboboxDataTestids = require('./ComboboxDataTestids.js');
 
 
 
 exports.DSComboBox = ComboBox.DSComboBox;
 exports.DSComboBoxV3 = ComboBox.DSComboBox;
 exports.DSComboBoxWithSchema = ComboBox.DSComboBoxWithSchema;
+exports.DSComboBoxName = theming.DSComboBoxName;
+exports.DSComboboxSlots = theming.DSComboboxSlots;
+exports.ComboboxDataTestid = ComboboxDataTestids.ComboboxDataTestid;

package/cjs/combobox/parts/A11yFocusedOption.js

@@ -19,22 +19,30 @@ var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 const A11yFocusedOption = () => {
   const {
     props: {
-      filteredOptions
+      filteredOptions,
+      selectedValues
     },
     focusOptionIdx,
-    showPopover
+    menuState
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const selectabledOptions = listHelper.getSelectableOptions(filteredOptions);
-  const focusOption = filteredOptions.find(option => !sharedTypes.isSeparator(option) && option.dsId === focusOptionIdx);
+  const focusOption = filteredOptions.find(option => option.dsId === focusOptionIdx);
+  const isFocusOptionSelected = (focusOption === null || focusOption === void 0 ? void 0 : focusOption.type) === 'option' && listHelper.isSelected(selectedValues, focusOption);
   const focusSelectableOptionIdx = selectabledOptions.findIndex(option => option.dsId === focusOptionIdx);
+  const navigationContext = 'Use up and down to choose options,press enter to choose focused option, press Escape to excuse dropdown menu';
   return React.useMemo(() => {
-    if (!sharedTypes.isSeparator(focusOption) && showPopover && focusOption) return /*#__PURE__*/_jsx__default["default"](styled.StyledA11ySelectedValues, {
+    if (!sharedTypes.isSeparator(focusOption) && menuState && focusOption && focusOption.type === 'option') 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, " "));
+    }, menuState, "option ".concat(focusOption === null || focusOption === void 0 ? void 0 : focusOption.label, " ").concat(isFocusOptionSelected ? 'selected and ' : '', "focused .").concat(focusSelectableOptionIdx + 1, " of ").concat(selectabledOptions.length, ". ").concat(navigationContext, " "));
+    if ((focusOption === null || focusOption === void 0 ? void 0 : focusOption.type) === 'creatable') return /*#__PURE__*/_jsx__default["default"](styled.StyledA11ySelectedValues, {
+      "aria-live": "assertive",
+      "aria-atomic": "false",
+      "aria-relevant": "additions text"
+    }, menuState, "Press enter to Add: ".concat(focusOption === null || focusOption === void 0 ? void 0 : focusOption.label, ". ").concat(navigationContext));
     return null;
-  }, [showPopover, focusOption, focusSelectableOptionIdx, selectabledOptions]);
+  }, [focusOption, menuState, isFocusOptionSelected, focusSelectableOptionIdx, selectabledOptions.length]);
 };
 
 exports.A11yFocusedOption = A11yFocusedOption;