@elliemae/ds-controlled-form 2.4.1-rc.4 → 2.4.1-rc.5

package/cjs/combobox/parts/menu-list/useItemRenderer.js

@@ -34,12 +34,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 const useItemRenderer = () => {
   const {
     props: {
-      options,
+      filteredOptions,
       onCreate,
       onChange,
       selectedValues,
       onFilter,
-      innerRef
+      allOptions
     },
     setShowPopover,
     inputValue,
@@ -54,11 +54,11 @@ const useItemRenderer = () => {
       if (inputValue) {
         onCreate(inputValue);
         setInputValue('');
-        onFilter('');
+        onFilter(allOptions, inputValue);
       }
     } else if (option.type === constants.MENU_OPTION_TYPES.OPTION) {
       if (!option.disabled) {
-        if (onFilter) onFilter('');
+        if (onFilter) onFilter(allOptions, inputValue);
         setInputValue('');
 
         if (!multiple) {
@@ -72,7 +72,7 @@ const useItemRenderer = () => {
 
     e.stopPropagation();
     e.preventDefault();
-  }, [onFilter, selectedValues, onChange, setShowPopover, multiple, innerRef]); // prevent blur from controls input
+  }, [onFilter, selectedValues, onChange, setShowPopover, multiple]); // prevent blur from controls input
 
   const handleOnMouseDown = React.useCallback(e => {
     e.preventDefault();
@@ -83,7 +83,7 @@ const useItemRenderer = () => {
     }
 
     return virtualListHelpers.virtualItems.map(vItem => {
-      const option = options[vItem.index];
+      const option = filteredOptions[vItem.index];
       const generalProps = {
         wrapperStyles: {
           position: 'absolute',
@@ -133,7 +133,7 @@ const useItemRenderer = () => {
               height: "16px",
               gutter: "xxs",
               alignItems: "center"
-            }, void 0, _StyledCreatableLabel || (_StyledCreatableLabel = /*#__PURE__*/_jsx__default["default"](styled.StyledCreatableLabel, {}, void 0, "Add:")), /*#__PURE__*/_jsx__default["default"]("span", {}, void 0, label));
+            }, void 0, _StyledCreatableLabel || (_StyledCreatableLabel = /*#__PURE__*/_jsx__default["default"](styled.StyledCreatableLabel, {}, void 0, "Add:")), /*#__PURE__*/_jsx__default["default"]("span", {}, void 0, "\"".concat(label, "\"")));
           },
           label: option.label,
           onClick: e => handleClick(option, e)
@@ -142,7 +142,7 @@ const useItemRenderer = () => {
 
       return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
     });
-  }, [options, focusOptionIdx, selectedValues, innerRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.virtualItems]);
+  }, [filteredOptions, focusOptionIdx, selectedValues, virtualListHelpers]);
 };
 
 exports.useItemRenderer = useItemRenderer;

package/cjs/combobox/parts/menu-list/useMenuListSetFocusOption.js

@@ -10,7 +10,7 @@ const useMenuListSetFocusOption = () => {
   const {
     props: {
       selectedValues,
-      options
+      filteredOptions
     },
     setFocusOptionIdx,
     hasFocus,
@@ -19,16 +19,16 @@ const useMenuListSetFocusOption = () => {
     scrollOptionIntoView
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const getFirstOption = React.useCallback(() => {
-    for (let i = 0; i < options.length; i += 1) if (!['section', 'separator'].includes(options[i].type) && !options[i].disabled) {
-      setFocusOptionIdx(options[i].dsId);
+    for (let i = 0; i < filteredOptions.length; i += 1) if (!['section', 'separator'].includes(filteredOptions[i].type) && !filteredOptions[i].disabled) {
+      setFocusOptionIdx(filteredOptions[i].dsId);
       break;
     }
-  }, [options, setFocusOptionIdx]);
+  }, [filteredOptions, setFocusOptionIdx]);
   React.useEffect(() => {
     scrollOptionIntoView(focusOptionIdx); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [focusOptionIdx]);
   React.useEffect(() => {
-    if (options.length === 0) {
+    if (filteredOptions.length === 0) {
       setFocusOptionIdx('');
     }
 
@@ -45,7 +45,7 @@ const useMenuListSetFocusOption = () => {
     }
 
     if (hasFocus) getFirstOption();
-  }, [getFirstOption, inputValue, selectedValues, hasFocus, setFocusOptionIdx, options.length]);
+  }, [getFirstOption, inputValue, selectedValues, hasFocus, setFocusOptionIdx, filteredOptions.length]);
 };
 
 exports.useMenuListSetFocusOption = useMenuListSetFocusOption;

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

@@ -20,7 +20,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function noop() {}
 const ComboboxPropTypes = _objectSpread(_objectSpread({}, dsPropsHelpers.globalAttributesPropTypes), {}, {
   placeholder: dsPropsHelpers.PropTypes.string.description("input's placeholder value").defaultValue(''),
-  options: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.array, dsPropsHelpers.PropTypes.object]).isRequired.description('List of options').defaultValue([]),
+  allOptions: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.array, dsPropsHelpers.PropTypes.object]).isRequired.description('List of original options').defaultValue([]),
+  filteredOptions: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.array, dsPropsHelpers.PropTypes.object]).description('List of filtered options to show in the menu based on the current internal input filter value').defaultValue([]),
   selectedValues: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.arrayOf(dsPropsHelpers.PropTypes.object), dsPropsHelpers.PropTypes.object]).isRequired.description('Array of option or single option selected'),
   disabled: dsPropsHelpers.PropTypes.bool.description('wheter or not the input is disabled').defaultValue('false'),
   autoFocus: dsPropsHelpers.PropTypes.bool.description('Whether the combo box uses auto focus or not').defaultValue('false'),

package/cjs/combobox/utils/listHelper.js

@@ -10,6 +10,8 @@ require('core-js/modules/esnext.iterator.some.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');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
 var constants = require('../constants.js');
 
 const getSelectableOptions = options => options.filter(option => option.type === constants.MENU_OPTION_TYPES.OPTION && !option.disabled);
@@ -34,15 +36,17 @@ const findInCircularList = function (list, from, criteria) {
 
   return from; // return same item
 };
+const getLastValueSelected = selectedValues => {
+  if (Array.isArray(selectedValues)) {
+    return selectedValues[selectedValues.length - 1];
+  }
+
+  return selectedValues;
+};
 const getFirstOption = (options, selectedValues, inputValue) => {
   if (!inputValue) {
-    if (Array.isArray(selectedValues) && selectedValues.length > 0) {
-      return selectedValues[selectedValues.length - 1].dsId;
-    }
-
-    if (selectedValues !== null && selectedValues !== void 0 && selectedValues.dsId) {
-      return selectedValues.dsId;
-    }
+    const lastValue = getLastValueSelected(selectedValues);
+    if (lastValue) return lastValue.dsId;
   }
 
   for (let i = 0; i < options.length; i += 1) if (!['section', 'separator'].includes(options[i].type) && !options[i].disabled) {
@@ -68,15 +72,39 @@ const getSuggestedValueOnChange = (selectedOption, selectedValues) => {
 
   return selectedOption;
 };
-const getLastValueSelected = selectedValues => {
-  if (Array.isArray(selectedValues)) {
-    return selectedValues[selectedValues.length - 1];
+const filterOptions = (inputValue, options) => options.filter(option => option.type === constants.MENU_OPTION_TYPES.OPTION && option.label.toLowerCase().includes(inputValue.toLowerCase()));
+const selectedValuesWithSections = (optionsToParse, multiSelectedValue) => {
+  var _items2;
+
+  const items = [];
+  if (optionsToParse) optionsToParse.forEach(option => {
+    // const isSelectedValue = multiSelectedValue.find((item) => item?.dsId === option.dsId);
+    if (option.type === constants.MENU_OPTION_TYPES.OPTION && isSelected(multiSelectedValue, option)) {
+      items.push(option);
+    }
+
+    if (option.type === constants.MENU_OPTION_TYPES.SECTION) {
+      var _items;
+
+      if (((_items = items[items.length - 1]) === null || _items === void 0 ? void 0 : _items.type) === constants.MENU_OPTION_TYPES.SECTION) {
+        items[items.length - 1] = option;
+      } else {
+        items.push(option);
+      }
+    }
+  });
+
+  if (((_items2 = items[items.length - 1]) === null || _items2 === void 0 ? void 0 : _items2.type) === constants.MENU_OPTION_TYPES.SECTION) {
+    items.pop();
   }
 
-  return selectedValues;
+  return items;
 };
+const getFilteredOptionsSelected = (filteredOption, selectedValues) => filteredOption.filter(option => option.type === constants.MENU_OPTION_TYPES.OPTION && isSelected(selectedValues, option));
 
+exports.filterOptions = filterOptions;
 exports.findInCircularList = findInCircularList;
+exports.getFilteredOptionsSelected = getFilteredOptionsSelected;
 exports.getFirstOption = getFirstOption;
 exports.getLastValueSelected = getLastValueSelected;
 exports.getOptions = getOptions;
@@ -85,3 +113,4 @@ exports.getSuggestedValueOnChange = getSuggestedValueOnChange;
 exports.isSelected = isSelected;
 exports.isSelectedValueEmpty = isSelectedValueEmpty;
 exports.isSelectedValueMultiple = isSelectedValueMultiple;
+exports.selectedValuesWithSections = selectedValuesWithSections;

package/cjs/index.js

@@ -18,7 +18,7 @@ var timeHelpers = require('./date-time-picker/utils/timeHelpers.js');
 var usePhoneMask = require('./mask-hook/hooks/usePhoneMask.js');
 var useNumberMask = require('./mask-hook/hooks/useNumberMask.js');
 var useSSNMask = require('./mask-hook/hooks/useSSNMask.js');
-var useZipCode = require('./mask-hook/hooks/useZipCode.js');
+var useZipCodeMask = require('./mask-hook/hooks/useZipCodeMask.js');
 var DSInputText = require('./text-input/DSInputText.js');
 var dataTestIds = require('./text-input/exported-related/data-test-ids.js');
 var theming = require('./text-input/exported-related/theming.js');
@@ -34,6 +34,7 @@ exports.DSAutocompleteWithSchema = Autocomplete.DSAutocompleteWithSchema;
 exports.DSControlledCheckbox = ControlledCheckbox.DSControlledCheckbox;
 exports.DSControlledCheckboxWithSchema = ControlledCheckbox.DSControlledCheckboxWithSchema;
 exports.DSComboBox = ComboBox.DSComboBox;
+exports.DSComboBoxV3 = ComboBox.DSComboBox;
 exports.DSComboBoxWithSchema = ComboBox.DSComboBoxWithSchema;
 exports.DSControlledDateRangePicker = ControlledDateRangePicker.DSControlledDateRangePicker;
 exports.DSControlledDateRangePickerWithSchema = ControlledDateRangePicker.DSControlledDateRangePickerWithSchema;
@@ -52,13 +53,17 @@ exports.getDayFromDateString = dateHelpers.getDayFromDateString;
 exports.getValidationDateStringMetaInfo = dateHelpers.getValidationDateStringMetaInfo;
 exports.getValidationTimeStringMetaInfo = timeHelpers.getValidationTimeStringMetaInfo;
 exports.UsePhoneMaskWithSchema = usePhoneMask.UsePhoneMaskWithSchema;
+exports.getPhoneMaskedValue = usePhoneMask.getPhoneMaskedValue;
 exports.usePhoneMask = usePhoneMask.usePhoneMask;
 exports.UseNumberMaskWithSchema = useNumberMask.UseNumberMaskWithSchema;
+exports.getNumberMaskedValue = useNumberMask.getNumberMaskedValue;
 exports.useNumberMask = useNumberMask.useNumberMask;
 exports.UseSSNMaskWithSchema = useSSNMask.UseSSNMaskWithSchema;
+exports.getSSNMaskedValue = useSSNMask.getSSNMaskedValue;
 exports.useSSNMask = useSSNMask.useSSNMask;
-exports.UseZipCodeMaskWithSchema = useZipCode.UseZipCodeMaskWithSchema;
-exports.useZipCode = useZipCode.useZipCode;
+exports.UseZipCodeMaskWithSchema = useZipCodeMask.UseZipCodeMaskWithSchema;
+exports.getUseZipMaskedValue = useZipCodeMask.getUseZipMaskedValue;
+exports.useZipCodeMask = useZipCodeMask.useZipCodeMask;
 exports.DSInputText = DSInputText.DSInputText;
 exports.DSInputTextWithSchema = DSInputText.DSInputTextWithSchema;
 exports.DSInputTextDataTestIds = dataTestIds.DSInputTextDataTestIds;

package/cjs/mask-hook/hooks/index.js

@@ -5,15 +5,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var usePhoneMask = require('./usePhoneMask.js');
 var useNumberMask = require('./useNumberMask.js');
 var useSSNMask = require('./useSSNMask.js');
-var useZipCode = require('./useZipCode.js');
+var useZipCodeMask = require('./useZipCodeMask.js');
 
 
 
 exports.UsePhoneMaskWithSchema = usePhoneMask.UsePhoneMaskWithSchema;
+exports.getPhoneMaskedValue = usePhoneMask.getPhoneMaskedValue;
 exports.usePhoneMask = usePhoneMask.usePhoneMask;
 exports.UseNumberMaskWithSchema = useNumberMask.UseNumberMaskWithSchema;
+exports.getNumberMaskedValue = useNumberMask.getNumberMaskedValue;
 exports.useNumberMask = useNumberMask.useNumberMask;
 exports.UseSSNMaskWithSchema = useSSNMask.UseSSNMaskWithSchema;
+exports.getSSNMaskedValue = useSSNMask.getSSNMaskedValue;
 exports.useSSNMask = useSSNMask.useSSNMask;
-exports.UseZipCodeMaskWithSchema = useZipCode.UseZipCodeMaskWithSchema;
-exports.useZipCode = useZipCode.useZipCode;
+exports.UseZipCodeMaskWithSchema = useZipCodeMask.UseZipCodeMaskWithSchema;
+exports.getUseZipMaskedValue = useZipCodeMask.getUseZipMaskedValue;
+exports.useZipCodeMask = useZipCodeMask.useZipCodeMask;

package/cjs/mask-hook/hooks/useNumberMask.js

@@ -164,8 +164,13 @@ const useNumberMask = props => {
     onBlur
   };
 };
+const getNumberMaskedValue = (value, opts) => {
+  const [maskedValue] = conformValue(value, value.length - 1, '', opts);
+  return maskedValue;
+};
 const UseNumberMaskWithSchema = dsPropsHelpers.describe(useNumberMask);
 UseNumberMaskWithSchema.propTypes = reactDescPropTypes.DSMaskNumberHookPropsTypes;
 
 exports.UseNumberMaskWithSchema = UseNumberMaskWithSchema;
+exports.getNumberMaskedValue = getNumberMaskedValue;
 exports.useNumberMask = useNumberMask;

package/cjs/mask-hook/hooks/usePhoneMask.js

@@ -86,8 +86,13 @@ const usePhoneMask = props => {
     onChange
   };
 };
+const getPhoneMaskedValue = (value, opts) => {
+  const [maskedValue] = conformValue(value, value.length - 1, '', opts);
+  return maskedValue;
+};
 const UsePhoneMaskWithSchema = dsPropsHelpers.describe(usePhoneMask);
 UsePhoneMaskWithSchema.propTypes = reactDescPropTypes.DSMaskPhoneHookPropsTypes;
 
 exports.UsePhoneMaskWithSchema = UsePhoneMaskWithSchema;
+exports.getPhoneMaskedValue = getPhoneMaskedValue;
 exports.usePhoneMask = usePhoneMask;

package/cjs/mask-hook/hooks/useSSNMask.js

@@ -65,8 +65,13 @@ const useSSNMask = props => {
     onChange
   };
 };
+const getSSNMaskedValue = value => {
+  const [maskedValue] = conformValue(value, value.length - 1, '');
+  return maskedValue;
+};
 const UseSSNMaskWithSchema = dsPropsHelpers.describe(useSSNMask);
 UseSSNMaskWithSchema.propTypes = reactDescPropTypes.DSMaskHookPropsTypes;
 
 exports.UseSSNMaskWithSchema = UseSSNMaskWithSchema;
+exports.getSSNMaskedValue = getSSNMaskedValue;
 exports.useSSNMask = useSSNMask;

package/cjs/mask-hook/hooks/{useZipCode.js → useZipCodeMask.js}

@@ -18,14 +18,14 @@ const zipCodeSpecialChars = [['-', 5]];
 
 const conformValue = (rawValue, cursorPos, lastKeyCode) => {
   // Work with digits only
-  let maskedValue = rawValue.split('').filter(char => char >= '0' && char <= '9'); // We only consider first 5 digits
+  let maskedValue = rawValue.split('').filter(char => char >= '0' && char <= '9'); // We only consider first 9 digits
 
-  maskedValue = maskedValue.slice(0, 6);
+  maskedValue = maskedValue.slice(0, 9);
   const maskedPos = getPartialMaskedPos.getPartialMaskedPos(rawValue, maskedValue, cursorPos);
   return addSpecialCharacters.addSpecialCharacters(maskedValue, zipCodeSpecialChars, maskedPos, lastKeyCode);
 };
 
-const useZipCode = props => {
+const useZipCodeMask = props => {
   const propsWithDefault = dsPropsHelpers.useMemoMergePropsWithDefault(props, reactDescPropTypes.DSMaskHookDefaultProps);
   dsPropsHelpers.useValidateTypescriptPropTypes(propsWithDefault, reactDescPropTypes.DSMaskHookPropsTypes);
   const {
@@ -62,8 +62,13 @@ const useZipCode = props => {
     onChange
   };
 };
-const UseZipCodeMaskWithSchema = dsPropsHelpers.describe(useZipCode);
+const getUseZipMaskedValue = value => {
+  const [maskedValue] = conformValue(value, value.length - 1, '');
+  return maskedValue;
+};
+const UseZipCodeMaskWithSchema = dsPropsHelpers.describe(useZipCodeMask);
 UseZipCodeMaskWithSchema.propTypes = reactDescPropTypes.DSMaskHookPropsTypes;
 
 exports.UseZipCodeMaskWithSchema = UseZipCodeMaskWithSchema;
-exports.useZipCode = useZipCode;
+exports.getUseZipMaskedValue = getUseZipMaskedValue;
+exports.useZipCodeMask = useZipCodeMask;

package/cjs/mask-hook/index.js

@@ -5,15 +5,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var usePhoneMask = require('./hooks/usePhoneMask.js');
 var useNumberMask = require('./hooks/useNumberMask.js');
 var useSSNMask = require('./hooks/useSSNMask.js');
-var useZipCode = require('./hooks/useZipCode.js');
+var useZipCodeMask = require('./hooks/useZipCodeMask.js');
 
 
 
 exports.UsePhoneMaskWithSchema = usePhoneMask.UsePhoneMaskWithSchema;
+exports.getPhoneMaskedValue = usePhoneMask.getPhoneMaskedValue;
 exports.usePhoneMask = usePhoneMask.usePhoneMask;
 exports.UseNumberMaskWithSchema = useNumberMask.UseNumberMaskWithSchema;
+exports.getNumberMaskedValue = useNumberMask.getNumberMaskedValue;
 exports.useNumberMask = useNumberMask.useNumberMask;
 exports.UseSSNMaskWithSchema = useSSNMask.UseSSNMaskWithSchema;
+exports.getSSNMaskedValue = useSSNMask.getSSNMaskedValue;
 exports.useSSNMask = useSSNMask.useSSNMask;
-exports.UseZipCodeMaskWithSchema = useZipCode.UseZipCodeMaskWithSchema;
-exports.useZipCode = useZipCode.useZipCode;
+exports.UseZipCodeMaskWithSchema = useZipCodeMask.UseZipCodeMaskWithSchema;
+exports.getUseZipMaskedValue = useZipCodeMask.getUseZipMaskedValue;
+exports.useZipCodeMask = useZipCodeMask.useZipCodeMask;

package/esm/autocomplete/Autocomplete.js

@@ -1,11 +1,10 @@
 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, useMemoMergePropsWithDefault, useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
 import { useAutocomplete } from './config/useAutocomplete.js';
 import { Container } from './parts/container/Container.js';
-import { propTypes } from './propTypes.js';
 import { defaultProps, AutocompleteContext } from './AutocompleteCTX.js';
+import { propTypes } from './react-desc-prop-types.js';
 
 var _Container;
 

package/esm/autocomplete/AutocompleteCTX.js

@@ -3,18 +3,10 @@ import { noop } from 'lodash';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 const defaultProps = {
-  placeholder: '',
-  options: [],
-  selectedValues: '',
-  hasError: false,
-  isLoading: false,
-  autoFocus: false,
+  zIndex: 10,
+  withoutPortal: false,
   startPlacementPreference: 'bottom-start',
-  placementOrderPreference: ['bottom-start', 'bottom-end'],
-  onChange: noop,
-  onKeyDown: noop,
-  onFilter: noop,
-  onMenuOpen: noop
+  placementOrderPreference: ['bottom-start', 'bottom-end']
 };
 const defaultContext = {
   props: defaultProps,
@@ -25,9 +17,6 @@ const defaultContext = {
   setReferenceElement: noop,
   inputRef: /*#__PURE__*/createRef(),
   listRef: /*#__PURE__*/createRef(),
-  wrapperListRef: /*#__PURE__*/createRef(),
-  controlsWrapperRef: /*#__PURE__*/createRef(),
-  selectedOptionsRef: /*#__PURE__*/createRef(),
   focusOptionIdx: '',
   setCurrentOption: noop
 };

package/esm/autocomplete/AutocompleteDataTestids.js

@@ -1,13 +1,7 @@
 const AutocompleteDataTestid = {
-  INPUT: 'autocomplete-input',
   LIST: 'autocomplete-menu-list',
-  SELECTED_VALUES: 'autocomplete-selected-values',
-  SELECT_ALL_BUTTON: 'autocomplete-all-btn',
-  CLEAR_ALL_BUTTON: 'autocomplete-clear-btn',
-  DROPDOWN: 'autocomplete-dropdown-btn',
   OPTION: 'autocomplete-option',
-  SHOW_ALL_BUTTON: 'autocomplete-show-all-btn',
-  SHOW_SELECTED_OPTIONS_BUTTON: 'autocomplete-selected-options-btn'
+  CONTAINER: 'autocomplete-container'
 };
 
 export { AutocompleteDataTestid };

package/esm/autocomplete/config/useAutocomplete.js

@@ -1,30 +1,37 @@
-import 'core-js/modules/esnext.async-iterator.filter.js';
-import 'core-js/modules/esnext.iterator.constructor.js';
-import 'core-js/modules/esnext.iterator.filter.js';
 import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import { useState, useRef, useCallback, useMemo } from 'react';
+import '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 { useRef, useState, useCallback, useEffect, useMemo } from 'react';
+import { useMemoMergePropsWithDefault, useValidateTypescriptPropTypes } from '@elliemae/ds-props-helpers';
 import { useVirtual } from 'react-virtual';
-import { useGetAutocompleteWithDefaultsProps } from './useGetPropsWithDefault.js';
+import { propTypes } from '../react-desc-prop-types.js';
+import { defaultProps } from '../AutocompleteCTX.js';
+import { getFirstOption } from '../utils/listHelper.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 useAutocomplete = props => {
+  const defaultPropsWithInnerRef = _objectSpread(_objectSpread({}, defaultProps), {}, {
+    innerRef: useRef(null)
+  });
+
+  const propsWithDefault = useMemoMergePropsWithDefault(props, defaultPropsWithInnerRef);
+  useValidateTypescriptPropTypes(propsWithDefault, propTypes);
   const [showPopover, setShowPopover] = useState(false);
   const [referenceElement, setReferenceElement] = useState(null);
   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 propsWithDefaults = useGetAutocompleteWithDefaultsProps(props);
   const {
-    options
-  } = propsWithDefaults; // ===========================================================================
+    options,
+    filter
+  } = propsWithDefault; // ===========================================================================
   // Virtualization setup
   // ===========================================================================
 
@@ -43,8 +50,16 @@ const useAutocomplete = props => {
     };
     virtualListHelpers.scrollToIndex(options.findIndex(opt => opt.dsId === dsId), opts);
   }, [options, virtualListHelpers]);
+  useEffect(() => {
+    if (filter.length === 0 || options.length === 0) {
+      setShowPopover(false);
+    }
+  }, [filter, options.length, setShowPopover]);
+  useEffect(() => {
+    setCurrentOption(getFirstOption(options));
+  }, [options, showPopover]);
   const ctx = useMemo(() => ({
-    props: _objectSpread({}, propsWithDefaults),
+    props: _objectSpread({}, propsWithDefault),
     virtualListHelpers,
     showPopover,
     referenceElement,
@@ -52,13 +67,11 @@ const useAutocomplete = props => {
     listRef,
     focusOptionIdx,
     selectedOptionsRef,
-    controlsWrapperRef,
-    wrapperListRef,
     setCurrentOption,
     scrollOptionIntoView,
     setReferenceElement,
     setShowPopover
-  }), [scrollOptionIntoView, propsWithDefaults, virtualListHelpers, focusOptionIdx, wrapperListRef, showPopover, referenceElement, inputRef, selectedOptionsRef, controlsWrapperRef, listRef]);
+  }), [scrollOptionIntoView, propsWithDefault, virtualListHelpers, focusOptionIdx, showPopover, referenceElement, inputRef, selectedOptionsRef, listRef]);
   return ctx;
 };
 

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

@@ -1,40 +1,56 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import { useContext, useCallback } from 'react';
+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 React, { useContext, useEffect, useCallback } from 'react';
 import { DSPopperJS } from '@elliemae/ds-popperjs';
 import { AutocompleteContext } from '../../AutocompleteCTX.js';
-import { StyledPopperWrapper, StyledContainerInline, StyledContainerWithPopper } from './styled.js';
-import { Controls } from '../controls/Controls.js';
+import { StyledContainerWithPopper, StyledPopperWrapper } from './styled.js';
 import { MenuList } from '../menu-list/MenuList.js';
-import { jsxs, Fragment } from 'react/jsx-runtime';
-
-var _Controls, _MenuList, _MenuList2;
+import { useKeyboardNavigation } from './useKeyboardNavigation.js';
+import { AutocompleteDataTestid } from '../../AutocompleteDataTestids.js';
+import { jsxs } from 'react/jsx-runtime';
 
+var _StyledPopperWrapper;
 const Container = () => {
   const {
     props: {
-      inline,
       startPlacementPreference,
+      children,
+      filter,
       placementOrderPreference
     },
     showPopover,
-    inputRef,
     setReferenceElement,
     setShowPopover,
     referenceElement
   } = useContext(AutocompleteContext);
+  useEffect(() => {
+    const closePopper = () => {
+      setShowPopover(false);
+    };
+
+    window.addEventListener('blur', closePopper);
+    return () => {
+      window.removeEventListener('blur', closePopper);
+    };
+  }, [setShowPopover]);
   const handleCloseMenu = useCallback(() => {
     setShowPopover(false);
-    if (inputRef.current) inputRef.current.blur();
-  }, [inputRef, setShowPopover]);
-  const handleMouseDown = useCallback(e => {
-    e.preventDefault();
-  }, []);
-  const StyledContainer = inline ? StyledContainerInline : StyledContainerWithPopper;
-  return /*#__PURE__*/jsxs(Fragment, {
-    children: [/*#__PURE__*/jsxs(StyledContainer, {
-      ref: setReferenceElement,
-      children: [_Controls || (_Controls = /*#__PURE__*/_jsx(Controls, {})), inline ? _MenuList || (_MenuList = /*#__PURE__*/_jsx(MenuList, {})) : null]
-    }), /*#__PURE__*/_jsx(DSPopperJS, {
+  }, [setShowPopover]);
+  const input = React.Children.only(children);
+  const {
+    onInputKeyDown
+  } = useKeyboardNavigation();
+  return /*#__PURE__*/jsxs(StyledContainerWithPopper, {
+    ref: setReferenceElement,
+    role: "combobox",
+    "aria-autocomplete": "list",
+    "aria-controls": "autocomplete-listbox",
+    "aria-expanded": showPopover,
+    onKeyDown: onInputKeyDown,
+    "data-testid": AutocompleteDataTestid.CONTAINER,
+    children: [input, filter && /*#__PURE__*/_jsx(DSPopperJS, {
       customOffset: [0, 5],
       closeContextMenu: handleCloseMenu,
       referenceElement: referenceElement,
@@ -45,10 +61,9 @@ const Container = () => {
       withoutArrow: true,
       withoutAnimation: true,
       zIndex: 10
-    }, void 0, /*#__PURE__*/_jsx(StyledPopperWrapper, {
-      tabIndex: -1,
-      onMouseDown: handleMouseDown
-    }, void 0, _MenuList2 || (_MenuList2 = /*#__PURE__*/_jsx(MenuList, {}))))]
+    }, void 0, _StyledPopperWrapper || (_StyledPopperWrapper = /*#__PURE__*/_jsx(StyledPopperWrapper, {
+      tabIndex: -1
+    }, void 0, /*#__PURE__*/_jsx(MenuList, {}))))]
   });
 };
 

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

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