@elliemae/ds-controlled-form 2.0.0-alpha.1 → 2.0.0-alpha.13

package/esm/controlled-date-time-picker/parts/Pickers/Calendar/useFocusLogic.js

@@ -1,11 +1,17 @@
-import { useState, useMemo, useCallback, useLayoutEffect } from 'react';
+import 'core-js/modules/web.dom-collections.iterator.js';
+import 'core-js/modules/esnext.async-iterator.find.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.find.js';
+import { useContext, useState, useMemo, useCallback, useLayoutEffect } from 'react';
+import { ControlledDateTimePickerContext } from '../../../ControlledDateTimePickerCTX.js';
 import { compareTwoDatesDayEquality } from '../../../utils/dateHelpers.js';
 import { useGetStartingFocusedDay } from '../../../utils/hooks/useGetStartingFocusedDay.js';
 
-/* eslint-disable complexity */
-
 // eslint-disable-next-line max-params
-const loopWhileWaiting = (cb, shortcircuit = () => false, timePerTry = 100, maxTries = 5) => {
+const loopWhileWaiting = function (cb) {
+  let shortcircuit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => false;
+  let timePerTry = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 100;
+  let maxTries = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 5;
   let ab = maxTries;
   const inter = setInterval(() => {
     cb();
@@ -14,30 +20,43 @@ const loopWhileWaiting = (cb, shortcircuit = () => false, timePerTry = 100, maxT
   }, timePerTry);
 };
 
-const useFocusLogic = ({
-  daysArray,
-  calendarDaysWrapperRef,
-  showCalendar
-}) => {
+const useFocusLogic = _ref => {
+  let {
+    daysArray,
+    showCalendar
+  } = _ref;
+  const {
+    calendarDaysWrapperRef
+  } = useContext(ControlledDateTimePickerContext);
   const {
     startFocusedDate
   } = useGetStartingFocusedDay();
-  const [metadayToFocus, setMetadayToFocus] = useState(daysArray.find(({
-    day: currDay
-  }) => compareTwoDatesDayEquality(currDay, startFocusedDate))); // this is required because we have to focus based on the inputs values too,
+  const [metadayToFocus, setMetadayToFocus] = useState(daysArray.find(_ref2 => {
+    let {
+      day: currDay
+    } = _ref2;
+    return compareTwoDatesDayEquality(currDay, startFocusedDate);
+  })); // this is required because we have to focus based on the inputs values too,
   // useGetStartingFocusedDay does this already,
   // this "useMemo" is here just to trigger it functionally by changing the metadayToFocus state
   // which is required for arrow key navigation in the calendar
 
   const focusedDay = useMemo(() => {
-    const newFocusedDay = metadayToFocus ? daysArray.find(({
-      day: currDay
-    }) => compareTwoDatesDayEquality(currDay, metadayToFocus.day)) : daysArray.find(({
-      day: currDay
-    }) => compareTwoDatesDayEquality(currDay, startFocusedDate));
+    const newFocusedDay = metadayToFocus ? daysArray.find(_ref3 => {
+      let {
+        day: currDay
+      } = _ref3;
+      return compareTwoDatesDayEquality(currDay, metadayToFocus.day);
+    }) : daysArray.find(_ref4 => {
+      let {
+        day: currDay
+      } = _ref4;
+      return compareTwoDatesDayEquality(currDay, startFocusedDate);
+    });
     return newFocusedDay;
   }, [daysArray, startFocusedDate, metadayToFocus]);
-  const tryToFocusCurrentlyDataIsFocusedDay = useCallback((wrapperDOM = (calendarDaysWrapperRef === null || calendarDaysWrapperRef === void 0 ? void 0 : calendarDaysWrapperRef.current) || document) => {
+  const tryToFocusCurrentlyDataIsFocusedDay = useCallback(function () {
+    let wrapperDOM = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (calendarDaysWrapperRef === null || calendarDaysWrapperRef === void 0 ? void 0 : calendarDaysWrapperRef.current) || document;
     let shortcircuit = false;
     loopWhileWaiting(() => {
       const domElem = wrapperDOM === null || wrapperDOM === void 0 ? void 0 : wrapperDOM.querySelector('[data-isfocused="true"]');
@@ -55,16 +74,22 @@ const useFocusLogic = ({
   }, [calendarDaysWrapperRef, focusedDay, showCalendar, tryToFocusCurrentlyDataIsFocusedDay]);
   const handleFocusMetaDay = useCallback(metaDayToFocus => {
     // if focusedDay is inside current daysArray we set Focused day
-    const newFocusedMetaDay = daysArray.find(({
-      day: currDay
-    }) => compareTwoDatesDayEquality(currDay, metaDayToFocus.day));
+    const newFocusedMetaDay = daysArray.find(_ref5 => {
+      let {
+        day: currDay
+      } = _ref5;
+      return compareTwoDatesDayEquality(currDay, metaDayToFocus.day);
+    });
     if (focusedDay !== newFocusedMetaDay) setMetadayToFocus(newFocusedMetaDay);
   }, [daysArray, focusedDay]);
   const handleFocusMetaDayByDay = useCallback(dayDate => {
     // if focusedDay is inside current daysArray we set Focused day
-    const newFocusedMetaDay = daysArray.find(({
-      day: currDay
-    }) => compareTwoDatesDayEquality(currDay, dayDate));
+    const newFocusedMetaDay = daysArray.find(_ref6 => {
+      let {
+        day: currDay
+      } = _ref6;
+      return compareTwoDatesDayEquality(currDay, dayDate);
+    });
     if (focusedDay !== newFocusedMetaDay) setMetadayToFocus(newFocusedMetaDay);
   }, [daysArray, focusedDay]);
   const resetFocusedDayToStartDate = useCallback(() => {

package/esm/controlled-date-time-picker/parts/Pickers/Calendar/useKeyboardHandlers.js

@@ -1,34 +1,50 @@
-import { useCallback, useMemo } from 'react';
+import 'core-js/modules/esnext.async-iterator.find.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.find.js';
+import { useContext, useCallback, useMemo } from 'react';
+import { ControlledDateTimePickerContext } from '../../../ControlledDateTimePickerCTX.js';
 import { sumValuesToDate } from '../../../utils/dateHelpers.js';
+import { homeEndKeys, homeEndAllArrowKeys } from '../../../utils/constants.js';
 
-/* eslint-disable complexity */
-const useKeyboardHandlers = ({
-  focusedDay,
-  daysArray,
-  handlePrevMonth,
-  handleNextMonth,
-  prevYearBtnRef,
-  prevMonthBtnRef,
-  nextMonthBtnRef,
-  nextYearBtnRef,
-  currMeridiemBtnRef,
-  isWithTimeWheelToo,
-  handleFocusMetaDay,
-  handleFocusMetaDayByDay,
-  tryToFocusCurrentlyDataIsFocusedDay,
-  hideDate,
-  hideTime,
-  monthInputRef,
-  hourInputRef,
-  setLatestInteractionRegion
-}) => {
+const useKeyboardHandlers = _ref => {
+  let {
+    focusedDay,
+    daysArray,
+    handlePrevMonth,
+    handleNextMonth,
+    handleFocusMetaDay,
+    handleFocusMetaDayByDay,
+    tryToFocusCurrentlyDataIsFocusedDay
+  } = _ref;
+  const {
+    hideDate,
+    hideTime,
+    monthInputRef,
+    hourInputRef,
+    prevYearBtnRef,
+    prevMonthBtnRef,
+    nextMonthBtnRef,
+    nextYearBtnRef,
+    currMeridiemBtnRef,
+    isControllerOnly,
+    isWithTimeWheelToo,
+    setLatestInteractionRegion,
+    withAnyInputs,
+    isWithTimeInputs,
+    meridiemInputRef,
+    isWithDateInputs,
+    yearInputRef
+  } = useContext(ControlledDateTimePickerContext);
   const tryToFocusDayRegion = useCallback(() => {
     setLatestInteractionRegion('calendar-days');
 
     if (!focusedDay) {
-      const newFocusDay = daysArray.find(({
-        isCurrMonthDay
-      }) => isCurrMonthDay);
+      const newFocusDay = daysArray.find(_ref2 => {
+        let {
+          isCurrMonthDay
+        } = _ref2;
+        return isCurrMonthDay;
+      });
       if (newFocusDay) setTimeout(() => {
         handleFocusMetaDay(newFocusDay);
       });
@@ -36,7 +52,17 @@ const useKeyboardHandlers = ({
       tryToFocusCurrentlyDataIsFocusedDay();
     }
   }, [daysArray, focusedDay, handleFocusMetaDay, setLatestInteractionRegion, tryToFocusCurrentlyDataIsFocusedDay]);
-  const onHomeKeyDown = useCallback(() => {
+  const onHomeKeyDownInsideCalendar = useCallback(() => {
+    var _prevMonthBtnRef$curr, _prevMonthBtnRef$curr2;
+
+    prevMonthBtnRef === null || prevMonthBtnRef === void 0 ? void 0 : (_prevMonthBtnRef$curr = prevMonthBtnRef.current) === null || _prevMonthBtnRef$curr === void 0 ? void 0 : (_prevMonthBtnRef$curr2 = _prevMonthBtnRef$curr.focus) === null || _prevMonthBtnRef$curr2 === void 0 ? void 0 : _prevMonthBtnRef$curr2.call(_prevMonthBtnRef$curr);
+  }, [prevMonthBtnRef]);
+  const onEndKeyDownInsideCalendar = useCallback(() => {
+    var _currMeridiemBtnRef$c, _currMeridiemBtnRef$c2;
+
+    if (isWithTimeWheelToo) currMeridiemBtnRef === null || currMeridiemBtnRef === void 0 ? void 0 : (_currMeridiemBtnRef$c = currMeridiemBtnRef.current) === null || _currMeridiemBtnRef$c === void 0 ? void 0 : (_currMeridiemBtnRef$c2 = _currMeridiemBtnRef$c.focus) === null || _currMeridiemBtnRef$c2 === void 0 ? void 0 : _currMeridiemBtnRef$c2.call(_currMeridiemBtnRef$c);else tryToFocusDayRegion();
+  }, [currMeridiemBtnRef, isWithTimeWheelToo, tryToFocusDayRegion]);
+  const onHomeKeyDownTriggerIcon = 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 if (!hideTime) 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);
@@ -45,10 +71,16 @@ const useKeyboardHandlers = ({
     const {
       key
     } = e;
-    const preventDefaultKeys = ['Home'];
-    if (preventDefaultKeys.includes(key)) e.preventDefault();
-    if (key === 'Home') onHomeKeyDown();
-  }, [onHomeKeyDown]);
+    if (homeEndKeys.includes(key)) e.preventDefault();
+    if (homeEndKeys.includes(key)) e.stopPropagation();
+    if (key === 'Home') onHomeKeyDownTriggerIcon();
+
+    if (key === 'Backspace' && withAnyInputs) {
+      var _meridiemInputRef$cur, _meridiemInputRef$cur2, _yearInputRef$current, _yearInputRef$current2;
+
+      if (isWithTimeInputs) meridiemInputRef === null || meridiemInputRef === void 0 ? void 0 : (_meridiemInputRef$cur = meridiemInputRef.current) === null || _meridiemInputRef$cur === void 0 ? void 0 : (_meridiemInputRef$cur2 = _meridiemInputRef$cur.focus) === null || _meridiemInputRef$cur2 === void 0 ? void 0 : _meridiemInputRef$cur2.call(_meridiemInputRef$cur);else if (isWithDateInputs) yearInputRef === null || yearInputRef === void 0 ? void 0 : (_yearInputRef$current = yearInputRef.current) === null || _yearInputRef$current === void 0 ? void 0 : (_yearInputRef$current2 = _yearInputRef$current.focus) === null || _yearInputRef$current2 === void 0 ? void 0 : _yearInputRef$current2.call(_yearInputRef$current);
+    }
+  }, [isWithDateInputs, isWithTimeInputs, meridiemInputRef, onHomeKeyDownTriggerIcon, withAnyInputs, yearInputRef]);
   const handleDayOnKeyDown = useCallback((e, metaDay) => {
     let newFocusedDayDate;
     const {
@@ -58,11 +90,16 @@ const useKeyboardHandlers = ({
       key,
       shiftKey
     } = e;
+    if (homeEndAllArrowKeys.includes(key)) e.preventDefault();
+    if (homeEndAllArrowKeys.includes(key)) e.stopPropagation();
     if (key === 'ArrowUp') newFocusedDayDate = sumValuesToDate(day, {
       daysToSum: -7
-    });else if (key === 'ArrowDown') newFocusedDayDate = sumValuesToDate(day, {
+    });
+    if (key === 'ArrowDown') newFocusedDayDate = sumValuesToDate(day, {
       daysToSum: 7
-    });else if (key === 'ArrowLeft') {
+    });
+
+    if (key === 'ArrowLeft') {
       newFocusedDayDate = sumValuesToDate(day, {
         daysToSum: -1
       });
@@ -70,7 +107,9 @@ const useKeyboardHandlers = ({
       if (metaDay === daysArray[1]) {
         handlePrevMonth();
       }
-    } else if (key === 'ArrowRight') {
+    }
+
+    if (key === 'ArrowRight') {
       newFocusedDayDate = sumValuesToDate(day, {
         daysToSum: 1
       });
@@ -78,31 +117,25 @@ const useKeyboardHandlers = ({
       if (metaDay === daysArray[daysArray.length - 2]) {
         handleNextMonth();
       }
-    } else if (key === 'Tab') {
-      if (shiftKey) {
-        var _nextYearBtnRef$curre, _nextYearBtnRef$curre2;
-
-        e.preventDefault();
-        nextYearBtnRef === null || nextYearBtnRef === void 0 ? void 0 : (_nextYearBtnRef$curre = nextYearBtnRef.current) === null || _nextYearBtnRef$curre === void 0 ? void 0 : (_nextYearBtnRef$curre2 = _nextYearBtnRef$curre.focus) === null || _nextYearBtnRef$curre2 === void 0 ? void 0 : _nextYearBtnRef$curre2.call(_nextYearBtnRef$curre);
-      } else if (!isWithTimeWheelToo) {
-        var _prevMonthBtnRef$curr, _prevMonthBtnRef$curr2;
-
-        //  Before it was like  https://jira.elliemae.io/browse/PUI-6632
-        //   setShowCalendar(false);
-        //   onPickerClose();
-        //  we are implementing focus cycle now
-        //  if someone changes his mind, remove comments to the above and add comments below
-        // setShowCalendar onPickerClose are recibed as part of the args of the hook already
-        e.preventDefault();
-        prevMonthBtnRef === null || prevMonthBtnRef === void 0 ? void 0 : (_prevMonthBtnRef$curr = prevMonthBtnRef.current) === null || _prevMonthBtnRef$curr === void 0 ? void 0 : (_prevMonthBtnRef$curr2 = _prevMonthBtnRef$curr.focus) === null || _prevMonthBtnRef$curr2 === void 0 ? void 0 : _prevMonthBtnRef$curr2.call(_prevMonthBtnRef$curr);
-      }
     }
 
     if (newFocusedDayDate) {
       handleFocusMetaDayByDay(newFocusedDayDate);
       setTimeout(tryToFocusCurrentlyDataIsFocusedDay);
     }
-  }, [daysArray, handleFocusMetaDayByDay, handleNextMonth, handlePrevMonth, isWithTimeWheelToo, nextYearBtnRef, prevMonthBtnRef, tryToFocusCurrentlyDataIsFocusedDay]);
+
+    if (key === 'Home') onHomeKeyDownInsideCalendar();
+    if (key === 'End') onEndKeyDownInsideCalendar(); // TAB CYCLE IMPLEMENTATION
+
+    if (key === 'Tab' && !shiftKey && isControllerOnly === false && !isWithTimeWheelToo) {
+      var _prevMonthBtnRef$curr3, _prevMonthBtnRef$curr4;
+
+      // MUST prevent default since this is a custom focus switch
+      // NOT preventing the default event will cause unexpected result
+      e.preventDefault();
+      prevMonthBtnRef === null || prevMonthBtnRef === void 0 ? void 0 : (_prevMonthBtnRef$curr3 = prevMonthBtnRef.current) === null || _prevMonthBtnRef$curr3 === void 0 ? void 0 : (_prevMonthBtnRef$curr4 = _prevMonthBtnRef$curr3.focus) === null || _prevMonthBtnRef$curr4 === void 0 ? void 0 : _prevMonthBtnRef$curr4.call(_prevMonthBtnRef$curr3);
+    }
+  }, [daysArray, handleFocusMetaDayByDay, handleNextMonth, handlePrevMonth, isControllerOnly, isWithTimeWheelToo, onEndKeyDownInsideCalendar, onHomeKeyDownInsideCalendar, prevMonthBtnRef, tryToFocusCurrentlyDataIsFocusedDay]);
   const handlePrevYearKeyDown = useCallback(e => {
     const {
       key,
@@ -118,7 +151,17 @@ const useKeyboardHandlers = ({
         nextYearBtnRef.current.focus();
       }
     }
-  }, [nextMonthBtnRef, nextYearBtnRef]);
+
+    if (key === 'Home') {
+      onHomeKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+
+    if (key === 'End') {
+      onEndKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+  }, [nextMonthBtnRef, nextYearBtnRef, onEndKeyDownInsideCalendar, onHomeKeyDownInsideCalendar]);
   const handlePrevMonthKeyDown = useCallback(e => {
     const {
       key,
@@ -126,17 +169,30 @@ const useKeyboardHandlers = ({
     } = e;
 
     if (key === 'Tab') {
-      e.preventDefault();
-
       if (shiftKey) {
-        var _currMeridiemBtnRef$c, _currMeridiemBtnRef$c2;
+        // TAB CYCLE IMPLEMENTATION
+        if (!isControllerOnly) {
+          var _currMeridiemBtnRef$c3, _currMeridiemBtnRef$c4;
 
-        if (isWithTimeWheelToo) currMeridiemBtnRef === null || currMeridiemBtnRef === void 0 ? void 0 : (_currMeridiemBtnRef$c = currMeridiemBtnRef.current) === null || _currMeridiemBtnRef$c === void 0 ? void 0 : (_currMeridiemBtnRef$c2 = _currMeridiemBtnRef$c.focus) === null || _currMeridiemBtnRef$c2 === void 0 ? void 0 : _currMeridiemBtnRef$c2.call(_currMeridiemBtnRef$c);else tryToFocusDayRegion();
+          e.preventDefault();
+          if (isWithTimeWheelToo) currMeridiemBtnRef === null || currMeridiemBtnRef === void 0 ? void 0 : (_currMeridiemBtnRef$c3 = currMeridiemBtnRef.current) === null || _currMeridiemBtnRef$c3 === void 0 ? void 0 : (_currMeridiemBtnRef$c4 = _currMeridiemBtnRef$c3.focus) === null || _currMeridiemBtnRef$c4 === void 0 ? void 0 : _currMeridiemBtnRef$c4.call(_currMeridiemBtnRef$c3);else tryToFocusDayRegion();
+        }
       } else {
+        e.preventDefault();
         nextMonthBtnRef.current.focus();
       }
     }
-  }, [currMeridiemBtnRef, isWithTimeWheelToo, nextMonthBtnRef, tryToFocusDayRegion]);
+
+    if (key === 'Home') {
+      onHomeKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+
+    if (key === 'End') {
+      onEndKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+  }, [currMeridiemBtnRef, isControllerOnly, isWithTimeWheelToo, nextMonthBtnRef, onEndKeyDownInsideCalendar, onHomeKeyDownInsideCalendar, tryToFocusDayRegion]);
   const handleNextMonthKeyDown = useCallback(e => {
     const {
       key,
@@ -152,7 +208,17 @@ const useKeyboardHandlers = ({
         prevYearBtnRef.current.focus();
       }
     }
-  }, [prevMonthBtnRef, prevYearBtnRef]);
+
+    if (key === 'Home') {
+      onHomeKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+
+    if (key === 'End') {
+      onEndKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+  }, [onEndKeyDownInsideCalendar, onHomeKeyDownInsideCalendar, prevMonthBtnRef, prevYearBtnRef]);
   const handleNextYearKeyDown = useCallback(e => {
     const {
       key,
@@ -170,7 +236,17 @@ const useKeyboardHandlers = ({
 
       if (!shiftKey) tryToFocusDayRegion();
     }
-  }, [tryToFocusDayRegion, prevYearBtnRef]);
+
+    if (key === 'Home') {
+      onHomeKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+
+    if (key === 'End') {
+      onEndKeyDownInsideCalendar();
+      e.preventDefault();
+    }
+  }, [tryToFocusDayRegion, prevYearBtnRef, onHomeKeyDownInsideCalendar, onEndKeyDownInsideCalendar]);
   return useMemo(() => ({
     handleDayOnKeyDown,
     handlePrevYearKeyDown,

package/esm/controlled-date-time-picker/parts/Pickers/Calendar/usePopperTriggerLogic.js

@@ -1,18 +1,25 @@
-import { useState, useCallback, useMemo } from 'react';
+import 'core-js/modules/web.dom-collections.iterator.js';
+import { useContext, useState, useCallback, useMemo } from 'react';
 import { usePopper } from 'react-popper';
+import { ControlledDateTimePickerContext } from '../../../ControlledDateTimePickerCTX.js';
 import { useOnClickOutside } from '../../../utils/hooks/useOnClickOutside.js';
 
-/* eslint-disable complexity */
-const usePopperTriggerLogic = ({
-  focusedDay,
-  resetFocusedDayToStartDate,
-  prevMonthBtnRef,
-  pickerButtonRef,
-  onPickerOpen,
-  onPickerClose,
-  showCalendar,
-  setShowCalendar
-}) => {
+const usePopperTriggerLogic = _ref => {
+  let {
+    focusedDay,
+    resetFocusedDayToStartDate,
+    showCalendar,
+    setShowCalendar,
+    tryToFocusCurrentlyDataIsFocusedDay
+  } = _ref;
+  const {
+    props: {
+      onPickerOpen,
+      onPickerClose
+    },
+    prevMonthBtnRef,
+    pickerButtonRef
+  } = useContext(ControlledDateTimePickerContext);
   const [referenceElement, setReferenceElement] = useState(null);
   const [popperElement, setPopperElement] = useState(null);
   const [arrowElement, setArrowElement] = useState(null);
@@ -23,7 +30,12 @@ const usePopperTriggerLogic = ({
         element: arrowElement
       }
     }]
-  });
+  }); // onOpen we try to focus the day we should focus, if we should focus one
+
+  const handleOnPickerOpen = useCallback(() => {
+    onPickerOpen();
+    tryToFocusCurrentlyDataIsFocusedDay();
+  }, [onPickerOpen, tryToFocusCurrentlyDataIsFocusedDay]);
   const openCalendar = useCallback(() => {
     if (focusedDay) setTimeout(() => {
       var _focusedDay$dayBtnRef, _focusedDay$dayBtnRef2, _focusedDay$dayBtnRef3;
@@ -35,8 +47,8 @@ const usePopperTriggerLogic = ({
       return prevMonthBtnRef === null || prevMonthBtnRef === void 0 ? void 0 : (_prevMonthBtnRef$curr = prevMonthBtnRef.current) === null || _prevMonthBtnRef$curr === void 0 ? void 0 : (_prevMonthBtnRef$curr2 = _prevMonthBtnRef$curr.focus) === null || _prevMonthBtnRef$curr2 === void 0 ? void 0 : _prevMonthBtnRef$curr2.call(_prevMonthBtnRef$curr);
     }, 100);
     setShowCalendar(true);
-    onPickerOpen();
-  }, [focusedDay, onPickerOpen, prevMonthBtnRef, setShowCalendar]);
+    handleOnPickerOpen();
+  }, [focusedDay, handleOnPickerOpen, prevMonthBtnRef, setShowCalendar]);
   const closeCalendar = useCallback(() => {
     var _pickerButtonRef$curr, _pickerButtonRef$curr2;
 

package/esm/controlled-date-time-picker/parts/Pickers/CalendarWithTimeWheel/CalendarWithTimeWheelContent.js

@@ -1,5 +1,6 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
 import { useContext } from 'react';
+import { ControlledDateTimePickerDatatestid } from '../../../ControlledDateTimePickerDatatestid.js';
 import { StyledCalendarWithTimeWheelWrapper, StyledCalendar } from './Styleds.js';
 import { CalendarWithTimeWheelFooter } from './CalendarWithTimeWheelFooter.js';
 import { TimeWheelContent } from '../TimeWheel/TimeWheelContent.js';
@@ -11,7 +12,8 @@ const CalendarWithTimeWheelContent = () => {
     isControllerOnly
   } = useContext(ControlledDateTimePickerContext);
   return /*#__PURE__*/_jsx(StyledCalendarWithTimeWheelWrapper, {
-    isControllerOnly: isControllerOnly
+    isControllerOnly: isControllerOnly,
+    "data-testid": ControlledDateTimePickerDatatestid.CONTROLLER_COMPONENT.CALENDAR_TIMEWHEEL
   }, void 0, _StyledCalendar || (_StyledCalendar = /*#__PURE__*/_jsx(StyledCalendar, {})), _TimeWheelContent || (_TimeWheelContent = /*#__PURE__*/_jsx(TimeWheelContent, {})), _CalendarWithTimeWhee || (_CalendarWithTimeWhee = /*#__PURE__*/_jsx(CalendarWithTimeWheelFooter, {})));
 };
 

package/esm/controlled-date-time-picker/parts/Pickers/CalendarWithTimeWheel/CalendarWithTimeWheelContext.js

@@ -4,6 +4,7 @@ import { createContext } from 'react';
 const noop = () => {};
 
 const defaultCalendarWithTimeWheelContext = {
+  ariaCurrentValueForInputs: '',
   showCalendarWithTimeWheel: false,
   setPopperElement: noop,
   setArrowElement: noop,
@@ -12,7 +13,8 @@ const defaultCalendarWithTimeWheelContext = {
   handleToggleCalendarWithTimeWheel: noop,
   handleMenuWrapperKeyDown: noop,
   handlePickerIconKeyDown: noop,
-  isControllerOnly: false
+  isControllerOnly: false,
+  disabled: false
 };
 /** Context for cross component communication */
 

package/esm/controlled-date-time-picker/parts/Pickers/CalendarWithTimeWheel/CalendarWithTimeWheelFooter.js

@@ -10,7 +10,9 @@ const CalendarWithTimeWheelFooter = () => {
       hasError
     }
   } = useContext(ControlledDateTimePickerContext);
-  return pickerFooterMsg !== undefined && hasError ? /*#__PURE__*/_jsx(CalendarWithTimeWheelFooterMessage, {}, void 0, pickerFooterMsg) : null;
+  return pickerFooterMsg !== undefined && hasError ? /*#__PURE__*/_jsx(CalendarWithTimeWheelFooterMessage, {
+    role: "alert"
+  }, void 0, pickerFooterMsg) : null;
 };
 
 export { CalendarWithTimeWheelFooter };

package/esm/controlled-date-time-picker/parts/Pickers/CalendarWithTimeWheel/CalendarWithTimeWheelIconTrigger.js

@@ -1,8 +1,9 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
 import { useContext, useMemo } from 'react';
-import DSButton, { BUTTON_VARIANT } from '@elliemae/ds-basic/Button';
-import DatePicker from '@elliemae/ds-icons/DatePicker';
+import { BUTTON_SIZES, BUTTON_VARIANT } from '@elliemae/ds-button';
+import { DatePicker } from '@elliemae/ds-icons';
 import { CalendarWithTimeWheelContext } from './CalendarWithTimeWheelContext.js';
+import { StyledIconTriggerButton } from './Styleds.js';
 import { ControlledDateTimePickerDatatestid } from '../../../ControlledDateTimePickerDatatestid.js';
 
 var _DatePicker;
@@ -13,19 +14,21 @@ const CalendarWithTimeWheelIconTrigger = () => {
   const {
     handleSetTriggerRef,
     handleToggleCalendarWithTimeWheel,
-    handlePickerIconKeyDown
+    handlePickerIconKeyDown,
+    ariaCurrentValueForInputs,
+    disabled
   } = useContext(CalendarWithTimeWheelContext);
-  return useMemo(() => /*#__PURE__*/_jsx(DSButton, {
-    "aria-label": "date time picker context menu trigger",
-    buttonType: "text",
-    leftIcon: _DatePicker || (_DatePicker = /*#__PURE__*/_jsx(DatePicker, {})),
-    size: "m",
+  return useMemo(() => /*#__PURE__*/_jsx(StyledIconTriggerButton, {
+    "aria-label": "date time picker context menu trigger, ".concat(ariaCurrentValueForInputs),
+    buttonType: "icon",
+    size: BUTTON_SIZES.M,
     variant: BUTTON_VARIANT.DEFAULT,
     innerRef: handleSetTriggerRef,
     onClick: handleToggleCalendarWithTimeWheel,
     onKeyDown: handlePickerIconKeyDown,
-    "data-testid": ControlledDateTimePickerDatatestid.PICKER_ICONS.CALENDAR_TIMEWHEEL
-  }), [handlePickerIconKeyDown, handleSetTriggerRef, handleToggleCalendarWithTimeWheel]);
+    "data-testid": ControlledDateTimePickerDatatestid.PICKER_ICONS.CALENDAR_TIMEWHEEL,
+    disabled: disabled
+  }, void 0, _DatePicker || (_DatePicker = /*#__PURE__*/_jsx(DatePicker, {}))), [ariaCurrentValueForInputs, disabled, handlePickerIconKeyDown, handleSetTriggerRef, handleToggleCalendarWithTimeWheel]);
 };
 
 export { CalendarWithTimeWheelIconTrigger };

package/esm/controlled-date-time-picker/parts/Pickers/CalendarWithTimeWheel/CalendarWithTimeWheelWrapper.js

@@ -1,6 +1,12 @@
+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 { useContext } from 'react';
+import { ControlledDateTimePickerDatatestid } from '../../../ControlledDateTimePickerDatatestid.js';
 import { CalendarWithTimeWheelContent } from './CalendarWithTimeWheelContent.js';
 import { CalendarWithTimeWheelContext } from './CalendarWithTimeWheelContext.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
@@ -28,6 +34,7 @@ const CalendarWithTimeWheelWrapper = () => {
       zIndex: 110
     })
   }, attributes.popper), {}, {
+    "data-testid": ControlledDateTimePickerDatatestid.CONTEXTUAL_MENU.CALENDAR_TIMEWHEEL,
     children: [_CalendarWithTimeWhee2 || (_CalendarWithTimeWhee2 = /*#__PURE__*/_jsx(CalendarWithTimeWheelContent, {})), /*#__PURE__*/jsx("div", {
       ref: setArrowElement,
       style: styles.arrow

package/esm/controlled-date-time-picker/parts/Pickers/CalendarWithTimeWheel/Styleds.js

@@ -1,32 +1,68 @@
 import styled from 'styled-components';
+import { DSButtonV2 } from '@elliemae/ds-button';
 import { CalendarContent } from '../Calendar/CalendarContent.js';
 
-const StyledCalendarWithTimeWheelWrapper = /*#__PURE__*/styled.div.withConfig({
+const StyledIconTriggerButton = /*#__PURE__*/styled(DSButtonV2).withConfig({
   componentId: "sc-h2xj8r-0"
-})(["background:", ";", " display:grid;grid-template-columns:260px 192px;grid-template-rows:1fr;column-gap:0;& > div:last-of-type{box-shadow:-1px 0 0 0 ", ";}"], ({
-  theme
-}) => theme.colors.neutral['000'], ({
-  isControllerOnly
-}) => isControllerOnly ? undefined : 'box-shadow: 0 6px 20px 0 rgb(0 0 0 / 24%), 0 8px 17px 0 rgb(0 0 0 / 19%);', ({
-  theme
-}) => theme.colors.neutral[200]);
-const StyledCalendar = /*#__PURE__*/styled(CalendarContent).withConfig({
+})(["color:", ";width:26px;height:26px;"], _ref => {
+  let {
+    theme
+  } = _ref;
+  return theme.colors.brand['600'];
+});
+const StyledCalendarWithTimeWheelWrapper = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-h2xj8r-1"
+})(["background:", ";", " display:grid;grid-template-columns:260px 192px;grid-template-rows:1fr;column-gap:0;& > div:last-of-type{box-shadow:-1px 0 0 0 ", ";margin-left:1px;}"], _ref2 => {
+  let {
+    theme
+  } = _ref2;
+  return theme.colors.neutral['000'];
+}, _ref3 => {
+  let {
+    isControllerOnly
+  } = _ref3;
+  return isControllerOnly ? undefined : 'box-shadow: 0 6px 20px 0 rgb(0 0 0 / 24%), 0 8px 17px 0 rgb(0 0 0 / 19%);';
+}, _ref4 => {
+  let {
+    theme
+  } = _ref4;
+  return theme.colors.neutral[200];
+});
+const StyledCalendar = /*#__PURE__*/styled(CalendarContent).withConfig({
+  componentId: "sc-h2xj8r-2"
 })(["box-shadow:none;"]);
 const CalendarWithTimeWheelFooterMessage = /*#__PURE__*/styled.footer.withConfig({
-  componentId: "sc-h2xj8r-2"
-})(["border-top:solid 1px ", ";margin:0 ", ";padding:", " 0;color:", ";font-style:italic;font-weight:", ";font-size:", ";text-align:right;grid-column:1/3;"], ({
-  theme
-}) => theme.colors.neutral[300], ({
-  theme
-}) => theme.space.xxs2, ({
-  theme
-}) => theme.space.xxs2, ({
-  theme
-}) => theme.colors.danger[900], ({
-  theme
-}) => theme.fontWeights.thin, ({
-  theme
-}) => theme.fontSizes.microText[200]);
+  componentId: "sc-h2xj8r-3"
+})(["border-top:solid 1px ", ";margin:0 ", ";padding:", " 0;color:", ";font-style:italic;font-weight:", ";font-size:", ";text-align:right;grid-column:1/3;"], _ref5 => {
+  let {
+    theme
+  } = _ref5;
+  return theme.colors.neutral[300];
+}, _ref6 => {
+  let {
+    theme
+  } = _ref6;
+  return theme.space.xxs2;
+}, _ref7 => {
+  let {
+    theme
+  } = _ref7;
+  return theme.space.xxs2;
+}, _ref8 => {
+  let {
+    theme
+  } = _ref8;
+  return theme.colors.danger[900];
+}, _ref9 => {
+  let {
+    theme
+  } = _ref9;
+  return theme.fontWeights.thin;
+}, _ref10 => {
+  let {
+    theme
+  } = _ref10;
+  return theme.fontSizes.microText[200];
+});
 
-export { CalendarWithTimeWheelFooterMessage, StyledCalendar, StyledCalendarWithTimeWheelWrapper };
+export { CalendarWithTimeWheelFooterMessage, StyledCalendar, StyledCalendarWithTimeWheelWrapper, StyledIconTriggerButton };