@optifye/dashboard-core 6.12.32 → 6.12.33

package/dist/index.d.mts

@@ -4397,7 +4397,7 @@ declare const useWorkspaceUptimeTimeline: (options: UseWorkspaceUptimeTimelineOp
  * console.log(formatTime(myDate, 'HH:mm:ss zzz')); // Formats using date-fns string in configured timezone
  * console.log(`Current timezone: ${timezone}`);
  */
-declare function useDateFormatter(): {
+declare function useDateFormatter(timezoneOverride?: string): {
     formatDate: (date: Date | string, formatString?: string) => string;
     formatTime: (date: Date | string, formatString?: string) => string;
     formatDateTime: (date: Date | string, formatString?: string) => string;

package/dist/index.d.ts

@@ -4397,7 +4397,7 @@ declare const useWorkspaceUptimeTimeline: (options: UseWorkspaceUptimeTimelineOp
  * console.log(formatTime(myDate, 'HH:mm:ss zzz')); // Formats using date-fns string in configured timezone
  * console.log(`Current timezone: ${timezone}`);
  */
-declare function useDateFormatter(): {
+declare function useDateFormatter(timezoneOverride?: string): {
     formatDate: (date: Date | string, formatString?: string) => string;
     formatTime: (date: Date | string, formatString?: string) => string;
     formatDateTime: (date: Date | string, formatString?: string) => string;

package/dist/index.js

@@ -20487,46 +20487,56 @@ var useWorkspaceUptimeTimeline = (options) => {
     refetch: fetchTimeline
   };
 };
-function useDateFormatter() {
+function useDateFormatter(timezoneOverride) {
   const { defaultTimezone, defaultLocale, dateFormatOptions, timeFormatOptions, dateTimeFormatOptions } = useDateTimeConfig();
+  const resolvedTimezone = timezoneOverride || defaultTimezone || "UTC";
   const formatDate2 = React144.useCallback(
     (date, formatString) => {
       const dateObj = typeof date === "string" ? dateFns.parseISO(date) : date;
       if (!dateFns.isValid(dateObj)) return "Invalid Date";
-      const tz = defaultTimezone || "UTC";
+      const tz = resolvedTimezone;
       if (formatString) {
         return dateFnsTz.formatInTimeZone(dateObj, tz, formatString);
       }
       const effectiveOptions = dateFormatOptions || { year: "numeric", month: "short", day: "numeric" };
-      return new Intl.DateTimeFormat(defaultLocale || "en-US", effectiveOptions).format(dateObj);
+      return new Intl.DateTimeFormat(defaultLocale || "en-US", {
+        ...effectiveOptions,
+        timeZone: tz
+      }).format(dateObj);
     },
-    [defaultTimezone, defaultLocale, dateFormatOptions]
+    [resolvedTimezone, defaultLocale, dateFormatOptions]
   );
   const formatTime5 = React144.useCallback(
     (date, formatString) => {
       const dateObj = typeof date === "string" ? dateFns.parseISO(date) : date;
       if (!dateFns.isValid(dateObj)) return "Invalid Time";
-      const tz = defaultTimezone || "UTC";
+      const tz = resolvedTimezone;
       if (formatString) {
         return dateFnsTz.formatInTimeZone(dateObj, tz, formatString);
       }
       const effectiveOptions = timeFormatOptions || { hour: "numeric", minute: "numeric" };
-      return new Intl.DateTimeFormat(defaultLocale || "en-US", effectiveOptions).format(dateObj);
+      return new Intl.DateTimeFormat(defaultLocale || "en-US", {
+        ...effectiveOptions,
+        timeZone: tz
+      }).format(dateObj);
     },
-    [defaultTimezone, defaultLocale, timeFormatOptions]
+    [resolvedTimezone, defaultLocale, timeFormatOptions]
   );
   const formatDateTime = React144.useCallback(
     (date, formatString) => {
       const dateObj = typeof date === "string" ? dateFns.parseISO(date) : date;
       if (!dateFns.isValid(dateObj)) return "Invalid Date/Time";
-      const tz = defaultTimezone || "UTC";
+      const tz = resolvedTimezone;
       if (formatString) {
         return dateFnsTz.formatInTimeZone(dateObj, tz, formatString);
       }
       const effectiveOptions = dateTimeFormatOptions || { year: "numeric", month: "short", day: "numeric", hour: "numeric", minute: "numeric" };
-      return new Intl.DateTimeFormat(defaultLocale || "en-US", effectiveOptions).format(dateObj);
+      return new Intl.DateTimeFormat(defaultLocale || "en-US", {
+        ...effectiveOptions,
+        timeZone: tz
+      }).format(dateObj);
     },
-    [defaultTimezone, defaultLocale, dateTimeFormatOptions]
+    [resolvedTimezone, defaultLocale, dateTimeFormatOptions]
   );
   const getNow = React144.useCallback(() => {
     return /* @__PURE__ */ new Date();
@@ -20536,7 +20546,7 @@ function useDateFormatter() {
     formatTime: formatTime5,
     formatDateTime,
     getNow,
-    timezone: defaultTimezone || "UTC",
+    timezone: resolvedTimezone,
     locale: defaultLocale || "en-US"
   };
 }
@@ -40265,14 +40275,16 @@ var DateTimeDisplay = ({
   const {
     defaultTimezone
   } = useDateTimeConfig();
-  const { formatDate: formatDate2, formatTime: formatTime5 } = useDateFormatter();
-  const [now4, setNow] = React144.useState(() => getCurrentTimeInZone(defaultTimezone || "UTC"));
+  const appTimezone = useAppTimezone();
+  const timezone = appTimezone || defaultTimezone || "UTC";
+  const { formatDate: formatDate2, formatTime: formatTime5 } = useDateFormatter(timezone);
+  const [now4, setNow] = React144.useState(() => /* @__PURE__ */ new Date());
   React144.useEffect(() => {
     const timerId = setInterval(() => {
-      setNow(getCurrentTimeInZone(defaultTimezone || "UTC"));
+      setNow(/* @__PURE__ */ new Date());
     }, 1e3);
     return () => clearInterval(timerId);
-  }, [defaultTimezone]);
+  }, []);
   if (!showDate && !showTime) {
     return null;
   }
@@ -42794,9 +42806,9 @@ var TimeDisplay = ({ className, variant = "default" }) => {
         minute: "2-digit",
         second: "2-digit",
         hour12: true,
-        timeZone: timezoneToDisplay,
-        ...dateTimeConfig?.timeFormatOptions || {}
+        ...dateTimeConfig?.timeFormatOptions || {},
         // Allow override from config
+        timeZone: timezoneToDisplay
       };
       try {
         setTime(new Intl.DateTimeFormat(localeToUse, effectiveFormatOptions).format(now4));
@@ -42839,7 +42851,8 @@ var TimeDisplay_default = TimeDisplay;
 var DateDisplay = ({ className, variant = "default" }) => {
   const { dateTimeConfig } = useDashboardConfig();
   const [date, setDate] = React144.useState("");
-  const timezoneToDisplay = dateTimeConfig?.defaultTimezone || "UTC";
+  const dbTimezone = useAppTimezone();
+  const timezoneToDisplay = dbTimezone || dateTimeConfig?.defaultTimezone || "UTC";
   const localeToUse = dateTimeConfig?.defaultLocale || "en-US";
   React144.useEffect(() => {
     const getCurrentFormattedDate = () => {
@@ -42848,9 +42861,9 @@ var DateDisplay = ({ className, variant = "default" }) => {
         weekday: "short",
         day: "numeric",
         month: "short",
-        timeZone: timezoneToDisplay,
-        ...dateTimeConfig?.dateFormatOptions || {}
+        ...dateTimeConfig?.dateFormatOptions || {},
         // Allow override from config
+        timeZone: timezoneToDisplay
       };
       try {
         return new Intl.DateTimeFormat(localeToUse, effectiveFormatOptions).format(now4);

package/dist/index.mjs

@@ -20458,46 +20458,56 @@ var useWorkspaceUptimeTimeline = (options) => {
     refetch: fetchTimeline
   };
 };
-function useDateFormatter() {
+function useDateFormatter(timezoneOverride) {
   const { defaultTimezone, defaultLocale, dateFormatOptions, timeFormatOptions, dateTimeFormatOptions } = useDateTimeConfig();
+  const resolvedTimezone = timezoneOverride || defaultTimezone || "UTC";
   const formatDate2 = useCallback(
     (date, formatString) => {
       const dateObj = typeof date === "string" ? parseISO(date) : date;
       if (!isValid(dateObj)) return "Invalid Date";
-      const tz = defaultTimezone || "UTC";
+      const tz = resolvedTimezone;
       if (formatString) {
         return formatInTimeZone(dateObj, tz, formatString);
       }
       const effectiveOptions = dateFormatOptions || { year: "numeric", month: "short", day: "numeric" };
-      return new Intl.DateTimeFormat(defaultLocale || "en-US", effectiveOptions).format(dateObj);
+      return new Intl.DateTimeFormat(defaultLocale || "en-US", {
+        ...effectiveOptions,
+        timeZone: tz
+      }).format(dateObj);
     },
-    [defaultTimezone, defaultLocale, dateFormatOptions]
+    [resolvedTimezone, defaultLocale, dateFormatOptions]
   );
   const formatTime5 = useCallback(
     (date, formatString) => {
       const dateObj = typeof date === "string" ? parseISO(date) : date;
       if (!isValid(dateObj)) return "Invalid Time";
-      const tz = defaultTimezone || "UTC";
+      const tz = resolvedTimezone;
       if (formatString) {
         return formatInTimeZone(dateObj, tz, formatString);
       }
       const effectiveOptions = timeFormatOptions || { hour: "numeric", minute: "numeric" };
-      return new Intl.DateTimeFormat(defaultLocale || "en-US", effectiveOptions).format(dateObj);
+      return new Intl.DateTimeFormat(defaultLocale || "en-US", {
+        ...effectiveOptions,
+        timeZone: tz
+      }).format(dateObj);
     },
-    [defaultTimezone, defaultLocale, timeFormatOptions]
+    [resolvedTimezone, defaultLocale, timeFormatOptions]
   );
   const formatDateTime = useCallback(
     (date, formatString) => {
       const dateObj = typeof date === "string" ? parseISO(date) : date;
       if (!isValid(dateObj)) return "Invalid Date/Time";
-      const tz = defaultTimezone || "UTC";
+      const tz = resolvedTimezone;
       if (formatString) {
         return formatInTimeZone(dateObj, tz, formatString);
       }
       const effectiveOptions = dateTimeFormatOptions || { year: "numeric", month: "short", day: "numeric", hour: "numeric", minute: "numeric" };
-      return new Intl.DateTimeFormat(defaultLocale || "en-US", effectiveOptions).format(dateObj);
+      return new Intl.DateTimeFormat(defaultLocale || "en-US", {
+        ...effectiveOptions,
+        timeZone: tz
+      }).format(dateObj);
     },
-    [defaultTimezone, defaultLocale, dateTimeFormatOptions]
+    [resolvedTimezone, defaultLocale, dateTimeFormatOptions]
   );
   const getNow = useCallback(() => {
     return /* @__PURE__ */ new Date();
@@ -20507,7 +20517,7 @@ function useDateFormatter() {
     formatTime: formatTime5,
     formatDateTime,
     getNow,
-    timezone: defaultTimezone || "UTC",
+    timezone: resolvedTimezone,
     locale: defaultLocale || "en-US"
   };
 }
@@ -40236,14 +40246,16 @@ var DateTimeDisplay = ({
   const {
     defaultTimezone
   } = useDateTimeConfig();
-  const { formatDate: formatDate2, formatTime: formatTime5 } = useDateFormatter();
-  const [now4, setNow] = useState(() => getCurrentTimeInZone(defaultTimezone || "UTC"));
+  const appTimezone = useAppTimezone();
+  const timezone = appTimezone || defaultTimezone || "UTC";
+  const { formatDate: formatDate2, formatTime: formatTime5 } = useDateFormatter(timezone);
+  const [now4, setNow] = useState(() => /* @__PURE__ */ new Date());
   useEffect(() => {
     const timerId = setInterval(() => {
-      setNow(getCurrentTimeInZone(defaultTimezone || "UTC"));
+      setNow(/* @__PURE__ */ new Date());
     }, 1e3);
     return () => clearInterval(timerId);
-  }, [defaultTimezone]);
+  }, []);
   if (!showDate && !showTime) {
     return null;
   }
@@ -42765,9 +42777,9 @@ var TimeDisplay = ({ className, variant = "default" }) => {
         minute: "2-digit",
         second: "2-digit",
         hour12: true,
-        timeZone: timezoneToDisplay,
-        ...dateTimeConfig?.timeFormatOptions || {}
+        ...dateTimeConfig?.timeFormatOptions || {},
         // Allow override from config
+        timeZone: timezoneToDisplay
       };
       try {
         setTime(new Intl.DateTimeFormat(localeToUse, effectiveFormatOptions).format(now4));
@@ -42810,7 +42822,8 @@ var TimeDisplay_default = TimeDisplay;
 var DateDisplay = ({ className, variant = "default" }) => {
   const { dateTimeConfig } = useDashboardConfig();
   const [date, setDate] = useState("");
-  const timezoneToDisplay = dateTimeConfig?.defaultTimezone || "UTC";
+  const dbTimezone = useAppTimezone();
+  const timezoneToDisplay = dbTimezone || dateTimeConfig?.defaultTimezone || "UTC";
   const localeToUse = dateTimeConfig?.defaultLocale || "en-US";
   useEffect(() => {
     const getCurrentFormattedDate = () => {
@@ -42819,9 +42832,9 @@ var DateDisplay = ({ className, variant = "default" }) => {
         weekday: "short",
         day: "numeric",
         month: "short",
-        timeZone: timezoneToDisplay,
-        ...dateTimeConfig?.dateFormatOptions || {}
+        ...dateTimeConfig?.dateFormatOptions || {},
         // Allow override from config
+        timeZone: timezoneToDisplay
       };
       try {
         return new Intl.DateTimeFormat(localeToUse, effectiveFormatOptions).format(now4);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optifye/dashboard-core",
-  "version": "6.12.32",
+  "version": "6.12.33",
   "description": "Reusable UI & logic for Optifye dashboard",
   "main": "dist/index.js",
   "module": "dist/index.mjs",