Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): stabilize pending thread panels and header actions (#1001)

Gener1b2c594b31f1
diff --git a/src/web/src/components/community/channels/channel-header.skeleton.test.ts b/src/web/src/components/community/channels/channel-header.skeleton.test.ts
index 8fd321f8e..89f34065c 100644
--- a/src/web/src/components/community/channels/channel-header.skeleton.test.ts
+++ b/src/web/src/components/community/channels/channel-header.skeleton.test.ts
@@ -14,6 +14,16 @@ describe("ChannelHeaderSkeleton", () => {
expect(html).not.toContain("<button")
})
+ it("pre-emits both action slots in one pending thread header without interactive controls", () => {
+ const html = renderToStaticMarkup(createElement(ChannelHeaderSkeleton, { kind: "thread", layoutPending: true }))
+ expect(html.match(/data-slot="message-header-identity"/g)).toHaveLength(1)
+ expect(html.match(/data-slot="message-header-actions"/g)).toHaveLength(1)
+ expect(html.match(/data-thread-panel-actions/g)).toHaveLength(1)
+ expect(html.match(/data-channel-header-full/g)).toHaveLength(2)
+ expect(html.match(/data-slot="skeleton"/g)).toHaveLength(8)
+ expect(html).not.toContain("<button")
+ })
+
it("renders inert mobile Back geometry without interaction", () => {
const html = renderToStaticMarkup(createElement(ChannelHeaderSkeleton))
diff --git a/src/web/src/components/community/channels/channel-header.tsx b/src/web/src/components/community/channels/channel-header.tsx
index ed929ed4b..2bd10969e 100644
--- a/src/web/src/components/community/channels/channel-header.tsx
+++ b/src/web/src/components/community/channels/channel-header.tsx
@@ -21,6 +21,7 @@ import type { EntityKind } from "@/lib/community/models/navigation"
import { CreateDialogShell } from "../settings/create-dialog-shell"
import { tid } from "@/lib/community/testids"
import { MessageHeader, MessageHeaderMobileBack } from "./message-header"
+import { ThreadPanelActionsFrame } from "./thread-panel-actions"
// Skeleton header for the loading frame between route change and channel
// metadata arriving. Same h-12 footprint as <ChannelHeader> so the body below
@@ -28,9 +29,11 @@ import { MessageHeader, MessageHeaderMobileBack } from "./message-header"
export function ChannelHeaderSkeleton({
kind = "text",
compactActions = false,
+ layoutPending = false,
}: {
kind?: EntityKind
compactActions?: boolean
+ layoutPending?: boolean
} = {}) {
const actionCount = compactActions || kind === "forum" ? 2 : 3
return (
@@ -39,6 +42,7 @@ export function ChannelHeaderSkeleton({
<div
data-testid={tid.messageHeaderLeadingLoading}
data-slot="loading-mobile-leading"
+ data-channel-header-full={kind === "thread" || undefined}
aria-hidden
className={`grid size-11 shrink-0 place-items-center ${kind === "thread" && !compactActions ? "" : "sm:hidden"}`}
>
@@ -47,20 +51,26 @@ export function ChannelHeaderSkeleton({
)}
identity={(
<>
- <Skeleton className="size-6 rounded-md sm:ml-1" />
+ <Skeleton data-channel-header-icon className={`size-6 rounded-md ${kind === "thread" ? compactActions ? "ml-1" : "" : "sm:ml-1"}`} />
<Skeleton className="h-4 w-32 rounded" />
</>
)}
actions={(
<>
- {Array.from({ length: actionCount }).map((_, index) => (
- <span key={index} className="contents">
- {!compactActions && index === 1 && (
- <span className="mx-1 h-5 w-px bg-border/60" aria-hidden />
- )}
- <Skeleton className={index > 1 ? "ml-1 size-7 rounded-md" : "size-7 rounded-md"} />
- </span>
- ))}
+ {(!compactActions || kind !== "thread") && <span data-channel-header-full className="contents">
+ {Array.from({ length: actionCount }).map((_, index) => (
+ <span key={index} className="contents">
+ {!compactActions && index === 1 && (
+ <span className="mx-1 h-5 w-px bg-border/60" aria-hidden />
+ )}
+ <Skeleton className={index > 1 && kind !== "thread" ? "ml-1 size-7 rounded-md" : "size-7 rounded-md"} />
+ </span>
+ ))}
+ </span>}
+ {kind === "thread" && (compactActions || layoutPending) && <ThreadPanelActionsFrame>
+ <Skeleton className="size-7 rounded-md" />
+ <Skeleton className="size-7 rounded-md" />
+ </ThreadPanelActionsFrame>}
</>
)}
/>
@@ -106,34 +116,36 @@ export function ChannelHeader({
</Button>
)
const leading = (
- <>
+ <span data-channel-header-full className="contents">
{onBack && (
<Button variant="ghost" size="icon-sm" onClick={onBack} className="text-muted-foreground hover:text-foreground" aria-label="Back"><ChevronLeft className="size-5" /></Button>
)}
{mobileBack && <MessageHeaderMobileBack onNavigate={mobileBack} display={mobileBackDisplay} />}
- </>
+ </span>
)
const identity = (
<>
{server && <ServerCrumb id={server.id} name={server.name} icon={server.icon} size={6} className="ml-1" />}
- <div className={`grid size-6 shrink-0 place-items-center rounded-md bg-muted text-muted-foreground ${mobileBack ? (mobileBackDisplay === "viewport" ? "sm:ml-1" : "") : server ? "" : "ml-1"}`}>
+ <div data-channel-header-icon className={`grid size-6 shrink-0 place-items-center rounded-md bg-muted text-muted-foreground ${mobileBack ? (mobileBackDisplay === "viewport" ? "sm:ml-1" : "") : server ? "" : "ml-1"}`}>
<EntityIcon kind={kind} className="size-4" />
</div>
<span className="min-w-0 truncate text-base font-semibold" title={channel}>{channel}</span>
{onRename && (
- <HeaderRename
- label={channel}
- onRename={onRename}
- titleMode={titleRename}
- className={mobileBack ? "hidden sm:inline-flex" : undefined}
- />
+ <span data-channel-header-full className="contents">
+ <HeaderRename
+ label={channel}
+ onRename={onRename}
+ titleMode={titleRename}
+ className={mobileBack ? "hidden sm:inline-flex" : undefined}
+ />
+ </span>
)}
</>
)
const actions = (
<>
{!compactActions && (
- <>
+ <span data-channel-header-full className="contents">
{tools?.members !== false && tool("members", Users, "Member list")}
<span className="mx-1 h-5 w-px bg-border/60" aria-hidden />
<ChannelNotifDropdown level={notifLevel ?? USE_SERVER_DEFAULT} onSetLevel={onSetNotifLevel} />
@@ -145,7 +157,7 @@ export function ChannelHeader({
showPinned={tools?.pinned !== false}
/>
)}
- </>
+ </span>
)}
{endActions}
</>
diff --git a/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts b/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts
index 68f902bca..0d0b594ff 100644
--- a/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts
+++ b/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts
@@ -243,6 +243,7 @@ vi.mock("@/components/community/channels/thread-split-parent-surface", () => ({
vi.mock("@/components/community/channels/thread-split-view", () => ({
ThreadSplitView: ({
split,
+ layoutPending = false,
mobileBack = false,
preserveParent = false,
parent,
@@ -251,6 +252,7 @@ vi.mock("@/components/community/channels/thread-split-view", () => ({
resolvingParent,
}: {
split: boolean
+ layoutPending?: boolean
mobileBack?: boolean
preserveParent?: boolean
parent: React.ReactNode
@@ -262,11 +264,12 @@ vi.mock("@/components/community/channels/thread-split-view", () => ({
{
"data-testid": conversationSubtype === "thread" ? "community-thread-split" : undefined,
"data-mobile-back-thread": mobileBack || undefined,
- "data-layout": split ? resolvingParent ? "pending" : "split" : "full",
+ "data-layout": layoutPending || resolvingParent ? "pending" : split ? "split" : "full",
+ "data-layout-pending": layoutPending || undefined,
"data-community-conversation-subtype": conversationSubtype === "unknown" ? undefined : conversationSubtype,
},
resolvingParent && React.createElement("main", { "aria-label": "Resolving conversation", "data-community-conversation-subtype": "unknown" }),
- (split || mobileBack || preserveParent) && React.createElement(
+ (split || layoutPending || mobileBack || preserveParent) && React.createElement(
"section",
{ "data-testid": "community-thread-split-parent", "data-mobile-back-parent": "", inert: !split },
parent,
@@ -994,12 +997,39 @@ describe("ChannelRoute message surface ownership", () => {
}, false)
})
+ it.each(["unknown", "desktop"] as const)("prepares split actions before geometry resolves with breakpoint %s", (breakpoint) => {
+ configureThreadRoute()
+ mockBreakpoint.value = breakpoint
+ mockSplitMode.value = "pending"
+ const props = { serverParam: "server_1", channelId: "channel_1" }
+ const renderer = render(React.createElement(ChannelRoute, props))
+ const panel = screen.getByTestId("community-thread-split-panel")
+ const fullscreen = screen.getByTestId("community-thread-split-fullscreen")
+ const close = screen.getByTestId("community-thread-split-close")
+ expect(mockHeaderParentNavigate.current).toBeTypeOf("function")
+ mockBreakpoint.value = "desktop"
+ mockSplitMode.value = "split"
+ renderer.rerender(React.createElement(ChannelRoute, props))
+ expect(screen.getByTestId("community-thread-split-panel")).toBe(panel)
+ expect(screen.getByTestId("community-thread-split-fullscreen")).toBe(fullscreen)
+ expect(screen.getByTestId("community-thread-split-close")).toBe(close)
+ expect(mockHeaderParentNavigate.current).toBeUndefined()
+ mockSplitMode.value = "full"
+ renderer.rerender(React.createElement(ChannelRoute, props))
+ expect(screen.queryByTestId("community-thread-split-fullscreen")).not.toBeInTheDocument()
+ expect(mockHeaderParentNavigate.current).toBeTypeOf("function")
+ renderer.unmount()
+ })
+
it("keeps readable target content independent of unresolved geometry and unknown parent type", () => {
configureThreadRoute()
mockSplitMode.value = "pending"
const props = { serverParam: "server_1", channelId: "channel_1" }
const renderer = render(React.createElement(ChannelRoute, props))
- expect(screen.getByTestId("community-thread-split")).toHaveAttribute("data-layout", "full")
+ expect(screen.getByTestId("community-thread-split")).toHaveAttribute("data-layout", "pending")
+ expect(screen.getByTestId("community-thread-split")).toHaveAttribute("data-layout-pending", "true")
+ expect(mockSplitParentSurface).toHaveBeenCalledWith(expect.objectContaining({ channel: expect.objectContaining({ id: "parent_1" }) }), undefined)
+ mockSplitParentSurface.mockClear()
expect(renderer.container.querySelector('[data-community-conversation-subtype="unknown"]')).toBeNull()
expect(mockedUseChannelMessageFeed).toHaveBeenCalledWith(expect.objectContaining({ channelId: "channel_1" }))
Object.assign(mockRouteModel, {
@@ -1019,7 +1049,7 @@ describe("ChannelRoute message surface ownership", () => {
Object.assign(mockRouteModel, { channel: null, routeLifecycle: "pending", routeHydrated: false,
skeletonSubtype: "thread",
layoutHint: { subtype: "thread", parentChannelId: "parent_1", parentSubtype: "text" } })
- mockSplitMode.value = "split"
+ mockSplitMode.value = "pending"
const props = { serverParam: "server_1", channelId: "channel_1" }
const renderer = render(React.createElement(ChannelRoute, props))
const outer = renderer.container.firstElementChild
diff --git a/src/web/src/components/community/channels/channel-route.tsx b/src/web/src/components/community/channels/channel-route.tsx
index 5e5af8000..5a6c4b5eb 100644
--- a/src/web/src/components/community/channels/channel-route.tsx
+++ b/src/web/src/components/community/channels/channel-route.tsx
@@ -100,6 +100,7 @@ function ChannelRouteFrame(target: RouteTarget) {
})
const uiHandlers = useUiHandlers()
const split = isThread && mode === "split"
+ const layoutPending = isThread && mode === "pending"
const [parentIdentity, setParentIdentity] = useAtom(useCreateAtom<{ id: string; confirmed: boolean; keepMounted: boolean } | null>(null))
const onParentIdentity = useCallback((id: string, confirmed: boolean) => {
setParentIdentity((current) => {
@@ -125,12 +126,12 @@ function ChannelRouteFrame(target: RouteTarget) {
uiHandlers.openProfile?.(name, event, discriminator, userId)
}, [uiHandlers])
const pane = <ChannelTargetPane key={JSON.stringify([currentUser.id, serverId, channelId])}
- {...target} split={split} resolvingParent={resolvingParent} onOpenChild={enterThread} />
+ {...target} split={split} layoutPending={layoutPending} resolvingParent={resolvingParent} onOpenChild={enterThread} />
const targetHref = `${channelHref(serverParam, channelId)}${searchParams.size ? `?${searchParams}` : ""}`
return <div ref={containerRef} data-community-target-href={targetHref} className="flex min-h-0 min-w-0 flex-1 flex-col">
<ThreadSplitView
- split={split} mobileBack={breakpoint === "mobile" && isThread && !!parent} preserveParent={preserveParent} resolvingParent={resolvingParent} conversationSubtype={isThread ? "thread" : routeModel.skeletonSubtype}
- parent={(split || breakpoint === "mobile" && isThread || preserveParent) && parent ? <ThreadSplitParentSurface
+ split={split} layoutPending={layoutPending} mobileBack={breakpoint === "mobile" && isThread && !!parent} preserveParent={preserveParent} resolvingParent={resolvingParent} conversationSubtype={isThread ? "thread" : routeModel.skeletonSubtype}
+ parent={(split || layoutPending || breakpoint === "mobile" && isThread || preserveParent) && parent ? <ThreadSplitParentSurface
key={JSON.stringify([currentUser.id, serverId, parent.id])}
serverId={serverId} serverParam={serverParam} server={server} channel={parent}
viewer={currentUser} onNavigateParent={navigateServerRoot}
@@ -154,8 +155,9 @@ function QualifiedThreadSurface({ routeLifecycle, ...props }: ComponentProps<typ
}
function ChannelTargetPane({ serverId, serverParam, channelId, searchParams, routeCommitted,
- routeModel, anchorMessageId, currentUser, split, resolvingParent, onOpenChild }: RouteTarget & {
+ routeModel, anchorMessageId, currentUser, split, layoutPending, resolvingParent, onOpenChild }: RouteTarget & {
split: boolean
+ layoutPending: boolean
resolvingParent: boolean
onOpenChild: (id: string) => void
}) {
@@ -341,14 +343,15 @@ function ChannelTargetPane({ serverId, serverParam, channelId, searchParams, rou
onOpenProfile={openProfile}
resolveUserName={resolveUserName}
embedded
- splitActions={split ? {
+ layoutPending={layoutPending}
+ splitActions={split || layoutPending ? {
onFullscreen: openThreadFullscreen,
onClose: navigateParent,
} : undefined}
/>
) : (
<>
- <ChannelHeaderSkeleton kind="thread" compactActions={split} />
+ <ChannelHeaderSkeleton kind="thread" compactActions={split} layoutPending={layoutPending} />
<div className="flex min-h-0 min-w-0 flex-1 flex-col">
<ConversationMessageSkeleton />
<ComposerSkeleton />
diff --git a/src/web/src/components/community/channels/thread-channel-surface.dom.test.ts b/src/web/src/components/community/channels/thread-channel-surface.dom.test.ts
index 03f98f8ea..8e2813431 100644
--- a/src/web/src/components/community/channels/thread-channel-surface.dom.test.ts
+++ b/src/web/src/components/community/channels/thread-channel-surface.dom.test.ts
@@ -227,6 +227,26 @@ describe("ThreadChannelSurface ownership", () => {
mocks.editMessage.mockResolvedValue({})
})
+ it("keeps full header fallback while split actions await layout measurement", () => {
+ const splitActions = { onFullscreen: vi.fn(), onClose: vi.fn() }
+ const props = surfaceProps({ splitActions, layoutPending: true, parentIsForum: true })
+ const renderer = render(React.createElement(ThreadChannelSurface, props))
+ expect(mockedChannelHeader).toHaveBeenLastCalledWith(expect.objectContaining({
+ mobileBack: props.onNavigateParent, compactActions: false, onRename: expect.any(Function),
+ endActions: expect.anything(),
+ }), undefined)
+ renderer.rerender(React.createElement(ThreadChannelSurface, { ...props, layoutPending: false }))
+ expect(mockedChannelHeader).toHaveBeenLastCalledWith(expect.objectContaining({
+ mobileBack: undefined, compactActions: true, onRename: undefined, endActions: expect.anything(),
+ }), undefined)
+ renderer.rerender(React.createElement(ThreadChannelSurface, { ...props, layoutPending: false, splitActions: undefined }))
+ expect(mockedChannelHeader).toHaveBeenLastCalledWith(expect.objectContaining({
+ mobileBack: props.onNavigateParent, compactActions: false, onRename: expect.any(Function),
+ endActions: undefined,
+ }), undefined)
+ renderer.unmount()
+ })
+
it("installs the parent-opener claim hook before initializing the child feed", () => {
const order: string[] = []
const handoff = { nonce: "nonce-1" } as never
diff --git a/src/web/src/components/community/channels/thread-channel-surface.tsx b/src/web/src/components/community/channels/thread-channel-surface.tsx
index cde0f871c..d2e0d699b 100644
--- a/src/web/src/components/community/channels/thread-channel-surface.tsx
+++ b/src/web/src/components/community/channels/thread-channel-surface.tsx
@@ -63,6 +63,7 @@ export function ThreadChannelSurface({
resolveUserName,
embedded = false,
splitActions,
+ layoutPending = false,
}: {
channelId: string
serverId: string
@@ -96,6 +97,7 @@ export function ThreadChannelSurface({
resolveUserName: (userId: string) => string
embedded?: boolean
splitActions?: { onFullscreen: () => void; onClose: () => void }
+ layoutPending?: boolean
}) {
const router = useRouter()
const breakpoint = useBreakpoint()
@@ -129,6 +131,7 @@ export function ThreadChannelSurface({
})
const displayName = localName ?? channelName
const Body = embedded ? "div" : "main"
+ const compactActions = !!splitActions && !layoutPending
useEffect(() => {
setRightPanel(null)
@@ -222,12 +225,12 @@ export function ThreadChannelSurface({
onToggle={togglePanel}
notifLevel={notificationLevel}
onSetNotifLevel={onSetNotificationLevel}
- mobileBack={splitActions ? undefined : onNavigateParent}
+ mobileBack={compactActions ? undefined : onNavigateParent}
mobileBackDisplay="always"
tools={{ threads: false }}
titleRename={parentIsForum}
- onRename={parentChannelId && !splitActions ? rename : undefined}
- compactActions={!!splitActions}
+ onRename={parentChannelId && !compactActions ? rename : undefined}
+ compactActions={compactActions}
endActions={splitActions ? (
<ThreadPanelActions
onFullscreen={splitActions.onFullscreen}
diff --git a/src/web/src/components/community/channels/thread-panel-actions.tsx b/src/web/src/components/community/channels/thread-panel-actions.tsx
index 4f9e3e59b..d2d9e9435 100644
--- a/src/web/src/components/community/channels/thread-panel-actions.tsx
+++ b/src/web/src/components/community/channels/thread-panel-actions.tsx
@@ -1,7 +1,12 @@
+import type { ReactNode } from "react"
import { Maximize2, X } from "lucide-react"
import { Button } from "@/components/ui/button"
import { tid } from "@/lib/community/testids"
+export function ThreadPanelActionsFrame({ children }: { children: ReactNode }) {
+ return <div data-thread-panel-actions className="flex shrink-0 items-center gap-1 border-l border-border/60 pl-1">{children}</div>
+}
+
export function ThreadPanelActions({
onFullscreen,
onClose,
@@ -10,7 +15,7 @@ export function ThreadPanelActions({
onClose: () => void
}) {
return (
- <div className="flex shrink-0 items-center gap-1 border-l border-border/60 pl-1">
+ <ThreadPanelActionsFrame>
<Button
type="button"
variant="ghost"
@@ -35,6 +40,6 @@ export function ThreadPanelActions({
>
<X className="size-4" />
</Button>
- </div>
+ </ThreadPanelActionsFrame>
)
}
diff --git a/src/web/src/components/community/channels/thread-split-view.dom.test.ts b/src/web/src/components/community/channels/thread-split-view.dom.test.ts
index e58e5310a..e585f4285 100644
--- a/src/web/src/components/community/channels/thread-split-view.dom.test.ts
+++ b/src/web/src/components/community/channels/thread-split-view.dom.test.ts
@@ -57,6 +57,49 @@ vi.mock("@/components/ui/resizable", () => ({
}))
describe("ThreadSplitView", () => {
+ it("reserves the native parent, target and handle while layout measurement is pending", () => {
+ const props = {
+ split: false, layoutPending: true,
+ parent: createElement("input", { "data-testid": "pending-parent-draft", defaultValue: "Parent draft" }),
+ thread: createElement("input", { "data-testid": "pending-thread-draft", defaultValue: "Thread draft" }),
+ }
+ const renderer = render(createElement(ThreadSplitView, props))
+ const group = screen.getByTestId("panel-group")
+ const parent = screen.getByTestId("pending-parent-draft")
+ const thread = screen.getByTestId("pending-thread-draft")
+ const handle = screen.getByLabelText("Resize thread panel")
+ expect(screen.getByTestId("community-thread-split")).toHaveAttribute("data-layout-pending", "true")
+ expect(group).toHaveAttribute("data-disabled", "true")
+ expect(group).toHaveAttribute("data-persists-layout", "false")
+ expect(parent.closest("section")).toHaveAttribute("inert")
+ renderer.rerender(createElement(ThreadSplitView, { ...props, split: true, layoutPending: false }))
+ expect(screen.getByTestId("panel-group")).toBe(group)
+ expect(screen.getByTestId("pending-parent-draft")).toBe(parent)
+ expect(screen.getByTestId("pending-thread-draft")).toBe(thread)
+ expect(screen.getByLabelText("Resize thread panel")).toBe(handle)
+ expect(parent.closest("section")).not.toHaveAttribute("inert")
+ expect(screen.getByTestId("community-thread-split")).not.toHaveAttribute("data-layout-pending")
+ renderer.unmount()
+ })
+
+ it("settles pending measurement to a single pane without replacing the target", () => {
+ const props = {
+ split: false, parent: createElement("span", null, "Parent content"),
+ thread: createElement("input", { "data-testid": "pending-target", defaultValue: "Unsent target" }),
+ }
+ const renderer = render(createElement(ThreadSplitView, { ...props, layoutPending: true }))
+ const group = screen.getByTestId("panel-group")
+ const target = screen.getByTestId("pending-target")
+ renderer.rerender(createElement(ThreadSplitView, props))
+ expect(screen.getByTestId("panel-group")).toBe(group)
+ expect(screen.getByTestId("pending-target")).toBe(target)
+ expect(screen.getByTestId("community-thread-split")).toHaveAttribute("data-layout", "full")
+ expect(screen.queryByText("Parent content")).not.toBeInTheDocument()
+ expect(screen.queryByLabelText("Resize thread panel")).not.toBeInTheDocument()
+ expect(group).toHaveAttribute("data-persists-layout", "false")
+ renderer.unmount()
+ })
+
it("keeps the actual parent mounted but inert beneath a mobile thread", () => {
const parent = createElement("input", { "data-testid": "back-parent-draft", defaultValue: "keep me" })
const renderer = render(createElement(ThreadSplitView, {
diff --git a/src/web/src/components/community/channels/thread-split-view.module.css b/src/web/src/components/community/channels/thread-split-view.module.css
new file mode 100644
index 000000000..e30fa9d0b
--- /dev/null
+++ b/src/web/src/components/community/channels/thread-split-view.module.css
@@ -0,0 +1,59 @@
+.layout {
+ container: thread-split / inline-size;
+}
+
+.layout[data-layout-pending] > [data-group] > [data-panel][id="parent"] {
+ flex: 0 0 0px !important;
+ width: 0 !important;
+ min-width: 0 !important;
+ max-width: 0 !important;
+ overflow: hidden;
+}
+
+.layout[data-layout-pending] > [data-group] > [data-panel][id="thread"] {
+ flex: 1 0 0px !important;
+ min-width: 0 !important;
+ max-width: none !important;
+}
+
+.layout[data-layout-pending] > [data-group] > [data-separator] {
+ display: none;
+}
+
+.layout[data-layout-pending] > [data-group] > [data-panel][id="thread"] [data-thread-panel-actions] {
+ display: none;
+}
+
+@container thread-split (min-width: 880px) {
+ .layout[data-layout-pending] > [data-group] > [data-panel][id="parent"] {
+ flex: 1 0 0px !important;
+ width: auto !important;
+ min-width: var(--thread-split-parent-min) !important;
+ max-width: none !important;
+ }
+
+ .layout[data-layout-pending] > [data-group] > [data-panel][id="thread"] {
+ flex: 0 0 clamp(
+ var(--thread-split-thread-min),
+ calc(44% - 0.44px),
+ min(var(--thread-split-thread-max), calc(100% - var(--thread-split-parent-min) - 1px))
+ ) !important;
+ }
+
+ .layout[data-layout-pending] > [data-group] > [data-separator] {
+ display: flex;
+ flex: 0 0 1px;
+ }
+
+ .layout[data-layout-pending] > [data-group] > [data-panel][id="thread"] [data-channel-header-full] {
+ display: none;
+ }
+
+ .layout[data-layout-pending] > [data-group] > [data-panel][id="thread"] [data-thread-panel-actions] {
+ display: flex;
+ }
+
+ .layout[data-layout-pending] > [data-group] > [data-panel][id="thread"] [data-channel-header-icon] {
+ margin-left: var(--spacing);
+ }
+}
diff --git a/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx b/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx
index 76ec964b7..72aa8016b 100644
--- a/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx
+++ b/src/web/src/components/community/channels/thread-split-view.native.dom.test.tsx
@@ -1,9 +1,15 @@
+import { readFileSync } from "node:fs"
+import { dirname, resolve } from "node:path"
+import { fileURLToPath } from "node:url"
import { createElement, createRef } from "react"
import { renderToString } from "react-dom/server"
import { Group, Panel, Separator, type GroupImperativeHandle } from "react-resizable-panels"
import { describe, expect, it, vi } from "vitest"
import { act, fireEvent, render, waitFor } from "@/test/react-dom-harness"
import { ThreadSplitView } from "./thread-split-view"
+import styles from "./thread-split-view.module.css"
+import { ChannelHeader, ChannelHeaderSkeleton } from "./channel-header"
+import { ThreadPanelActions } from "./thread-panel-actions"
const storageKey = "react-resizable-panels:community-thread-split-layout"
const saved = { parent: 57.538, thread: 42.462 }
@@ -59,18 +65,132 @@ function nativeGeometry(initialWidth: number) {
}
describe("ThreadSplitView actual native persistence", () => {
- it.each([false, true].flatMap(hydrate => [false, true].flatMap(startFull => [false, true]
- .map(startZero => ({ hydrate, startFull, startZero })))))(
- "restores with hydration=$hydrate full=$startFull zero=$startZero",
- async ({ hydrate, startFull, startZero }) => {
+ it("applies pending stylesheet geometry to the native group flex items", () => {
+ const browser = window
+ let html: string
+ try {
+ vi.stubGlobal("window", undefined)
+ html = renderToString(createElement(ThreadSplitView, {
+ split: false, layoutPending: true,
+ parent: createElement(ChannelHeader, { channel: "Parent", rightPanel: null, onToggle: () => {} }),
+ thread: createElement(ChannelHeader, {
+ channel: "Thread", kind: "thread", rightPanel: null, onToggle: () => {},
+ mobileBack: () => {}, mobileBackDisplay: "always", onRename: () => {},
+ endActions: createElement(ThreadPanelActions, { onFullscreen: () => {}, onClose: () => {} }),
+ }),
+ }))
+ } finally { vi.stubGlobal("window", browser) }
+ const ssr = document.createElement("div")
+ ssr.innerHTML = html
+ const css = readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), "thread-split-view.module.css"), "utf8")
+ const selectors = [...css.matchAll(/(\.layout\[data-layout-pending\][^{}]+)\{/g)]
+ .map(match => match[1].trim().replace(/\.([\w-]+)/g, (_, name: string) => `.${styles[name]}`))
+ expect(selectors.length).toBeGreaterThan(0)
+ for (const selector of selectors) {
+ const items = ssr.querySelectorAll(selector)
+ expect(items.length, selector).toBeGreaterThan(0)
+ for (const item of items) {
+ if (item.matches("[data-panel], [data-separator]")) {
+ expect(item.parentElement, selector).toHaveAttribute("data-group")
+ } else {
+ expect(item.matches("[data-channel-header-full], [data-thread-panel-actions], [data-channel-header-icon]"), selector).toBe(true)
+ expect(item.closest("[data-panel]"), selector).toHaveAttribute("id", "thread")
+ }
+ }
+ }
+ })
+
+ it.each([false, true].flatMap(loading => [false, true].map(split => ({ loading, split }))))(
+ "keeps native header slots through hydration and measurement with loading=$loading split=$split",
+ async ({ loading, split }) => {
+ nativeGeometry(905)
+ const onFullscreen = vi.fn()
+ const onClose = vi.fn()
+ const onBack = vi.fn()
+ const node = (mode: "pending" | "split" | "full") => createElement(ThreadSplitView, {
+ split: mode === "split", layoutPending: mode === "pending",
+ parent: createElement(ChannelHeader, { channel: "Parent", rightPanel: null, onToggle: () => {} }),
+ thread: createElement("div", null,
+ loading ? <ChannelHeaderSkeleton
+ kind="thread" compactActions={mode === "split"} layoutPending={mode === "pending"}
+ /> : createElement(ChannelHeader, {
+ channel: "Thread", kind: "thread", rightPanel: null, onToggle: () => {},
+ mobileBack: mode === "split" ? undefined : onBack, mobileBackDisplay: "always",
+ compactActions: mode === "split",
+ endActions: mode === "full" ? undefined : createElement(ThreadPanelActions, { onFullscreen, onClose }),
+ }),
+ createElement("input", { defaultValue: "Keep draft" })),
+ })
+ const browser = window
+ let html: string
+ try {
+ vi.stubGlobal("window", undefined)
+ html = renderToString(node("pending"))
+ } finally { vi.stubGlobal("window", browser) }
+ const container = document.createElement("div")
+ container.innerHTML = html
+ document.body.appendChild(container)
+ const thread = container.querySelector("#thread")!
+ const header = thread.querySelector("header")!
+ const identity = header.querySelector("[data-slot=message-header-identity]")!
+ const actions = header.querySelector("[data-slot=message-header-actions]")!
+ const compact = actions.querySelector("[data-thread-panel-actions]")!
+ const parentHeader = container.querySelector("#parent header")!
+ const input = thread.querySelector("input")!
+ expect(thread.querySelectorAll("header")).toHaveLength(1)
+ expect(header.querySelector("[data-channel-header-full]")).not.toBeNull()
+ expect(actions.querySelector("[data-channel-header-full]")).not.toBeNull()
+ expect(compact).not.toBeNull()
+ if (loading) expect(thread.querySelectorAll("button")).toHaveLength(0)
+ const error = vi.spyOn(console, "error").mockImplementation(() => {})
+ const view = render(node("pending"), { container, hydrate: true })
+ try {
+ view.rerender(node(split ? "split" : "full"))
+ expect(thread.querySelector("header")).toBe(header)
+ expect(header.querySelector("[data-slot=message-header-identity]")).toBe(identity)
+ expect(header.querySelector("[data-slot=message-header-actions]")).toBe(actions)
+ expect(container.querySelector("#parent header")).toBe(split ? parentHeader : null)
+ expect(thread.querySelector("input")).toBe(input)
+ expect(input.value).toBe("Keep draft")
+ if (split) {
+ expect(actions.querySelector("[data-thread-panel-actions]")).toBe(compact)
+ if (!loading) {
+ fireEvent.click(thread.querySelector("[aria-label='Open thread full screen']")!)
+ fireEvent.click(thread.querySelector("[aria-label='Close thread']")!)
+ expect(onFullscreen).toHaveBeenCalledOnce()
+ expect(onClose).toHaveBeenCalledOnce()
+ }
+ } else {
+ expect(actions.querySelector("[data-thread-panel-actions]")).toBeNull()
+ if (!loading) {
+ fireEvent.click(thread.querySelector("[aria-label=Back]")!)
+ expect(onBack).toHaveBeenCalledOnce()
+ }
+ }
+ expect(error.mock.calls.filter(call => call.some(value => /hydrat/i.test(String(value))))).toEqual([])
+ } finally {
+ view.unmount()
+ container.remove()
+ vi.unstubAllGlobals()
+ vi.restoreAllMocks()
+ }
+ },
+ )
+
+ it.each([false, true].flatMap(hydrate => (["split", "full", "pending"] as const).flatMap(startMode => [false, true]
+ .map(startZero => ({ hydrate, startMode, startZero })))))(
+ "restores with hydration=$hydrate mode=$startMode zero=$startZero",
+ async ({ hydrate, startMode, startZero }) => {
localStorage.setItem(storageKey, JSON.stringify(saved))
const read = vi.spyOn(Storage.prototype, "getItem")
+ const write = vi.spyOn(Storage.prototype, "setItem")
const error = vi.spyOn(console, "error").mockImplementation(() => {})
const resize = nativeGeometry(startZero ? 0 : 1225)
const parent = createElement("span", null, "Parent")
const thread = createElement("input", { defaultValue: "unsent child" })
const node = createElement(ThreadSplitView, {
- split: !startFull, conversationSubtype: startFull ? "unknown" : "thread", parent, thread,
+ split: startMode === "split", layoutPending: startMode === "pending",
+ conversationSubtype: startMode === "full" ? "unknown" : "thread", parent, thread,
})
const browser = window
let html = ""
@@ -80,6 +200,15 @@ describe("ThreadSplitView actual native persistence", () => {
html = renderToString(node)
} finally { vi.stubGlobal("window", browser) }
expect(html).toContain("flex-basis:44%")
+ if (startMode === "pending") {
+ const ssr = document.createElement("div")
+ ssr.innerHTML = html
+ expect(ssr.querySelector("main")).toHaveAttribute("data-layout-pending", "true")
+ expect(ssr.querySelectorAll("[data-panel]")).toHaveLength(2)
+ expect(ssr.querySelector("[data-separator]")).toHaveAttribute("aria-disabled", "true")
+ expect(ssr.querySelector("[data-separator]")).not.toHaveAttribute("tabindex")
+ expect(ssr.querySelector("#parent")?.textContent).toBe("Parent")
+ }
}
const container = document.createElement("div")
container.innerHTML = html
@@ -88,7 +217,7 @@ describe("ThreadSplitView actual native persistence", () => {
try {
const group = container.querySelector("[data-group]")
const input = container.querySelector("input")
- if (startFull) {
+ if (startMode !== "split") {
view.rerender(createElement(ThreadSplitView, { split: true, conversationSubtype: "thread", parent, thread }))
expect(container.querySelector("[data-group]")).toBe(group)
expect(container.querySelector("input")).toBe(input)
@@ -106,6 +235,7 @@ describe("ThreadSplitView actual native persistence", () => {
expect(panel.style.flexBasis).toBe("0px")
expect(error.mock.calls.filter(call => call.some(value => /hydrat/i.test(String(value))))).toEqual([])
expect(localStorage.getItem(storageKey)).toBe(JSON.stringify(saved))
+ expect(write).not.toHaveBeenCalled()
} finally {
view.unmount()
container.remove()
diff --git a/src/web/src/components/community/channels/thread-split-view.tsx b/src/web/src/components/community/channels/thread-split-view.tsx
index 04c06ddf4..bcc5455d1 100644
--- a/src/web/src/components/community/channels/thread-split-view.tsx
+++ b/src/web/src/components/community/channels/thread-split-view.tsx
@@ -3,7 +3,7 @@
* macrostructure: parallel-conversation-panel · pre-emit: P5 H5 E4 S5 R5 V4 · slop: pass
*/
-import { useCallback, useLayoutEffect, useRef, type ReactNode } from "react"
+import { useCallback, useLayoutEffect, useRef, type CSSProperties, type ReactNode } from "react"
import { useDefaultLayout, type GroupImperativeHandle, type Layout, type LayoutChangedMeta } from "react-resizable-panels"
import { useHydratedClient } from "@/components/community/shell/use-hydrated-client"
import {
@@ -14,7 +14,9 @@ import {
import { tid } from "@/lib/community/testids"
import { cn } from "@/lib/utils"
import { ConversationResolutionPendingFrame } from "./conversation-resolution-pending-frame"
+import styles from "./thread-split-view.module.css"
+const THREAD_SPLIT_PARENT_MIN_WIDTH = 320
export const THREAD_SPLIT_PANEL_MIN_WIDTH = 360
export const THREAD_SPLIT_PANEL_MAX_WIDTH = 800
@@ -27,6 +29,7 @@ const threadSplitLayoutStorage = {
export function ThreadSplitView({
split,
+ layoutPending = false,
mobileBack = false,
preserveParent = false,
parent,
@@ -35,6 +38,7 @@ export function ThreadSplitView({
resolvingParent = false,
}: {
split: boolean
+ layoutPending?: boolean
mobileBack?: boolean
preserveParent?: boolean
parent: ReactNode
@@ -68,9 +72,15 @@ export function ThreadSplitView({
<main
data-testid={isThread ? tid.threadSplit : undefined}
data-mobile-back-thread={mobileBack || undefined}
- data-layout={split ? resolvingParent ? "pending" : "split" : "full"}
+ data-layout={layoutPending || resolvingParent ? "pending" : split ? "split" : "full"}
+ data-layout-pending={layoutPending || undefined}
data-community-conversation-subtype={conversationSubtype === "unknown" ? undefined : conversationSubtype}
- className="relative flex min-h-0 min-w-0 flex-1"
+ className={cn("relative flex min-h-0 min-w-0 flex-1", styles.layout)}
+ style={{
+ "--thread-split-parent-min": `${THREAD_SPLIT_PARENT_MIN_WIDTH}px`,
+ "--thread-split-thread-min": `${THREAD_SPLIT_PANEL_MIN_WIDTH}px`,
+ "--thread-split-thread-max": `${THREAD_SPLIT_PANEL_MAX_WIDTH}px`,
+ } as CSSProperties}
>
<ResizablePanelGroup
id="community-thread-split-layout"
@@ -81,7 +91,7 @@ export function ThreadSplitView({
disabled={!split || resolvingParent}
aria-hidden={resolvingParent || undefined}
inert={resolvingParent || undefined}
- className={cn("min-h-0 flex-1", resolvingParent && "invisible", !split && !mobileBack && [
+ className={cn("min-h-0 flex-1", resolvingParent && "invisible", !split && !mobileBack && !layoutPending && [
"*:data-[layout-hidden=true]:flex-none!",
"*:data-[layout-hidden=true]:w-0!",
"*:data-[layout-hidden=true]:min-w-0!",
@@ -95,12 +105,12 @@ export function ThreadSplitView({
<ResizablePanel
id="parent"
defaultSize="56%"
- minSize={320}
+ minSize={THREAD_SPLIT_PARENT_MIN_WIDTH}
disabled={!split || resolvingParent}
- data-layout-hidden={!split || undefined}
+ data-layout-hidden={!split && !layoutPending || undefined}
className="flex min-h-0 min-w-0 flex-col"
>
- {(split || mobileBack || preserveParent) && <section
+ {(split || layoutPending || mobileBack || preserveParent) && <section
data-testid={tid.threadSplitParent}
data-mobile-back-parent
inert={!split}
@@ -111,8 +121,9 @@ export function ThreadSplitView({
{parent}
</section>}
</ResizablePanel>
- {split && !resolvingParent && <ResizableHandle
+ {(split && !resolvingParent || layoutPending) && <ResizableHandle
aria-label="Resize thread panel"
+ disabled={!split || resolvingParent}
className="bg-border/60"
/>}
<ResizablePanel
@@ -121,7 +132,7 @@ export function ThreadSplitView({
minSize={THREAD_SPLIT_PANEL_MIN_WIDTH}
maxSize={THREAD_SPLIT_PANEL_MAX_WIDTH}
disabled={!split || resolvingParent}
- data-layout-active={!split || undefined}
+ data-layout-active={!split && !layoutPending || undefined}
className="flex min-h-0 min-w-0 flex-col bg-background"
>
<section