@elliemae/ds-controlled-form 2.4.1-rc.6 → 2.4.1

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

@@ -9,7 +9,7 @@ const validSecondDigits = ['m', 'M'];
 
 const isInvalidMeridiem = meridiem => {
   if (meridiem === '') return false;
-  const [firstDigit, secondDigit] = meridiem === null || meridiem === void 0 ? void 0 : meridiem.split('');
+  const [firstDigit, secondDigit] = meridiem.split('');
   const isValidFirstDigit = meridiem.length < 1 && !firstDigit || validFirstDigits.includes(firstDigit);
   const isValidSecondDigit = !secondDigit || validSecondDigits.includes(secondDigit);
   return meridiem.length > 2 || !isValidFirstDigit || !isValidSecondDigit;

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

@@ -12,30 +12,26 @@ import { StyledFocusWithIn, StyledColonSeparator, StyledSeparator } from '../Sty
 var _StyledColonSeparator, _StyledSeparator;
 const TimeInputs = () => {
   const {
-    hours,
-    minutes,
-    // seconds,
-    meridiem,
     autoFocusHourInput,
     disabled,
     onHoursChange,
     onMinutesChange,
-    // onSecondsChange,
     onMeridiemChange,
     onHoursBlur,
     onMinutesBlur,
-    // onSecondsBlur,
     onMeridiemBlur,
     onHoursFocus,
     onMeridiemFocus,
     onMinutesFocus,
     onHoursKeyDown,
     onMinutesKeyDown,
-    // onSecondsKeyDown,
     onMeridiemKeyDown
   } = useTimeInputs(); // we do this here so HHInput,MinutesInput, MeridiemInput can be pure components memoized via React.memo
 
   const {
+    hours,
+    minutes,
+    meridiem,
     hourInputRef,
     minutesInputRef,
     meridiemInputRef,

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

@@ -7,7 +7,6 @@ import { prependStringWithPlaceHolders } from '../../utils/stringHelpers.js';
 const useTimeInputs = () => {
   const {
     props: {
-      minutesInterval,
       disabled
     },
     lastSegmentRef,
@@ -30,7 +29,8 @@ const useTimeInputs = () => {
     handleChangeHours,
     handleChangeMinutes,
     handleChangeMeridiem,
-    setLatestInteractionRegion
+    setLatestInteractionRegion,
+    minutesInterval
   } = useContext(ControlledDateTimePickerContext);
   const setLatestInteractionRegionTimeInputs = useCallback(() => {
     setLatestInteractionRegion('time-inputs');
@@ -225,9 +225,6 @@ const useTimeInputs = () => {
     });
   }, [handleChangeMeridiem]);
   return useMemo(() => ({
-    hours,
-    minutes,
-    meridiem,
     autoFocusHourInput,
     disabled,
     handleChangeHours,
@@ -245,7 +242,7 @@ const useTimeInputs = () => {
     onHoursKeyDown,
     onMinutesKeyDown,
     onMeridiemKeyDown
-  }), [hours, minutes, meridiem, autoFocusHourInput, disabled, handleChangeHours, onHoursFocus, onHoursChange, handleChangeMinutes, onMinutesFocus, onMinutesChange, handleChangeMeridiem, onMeridiemFocus, onMeridiemChange, onHoursBlur, onMinutesBlur, onMeridiemBlur, onHoursKeyDown, onMinutesKeyDown, onMeridiemKeyDown]);
+  }), [autoFocusHourInput, disabled, handleChangeHours, onHoursFocus, onHoursChange, handleChangeMinutes, onMinutesFocus, onMinutesChange, handleChangeMeridiem, onMeridiemFocus, onMeridiemChange, onHoursBlur, onMinutesBlur, onMeridiemBlur, onHoursKeyDown, onMinutesKeyDown, onMeridiemKeyDown]);
 };
 
 export { useTimeInputs };

package/esm/date-time-picker/propTypes.js

@@ -1,28 +1,60 @@
-import { PropTypes } from 'react-desc';
+import { PropTypes } from '@elliemae/ds-props-helpers';
 
+/* eslint-disable max-lines */
+
+const noop = () => {};
+
+const defaultReturnFalse = () => false;
+
+const defaultProps = {
+  type: 'full-date-time',
+  onDateChange: noop,
+  onMonthChange: noop,
+  onDayChange: noop,
+  onYearChange: noop,
+  onTimeChange: noop,
+  onHourChange: noop,
+  onMinuteChange: noop,
+  onMeridiemChange: noop,
+  onPickerOpen: noop,
+  onPickerClose: noop,
+  getIsDisabledDay: defaultReturnFalse,
+  getIsOutOfRangeDay: defaultReturnFalse,
+  getIsStartRangeDay: defaultReturnFalse,
+  getIsDayInRange: defaultReturnFalse,
+  getIsEndRangeDay: defaultReturnFalse,
+  getIsDisabledTime: defaultReturnFalse,
+  minutesInterval: 1,
+  isClearable: false,
+  disabled: false,
+  hasError: false,
+  autoFocus: false,
+  preventCloseOnSelection: false
+};
 const propTypes = {
   type: PropTypes.oneOf(['full-date-time', 'date-time-inputs', 'date-time-picker', 'date-time-picker-controller-only', 'full-date', 'date-inputs', 'date-picker', 'date-picker-controller-only', 'full-time', 'time-inputs', 'time-picker', 'time-picker-controller-only']).description('Type of time form control to use').defaultValue('full-date-time'),
-  disabled: PropTypes.bool.description('wheter or not the input is disabled').defaultValue('false'),
-  isClearable: PropTypes.bool.description('with or without clearable button').defaultValue('false'),
+  disabled: PropTypes.bool.description('wheter or not the input is disabled').defaultValue(false),
+  isClearable: PropTypes.bool.description('with or without clearable button').defaultValue(false),
   dateTime: PropTypes.string.description('when using date-time types, this is the value of the controller'),
   date: PropTypes.string.description('when using date types, this is the value of the controller'),
   time: PropTypes.string.description('when using time types, this is the value of the controller'),
-  onDateChange: PropTypes.func.description('(newDateString, metaInformations) => void').defaultValue(''),
-  onTimeChange: PropTypes.func.description('(newTimeString, metaInformations) => void').defaultValue(''),
-  onDateTimeChange: PropTypes.func.description('(newDateTimeString, metaInformations) => void').defaultValue(''),
-  onMonthChange: PropTypes.func.description('(newMonthString, event, metaInformations) => void').defaultValue(''),
-  onDayChange: PropTypes.func.description('(newDayString, event, metaInformations) => void').defaultValue(''),
-  onYearChange: PropTypes.func.description('(newYearString, event, metaInformations) => void').defaultValue(''),
-  onHourChange: PropTypes.func.description('(newHourString, event, metaInformations) => void').defaultValue(''),
-  onMinuteChange: PropTypes.func.description('(newMinuteString, event, metaInformations) => void').defaultValue(''),
-  onMeridiemChange: PropTypes.func.description('(newMeridiemString, event, metaInformations) => void').defaultValue(''),
-  getIsDisabledDay: PropTypes.func.description('(dayAsString) => true for marking as disabled, false for marking as valid').defaultValue(''),
-  getIsOutOfRangeDay: PropTypes.func.description('(dayAsString) => true for marking as disabled, false for marking as valid').defaultValue(''),
-  getIsDisabledTime: PropTypes.func.description('(timeAsString) => true for marking as disabled, false for marking as valid').defaultValue(''),
+  onDateChange: PropTypes.func.description('(newDateString, metaInformations) => void'),
+  onTimeChange: PropTypes.func.description('(newTimeString, metaInformations) => void'),
+  onDateTimeChange: PropTypes.func.description('(newDateTimeString, metaInformations) => void'),
+  onMonthChange: PropTypes.func.description('(newMonthString, event, metaInformations) => void'),
+  onDayChange: PropTypes.func.description('(newDayString, event, metaInformations) => void'),
+  onYearChange: PropTypes.func.description('(newYearString, event, metaInformations) => void'),
+  onHourChange: PropTypes.func.description('(newHourString, event, metaInformations) => void'),
+  onMinuteChange: PropTypes.func.description('(newMinuteString, event, metaInformations) => void'),
+  onMeridiemChange: PropTypes.func.description('(newMeridiemString, event, metaInformations) => void'),
+  getIsDisabledDay: PropTypes.func.description('(dayAsString) => true for marking as disabled, false for marking as valid'),
+  getIsOutOfRangeDay: PropTypes.func.description('(dayAsString) => true for marking as disabled, false for marking as valid'),
+  getIsDisabledTime: PropTypes.func.description('(timeAsString) => true for marking as disabled, false for marking as valid'),
   emptyPickerStartingMonth: PropTypes.string.description('which month to start the calendar on open, when value is empty, string following the "MM/__/YYYY" pattern'),
-  onCalendarOpenFocusedDay: PropTypes.string.description('which day to focus on calendar open when value is empty, string following the "MM/DD/YYYY" pattern').defaultValue('if value is empty current month, else month corresponding the month'),
+  onCalendarOpenFocusedDay: PropTypes.string.description('which day to focus on calendar open when value is empty, string following the "MM/DD/YYYY" pattern').defaultValue('if value is empty current month, else current month'),
+  onTimeWheelOpenStartingTime: PropTypes.string.description('which day to start the timewheel on picker open when value is empty, string following the HH:MM AA" pattern').defaultValue('01:00 AM'),
   minutesInterval: PropTypes.number.description('increments/decrements of minutes in time related controllers interactions').defaultValue('1'),
   'data-testid': PropTypes.string.description('Unique id for tests.').defaultValue('')
 };
 
-export { propTypes };
+export { defaultProps, propTypes };

package/esm/date-time-picker/sharedTypes.js

@@ -0,0 +1 @@
+

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

@@ -3,15 +3,71 @@ import 'core-js/modules/esnext.iterator.map.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import { createRef } from 'react';
 import { monthNames } from './constants.js';
-import { isIncompleteString, deconstructValuesFromDateString, prependStringWithPlaceHolders } from './stringHelpers.js';
+import { prependStringWithPlaceHolders, deconstructValuesFromDateString, isIncompleteString } from './stringHelpers.js';
 import { convertToPositiveNumberIfPossible } from './numberHelpers.js';
 
+const getDateValuesFromDate = day => {
+  var _day$getMonth, _day$getDate, _day$getFullYear;
+
+  return {
+    month: day === null || day === void 0 ? void 0 : (_day$getMonth = day.getMonth) === null || _day$getMonth === void 0 ? void 0 : _day$getMonth.call(day),
+    day: day === null || day === void 0 ? void 0 : (_day$getDate = day.getDate) === null || _day$getDate === void 0 ? void 0 : _day$getDate.call(day),
+    year: day === null || day === void 0 ? void 0 : (_day$getFullYear = day.getFullYear) === null || _day$getFullYear === void 0 ? void 0 : _day$getFullYear.call(day)
+  };
+};
+const getDateStringFromDay = day => {
+  const monthFromDay = prependStringWithPlaceHolders("".concat(day.getMonth() + 1), 2); // months from 1-12
+
+  const dayFromDay = prependStringWithPlaceHolders("".concat(day.getDate()), 2);
+  const yearFromDay = prependStringWithPlaceHolders("".concat(day.getFullYear()), 4);
+  return "".concat(monthFromDay, "/").concat(dayFromDay, "/").concat(yearFromDay);
+};
+const getTimeStringFromDay = day => {
+  const hoursNum = day.getHours();
+  const meridiem = hoursNum > 12 ? 'PM' : 'AM';
+  const twelveHourFormat = hoursNum > 12 ? hoursNum - 12 : hoursNum;
+  const minutesNum = day.getMinutes();
+  const hoursFromDay = prependStringWithPlaceHolders("".concat(twelveHourFormat), 2);
+  const minutesFromDay = prependStringWithPlaceHolders("".concat(minutesNum), 2);
+  return "".concat(hoursFromDay, ":").concat(minutesFromDay, " ").concat(meridiem);
+};
+const getMonthNameByMonthNumber = monthNumber => monthNames[monthNumber];
+const isSameDateMoment = (dateA, dateB) => {
+  var _dateA$getTime, _dateB$getTime;
+
+  return (dateA === null || dateA === void 0 ? void 0 : (_dateA$getTime = dateA.getTime) === null || _dateA$getTime === void 0 ? void 0 : _dateA$getTime.call(dateA)) === (dateB === null || dateB === void 0 ? void 0 : (_dateB$getTime = dateB.getTime) === null || _dateB$getTime === void 0 ? void 0 : _dateB$getTime.call(dateB));
+};
+const compareTwoDatesDayEquality = (dayA, dayB) => {
+  const {
+    day: currD,
+    month: currM,
+    year: currY
+  } = getDateValuesFromDate(dayA);
+  const {
+    day: focusD,
+    month: focusM,
+    year: focusY
+  } = getDateValuesFromDate(dayB);
+  return currD === focusD && currM === focusM && currY === focusY;
+};
 const getLastDayOfMonth = (month, year) => new Date(year, month + 1, 0);
 const isValidDayForTheMonth = (month, year, day) => {
   var _Date, _Date$getMonth;
 
   return ((_Date = new Date(year, month, day)) === null || _Date === void 0 ? void 0 : (_Date$getMonth = _Date.getMonth) === null || _Date$getMonth === void 0 ? void 0 : _Date$getMonth.call(_Date)) === month;
 };
+const getDayFromDateString = dateString => {
+  const {
+    month,
+    day,
+    year
+  } = deconstructValuesFromDateString(dateString);
+  const monthNum = convertToPositiveNumberIfPossible(month);
+  const dayNum = convertToPositiveNumberIfPossible(day);
+  const yearNum = convertToPositiveNumberIfPossible(year);
+  if (monthNum !== -1 && dayNum !== -1 && yearNum !== -1 && isValidDayForTheMonth(monthNum - 1, yearNum, dayNum)) return new Date(yearNum, monthNum - 1, dayNum);
+  return null;
+};
 const isValidDayForTheMonthDateString = dateString => {
   var _getDayFromDateString, _getDayFromDateString2;
 
@@ -182,61 +238,5 @@ const getFiveBySevenCurrentMonthDaysMatrix = (month, year) => {
   }));
   return [...previousMonthDaysToPrepend, ...currentMonthDays, ...nextMonthDaysToAppend];
 };
-const getDateValuesFromDate = day => {
-  var _day$getMonth, _day$getDate, _day$getFullYear;
-
-  return {
-    month: day === null || day === void 0 ? void 0 : (_day$getMonth = day.getMonth) === null || _day$getMonth === void 0 ? void 0 : _day$getMonth.call(day),
-    day: day === null || day === void 0 ? void 0 : (_day$getDate = day.getDate) === null || _day$getDate === void 0 ? void 0 : _day$getDate.call(day),
-    year: day === null || day === void 0 ? void 0 : (_day$getFullYear = day.getFullYear) === null || _day$getFullYear === void 0 ? void 0 : _day$getFullYear.call(day)
-  };
-};
-const getDateStringFromDay = day => {
-  const monthFromDay = prependStringWithPlaceHolders("".concat(day.getMonth() + 1), 2); // months from 1-12
-
-  const dayFromDay = prependStringWithPlaceHolders("".concat(day.getDate()), 2);
-  const yearFromDay = prependStringWithPlaceHolders("".concat(day.getFullYear()), 4);
-  return "".concat(monthFromDay, "/").concat(dayFromDay, "/").concat(yearFromDay);
-};
-const getTimeStringFromDay = day => {
-  const hoursNum = day.getHours();
-  const meridiem = hoursNum > 12 ? 'PM' : 'AM';
-  const twelveHourFormat = hoursNum > 12 ? hoursNum - 12 : hoursNum;
-  const minutesNum = day.getMinutes();
-  const hoursFromDay = prependStringWithPlaceHolders("".concat(twelveHourFormat), 2);
-  const minutesFromDay = prependStringWithPlaceHolders("".concat(minutesNum), 2);
-  return "".concat(hoursFromDay, ":").concat(minutesFromDay, " ").concat(meridiem);
-};
-const getDayFromDateString = dateString => {
-  const {
-    month,
-    day,
-    year
-  } = deconstructValuesFromDateString(dateString);
-  const monthNum = convertToPositiveNumberIfPossible(month);
-  const dayNum = convertToPositiveNumberIfPossible(day);
-  const yearNum = convertToPositiveNumberIfPossible(year);
-  if (monthNum !== -1 && dayNum !== -1 && yearNum !== -1 && isValidDayForTheMonth(monthNum - 1, yearNum, dayNum)) return new Date(yearNum, monthNum - 1, dayNum);
-  return null;
-};
-const getMonthNameByMonthNumber = monthNumber => monthNames[monthNumber];
-const isSameDateMoment = (dateA, dateB) => {
-  var _dateA$getTime, _dateB$getTime;
-
-  return (dateA === null || dateA === void 0 ? void 0 : (_dateA$getTime = dateA.getTime) === null || _dateA$getTime === void 0 ? void 0 : _dateA$getTime.call(dateA)) === (dateB === null || dateB === void 0 ? void 0 : (_dateB$getTime = dateB.getTime) === null || _dateB$getTime === void 0 ? void 0 : _dateB$getTime.call(dateB));
-};
-const compareTwoDatesDayEquality = (dayA, dayB) => {
-  const {
-    day: currD,
-    month: currM,
-    year: currY
-  } = getDateValuesFromDate(dayA);
-  const {
-    day: focusD,
-    month: focusM,
-    year: focusY
-  } = getDateValuesFromDate(dayB);
-  return currD === focusD && currM === focusM && currY === focusY;
-};
 
 export { compareTwoDatesDayEquality, dateAddMonths, dateAddYear, dateGetDaysInMonth, dateIsLeapYear, getDateStringFromDay, getDateValuesFromDate, getDayFromDateString, getDaysInMonth, getFirstXDaysFromNextMonth, getFiveBySevenCurrentMonthDaysMatrix, getHowManyDaysInMonth, getLastDayOfMonth, getLastXDaysFromPreviousMonth, getMonthNameByMonthNumber, getTimeStringFromDay, getValidationDateStringMetaInfo, isLeapYear, isSameDateMoment, isValidDayForTheMonth, isValidDayForTheMonthDateString, subtractMonths, subtractYears, sumFromDateValues, sumMonths, sumValuesToDate, sumYears };

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

@@ -5,12 +5,9 @@ import { deconstructValuesFromDateString } from '../stringHelpers.js';
 const useGetMonthYearFromDateStringOrEmptyStartingMonth = () => {
   const {
     dateStringFromProps,
-    props: {
-      emptyPickerStartingMonth
-    }
+    emptyPickerStartingMonth
   } = useContext(ControlledDateTimePickerContext);
   return useMemo(() => {
-    const emptyPickerStartingMonthDefault = "".concat(new Date().getMonth() + 1, "/__/").concat(new Date().getFullYear());
     const {
       month: stringMonthVal,
       year: stringYearVal
@@ -18,7 +15,7 @@ const useGetMonthYearFromDateStringOrEmptyStartingMonth = () => {
     const {
       month: emptyStringSplitMonth,
       year: emptyStringSplitYear
-    } = deconstructValuesFromDateString(emptyPickerStartingMonth || emptyPickerStartingMonthDefault);
+    } = deconstructValuesFromDateString(emptyPickerStartingMonth);
     const userEmptyStringMonth = Number.parseInt(emptyStringSplitMonth, 10);
     const userEmptyStringYear = Number.parseInt(emptyStringSplitYear, 10);
     const month = stringMonthVal === '' || stringMonthVal.length !== 2 ? userEmptyStringMonth - 1 : Number.parseInt(stringMonthVal, 10) - 1; // month is 0~11 in javascript Date...

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

@@ -1,3 +1,9 @@
+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 { useContext, useMemo } from 'react';
 import { ControlledDateTimePickerContext } from '../../ControlledDateTimePickerCTX.js';
 import { deconstructValuesFromDateString } from '../stringHelpers.js';
@@ -5,7 +11,9 @@ import { convertToPositiveNumberIfPossible } from '../numberHelpers.js';
 import { getDateValuesFromDate, isValidDayForTheMonth } from '../dateHelpers.js';
 import { useGetDayFromDateString } from './useGetDayFromDateString.js';
 
-/* eslint-disable max-statements */
+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 empty = {
   startFocusedYear: null,
   startFocusedDay: null,
@@ -14,61 +22,52 @@ const empty = {
 };
 const useGetStartingFocusedDay = () => {
   const {
-    props: {
-      onCalendarOpenFocusedDay
-    }
+    onCalendarOpenFocusedDay
   } = useContext(ControlledDateTimePickerContext);
   const dayFromInputValues = useGetDayFromDateString();
   return useMemo(() => {
-    const {
-      month: inputValuesSplitMonth,
-      day: inputValuesSplitDay,
-      year: inputValuesDaySplitYear
-    } = getDateValuesFromDate(dayFromInputValues);
-    let startFocusedMonth = null;
-    let startFocusedDay = null;
-    let startFocusedYear = null;
-    let startFocusedDate = null;
-    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) {
-      startFocusedMonth = inputValuesSplitMonth;
-      startFocusedDay = inputValuesSplitDay;
-      startFocusedYear = inputValuesDaySplitYear;
-      startFocusedDate = dayFromInputValues; // if input was not filled (or filled invalid) and there is no onCalendarOpenFocusedDay start focus is not a day
-    } // if input was not filled and there is onCalendarOpenFocusedDay start focus is onCalendarOpenFocusedDay day
+    const startingDay = _objectSpread({}, empty);
 
-
-    if (!isInputFilledAndValid && isOnCalendarOpenFocusedDayEmpty) return empty;
-
-    if (shouldFillWithOnCalendarOpenFocusedDay) {
+    if (dayFromInputValues) {
       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
+        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 (monthAsInt !== -1 && dayAsInt !== -1 && yearAsInt !== -1 && isValidDayForTheMonth(monthAsInt - 1, yearAsInt, dayAsInt)) {
-        startFocusedMonth = monthAsInt;
-        startFocusedDay = dayAsInt;
-        startFocusedYear = yearAsInt;
-        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 {
-      startFocusedYear,
-      startFocusedDay,
-      startFocusedMonth,
-      startFocusedDate
-    };
+    return startingDay;
   }, [dayFromInputValues, onCalendarOpenFocusedDay]);
 };
 

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

@@ -6,10 +6,9 @@ const useOnClickOutside = (ref, handler) => {
       var _ref$contains;
 
       // Do nothing if clicking ref's element or descendent elements
-      if (!ref || ref !== null && ref !== void 0 && (_ref$contains = ref.contains) !== null && _ref$contains !== void 0 && _ref$contains.call(ref, event.target)) {
+      if (event.target instanceof Element) if (!ref || ref !== null && ref !== void 0 && (_ref$contains = ref.contains) !== null && _ref$contains !== void 0 && _ref$contains.call(ref, event.target)) {
         return;
       }
-
       handler(event);
     };
 

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

@@ -6,7 +6,6 @@ import { monthNames, announcableCardinalDays } from './constants.js';
 import { convertToPositiveNumberIfPossible } from './numberHelpers.js';
 
 /* eslint-disable max-lines */
-
 const prependStringWithPlaceHolders = function (val, finalLength) {
   let placeholder = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '0';
   if (val.length === finalLength) return val;
@@ -36,7 +35,7 @@ const dateTimeToDate = dateTime => {
   return dateTime === null || dateTime === void 0 ? void 0 : (_dateTime$split = dateTime.split) === null || _dateTime$split === void 0 ? void 0 : (_dateTime$split$call = _dateTime$split.call(dateTime, ' ')) === null || _dateTime$split$call === void 0 ? void 0 : _dateTime$split$call[0];
 };
 const deconstructValuesFromDateString = dateString => {
-  const [dirtyMonth = '', dirtyDay = '', dirtyYear = ''] = dateString === null || dateString === void 0 ? void 0 : dateString.split('/');
+  const [dirtyMonth = '', dirtyDay = '', dirtyYear = ''] = dateString.split('/');
   const replaceAllRegexp = /_/g;
   return {
     month: (dirtyMonth || '').replace(replaceAllRegexp, ''),
@@ -45,8 +44,8 @@ const deconstructValuesFromDateString = dateString => {
   };
 };
 const deconstructValuesFromTimeString = timeString => {
-  const [dirtyHour = '', dirtyMintuesAndMeridiem = ''] = timeString === null || timeString === void 0 ? void 0 : timeString.split(':');
-  const [dirtyMinutes = '', dirtyMeridiem = ''] = dirtyMintuesAndMeridiem === null || dirtyMintuesAndMeridiem === void 0 ? void 0 : dirtyMintuesAndMeridiem.split(' ');
+  const [dirtyHour = '', dirtyMintuesAndMeridiem = ''] = timeString.split(':');
+  const [dirtyMinutes = '', dirtyMeridiem = ''] = dirtyMintuesAndMeridiem.split(' ');
   const replaceAllRegexp = /_/g;
   return {
     hours: (dirtyHour || '').replace(replaceAllRegexp, ''),
@@ -83,26 +82,21 @@ const getFormattedTimeString = _ref2 => {
   return "".concat(finalHour, ":").concat(finalMinutes, " ").concat(finalMeridiem);
 };
 const dateTimeToTime = dateTime => {
-  var _dateTime$split2;
-
-  const [// eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _date, // timeNumbers = '__:__:__', // <-- seconds format
-  timeNumbers = '__:__', timeMeridiem = '__'] = dateTime === null || dateTime === void 0 ? void 0 : (_dateTime$split2 = dateTime.split) === null || _dateTime$split2 === void 0 ? void 0 : _dateTime$split2.call(dateTime, ' ');
+  const [// eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars
+  date, // timeNumbers = '__:__:__', // <-- seconds format
+  timeNumbers = '__:__', timeMeridiem = '__'] = dateTime.split(' ');
   return "".concat(timeNumbers, " ").concat(timeMeridiem);
 };
 const deconstructTimeValues = timeString => {
-  var _timeString$split, _dirtyTimes$split;
-
-  const [dirtyTimes, dirtyMeridiem] = timeString === null || timeString === void 0 ? void 0 : (_timeString$split = timeString.split) === null || _timeString$split === void 0 ? void 0 : _timeString$split.call(timeString, ' '); // <--['__:__','__']
+  const [dirtyTimes = '', dirtyMeridiem] = timeString.split(' '); // <--['__:__','__']
 
-  const [dirtyHours, dirtyMinutes] = (_dirtyTimes$split = dirtyTimes.split) === null || _dirtyTimes$split === void 0 ? void 0 : _dirtyTimes$split.call(dirtyTimes, ':'); // <--['__','__']
+  const [dirtyHours, dirtyMinutes] = dirtyTimes.split(':'); // <--['__','__']
 
   const regex = /_/g; // Note the 'g' flag, which matches all occurrences of the expression
 
   const newValues = {
     hours: (dirtyHours || '').replace(regex, ''),
     minutes: (dirtyMinutes || '').replace(regex, ''),
-    // seconds: (dirtySeconds||"").replace(regex, ''),
     meridiem: (dirtyMeridiem || '').replace(regex, '')
   };
   return newValues;

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

@@ -0,0 +1,8 @@
+const dateTimeTypes = ['full-date-time', 'date-time-inputs', 'date-time-picker', 'date-time-picker-controller-only'];
+const dateTypes = ['full-date', 'date-inputs', 'date-picker', 'date-picker-controller-only'];
+const timeTypes = ['full-time', 'time-inputs', 'time-picker', 'time-picker-controller-only'];
+const getIsDateTime = props => dateTimeTypes.includes(props.type);
+const getIsDate = props => dateTypes.includes(props.type);
+const getIsTime = props => timeTypes.includes(props.type);
+
+export { getIsDate, getIsDateTime, getIsTime };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-controlled-form",
-  "version": "2.4.1-rc.6",
+  "version": "2.4.1",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Controlled Form Controllers",
   "module": "./esm/index.js",
@@ -159,6 +159,10 @@
       "import": "./esm/large-text-input/DSControlledLargeTextInput.js",
       "require": "./cjs/large-text-input/DSControlledLargeTextInput.js"
     },
+    "./date-time-picker/utils/typeGuards": {
+      "import": "./esm/date-time-picker/utils/typeGuards.js",
+      "require": "./cjs/date-time-picker/utils/typeGuards.js"
+    },
     "./date-time-picker/utils/timeHelpers": {
       "import": "./esm/date-time-picker/utils/timeHelpers.js",
       "require": "./cjs/date-time-picker/utils/timeHelpers.js"
@@ -199,6 +203,10 @@
       "import": "./esm/date-time-picker/utils/constants.js",
       "require": "./cjs/date-time-picker/utils/constants.js"
     },
+    "./date-time-picker/sharedTypes": {
+      "import": "./esm/date-time-picker/sharedTypes.js",
+      "require": "./cjs/date-time-picker/sharedTypes.js"
+    },
     "./date-time-picker/propTypes": {
       "import": "./esm/date-time-picker/propTypes.js",
       "require": "./cjs/date-time-picker/propTypes.js"
@@ -455,10 +463,30 @@
       "import": "./esm/date-time-picker/config/useValidateProps.js",
       "require": "./cjs/date-time-picker/config/useValidateProps.js"
     },
+    "./date-time-picker/config/useRelevantValueFromProps": {
+      "import": "./esm/date-time-picker/config/useRelevantValueFromProps.js",
+      "require": "./cjs/date-time-picker/config/useRelevantValueFromProps.js"
+    },
+    "./date-time-picker/config/useGlobalKeyHandlers": {
+      "import": "./esm/date-time-picker/config/useGlobalKeyHandlers.js",
+      "require": "./cjs/date-time-picker/config/useGlobalKeyHandlers.js"
+    },
+    "./date-time-picker/config/useGetReferences": {
+      "import": "./esm/date-time-picker/config/useGetReferences.js",
+      "require": "./cjs/date-time-picker/config/useGetReferences.js"
+    },
     "./date-time-picker/config/useGetPropsWithDefault": {
       "import": "./esm/date-time-picker/config/useGetPropsWithDefault.js",
       "require": "./cjs/date-time-picker/config/useGetPropsWithDefault.js"
     },
+    "./date-time-picker/config/useGetPropsBasedOnType": {
+      "import": "./esm/date-time-picker/config/useGetPropsBasedOnType.js",
+      "require": "./cjs/date-time-picker/config/useGetPropsBasedOnType.js"
+    },
+    "./date-time-picker/config/useGetFlags": {
+      "import": "./esm/date-time-picker/config/useGetFlags.js",
+      "require": "./cjs/date-time-picker/config/useGetFlags.js"
+    },
     "./date-time-picker/config/useGetDestructuredValues": {
       "import": "./esm/date-time-picker/config/useGetDestructuredValues.js",
       "require": "./cjs/date-time-picker/config/useGetDestructuredValues.js"
@@ -467,6 +495,10 @@
       "import": "./esm/date-time-picker/config/useControlledDateTimePicker.js",
       "require": "./cjs/date-time-picker/config/useControlledDateTimePicker.js"
     },
+    "./date-time-picker/config/useChangeHandlers": {
+      "import": "./esm/date-time-picker/config/useChangeHandlers.js",
+      "require": "./cjs/date-time-picker/config/useChangeHandlers.js"
+    },
     "./date-range-picker/propTypes": {
       "import": "./esm/date-range-picker/propTypes.js",
       "require": "./cjs/date-range-picker/propTypes.js"
@@ -808,20 +840,20 @@
     "build": "node ../../scripts/build/build.js"
   },
   "dependencies": {
-    "@elliemae/ds-button": "2.4.1-rc.6",
-    "@elliemae/ds-circular-progress-indicator": "2.4.1-rc.6",
-    "@elliemae/ds-controlled-form": "2.4.1-rc.6",
-    "@elliemae/ds-form": "2.4.1-rc.6",
-    "@elliemae/ds-form-layout-blocks": "2.4.1-rc.6",
-    "@elliemae/ds-grid": "2.4.1-rc.6",
-    "@elliemae/ds-icon": "2.4.1-rc.6",
-    "@elliemae/ds-icons": "2.4.1-rc.6",
-    "@elliemae/ds-pills": "2.4.1-rc.6",
-    "@elliemae/ds-popperjs": "2.4.1-rc.6",
-    "@elliemae/ds-props-helpers": "2.4.1-rc.6",
-    "@elliemae/ds-system": "2.4.1-rc.6",
-    "@elliemae/ds-tooltip": "2.4.1-rc.6",
-    "@elliemae/ds-truncated-tooltip-text": "2.4.1-rc.6",
+    "@elliemae/ds-button": "2.4.1",
+    "@elliemae/ds-circular-progress-indicator": "2.4.1",
+    "@elliemae/ds-controlled-form": "2.4.1",
+    "@elliemae/ds-form": "2.4.1",
+    "@elliemae/ds-form-layout-blocks": "2.4.1",
+    "@elliemae/ds-grid": "2.4.1",
+    "@elliemae/ds-icon": "2.4.1",
+    "@elliemae/ds-icons": "2.4.1",
+    "@elliemae/ds-pills": "2.4.1",
+    "@elliemae/ds-popperjs": "2.4.1",
+    "@elliemae/ds-props-helpers": "2.4.1",
+    "@elliemae/ds-system": "2.4.1",
+    "@elliemae/ds-tooltip": "2.4.1",
+    "@elliemae/ds-truncated-tooltip-text": "2.4.1",
     "prop-types": "~15.7.2",
     "react-desc": "~4.1.3",
     "react-popper": "~2.2.5",