Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Show message threads instead of the profile panel on mobile (#4777)

Steven Teyc9521d153bda
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx
index 4350be6e38..3c01eb9367 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx
@@ -18,10 +18,12 @@ import {
COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,
INACTIVE_ENROLLMENT_STATUSES,
} from "@/lib/zod/schemas/partners";
+import { messageSidePanelClassName } from "@/ui/messages/message-side-panel";
import { useMessagesContext } from "@/ui/messages/messages-context";
import { MessagesPanel } from "@/ui/messages/messages-panel";
import { appendPersistedMessage } from "@/ui/messages/optimistic-message";
import { ToggleSidePanelButton } from "@/ui/messages/toggle-side-panel-button";
+import { useMessageSidePanel } from "@/ui/messages/use-message-side-panel";
import { ProgramHelpLinks } from "@/ui/partners/program-help-links";
import { ProgramRewardsPanel } from "@/ui/partners/program-rewards-panel";
import { X } from "@/ui/shared/icons";
@@ -47,7 +49,7 @@ import {
import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
import { redirect, useParams } from "next/navigation";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
import { toast } from "sonner";
import { v4 as uuid } from "uuid";
@@ -79,7 +81,11 @@ export default function PartnerMessagesProgramPage() {
} = useProgramMessages({
query: { programSlug, sortOrder: "asc" },
swrOpts: {
+ // Don't keep the previous program's thread visible while the next one loads.
+ keepPreviousData: false,
onSuccess: async (data) => {
+ if (data?.[0]?.program.slug !== programSlug) return;
+
// Mark unread messages from the program as read
if (
!isMarkingProgramMessagesRead &&
@@ -96,8 +102,18 @@ export default function PartnerMessagesProgramPage() {
},
});
- const program = programMessages?.[0]?.program;
- const messages = programMessages?.[0]?.messages;
+ const { programMessages: inbox } = useProgramMessages({
+ query: { messagesLimit: 1 },
+ });
+
+ const thread =
+ programMessages?.[0]?.program.slug === programSlug
+ ? programMessages[0]
+ : undefined;
+ const program =
+ thread?.program ??
+ inbox?.find((group) => group.program.slug === programSlug)?.program;
+ const messages = thread?.messages;
const isInactiveEnrollment =
programEnrollment?.status &&
@@ -159,6 +175,12 @@ export default function PartnerMessagesProgramPage() {
const [pendingAttachments, setPendingAttachments] = useState<
PendingAttachment[]
>([]);
+ const [draftProgramSlug, setDraftProgramSlug] = useState(programSlug);
+
+ if (draftProgramSlug !== programSlug) {
+ setDraftProgramSlug(programSlug);
+ setPendingAttachments([]);
+ }
const handleAddFiles = useCallback(
async (files: File[]) => {
@@ -224,8 +246,16 @@ export default function PartnerMessagesProgramPage() {
setPendingAttachments((prev) => prev.filter((a) => a.id !== id));
}, []);
- const { setCurrentPanel } = useMessagesContext();
- const [isRightPanelOpen, setIsRightPanelOpen] = useState(true);
+ const { setCurrentPanel, openingThreadId, setLoadedThreadId } =
+ useMessagesContext();
+ const { isRightPanelOpen, setIsRightPanelOpen, toggleRightPanel } =
+ useMessageSidePanel();
+ const showingOpenedThread =
+ !openingThreadId || openingThreadId === programSlug;
+
+ useEffect(() => {
+ if (showingOpenedThread && messages) setLoadedThreadId(programSlug);
+ }, [showingOpenedThread, messages, programSlug, setLoadedThreadId]);
// Redirect if no messages and not enrolled, or messages error
if (
@@ -255,7 +285,7 @@ export default function PartnerMessagesProgramPage() {
<div className="min-w-0">
<button
type="button"
- onClick={() => setIsRightPanelOpen((o) => !o)}
+ onClick={toggleRightPanel}
disabled={!programEnrollment}
className="-mx-2 -my-1 flex items-center gap-2 rounded-lg px-2.5 py-1.5 transition-colors duration-100 enabled:hover:bg-black/5 enabled:active:bg-black/10"
>
@@ -282,7 +312,7 @@ export default function PartnerMessagesProgramPage() {
{programEnrollment ? (
<ToggleSidePanelButton
isOpen={isRightPanelOpen}
- onClick={() => setIsRightPanelOpen((o) => !o)}
+ onClick={toggleRightPanel}
/>
) : programEnrollmentError ? (
<ViewProgramButton programSlug={programSlug} />
@@ -297,7 +327,12 @@ export default function PartnerMessagesProgramPage() {
) : (
<div className="min-h-0 grow">
<MessagesPanel
- messages={messages && partner && user ? messages : undefined}
+ key={programSlug}
+ messages={
+ showingOpenedThread && messages && partner && user
+ ? messages
+ : undefined
+ }
error={errorMessages}
currentUserType="partner"
currentUserId={partner?.id || ""}
@@ -407,13 +442,7 @@ export default function PartnerMessagesProgramPage() {
</div>
{/* Right panel - Profile */}
- <div
- className={cn(
- "absolute right-0 top-0 h-full min-h-0 w-0 overflow-hidden bg-white shadow-lg transition-[width]",
- "@[1082px]/page:shadow-none @[1082px]/page:relative",
- isRightPanelOpen && "w-full sm:w-[400px]",
- )}
- >
+ <div className={messageSidePanelClassName(isRightPanelOpen, "partner")}>
<div className="border-border-subtle flex size-full min-h-0 w-full flex-col border-l sm:w-[400px]">
<div className="border-border-subtle flex h-12 shrink-0 items-center justify-between gap-4 border-b px-4 sm:h-16 sm:px-6">
<h2 className="text-content-emphasis text-lg font-semibold leading-7">
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx
index 0abefe9ffb..92a89ef37b 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx
@@ -5,7 +5,7 @@ import { NavButton } from "@/ui/layout/page-content/nav-button";
import { MessagesContext, MessagesPanel } from "@/ui/messages/messages-context";
import { MessagesList } from "@/ui/messages/messages-list";
import { ProgramSelector } from "@/ui/partners/program-selector";
-import { Button, InfoTooltip, useRouterStuff } from "@dub/ui";
+import { Button, InfoTooltip, LoadingSpinner, useRouterStuff } from "@dub/ui";
import { Msgs, Pen2 } from "@dub/ui/icons";
import { useParams, useRouter } from "next/navigation";
import { CSSProperties, ReactNode, useEffect, useState } from "react";
@@ -23,13 +23,34 @@ export default function MessagesLayout({ children }: { children: ReactNode }) {
const [currentPanel, setCurrentPanel] = useState<MessagesPanel>(
programSlug ? "main" : "index",
);
+ const [openingThreadId, setOpeningThreadId] = useState<string | null>(null);
+ const [loadedThreadId, setLoadedThreadId] = useState<string | null>(null);
+ const showThreadSpinner = Boolean(
+ openingThreadId && openingThreadId !== loadedThreadId,
+ );
useEffect(() => {
searchParams.get("new") && setCurrentPanel("main");
}, [searchParams.get("new")]);
+ useEffect(() => {
+ if (!programSlug) {
+ setOpeningThreadId(null);
+ setLoadedThreadId(null);
+ }
+ }, [programSlug]);
+
return (
- <MessagesContext.Provider value={{ currentPanel, setCurrentPanel }}>
+ <MessagesContext.Provider
+ value={{
+ currentPanel,
+ setCurrentPanel,
+ openingThreadId,
+ setOpeningThreadId,
+ loadedThreadId,
+ setLoadedThreadId,
+ }}
+ >
<div className="@container/page h-[calc(100dvh-var(--page-banner-height)-var(--page-top-margin)-var(--page-bottom-margin)-1px)] w-full overflow-hidden rounded-t-[inherit] bg-white">
<div
className="@[800px]/page:grid-cols-[min-content_minmax(340px,1fr)] @[800px]/page:translate-x-0 grid h-full translate-x-[calc(var(--current-panel)*-100%)] grid-cols-[100%_100%]"
@@ -57,9 +78,13 @@ export default function MessagesLayout({ children }: { children: ReactNode }) {
</div>
<ProgramSelector
selectedProgramSlug={programSlug ?? null}
- setSelectedProgramSlug={(slug) =>
- router.push(`/messages/${slug}`)
- }
+ setSelectedProgramSlug={(slug) => {
+ if (slug !== programSlug) {
+ setCurrentPanel("main");
+ setOpeningThreadId(slug);
+ }
+ router.push(`/messages/${slug}`);
+ }}
trigger={
<Button
type="button"
@@ -111,8 +136,13 @@ export default function MessagesLayout({ children }: { children: ReactNode }) {
</div>
</div>
- <div className="border-border-subtle @[800px]/page:border-l size-full min-h-0">
+ <div className="border-border-subtle @[800px]/page:border-l relative size-full min-h-0">
{children}
+ {showThreadSpinner && (
+ <div className="absolute inset-0 z-10 flex items-center justify-center bg-white">
+ <LoadingSpinner />
+ </div>
+ )}
</div>
</div>
</div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
index c87381f16b..52f03c9134 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
@@ -11,10 +11,12 @@ import usePartner from "@/lib/swr/use-partner";
import useProgram from "@/lib/swr/use-program";
import useUser from "@/lib/swr/use-user";
import useWorkspace from "@/lib/swr/use-workspace";
+import { messageSidePanelClassName } from "@/ui/messages/message-side-panel";
import { useMessagesContext } from "@/ui/messages/messages-context";
import { MessagesPanel } from "@/ui/messages/messages-panel";
import { appendPersistedMessage } from "@/ui/messages/optimistic-message";
import { ToggleSidePanelButton } from "@/ui/messages/toggle-side-panel-button";
+import { useMessageSidePanel } from "@/ui/messages/use-message-side-panel";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { PartnerInfoGroup } from "@/ui/partners/partner-info-group";
import { PartnerInfoSection } from "@/ui/partners/partner-info-section";
@@ -27,7 +29,7 @@ import { cn } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
import { redirect, useParams, useSearchParams } from "next/navigation";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
import { toast } from "sonner";
import { v4 as uuid } from "uuid";
@@ -59,7 +61,11 @@ export function ProgramMessagesPartnerPageClient() {
} = usePartnerMessages({
query: { partnerId, sortOrder: "asc" },
swrOpts: {
+ // Don't keep the previous partner's thread visible while the next one loads.
+ keepPreviousData: false,
onSuccess: async (data) => {
+ if (data?.[0]?.partner.id !== partnerId) return;
+
// Mark unread messages from the partner as read
if (
!isMarkingPartnerMessagesRead &&
@@ -77,8 +83,18 @@ export function ProgramMessagesPartnerPageClient() {
},
});
- const partner = partnerMessages?.[0]?.partner;
- const messages = partnerMessages?.[0]?.messages;
+ const { partnerMessages: inbox } = usePartnerMessages({
+ query: { messagesLimit: 1 },
+ });
+
+ const thread =
+ partnerMessages?.[0]?.partner.id === partnerId
+ ? partnerMessages[0]
+ : undefined;
+ const partner =
+ thread?.partner ??
+ inbox?.find((group) => group.partner.id === partnerId)?.partner;
+ const messages = thread?.messages;
const { executeAsync: sendMessage } = useAction(messagePartnerAction, {
onError({ error }) {
@@ -98,6 +114,12 @@ export function ProgramMessagesPartnerPageClient() {
const [pendingAttachments, setPendingAttachments] = useState<
PendingAttachment[]
>([]);
+ const [draftPartnerId, setDraftPartnerId] = useState(partnerId);
+
+ if (draftPartnerId !== partnerId) {
+ setDraftPartnerId(partnerId);
+ setPendingAttachments([]);
+ }
const handleAddFiles = useCallback(
async (files: File[]) => {
@@ -163,8 +185,15 @@ export function ProgramMessagesPartnerPageClient() {
setPendingAttachments((prev) => prev.filter((a) => a.id !== id));
}, []);
- const { setCurrentPanel } = useMessagesContext();
- const [isRightPanelOpen, setIsRightPanelOpen] = useState(true);
+ const { setCurrentPanel, openingThreadId, setLoadedThreadId } =
+ useMessagesContext();
+ const { isRightPanelOpen, setIsRightPanelOpen, toggleRightPanel } =
+ useMessageSidePanel();
+ const showingOpenedThread = !openingThreadId || openingThreadId === partnerId;
+
+ useEffect(() => {
+ if (showingOpenedThread && messages) setLoadedThreadId(partnerId);
+ }, [showingOpenedThread, messages, partnerId, setLoadedThreadId]);
if (errorMessages) redirect(`/${workspaceSlug}/program/messages`);
@@ -189,7 +218,7 @@ export function ProgramMessagesPartnerPageClient() {
</button>
<button
type="button"
- onClick={() => setIsRightPanelOpen((o) => !o)}
+ onClick={toggleRightPanel}
disabled={!enrolledPartner}
className="-mx-2 -my-1 flex items-center gap-2 rounded-lg px-2 py-1 transition-colors duration-100 enabled:hover:bg-black/5 enabled:active:bg-black/10"
>
@@ -211,7 +240,7 @@ export function ProgramMessagesPartnerPageClient() {
{enrolledPartner ? (
<ToggleSidePanelButton
isOpen={isRightPanelOpen}
- onClick={() => setIsRightPanelOpen((o) => !o)}
+ onClick={toggleRightPanel}
/>
) : enrolledPartnerError ? (
<ViewPartnerButton partnerId={partnerId} isEnrolled={false} />
@@ -219,7 +248,10 @@ export function ProgramMessagesPartnerPageClient() {
</div>
<div className="min-h-0 grow">
<MessagesPanel
- messages={messages && user ? messages : undefined}
+ key={partnerId}
+ messages={
+ showingOpenedThread && messages && user ? messages : undefined
+ }
error={errorMessages}
currentUserType="user"
currentUserId={user?.id || ""}
@@ -318,13 +350,7 @@ export function ProgramMessagesPartnerPageClient() {
</div>
{/* Right panel - Profile */}
- <div
- className={cn(
- "absolute right-0 top-0 h-full min-h-0 w-0 overflow-hidden bg-white shadow-lg transition-[width]",
- "@[960px]/page:shadow-none @[960px]/page:relative",
- isRightPanelOpen && "w-full sm:w-[340px]",
- )}
- >
+ <div className={messageSidePanelClassName(isRightPanelOpen, "program")}>
<div className="border-border-subtle flex size-full min-h-0 w-full flex-col border-l sm:w-[340px]">
<div className="border-border-subtle flex h-12 shrink-0 items-center justify-between gap-4 border-b px-4 sm:h-16 sm:px-6">
<h2 className="text-content-emphasis text-lg font-semibold leading-7">
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
index 21d3e0400d..99105b17d8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
@@ -10,10 +10,10 @@ import { NavButton } from "@/ui/layout/page-content/nav-button";
import { MessagesContext, MessagesPanel } from "@/ui/messages/messages-context";
import { MessagesList } from "@/ui/messages/messages-list";
import { PartnerSelector } from "@/ui/partners/partner-selector";
-import { Button, InfoTooltip } from "@dub/ui";
+import { Button, InfoTooltip, LoadingSpinner } from "@dub/ui";
import { Msgs, Pen2 } from "@dub/ui/icons";
import { useParams, useRouter } from "next/navigation";
-import { CSSProperties, ReactNode, useState } from "react";
+import { CSSProperties, ReactNode, useEffect, useState } from "react";
import { MessagesUpsell } from "./messages-upsell";
export default function MessagesLayout({ children }: { children: ReactNode }) {
@@ -48,9 +48,30 @@ function CapableLayout({ children }: { children: ReactNode }) {
const [currentPanel, setCurrentPanel] = useState<MessagesPanel>(
partnerId ? "main" : "index",
);
+ const [openingThreadId, setOpeningThreadId] = useState<string | null>(null);
+ const [loadedThreadId, setLoadedThreadId] = useState<string | null>(null);
+ const showThreadSpinner = Boolean(
+ openingThreadId && openingThreadId !== loadedThreadId,
+ );
+
+ useEffect(() => {
+ if (!partnerId) {
+ setOpeningThreadId(null);
+ setLoadedThreadId(null);
+ }
+ }, [partnerId]);
return (
- <MessagesContext.Provider value={{ currentPanel, setCurrentPanel }}>
+ <MessagesContext.Provider
+ value={{
+ currentPanel,
+ setCurrentPanel,
+ openingThreadId,
+ setOpeningThreadId,
+ loadedThreadId,
+ setLoadedThreadId,
+ }}
+ >
<div className="@container/page h-[calc(100dvh-var(--page-banner-height)-var(--page-top-margin)-var(--page-bottom-margin)-1px)] w-full overflow-hidden rounded-t-[inherit] bg-white">
<div
className="@[800px]/page:grid-cols-[min-content_minmax(340px,1fr)] @[800px]/page:translate-x-0 grid h-full translate-x-[calc(var(--current-panel)*-100%)] grid-cols-[100%_100%]"
@@ -87,9 +108,13 @@ function CapableLayout({ children }: { children: ReactNode }) {
) : (
<PartnerSelector
selectedPartnerId={partnerId ?? null}
- setSelectedPartnerId={(id) =>
- router.push(`/${workspaceSlug}/program/messages/${id}`)
- }
+ setSelectedPartnerId={(id) => {
+ if (id !== partnerId) {
+ setCurrentPanel("main");
+ setOpeningThreadId(id);
+ }
+ router.push(`/${workspaceSlug}/program/messages/${id}`);
+ }}
trigger={
<Button
type="button"
@@ -140,8 +165,13 @@ function CapableLayout({ children }: { children: ReactNode }) {
</div>
</div>
- <div className="border-border-subtle @[800px]/page:border-l size-full min-h-0">
+ <div className="border-border-subtle @[800px]/page:border-l relative size-full min-h-0">
{children}
+ {showThreadSpinner && (
+ <div className="absolute inset-0 z-10 flex items-center justify-center bg-white">
+ <LoadingSpinner />
+ </div>
+ )}
</div>
</div>
</div>
diff --git a/apps/web/ui/messages/message-side-panel.ts b/apps/web/ui/messages/message-side-panel.ts
new file mode 100644
index 0000000000..e5cd1e4198
--- /dev/null
+++ b/apps/web/ui/messages/message-side-panel.ts
@@ -0,0 +1,42 @@
+import { cn } from "@dub/utils";
+
+/**
+ * `null` is the responsive default: the panel stays closed below the `sm`
+ * breakpoint (where it is full-width) and open from `sm` up.
+ */
+export type MessageSidePanelState = boolean | null;
+
+export function nextMessageSidePanelOpen(
+ isOpen: MessageSidePanelState,
+ isAtLeastSm: boolean,
+) {
+ return !(isOpen ?? isAtLeastSm);
+}
+
+const PANEL_WIDTH = {
+ program: {
+ // Full class strings so Tailwind can see them.
+ open: "w-full sm:w-[340px]",
+ responsive: "sm:w-[340px]",
+ inline: "@[960px]/page:shadow-none @[960px]/page:relative",
+ },
+ partner: {
+ open: "w-full sm:w-[400px]",
+ responsive: "sm:w-[400px]",
+ inline: "@[1082px]/page:shadow-none @[1082px]/page:relative",
+ },
+} as const;
+
+export function messageSidePanelClassName(
+ isOpen: MessageSidePanelState,
+ variant: keyof typeof PANEL_WIDTH,
+) {
+ const panel = PANEL_WIDTH[variant];
+
+ return cn(
+ "absolute right-0 top-0 h-full min-h-0 w-0 overflow-hidden bg-white shadow-lg transition-[width]",
+ panel.inline,
+ isOpen === true && panel.open,
+ isOpen === null && panel.responsive,
+ );
+}
diff --git a/apps/web/ui/messages/messages-context.tsx b/apps/web/ui/messages/messages-context.tsx
index 06a55feb90..7c4066e6a6 100644
--- a/apps/web/ui/messages/messages-context.tsx
+++ b/apps/web/ui/messages/messages-context.tsx
@@ -5,9 +5,19 @@ export type MessagesPanel = "index" | "main";
export const MessagesContext = createContext<{
currentPanel: MessagesPanel;
setCurrentPanel: Dispatch<SetStateAction<MessagesPanel>>;
+ /** Thread the user just opened. Covers the pane until its messages are ready. */
+ openingThreadId: string | null;
+ setOpeningThreadId: Dispatch<SetStateAction<string | null>>;
+ /** Thread whose messages are currently safe to show. */
+ loadedThreadId: string | null;
+ setLoadedThreadId: Dispatch<SetStateAction<string | null>>;
}>({
currentPanel: "index",
setCurrentPanel: () => {},
+ openingThreadId: null,
+ setOpeningThreadId: () => {},
+ loadedThreadId: null,
+ setLoadedThreadId: () => {},
});
export function useMessagesContext() {
diff --git a/apps/web/ui/messages/messages-list.tsx b/apps/web/ui/messages/messages-list.tsx
index 43ac12d335..d5aab26c77 100644
--- a/apps/web/ui/messages/messages-list.tsx
+++ b/apps/web/ui/messages/messages-list.tsx
@@ -31,7 +31,7 @@ export function MessagesList({
| undefined;
activeId?: string;
}) {
- const { setCurrentPanel } = useMessagesContext();
+ const { setCurrentPanel, setOpeningThreadId } = useMessagesContext();
return (
<div className="flex w-full flex-col">
@@ -43,7 +43,10 @@ export function MessagesList({
<Link
key={group.id}
href={group.href}
- onClick={() => setCurrentPanel("main")}
+ onClick={() => {
+ setCurrentPanel("main");
+ if (group.id !== activeId) setOpeningThreadId(group.id);
+ }}
className={cn(
"border-border-subtle flex w-full items-center gap-2.5 border-b bg-white px-6 py-4",
group.id === activeId ? "bg-bg-subtle" : "hover:bg-bg-muted",
diff --git a/apps/web/ui/messages/toggle-side-panel-button.tsx b/apps/web/ui/messages/toggle-side-panel-button.tsx
index 53f2a5275e..8ea56864a1 100644
--- a/apps/web/ui/messages/toggle-side-panel-button.tsx
+++ b/apps/web/ui/messages/toggle-side-panel-button.tsx
@@ -7,7 +7,8 @@ export function ToggleSidePanelButton({
onClick,
}: {
side?: "left" | "right";
- isOpen: boolean;
+ // `null` follows the responsive default: closed below `sm`, open from `sm` up.
+ isOpen: boolean | null;
onClick: () => void;
}) {
return (
@@ -42,7 +43,8 @@ export function ToggleSidePanelButton({
strokeWidth="1.5"
className={cn(
"transition-transform [transform-box:fill-box] [transform-origin:center] [vector-effect:non-scaling-stroke]",
- !isOpen && "-scale-x-100",
+ isOpen === false && "-scale-x-100",
+ isOpen === null && "max-sm:-scale-x-100",
)}
/>
<rect
diff --git a/apps/web/ui/messages/use-message-side-panel.ts b/apps/web/ui/messages/use-message-side-panel.ts
new file mode 100644
index 0000000000..d9dfa6ba1e
--- /dev/null
+++ b/apps/web/ui/messages/use-message-side-panel.ts
@@ -0,0 +1,26 @@
+"use client";
+
+import { useCallback, useState } from "react";
+import {
+ MessageSidePanelState,
+ nextMessageSidePanelOpen,
+} from "./message-side-panel";
+
+// Matches Tailwind's `sm` breakpoint, where the panel stops being full-width.
+const SIDE_PANEL_OPEN_QUERY = "(min-width: 640px)";
+
+export function useMessageSidePanel() {
+ const [isRightPanelOpen, setIsRightPanelOpen] =
+ useState<MessageSidePanelState>(null);
+
+ const toggleRightPanel = useCallback(() => {
+ setIsRightPanelOpen((open) =>
+ nextMessageSidePanelOpen(
+ open,
+ window.matchMedia(SIDE_PANEL_OPEN_QUERY).matches,
+ ),
+ );
+ }, []);
+
+ return { isRightPanelOpen, setIsRightPanelOpen, toggleRightPanel };
+}