@elliemae/ds-controlled-form 2.4.2-rc.1 → 2.4.2-rc.13

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] : {};
@@ -81,9 +81,9 @@ const useChangeHandlers = _ref => {
     appOnTimeChange(appTimeString, metaInfo); // don't do this on useEffect to avoid complete chaos
 
     setTimeString(newTimeString);
-    const newDateTimeString = "".concat(newDateString, " ").concat(newTimeString);
+    const newDateTimeString = `${newDateString} ${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
@@ -98,9 +98,9 @@ const useChangeHandlers = _ref => {
     appOnDateChange(appDateString, metaInfo); // don't do this on useEffect to avoid complete chaos
 
     setTempDateString(newDateString);
-    const newDateTimeString = "".concat(newDateString, " ").concat(tempTimeString);
+    const newDateTimeString = `${newDateString} ${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
@@ -114,9 +114,9 @@ const useChangeHandlers = _ref => {
     appOnTimeChange(appTimeString, metaInfo); // don't do this on useEffect to avoid complete chaos
 
     setTimeString(newTimeString);
-    const newDateTimeString = "".concat(tempDateString, " ").concat(newTimeString);
+    const newDateTimeString = `${tempDateString} ${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
@@ -54,14 +59,13 @@ const useControlledDateTimePicker = props => {
     isDateTimeSelector,
     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 ariaCurrentValueForInputs = `current values: ${isWithDateInputs ? `${announcedDateValues}` : ''}${isDateTimeSelector ? ', ' : ''}${isWithTimeInputs ? `${announcedTimeValues}` : ''}`;
+  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 { useState, useCallback, useMemo } from 'react';
+
+/* eslint-disable max-lines */
+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 };

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

@@ -34,8 +34,8 @@ const useGetDestructuredDateValues = _ref => {
   const yearNum = convertToPositiveNumberIfPossible(year);
   const announcedMonth = monthNum !== -1 ? monthNames[monthNum - 1] : 'empty month';
   const announcedDay = dayNum !== -1 ? announcableCardinalDays[dayNum] : 'empty day';
-  const announcedYear = yearNum !== -1 ? fillStringWithPlaceHolders("".concat(yearNum), 4, '0') : 'empty year';
-  const announcedDateValues = "".concat(announcedMonth, ", ").concat(announcedDay, ", ").concat(announcedYear);
+  const announcedYear = yearNum !== -1 ? fillStringWithPlaceHolders(`${yearNum}`, 4, '0') : 'empty year';
+  const announcedDateValues = `${announcedMonth}, ${announcedDay}, ${announcedYear}`;
   return useMemo(() => ({
     month,
     day,
@@ -69,12 +69,12 @@ const useGetDestructuredTimeValues = _ref2 => {
   const hoursNum = convertToPositiveNumberIfPossible(hours);
   const minutesNum = convertToPositiveNumberIfPossible(minutes); // 01 -> 1 ~ 09 -> 9 || 1_ -> 1 ~ 9_ -> 9 || empty...
 
-  const announcedHours = hoursNum !== -1 ? "".concat(hoursNum) : 'empty hours'; // 01 -> 1 ~ 09 -> 9 || 1_ -> 1 ~ 9_ -> 9 || empty...
+  const announcedHours = hoursNum !== -1 ? `${hoursNum}` : 'empty hours'; // 01 -> 1 ~ 09 -> 9 || 1_ -> 1 ~ 9_ -> 9 || empty...
 
-  const announcedMinutes = minutesNum !== -1 ? "".concat(minutesNum) : 'empty minutes';
+  const announcedMinutes = minutesNum !== -1 ? `${minutesNum}` : 'empty minutes';
   const announcedMeridiem = // eslint-disable-next-line no-nested-ternary
-  meridiem === 'PM' ? "post meridiem" : meridiem === 'AM' ? 'ante meridiem' : 'empty meriediem';
-  const announcedTimeValues = "".concat(announcedHours, ", ").concat(announcedMinutes, ", ").concat(announcedMeridiem);
+  meridiem === 'PM' ? `post meridiem` : meridiem === 'AM' ? 'ante meridiem' : 'empty meriediem';
+  const announcedTimeValues = `${announcedHours}, ${announcedMinutes}, ${announcedMeridiem}`;
   return useMemo(() => ({
     hours,
     minutes,

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

@@ -23,7 +23,7 @@ const useGetPropsBasedOnType = propsWithDefaults => {
   const appOnMonthChange = (isDateTime || isDate) && propsWithDefaults.onMonthChange ? propsWithDefaults.onMonthChange : noop;
   const appOnDayChange = (isDateTime || isDate) && propsWithDefaults.onDayChange ? propsWithDefaults.onDayChange : noop;
   const appOnYearChange = (isDateTime || isDate) && propsWithDefaults.onYearChange ? propsWithDefaults.onYearChange : noop;
-  const emptyPickerStartingMonthDefault = "".concat(new Date().getMonth() + 1, "/__/").concat(new Date().getFullYear());
+  const emptyPickerStartingMonthDefault = `${new Date().getMonth() + 1}/__/${new Date().getFullYear()}`;
   const emptyPickerStartingMonth = (isDateTime || isDate) && propsWithDefaults.emptyPickerStartingMonth ? propsWithDefaults.emptyPickerStartingMonth : emptyPickerStartingMonthDefault;
   const onCalendarOpenFocusedDay = (isDateTime || isDate) && propsWithDefaults.onCalendarOpenFocusedDay ? propsWithDefaults.onCalendarOpenFocusedDay : undefined;
   /* -------------------------- -------------- --------------------------*/

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

@@ -1,14 +1,20 @@
-import { useRef, useMemo } from 'react';
+import { useState, useRef, useMemo } from 'react';
 
 /* eslint-disable complexity */
 const useGetReferences = _ref => {
   let {
     isWithDateInputs,
     isWithTimeInputs,
+    isDateSelector,
+    isTimeSelector,
+    isDateTimeSelector,
     withAnyPicker,
     withClearBtn
   } = _ref;
-  // refs are used for "auto-advance" feature
+  // those 2 states are needed for focus tracking
+  const [firstSegment, setFirstSegment] = useState('');
+  const [lastSegment, setLastSegment] = useState(''); // refs are used for "auto-advance" feature
+
   const monthInputRef = useRef(null);
   const dayInputRef = useRef(null);
   const yearInputRef = useRef(null);
@@ -32,22 +38,38 @@ const useGetReferences = _ref => {
   const currMeridiemBtnRef = useRef(null);
   const nextMeridiemBtnRef = useRef(null);
   let firstSegmentRef = useRef(null);
-  if (isWithDateInputs) firstSegmentRef = monthInputRef;else if (isWithTimeInputs) firstSegmentRef = hourInputRef;else if (withAnyPicker) firstSegmentRef = pickerButtonRef; // we need some non-ref to force refresh of the hooks dependencies when using firstSegmentRef
 
-  const firstFragmentRefUpdateDeps = useMemo(() => ({
-    isWithDateInputs,
-    isWithTimeInputs,
-    withAnyPicker
-  }), [isWithDateInputs, isWithTimeInputs, withAnyPicker]);
+  if (isWithDateInputs) {
+    firstSegmentRef = monthInputRef;
+    if (firstSegment !== 'month-input') setFirstSegment('month-input');
+  } else if (isWithTimeInputs) {
+    firstSegmentRef = hourInputRef;
+    if (firstSegment !== 'hour-input') setFirstSegment('hour-input');
+  } else if (withAnyPicker) {
+    firstSegmentRef = pickerButtonRef;
+    if (isDateSelector && firstSegment !== 'date-picker-icon') setFirstSegment('date-picker-icon');
+    if (isTimeSelector && firstSegment !== 'time-picker-icon') setFirstSegment('time-picker-icon');
+    if (isDateTimeSelector && firstSegment !== 'datetime-picker-icon') setFirstSegment('datetime-picker-icon');
+  }
+
   let lastSegmentRef = useRef(null);
-  if (withAnyPicker) lastSegmentRef = pickerButtonRef;else if (withClearBtn) lastSegmentRef = clearButtonRef;else if (isWithTimeInputs) lastSegmentRef = meridiemInputRef;else if (isWithDateInputs) lastSegmentRef = yearInputRef; // we need some non-ref to force refresh of the hooks dependencies when using lastSegmentRef
 
-  const lastFragmentRefUpdateDeps = useMemo(() => ({
-    withAnyPicker,
-    withClearBtn,
-    isWithTimeInputs,
-    isWithDateInputs
-  }), [isWithDateInputs, isWithTimeInputs, withAnyPicker, withClearBtn]);
+  if (withAnyPicker) {
+    lastSegmentRef = pickerButtonRef;
+    if (isDateSelector && lastSegment !== 'date-picker-icon') setLastSegment('date-picker-icon');
+    if (isTimeSelector && lastSegment !== 'time-picker-icon') setLastSegment('time-picker-icon');
+    if (isDateTimeSelector && lastSegment !== 'datetime-picker-icon') setLastSegment('datetime-picker-icon');
+  } else if (withClearBtn) {
+    lastSegmentRef = clearButtonRef;
+    if (lastSegment !== 'clear-btn') setLastSegment('clear-btn');
+  } else if (isWithTimeInputs) {
+    lastSegmentRef = meridiemInputRef;
+    if (lastSegment !== 'meridiem-input') setLastSegment('meridiem-input');
+  } else if (isWithDateInputs) {
+    lastSegmentRef = yearInputRef;
+    if (lastSegment !== 'year-input') setLastSegment('year-input');
+  }
+
   return useMemo(() => ({
     monthInputRef,
     dayInputRef,
@@ -73,10 +95,9 @@ const useGetReferences = _ref => {
     nextMeridiemBtnRef,
     firstSegmentRef,
     lastSegmentRef,
-    firstFragmentRefUpdateDeps,
-    lastFragmentRefUpdateDeps
-  }), [firstFragmentRefUpdateDeps, lastFragmentRefUpdateDeps] // if we remove this last/first segment won't work
-  );
+    firstSegment,
+    lastSegment
+  }), [firstSegment, lastSegment]);
 };
 
 export { useGetReferences };

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

@@ -16,8 +16,8 @@ const useGlobalKeyHandlers = _ref => {
   let {
     propsBasedOnType,
     changeHandlers,
-    DOMRefs,
-    flags
+    flags,
+    focusTrackers
   } = _ref;
   const {
     getIsOutOfRangeDay,
@@ -34,13 +34,13 @@ const useGlobalKeyHandlers = _ref => {
     handleChangeComposedDateTimeString,
     handleClearAll
   } = changeHandlers;
-  const {
-    lastSegmentRef,
-    clearButtonRef
-  } = DOMRefs;
   const {
     shouldPreserveClearableSpace
   } = flags;
+  const {
+    trackFocusClearBtn,
+    trackFocusLastSegment
+  } = focusTrackers;
   const onFillWithCurrentDateKeys = useCallback(function (e) {
     let metaInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
       isAutomaticFillTrigger: true
@@ -70,12 +70,8 @@ const useGlobalKeyHandlers = _ref => {
     appOnMinuteChange(minutes, e, metaInfo);
     appOnMeridiemChange(meridiem, e, metaInfo);
     handleChangeComposedDateTimeString(nowDateString, nowTimeString, finalMetaInfo);
-    setTimeout(() => {
-      var _clearButtonRef$curre, _lastSegmentRef$curre;
-
-      if (shouldPreserveClearableSpace) (_clearButtonRef$curre = clearButtonRef.current) === null || _clearButtonRef$curre === void 0 ? void 0 : _clearButtonRef$curre.focus();else (_lastSegmentRef$curre = lastSegmentRef.current) === null || _lastSegmentRef$curre === void 0 ? void 0 : _lastSegmentRef$curre.focus();
-    });
-  }, [appOnDayChange, appOnHourChange, appOnMeridiemChange, appOnMinuteChange, appOnMonthChange, appOnYearChange, clearButtonRef, getIsDisabledDay, getIsDisabledTime, getIsOutOfRangeDay, handleChangeComposedDateTimeString, lastSegmentRef, shouldPreserveClearableSpace]);
+    if (shouldPreserveClearableSpace) trackFocusClearBtn();else trackFocusLastSegment();
+  }, [appOnDayChange, appOnHourChange, appOnMeridiemChange, appOnMinuteChange, appOnMonthChange, appOnYearChange, getIsDisabledDay, getIsDisabledTime, getIsOutOfRangeDay, handleChangeComposedDateTimeString, shouldPreserveClearableSpace, trackFocusClearBtn, trackFocusLastSegment]);
   const onGlobalKeyDown = useCallback(e => {
     const {
       key,

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

@@ -1,8 +1,8 @@
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { useMemo, useState } from 'react';
 import { getIsDateTime, getIsDate, getIsTime } from '../utils/typeGuards.js';
 import { dateTimeToDate, dateTimeToTime } from '../utils/stringHelpers.js';
 
+/* eslint-disable complexity */
 const useRelevantValueFromProps = props => {
   const dateStringFromProps = useMemo(() => {
     if (getIsDateTime(props)) return props.dateTime !== '' ? dateTimeToDate(props.dateTime) : '__/__/____';

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

@@ -1,43 +1,74 @@
+import 'core-js/modules/es.error.cause.js';
 import { deconstructValuesFromDateString, isValidDateString, dateTimeToDate, isValidTimeString, dateTimeToTime } from '../utils/stringHelpers.js';
 import { convertToPositiveNumberIfPossible } from '../utils/numberHelpers.js';
 import { getIsDateTime, getIsDate, getIsTime } from '../utils/typeGuards.js';
 
-/* eslint-disable max-statements */
-const PREPEND = "ControlledDateTimePicker:\n  Invalid configuration detected::\n  \n    ";
+const PREPEND = `ControlledDateTimePicker:
+  Invalid configuration detected::
+  
+    `;
 const NOT_A_DEFECT = ''; // '\n\n\t\tThis is not a defect, please check\n\n\t\thttps://qa.dimsum.rd.elliemae.io/?path=/story/components-desktop-components-d-controlledform-date-time-picker--basic\n\n\t\tfor instructions on how to use the component correctly\n\n';
 
-const INLINE_RECEIVED_PREPEND = "\n\n    Received:";
+const INLINE_RECEIVED_PREPEND = `
+
+    Received:`;
 
 const throwInvalidDateTimeError = invalidValue => {
-  throw new Error("".concat(PREPEND, "the \"dateTime\" you are providing is not respecting the format it must respect.").concat(INLINE_RECEIVED_PREPEND).concat(invalidValue, "(").concat(typeof invalidValue, ")").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}the "dateTime" you are providing is not respecting the format it must respect.${INLINE_RECEIVED_PREPEND}${invalidValue}(${typeof invalidValue})${NOT_A_DEFECT}`);
 };
 
 const throwInvalidDaterror = invalidValue => {
-  throw new Error("".concat(PREPEND, "the \"date\" you are providing is not respecting the format it must respect.").concat(INLINE_RECEIVED_PREPEND).concat(invalidValue, "(").concat(typeof invalidValue, ")").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}the "date" you are providing is not respecting the format it must respect.${INLINE_RECEIVED_PREPEND}${invalidValue}(${typeof invalidValue})${NOT_A_DEFECT}`);
 };
 
 const throwInvalidTimerror = invalidValue => {
-  throw new Error("".concat(PREPEND, "the \"time\" you are providing is not respecting the format it must respect.").concat(INLINE_RECEIVED_PREPEND).concat(invalidValue, "(").concat(typeof invalidValue, ")").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}the "time" you are providing is not respecting the format it must respect.${INLINE_RECEIVED_PREPEND}${invalidValue}(${typeof invalidValue})${NOT_A_DEFECT}`);
 };
 
 const throwUncontrolledDateError = (date, onDateChange) => {
-  throw new Error("".concat(PREPEND, "you are trying to use a date selector while providing a non-string \"date\" or providing a non-function to \"onDateChange\"\n  the full-controlled pattern must be used\n\tcheck https://reactjs.org/docs/forms.html#controlled-components for more informations\n\n  Received:\n    date: ").concat(date, "(").concat(typeof date, ")\n    onDateChange: (").concat(typeof onDateChange, ")\n  ").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}you are trying to use a date selector while providing a non-string "date" or providing a non-function to "onDateChange"
+  the full-controlled pattern must be used\n\tcheck https://reactjs.org/docs/forms.html#controlled-components for more informations
+
+  Received:
+    date: ${date}(${typeof date})
+    onDateChange: (${typeof onDateChange})
+  ${NOT_A_DEFECT}`);
 };
 
 const throwUncontrolledTimeError = (time, onTimeChange) => {
-  throw new Error("".concat(PREPEND, "you are trying to use a time selector while providing a non-string \"time\" or providing a non-function to \"onTimeChange\"\n  the full-controlled pattern must be used\n\tcheck https://reactjs.org/docs/forms.html#controlled-components for more informations\n\n  Received:\n    time: ").concat(time, "(").concat(typeof time, ")\n    onTimeChange: (").concat(typeof onTimeChange, ")\n  ").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}you are trying to use a time selector while providing a non-string "time" or providing a non-function to "onTimeChange"
+  the full-controlled pattern must be used\n\tcheck https://reactjs.org/docs/forms.html#controlled-components for more informations
+
+  Received:
+    time: ${time}(${typeof time})
+    onTimeChange: (${typeof onTimeChange})
+  ${NOT_A_DEFECT}`);
 };
 
 const throwUncontrolledDateTimeError = (dateTime, onDateTimeChange) => {
-  throw new Error("".concat(PREPEND, "you are trying to use a date-time selector while providing a non-string \"dateTime\" or providing a non-function to \"onDateTimeChange\"\n  the full-controlled pattern must be used\n\tcheck https://reactjs.org/docs/forms.html#controlled-components for more informations\n\n  Received:\n    dateTime: ").concat(dateTime, "(").concat(typeof dateTime, ")\n    onDateTimeChange: (").concat(typeof onDateTimeChange, ")\n  ").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}you are trying to use a date-time selector while providing a non-string "dateTime" or providing a non-function to "onDateTimeChange"
+  the full-controlled pattern must be used\n\tcheck https://reactjs.org/docs/forms.html#controlled-components for more informations
+
+  Received:
+    dateTime: ${dateTime}(${typeof dateTime})
+    onDateTimeChange: (${typeof onDateTimeChange})
+  ${NOT_A_DEFECT}`);
 };
 
 const throwInvalidEmptyPickerStartingMonthError = emptyPickerStartingMonth => {
-  throw new Error("".concat(PREPEND, "the provided emptyPickerStartingMonth props is invalid. please provide a string with the format mm/__/yyyy, (mm 01~12, yyyy 0001~9999) \n\n  Received:\n    ").concat(emptyPickerStartingMonth, "(").concat(typeof emptyPickerStartingMonth, ")\n  ").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}the provided emptyPickerStartingMonth props is invalid. please provide a string with the format mm/__/yyyy, (mm 01~12, yyyy 0001~9999) 
+
+  Received:
+    ${emptyPickerStartingMonth}(${typeof emptyPickerStartingMonth})
+  ${NOT_A_DEFECT}`);
 };
 
 const throwInvalidOnCalendarOpenFocusedDayError = onCalendarOpenFocusedDay => {
-  throw new Error("".concat(PREPEND, "the provided onCalendarOpenFocusedDay props is invalid. please provide a string with the format mm/dd/yyyy, (mm 01~12, dd 01~31, yyyy 0001~9999) \n\n  Received:\n    ").concat(onCalendarOpenFocusedDay, "(").concat(typeof onCalendarOpenFocusedDay, ")\n  ").concat(NOT_A_DEFECT));
+  throw new Error(`${PREPEND}the provided onCalendarOpenFocusedDay props is invalid. please provide a string with the format mm/dd/yyyy, (mm 01~12, dd 01~31, yyyy 0001~9999) 
+
+  Received:
+    ${onCalendarOpenFocusedDay}(${typeof onCalendarOpenFocusedDay})
+  ${NOT_A_DEFECT}`);
 };
 
 const useValidateProps = props => {

package/esm/date-time-picker/parts/ClearButton/ClearButton.js

@@ -5,12 +5,13 @@ 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 _jsx from '@babel/runtime/helpers/esm/jsx';
-import 'react';
+import { useContext } from 'react';
 import { CloseMedium } from '@elliemae/ds-icons';
 import { DSIconColors } from '@elliemae/ds-icon';
 import { BUTTON_SIZES } from '@elliemae/ds-button';
 import { StyledClearButton } from '../Styleds.js';
 import { ControlledDateTimePickerDatatestid } from '../../ControlledDateTimePickerDatatestid.js';
+import { ControlledDateTimePickerContext } from '../../ControlledDateTimePickerCTX.js';
 import { useClearButton } from './useClearButton.js';
 import { jsx } from 'react/jsx-runtime';
 
@@ -27,12 +28,19 @@ const ClearButton = () => {
   const styledsAttrs = {
     shouldDisplay: withClearBtn
   };
+  const {
+    latestInteractionRegion,
+    currFocusDescriber
+  } = useContext(ControlledDateTimePickerContext);
   return /*#__PURE__*/jsx(StyledClearButton, _objectSpread(_objectSpread({
     "aria-label": "clear selected date",
     buttonType: "icon",
     size: BUTTON_SIZES.M,
     "data-testid": ControlledDateTimePickerDatatestid.CLEAR_BUTTON,
-    innerRef: clearButtonRef,
+    innerRef: DomElem => {
+      clearButtonRef.current = DomElem;
+      if (latestInteractionRegion === 'clear-btn' && currFocusDescriber === 'clear-btn') DomElem?.focus?.();
+    },
     onClick: onClearClick,
     onKeyDown: onClearButtonKeyDown
   }, styledsAttrs), {}, {

package/esm/date-time-picker/parts/ClearButton/useClearButton.js

@@ -11,32 +11,21 @@ const useClearButton = () => {
     withAnyInputs,
     isWithTimeInputs,
     isWithDateInputs,
-    isTimeSelector,
-    hourInputRef,
-    monthInputRef,
-    pickerButtonRef,
-    meridiemInputRef,
-    yearInputRef,
-    setLatestInteractionRegion
+    trackFocusFirstSegment,
+    trackFocusMeridiemInput,
+    trackFocusYearInput,
+    trackFocusPicker
   } = useContext(ControlledDateTimePickerContext);
-  const focusFirstRegion = useCallback(() => {
-    var _hourInputRef$current, _hourInputRef$current2, _monthInputRef$curren, _monthInputRef$curren2;
-
-    if (withAnyInputs) if (isTimeSelector) hourInputRef === null || hourInputRef === void 0 ? void 0 : (_hourInputRef$current = hourInputRef.current) === null || _hourInputRef$current === void 0 ? void 0 : (_hourInputRef$current2 = _hourInputRef$current.focus) === null || _hourInputRef$current2 === void 0 ? void 0 : _hourInputRef$current2.call(_hourInputRef$current);else monthInputRef === null || monthInputRef === void 0 ? void 0 : (_monthInputRef$curren = monthInputRef.current) === null || _monthInputRef$curren === void 0 ? void 0 : (_monthInputRef$curren2 = _monthInputRef$curren.focus) === null || _monthInputRef$curren2 === void 0 ? void 0 : _monthInputRef$curren2.call(_monthInputRef$curren);
-  }, [withAnyInputs, isTimeSelector, hourInputRef, monthInputRef]);
   const onClearClick = useCallback(e => {
     handleClearAll(e);
-    setLatestInteractionRegion('clear-btn');
-    focusFirstRegion();
-  }, [focusFirstRegion, handleClearAll, setLatestInteractionRegion]);
+    trackFocusFirstSegment();
+  }, [handleClearAll, trackFocusFirstSegment]);
   const onHomeKeyDown = useCallback(() => {
-    focusFirstRegion();
-  }, [focusFirstRegion]);
+    trackFocusFirstSegment();
+  }, [trackFocusFirstSegment]);
   const onEndKeyDown = useCallback(() => {
-    var _pickerButtonRef$curr, _pickerButtonRef$curr2;
-
-    if (withAnyPicker) pickerButtonRef === null || pickerButtonRef === void 0 ? void 0 : (_pickerButtonRef$curr = pickerButtonRef.current) === null || _pickerButtonRef$curr === void 0 ? void 0 : (_pickerButtonRef$curr2 = _pickerButtonRef$curr.focus) === null || _pickerButtonRef$curr2 === void 0 ? void 0 : _pickerButtonRef$curr2.call(_pickerButtonRef$curr);
-  }, [withAnyPicker, pickerButtonRef]);
+    if (withAnyPicker) trackFocusPicker();
+  }, [withAnyPicker, trackFocusPicker]);
   const onClearButtonKeyDown = useCallback(e => {
     const {
       key
@@ -49,11 +38,9 @@ const useClearButton = () => {
     if (key === 'End') onEndKeyDown();
 
     if (key === 'Backspace' && withAnyInputs) {
-      var _meridiemInputRef$cur, _meridiemInputRef$cur2, _yearInputRef$current, _yearInputRef$current2;
-
-      if (isWithTimeInputs) meridiemInputRef === null || meridiemInputRef === void 0 ? void 0 : (_meridiemInputRef$cur = meridiemInputRef.current) === null || _meridiemInputRef$cur === void 0 ? void 0 : (_meridiemInputRef$cur2 = _meridiemInputRef$cur.focus) === null || _meridiemInputRef$cur2 === void 0 ? void 0 : _meridiemInputRef$cur2.call(_meridiemInputRef$cur);else if (isWithDateInputs) yearInputRef === null || yearInputRef === void 0 ? void 0 : (_yearInputRef$current = yearInputRef.current) === null || _yearInputRef$current === void 0 ? void 0 : (_yearInputRef$current2 = _yearInputRef$current.focus) === null || _yearInputRef$current2 === void 0 ? void 0 : _yearInputRef$current2.call(_yearInputRef$current);
+      if (isWithTimeInputs) trackFocusMeridiemInput();else if (isWithDateInputs) trackFocusYearInput();
     }
-  }, [isWithDateInputs, isWithTimeInputs, meridiemInputRef, onEndKeyDown, onHomeKeyDown, withAnyInputs, yearInputRef]);
+  }, [isWithDateInputs, isWithTimeInputs, onEndKeyDown, onHomeKeyDown, trackFocusMeridiemInput, trackFocusYearInput, withAnyInputs]);
   return useMemo(() => ({
     onClearClick,
     onClearButtonKeyDown,