@kalyx/react 0.2.2 → 0.4.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createContext, forwardRef, useState, useCallback, useContext, useId, useRef, useMemo, useEffect } from 'react';
-import { parseInputValue, formatTimeString, parseTimeString, getTime, DateFnsAdapter, getMonthName, getWeekdayNames, getCalendarDays, formatMonthYear, formatFullDate, isDateDisabled, setTime, to12Hour, to24Hour, generateMinutes, generateHours } from '@kalyx/core';
+import { parseInputValue, formatTimeString, parseTimeString, getTimeInTimezone, getTime, DateFnsAdapter, DEFAULT_DATEPICKER_LABELS, civilMidnightFromUtcDay, getMonthName, getWeekdayNames, getCalendarDays, formatMonthYear, isDateDisabled, DEFAULT_RANGEPICKER_LABELS, DEFAULT_TIMEPICKER_LABELS, setTimeInTimezone, setTime, to12Hour, to24Hour, generateMinutes, generateHours, formatFullDate } from '@kalyx/core';
 export { DateFnsAdapter } from '@kalyx/core';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useFloating, autoUpdate, offset, flip, shift } from '@floating-ui/react';
@@ -29,7 +29,9 @@ function DatePickerRoot({
   weekStartsOn = 0,
   displayFormat = "yyyy-MM-dd",
   locale = "en-US",
+  displayTimezone,
   adapter = DateFnsAdapter,
+  labels: labelsProp,
   children
 }) {
   const pickerId = useId();
@@ -41,31 +43,39 @@ function DatePickerRoot({
   const currentValue = isControlled ? controlledValue ?? null : uncontrolledValue;
   const [isOpen, setIsOpen] = useState(false);
   const [viewMonth, setViewMonth] = useState(
-    currentValue ?? adapter.today()
+    currentValue ?? adapter.today(displayTimezone)
   );
   const [focusedDate, setFocusedDate] = useState(
-    currentValue ?? adapter.today()
+    currentValue ?? adapter.today(displayTimezone)
+  );
+  const mergedLabels = useMemo(
+    () => ({ ...DEFAULT_DATEPICKER_LABELS, ...labelsProp }),
+    [labelsProp]
   );
   const isDisabled = typeof disabled === "boolean" ? disabled : false;
-  const disabledRules = Array.isArray(disabled) ? disabled : [];
+  const disabledRules = useMemo(
+    () => Array.isArray(disabled) ? disabled : [],
+    [disabled]
+  );
   const selectDate = useCallback(
     (iso) => {
       if (isDisabled || readOnly) return;
+      const normalized = iso && displayTimezone ? civilMidnightFromUtcDay(iso, displayTimezone) : iso;
       if (!isControlled) {
-        setUncontrolledValue(iso);
+        setUncontrolledValue(normalized);
       }
-      onChange?.(iso);
+      onChange?.(normalized);
       setIsOpen(false);
     },
-    [isControlled, isDisabled, readOnly, onChange]
+    [isControlled, isDisabled, readOnly, onChange, displayTimezone]
   );
   const open = useCallback(() => {
     if (isDisabled || readOnly) return;
     setIsOpen(true);
-    const target = currentValue ?? adapter.today();
+    const target = currentValue ?? adapter.today(displayTimezone);
     setViewMonth(target);
     setFocusedDate(target);
-  }, [isDisabled, readOnly, currentValue, adapter]);
+  }, [isDisabled, readOnly, currentValue, adapter, displayTimezone]);
   const close = useCallback(() => {
     setIsOpen(false);
   }, []);
@@ -94,9 +104,11 @@ function DatePickerRoot({
       weekStartsOn,
       displayFormat,
       locale,
+      displayTimezone,
       isDisabled,
       isReadOnly: readOnly,
-      pickerId
+      pickerId,
+      labels: mergedLabels
     }),
     [
       currentValue,
@@ -112,30 +124,40 @@ function DatePickerRoot({
       weekStartsOn,
       displayFormat,
       locale,
+      displayTimezone,
       isDisabled,
       readOnly,
-      pickerId
+      pickerId,
+      mergedLabels
     ]
   );
   return /* @__PURE__ */ jsx(DatePickerContext.Provider, { value: contextValue, children });
 }
 var DatePickerInput = forwardRef(
-  function DatePickerInput2({ format: formatProp, onFocus, onBlur, onKeyDown, ...props }, ref) {
+  function DatePickerInput2({ format: formatProp, onClick, onBlur, onKeyDown, ...props }, ref) {
     const ctx = useDatePickerContext("DatePicker.Input");
     const displayFormat = formatProp ?? ctx.displayFormat;
     const [inputText, setInputText] = useState(null);
-    const displayValue = inputText !== null ? inputText : ctx.value ? ctx.adapter.format(ctx.value, displayFormat) : "";
-    const handleFocus = useCallback(
+    let formattedValue = "";
+    if (ctx.value) {
+      try {
+        formattedValue = ctx.adapter.format(ctx.value, displayFormat, ctx.displayTimezone);
+      } catch {
+        formattedValue = ctx.value;
+      }
+    }
+    const displayValue = inputText !== null ? inputText : formattedValue;
+    const handleClick = useCallback(
       (e) => {
-        ctx.open();
-        onFocus?.(e);
+        if (!ctx.isOpen) ctx.open();
+        onClick?.(e);
       },
-      [ctx, onFocus]
+      [ctx, onClick]
     );
     const handleBlur = useCallback(
       (e) => {
         if (inputText !== null) {
-          const parsed = parseInputValue(inputText, displayFormat, ctx.adapter);
+          const parsed = parseInputValue(inputText, ctx.adapter);
           if (parsed) {
             ctx.selectDate(parsed);
           }
@@ -154,7 +176,7 @@ var DatePickerInput = forwardRef(
           setInputText(null);
           return;
         }
-        const parsed = parseInputValue(text, displayFormat, ctx.adapter);
+        const parsed = parseInputValue(text, ctx.adapter);
         if (parsed) {
           ctx.selectDate(parsed);
           setInputText(null);
@@ -168,7 +190,7 @@ var DatePickerInput = forwardRef(
           ctx.close();
         } else if (e.key === "Enter") {
           if (inputText !== null) {
-            const parsed = parseInputValue(inputText, displayFormat, ctx.adapter);
+            const parsed = parseInputValue(inputText, ctx.adapter);
             if (parsed) {
               ctx.selectDate(parsed);
               setInputText(null);
@@ -202,7 +224,7 @@ var DatePickerInput = forwardRef(
         disabled: ctx.isDisabled || props.disabled,
         readOnly: ctx.isReadOnly,
         onChange: handleChange,
-        onFocus: handleFocus,
+        onClick: handleClick,
         onBlur: handleBlur,
         onKeyDown: handleKeyDown,
         ...props
@@ -231,7 +253,7 @@ var DatePickerTrigger = forwardRef(
         },
         type: "button",
         tabIndex: 0,
-        "aria-label": ctx.isOpen ? "\uCE98\uB9B0\uB354 \uB2EB\uAE30" : "\uCE98\uB9B0\uB354 \uC5F4\uAE30",
+        "aria-label": ctx.isOpen ? ctx.labels.triggerClose : ctx.labels.triggerOpen,
         "aria-expanded": ctx.isOpen,
         "aria-controls": ctx.isOpen ? calendarId : void 0,
         disabled: ctx.isDisabled || props.disabled,
@@ -263,38 +285,39 @@ var DatePickerTrigger = forwardRef(
     );
   }
 );
-function DatePickerPopover({ children, ...props }) {
-  const ctx = useDatePickerContext("DatePicker.Popover");
-  const calendarId = `${ctx.pickerId}-calendar`;
+function usePopover({ isOpen, close, referenceRef, placement = "bottom-start" }) {
   const floatingRef = useRef(null);
+  const previousFocusRef = useRef(null);
   const { refs, floatingStyles } = useFloating({
-    open: ctx.isOpen,
-    placement: "bottom-start",
+    open: isOpen,
+    placement,
     middleware: [offset(4), flip(), shift({ padding: 8 })],
     whileElementsMounted: autoUpdate
   });
   useEffect(() => {
-    if (ctx.referenceRef.current) {
-      refs.setReference(ctx.referenceRef.current);
+    if (referenceRef.current) {
+      refs.setReference(referenceRef.current);
     }
-  }, [ctx.referenceRef, refs, ctx.isOpen]);
-  const previousFocusRef = useRef(null);
+  }, [referenceRef, refs, isOpen]);
   useEffect(() => {
-    if (ctx.isOpen) {
+    if (isOpen) {
       previousFocusRef.current = document.activeElement;
     } else if (previousFocusRef.current) {
-      previousFocusRef.current.focus();
+      const el = previousFocusRef.current;
       previousFocusRef.current = null;
+      if (el !== referenceRef.current && typeof el.focus === "function") {
+        el.focus({ preventScroll: true });
+      }
     }
-  }, [ctx.isOpen]);
+  }, [isOpen, referenceRef]);
   useEffect(() => {
-    if (!ctx.isOpen) return;
+    if (!isOpen) return;
     function handleClickOutside(e) {
       const floating = floatingRef.current;
-      const reference = ctx.referenceRef.current;
+      const reference = referenceRef.current;
       const target = e.target;
       if (floating && !floating.contains(target) && (!reference || !reference.contains(target))) {
-        ctx.close();
+        close();
       }
     }
     const timer = setTimeout(() => {
@@ -304,28 +327,39 @@ function DatePickerPopover({ children, ...props }) {
       clearTimeout(timer);
       document.removeEventListener("mousedown", handleClickOutside);
     };
-  }, [ctx.isOpen, ctx]);
+  }, [isOpen, close, referenceRef]);
   useEffect(() => {
-    if (!ctx.isOpen) return;
+    if (!isOpen) return;
     function handleKeyDown(e) {
       if (e.key === "Escape") {
-        ctx.close();
+        close();
       }
     }
     document.addEventListener("keydown", handleKeyDown);
     return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [ctx.isOpen, ctx]);
+  }, [isOpen, close]);
+  const setFloatingRef = (node) => {
+    floatingRef.current = node;
+    refs.setFloating(node);
+  };
+  return { floatingStyles, setFloatingRef };
+}
+function DatePickerPopover({ children, ...props }) {
+  const ctx = useDatePickerContext("DatePicker.Popover");
+  const calendarId = `${ctx.pickerId}-calendar`;
+  const { floatingStyles, setFloatingRef } = usePopover({
+    isOpen: ctx.isOpen,
+    close: ctx.close,
+    referenceRef: ctx.referenceRef
+  });
   if (!ctx.isOpen) return null;
   return /* @__PURE__ */ jsx(
     "div",
     {
-      ref: (node) => {
-        floatingRef.current = node;
-        refs.setFloating(node);
-      },
+      ref: setFloatingRef,
       id: calendarId,
       role: "dialog",
-      "aria-label": "\uB0A0\uC9DC \uC120\uD0DD",
+      "aria-label": ctx.labels.popoverLabel,
       "aria-modal": "false",
       style: floatingStyles,
       ...props,
@@ -333,6 +367,13 @@ function DatePickerPopover({ children, ...props }) {
     }
   );
 }
+function safeFormatFullDate(iso, locale) {
+  try {
+    return formatFullDate(iso, locale);
+  } catch {
+    return iso;
+  }
+}
 var srOnly = {
   position: "absolute",
   width: "1px",
@@ -348,13 +389,14 @@ function DatePickerCalendar({ classNames, onTitleClick, ...props }) {
   const ctx = useDatePickerContext("DatePicker.Calendar");
   const gridRef = useRef(null);
   const [announcement, setAnnouncement] = useState("");
-  const { adapter, viewMonth, focusedDate, weekStartsOn, disabled, locale } = ctx;
+  const { adapter, viewMonth, focusedDate, weekStartsOn, disabled, locale, displayTimezone } = ctx;
   const weekdays = getWeekdayNames(locale, weekStartsOn);
   const weeks = getCalendarDays(viewMonth, adapter, {
     weekStartsOn,
     selected: ctx.value,
     focusedDate,
-    disabled
+    disabled,
+    timezone: displayTimezone
   });
   const year = adapter.getYear(viewMonth);
   const month = adapter.getMonth(viewMonth);
@@ -364,7 +406,7 @@ function DatePickerCalendar({ classNames, onTitleClick, ...props }) {
     const focusedButton = gridRef.current.querySelector(
       '[data-focused="true"]'
     );
-    focusedButton?.focus();
+    focusedButton?.focus({ preventScroll: true });
   }, [focusedDate, ctx.isOpen]);
   const navigateMonth = useCallback(
     (direction) => {
@@ -381,7 +423,7 @@ function DatePickerCalendar({ classNames, onTitleClick, ...props }) {
     (day) => {
       if (day.isDisabled) return;
       ctx.selectDate(day.isoString);
-      setAnnouncement(formatFullDate(day.isoString, locale));
+      setAnnouncement(safeFormatFullDate(day.isoString, locale));
     },
     [ctx, locale]
   );
@@ -453,7 +495,7 @@ function DatePickerCalendar({ classNames, onTitleClick, ...props }) {
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateMonth(-1),
-          "aria-label": "\uC774\uC804 \uB2EC",
+          "aria-label": ctx.labels.prevMonth,
           children: "<"
         }
       ),
@@ -473,7 +515,7 @@ function DatePickerCalendar({ classNames, onTitleClick, ...props }) {
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateMonth(1),
-          "aria-label": "\uB2E4\uC74C \uB2EC",
+          "aria-label": ctx.labels.nextMonth,
           children: ">"
         }
       )
@@ -526,7 +568,7 @@ function DatePickerCalendar({ classNames, onTitleClick, ...props }) {
                     "data-outside-month": !day.isCurrentMonth || void 0,
                     className: dayClasses,
                     onClick: () => handleDayClick(day),
-                    "aria-label": formatFullDate(day.isoString, locale),
+                    "aria-label": safeFormatFullDate(day.isoString, locale),
                     children: day.dayNumber
                   }
                 )
@@ -582,7 +624,7 @@ function DatePickerMonthGrid({
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateYear(-1),
-          "aria-label": "\uC774\uC804 \uB144",
+          "aria-label": ctx.labels.prevYear,
           children: "<"
         }
       ),
@@ -601,7 +643,7 @@ function DatePickerMonthGrid({
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateYear(1),
-          "aria-label": "\uB2E4\uC74C \uB144",
+          "aria-label": ctx.labels.nextYear,
           children: ">"
         }
       )
@@ -686,7 +728,7 @@ function DatePickerYearGrid({
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateDecade(-1),
-          "aria-label": "\uC774\uC804 12\uB144",
+          "aria-label": ctx.labels.prevDecade,
           children: "<"
         }
       ),
@@ -697,7 +739,7 @@ function DatePickerYearGrid({
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateDecade(1),
-          "aria-label": "\uB2E4\uC74C 12\uB144",
+          "aria-label": ctx.labels.nextDecade,
           children: ">"
         }
       )
@@ -770,7 +812,9 @@ function RangePickerRoot({
   weekStartsOn = 0,
   displayFormat = "yyyy-MM-dd",
   locale = "en-US",
+  displayTimezone,
   adapter = DateFnsAdapter,
+  labels: labelsProp,
   children
 }) {
   const pickerId = useId();
@@ -784,13 +828,20 @@ function RangePickerRoot({
   const [selectingTarget, setSelectingTarget] = useState("start");
   const [hoverDate, setHoverDate] = useState(null);
   const [viewMonth, setViewMonth] = useState(
-    currentValue.start ?? adapter.today()
+    currentValue.start ?? adapter.today(displayTimezone)
   );
   const [focusedDate, setFocusedDate] = useState(
-    currentValue.start ?? adapter.today()
+    currentValue.start ?? adapter.today(displayTimezone)
+  );
+  const mergedLabels = useMemo(
+    () => ({ ...DEFAULT_RANGEPICKER_LABELS, ...labelsProp }),
+    [labelsProp]
   );
   const isDisabled = typeof disabled === "boolean" ? disabled : false;
-  const disabledRules = Array.isArray(disabled) ? disabled : [];
+  const disabledRules = useMemo(
+    () => Array.isArray(disabled) ? disabled : [],
+    [disabled]
+  );
   const setRange = useCallback(
     (range) => {
       if (isDisabled || readOnly) return;
@@ -804,23 +855,24 @@ function RangePickerRoot({
   const selectDate = useCallback(
     (iso) => {
       if (isDisabled || readOnly) return;
+      const normalized = displayTimezone ? civilMidnightFromUtcDay(iso, displayTimezone) : iso;
       if (selectingTarget === "start") {
-        const newRange = { start: iso, end: null };
+        const newRange = { start: normalized, end: null };
         setRange(newRange);
         setSelectingTarget("end");
         setHoverDate(null);
       } else {
         const start = currentValue.start;
         if (!start) {
-          setRange({ start: iso, end: null });
+          setRange({ start: normalized, end: null });
           setSelectingTarget("end");
           return;
         }
         let newRange;
-        if (adapter.isBefore(iso, start)) {
-          newRange = { start: iso, end: start };
+        if (adapter.isBefore(normalized, start)) {
+          newRange = { start: normalized, end: start };
         } else {
-          newRange = { start, end: iso };
+          newRange = { start, end: normalized };
         }
         setRange(newRange);
         setSelectingTarget("start");
@@ -828,18 +880,18 @@ function RangePickerRoot({
         setIsOpen(false);
       }
     },
-    [isDisabled, readOnly, selectingTarget, currentValue.start, adapter, setRange]
+    [isDisabled, readOnly, selectingTarget, currentValue.start, adapter, setRange, displayTimezone]
   );
   const open = useCallback(() => {
     if (isDisabled || readOnly) return;
     setIsOpen(true);
-    const target = currentValue.start ?? adapter.today();
+    const target = currentValue.start ?? adapter.today(displayTimezone);
     setViewMonth(target);
     setFocusedDate(target);
     if (currentValue.start && currentValue.end) {
       setSelectingTarget("start");
     }
-  }, [isDisabled, readOnly, currentValue, adapter]);
+  }, [isDisabled, readOnly, currentValue, adapter, displayTimezone]);
   const close = useCallback(() => {
     setIsOpen(false);
     setHoverDate(null);
@@ -870,9 +922,11 @@ function RangePickerRoot({
       weekStartsOn,
       displayFormat,
       locale,
+      displayTimezone,
       isDisabled,
       isReadOnly: readOnly,
-      pickerId
+      pickerId,
+      labels: mergedLabels
     }),
     [
       currentValue,
@@ -891,25 +945,34 @@ function RangePickerRoot({
       weekStartsOn,
       displayFormat,
       locale,
+      displayTimezone,
       isDisabled,
       readOnly,
-      pickerId
+      pickerId,
+      mergedLabels
     ]
   );
   return /* @__PURE__ */ jsx(RangePickerContext.Provider, { value: contextValue, children });
 }
 var RangePickerInput = forwardRef(
-  function RangePickerInput2({ part, format: formatProp, onFocus, onKeyDown, ...props }, ref) {
+  function RangePickerInput2({ part, format: formatProp, onClick, onKeyDown, ...props }, ref) {
     const ctx = useRangePickerContext("RangePicker.Input");
     const displayFormat = formatProp ?? ctx.displayFormat;
     const value = ctx.value[part];
-    const displayValue = value ? ctx.adapter.format(value, displayFormat) : "";
-    const handleFocus = useCallback(
+    let displayValue = "";
+    if (value) {
+      try {
+        displayValue = ctx.adapter.format(value, displayFormat, ctx.displayTimezone);
+      } catch {
+        displayValue = value;
+      }
+    }
+    const handleClick = useCallback(
       (e) => {
-        ctx.open();
-        onFocus?.(e);
+        if (!ctx.isOpen) ctx.open();
+        onClick?.(e);
       },
-      [ctx, onFocus]
+      [ctx, onClick]
     );
     const handleKeyDown = useCallback(
       (e) => {
@@ -939,11 +1002,11 @@ var RangePickerInput = forwardRef(
         "aria-haspopup": "dialog",
         "aria-controls": ctx.isOpen ? calendarId : void 0,
         "aria-autocomplete": "none",
-        "aria-label": part === "start" ? "\uC2DC\uC791\uC77C" : "\uC885\uB8CC\uC77C",
+        "aria-label": part === "start" ? ctx.labels.startInput : ctx.labels.endInput,
         autoComplete: "off",
         value: displayValue,
         disabled: ctx.isDisabled || props.disabled,
-        onFocus: handleFocus,
+        onClick: handleClick,
         onKeyDown: handleKeyDown,
         "data-part": part,
         ...props
@@ -954,66 +1017,19 @@ var RangePickerInput = forwardRef(
 function RangePickerPopover({ children, ...props }) {
   const ctx = useRangePickerContext("RangePicker.Popover");
   const calendarId = `${ctx.pickerId}-calendar`;
-  const floatingRef = useRef(null);
-  const { refs, floatingStyles } = useFloating({
-    open: ctx.isOpen,
-    placement: "bottom-start",
-    middleware: [offset(4), flip(), shift({ padding: 8 })],
-    whileElementsMounted: autoUpdate
+  const { floatingStyles, setFloatingRef } = usePopover({
+    isOpen: ctx.isOpen,
+    close: ctx.close,
+    referenceRef: ctx.referenceRef
   });
-  useEffect(() => {
-    if (ctx.referenceRef.current) {
-      refs.setReference(ctx.referenceRef.current);
-    }
-  }, [ctx.referenceRef, refs, ctx.isOpen]);
-  const previousFocusRef = useRef(null);
-  useEffect(() => {
-    if (ctx.isOpen) {
-      previousFocusRef.current = document.activeElement;
-    } else if (previousFocusRef.current) {
-      previousFocusRef.current.focus();
-      previousFocusRef.current = null;
-    }
-  }, [ctx.isOpen]);
-  useEffect(() => {
-    if (!ctx.isOpen) return;
-    function handleClickOutside(e) {
-      const floating = floatingRef.current;
-      const reference = ctx.referenceRef.current;
-      const target = e.target;
-      if (floating && !floating.contains(target) && (!reference || !reference.contains(target))) {
-        ctx.close();
-      }
-    }
-    const timer = setTimeout(() => {
-      document.addEventListener("mousedown", handleClickOutside);
-    }, 0);
-    return () => {
-      clearTimeout(timer);
-      document.removeEventListener("mousedown", handleClickOutside);
-    };
-  }, [ctx.isOpen, ctx]);
-  useEffect(() => {
-    if (!ctx.isOpen) return;
-    function handleKeyDown(e) {
-      if (e.key === "Escape") {
-        ctx.close();
-      }
-    }
-    document.addEventListener("keydown", handleKeyDown);
-    return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [ctx.isOpen, ctx]);
   if (!ctx.isOpen) return null;
   return /* @__PURE__ */ jsx(
     "div",
     {
-      ref: (node) => {
-        floatingRef.current = node;
-        refs.setFloating(node);
-      },
+      ref: setFloatingRef,
       id: calendarId,
       role: "dialog",
-      "aria-label": "\uB0A0\uC9DC \uBC94\uC704 \uC120\uD0DD",
+      "aria-label": ctx.labels.popoverLabel,
       "aria-modal": "false",
       style: floatingStyles,
       ...props,
@@ -1021,6 +1037,13 @@ function RangePickerPopover({ children, ...props }) {
     }
   );
 }
+function safeFormatFullDate2(iso, locale) {
+  try {
+    return formatFullDate(iso, locale);
+  } catch {
+    return iso;
+  }
+}
 var srOnly2 = {
   position: "absolute",
   width: "1px",
@@ -1044,7 +1067,8 @@ function RangePickerCalendar({ classNames, ...props }) {
     disabled,
     value,
     hoverDate,
-    selectingTarget
+    selectingTarget,
+    displayTimezone
   } = ctx;
   const { locale } = ctx;
   const weekdays = getWeekdayNames(locale, weekStartsOn);
@@ -1053,7 +1077,8 @@ function RangePickerCalendar({ classNames, ...props }) {
     focusedDate,
     disabled,
     range: value,
-    rangeHover: hoverDate
+    rangeHover: hoverDate,
+    timezone: displayTimezone
   });
   const year = adapter.getYear(viewMonth);
   const month = adapter.getMonth(viewMonth);
@@ -1063,7 +1088,7 @@ function RangePickerCalendar({ classNames, ...props }) {
     const focusedButton = gridRef.current.querySelector(
       '[data-focused="true"]'
     );
-    focusedButton?.focus();
+    focusedButton?.focus({ preventScroll: true });
   }, [focusedDate, ctx.isOpen]);
   const navigateMonth = useCallback(
     (direction) => {
@@ -1080,7 +1105,7 @@ function RangePickerCalendar({ classNames, ...props }) {
     (day) => {
       if (day.isDisabled) return;
       ctx.selectDate(day.isoString);
-      setAnnouncement(formatFullDate(day.isoString, locale));
+      setAnnouncement(safeFormatFullDate2(day.isoString, locale));
     },
     [ctx, locale]
   );
@@ -1157,7 +1182,7 @@ function RangePickerCalendar({ classNames, ...props }) {
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateMonth(-1),
-          "aria-label": "\uC774\uC804 \uB2EC",
+          "aria-label": ctx.labels.prevMonth,
           children: "<"
         }
       ),
@@ -1168,7 +1193,7 @@ function RangePickerCalendar({ classNames, ...props }) {
           type: "button",
           className: classNames?.navButton,
           onClick: () => navigateMonth(1),
-          "aria-label": "\uB2E4\uC74C \uB2EC",
+          "aria-label": ctx.labels.nextMonth,
           children: ">"
         }
       )
@@ -1228,7 +1253,7 @@ function RangePickerCalendar({ classNames, ...props }) {
                     className: dayClasses,
                     onClick: () => handleDayClick(day),
                     onMouseEnter: () => handleDayMouseEnter(day),
-                    "aria-label": formatFullDate(day.isoString, locale),
+                    "aria-label": safeFormatFullDate2(day.isoString, locale),
                     children: day.dayNumber
                   }
                 )
@@ -1243,7 +1268,8 @@ function RangePickerCalendar({ classNames, ...props }) {
   ] });
 }
 function RangePickerPresets({ classNames, children, ...props }) {
-  return /* @__PURE__ */ jsx("div", { role: "group", "aria-label": "\uB0A0\uC9DC \uBC94\uC704 \uD504\uB9AC\uC14B", className: classNames?.root, ...props, children });
+  const ctx = useRangePickerContext("RangePicker.Presets");
+  return /* @__PURE__ */ jsx("div", { role: "group", "aria-label": ctx.labels.presetsGroup, className: classNames?.root, ...props, children });
 }
 function resolvePreset(key, today, adapter) {
   switch (key) {
@@ -1282,8 +1308,9 @@ function resolvePreset(key, today, adapter) {
       };
     }
     case "thisYear": {
+      const currentMonth = new Date(today).getUTCMonth();
       const yearStart = adapter.startOfMonth(
-        adapter.addMonths(today, -new Date(today).getUTCMonth())
+        adapter.addMonths(today, -currentMonth)
       );
       return { start: yearStart, end: today };
     }
@@ -1365,10 +1392,7 @@ function useTimePickerContext(componentName) {
   return context;
 }
 function getDefaultIso() {
-  const now = /* @__PURE__ */ new Date();
-  return new Date(
-    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate())
-  ).toISOString();
+  return DateFnsAdapter.today();
 }
 function TimePickerRoot({
   value: controlledValue,
@@ -1377,28 +1401,37 @@ function TimePickerRoot({
   format = "24h",
   step = 1,
   withSeconds = false,
+  displayTimezone,
   disabled = false,
   readOnly = false,
+  labels: labelsProp,
   children
 }) {
   const pickerId = useId();
+  const mergedLabels = useMemo(
+    () => ({ ...DEFAULT_TIMEPICKER_LABELS, ...labelsProp }),
+    [labelsProp]
+  );
   const isControlled = useRef(controlledValue !== void 0).current;
   const [uncontrolledValue, setUncontrolledValue] = useState(
     defaultValue ?? null
   );
   const currentValue = isControlled ? controlledValue ?? null : uncontrolledValue;
   const baseIso = currentValue ?? getDefaultIso();
-  const currentTime = useMemo(() => getTime(baseIso), [baseIso]);
+  const currentTime = useMemo(
+    () => displayTimezone ? getTimeInTimezone(baseIso, displayTimezone) : getTime(baseIso),
+    [baseIso, displayTimezone]
+  );
   const setTime$1 = useCallback(
     (partial) => {
       if (disabled || readOnly) return;
-      const newIso = setTime(baseIso, partial);
+      const newIso = displayTimezone ? setTimeInTimezone(baseIso, partial, displayTimezone) : setTime(baseIso, partial);
       if (!isControlled) {
         setUncontrolledValue(newIso);
       }
       onChange?.(newIso);
     },
-    [disabled, readOnly, baseIso, isControlled, onChange]
+    [disabled, readOnly, baseIso, isControlled, onChange, displayTimezone]
   );
   const contextValue = useMemo(
     () => ({
@@ -1407,12 +1440,14 @@ function TimePickerRoot({
       format,
       step,
       withSeconds,
+      displayTimezone,
       isDisabled: disabled,
       isReadOnly: readOnly,
       currentTime,
-      pickerId
+      pickerId,
+      labels: mergedLabels
     }),
-    [currentValue, setTime$1, format, step, withSeconds, disabled, readOnly, currentTime, pickerId]
+    [currentValue, setTime$1, format, step, withSeconds, displayTimezone, disabled, readOnly, currentTime, pickerId, mergedLabels]
   );
   return /* @__PURE__ */ jsx(TimePickerContext.Provider, { value: contextValue, children });
 }
@@ -1458,7 +1493,7 @@ var TimePickerInput = forwardRef(
         type: "text",
         inputMode: "numeric",
         autoComplete: "off",
-        "aria-label": "\uC2DC\uAC04 \uC785\uB825",
+        "aria-label": ctx.labels.timeInput,
         placeholder: ctx.withSeconds ? "HH:MM:SS" : "HH:MM",
         value: displayValue,
         disabled: ctx.isDisabled || props.disabled,
@@ -1471,46 +1506,42 @@ var TimePickerInput = forwardRef(
     );
   }
 );
-function TimePickerHourList({ classNames, ...props }) {
-  const ctx = useTimePickerContext("TimePicker.HourList");
-  const { format, currentTime, isDisabled, isReadOnly } = ctx;
+function useListboxNavigation({
+  items,
+  onSelect,
+  disabled = false
+}) {
   const listRef = useRef(null);
-  const hours = generateHours(format);
-  const selectedHourDisplay = format === "12h" ? to12Hour(currentTime.hours).hours12 : currentTime.hours;
-  const currentPeriod = format === "12h" ? to12Hour(currentTime.hours).period : null;
-  const handleSelect = useCallback(
-    (hourDisplay) => {
-      if (isDisabled || isReadOnly) return;
-      const hours24 = format === "12h" && currentPeriod ? to24Hour(hourDisplay, currentPeriod) : hourDisplay;
-      ctx.setTime({ hours: hours24 });
-    },
-    [format, currentPeriod, ctx, isDisabled, isReadOnly]
-  );
+  const rafIdRef = useRef(0);
+  useEffect(() => {
+    return () => cancelAnimationFrame(rafIdRef.current);
+  }, []);
   const handleKeyDown = useCallback(
-    (e, hour) => {
-      if (isDisabled || isReadOnly) return;
-      const currentIndex = hours.indexOf(hour);
+    (e, item) => {
+      if (disabled) return;
+      const currentIndex = items.indexOf(item);
       let newIndex = -1;
       if (e.key === "ArrowDown") {
-        newIndex = Math.min(currentIndex + 1, hours.length - 1);
+        newIndex = Math.min(currentIndex + 1, items.length - 1);
       } else if (e.key === "ArrowUp") {
         newIndex = Math.max(currentIndex - 1, 0);
       } else if (e.key === "Home") {
         newIndex = 0;
       } else if (e.key === "End") {
-        newIndex = hours.length - 1;
+        newIndex = items.length - 1;
       } else if (e.key === "Enter" || e.key === " ") {
         e.preventDefault();
-        handleSelect(hour);
+        onSelect(item);
         return;
       } else {
         return;
       }
       e.preventDefault();
-      const targetHour = hours[newIndex];
-      if (targetHour !== void 0) {
-        handleSelect(targetHour);
-        requestAnimationFrame(() => {
+      const target = items[newIndex];
+      if (target !== void 0) {
+        onSelect(target);
+        cancelAnimationFrame(rafIdRef.current);
+        rafIdRef.current = requestAnimationFrame(() => {
           const next = listRef.current?.querySelector(
             '[data-selected="true"]'
           );
@@ -1518,14 +1549,35 @@ function TimePickerHourList({ classNames, ...props }) {
         });
       }
     },
-    [hours, handleSelect, isDisabled, isReadOnly]
+    [items, onSelect, disabled]
+  );
+  return { listRef, handleKeyDown };
+}
+function TimePickerHourList({ classNames, ...props }) {
+  const ctx = useTimePickerContext("TimePicker.HourList");
+  const { format, currentTime, isDisabled, isReadOnly } = ctx;
+  const hours = generateHours(format);
+  const selectedHourDisplay = format === "12h" ? to12Hour(currentTime.hours).hours12 : currentTime.hours;
+  const currentPeriod = format === "12h" ? to12Hour(currentTime.hours).period : null;
+  const handleSelect = useCallback(
+    (hourDisplay) => {
+      if (isDisabled || isReadOnly) return;
+      const hours24 = format === "12h" && currentPeriod ? to24Hour(hourDisplay, currentPeriod) : hourDisplay;
+      ctx.setTime({ hours: hours24 });
+    },
+    [format, currentPeriod, ctx, isDisabled, isReadOnly]
   );
+  const { listRef, handleKeyDown } = useListboxNavigation({
+    items: hours,
+    onSelect: handleSelect,
+    disabled: isDisabled || isReadOnly
+  });
   return /* @__PURE__ */ jsx(
     "ul",
     {
       ref: listRef,
       role: "listbox",
-      "aria-label": "\uC2DC",
+      "aria-label": ctx.labels.hourList,
       "aria-disabled": isDisabled || void 0,
       className: classNames?.root,
       ...props,
@@ -1538,7 +1590,7 @@ function TimePickerHourList({ classNames, ...props }) {
             role: "option",
             "aria-selected": isSelected,
             "aria-disabled": isDisabled || void 0,
-            "aria-label": `${hour}\uC2DC`,
+            "aria-label": ctx.labels.hourOption(hour),
             "data-selected": isSelected || void 0,
             tabIndex: isSelected ? 0 : -1,
             className: optionClass,
@@ -1555,7 +1607,6 @@ function TimePickerHourList({ classNames, ...props }) {
 function TimePickerMinuteList({ classNames, ...props }) {
   const ctx = useTimePickerContext("TimePicker.MinuteList");
   const { step, currentTime, isDisabled, isReadOnly } = ctx;
-  const listRef = useRef(null);
   const minutes = generateMinutes(step);
   const handleSelect = useCallback(
     (minute) => {
@@ -1564,46 +1615,17 @@ function TimePickerMinuteList({ classNames, ...props }) {
     },
     [ctx, isDisabled, isReadOnly]
   );
-  const handleKeyDown = useCallback(
-    (e, minute) => {
-      if (isDisabled || isReadOnly) return;
-      const currentIndex = minutes.indexOf(minute);
-      let newIndex = -1;
-      if (e.key === "ArrowDown") {
-        newIndex = Math.min(currentIndex + 1, minutes.length - 1);
-      } else if (e.key === "ArrowUp") {
-        newIndex = Math.max(currentIndex - 1, 0);
-      } else if (e.key === "Home") {
-        newIndex = 0;
-      } else if (e.key === "End") {
-        newIndex = minutes.length - 1;
-      } else if (e.key === "Enter" || e.key === " ") {
-        e.preventDefault();
-        handleSelect(minute);
-        return;
-      } else {
-        return;
-      }
-      e.preventDefault();
-      const target = minutes[newIndex];
-      if (target !== void 0) {
-        handleSelect(target);
-        requestAnimationFrame(() => {
-          const next = listRef.current?.querySelector(
-            '[data-selected="true"]'
-          );
-          next?.focus();
-        });
-      }
-    },
-    [minutes, handleSelect, isDisabled, isReadOnly]
-  );
+  const { listRef, handleKeyDown } = useListboxNavigation({
+    items: minutes,
+    onSelect: handleSelect,
+    disabled: isDisabled || isReadOnly
+  });
   return /* @__PURE__ */ jsx(
     "ul",
     {
       ref: listRef,
       role: "listbox",
-      "aria-label": "\uBD84",
+      "aria-label": ctx.labels.minuteList,
       "aria-disabled": isDisabled || void 0,
       className: classNames?.root,
       ...props,
@@ -1616,7 +1638,7 @@ function TimePickerMinuteList({ classNames, ...props }) {
             role: "option",
             "aria-selected": isSelected,
             "aria-disabled": isDisabled || void 0,
-            "aria-label": `${minute}\uBD84`,
+            "aria-label": ctx.labels.minuteOption(minute),
             "data-selected": isSelected || void 0,
             tabIndex: isSelected ? 0 : -1,
             className: optionClass,
@@ -1659,7 +1681,7 @@ function TimePickerAmPmToggle({ classNames, ...props }) {
       }
     );
   };
-  return /* @__PURE__ */ jsxs("div", { role: "radiogroup", "aria-label": "\uC624\uC804/\uC624\uD6C4", className: classNames?.root, ...props, children: [
+  return /* @__PURE__ */ jsxs("div", { role: "radiogroup", "aria-label": ctx.labels.amPmToggle, className: classNames?.root, ...props, children: [
     renderButton("AM"),
     renderButton("PM")
   ] });
@@ -1673,10 +1695,7 @@ var TimePicker = Object.assign(TimePickerRoot, {
   AmPmToggle: TimePickerAmPmToggle
 });
 function getDefaultIso2() {
-  const now = /* @__PURE__ */ new Date();
-  return new Date(
-    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate())
-  ).toISOString();
+  return DateFnsAdapter.today();
 }
 function DateTimePickerRoot({
   value: controlledValue,
@@ -1689,10 +1708,20 @@ function DateTimePickerRoot({
   weekStartsOn = 0,
   displayFormat = "yyyy-MM-dd HH:mm",
   locale = "en-US",
+  displayTimezone,
   adapter = DateFnsAdapter,
+  labels: labelsProp,
   children
 }) {
   const pickerId = useId();
+  const mergedDateLabels = useMemo(
+    () => ({ ...DEFAULT_DATEPICKER_LABELS, ...labelsProp }),
+    [labelsProp]
+  );
+  const mergedTimeLabels = useMemo(
+    () => ({ ...DEFAULT_TIMEPICKER_LABELS, ...labelsProp }),
+    [labelsProp]
+  );
   const isControlled = useRef(controlledValue !== void 0).current;
   const referenceRef = useRef(null);
   const [uncontrolledValue, setUncontrolledValue] = useState(
@@ -1701,15 +1730,21 @@ function DateTimePickerRoot({
   const currentValue = isControlled ? controlledValue ?? null : uncontrolledValue;
   const [isOpen, setIsOpen] = useState(false);
   const [viewMonth, setViewMonth] = useState(
-    currentValue ?? adapter.today()
+    currentValue ?? adapter.today(displayTimezone)
   );
   const [focusedDate, setFocusedDate] = useState(
-    currentValue ?? adapter.today()
+    currentValue ?? adapter.today(displayTimezone)
   );
   const isDisabled = typeof disabled === "boolean" ? disabled : false;
-  const disabledRules = Array.isArray(disabled) ? disabled : [];
+  const disabledRules = useMemo(
+    () => Array.isArray(disabled) ? disabled : [],
+    [disabled]
+  );
   const baseIso = currentValue ?? getDefaultIso2();
-  const currentTime = useMemo(() => getTime(baseIso), [baseIso]);
+  const currentTime = useMemo(
+    () => displayTimezone ? getTimeInTimezone(baseIso, displayTimezone) : getTime(baseIso),
+    [baseIso, displayTimezone]
+  );
   const updateValue = useCallback(
     (next) => {
       if (isDisabled || readOnly) return;
@@ -1726,27 +1761,28 @@ function DateTimePickerRoot({
         updateValue(null);
         return;
       }
-      const time = currentValue ? getTime(currentValue) : currentTime;
-      const merged = setTime(newDateIso, time);
+      const normalizedDate = displayTimezone ? civilMidnightFromUtcDay(newDateIso, displayTimezone) : newDateIso;
+      const time = currentValue ? displayTimezone ? getTimeInTimezone(currentValue, displayTimezone) : getTime(currentValue) : currentTime;
+      const merged = displayTimezone ? setTimeInTimezone(normalizedDate, time, displayTimezone) : setTime(normalizedDate, time);
       updateValue(merged);
     },
-    [currentValue, currentTime, updateValue]
+    [currentValue, currentTime, updateValue, displayTimezone]
   );
   const setTime$1 = useCallback(
     (partial) => {
       const base = currentValue ?? getDefaultIso2();
-      const merged = setTime(base, partial);
+      const merged = displayTimezone ? setTimeInTimezone(base, partial, displayTimezone) : setTime(base, partial);
       updateValue(merged);
     },
-    [currentValue, updateValue]
+    [currentValue, updateValue, displayTimezone]
   );
   const open = useCallback(() => {
     if (isDisabled || readOnly) return;
     setIsOpen(true);
-    const target = currentValue ?? adapter.today();
+    const target = currentValue ?? adapter.today(displayTimezone);
     setViewMonth(target);
     setFocusedDate(target);
-  }, [isDisabled, readOnly, currentValue, adapter]);
+  }, [isDisabled, readOnly, currentValue, adapter, displayTimezone]);
   const close = useCallback(() => {
     setIsOpen(false);
   }, []);
@@ -1772,9 +1808,11 @@ function DateTimePickerRoot({
       weekStartsOn,
       displayFormat,
       locale,
+      displayTimezone,
       isDisabled,
       isReadOnly: readOnly,
-      pickerId
+      pickerId,
+      labels: mergedDateLabels
     }),
     [
       currentValue,
@@ -1790,9 +1828,11 @@ function DateTimePickerRoot({
       weekStartsOn,
       displayFormat,
       locale,
+      displayTimezone,
       isDisabled,
       readOnly,
-      pickerId
+      pickerId,
+      mergedDateLabels
     ]
   );
   const timeContext = useMemo(
@@ -1802,25 +1842,36 @@ function DateTimePickerRoot({
       format,
       step,
       withSeconds: false,
+      displayTimezone,
       isDisabled,
       isReadOnly: readOnly,
       currentTime,
-      pickerId
+      pickerId,
+      labels: mergedTimeLabels
     }),
-    [currentValue, setTime$1, format, step, isDisabled, readOnly, currentTime, pickerId]
+    [currentValue, setTime$1, format, step, displayTimezone, isDisabled, readOnly, currentTime, pickerId, mergedTimeLabels]
   );
   return /* @__PURE__ */ jsx(DatePickerContext.Provider, { value: dateContext, children: /* @__PURE__ */ jsx(TimePickerContext.Provider, { value: timeContext, children }) });
 }
 var DateTimePickerInput = forwardRef(
-  function DateTimePickerInput2({ onFocus, onKeyDown, ...props }, ref) {
+  function DateTimePickerInput2({ onClick, onKeyDown, ...props }, ref) {
     const ctx = useDatePickerContext("DateTimePicker.Input");
-    const displayValue = ctx.value ? `${ctx.adapter.format(ctx.value, "yyyy-MM-dd")} ${formatTimeString(getTime(ctx.value))}` : "";
-    const handleFocus = useCallback(
+    let displayValue = "";
+    if (ctx.value) {
+      try {
+        const datePart = ctx.adapter.format(ctx.value, "yyyy-MM-dd", ctx.displayTimezone);
+        const time = ctx.displayTimezone ? getTimeInTimezone(ctx.value, ctx.displayTimezone) : getTime(ctx.value);
+        displayValue = `${datePart} ${formatTimeString(time)}`;
+      } catch {
+        displayValue = ctx.value;
+      }
+    }
+    const handleClick = useCallback(
       (e) => {
-        ctx.open();
-        onFocus?.(e);
+        if (!ctx.isOpen) ctx.open();
+        onClick?.(e);
       },
-      [ctx, onFocus]
+      [ctx, onClick]
     );
     const handleKeyDown = useCallback(
       (e) => {
@@ -1846,7 +1897,7 @@ var DateTimePickerInput = forwardRef(
         type: "text",
         role: "combobox",
         readOnly: true,
-        "aria-label": "\uB0A0\uC9DC \uBC0F \uC2DC\uAC04",
+        "aria-label": ctx.labels.dateTimeInput ?? "Date and time",
         "aria-expanded": ctx.isOpen,
         "aria-haspopup": "dialog",
         "aria-controls": ctx.isOpen ? calendarId : void 0,
@@ -1854,7 +1905,7 @@ var DateTimePickerInput = forwardRef(
         autoComplete: "off",
         value: displayValue,
         disabled: ctx.isDisabled || props.disabled,
-        onFocus: handleFocus,
+        onClick: handleClick,
         onKeyDown: handleKeyDown,
         ...props
       }
@@ -1880,7 +1931,8 @@ function useDatePicker(options = {}) {
     onChange,
     disabled = [],
     weekStartsOn = 0,
-    adapter = DateFnsAdapter
+    adapter = DateFnsAdapter,
+    displayTimezone
   } = options;
   const pickerId = useId();
   const isControlled = useRef(controlledValue !== void 0).current;
@@ -1889,24 +1941,29 @@ function useDatePicker(options = {}) {
   );
   const currentValue = isControlled ? controlledValue ?? null : uncontrolledValue;
   const [isOpen, setIsOpen] = useState(false);
-  const [viewMonth, setViewMonth] = useState(currentValue ?? adapter.today());
-  const [focusedDate, setFocusedDate] = useState(currentValue ?? adapter.today());
+  const [viewMonth, setViewMonth] = useState(
+    currentValue ?? adapter.today(displayTimezone)
+  );
+  const [focusedDate, setFocusedDate] = useState(
+    currentValue ?? adapter.today(displayTimezone)
+  );
   const selectDate = useCallback(
     (iso) => {
+      const normalized = iso && displayTimezone ? civilMidnightFromUtcDay(iso, displayTimezone) : iso;
       if (!isControlled) {
-        setUncontrolledValue(iso);
+        setUncontrolledValue(normalized);
       }
-      onChange?.(iso);
+      onChange?.(normalized);
       setIsOpen(false);
     },
-    [isControlled, onChange]
+    [isControlled, onChange, displayTimezone]
   );
   const open = useCallback(() => {
     setIsOpen(true);
-    const target = currentValue ?? adapter.today();
+    const target = currentValue ?? adapter.today(displayTimezone);
     setViewMonth(target);
     setFocusedDate(target);
-  }, [currentValue, adapter]);
+  }, [currentValue, adapter, displayTimezone]);
   const close = useCallback(() => {
     setIsOpen(false);
   }, []);
@@ -1928,7 +1985,8 @@ function useDatePicker(options = {}) {
     weekStartsOn,
     selected: currentValue,
     focusedDate,
-    disabled
+    disabled,
+    timezone: displayTimezone
   });
   return {
     value: currentValue,
@@ -1956,7 +2014,8 @@ function useRangePicker(options = {}) {
     onChange,
     disabled = [],
     weekStartsOn = 0,
-    adapter = DateFnsAdapter
+    adapter = DateFnsAdapter,
+    displayTimezone
   } = options;
   const pickerId = useId();
   const isControlled = useRef(controlledValue !== void 0).current;
@@ -1968,10 +2027,10 @@ function useRangePicker(options = {}) {
   const [selectingTarget, setSelectingTarget] = useState("start");
   const [hoverDate, setHoverDate] = useState(null);
   const [viewMonth, setViewMonth] = useState(
-    currentValue.start ?? adapter.today()
+    currentValue.start ?? adapter.today(displayTimezone)
   );
   const [focusedDate, setFocusedDate] = useState(
-    currentValue.start ?? adapter.today()
+    currentValue.start ?? adapter.today(displayTimezone)
   );
   const setRange = useCallback(
     (range) => {
@@ -1984,35 +2043,36 @@ function useRangePicker(options = {}) {
   );
   const selectDate = useCallback(
     (iso) => {
+      const normalized = displayTimezone ? civilMidnightFromUtcDay(iso, displayTimezone) : iso;
       if (selectingTarget === "start") {
-        setRange({ start: iso, end: null });
+        setRange({ start: normalized, end: null });
         setSelectingTarget("end");
         setHoverDate(null);
       } else {
         const start = currentValue.start;
         if (!start) {
-          setRange({ start: iso, end: null });
+          setRange({ start: normalized, end: null });
           setSelectingTarget("end");
           return;
         }
-        const newRange = adapter.isBefore(iso, start) ? { start: iso, end: start } : { start, end: iso };
+        const newRange = adapter.isBefore(normalized, start) ? { start: normalized, end: start } : { start, end: normalized };
         setRange(newRange);
         setSelectingTarget("start");
         setHoverDate(null);
         setIsOpen(false);
       }
     },
-    [selectingTarget, currentValue.start, adapter, setRange]
+    [selectingTarget, currentValue.start, adapter, setRange, displayTimezone]
   );
   const open = useCallback(() => {
     setIsOpen(true);
-    const target = currentValue.start ?? adapter.today();
+    const target = currentValue.start ?? adapter.today(displayTimezone);
     setViewMonth(target);
     setFocusedDate(target);
     if (currentValue.start && currentValue.end) {
       setSelectingTarget("start");
     }
-  }, [currentValue, adapter]);
+  }, [currentValue, adapter, displayTimezone]);
   const close = useCallback(() => {
     setIsOpen(false);
     setHoverDate(null);
@@ -2036,7 +2096,8 @@ function useRangePicker(options = {}) {
     focusedDate,
     disabled,
     range: currentValue,
-    rangeHover: hoverDate
+    rangeHover: hoverDate,
+    timezone: displayTimezone
   });
   return {
     value: currentValue,
@@ -2061,10 +2122,7 @@ function useRangePicker(options = {}) {
   };
 }
 function getDefaultIso3() {
-  const now = /* @__PURE__ */ new Date();
-  return new Date(
-    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate())
-  ).toISOString();
+  return DateFnsAdapter.today();
 }
 function useTimePicker(options = {}) {
   const {
@@ -2072,7 +2130,8 @@ function useTimePicker(options = {}) {
     defaultValue,
     onChange,
     format = "24h",
-    step = 1
+    step = 1,
+    displayTimezone
   } = options;
   const pickerId = useId();
   const isControlled = useRef(controlledValue !== void 0).current;
@@ -2081,16 +2140,19 @@ function useTimePicker(options = {}) {
   );
   const currentValue = isControlled ? controlledValue ?? null : uncontrolledValue;
   const baseIso = currentValue ?? getDefaultIso3();
-  const currentTime = useMemo(() => getTime(baseIso), [baseIso]);
+  const currentTime = useMemo(
+    () => displayTimezone ? getTimeInTimezone(baseIso, displayTimezone) : getTime(baseIso),
+    [baseIso, displayTimezone]
+  );
   const setTime$1 = useCallback(
     (partial) => {
-      const newIso = setTime(baseIso, partial);
+      const newIso = displayTimezone ? setTimeInTimezone(baseIso, partial, displayTimezone) : setTime(baseIso, partial);
       if (!isControlled) {
         setUncontrolledValue(newIso);
       }
       onChange?.(newIso);
     },
-    [baseIso, isControlled, onChange]
+    [baseIso, isControlled, onChange, displayTimezone]
   );
   const period = format === "12h" ? to12Hour(currentTime.hours).period : null;
   const displayHour = format === "12h" ? to12Hour(currentTime.hours).hours12 : currentTime.hours;