use isSameTZDay for current day highlights

mongodb · Dec 4, 2023 · d7af825 · d7af825
1 parent f6a7320
commit d7af825
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/date-picker/src/DatePicker/DatePickerMenu/DatePickerMenu.tsx b/packages/date-picker/src/DatePicker/DatePickerMenu/DatePickerMenu.tsx
@@ -22,6 +22,7 @@ import {
   getFullMonthLabel,
   getISODate,
   getUTCDateString,
+  isSameTZDay,
   isSameUTCDay,
   isSameUTCMonth,
 } from '../../shared/utils';
@@ -38,7 +39,7 @@ import { DatePickerMenuHeader } from './DatePickerMenuHeader';
 
 export const DatePickerMenu = forwardRef<HTMLDivElement, DatePickerMenuProps>(
   ({ onKeyDown, ...rest }: DatePickerMenuProps, fwdRef) => {
-    const { isInRange, isOpen, setIsDirty } = useDatePickerContext();
+    const { isInRange, isOpen, setIsDirty, timeZone } = useDatePickerContext();
     const {
       refs,
       today,
@@ -216,6 +217,8 @@ export const DatePickerMenu = forwardRef<HTMLDivElement, DatePickerMenuProps>(
       }
     };
 
+    console.log({ today, iso: getISODate(today), timeZone });
+
     return (
       <MenuWrapper
         ref={ref}
@@ -225,6 +228,7 @@ export const DatePickerMenu = forwardRef<HTMLDivElement, DatePickerMenuProps>(
         className={menuWrapperStyles}
         usePortal
         onKeyDown={handleMenuKeyPress}
+        data-today={today.toISOString()}
         {...rest}
       >
         <div className={menuContentStyles}>
@@ -247,7 +251,7 @@ export const DatePickerMenu = forwardRef<HTMLDivElement, DatePickerMenuProps>(
                 ref={cellRefs(getISODate(day))}
                 aria-label={getUTCDateString(day)}
                 isHighlighted={isSameUTCDay(day, highlight)}
-                isCurrent={isSameUTCDay(day, today)}
+                isCurrent={isSameTZDay(today, day, timeZone)}
                 state={getCellState(day)}
                 onClick={cellClickHandlerForDay(day)}
                 data-iso={getISODate(day)}

diff --git a/packages/date-picker/src/shared/utils/isSameTZDay/index.ts b/packages/date-picker/src/shared/utils/isSameTZDay/index.ts
@@ -19,7 +19,7 @@ import { isSameUTCDay } from '../isSameUTCDay';
  * ```
  *
  * @param zoned A Date object presumed to be in `timeZone`
- * @param utc A UTC Date objects
+ * @param utc A UTC Date object
  * @param timeZone An IANA timeZone string
  */
 export const isSameTZDay = (