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

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/index.js

@@ -1,6 +1,10 @@
 export { DSAutocomplete, DSAutocompleteWithSchema } from './autocomplete/Autocomplete.js';
+export { DSInputGroup, DSInputGroupWithSchema } from './input-group/InputGroup.js';
+export { InputGroupDataTestIds } from './input-group/InputGroupDataTestIds.js';
 export { DSControlledCheckbox, DSControlledCheckboxWithSchema } from './checkbox/ControlledCheckbox.js';
 export { DSComboBox, DSComboBox as DSComboBoxV3, DSComboBoxWithSchema } from './combobox/ComboBox.js';
+export { DSComboBoxName, DSComboboxSlots } from './combobox/theming.js';
+export { ComboboxDataTestid } from './combobox/ComboboxDataTestids.js';
 export { DSControlledDateRangePicker, DSControlledDateRangePickerWithSchema } from './date-range-picker/ControlledDateRangePicker.js';
 export { ControlledDateRangePickerDatatestid } from './date-range-picker/ControlledDateRangePickerDatatestid.js';
 export { CONTROLLED_DATE_RANGE_PICKER_TYPES } from './date-range-picker/ControlledDateRangePickerTypes.js';
@@ -14,7 +18,7 @@ export { getValidationTimeStringMetaInfo } from './date-time-picker/utils/timeHe
 export { UsePhoneMaskWithSchema, getPhoneMaskedValue, usePhoneMask } from './mask-hook/hooks/usePhoneMask.js';
 export { UseNumberMaskWithSchema, getNumberMaskedValue, useNumberMask } from './mask-hook/hooks/useNumberMask.js';
 export { UseSSNMaskWithSchema, getSSNMaskedValue, useSSNMask } from './mask-hook/hooks/useSSNMask.js';
-export { UseRegExpMaskWithSchema, isRegExp, useRegExpMask } from './mask-hook/hooks/useRegExpMask.js';
+export { UseRegExpMaskWithSchema, useRegExpMask } from './mask-hook/hooks/useRegExpMask.js';
 export { UseZipCodeMaskWithSchema, getUseZipMaskedValue, useZipCodeMask } from './mask-hook/hooks/useZipCodeMask.js';
 export { DSInputText, DSInputTextWithSchema } from './text-input/DSInputText.js';
 export { DSInputTextDataTestIds } from './text-input/exported-related/data-test-ids.js';

package/esm/input-group/InputGroup.js

@@ -0,0 +1,59 @@
+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 _jsx from '@babel/runtime/helpers/esm/jsx';
+import { useMemo } from 'react';
+import { describe, useValidateTypescriptPropTypes, useGetGlobalAttributes } 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 { 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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+const DSInputGroup = props => {
+  useValidateTypescriptPropTypes(props, propTypes);
+  const {
+    children,
+    leftAddon,
+    rightAddon
+  } = props;
+  const globals = useGetGlobalAttributes(props);
+  const cols = useMemo(() => {
+    if (leftAddon && rightAddon) {
+      return ['max-content', 'auto', 'max-content'];
+    }
+
+    if (leftAddon && !rightAddon) {
+      return ['max-content', 'auto'];
+    }
+
+    if (!leftAddon && rightAddon) {
+      return ['auto', 'max-content'];
+    }
+
+    return ['auto'];
+  }, [leftAddon, rightAddon]);
+  return /*#__PURE__*/jsxs(StyledContainer, _objectSpread(_objectSpread({
+    cols: cols,
+    "data-testid": InputGroupDataTestIds.CONTAINER
+  }, globals), {}, {
+    children: [leftAddon && /*#__PURE__*/_jsx(StyledLeftAddon, {
+      "data-testid": InputGroupDataTestIds.LEFTADDON
+    }, void 0, leftAddon), /*#__PURE__*/_jsx(StyledInput, {
+      "data-testid": InputGroupDataTestIds.INPUTCONTAINER
+    }, void 0, children), rightAddon && /*#__PURE__*/_jsx(StyledRightAddon, {
+      "data-testid": InputGroupDataTestIds.RIGHTADDON
+    }, void 0, rightAddon)]
+  }));
+};
+
+const DSInputGroupWithSchema = describe(DSInputGroup);
+DSInputGroupWithSchema.propTypes = propTypes;
+
+export { DSInputGroup, DSInputGroupWithSchema };

package/esm/input-group/InputGroupDataTestIds.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/index.js

@@ -0,0 +1,2 @@
+export { DSInputGroup, DSInputGroupWithSchema } from './InputGroup.js';
+export { InputGroupDataTestIds } from './InputGroupDataTestIds.js';

package/esm/input-group/react-desc-prop-types.js

@@ -0,0 +1,10 @@
+import { PropTypes } from '@elliemae/ds-props-helpers';
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const propTypes = {
+  leftAddon: PropTypes.element.description('Component to be added at the left side of the input'),
+  rightAddon: PropTypes.element.description('Component to be added at the right side of the input'),
+  children: PropTypes.node.isRequired.description('React component to apply autocomplete functionality').defaultValue('')
+};
+
+export { propTypes };

package/esm/input-group/styled.js

@@ -0,0 +1,35 @@
+import styled from 'styled-components';
+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';
+
+/* 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 => {
+  let {
+    theme
+  } = _ref;
+  return theme.colors.neutral['400'];
+}, _ref2 => {
+  let {
+    theme
+  } = _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;}"]);
+
+export { StyledContainer, StyledInput, StyledLeftAddon, StyledRightAddon };

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

@@ -1,5 +1,5 @@
 export { UsePhoneMaskWithSchema, getPhoneMaskedValue, usePhoneMask } from './usePhoneMask.js';
 export { UseNumberMaskWithSchema, getNumberMaskedValue, useNumberMask } from './useNumberMask.js';
 export { UseSSNMaskWithSchema, getSSNMaskedValue, useSSNMask } from './useSSNMask.js';
-export { UseRegExpMaskWithSchema, isRegExp, useRegExpMask } from './useRegExpMask.js';
+export { UseRegExpMaskWithSchema, useRegExpMask } from './useRegExpMask.js';
 export { UseZipCodeMaskWithSchema, getUseZipMaskedValue, useZipCodeMask } from './useZipCodeMask.js';

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

@@ -14,8 +14,8 @@ import 'core-js/modules/esnext.iterator.reduce.js';
 import { DSMaskPhoneHookPropsTypes, DSMaskPhoneHookDefaultProps } from '../react-desc-prop-types.js';
 
 const _excluded = ["valueSetter", "onChange", "onKeyDown", "onBlur"];
-const phoneSpecialChars = [['(', 0], [') ', 4], ['-', 9]];
-const internationalPhoneSpecialChars = [['+1 (', 0], [') ', 7], ['-', 12]];
+const phoneSpecialChars = [['(', 0], [') ', 4], [' - ', 9]];
+const internationalPhoneSpecialChars = [['+1 (', 0], [') ', 7], [' - ', 12]];
 
 const conformValue = (rawValue, cursorPos, lastKeyCode, opts) => {
   const characters = rawValue.split(''); // Work with digits only

package/esm/mask-hook/hooks/useRegExpMask.js

@@ -113,4 +113,4 @@ const useRegExpMask = props => {
 const UseRegExpMaskWithSchema = describe(useRegExpMask);
 UseRegExpMaskWithSchema.propTypes = DSMaskRegExpHookPropsTypes;
 
-export { UseRegExpMaskWithSchema, isRegExp, useRegExpMask };
+export { UseRegExpMaskWithSchema, useRegExpMask };

package/esm/mask-hook/index.js

@@ -1,5 +1,5 @@
 export { UsePhoneMaskWithSchema, getPhoneMaskedValue, usePhoneMask } from './hooks/usePhoneMask.js';
 export { UseNumberMaskWithSchema, getNumberMaskedValue, useNumberMask } from './hooks/useNumberMask.js';
 export { UseSSNMaskWithSchema, getSSNMaskedValue, useSSNMask } from './hooks/useSSNMask.js';
-export { UseRegExpMaskWithSchema, isRegExp, useRegExpMask } from './hooks/useRegExpMask.js';
+export { UseRegExpMaskWithSchema, useRegExpMask } from './hooks/useRegExpMask.js';
 export { UseZipCodeMaskWithSchema, getUseZipMaskedValue, useZipCodeMask } from './hooks/useZipCodeMask.js';

package/esm/text-input/styled/borders.js

@@ -7,7 +7,7 @@ const readOnlyBorderCss = css(_templateObject2 || (_templateObject2 = _taggedTem
 const disabledBorderCss = commonBorderCss;
 const hasErrorBorderCss = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  border: 1px solid ", ";\n"])), th.color('danger-900'));
 const hoverBorderCss = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  border: 1px solid ", ";\n"])), th.color('brand-700'));
-const focusBorderCss = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  border: 1px solid transparent;\n  outline: 2px solid ", ";\n  outline-offset: -1px;\n"])), th.color('brand-700'));
+const focusBorderCss = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  border: 1px solid transparent;\n  outline: 2px solid ", ";\n  outline-offset: -2px;\n"])), th.color('brand-700'));
 const getBorderCss = props => {
   if (props.isDisabled) return disabledBorderCss;
   if (props.hasFocus) return focusBorderCss;

package/esm/toggle/ControlledToggle.js

@@ -1,11 +1,11 @@
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import _jsx from '@babel/runtime/helpers/esm/jsx';
+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 _jsx from '@babel/runtime/helpers/esm/jsx';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { useState, useRef, useMemo, useEffect, useCallback } from 'react';
 import { uid } from 'uid';
 import { describe } from 'react-desc';