Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

✨ Apply clock preference changes instantly without a refresh (#2520)

Luke Vella7a9c5e093b70
diff --git a/apps/web/src/app/[locale]/(optional-space)/layout.tsx b/apps/web/src/app/[locale]/(optional-space)/layout.tsx
index 9aa585fcd..3f0964e27 100644
--- a/apps/web/src/app/[locale]/(optional-space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/layout.tsx
@@ -3,7 +3,7 @@ import { SessionRefresher } from "@/components/session-refresher";
import { PreferencesProvider } from "@/contexts/preferences";
import { PayWall } from "@/features/billing/components/pay-wall";
import { isQuickCreateEnabled } from "@/features/quick-create";
-import { DateTimeProvider } from "@/lib/datetime/client";
+import { DeviceDateTimeProvider } from "@/lib/datetime/device";
import { getDeviceDateTimeConfig } from "@/lib/datetime/server";
import {
createPrivateSSRHelper,
@@ -29,7 +29,7 @@ export default async function Layout({
<HydrationBoundary state={dehydrate(helpers.queryClient)}>
<SessionRefresher />
<PreferencesProvider>
- <DateTimeProvider
+ <DeviceDateTimeProvider
timeZone={
deviceDateTimeConfig.timeZone ?? user?.timeZone ?? undefined
}
@@ -39,7 +39,7 @@ export default async function Layout({
>
{children}
<PayWall />
- </DateTimeProvider>
+ </DeviceDateTimeProvider>
</PreferencesProvider>
</HydrationBoundary>
);
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
index 08986c486..39b28c9d1 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
@@ -6,7 +6,7 @@ import { notFound } from "next/navigation";
import { cache } from "react";
import { SessionRefresher } from "@/components/session-refresher";
import { PermissionProvider } from "@/contexts/permissions";
-import { DateTimeProvider } from "@/lib/datetime/client";
+import { DeviceDateTimeProvider } from "@/lib/datetime/device";
import { getDeviceDateTimeConfig } from "@/lib/datetime/server";
import { LocaleSync } from "@/lib/locale/client";
import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";
@@ -68,7 +68,7 @@ export default async function Page(props: {
<HydrationBoundary state={dehydrate(trpc.queryClient)}>
<SessionRefresher />
<LocaleSync userLocale={user?.locale ?? undefined} />
- <DateTimeProvider
+ <DeviceDateTimeProvider
timeZone={deviceDateTimeConfig.timeZone}
timeFormat={deviceDateTimeConfig.timeFormat}
>
@@ -77,7 +77,7 @@ export default async function Page(props: {
<InvitePageLoader />
</PermissionProvider>
</Providers>
- </DateTimeProvider>
+ </DeviceDateTimeProvider>
</HydrationBoundary>
);
}
diff --git a/apps/web/src/components/clock.tsx b/apps/web/src/components/clock.tsx
index fbc97c3b9..31c654f34 100644
--- a/apps/web/src/components/clock.tsx
+++ b/apps/web/src/components/clock.tsx
@@ -11,7 +11,6 @@ import {
} from "@rallly/ui/dialog";
import { Label } from "@rallly/ui/label";
import { GlobeIcon } from "lucide-react";
-import { useRouter } from "next/navigation";
import React from "react";
import { useInterval } from "react-use";
import { TimeFormatPicker } from "@/components/time-format-picker";
@@ -19,23 +18,16 @@ import { TimeZoneSelect } from "@/components/time-zone-picker/time-zone-select";
import { getCityFromTimezoneId } from "@/components/time-zone-picker/timezone-data";
import { Trans } from "@/i18n/client";
import { useDateTimeConfig } from "@/lib/datetime/client";
-import {
- setDeviceTimeFormat,
- setTimeZoneOverride,
-} from "@/lib/datetime/device";
+import { useDeviceDateTime } from "@/lib/datetime/device";
+import { getLocaleDefaults } from "@/lib/datetime/locales";
import { Time } from "@/lib/datetime/time";
const TimePreferences = () => {
- const router = useRouter();
+ const { setTimeZone, setTimeFormat } = useDeviceDateTime();
const { locale, timeZone, timeFormat } = useDateTimeConfig();
// When there's no explicit preference, show the locale's default format.
- const resolvedTimeFormat =
- timeFormat ??
- (new Intl.DateTimeFormat(locale, { hour: "numeric" }).resolvedOptions()
- .hour12
- ? "hours12"
- : "hours24");
+ const resolvedTimeFormat = timeFormat ?? getLocaleDefaults(locale).timeFormat;
return (
<div className="grid gap-4">
@@ -43,25 +35,13 @@ const TimePreferences = () => {
<Label>
<Trans i18nKey="timeZone" />
</Label>
- <TimeZoneSelect
- value={timeZone}
- onValueChange={(newTimeZone) => {
- setTimeZoneOverride(newTimeZone);
- router.refresh();
- }}
- />
+ <TimeZoneSelect value={timeZone} onValueChange={setTimeZone} />
</div>
<div className="grid gap-2">
<Label>
<Trans i18nKey="timeFormat" />
</Label>
- <TimeFormatPicker
- value={resolvedTimeFormat}
- onChange={(newTimeFormat) => {
- setDeviceTimeFormat(newTimeFormat);
- router.refresh();
- }}
- />
+ <TimeFormatPicker value={resolvedTimeFormat} onChange={setTimeFormat} />
</div>
</div>
);
diff --git a/apps/web/src/lib/datetime/device.ts b/apps/web/src/lib/datetime/device.ts
deleted file mode 100644
index 31d707a02..000000000
--- a/apps/web/src/lib/datetime/device.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-"use client";
-
-import type { TimeFormat } from "@rallly/database";
-import Cookies from "js-cookie";
-import {
- TIME_FORMAT_COOKIE_NAME,
- TIME_ZONE_COOKIE_NAME,
- TIME_ZONE_OVERRIDE_COOKIE_NAME,
-} from "@/lib/datetime/constants";
-
-const cookieAttributes = {
- path: "/",
- sameSite: "lax",
- domain: process.env.NEXT_PUBLIC_COOKIE_DOMAIN,
-} as const;
-
-/**
- * Session-scoped zone override for viewing times in another zone; wins over
- * the detected zone (which TimeZoneSync keeps current). Picking the detected
- * zone clears the override so it can't pin a stale zone after travel.
- * No expiry: the override dies with the browser session.
- */
-export function setTimeZoneOverride(timeZone: string) {
- if (timeZone === Cookies.get(TIME_ZONE_COOKIE_NAME)) {
- Cookies.remove(TIME_ZONE_OVERRIDE_COOKIE_NAME, cookieAttributes);
- } else {
- Cookies.set(TIME_ZONE_OVERRIDE_COOKIE_NAME, timeZone, cookieAttributes);
- }
-}
-
-/** Per-device time format choice, read by getDeviceDateTimeConfig. */
-export function setDeviceTimeFormat(timeFormat: TimeFormat) {
- Cookies.set(TIME_FORMAT_COOKIE_NAME, timeFormat, {
- ...cookieAttributes,
- expires: 365,
- });
-}
diff --git a/apps/web/src/lib/datetime/device.tsx b/apps/web/src/lib/datetime/device.tsx
new file mode 100644
index 000000000..18ce5a3cc
--- /dev/null
+++ b/apps/web/src/lib/datetime/device.tsx
@@ -0,0 +1,96 @@
+"use client";
+
+import type { TimeFormat } from "@rallly/database";
+import Cookies from "js-cookie";
+import React from "react";
+import { DateTimeProvider } from "@/lib/datetime/client";
+import {
+ TIME_FORMAT_COOKIE_NAME,
+ TIME_ZONE_COOKIE_NAME,
+ TIME_ZONE_OVERRIDE_COOKIE_NAME,
+} from "@/lib/datetime/constants";
+
+const cookieAttributes = {
+ path: "/",
+ sameSite: "lax",
+ domain: process.env.NEXT_PUBLIC_COOKIE_DOMAIN,
+} as const;
+
+/**
+ * Session-scoped zone override for viewing times in another zone; wins over
+ * the detected zone (which TimeZoneSync keeps current). Picking the detected
+ * zone clears the override so it can't pin a stale zone after travel.
+ * No expiry: the override dies with the browser session.
+ */
+function setTimeZoneOverrideCookie(timeZone: string) {
+ if (timeZone === Cookies.get(TIME_ZONE_COOKIE_NAME)) {
+ Cookies.remove(TIME_ZONE_OVERRIDE_COOKIE_NAME, cookieAttributes);
+ } else {
+ Cookies.set(TIME_ZONE_OVERRIDE_COOKIE_NAME, timeZone, cookieAttributes);
+ }
+}
+
+function setTimeFormatCookie(timeFormat: TimeFormat) {
+ Cookies.set(TIME_FORMAT_COOKIE_NAME, timeFormat, {
+ ...cookieAttributes,
+ expires: 365,
+ });
+}
+
+type DeviceDateTime = {
+ setTimeZone: (timeZone: string) => void;
+ setTimeFormat: (timeFormat: TimeFormat) => void;
+};
+
+const DeviceDateTimeContext = React.createContext<DeviceDateTime | null>(null);
+
+/**
+ * DateTimeProvider for device-configured segments (public pages): the
+ * setters update state so the UI responds instantly, and persist to cookies
+ * so the next server render agrees. Seed it with the values from
+ * getDeviceDateTimeConfig.
+ */
+export function DeviceDateTimeProvider({
+ timeZone: initialTimeZone,
+ timeFormat: initialTimeFormat,
+ children,
+}: {
+ timeZone?: string;
+ timeFormat?: TimeFormat;
+ children: React.ReactNode;
+}) {
+ const [timeZone, setTimeZoneState] = React.useState(initialTimeZone);
+ const [timeFormat, setTimeFormatState] = React.useState(initialTimeFormat);
+
+ const value = React.useMemo<DeviceDateTime>(
+ () => ({
+ setTimeZone: (newTimeZone) => {
+ setTimeZoneState(newTimeZone);
+ setTimeZoneOverrideCookie(newTimeZone);
+ },
+ setTimeFormat: (newTimeFormat) => {
+ setTimeFormatState(newTimeFormat);
+ setTimeFormatCookie(newTimeFormat);
+ },
+ }),
+ [],
+ );
+
+ return (
+ <DeviceDateTimeContext.Provider value={value}>
+ <DateTimeProvider timeZone={timeZone} timeFormat={timeFormat}>
+ {children}
+ </DateTimeProvider>
+ </DeviceDateTimeContext.Provider>
+ );
+}
+
+export function useDeviceDateTime() {
+ const context = React.useContext(DeviceDateTimeContext);
+ if (!context) {
+ throw new Error(
+ "useDeviceDateTime must be used within a DeviceDateTimeProvider",
+ );
+ }
+ return context;
+}