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

package/cjs/combobox/parts/header-list/HeaderList.js

@@ -22,6 +22,7 @@ const HeaderList = () => {
   const {
     props: {
       selectedValues,
+      filteredOptions,
       onSelectAll
     },
     showSelectedOptions,
@@ -40,15 +41,15 @@ const HeaderList = () => {
   } = useHeaderListHandlers.useHeaderListHandlers();
   return /*#__PURE__*/_jsx__default["default"](styled.StyledHeaderListWrapper, {
     onKeyDown: handleKeyDown,
-    onMouseDown: handleOnMouseDown
+    onMouseDown: handleOnMouseDown,
+    "data-testid": ComboboxDataTestids.ComboboxDataTestid.MULTISELECT.HEADER_LIST
   }, void 0, /*#__PURE__*/_jsx__default["default"](styled.StyledSelectAllCheckbox, {}, void 0, onSelectAll && /*#__PURE__*/_jsx__default["default"](ControlledCheckbox.DSControlledCheckbox, {
     checked: checkboxStatus,
-    "aria-controls": checkboxStatus === 'mixed' ? multiSelectedValues.map(item => item.dsId).join(' ') : '',
+    "aria-controls": filteredOptions.map(item => item.dsId).join(' '),
     name: "select-all-checkbox",
     "aria-label": "Select/Unselect All Items",
     id: "select-all-checkbox",
     onChange: handleSelectAllCheckboxChange,
-    "data-testid": ComboboxDataTestids.ComboboxDataTestid.MULTISELECT.SELECT_ALL_CHECKBOX,
     onKeyDown: handleCheckAllOnTab,
     innerRef: selectAllCheckboxRef
   })), /*#__PURE__*/_jsx__default["default"](styled.StyledSelectedItems, {}, void 0, multiSelectedValues.length > 0 ? /*#__PURE__*/_jsx__default["default"](styled.StyledButtonSelection, {

package/cjs/combobox/parts/header-list/useHeaderListHandlers.js

@@ -20,7 +20,7 @@ const useHeaderListHandlers = () => {
     },
     showSelectedOptions,
     setShowSelectedOptions,
-    setShowPopover
+    setMenuState
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const multiSelectedValues = selectedValues;
   const selectableOptions = listHelper.getSelectableOptions(filteredOptions);
@@ -55,27 +55,31 @@ const useHeaderListHandlers = () => {
     e.preventDefault();
     setShowSelectedOptions(!showSelectedOptions);
   }, [setShowSelectedOptions, showSelectedOptions]); // when pressing escape on each header list button we close the menu
+  // and set focus on input
 
   const handleKeyDown = React.useCallback(e => {
     if (e.key === 'Escape') {
-      setShowPopover(false);
+      var _innerRef$current;
+
+      setMenuState(false, 'close', e);
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
     }
-  }, [setShowPopover]); // when hitting tab on selected values button filter we target the input again
+  }, [setMenuState, innerRef]); // when hitting tab on selected values button filter we target the input again
 
   const handleFilterSelectionBtnOnTab = React.useCallback(e => {
     if (e.key === 'Tab' && !e.shiftKey) {
-      var _innerRef$current;
+      var _innerRef$current2;
 
       e.preventDefault();
-      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
+      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
     }
   }, [innerRef]);
   const handleCheckAllOnTab = React.useCallback(e => {
     if (e.key === 'Tab' && !e.shiftKey && multiSelectedValues.length === 0) {
-      var _innerRef$current2;
+      var _innerRef$current3;
 
       e.preventDefault();
-      (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.focus();
+      (_innerRef$current3 = innerRef.current) === null || _innerRef$current3 === void 0 ? void 0 : _innerRef$current3.focus();
     }
   }, [innerRef, multiSelectedValues]);
   React.useEffect(() => {

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

@@ -16,11 +16,14 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-var _HeaderList, _StyledNoResultsWrapp;
+var _HeaderList;
 const MenuList = () => {
+  var _StyledNoResultsWrapp;
+
   const {
     props: {
       menuMinWidth,
+      noOptionsMessage,
       menuMaxHeight,
       onCreate,
       inline,
@@ -48,7 +51,9 @@ const MenuList = () => {
     inline: inline,
     onMouseDown: preventLoseInputFocus,
     width: width,
-    minWidth: menuMinWidth,
+    minWidth: menuMinWidth // we use width as key to force react virtual re-render on window resize
+    // and update the item height accordly
+    ,
     children: [withHeader && (_HeaderList || (_HeaderList = /*#__PURE__*/_jsx__default["default"](HeaderList.HeaderList, {}))), filteredOptions.length > 0 || onCreate ? /*#__PURE__*/jsxRuntime.jsx(styled.StyledVirtualListWrapper, {
       inline: inline,
       maxHeight: menuMaxHeight,
@@ -64,9 +69,9 @@ const MenuList = () => {
         }
       }, void 0, ItemRenderer)
     }) : _StyledNoResultsWrapp || (_StyledNoResultsWrapp = /*#__PURE__*/_jsx__default["default"](styled.StyledNoResultsWrapper, {
-      "aria-live": "polite"
-    }, void 0, "No matches found"))]
-  }), [wrapperListRef, inline, preventLoseInputFocus, width, menuMinWidth, withHeader, filteredOptions.length, onCreate, menuMaxHeight, listRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.totalSize, ItemRenderer]);
+      role: "alert"
+    }, void 0, noOptionsMessage))]
+  }, width), [wrapperListRef, inline, preventLoseInputFocus, width, menuMinWidth, withHeader, filteredOptions.length, onCreate, menuMaxHeight, listRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.totalSize, ItemRenderer, noOptionsMessage]);
 };
 
 exports.MenuList = MenuList;

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

@@ -9,8 +9,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _taggedTemplateLiteral__default = /*#__PURE__*/_interopDefaultLegacy(_taggedTemplateLiteral);
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-const StyledListWrapper = dsSystem.styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral__default["default"](["\n  min-width: ", ";\n  width: ", ";\n  background-color: #ffffff;\n"])), _ref => {
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+const StyledListWrapper = dsSystem.styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral__default["default"](["\n  min-width: ", ";\n  width: ", ";\n  background-color: #ffffff;\n  max-height: ", ";\n  z-index: 100;\n"])), _ref => {
   let {
     inline,
     minWidth
@@ -21,23 +21,30 @@ const StyledListWrapper = dsSystem.styled.div(_templateObject || (_templateObjec
     width
   } = _ref2;
   return "".concat(width, "px");
+}, _ref3 => {
+  let {
+    maxHeight
+  } = _ref3;
+  return "".concat(maxHeight, "px");
 });
-const StyledList = dsSystem.styled.ul(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral__default["default"](["\n  position: relative;\n  padding: 0;\n"])));
-const StyledVirtualListWrapper = dsSystem.styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral__default["default"](["\n  overflow-y: auto;\n  margin-top: ", ";\n\n  max-height: ", ";\n"])), _ref3 => {
+const StyledList = dsSystem.styled.ul(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral__default["default"](["\n  position: relative;\n  padding: 0;\n  background-color: #ffffff;\n  overflow-x: hidden;\n"])));
+const StyledVirtualListWrapper = dsSystem.styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral__default["default"](["\n  overflow-y: auto;\n  margin-top: ", ";\n  max-height: ", ";\n"])), _ref4 => {
   let {
     withHeader
-  } = _ref3;
+  } = _ref4;
   return withHeader ? '28px' : '';
-}, _ref4 => {
+}, _ref5 => {
   let {
     maxHeight
-  } = _ref4;
-  return !maxHeight ? '400px' : "".concat(maxHeight, "px");
+  } = _ref5;
+  return maxHeight ? "".concat(maxHeight, "px") : '300px';
 });
 const StyledCreatableLabel = dsSystem.styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral__default["default"](["\n  font-weight: bold;\n  font-style: italic;\n"])));
-const StyledNoResultsWrapper = dsSystem.styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral__default["default"](["\n  padding: 16px;\n"])));
+const StyledCreatableValue = dsSystem.styled.span(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral__default["default"](["\n  word-break: break-all;\n"])));
+const StyledNoResultsWrapper = dsSystem.styled.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral__default["default"](["\n  padding: 16px;\n"])));
 
 exports.StyledCreatableLabel = StyledCreatableLabel;
+exports.StyledCreatableValue = StyledCreatableValue;
 exports.StyledList = StyledList;
 exports.StyledListWrapper = StyledListWrapper;
 exports.StyledNoResultsWrapper = StyledNoResultsWrapper;

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

@@ -41,7 +41,7 @@ const useItemRenderer = () => {
       onFilter,
       allOptions
     },
-    setShowPopover,
+    setMenuState,
     inputValue,
     focusOptionIdx,
     setInputValue,
@@ -49,20 +49,21 @@ const useItemRenderer = () => {
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
   const multiple = Array.isArray(selectedValues);
   const CBItem = multiple ? dsForm.MultiMenuItem : dsForm.SingleMenuItem;
+  const handleOnCreateClick = React.useCallback(() => {
+    if (inputValue && onCreate) {
+      onCreate(inputValue);
+      setInputValue('');
+      if (onFilter) onFilter(allOptions, inputValue);
+    }
+  }, [onFilter, onCreate, inputValue, allOptions, setInputValue]);
   const handleClick = React.useCallback((option, e) => {
-    if (option.type === constants.INTERNAL_MENU_OPTION_TYPES.CREATABLE && onCreate && onFilter) {
-      if (inputValue) {
-        onCreate(inputValue);
-        setInputValue('');
-        onFilter(allOptions, inputValue);
-      }
-    } else if (option.type === constants.MENU_OPTION_TYPES.OPTION) {
+    if (option.type === constants.MENU_OPTION_TYPES.OPTION) {
       if (!option.disabled) {
         if (onFilter) onFilter(allOptions, inputValue);
         setInputValue('');
 
         if (!multiple) {
-          setShowPopover(false);
+          setMenuState(false, 'selectOption', e);
         }
 
         onChange(listHelper.getSuggestedValueOnChange(option, selectedValues), option, e);
@@ -72,7 +73,7 @@ const useItemRenderer = () => {
 
     e.stopPropagation();
     e.preventDefault();
-  }, [onFilter, selectedValues, onChange, setShowPopover, multiple]); // prevent blur from controls input
+  }, [onFilter, selectedValues, allOptions, onChange, setMenuState, multiple]); // prevent blur from controls input
 
   const handleOnMouseDown = React.useCallback(e => {
     e.preventDefault();
@@ -87,9 +88,10 @@ const useItemRenderer = () => {
       const generalProps = {
         wrapperStyles: {
           position: 'absolute',
-          top: vItem.start,
+          top: 0,
           left: 0,
-          width: '100%'
+          width: '100%',
+          transform: "translateY(".concat(vItem.start, "px)")
         },
         key: "".concat(option.dsId),
         innerRef: vItem.measureRef
@@ -129,14 +131,14 @@ const useItemRenderer = () => {
               label
             } = _ref;
             return /*#__PURE__*/_jsx__default["default"](dsGrid.Grid, {
+              p: "8px",
               cols: ['min-content', 'auto'],
-              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, "\"".concat(label, "\"")));
+            }, void 0, _StyledCreatableLabel || (_StyledCreatableLabel = /*#__PURE__*/_jsx__default["default"](styled.StyledCreatableLabel, {}, void 0, "Add:")), /*#__PURE__*/_jsx__default["default"](styled.StyledCreatableValue, {}, void 0, "\"".concat(label, "\"")));
           },
           label: option.label,
-          onClick: e => handleClick(option, e)
+          onClick: handleOnCreateClick
         }));
       }
 

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

@@ -29,7 +29,7 @@ const MultiSelectedValuesContainer = () => {
   const correctPillsToShow = useGroupPills.useGroupPills();
   return React.useMemo(() => /*#__PURE__*/_jsx__default["default"]("div", {
     style: {
-      width: 'max-content'
+      width: multiSelectedValue.length > 0 ? 'max-content' : '0px'
     },
     "data-testid": ComboboxDataTestids.ComboboxDataTestid.SELECTED_VALUES
   }, void 0, /*#__PURE__*/_jsx__default["default"](dsPills.DSPillGroupV2, {

package/cjs/combobox/parts/multi-selected-values-container/RemovableSelectedValuePill.js

@@ -33,6 +33,8 @@ const RemovableSelectedValuePill = props => {
     onRemove: e => {
       var _innerRef$current;
 
+      // preventing the menu to be opened
+      e.stopPropagation();
       onChange(listHelper.getSuggestedValueOnChange(pill, selectedValues), pill, e);
       (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.focus();
     }

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

@@ -29,8 +29,11 @@ const useGroupPills = () => {
     controlsWrapperRef,
     pillGroupRef
   } = React.useContext(ComboBoxCTX.ComboBoxContext);
-  const multiSelectedValues = selectedValues;
-  const [pillsToShow, setPillsToShow] = React.useState(multiSelectedValues.length);
+  const multiSelectedValues = selectedValues; // 30 represent 30 pills maximum to calculate the grouped pill. this fix the load time issue
+  // when combobox is receiving a huge amount of options.
+
+  const selectedValuesLength = Math.min(30, multiSelectedValues.length);
+  const [pillsToShow, setPillsToShow] = React.useState(selectedValuesLength);
   const {
     width
   } = dsUtilities.useOnElementResize(controlsWrapperRef);
@@ -38,28 +41,28 @@ const useGroupPills = () => {
     width: widthInput
   } = dsUtilities.useOnElementResize(innerRef || null);
   React.useEffect(() => {
-    if (multiSelectedValues.length !== pillsToShow) {
-      setPillsToShow(multiSelectedValues.length);
+    if (selectedValuesLength !== pillsToShow) {
+      setPillsToShow(selectedValuesLength);
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  }, [multiSelectedValues.length, width, widthInput]);
+  }, [selectedValuesLength, width, widthInput]);
   React.useLayoutEffect(() => {
-    if (selectedOptionsRef.current) {
+    if (selectedOptionsRef.current && pillGroupRef.current) {
       if (pillGroupRef.current) pillGroupRef.current.style.width = 'max-content';
       let lastPillFit = -1;
       let currentWidth = 0;
       const referenceWidth = selectedOptionsRef.current.offsetWidth;
-      const pills = [...selectedOptionsRef.current.querySelectorAll(disabled ? '.ds-pill-wrapper-value' : '.ds-pill-wrapper-removable')];
+      const pills = [...pillGroupRef.current.querySelectorAll(disabled ? '.ds-pill-wrapper-value' : '.ds-pill-wrapper-removable')];
       const pillsWidth = pills.map(pill => pill === null || pill === void 0 ? void 0 : pill.offsetWidth);
       pillsWidth.forEach((pillWidth, idx) => {
         currentWidth += pillWidth;
 
-        if (currentWidth + getGroupedPillWidth(multiSelectedValues.length - idx - 1) <= referenceWidth) {
+        if (currentWidth + getGroupedPillWidth(selectedValuesLength - idx - 1) <= referenceWidth) {
           lastPillFit = idx;
         }
       });
 
-      if (!(multiSelectedValues.length > 0 && pillsToShow !== multiSelectedValues.length)) {
+      if (!(selectedValuesLength > 0 && pillsToShow !== selectedValuesLength)) {
         const nextPillsToShow = lastPillFit + 1;
 
         if (nextPillsToShow !== pillsToShow) {
@@ -69,7 +72,7 @@ const useGroupPills = () => {
 
       if (pillGroupRef.current) pillGroupRef.current.style.width = 'fit-content';
     }
-  }, [selectedOptionsRef, innerRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput, disabled]);
+  }, [selectedOptionsRef, innerRef, multiSelectedValues, pillsToShow, pillGroupRef, width, widthInput, disabled, selectedValuesLength]);
   return pillsToShow || 1;
 };
 

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

@@ -26,12 +26,13 @@ const ComboboxPropTypes = _objectSpread(_objectSpread({}, dsPropsHelpers.globalA
   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'),
   hasError: dsPropsHelpers.PropTypes.bool.description('Whether the combo box has error or not').defaultValue('false'),
+  noOptionsMessage: dsPropsHelpers.PropTypes.string.description('Custome message to be display when no matches found after filtering').defaultValue('No Matches Found'),
+  closeMenuOnScroll: dsPropsHelpers.PropTypes.oneOfType([dsPropsHelpers.PropTypes.func, dsPropsHelpers.PropTypes.bool]).description('If true, close the select menu when the user scrolls the document/body.').defaultValue(false),
   onChange: dsPropsHelpers.PropTypes.func.isRequired.description('function triggered when an option is selected it will send the options selected').defaultValue('() => {}'),
   onFilter: dsPropsHelpers.PropTypes.func.description('function triggered when user type in the combobox input').defaultValue(''),
   onCreate: dsPropsHelpers.PropTypes.func.description('function triggered when user select "create" a new item whenever is not a match in the all option list').defaultValue(''),
   onCancel: dsPropsHelpers.PropTypes.func.description('function triggered when user press ESC key').defaultValue('() => {}'),
-  onMenuOpen: dsPropsHelpers.PropTypes.func.description('function triggered when user open the menu list').defaultValue('() => {}'),
-  onMenuClose: dsPropsHelpers.PropTypes.func.description('function triggered when user close the menu list').defaultValue('() => {}'),
+  onMenuChange: dsPropsHelpers.PropTypes.func.description('function triggered when user open or close the menu list').defaultValue('() => {}'),
   inputMinWidth: dsPropsHelpers.PropTypes.any.description('Minimum width for the combo box input controller').defaultValue(undefined),
   menuMinWidth: dsPropsHelpers.PropTypes.any.description('Minimum width for the dropdown menu').defaultValue(undefined),
   menuMaxHeight: dsPropsHelpers.PropTypes.any.description('Maximum height for the dropdown menu').defaultValue(undefined),

package/cjs/combobox/theming.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const DSComboBoxName = 'ds-combobox';
+const DSComboboxSlots = {
+  CONTAINER: 'root',
+  INPUT_WRAPPER: 'input-wrapper',
+  INPUT: 'input'
+};
+
+exports.DSComboBoxName = DSComboBoxName;
+exports.DSComboboxSlots = DSComboboxSlots;

package/cjs/combobox/utils/listHelper.js

@@ -51,7 +51,8 @@ const getFirstOption = (options, selectedValues, inputValue) => {
 
   for (let i = 0; i < options.length; i += 1) if (!['section', 'separator'].includes(options[i].type) && !options[i].disabled) {
     return options[i].dsId;
-  }
+  } // list of disabled item results return ''
+
 
   return '';
 };
@@ -101,6 +102,15 @@ const selectedValuesWithSections = (optionsToParse, multiSelectedValue) => {
   return items;
 };
 const getFilteredOptionsSelected = (filteredOption, selectedValues) => filteredOption.filter(option => option.type === constants.MENU_OPTION_TYPES.OPTION && isSelected(selectedValues, option));
+const scrollIfNeeded = function (elem) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    behavior: 'smooth',
+    block: 'end',
+    inline: 'nearest'
+  };
+  const bounding = elem.getBoundingClientRect();
+  if (!(bounding.top >= 0 && bounding.left >= 0 && bounding.bottom <= (window.innerHeight || document.documentElement.clientHeight) && bounding.right <= (window.innerWidth || document.documentElement.clientWidth))) elem.scrollIntoView(options);
+};
 
 exports.filterOptions = filterOptions;
 exports.findInCircularList = findInCircularList;
@@ -113,4 +123,5 @@ exports.getSuggestedValueOnChange = getSuggestedValueOnChange;
 exports.isSelected = isSelected;
 exports.isSelectedValueEmpty = isSelectedValueEmpty;
 exports.isSelectedValueMultiple = isSelectedValueMultiple;
+exports.scrollIfNeeded = scrollIfNeeded;
 exports.selectedValuesWithSections = selectedValuesWithSections;

package/cjs/date-time-picker/config/useChangeHandlers.js

@@ -26,7 +26,7 @@ const useChangeHandlers = _ref => {
     relevantValues,
     destructuredValues,
     propsBasedOnType,
-    DOMRefs
+    focusTrackers
   } = _ref;
   const {
     tempDateString,
@@ -60,8 +60,8 @@ const useChangeHandlers = _ref => {
     meridiem
   } = destructuredValues;
   const {
-    firstSegmentRef
-  } = DOMRefs;
+    trackFocusFirstSegment
+  } = focusTrackers;
   const getDateMetaInfo = React.useCallback(function () {
     let newDateString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     let metaInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -91,7 +91,7 @@ const useChangeHandlers = _ref => {
     setTimeString(newTimeString);
     const newDateTimeString = "".concat(newDateString, " ").concat(newTimeString);
 
-    const newMetaInfo = _objectSpread(_objectSpread(_objectSpread({}, getTimeMetaInfo(newTimeString, metaInfo)), getDateMetaInfo(newDateString, metaInfo)), {}, {
+    const newMetaInfo = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, metaInfo), getTimeMetaInfo(newTimeString, metaInfo)), getDateMetaInfo(newDateString, metaInfo)), {}, {
       newDateString,
       newTimeString,
       newDateTimeString
@@ -108,7 +108,7 @@ const useChangeHandlers = _ref => {
     setTempDateString(newDateString);
     const newDateTimeString = "".concat(newDateString, " ").concat(tempTimeString);
 
-    const newMetaInfo = _objectSpread(_objectSpread(_objectSpread({}, getTimeMetaInfo(tempTimeString, metaInfo)), getDateMetaInfo(newDateString, metaInfo)), {}, {
+    const newMetaInfo = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, metaInfo), getTimeMetaInfo(tempTimeString, metaInfo)), getDateMetaInfo(newDateString, metaInfo)), {}, {
       newDateString,
       newTimeString: tempTimeString,
       newDateTimeString
@@ -124,7 +124,7 @@ const useChangeHandlers = _ref => {
     setTimeString(newTimeString);
     const newDateTimeString = "".concat(tempDateString, " ").concat(newTimeString);
 
-    const newMetaInfo = _objectSpread(_objectSpread(_objectSpread({}, getTimeMetaInfo(newTimeString, metaInfo)), getDateMetaInfo(tempDateString, metaInfo)), {}, {
+    const newMetaInfo = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, metaInfo), getTimeMetaInfo(newTimeString, metaInfo)), getDateMetaInfo(tempDateString, metaInfo)), {}, {
       newDateTimeString,
       newDateString: tempDateString,
       newTimeString
@@ -241,12 +241,8 @@ const useChangeHandlers = _ref => {
     if (isDateTime) handleChangeComposedDateTimeString('__/__/____', '__:__ __', metaInfo);
     if (isDate) handleChangeComposedDateString('__/__/____', metaInfo);
     if (isTime) handleChangeComposedTimeString('__:__ __', metaInfo);
-    setTimeout(() => {
-      var _firstSegmentRef$curr;
-
-      (_firstSegmentRef$curr = firstSegmentRef.current) === null || _firstSegmentRef$curr === void 0 ? void 0 : _firstSegmentRef$curr.focus();
-    });
-  }, [appOnDayChange, appOnHourChange, appOnMeridiemChange, appOnMinuteChange, appOnMonthChange, appOnYearChange, firstSegmentRef, handleChangeComposedDateString, handleChangeComposedDateTimeString, handleChangeComposedTimeString, isDate, isDateTime, isTime]);
+    trackFocusFirstSegment();
+  }, [appOnDayChange, appOnHourChange, appOnMeridiemChange, appOnMinuteChange, appOnMonthChange, appOnYearChange, handleChangeComposedDateString, handleChangeComposedDateTimeString, handleChangeComposedTimeString, isDate, isDateTime, isTime, trackFocusFirstSegment]);
   return React.useMemo(() => ({
     handleChangeComposedDateTimeString,
     handleChangeComposedDateString,

package/cjs/date-time-picker/config/useControlledDateTimePicker.js

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/esnext.async-iterator.filter.js');
 require('core-js/modules/esnext.iterator.constructor.js');
 require('core-js/modules/esnext.iterator.filter.js');
 require('core-js/modules/esnext.async-iterator.for-each.js');
 require('core-js/modules/esnext.iterator.for-each.js');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var dsPropsHelpers = require('@elliemae/ds-props-helpers');
 var useGetPropsWithDefault = require('./useGetPropsWithDefault.js');
+var useFocusTracker = require('./useFocusTracker.js');
 var useGetFlags = require('./useGetFlags.js');
 var useGetReferences = require('./useGetReferences.js');
 var useRelevantValueFromProps = require('./useRelevantValueFromProps.js');
@@ -36,6 +36,10 @@ const useControlledDateTimePicker = props => {
   const flags = useGetFlags.useGetFlags(propsWithDefaults);
   const DOMRefs = useGetReferences.useGetReferences(flags); // refs are used for "auto-advance" feature
 
+  const focusTrackers = useFocusTracker.useFocusTracker({
+    DOMRefs,
+    flags
+  });
   const relevantValues = useRelevantValueFromProps.useRelevantValueFromProps(propsWithDefaults);
   const propsBasedOnType = useGetPropsBasedOnType.useGetPropsBasedOnType(propsWithDefaults);
   const destructuredValues = useGetDestructuredValues.useGetDestructuredValues(_objectSpread(_objectSpread({}, propsBasedOnType), flags));
@@ -43,17 +47,18 @@ const useControlledDateTimePicker = props => {
     relevantValues,
     destructuredValues,
     propsBasedOnType,
-    DOMRefs
+    DOMRefs,
+    focusTrackers
   });
   const globalKeyHandlers = useGlobalKeyHandlers.useGlobalKeyHandlers({
     changeHandlers,
     propsBasedOnType,
     DOMRefs,
-    flags
+    flags,
+    focusTrackers
   }); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 
   const dataAttrs = dsPropsHelpers.getDataProps(propsWithDefaults);
-  const [latestInteractionRegion, setLatestInteractionRegion] = React.useState('');
   const {
     announcedDateValues,
     announcedTimeValues
@@ -64,13 +69,12 @@ const useControlledDateTimePicker = props => {
     isWithTimeInputs
   } = flags;
   const ariaCurrentValueForInputs = "current values: ".concat(isWithDateInputs ? "".concat(announcedDateValues) : '').concat(isDateTimeSelector ? ', ' : '').concat(isWithTimeInputs ? "".concat(announcedTimeValues) : '');
-  const ctx = React__default["default"].useMemo(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  const ctx = React__default["default"].useMemo(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     props: propsWithDefaults,
-    latestInteractionRegion,
-    setLatestInteractionRegion,
     ariaCurrentValueForInputs,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     dataAttrs
-  }, flags), DOMRefs), relevantValues), propsBasedOnType), destructuredValues), changeHandlers), globalKeyHandlers), [propsWithDefaults, latestInteractionRegion, ariaCurrentValueForInputs, dataAttrs, flags, DOMRefs, relevantValues, propsBasedOnType, destructuredValues, changeHandlers, globalKeyHandlers]);
+  }, focusTrackers), flags), DOMRefs), relevantValues), propsBasedOnType), destructuredValues), changeHandlers), globalKeyHandlers), [propsWithDefaults, ariaCurrentValueForInputs, dataAttrs, focusTrackers, flags, DOMRefs, relevantValues, propsBasedOnType, destructuredValues, changeHandlers, globalKeyHandlers]);
   return ctx;
 };