Skip to content

Email for professionals and teams

Improve UI

Hieu Nguyen (Jack)a65c8779c2d1
diff --git a/src/app/(calendar)/booking/page.tsx b/src/app/(calendar)/booking/page.tsx
index 0ad242f..c86833d 100644
--- a/src/app/(calendar)/booking/page.tsx
+++ b/src/app/(calendar)/booking/page.tsx
@@ -7,7 +7,7 @@ import clsx from "clsx";
import { CalendarDays, Check, Clock3, Copy, ExternalLink, MapPin, MoreHorizontal, Plus } from "lucide-react";
import toast, { Toaster } from "react-hot-toast";
import { Button } from "@/components/ui/button";
-import { RouteLoadingBar } from "@/components/route-loading-bar";
+import { RouteLoadingBarPortal } from "@/components/route-loading-bar-portal";
import { authFetch } from "@/lib/auth/client";
import { getUserTimeZone } from "@/lib/time/utils";
import { useSidebar } from "@/components/sidebar-state";
@@ -111,7 +111,7 @@ export default function BookingsPage() {
return <div className={clsx("flex h-full min-h-0 flex-col bg-[#f6f8fc] pl-3 max-md:pl-0 transition-[gap] duration-200 ease-in-out motion-reduce:transition-none lg:flex-row", minimal ? "gap-0" : "gap-3")}>
<Toaster position="bottom-right" />
- {loading && <RouteLoadingBar />}
+ {loading && <RouteLoadingBarPortal />}
<UpcomingSidebar />
<section className="min-h-0 min-w-0 flex-1 overflow-hidden overscroll-contain max-md:rounded-t-3xl max-md:bg-white">
<div className="flex h-full min-h-0 min-w-0">
diff --git a/src/app/(calendar)/calendar/page.tsx b/src/app/(calendar)/calendar/page.tsx
index 9fa8209..edcd3c4 100644
--- a/src/app/(calendar)/calendar/page.tsx
+++ b/src/app/(calendar)/calendar/page.tsx
@@ -11,7 +11,7 @@ import { mobilePrimaryActionClass } from "@/components/page-header-utils";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea";
-import { RouteLoadingBar } from "@/components/route-loading-bar";
+import { RouteLoadingBarPortal } from "@/components/route-loading-bar-portal";
import { authFetch } from "@/lib/auth/client";
import { formatUserDate, getUserTimeZone, parseUserDateTimeLocal } from "@/lib/time/utils";
import { normalizeCalendarColor } from "@/lib/calendar/colors";
@@ -350,7 +350,7 @@ export default function CalendarPage() {
return (
<div className={clsx("flex h-full min-h-0 flex-col bg-[#f6f8fc] pl-3 max-md:pl-0 lg:flex-row transition-[gap] duration-200 ease-in-out motion-reduce:transition-none", minimal ? "gap-0" : "gap-3")}>
<Toaster position="bottom-right" />
- {loading && <RouteLoadingBar />}
+ {loading && <RouteLoadingBarPortal />}
{headerTarget && createPortal(
<div className="flex min-w-0 flex-1 items-center justify-between gap-3 ">
<div className="flex shrink-0 items-center gap-2">
diff --git a/src/components/route-loading-bar-portal.tsx b/src/components/route-loading-bar-portal.tsx
new file mode 100644
index 0000000..809849d
--- /dev/null
+++ b/src/components/route-loading-bar-portal.tsx
@@ -0,0 +1,13 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { createPortal } from "react-dom";
+import { RouteLoadingBar } from "./route-loading-bar";
+
+// Pinned to the viewport top even when an ancestor's transform (e.g. a page transition) would otherwise become the fixed containing block.
+export function RouteLoadingBarPortal() {
+ const [mounted, setMounted] = useState(false);
+ useEffect(() => setMounted(true), []);
+ if (!mounted) return <RouteLoadingBar />;
+ return createPortal(<RouteLoadingBar />, document.body);
+}