@elliemae/ds-controlled-form 2.4.1 → 2.4.2-rc.3

package/esm/combobox/parts/controls-input/useKeyboardNavigation.js

@@ -28,6 +28,7 @@ const useKeyboardNavigation = () => {
     inputValue,
     showPopover,
     focusOptionIdx,
+    listRef,
     selectAllCheckboxRef,
     toggleSelectionButtonRef,
     setShowPopover,
@@ -47,6 +48,14 @@ const useKeyboardNavigation = () => {
 
     if (['ArrowDown', 'ArrowUp', 'Enter', 'Spacebar'].includes(e.key) || e.keyCode >= 48 && e.keyCode <= 90) {
       setShowPopover(true);
+      window.requestAnimationFrame(() => {
+        if (listRef.current && window.scrollY < listRef.current.offsetHeight) {
+          window.scrollTo({
+            top: listRef.current.offsetHeight,
+            behavior: 'smooth'
+          });
+        }
+      });
     } // =============================================================================
     // ESCAPE
     // =============================================================================
@@ -67,7 +76,7 @@ const useKeyboardNavigation = () => {
 
 
     if (e.key === 'Enter' && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.type) === INTERNAL_MENU_OPTION_TYPES.CREATABLE && onCreate) {
-      onCreate(inputValue); //blank active item to force search last one
+      onCreate(inputValue); // blank active item to force search last one
 
       setFocusOptionIdx('');
       if (onFilter) onFilter(allOptions, '');
@@ -110,9 +119,12 @@ const useKeyboardNavigation = () => {
       e.stopPropagation();
 
       if ((showPopover || inline) && selectableOptions.length) {
-        const nextItemIndex = findInCircularList(filteredOptions, currentItemIndex, isOptionFocuseable);
-        setFocusOptionIdx(filteredOptions[nextItemIndex].dsId);
-        scrollOptionIntoView(filteredOptions[nextItemIndex].dsId);
+        const nextItemIndexIndex = findInCircularList(filteredOptions, currentItemIndex, isOptionFocuseable);
+
+        if (nextItemIndexIndex > -1) {
+          setFocusOptionIdx(filteredOptions[nextItemIndexIndex].dsId);
+          scrollOptionIntoView(filteredOptions[nextItemIndexIndex].dsId);
+        }
       }
     }
 
@@ -122,16 +134,19 @@ const useKeyboardNavigation = () => {
       if (!selectableOptions.length) return;
       const prevItemIndex = findInCircularList(filteredOptions, currentItemIndex, isOptionFocuseable, -1);
 
-      if (showPopover || inline) {
-        setFocusOptionIdx(filteredOptions[prevItemIndex].dsId);
-        scrollOptionIntoView(filteredOptions[prevItemIndex].dsId);
-      } else {
-        setShowPopover(true);
-        setTimeout(() => {
-          const prevItem = findInCircularList(filteredOptions, 0, isOptionFocuseable, -1);
-          setFocusOptionIdx(filteredOptions[prevItem].dsId);
-          scrollOptionIntoView(filteredOptions[prevItem].dsId);
-        });
+      if (prevItemIndex > -1) {
+        if (showPopover || inline) {
+          setFocusOptionIdx(filteredOptions[prevItemIndex].dsId);
+          scrollOptionIntoView(filteredOptions[prevItemIndex].dsId);
+        } else {
+          // open menu and search last item to focused
+          setShowPopover(true);
+          const lastItemIndex = findInCircularList(filteredOptions, 0, isOptionFocuseable, -1);
+          setFocusOptionIdx(filteredOptions[lastItemIndex].dsId);
+          setTimeout(() => {
+            scrollOptionIntoView(filteredOptions[lastItemIndex].dsId);
+          });
+        }
       }
     } // =============================================================================
     // BACKSPACE
@@ -163,7 +178,7 @@ const useKeyboardNavigation = () => {
       setShowPopover(false);
     }
   }, // eslint-disable-next-line react-hooks/exhaustive-deps
-  [onKeyDown, currentItem, onCreate, multiple, inputValue, inline, withoutPortal, setShowPopover, onCancel, onFilter, setInputValue, focusOptionIdx, showPopover, selectableOptions.length, filteredOptions, currentItemIndex, setFocusOptionIdx, selectedValues, onChange, selectAllCheckboxRef, toggleSelectionButtonRef]);
+  [onKeyDown, currentItem, onCreate, multiple, inputValue, inline, withoutPortal, setShowPopover, onCancel, onFilter, setInputValue, listRef, focusOptionIdx, showPopover, selectableOptions.length, filteredOptions, currentItemIndex, setFocusOptionIdx, selectedValues, onChange, selectAllCheckboxRef, toggleSelectionButtonRef]);
   return {
     onInputKeyDown
   };

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

@@ -14,6 +14,7 @@ const HeaderList = () => {
   const {
     props: {
       selectedValues,
+      filteredOptions,
       onSelectAll
     },
     showSelectedOptions,
@@ -32,15 +33,15 @@ const HeaderList = () => {
   } = useHeaderListHandlers();
   return /*#__PURE__*/_jsx(StyledHeaderListWrapper, {
     onKeyDown: handleKeyDown,
-    onMouseDown: handleOnMouseDown
+    onMouseDown: handleOnMouseDown,
+    "data-testid": ComboboxDataTestid.MULTISELECT.HEADER_LIST
   }, void 0, /*#__PURE__*/_jsx(StyledSelectAllCheckbox, {}, void 0, onSelectAll && /*#__PURE__*/_jsx(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": ComboboxDataTestid.MULTISELECT.SELECT_ALL_CHECKBOX,
     onKeyDown: handleCheckAllOnTab,
     innerRef: selectAllCheckboxRef
   })), /*#__PURE__*/_jsx(StyledSelectedItems, {}, void 0, multiSelectedValues.length > 0 ? /*#__PURE__*/_jsx(StyledButtonSelection, {

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

@@ -51,27 +51,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 = useCallback(e => {
     if (e.key === 'Escape') {
+      var _innerRef$current;
+
       setShowPopover(false);
+      (_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
+  }, [setShowPopover, innerRef]); // when hitting tab on selected values button filter we target the input again
 
   const handleFilterSelectionBtnOnTab = 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 = 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]);
   useEffect(() => {

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

@@ -40,7 +40,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(HeaderList, {}))), filteredOptions.length > 0 || onCreate ? /*#__PURE__*/jsx(StyledVirtualListWrapper, {
       inline: inline,
       maxHeight: menuMaxHeight,
@@ -56,9 +58,10 @@ const MenuList = () => {
         }
       }, void 0, ItemRenderer)
     }) : _StyledNoResultsWrapp || (_StyledNoResultsWrapp = /*#__PURE__*/_jsx(StyledNoResultsWrapper, {
+      role: "alert",
       "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]);
+  }, width), [wrapperListRef, inline, preventLoseInputFocus, menuMinWidth, withHeader, filteredOptions.length, onCreate, menuMaxHeight, listRef, virtualListHelpers === null || virtualListHelpers === void 0 ? void 0 : virtualListHelpers.totalSize, ItemRenderer, width]);
 };
 
 export { MenuList };

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

@@ -2,7 +2,7 @@ import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLit
 import { styled } from '@elliemae/ds-system';
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-const StyledListWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  min-width: ", ";\n  width: ", ";\n  background-color: #ffffff;\n"])), _ref => {
+const StyledListWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  min-width: ", ";\n  width: ", ";\n  background-color: #ffffff;\n  max-height: ", ";\n  z-index: 100;\n"])), _ref => {
   let {
     inline,
     minWidth
@@ -13,18 +13,23 @@ const StyledListWrapper = styled.div(_templateObject || (_templateObject = _tagg
     width
   } = _ref2;
   return "".concat(width, "px");
+}, _ref3 => {
+  let {
+    maxHeight
+  } = _ref3;
+  return "".concat(maxHeight, "px");
 });
-const StyledList = styled.ul(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  padding: 0;\n"])));
-const StyledVirtualListWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  overflow-y: auto;\n  margin-top: ", ";\n\n  max-height: ", ";\n"])), _ref3 => {
+const StyledList = styled.ul(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  padding: 0;\n  background-color: #ffffff;\n"])));
+const StyledVirtualListWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\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 = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-weight: bold;\n  font-style: italic;\n"])));
 const StyledNoResultsWrapper = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  padding: 16px;\n"])));

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

@@ -78,9 +78,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
@@ -105,8 +106,8 @@ const useItemRenderer = () => {
           onClick: e => handleClick(option, e),
           onMouseDown: handleOnMouseDown,
           isActive: option.dsId === focusOptionIdx,
-          isSelected: isSelected(selectedValues, option),
-          tabIndex: -1
+          isSelected: isSelected(selectedValues, option) //tabIndex={-1}
+
         }));
       }
 

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

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

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

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

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

@@ -25,8 +25,11 @@ const useGroupPills = () => {
     controlsWrapperRef,
     pillGroupRef
   } = useContext(ComboBoxContext);
-  const multiSelectedValues = selectedValues;
-  const [pillsToShow, setPillsToShow] = 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] = useState(selectedValuesLength);
   const {
     width
   } = useOnElementResize(controlsWrapperRef);
@@ -34,28 +37,28 @@ const useGroupPills = () => {
     width: widthInput
   } = useOnElementResize(innerRef || null);
   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]);
   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) {
@@ -65,7 +68,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/esm/combobox/theming.js

@@ -0,0 +1,8 @@
+const DSComboBoxName = 'ds-combobox';
+const DSComboboxSlots = {
+  CONTAINER: 'root',
+  INPUT_WRAPPER: 'input-wrapper',
+  INPUT: 'input'
+};
+
+export { DSComboBoxName, DSComboboxSlots };

package/esm/combobox/utils/listHelper.js

@@ -47,7 +47,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 '';
 };

package/esm/date-range-picker/config/useRangePickerLogic.js

@@ -1,10 +1,10 @@
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import 'core-js/modules/web.dom-collections.iterator.js';
 import 'core-js/modules/esnext.async-iterator.filter.js';
 import 'core-js/modules/esnext.iterator.constructor.js';
 import 'core-js/modules/esnext.iterator.filter.js';
 import '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, useEffect, useCallback, useMemo } from 'react';
 import '../../date-time-picker/ControlledDateTimePicker.js';
 import 'core-js/modules/esnext.async-iterator.map.js';

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

@@ -18,7 +18,7 @@ const useChangeHandlers = _ref => {
     relevantValues,
     destructuredValues,
     propsBasedOnType,
-    DOMRefs
+    focusTrackers
   } = _ref;
   const {
     tempDateString,
@@ -52,8 +52,8 @@ const useChangeHandlers = _ref => {
     meridiem
   } = destructuredValues;
   const {
-    firstSegmentRef
-  } = DOMRefs;
+    trackFocusFirstSegment
+  } = focusTrackers;
   const getDateMetaInfo = useCallback(function () {
     let newDateString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     let metaInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -83,7 +83,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
@@ -100,7 +100,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
@@ -116,7 +116,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
@@ -233,12 +233,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 useMemo(() => ({
     handleChangeComposedDateTimeString,
     handleChangeComposedDateString,

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

@@ -4,10 +4,10 @@ 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 React, { useState } from 'react';
+import React from 'react';
 import { getDataProps } from '@elliemae/ds-props-helpers';
 import { useGetDatePickerWithDefaultsProps } from './useGetPropsWithDefault.js';
+import { useFocusTracker } from './useFocusTracker.js';
 import { useGetFlags } from './useGetFlags.js';
 import { useGetReferences } from './useGetReferences.js';
 import { useRelevantValueFromProps } from './useRelevantValueFromProps.js';
@@ -27,6 +27,10 @@ const useControlledDateTimePicker = props => {
   const flags = useGetFlags(propsWithDefaults);
   const DOMRefs = useGetReferences(flags); // refs are used for "auto-advance" feature
 
+  const focusTrackers = useFocusTracker({
+    DOMRefs,
+    flags
+  });
   const relevantValues = useRelevantValueFromProps(propsWithDefaults);
   const propsBasedOnType = useGetPropsBasedOnType(propsWithDefaults);
   const destructuredValues = useGetDestructuredValues(_objectSpread(_objectSpread({}, propsBasedOnType), flags));
@@ -34,17 +38,18 @@ const useControlledDateTimePicker = props => {
     relevantValues,
     destructuredValues,
     propsBasedOnType,
-    DOMRefs
+    DOMRefs,
+    focusTrackers
   });
   const globalKeyHandlers = useGlobalKeyHandlers({
     changeHandlers,
     propsBasedOnType,
     DOMRefs,
-    flags
+    flags,
+    focusTrackers
   }); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 
   const dataAttrs = getDataProps(propsWithDefaults);
-  const [latestInteractionRegion, setLatestInteractionRegion] = useState('');
   const {
     announcedDateValues,
     announcedTimeValues
@@ -55,13 +60,12 @@ const useControlledDateTimePicker = props => {
     isWithTimeInputs
   } = flags;
   const ariaCurrentValueForInputs = "current values: ".concat(isWithDateInputs ? "".concat(announcedDateValues) : '').concat(isDateTimeSelector ? ', ' : '').concat(isWithTimeInputs ? "".concat(announcedTimeValues) : '');
-  const ctx = React.useMemo(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  const ctx = React.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;
 };
 

package/esm/date-time-picker/config/useFocusTracker.js

@@ -0,0 +1,132 @@
+import 'core-js/modules/web.dom-collections.iterator.js';
+import { useState, useCallback, useMemo } from 'react';
+
+const useFocusTracker = _ref => {
+  let {
+    DOMRefs,
+    flags
+  } = _ref;
+  const [latestInteractionRegion, setLatestInteractionRegion] = useState('');
+  const [currFocusDescriber, setCurrFocusDescriber] = useState('');
+  const {
+    firstSegment,
+    lastSegment
+  } = DOMRefs;
+  const {
+    isDateSelector,
+    isTimeSelector
+  } = flags;
+  const trackFocusPicker = useCallback(() => {
+    let picker = 'datetime-picker-icon';
+    if (isDateSelector) picker = 'date-picker-icon';
+    if (isTimeSelector) picker = 'time-picker-icon';
+    if (latestInteractionRegion !== 'picker-icon') setLatestInteractionRegion('picker-icon');
+    if (picker !== currFocusDescriber) setCurrFocusDescriber(picker);
+  }, [currFocusDescriber, isDateSelector, isTimeSelector, latestInteractionRegion]);
+  const trackFocusFirstSegment = useCallback(() => {
+    let region = 'date-inputs';
+    if (firstSegment === 'hour-input') region = 'time-inputs';
+    if (firstSegment === 'date-picker-icon') region = 'picker-icon';
+    if (firstSegment === 'time-picker-icon') region = 'picker-icon';
+    if (firstSegment === 'datetime-picker-icon') region = 'picker-icon';
+    if (region !== latestInteractionRegion) setLatestInteractionRegion(region);
+    if (firstSegment !== currFocusDescriber) setCurrFocusDescriber(firstSegment);
+  }, [currFocusDescriber, firstSegment, latestInteractionRegion]);
+  const trackFocusLastSegment = useCallback(() => {
+    let region = 'date-inputs';
+    if (lastSegment === 'meridiem-input') region = 'time-inputs';
+    if (lastSegment === 'clear-btn') region = 'clear-btn';
+    if (lastSegment === 'date-picker-icon') region = 'picker-icon';
+    if (lastSegment === 'time-picker-icon') region = 'picker-icon';
+    if (lastSegment === 'datetime-picker-icon') region = 'picker-icon';
+    if (region !== latestInteractionRegion) setLatestInteractionRegion(region);
+    if (lastSegment !== currFocusDescriber) setCurrFocusDescriber(lastSegment);
+  }, [currFocusDescriber, lastSegment, latestInteractionRegion]);
+  return useMemo(() => ({
+    latestInteractionRegion,
+    setLatestInteractionRegion,
+    currFocusDescriber,
+    setCurrFocusDescriber,
+    trackFocusResetter: () => {
+      if (latestInteractionRegion !== '') setLatestInteractionRegion('');
+      if (currFocusDescriber !== '') setCurrFocusDescriber('');
+    },
+    trackFocusMonthInput: () => {
+      if (latestInteractionRegion !== 'date-inputs') setLatestInteractionRegion('date-inputs');
+      if (currFocusDescriber !== 'month-input') setCurrFocusDescriber('month-input');
+    },
+    trackFocusDayInput: () => {
+      if (latestInteractionRegion !== 'date-inputs') setLatestInteractionRegion('date-inputs');
+      if (currFocusDescriber !== 'day-input') setCurrFocusDescriber('day-input');
+    },
+    trackFocusYearInput: () => {
+      if (latestInteractionRegion !== 'date-inputs') setLatestInteractionRegion('date-inputs');
+      if (currFocusDescriber !== 'year-input') setCurrFocusDescriber('year-input');
+    },
+    trackFocusHourInput: () => {
+      if (latestInteractionRegion !== 'time-inputs') setLatestInteractionRegion('time-inputs');
+      if (currFocusDescriber !== 'hour-input') setCurrFocusDescriber('hour-input');
+    },
+    trackFocusMinuteInput: () => {
+      if (latestInteractionRegion !== 'time-inputs') setLatestInteractionRegion('time-inputs');
+      if (currFocusDescriber !== 'minute-input') setCurrFocusDescriber('minute-input');
+    },
+    trackFocusMeridiemInput: () => {
+      if (latestInteractionRegion !== 'time-inputs') setLatestInteractionRegion('time-inputs');
+      if (currFocusDescriber !== 'meridiem-input') setCurrFocusDescriber('meridiem-input');
+    },
+    trackFocusClearBtn: () => {
+      if (latestInteractionRegion !== 'clear-btn') setLatestInteractionRegion('clear-btn');
+      if (currFocusDescriber !== 'clear-btn') setCurrFocusDescriber('clear-btn');
+    },
+    trackFocusDatePickerIcon: () => {
+      if (latestInteractionRegion !== 'picker-icon') setLatestInteractionRegion('picker-icon');
+      if (currFocusDescriber !== 'date-picker-icon') setCurrFocusDescriber('date-picker-icon');
+    },
+    trackFocusTimePickerIcon: () => {
+      if (latestInteractionRegion !== 'picker-icon') setLatestInteractionRegion('picker-icon');
+      if (currFocusDescriber !== 'time-picker-icon') setCurrFocusDescriber('time-picker-icon');
+    },
+    trackFocusDatetimePickerIcon: () => {
+      if (latestInteractionRegion !== 'picker-icon') setLatestInteractionRegion('picker-icon');
+      if (currFocusDescriber !== 'datetime-picker-icon') setCurrFocusDescriber('datetime-picker-icon');
+    },
+    trackFocusCalendarPrevMonth: () => {
+      if (latestInteractionRegion !== 'calendar-head') setLatestInteractionRegion('calendar-head');
+      if (currFocusDescriber !== 'calendar-prev-month') setCurrFocusDescriber('calendar-prev-month');
+    },
+    trackFocusCalendarNextMonth: () => {
+      if (latestInteractionRegion !== 'calendar-head') setLatestInteractionRegion('calendar-head');
+      if (currFocusDescriber !== 'calendar-next-month') setCurrFocusDescriber('calendar-next-month');
+    },
+    trackFocusCalendarPrevYear: () => {
+      if (latestInteractionRegion !== 'calendar-head') setLatestInteractionRegion('calendar-head');
+      if (currFocusDescriber !== 'calendar-prev-year') setCurrFocusDescriber('calendar-prev-year');
+    },
+    trackFocusCalendarNextYear: () => {
+      if (latestInteractionRegion !== 'calendar-head') setLatestInteractionRegion('calendar-head');
+      if (currFocusDescriber !== 'calendar-next-year') setCurrFocusDescriber('calendar-next-year');
+    },
+    trackFocusCalendarMetafocusedDay: () => {
+      if (latestInteractionRegion !== 'calendar-days') setLatestInteractionRegion('calendar-days');
+      if (currFocusDescriber !== 'calendar-metafocused-day') setCurrFocusDescriber('calendar-metafocused-day');
+    },
+    trackFocusTimewheelCurrHour: () => {
+      if (latestInteractionRegion !== 'timewheel') setLatestInteractionRegion('timewheel');
+      if (currFocusDescriber !== 'timewheel-curr-hour') setCurrFocusDescriber('timewheel-curr-hour');
+    },
+    trackFocusTimewheelCurrMinute: () => {
+      if (latestInteractionRegion !== 'timewheel') setLatestInteractionRegion('timewheel');
+      if (currFocusDescriber !== 'timewheel-curr-minute') setCurrFocusDescriber('timewheel-curr-minute');
+    },
+    trackFocusTimewheelCurrMeridiem: () => {
+      if (latestInteractionRegion !== 'timewheel') setLatestInteractionRegion('timewheel');
+      if (currFocusDescriber !== 'timewheel-curr-meridiem') setCurrFocusDescriber('timewheel-curr-meridiem');
+    },
+    trackFocusPicker,
+    trackFocusFirstSegment,
+    trackFocusLastSegment
+  }), [currFocusDescriber, latestInteractionRegion, trackFocusPicker, trackFocusFirstSegment, trackFocusLastSegment]);
+};
+
+export { useFocusTracker };