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

package/esm/controlled-combobox/parts/menu-list/styled.js

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const StyledListWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-g2fmft-0"
-})(["min-width:", ";"], props => props.inline ? '100%' : "".concat(props.minWidth, "px"));
+})(["min-width:", ";background-color:#ffffff;"], props => props.inline ? '100%' : "".concat(props.minWidth, "px"));
 const StyledList = /*#__PURE__*/styled.ul.withConfig({
   componentId: "sc-g2fmft-1"
 })(["position:relative;padding:0;"]);
@@ -22,5 +22,8 @@ const StyledVirtualListWrapper = /*#__PURE__*/styled.div.withConfig({
 const StyledCreatableLabel = /*#__PURE__*/styled.span.withConfig({
   componentId: "sc-g2fmft-3"
 })(["font-weight:bold;font-style:italic;"]);
+const StyledNoResultsWrapper = /*#__PURE__*/styled.div.withConfig({
+  componentId: "sc-g2fmft-4"
+})(["padding:16px;"]);
 
-export { StyledCreatableLabel, StyledList, StyledListWrapper, StyledVirtualListWrapper };
+export { StyledCreatableLabel, StyledList, StyledListWrapper, StyledNoResultsWrapper, StyledVirtualListWrapper };

package/esm/controlled-combobox/parts/menu-list/useItemRenderer.js

@@ -29,23 +29,20 @@ const useItemRenderer = () => {
       onCreate,
       onChange,
       selectedValues,
-      onFilter
+      onFilter,
+      innerRef
     },
-    inputRef,
     setShowPopover,
     focusOptionIdx,
     virtualListHelpers
   } = useContext(ComboBoxContext);
-  const {
-    virtualItems
-  } = virtualListHelpers;
   const multiple = Array.isArray(selectedValues);
   const CBItem = multiple ? MultiMenuItem : SingleMenuItem;
   const handleClick = useCallback((option, e) => {
     if (option.type === 'creatable') {
-      if (inputRef.current) {
-        onCreate(inputRef.current.value);
-        inputRef.current.value = '';
+      if (innerRef.current) {
+        onCreate(innerRef.current.value);
+        innerRef.current.value = '';
         onFilter('');
       }
 
@@ -53,20 +50,20 @@ const useItemRenderer = () => {
     }
 
     if (!multiple) {
-      setShowPopover(false);
-      if (inputRef.current) inputRef.current.value = '';
-    } else if (inputRef.current) {
-      onFilter(inputRef.current.value);
+      if (!option.disabled) setShowPopover(false);
+      if (innerRef.current) innerRef.current.value = '';
+    } else if (innerRef.current) {
+      onFilter(innerRef.current.value);
     }
 
     onChange(option);
     e.stopPropagation();
     e.preventDefault();
-  }, [onFilter, onChange, setShowPopover, multiple, inputRef]);
+  }, [onFilter, onChange, setShowPopover, multiple, innerRef]);
   const handleOnMouseDown = useCallback(e => {
     e.preventDefault();
   }, []);
-  const ItemRenderer = useMemo(() => virtualItems.map(vItem => {
+  const ItemRenderer = useMemo(() => virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems.map(vItem => {
     const option = options[vItem.index];
     const generalProps = {
       wrapperStyles: {
@@ -125,7 +122,7 @@ const useItemRenderer = () => {
     }
 
     return /*#__PURE__*/jsx(Fragment, {});
-  }), [options, focusOptionIdx, selectedValues, inputRef, virtualItems]);
+  }), [options, focusOptionIdx, selectedValues, innerRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems]);
   return ItemRenderer;
 };
 

package/esm/controlled-combobox/parts/menu-list/useMenuList.js

@@ -2,16 +2,16 @@ import { useContext, useEffect } from 'react';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 
 const useMenuList = () => {
-  var _inputRef$current2;
+  var _innerRef$current2;
 
   const {
     props: {
       inline,
       selectedValues,
       onMenuOpen,
-      options
+      options,
+      innerRef
     },
-    inputRef,
     setCurrentOption,
     scrollOptionIntoView,
     hasFocus,
@@ -26,18 +26,16 @@ const useMenuList = () => {
     };
 
     if (showPopover || inline) {
-      var _inputRef$current;
+      var _innerRef$current;
 
       if (onMenuOpen) onMenuOpen();
 
-      if (((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.value) !== '') {
+      if (((_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.value) !== '') {
         getFirstOption();
       } else if (Array.isArray(selectedValues)) {
-        const multiSelectedValues = selectedValues;
-
-        if (multiSelectedValues.length > 0) {
-          setCurrentOption(multiSelectedValues[multiSelectedValues.length - 1].dsId);
-          scrollOptionIntoView(multiSelectedValues[multiSelectedValues.length - 1].dsId);
+        if (selectedValues && selectedValues.length > 0) {
+          setCurrentOption(selectedValues[selectedValues.length - 1].dsId);
+          scrollOptionIntoView(selectedValues[selectedValues.length - 1].dsId);
         } else {
           getFirstOption();
         }
@@ -45,15 +43,15 @@ const useMenuList = () => {
         const singleSelectedValue = selectedValues;
 
         if (singleSelectedValue) {
-          setCurrentOption(selectedValues.dsId);
-          scrollOptionIntoView(selectedValues.dsId);
+          setCurrentOption(singleSelectedValue.dsId);
+          scrollOptionIntoView(singleSelectedValue.dsId);
         } else {
           getFirstOption();
         }
       }
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  }, [showPopover, inline, hasFocus, (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.value]);
+  }, [showPopover, inline, hasFocus, (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.value]);
 };
 
 export { useMenuList };

package/esm/controlled-combobox/parts/multi-selected-values-container/MultiSelectedValuesContainer.js

@@ -1,48 +1,63 @@
 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 Grid from '@elliemae/ds-grid';
+import { useContext, useCallback, useMemo } from 'react';
 import { DSPillGroupV2, DSPillV2 } from '@elliemae/ds-pills';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { useGroupPills } from './useGroupPills.js';
-import { MultiAllyMessages } from '../a11y-messages/MultiAllyMessages.js';
-import 'styled-components';
-import { jsxs, Fragment } from 'react/jsx-runtime';
-
-var _MultiAllyMessages;
+import { ComboboxDataTestid } from '../../ComboboxDataTestids.js';
+import { jsx, Fragment } from 'react/jsx-runtime';
 
 const MultiSelectedValuesContainer = () => {
-  var _inputRef$current;
-
   const {
     props: {
-      selectedValues
+      selectedValues,
+      onChange,
+      innerRef
     },
-    inputRef,
-    pillGroupRef
+    pillGroupRef,
+    showPopover,
+    setShowPopover
   } = useContext(ComboBoxContext);
   const multiSelectedValue = selectedValues;
-  const pillsToShow = useGroupPills();
-  const correctPillsToShow = pillsToShow || 1;
-  const pills = useMemo(() => /*#__PURE__*/_jsx(Grid, {
+  const correctPillsToShow = useGroupPills() || 1;
+  const handleClickOnPills = useCallback(e => {
+    if (!showPopover) {
+      var _innerRef$current;
+
+      setShowPopover(true);
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
+    }
+
+    e.stopPropagation();
+  }, [setShowPopover, innerRef, showPopover]);
+  const pills = useMemo(() => /*#__PURE__*/_jsx("div", {
     style: {
       width: 'max-content'
-    }
+    },
+    "data-testid": ComboboxDataTestid.SELECTED_VALUES
   }, void 0, /*#__PURE__*/_jsx(DSPillGroupV2, {
+    onClick: handleClickOnPills,
     innerRef: pillGroupRef
   }, void 0, multiSelectedValue.length > 0 && multiSelectedValue.slice(0, correctPillsToShow).map(option => /*#__PURE__*/_jsx(DSPillV2, {
     size: "s",
     label: option.label,
-    type: "value"
+    type: "removable",
+    tabIndex: -1,
+    onRemove: () => {
+      var _innerRef$current2;
+
+      onChange(option);
+      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
+    }
   }, option.value)), multiSelectedValue.length > 0 && correctPillsToShow !== multiSelectedValue.length && /*#__PURE__*/_jsx(DSPillV2, {
     size: "s",
     labelTruncated: false,
     label: "+".concat(multiSelectedValue.length - correctPillsToShow),
     type: "value"
-  }, "grouped"))), [pillGroupRef, multiSelectedValue, correctPillsToShow]);
-  return /*#__PURE__*/jsxs(Fragment, {
-    children: [multiSelectedValue.length > 0 && !((_inputRef$current = inputRef.current) !== null && _inputRef$current !== void 0 && _inputRef$current.value) && (_MultiAllyMessages || (_MultiAllyMessages = /*#__PURE__*/_jsx(MultiAllyMessages, {}))), pills]
+  }, "grouped"))), [pillGroupRef, innerRef, onChange, handleClickOnPills, multiSelectedValue, correctPillsToShow]);
+  return /*#__PURE__*/jsx(Fragment, {
+    children: pills
   });
 };
 

package/esm/controlled-combobox/parts/multi-selected-values-container/useGroupPills.js

@@ -17,9 +17,9 @@ const getGroupedPillWidth = remainingPills => {
 const useGroupPills = () => {
   const {
     props: {
-      selectedValues
+      selectedValues,
+      innerRef
     },
-    inputRef,
     selectedOptionsRef,
     controlsWrapperRef,
     pillGroupRef
@@ -31,7 +31,7 @@ const useGroupPills = () => {
   } = useOnElementResize(controlsWrapperRef);
   const {
     width: widthInput
-  } = useOnElementResize(inputRef || null);
+  } = useOnElementResize(innerRef || null);
   useEffect(() => {
     if (multiSelectedValues.length !== pillsToShow) {
       setPillsToShow(multiSelectedValues.length);
@@ -44,7 +44,7 @@ const useGroupPills = () => {
       let lastPillFit = -1;
       let currentWidth = 0;
       const referenceWidth = selectedOptionsRef.current.offsetWidth;
-      const pills = [...selectedOptionsRef.current.querySelectorAll('.ds-pill-wrapper-value')];
+      const pills = [...selectedOptionsRef.current.querySelectorAll('.ds-pill-wrapper-removable')];
       const pillsWidth = pills.map(pill => pill === null || pill === void 0 ? void 0 : pill.offsetWidth);
       pillsWidth.forEach((pillWidth, idx) => {
         currentWidth += pillWidth;
@@ -64,7 +64,7 @@ const useGroupPills = () => {
 
       if (pillGroupRef.current) pillGroupRef.current.style.width = 'fit-content';
     }
-  }, [selectedOptionsRef, inputRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput]);
+  }, [selectedOptionsRef, innerRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput]);
   return pillsToShow;
 };
 

package/esm/controlled-combobox/{propTypes.js → react-desc-prop-types.js}

@@ -1,9 +1,19 @@
-import { PropTypes } from 'react-desc';
+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';
 
-const propTypes = {
+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 ComboboxPropTypes = _objectSpread(_objectSpread({}, globalAttributesPropTypes), {}, {
   placeholder: PropTypes.string.description('input s placeholder value').defaultValue(''),
-  options: PropTypes.oneOfType([PropTypes.array, PropTypes.object]).description('List of options').defaultValue([]),
+  options: PropTypes.oneOfType([PropTypes.array, PropTypes.object]).isRequired.description('List of options').defaultValue([]),
   selectedValues: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]).description('Array of option or single option selected'),
+  disabled: PropTypes.bool.description('wheter or not the input is disabled').defaultValue('false'),
   autoFocus: PropTypes.bool.description('Whether the combo box uses auto focus or not').defaultValue('false'),
   hasError: PropTypes.bool.description('Whether the combo box has error or not').defaultValue('false'),
   onChange: PropTypes.func.description('function triggered when an option is selected it will send the options selected').defaultValue(''),
@@ -16,9 +26,9 @@ const propTypes = {
   inputMinWidth: PropTypes.any.description('Minimum width for the combo box input controller').defaultValue(undefined),
   menuMinWidth: PropTypes.any.description('Minimum width for the dropdown menu').defaultValue(undefined),
   menuMaxHeight: PropTypes.any.description('Maximum height for the dropdown menu').defaultValue(undefined),
-  withToggle: PropTypes.bool.description('POC purpose this prop will not remain').defaultValue('false'),
   withoutPortal: PropTypes.bool.description('Whether the combobox menu is rendered in a portal or not').defaultValue(false),
-  zIndex: PropTypes.number.description('The z-index of the combobox menu').defaultValue(10)
-};
+  zIndex: PropTypes.number.description('The z-index of the combobox menu').defaultValue(10),
+  innerRef: PropTypes.object.description('ref to the component s container')
+});
 
-export { propTypes };
+export { ComboboxPropTypes };

package/esm/controlled-combobox/utils/hooks/useKeyboardNavigation.js

@@ -5,7 +5,7 @@ import { useContext, useCallback } from 'react';
 import { ComboBoxContext } from '../../ComboBoxCTX.js';
 import { findInCircularList } from '../listHelper.js';
 
-const isOptionFocuseable = opt => !['section', 'separator'].includes(opt.type);
+const isOptionFocuseable = opt => !['section', 'separator'].includes(opt.type) && !opt.disabled;
 
 const useKeyboardNavigation = () => {
   const {
@@ -19,13 +19,12 @@ const useKeyboardNavigation = () => {
       options,
       selectedValues,
       onFilter,
-      withoutPortal
+      withoutPortal,
+      innerRef
     },
     setShowPopover,
     showPopover,
-    setShowSelectedValue,
     focusOptionIdx,
-    inputRef,
     setCurrentOption,
     scrollOptionIntoView,
     selectAllCheckboxRef,
@@ -36,16 +35,16 @@ const useKeyboardNavigation = () => {
   const currentItem = options.find(item => item.dsId === focusOptionIdx);
   const selectOption = 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 = '';
-      setShowSelectedValue(true);
+      if (innerRef.current) innerRef.current.value = '';
     }
 
-    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, onChange]);
   const onInputKeyDown = useCallback(e => {
     const targetElement = e.target; // =============================================================================
     // CUSTOM KEYS
@@ -58,7 +57,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
@@ -67,6 +66,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'Enter' || e.keyCode === 32 && e.altKey) {
       e.preventDefault();
+      e.stopPropagation();
 
       if (!showPopover && !inline) {
         setShowPopover(true);
@@ -88,6 +88,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'ArrowDown') {
       e.preventDefault();
+      e.stopPropagation();
 
       if (showPopover || inline) {
         const nextItemIndex = findInCircularList(options, currentItemIndex, isOptionFocuseable);
@@ -100,6 +101,7 @@ const useKeyboardNavigation = () => {
 
     if (e.key === 'ArrowUp') {
       e.preventDefault();
+      e.stopPropagation();
 
       if (showPopover || inline) {
         const nextItemIndex = findInCircularList(options, currentItemIndex, isOptionFocuseable, -1);
@@ -119,13 +121,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);
@@ -142,7 +144,6 @@ const useKeyboardNavigation = () => {
       }
 
       onFilter('');
-      setShowSelectedValue(true);
     }
 
     if (e.key === 'Tab' && !inline && !withoutPortal) {
@@ -154,10 +155,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, selectOption, onCancel, selectAllCheckboxRef, toggleSelectionButtonRef, withoutPortal]);
   return {
     onInputKeyDown
   };

package/esm/controlled-combobox/utils/listHelper.js

@@ -4,8 +4,8 @@ import 'core-js/modules/esnext.iterator.filter.js';
 import 'core-js/modules/esnext.async-iterator.some.js';
 import '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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-controlled-form",
-  "version": "2.3.0-next.1",
+  "version": "2.3.0-next.14",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Controlled Form Controllers",
   "module": "./esm/index.js",
@@ -419,30 +419,18 @@
       "import": "./esm/controlled-combobox/tests/utils.js",
       "require": "./cjs/controlled-combobox/tests/utils.js"
     },
-    "./controlled-combobox/propTypes": {
-      "import": "./esm/controlled-combobox/propTypes.js",
-      "require": "./cjs/controlled-combobox/propTypes.js"
+    "./controlled-combobox/sharedTypes": {
+      "import": "./esm/controlled-combobox/sharedTypes.js",
+      "require": "./cjs/controlled-combobox/sharedTypes.js"
     },
-    "./controlled-combobox/parts/single-selected-value-container/styled": {
-      "import": "./esm/controlled-combobox/parts/single-selected-value-container/styled.js",
-      "require": "./cjs/controlled-combobox/parts/single-selected-value-container/styled.js"
-    },
-    "./controlled-combobox/parts/single-selected-value-container/SingleSelectedValueContainer": {
-      "import": "./esm/controlled-combobox/parts/single-selected-value-container/SingleSelectedValueContainer.js",
-      "require": "./cjs/controlled-combobox/parts/single-selected-value-container/SingleSelectedValueContainer.js"
-    },
-    "./controlled-combobox/parts/single-selected-value-container": {
-      "import": "./esm/controlled-combobox/parts/single-selected-value-container/index.js",
-      "require": "./cjs/controlled-combobox/parts/single-selected-value-container/index.js"
+    "./controlled-combobox/react-desc-prop-types": {
+      "import": "./esm/controlled-combobox/react-desc-prop-types.js",
+      "require": "./cjs/controlled-combobox/react-desc-prop-types.js"
     },
     "./controlled-combobox/parts/multi-selected-values-container/useGroupPills": {
       "import": "./esm/controlled-combobox/parts/multi-selected-values-container/useGroupPills.js",
       "require": "./cjs/controlled-combobox/parts/multi-selected-values-container/useGroupPills.js"
     },
-    "./controlled-combobox/parts/multi-selected-values-container/styled": {
-      "import": "./esm/controlled-combobox/parts/multi-selected-values-container/styled.js",
-      "require": "./cjs/controlled-combobox/parts/multi-selected-values-container/styled.js"
-    },
     "./controlled-combobox/parts/multi-selected-values-container/MultiSelectedValuesContainer": {
       "import": "./esm/controlled-combobox/parts/multi-selected-values-container/MultiSelectedValuesContainer.js",
       "require": "./cjs/controlled-combobox/parts/multi-selected-values-container/MultiSelectedValuesContainer.js"
@@ -487,26 +475,18 @@
       "import": "./esm/controlled-combobox/parts/header-list/HeaderList.js",
       "require": "./cjs/controlled-combobox/parts/header-list/HeaderList.js"
     },
-    "./controlled-combobox/parts/empty-state/styled": {
-      "import": "./esm/controlled-combobox/parts/empty-state/styled.js",
-      "require": "./cjs/controlled-combobox/parts/empty-state/styled.js"
-    },
-    "./controlled-combobox/parts/empty-state": {
-      "import": "./esm/controlled-combobox/parts/empty-state/index.js",
-      "require": "./cjs/controlled-combobox/parts/empty-state/index.js"
-    },
     "./controlled-combobox/parts/dropdown-indicator/styled": {
       "import": "./esm/controlled-combobox/parts/dropdown-indicator/styled.js",
       "require": "./cjs/controlled-combobox/parts/dropdown-indicator/styled.js"
     },
-    "./controlled-combobox/parts/dropdown-indicator": {
-      "import": "./esm/controlled-combobox/parts/dropdown-indicator/index.js",
-      "require": "./cjs/controlled-combobox/parts/dropdown-indicator/index.js"
-    },
     "./controlled-combobox/parts/dropdown-indicator/DropdownIndicator": {
       "import": "./esm/controlled-combobox/parts/dropdown-indicator/DropdownIndicator.js",
       "require": "./cjs/controlled-combobox/parts/dropdown-indicator/DropdownIndicator.js"
     },
+    "./controlled-combobox/parts/controls/useOnPillsNavigation": {
+      "import": "./esm/controlled-combobox/parts/controls/useOnPillsNavigation.js",
+      "require": "./cjs/controlled-combobox/parts/controls/useOnPillsNavigation.js"
+    },
     "./controlled-combobox/parts/controls/styled": {
       "import": "./esm/controlled-combobox/parts/controls/styled.js",
       "require": "./cjs/controlled-combobox/parts/controls/styled.js"
@@ -547,34 +527,30 @@
       "import": "./esm/controlled-combobox/parts/a11y-messages/styled.js",
       "require": "./cjs/controlled-combobox/parts/a11y-messages/styled.js"
     },
-    "./controlled-combobox/parts/a11y-messages/SingleAllyMessages": {
-      "import": "./esm/controlled-combobox/parts/a11y-messages/SingleAllyMessages.js",
-      "require": "./cjs/controlled-combobox/parts/a11y-messages/SingleAllyMessages.js"
-    },
-    "./controlled-combobox/parts/a11y-messages/MultiAllyMessages": {
-      "import": "./esm/controlled-combobox/parts/a11y-messages/MultiAllyMessages.js",
-      "require": "./cjs/controlled-combobox/parts/a11y-messages/MultiAllyMessages.js"
+    "./controlled-combobox/parts/a11y-messages/SelectedValuesAllyMsg": {
+      "import": "./esm/controlled-combobox/parts/a11y-messages/SelectedValuesAllyMsg.js",
+      "require": "./cjs/controlled-combobox/parts/a11y-messages/SelectedValuesAllyMsg.js"
     },
     "./controlled-combobox/parts/a11y-messages": {
       "import": "./esm/controlled-combobox/parts/a11y-messages/index.js",
       "require": "./cjs/controlled-combobox/parts/a11y-messages/index.js"
     },
+    "./controlled-combobox/parts/a11y-messages/FocusMenuItem": {
+      "import": "./esm/controlled-combobox/parts/a11y-messages/FocusMenuItem.js",
+      "require": "./cjs/controlled-combobox/parts/a11y-messages/FocusMenuItem.js"
+    },
     "./controlled-combobox": {
       "import": "./esm/controlled-combobox/index.js",
       "require": "./cjs/controlled-combobox/index.js"
     },
-    "./controlled-combobox/config/useGetPropsWithDefault": {
-      "import": "./esm/controlled-combobox/config/useGetPropsWithDefault.js",
-      "require": "./cjs/controlled-combobox/config/useGetPropsWithDefault.js"
+    "./controlled-combobox/config/useCorrectOptions": {
+      "import": "./esm/controlled-combobox/config/useCorrectOptions.js",
+      "require": "./cjs/controlled-combobox/config/useCorrectOptions.js"
     },
     "./controlled-combobox/config/useComboBox": {
       "import": "./esm/controlled-combobox/config/useComboBox.js",
       "require": "./cjs/controlled-combobox/config/useComboBox.js"
     },
-    "./controlled-combobox/config/constants": {
-      "import": "./esm/controlled-combobox/config/constants.js",
-      "require": "./cjs/controlled-combobox/config/constants.js"
-    },
     "./controlled-combobox/ComboboxDataTestids": {
       "import": "./esm/controlled-combobox/ComboboxDataTestids.js",
       "require": "./cjs/controlled-combobox/ComboboxDataTestids.js"
@@ -599,9 +575,9 @@
       "import": "./esm/controlled-checkbox/styles.js",
       "require": "./cjs/controlled-checkbox/styles.js"
     },
-    "./controlled-checkbox/propTypes": {
-      "import": "./esm/controlled-checkbox/propTypes.js",
-      "require": "./cjs/controlled-checkbox/propTypes.js"
+    "./controlled-checkbox/react-desc-prop-types": {
+      "import": "./esm/controlled-checkbox/react-desc-prop-types.js",
+      "require": "./cjs/controlled-checkbox/react-desc-prop-types.js"
     },
     "./controlled-checkbox": {
       "import": "./esm/controlled-checkbox/index.js",
@@ -744,22 +720,22 @@
     "build": "node ../../scripts/build/build.js"
   },
   "dependencies": {
-    "@elliemae/ds-button": "2.3.0-next.1",
-    "@elliemae/ds-form-layout-blocks": "2.3.0-next.1",
-    "@elliemae/ds-grid": "2.3.0-next.1",
-    "@elliemae/ds-icon": "2.3.0-next.1",
-    "@elliemae/ds-icons": "2.3.0-next.1",
-    "@elliemae/ds-props-helpers": "2.3.0-next.1",
-    "@elliemae/ds-system": "2.3.0-next.1",
-    "@elliemae/ds-tooltip": "2.3.0-next.1",
-    "@elliemae/ds-truncated-tooltip-text": "2.3.0-next.1",
+    "@elliemae/ds-button": "2.3.0-next.14",
+    "@elliemae/ds-form-layout-blocks": "2.3.0-next.14",
+    "@elliemae/ds-grid": "2.3.0-next.14",
+    "@elliemae/ds-icon": "2.3.0-next.14",
+    "@elliemae/ds-icons": "2.3.0-next.14",
+    "@elliemae/ds-props-helpers": "2.3.0-next.14",
+    "@elliemae/ds-system": "2.3.0-next.14",
+    "@elliemae/ds-tooltip": "2.3.0-next.14",
+    "@elliemae/ds-truncated-tooltip-text": "2.3.0-next.14",
     "prop-types": "~15.7.2",
     "react-desc": "~4.1.3",
     "react-popper": "~2.2.5",
     "uid": "~2.0.0"
   },
   "devDependencies": {
-    "@elliemae/pui-theme": "~2.2.5",
+    "@elliemae/pui-theme": "~2.3.0",
     "@testing-library/dom": "~8.11.1",
     "@testing-library/jest-dom": "~5.15.0",
     "@testing-library/react": "~12.1.2",
@@ -768,7 +744,7 @@
     "styled-system": "~5.1.5"
   },
   "peerDependencies": {
-    "@elliemae/pui-theme": "^2.2.5",
+    "@elliemae/pui-theme": "~2.3.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "styled-components": "^5.3.3",