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

package/esm/date-time-picker/parts/TimeInputs/useTimeInputs.js

@@ -1,6 +1,5 @@
 import { useContext, useCallback, useMemo } from 'react';
 import { ControlledDateTimePickerContext } from '../../ControlledDateTimePickerCTX.js';
-import { homeEndArrowUpDownSemiKeys, homeEndArrowUpDownSpaceKeys, homeEndArrowUpDownKeys } from '../../utils/constants.js';
 import { prependStringWithPlaceHolders } from '../../utils/stringHelpers.js';
 
 /* eslint-disable complexity */
@@ -9,66 +8,55 @@ const useTimeInputs = () => {
     props: {
       disabled
     },
-    lastSegmentRef,
     hours,
     minutes,
     meridiem,
-    hideDate,
     withAnyRightController,
     withAnyPicker,
     withClearBtn,
     isWithDateInputs,
-    hourInputRef,
-    minutesInputRef,
-    meridiemInputRef,
-    yearInputRef,
-    clearButtonRef,
-    pickerButtonRef,
-    monthInputRef,
     autoFocusHourInput,
     handleChangeHours,
     handleChangeMinutes,
     handleChangeMeridiem,
-    setLatestInteractionRegion,
-    minutesInterval
+    minutesInterval,
+    trackFocusFirstSegment,
+    trackFocusLastSegment,
+    trackFocusHourInput,
+    trackFocusMinuteInput,
+    trackFocusMeridiemInput,
+    trackFocusClearBtn,
+    trackFocusPicker,
+    trackFocusYearInput
   } = useContext(ControlledDateTimePickerContext);
-  const setLatestInteractionRegionTimeInputs = useCallback(() => {
-    setLatestInteractionRegion('time-inputs');
-  }, [setLatestInteractionRegion]);
   const onHomeKeyDown = useCallback(() => {
-    var _monthInputRef$curren, _monthInputRef$curren2, _hourInputRef$current, _hourInputRef$current2;
-
-    if (!hideDate) 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);else 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);
-  }, [hideDate, monthInputRef, hourInputRef]);
+    trackFocusFirstSegment();
+  }, [trackFocusFirstSegment]);
   const onEndKeyDown = useCallback(() => {
-    var _pickerButtonRef$curr, _pickerButtonRef$curr2, _clearButtonRef$curre, _clearButtonRef$curre2, _meridiemInputRef$cur, _meridiemInputRef$cur2;
-
-    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);else if (withClearBtn) clearButtonRef === null || clearButtonRef === void 0 ? void 0 : (_clearButtonRef$curre = clearButtonRef.current) === null || _clearButtonRef$curre === void 0 ? void 0 : (_clearButtonRef$curre2 = _clearButtonRef$curre.focus) === null || _clearButtonRef$curre2 === void 0 ? void 0 : _clearButtonRef$curre2.call(_clearButtonRef$curre);else 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);
-  }, [withAnyPicker, pickerButtonRef, withClearBtn, clearButtonRef, meridiemInputRef]);
+    trackFocusLastSegment();
+  }, [trackFocusLastSegment]);
   const onHoursFocus = useCallback(() => {
-    setLatestInteractionRegionTimeInputs();
-  }, [setLatestInteractionRegionTimeInputs]);
+    trackFocusHourInput();
+  }, [trackFocusHourInput]);
   const onHoursChange = useCallback(e => {
-    var _e$target, _minutesInputRef$curr, _minutesInputRef$curr2;
+    var _e$target;
 
     let newHours = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value; // converts hours 2~9 to 07~09
 
     if (Number.parseInt(newHours, 10) > 1) newHours = prependStringWithPlaceHolders(newHours, 2);
     handleChangeHours(newHours, e); // auto-advance functionality:
 
-    if (newHours.length === 2) minutesInputRef === null || minutesInputRef === void 0 ? void 0 : (_minutesInputRef$curr = minutesInputRef.current) === null || _minutesInputRef$curr === void 0 ? void 0 : (_minutesInputRef$curr2 = _minutesInputRef$curr.focus) === null || _minutesInputRef$curr2 === void 0 ? void 0 : _minutesInputRef$curr2.call(_minutesInputRef$curr);
-  }, [minutesInputRef, handleChangeHours]);
+    if (newHours.length === 2) trackFocusMinuteInput();
+  }, [handleChangeHours, trackFocusMinuteInput]);
   const onHoursKeyDown = useCallback(e => {
-    var _lastSegmentRef$curre, _lastSegmentRef$curre2;
-
     const {
       key,
       ctrlKey,
       metaKey
     } = e;
     const hoursStringConvertedToInteger = Number.parseInt(hours, 10);
-    if (homeEndArrowUpDownSemiKeys.includes(key)) e.preventDefault();
-    if (homeEndArrowUpDownSemiKeys.includes(key)) e.stopPropagation();
+    if (['Home', 'End', 'ArrowUp', 'ArrowDown', ':'].includes(key)) e.preventDefault();
+    if (['Home', 'End', 'ArrowUp', 'ArrowDown', ':'].includes(key)) e.stopPropagation();
     if (key === 'Home') onHomeKeyDown();
     if (key === 'End') onEndKeyDown();
 
@@ -81,24 +69,20 @@ const useTimeInputs = () => {
     }
 
     if (!Number.isNaN(hoursStringConvertedToInteger) && key === ':') {
-      var _minutesInputRef$curr3, _minutesInputRef$curr4;
-
       const newHours = prependStringWithPlaceHolders("".concat(hoursStringConvertedToInteger), 2);
       handleChangeHours(newHours, e); // auto-advance functionality:
 
-      if (newHours.length === 2) minutesInputRef === null || minutesInputRef === void 0 ? void 0 : (_minutesInputRef$curr3 = minutesInputRef.current) === null || _minutesInputRef$curr3 === void 0 ? void 0 : (_minutesInputRef$curr4 = _minutesInputRef$curr3.focus) === null || _minutesInputRef$curr4 === void 0 ? void 0 : _minutesInputRef$curr4.call(_minutesInputRef$curr3);
+      if (newHours.length === 2) trackFocusMinuteInput();
     } // regressive backspace functionality
 
 
     if (key === 'Backspace' && hours.length === 0 && isWithDateInputs) {
-      var _yearInputRef$current, _yearInputRef$current2;
-
-      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);
+      trackFocusYearInput();
     } // focus last fragment on fill with now
 
 
-    if ((ctrlKey || metaKey) && key === ';') lastSegmentRef === null || lastSegmentRef === void 0 ? void 0 : (_lastSegmentRef$curre = lastSegmentRef.current) === null || _lastSegmentRef$curre === void 0 ? void 0 : (_lastSegmentRef$curre2 = _lastSegmentRef$curre.focus) === null || _lastSegmentRef$curre2 === void 0 ? void 0 : _lastSegmentRef$curre2.call(_lastSegmentRef$curre);
-  }, [hours, onHomeKeyDown, onEndKeyDown, isWithDateInputs, lastSegmentRef, handleChangeHours, minutesInputRef, yearInputRef]);
+    if ((ctrlKey || metaKey) && key === ';') trackFocusLastSegment();
+  }, [hours, isWithDateInputs, trackFocusYearInput, onHomeKeyDown, onEndKeyDown, trackFocusLastSegment, trackFocusMinuteInput, handleChangeHours]);
   const onHoursBlur = useCallback(e => {
     var _e$target2;
 
@@ -110,30 +94,27 @@ const useTimeInputs = () => {
     });
   }, [handleChangeHours]);
   const onMinutesFocus = useCallback(() => {
-    setLatestInteractionRegionTimeInputs();
-  }, [setLatestInteractionRegionTimeInputs]);
+    trackFocusMinuteInput();
+  }, [trackFocusMinuteInput]);
   const onMinutesChange = useCallback(e => {
-    var _e$target3, _meridiemInputRef$cur3, _meridiemInputRef$cur4;
+    var _e$target3;
 
     let newMinutes = e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value; // converts minutes 7~9 to 07~09
 
     if (Number.parseInt(newMinutes, 10) > 6) newMinutes = prependStringWithPlaceHolders(newMinutes, 2);
     handleChangeMinutes(newMinutes, e); // auto-advance functionality:
-    // if (newMinutes.length === 2) secondsInputRef?.current?.focus?.();
 
-    if (newMinutes.length === 2) meridiemInputRef === null || meridiemInputRef === void 0 ? void 0 : (_meridiemInputRef$cur3 = meridiemInputRef.current) === null || _meridiemInputRef$cur3 === void 0 ? void 0 : (_meridiemInputRef$cur4 = _meridiemInputRef$cur3.focus) === null || _meridiemInputRef$cur4 === void 0 ? void 0 : _meridiemInputRef$cur4.call(_meridiemInputRef$cur3);
-  }, [meridiemInputRef, handleChangeMinutes]);
+    if (newMinutes.length === 2) trackFocusMeridiemInput();
+  }, [handleChangeMinutes, trackFocusMeridiemInput]);
   const onMinutesKeyDown = useCallback(e => {
-    var _lastSegmentRef$curre3, _lastSegmentRef$curre4;
-
     const {
       key,
       ctrlKey,
       metaKey
     } = e;
     const minutesStringConvertedToInteger = Number.parseInt(minutes, 10);
-    if (homeEndArrowUpDownSpaceKeys.includes(key)) e.preventDefault();
-    if (homeEndArrowUpDownSpaceKeys.includes(key)) e.stopPropagation();
+    if (['Home', 'End', 'ArrowUp', 'ArrowDown', ' '].includes(key)) e.preventDefault();
+    if (['Home', 'End', 'ArrowUp', 'ArrowDown', ' '].includes(key)) e.stopPropagation();
     if (key === 'Home') onHomeKeyDown();
     if (key === 'End') onEndKeyDown();
 
@@ -146,25 +127,20 @@ const useTimeInputs = () => {
     }
 
     if (!Number.isNaN(minutesStringConvertedToInteger) && key === ' ') {
-      var _meridiemInputRef$cur5, _meridiemInputRef$cur6;
-
       const newMinutes = prependStringWithPlaceHolders("".concat(minutesStringConvertedToInteger), 2);
       handleChangeMinutes(newMinutes, e); // auto-advance functionality:
-      // if (newMinutes.length === 2) secondsInputRef?.current?.focus?.();
 
-      if (newMinutes.length === 2) meridiemInputRef === null || meridiemInputRef === void 0 ? void 0 : (_meridiemInputRef$cur5 = meridiemInputRef.current) === null || _meridiemInputRef$cur5 === void 0 ? void 0 : (_meridiemInputRef$cur6 = _meridiemInputRef$cur5.focus) === null || _meridiemInputRef$cur6 === void 0 ? void 0 : _meridiemInputRef$cur6.call(_meridiemInputRef$cur5);
+      if (newMinutes.length === 2) trackFocusMeridiemInput();
     } // regressive backspace functionality
 
 
     if (key === 'Backspace' && (minutes === null || minutes === void 0 ? void 0 : minutes.length) === 0) {
-      var _hourInputRef$current3, _hourInputRef$current4;
-
-      hourInputRef === null || hourInputRef === void 0 ? void 0 : (_hourInputRef$current3 = hourInputRef.current) === null || _hourInputRef$current3 === void 0 ? void 0 : (_hourInputRef$current4 = _hourInputRef$current3.focus) === null || _hourInputRef$current4 === void 0 ? void 0 : _hourInputRef$current4.call(_hourInputRef$current3);
+      trackFocusHourInput();
     } // focus last fragment on fill with now
 
 
-    if ((ctrlKey || metaKey) && key === ';') lastSegmentRef === null || lastSegmentRef === void 0 ? void 0 : (_lastSegmentRef$curre3 = lastSegmentRef.current) === null || _lastSegmentRef$curre3 === void 0 ? void 0 : (_lastSegmentRef$curre4 = _lastSegmentRef$curre3.focus) === null || _lastSegmentRef$curre4 === void 0 ? void 0 : _lastSegmentRef$curre4.call(_lastSegmentRef$curre3);
-  }, [minutes, onHomeKeyDown, onEndKeyDown, lastSegmentRef, minutesInterval, handleChangeMinutes, meridiemInputRef, hourInputRef]);
+    if ((ctrlKey || metaKey) && key === ';') trackFocusLastSegment();
+  }, [minutes, onHomeKeyDown, onEndKeyDown, trackFocusLastSegment, minutesInterval, handleChangeMinutes, trackFocusMeridiemInput, trackFocusHourInput]);
   const onMinutesBlur = useCallback(e => {
     var _e$target4;
 
@@ -174,8 +150,8 @@ const useTimeInputs = () => {
     });
   }, [handleChangeMinutes]);
   const onMeridiemFocus = useCallback(() => {
-    setLatestInteractionRegionTimeInputs();
-  }, [setLatestInteractionRegionTimeInputs]);
+    trackFocusMeridiemInput();
+  }, [trackFocusMeridiemInput]);
   const onMeridiemChange = useCallback(e => {
     var _e$target5, _e$target5$value, _e$target5$value$toUp;
 
@@ -187,35 +163,29 @@ const useTimeInputs = () => {
     handleChangeMeridiem(newMeridiem, e); // auto-advance functionality:
 
     if (newMeridiem.length === 2 && withAnyRightController) {
-      var _clearButtonRef$curre3, _clearButtonRef$curre4, _pickerButtonRef$curr3, _pickerButtonRef$curr4;
-
-      if (withClearBtn) (_clearButtonRef$curre3 = clearButtonRef.current) === null || _clearButtonRef$curre3 === void 0 ? void 0 : (_clearButtonRef$curre4 = _clearButtonRef$curre3.focus) === null || _clearButtonRef$curre4 === void 0 ? void 0 : _clearButtonRef$curre4.call(_clearButtonRef$curre3);else if (withAnyPicker) pickerButtonRef === null || pickerButtonRef === void 0 ? void 0 : (_pickerButtonRef$curr3 = pickerButtonRef.current) === null || _pickerButtonRef$curr3 === void 0 ? void 0 : (_pickerButtonRef$curr4 = _pickerButtonRef$curr3.focus) === null || _pickerButtonRef$curr4 === void 0 ? void 0 : _pickerButtonRef$curr4.call(_pickerButtonRef$curr3);
+      if (withClearBtn) trackFocusClearBtn();else if (withAnyPicker) trackFocusPicker();
     }
-  }, [meridiem, handleChangeMeridiem, withAnyRightController, withClearBtn, clearButtonRef, withAnyPicker, pickerButtonRef]);
+  }, [meridiem, handleChangeMeridiem, withAnyRightController, withClearBtn, trackFocusClearBtn, withAnyPicker, trackFocusPicker]);
   const onMeridiemKeyDown = useCallback(e => {
-    var _lastSegmentRef$curre5, _lastSegmentRef$curre6;
-
     const {
       key,
       ctrlKey,
       metaKey
     } = e;
-    if (homeEndArrowUpDownKeys.includes(key)) e.preventDefault();
-    if (homeEndArrowUpDownKeys.includes(key)) e.stopPropagation();
+    if (['Home', 'End', 'ArrowUp', 'ArrowDown'].includes(key)) e.preventDefault();
+    if (['Home', 'End', 'ArrowUp', 'ArrowDown'].includes(key)) e.stopPropagation();
     if (key === 'Home') onHomeKeyDown();
     if (key === 'End') onEndKeyDown();
     if (key === 'ArrowUp' && meridiem !== 'AM') handleChangeMeridiem('AM', e);
     if (key === 'ArrowDown' && meridiem !== 'PM') handleChangeMeridiem('PM', e); // regressive backspace functionality
 
     if (key === 'Backspace') {
-      var _minutesInputRef$curr5, _minutesInputRef$curr6;
-
-      if ((meridiem === null || meridiem === void 0 ? void 0 : meridiem.length) === 2) handleChangeMeridiem('', e);else minutesInputRef === null || minutesInputRef === void 0 ? void 0 : (_minutesInputRef$curr5 = minutesInputRef.current) === null || _minutesInputRef$curr5 === void 0 ? void 0 : (_minutesInputRef$curr6 = _minutesInputRef$curr5.focus) === null || _minutesInputRef$curr6 === void 0 ? void 0 : _minutesInputRef$curr6.call(_minutesInputRef$curr5);
+      if ((meridiem === null || meridiem === void 0 ? void 0 : meridiem.length) === 2) handleChangeMeridiem('', e);else trackFocusMinuteInput();
     } // focus last fragment on fill with now
 
 
-    if ((ctrlKey || metaKey) && key === ';') lastSegmentRef === null || lastSegmentRef === void 0 ? void 0 : (_lastSegmentRef$curre5 = lastSegmentRef.current) === null || _lastSegmentRef$curre5 === void 0 ? void 0 : (_lastSegmentRef$curre6 = _lastSegmentRef$curre5.focus) === null || _lastSegmentRef$curre6 === void 0 ? void 0 : _lastSegmentRef$curre6.call(_lastSegmentRef$curre5);
-  }, [onHomeKeyDown, onEndKeyDown, meridiem, handleChangeMeridiem, lastSegmentRef, minutesInputRef]);
+    if ((ctrlKey || metaKey) && key === ';') trackFocusLastSegment();
+  }, [onHomeKeyDown, onEndKeyDown, meridiem, handleChangeMeridiem, trackFocusLastSegment, trackFocusMinuteInput]);
   const onMeridiemBlur = useCallback(e => {
     var _e$target6, _e$target6$value, _e$target6$value$toUp;
 

package/esm/date-time-picker/utils/constants.js

@@ -33,14 +33,8 @@ const announcableCardinalDays = {
   30: 'thirtieth',
   31: 'thirty first'
 };
-const homeEndAllArrowKeys = ['Home', 'End', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'];
-const homeEndKeys = ['Home', 'End'];
-const homeEndArrowUpDownDashSlashesKeys = ['Home', 'End', 'ArrowUp', 'ArrowDown', '-', '/', '\\'];
-const homeEndArrowUpDownSpaceKeys = ['Home', 'End', 'ArrowUp', 'ArrowDown', ' '];
-const homeEndArrowUpDownSemiKeys = ['Home', 'End', 'ArrowUp', 'ArrowDown', ':'];
-const homeEndArrowUpDownKeys = ['Home', 'End', 'ArrowUp', 'ArrowDown'];
 const defaultMetaInfo = {
   isAutomaticFillTrigger: false
 };
 
-export { announcableCardinalDays, defaultMetaInfo, homeEndAllArrowKeys, homeEndArrowUpDownDashSlashesKeys, homeEndArrowUpDownKeys, homeEndArrowUpDownSemiKeys, homeEndArrowUpDownSpaceKeys, homeEndKeys, monthNames, weekDays };
+export { announcableCardinalDays, defaultMetaInfo, monthNames, weekDays };

package/esm/date-time-picker/utils/hooks/useGetStartingFocusedDay.js

@@ -25,50 +25,52 @@ const useGetStartingFocusedDay = () => {
     onCalendarOpenFocusedDay
   } = useContext(ControlledDateTimePickerContext);
   const dayFromInputValues = useGetDayFromDateString();
+  const {
+    month: inputValuesSplitMonth,
+    day: inputValuesSplitDay,
+    year: inputValuesDaySplitYear
+  } = dayFromInputValues ? getDateValuesFromDate(dayFromInputValues) : {
+    month: null,
+    day: null,
+    year: null
+  };
+  const isInputFilledAndValid = inputValuesSplitMonth && inputValuesSplitDay && inputValuesDaySplitYear && isValidDayForTheMonth(inputValuesSplitMonth, inputValuesDaySplitYear, inputValuesSplitDay);
+  const isOnCalendarOpenFocusedDayEmpty = !onCalendarOpenFocusedDay;
+  const shouldFillWithOnCalendarOpenFocusedDay = !isInputFilledAndValid && !isOnCalendarOpenFocusedDayEmpty;
   return useMemo(() => {
-    const startingDay = _objectSpread({}, empty);
+    const startingDay = _objectSpread({}, empty); // if input was filled start focus is the filled value (if it's valid day for the month)
 
-    if (dayFromInputValues) {
-      const {
-        month: inputValuesSplitMonth,
-        day: inputValuesSplitDay,
-        year: inputValuesDaySplitYear
-      } = getDateValuesFromDate(dayFromInputValues);
-      const isInputFilledAndValid = inputValuesSplitMonth && inputValuesSplitDay && inputValuesDaySplitYear && isValidDayForTheMonth(inputValuesSplitMonth, inputValuesDaySplitYear, inputValuesSplitDay);
-      const isOnCalendarOpenFocusedDayEmpty = !onCalendarOpenFocusedDay;
-      const shouldFillWithOnCalendarOpenFocusedDay = !isInputFilledAndValid && !isOnCalendarOpenFocusedDayEmpty; // if input was filled start focus is the filled value (if it's valid day for the month)
 
-      if (isInputFilledAndValid) {
-        startingDay.startFocusedMonth = inputValuesSplitMonth;
-        startingDay.startFocusedDay = inputValuesSplitDay;
-        startingDay.startFocusedYear = inputValuesDaySplitYear;
-        startingDay.startFocusedDate = dayFromInputValues; // if input was not filled (or filled invalid) and there is no onCalendarOpenFocusedDay start focus is not a day
-      } else if (isOnCalendarOpenFocusedDayEmpty) {
-        // if input was not filled and there is onCalendarOpenFocusedDay start focus is onCalendarOpenFocusedDay day
-        return empty;
-      } else if (shouldFillWithOnCalendarOpenFocusedDay) {
-        const {
-          month: focusedDaySplitMonth,
-          day: focusedDaySplitDay,
-          year: focusedDaySplitYear
-        } = deconstructValuesFromDateString(onCalendarOpenFocusedDay);
-        const monthAsInt = convertToPositiveNumberIfPossible(focusedDaySplitMonth);
-        const dayAsInt = convertToPositiveNumberIfPossible(focusedDaySplitDay);
-        const yearAsInt = convertToPositiveNumberIfPossible(focusedDaySplitYear); // if this condition is false, return will be the same as return empty
-        // because startFocusedMonth/Day/Year/Date will be === null
-        // which is the expected result
+    if (isInputFilledAndValid) {
+      startingDay.startFocusedMonth = inputValuesSplitMonth;
+      startingDay.startFocusedDay = inputValuesSplitDay;
+      startingDay.startFocusedYear = inputValuesDaySplitYear;
+      startingDay.startFocusedDate = dayFromInputValues; // if input was not filled (or filled invalid) and there is no onCalendarOpenFocusedDay start focus is not a day
+    } else if (isOnCalendarOpenFocusedDayEmpty) {
+      // if input was not filled and there is onCalendarOpenFocusedDay start focus is onCalendarOpenFocusedDay day
+      return empty;
+    } else if (shouldFillWithOnCalendarOpenFocusedDay) {
+      const {
+        month: focusedDaySplitMonth,
+        day: focusedDaySplitDay,
+        year: focusedDaySplitYear
+      } = deconstructValuesFromDateString(onCalendarOpenFocusedDay);
+      const monthAsInt = convertToPositiveNumberIfPossible(focusedDaySplitMonth);
+      const dayAsInt = convertToPositiveNumberIfPossible(focusedDaySplitDay);
+      const yearAsInt = convertToPositiveNumberIfPossible(focusedDaySplitYear); // if this condition is false, return will be the same as return empty
+      // because startFocusedMonth/Day/Year/Date will be === null
+      // which is the expected result
 
-        if (monthAsInt !== -1 && dayAsInt !== -1 && yearAsInt !== -1 && isValidDayForTheMonth(monthAsInt - 1, yearAsInt, dayAsInt)) {
-          startingDay.startFocusedMonth = monthAsInt;
-          startingDay.startFocusedDay = dayAsInt;
-          startingDay.startFocusedYear = yearAsInt;
-          startingDay.startFocusedDate = new Date(yearAsInt, monthAsInt - 1, dayAsInt);
-        }
+      if (monthAsInt !== -1 && dayAsInt !== -1 && yearAsInt !== -1 && isValidDayForTheMonth(monthAsInt - 1, yearAsInt, dayAsInt)) {
+        startingDay.startFocusedMonth = monthAsInt;
+        startingDay.startFocusedDay = dayAsInt;
+        startingDay.startFocusedYear = yearAsInt;
+        startingDay.startFocusedDate = new Date(yearAsInt, monthAsInt - 1, dayAsInt);
       }
     }
 
     return startingDay;
-  }, [dayFromInputValues, onCalendarOpenFocusedDay]);
+  }, [dayFromInputValues, inputValuesDaySplitYear, inputValuesSplitDay, inputValuesSplitMonth, isInputFilledAndValid, isOnCalendarOpenFocusedDayEmpty, onCalendarOpenFocusedDay, shouldFillWithOnCalendarOpenFocusedDay]);
 };
 
 export { useGetStartingFocusedDay };

package/esm/input-group/InputGroup.js

@@ -6,10 +6,10 @@ 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 { useMemo } from 'react';
-import { describe, useValidateTypescriptPropTypes, useGetGlobalAttributes } from '@elliemae/ds-props-helpers';
+import { describe, useValidateTypescriptPropTypes, useGetGlobalAttributes, useGetXstyledProps } from '@elliemae/ds-props-helpers';
 import { StyledContainer, StyledLeftAddon, StyledInput, StyledRightAddon } from './styled.js';
 import { propTypes } from './react-desc-prop-types.js';
-import { InputGroupDataTestIds } from './InputGroupDataTestIds.js';
+import { InputGroupDataTestIds } from './exported-related/data-test-ids.js';
 import { jsxs } from 'react/jsx-runtime';
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -24,6 +24,7 @@ const DSInputGroup = props => {
     rightAddon
   } = props;
   const globals = useGetGlobalAttributes(props);
+  const xstyledProps = useGetXstyledProps(props);
   const cols = useMemo(() => {
     if (leftAddon && rightAddon) {
       return ['max-content', 'auto', 'max-content'];
@@ -39,10 +40,10 @@ const DSInputGroup = props => {
 
     return ['auto'];
   }, [leftAddon, rightAddon]);
-  return /*#__PURE__*/jsxs(StyledContainer, _objectSpread(_objectSpread({
+  return /*#__PURE__*/jsxs(StyledContainer, _objectSpread(_objectSpread(_objectSpread({
     cols: cols,
     "data-testid": InputGroupDataTestIds.CONTAINER
-  }, globals), {}, {
+  }, globals), xstyledProps), {}, {
     children: [leftAddon && /*#__PURE__*/_jsx(StyledLeftAddon, {
       "data-testid": InputGroupDataTestIds.LEFTADDON
     }, void 0, leftAddon), /*#__PURE__*/_jsx(StyledInput, {

package/esm/input-group/exported-related/data-test-ids.js

@@ -0,0 +1,8 @@
+const InputGroupDataTestIds = {
+  CONTAINER: 'ds-input-group-container',
+  LEFTADDON: 'ds-input-group-left-addon',
+  RIGHTADDON: 'ds-input-group-right-addon',
+  INPUTCONTAINER: 'ds-input-group-input-container'
+};
+
+export { InputGroupDataTestIds };

package/esm/input-group/exported-related/index.js

@@ -0,0 +1,2 @@
+export { InputGroupDataTestIds } from './data-test-ids.js';
+export { DSInputGroupName, DSInputGroupSlots } from './theming.js';

package/esm/input-group/exported-related/theming.js

@@ -0,0 +1,8 @@
+const DSInputGroupName = 'ds-input-group';
+const DSInputGroupSlots = {
+  CONTAINER: 'root',
+  LEFT_ADDON: 'leftaddon',
+  RIGHT_ADDON: 'rightaddon'
+};
+
+export { DSInputGroupName, DSInputGroupSlots };

package/esm/input-group/styled.js

@@ -1,17 +1,18 @@
-import styled from 'styled-components';
+import _taggedTemplateLiteral from '@babel/runtime/helpers/esm/taggedTemplateLiteral';
+import { styled } from '@elliemae/ds-system';
 import { Grid } from '@elliemae/ds-grid';
 import '../text-input/DSInputText.js';
 import { DSInputTextName, DSInputTextSlots } from '../text-input/exported-related/theming.js';
 import '../combobox/ComboBox.js';
 import { DSComboBoxName, DSComboboxSlots } from '../combobox/theming.js';
+import { DSInputGroupName, DSInputGroupSlots } from './exported-related/theming.js';
 
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-const StyledContainer = /*#__PURE__*/styled(Grid).withConfig({
-  componentId: "sc-12elcva-0"
-})(["width:100%;height:28px;& > div:nth-child(1){.", "-", ",.", "-", ",.", "-", "{border-top-right-radius:0;border-bottom-right-radius:0;}}& > div:nth-child(2):nth-last-child(2){.", "-", ",.", "-", ",.", "-", "{border-radius:0;}}& > div:nth-child(2):nth-last-child(1){.", "-", ",.", "-", ",.", "-", "{border-top-left-radius:0;border-bottom-left-radius:0;}}"], DSInputTextName, DSInputTextSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT, DSComboBoxName, DSComboboxSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT, DSComboBoxName, DSComboboxSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT, DSComboBoxName, DSComboboxSlots.INPUT_WRAPPER);
-const StyledAddon = /*#__PURE__*/styled.div.withConfig({
-  componentId: "sc-12elcva-1"
-})(["outline:1px solid ", ";outline-offset:-1px;height:inherit;display:flex;button{border-width:1px;}&:hover{z-index:1;button:not(:disabled){border:1px solid ", ";}}&:focus-within{z-index:1;}"], _ref => {
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+const StyledContainer = styled(Grid, {
+  name: DSInputGroupName,
+  slot: DSInputGroupSlots.CONTAINER
+})(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 28px;\n\n  // input in left position with right addon\n  & > div:nth-child(1) {\n    .", "-", ",\n      .", "-", ",\n      .", "-", " {\n      border-top-right-radius: 0;\n      border-bottom-right-radius: 0;\n    }\n  }\n\n  // input in center position with left and right addon\n  & > div:nth-child(2):nth-last-child(2) {\n    .", "-", ",\n      .", "-", ",\n      .", "-", " {\n      border-radius: 0;\n    }\n  }\n\n  // input in right position with left addon\n  & > div:nth-child(2):nth-last-child(1) {\n    .", "-", ",\n      .", "-", ",\n      .", "-", " {\n      border-top-left-radius: 0;\n      border-bottom-left-radius: 0;\n    }\n  }\n"])), DSInputTextName, DSInputTextSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT, DSComboBoxName, DSComboboxSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT, DSComboBoxName, DSComboboxSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT_WRAPPER, DSInputTextName, DSInputTextSlots.INPUT, DSComboBoxName, DSComboboxSlots.INPUT_WRAPPER);
+const StyledAddon = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  outline: 1px solid ", ";\n  outline-offset: -1px;\n  height: inherit;\n  display: flex;\n  button {\n    border-width: 1px;\n  }\n  &:hover {\n    z-index: 2;\n    button:not(:disabled) {\n      border: 1px solid ", ";\n    }\n  }\n  &:focus-within {\n    z-index: 2;\n  }\n"])), _ref => {
   let {
     theme
   } = _ref;
@@ -22,14 +23,14 @@ const StyledAddon = /*#__PURE__*/styled.div.withConfig({
   } = _ref2;
   return theme.colors.brand['700'];
 });
-const StyledLeftAddon = /*#__PURE__*/styled(StyledAddon).withConfig({
-  componentId: "sc-12elcva-2"
-})(["border-top-left-radius:2px;border-bottom-left-radius:2px;margin-right:-1px;&:hover{button:not(:disabled){border-top-right-radius:0px;border-bottom-right-radius:0px;}}"]);
-const StyledRightAddon = /*#__PURE__*/styled(StyledAddon).withConfig({
-  componentId: "sc-12elcva-3"
-})(["border-top-right-radius:2px;border-bottom-right-radius:2px;margin-left:-1px;&:hover{button:not(:disabled){border-top-left-radius:0px;border-bottom-left-radius:0px;}}"]);
-const StyledInput = /*#__PURE__*/styled.div.withConfig({
-  componentId: "sc-12elcva-4"
-})(["&:focus-within,&:hover{z-index:1;}"]);
+const StyledLeftAddon = styled(StyledAddon, {
+  name: DSInputGroupName,
+  slot: DSInputGroupSlots.LEFT_ADDON
+})(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  border-top-left-radius: 2px;\n  border-bottom-left-radius: 2px;\n  margin-right: -1px;\n  &:hover {\n    button:not(:disabled) {\n      border-top-right-radius: 0px;\n      border-bottom-right-radius: 0px;\n    }\n  }\n"])));
+const StyledRightAddon = styled(StyledAddon, {
+  name: DSInputGroupName,
+  slot: DSInputGroupSlots.RIGHT_ADDON
+})(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  margin-left: -1px;\n  &:hover {\n    button:not(:disabled) {\n      border-top-left-radius: 0px;\n      border-bottom-left-radius: 0px;\n    }\n  }\n"])));
+const StyledInput = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  z-index: 1;\n"])));
 
 export { StyledContainer, StyledInput, StyledLeftAddon, StyledRightAddon };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-controlled-form",
-  "version": "2.4.2-rc.1",
+  "version": "2.4.2-rc.11",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Controlled Form Controllers",
   "module": "./esm/index.js",
@@ -179,6 +179,18 @@
       "import": "./esm/input-group/index.js",
       "require": "./cjs/input-group/index.js"
     },
+    "./input-group/exported-related/theming": {
+      "import": "./esm/input-group/exported-related/theming.js",
+      "require": "./cjs/input-group/exported-related/theming.js"
+    },
+    "./input-group/exported-related": {
+      "import": "./esm/input-group/exported-related/index.js",
+      "require": "./cjs/input-group/exported-related/index.js"
+    },
+    "./input-group/exported-related/data-test-ids": {
+      "import": "./esm/input-group/exported-related/data-test-ids.js",
+      "require": "./cjs/input-group/exported-related/data-test-ids.js"
+    },
     "./date-time-picker/utils/typeGuards": {
       "import": "./esm/date-time-picker/utils/typeGuards.js",
       "require": "./cjs/date-time-picker/utils/typeGuards.js"
@@ -511,6 +523,10 @@
       "import": "./esm/date-time-picker/config/useGetDestructuredValues.js",
       "require": "./cjs/date-time-picker/config/useGetDestructuredValues.js"
     },
+    "./date-time-picker/config/useFocusTracker": {
+      "import": "./esm/date-time-picker/config/useFocusTracker.js",
+      "require": "./cjs/date-time-picker/config/useFocusTracker.js"
+    },
     "./date-time-picker/config/useControlledDateTimePicker": {
       "import": "./esm/date-time-picker/config/useControlledDateTimePicker.js",
       "require": "./cjs/date-time-picker/config/useControlledDateTimePicker.js"
@@ -799,6 +815,10 @@
       "import": "./esm/autocomplete/react-desc-prop-types.js",
       "require": "./cjs/autocomplete/react-desc-prop-types.js"
     },
+    "./autocomplete/parts/styled": {
+      "import": "./esm/autocomplete/parts/styled.js",
+      "require": "./cjs/autocomplete/parts/styled.js"
+    },
     "./autocomplete/parts/menu-list/useItemRenderer": {
       "import": "./esm/autocomplete/parts/menu-list/useItemRenderer.js",
       "require": "./cjs/autocomplete/parts/menu-list/useItemRenderer.js"
@@ -831,6 +851,10 @@
       "import": "./esm/autocomplete/parts/container/Container.js",
       "require": "./cjs/autocomplete/parts/container/Container.js"
     },
+    "./autocomplete/parts/A11yFocusedOption": {
+      "import": "./esm/autocomplete/parts/A11yFocusedOption.js",
+      "require": "./cjs/autocomplete/parts/A11yFocusedOption.js"
+    },
     "./autocomplete": {
       "import": "./esm/autocomplete/index.js",
       "require": "./cjs/autocomplete/index.js"
@@ -872,20 +896,20 @@
     "build": "node ../../scripts/build/build.js"
   },
   "dependencies": {
-    "@elliemae/ds-button": "2.4.2-rc.1",
-    "@elliemae/ds-circular-progress-indicator": "2.4.2-rc.1",
-    "@elliemae/ds-controlled-form": "2.4.2-rc.1",
-    "@elliemae/ds-form": "2.4.2-rc.1",
-    "@elliemae/ds-form-layout-blocks": "2.4.2-rc.1",
-    "@elliemae/ds-grid": "2.4.2-rc.1",
-    "@elliemae/ds-icon": "2.4.2-rc.1",
-    "@elliemae/ds-icons": "2.4.2-rc.1",
-    "@elliemae/ds-pills": "2.4.2-rc.1",
-    "@elliemae/ds-popperjs": "2.4.2-rc.1",
-    "@elliemae/ds-props-helpers": "2.4.2-rc.1",
-    "@elliemae/ds-system": "2.4.2-rc.1",
-    "@elliemae/ds-tooltip": "2.4.2-rc.1",
-    "@elliemae/ds-truncated-tooltip-text": "2.4.2-rc.1",
+    "@elliemae/ds-button": "2.4.2-rc.11",
+    "@elliemae/ds-circular-progress-indicator": "2.4.2-rc.11",
+    "@elliemae/ds-controlled-form": "2.4.2-rc.11",
+    "@elliemae/ds-form": "2.4.2-rc.11",
+    "@elliemae/ds-form-layout-blocks": "2.4.2-rc.11",
+    "@elliemae/ds-grid": "2.4.2-rc.11",
+    "@elliemae/ds-icon": "2.4.2-rc.11",
+    "@elliemae/ds-icons": "2.4.2-rc.11",
+    "@elliemae/ds-pills": "2.4.2-rc.11",
+    "@elliemae/ds-popperjs": "2.4.2-rc.11",
+    "@elliemae/ds-props-helpers": "2.4.2-rc.11",
+    "@elliemae/ds-system": "2.4.2-rc.11",
+    "@elliemae/ds-tooltip": "2.4.2-rc.11",
+    "@elliemae/ds-truncated-tooltip-text": "2.4.2-rc.11",
     "prop-types": "~15.7.2",
     "react-desc": "~4.1.3",
     "react-popper": "~2.2.5",

package/types/autocomplete/parts/A11yFocusedOption.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { DSAutocompleteT } from '../react-desc-prop-types';
+export declare const isSeparator: (el: DSAutocompleteT.OptionTypes | undefined) => el is DSAutocompleteT.ItemSeparatorOptions;
+export declare const StyledA11ySelectedValues: any;
+export declare const A11yFocusedOption: React.ComponentType;

package/types/autocomplete/parts/container/styled.d.ts

@@ -1,2 +1,2 @@
-export declare const StyledContainerWithPopper: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>;
+export declare const StyledContainer: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>;
 export declare const StyledPopperWrapper: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>;

package/types/autocomplete/utils/listHelper.d.ts

@@ -1,7 +1,7 @@
 import { DSAutocompleteT } from '../react-desc-prop-types';
-export declare const getSelectableOptions: (options: Array<CBOptionT>) => Array<CBOptionT>;
-export declare const getOptions: (options: Array<CBOptionT>) => Array<CBOptionT>;
-export declare const isSelectedValueEmpty: (value: CBOptionT | Array<CBOptionT>) => boolean;
-export declare const isSelectedValueMultiple: (value: CBOptionT | Array<CBOptionT>) => boolean;
-export declare const findInCircularList: <T extends unknown>(list: T[], from: number, criteria: (item: T) => boolean, step?: number) => number;
+export declare const getSelectableOptions: (options: Array<DSAutocompleteT.OptionTypes>) => Array<DSAutocompleteT.OptionTypes>;
+export declare const getOptions: (options: Array<DSAutocompleteT.OptionTypes>) => Array<DSAutocompleteT.OptionTypes>;
+export declare const isSelectedValueEmpty: (value: DSAutocompleteT.OptionTypes | Array<DSAutocompleteT.OptionTypes>) => boolean;
+export declare const isSelectedValueMultiple: (value: DSAutocompleteT.OptionTypes | Array<DSAutocompleteT.OptionTypes>) => boolean;
+export declare const findInCircularList: (list: DSAutocompleteT.OptionTypes[], from: number, criteria: (item: DSAutocompleteT.OptionTypes) => boolean, step?: number) => number;
 export declare const getFirstOption: (options: DSAutocompleteT.OptionTypes[]) => string;

package/types/checkbox/react-desc-prop-types.d.ts

@@ -5,7 +5,6 @@ export declare namespace DSControlledCheckboxT {
         checked: boolean | 'mixed';
         tabIndex?: number;
         hasError?: boolean;
-        'data-testid'?: string;
         wrapLabel: boolean;
     }
     interface OptionalProps {
@@ -35,6 +34,7 @@ export declare const propTypes: {
     label: import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;
     hasError: import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;
     innerRef: import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;
+    wrapLabel: import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;
     'aria-*': import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;
     'on-*': import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;
     'data-*': import("@elliemae/ds-props-helpers/types/propTypes/types").ReactDescT;

package/types/checkbox/styles.d.ts

@@ -3,3 +3,4 @@ export declare const StyledCheckBox: any;
 export declare const StyledInput: any;
 export declare const StyledInputMixed: any;
 export declare const StyledLabel: any;
+export declare const StyledWrapLabel: any;

package/types/combobox/parts/menu-list/styled.d.ts

@@ -2,4 +2,5 @@ export declare const StyledListWrapper: any;
 export declare const StyledList: any;
 export declare const StyledVirtualListWrapper: any;
 export declare const StyledCreatableLabel: any;
+export declare const StyledCreatableValue: any;
 export declare const StyledNoResultsWrapper: any;