Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): align conversation accessories with footer (#966)

Gener81f4e3664bc2
diff --git a/src/web/src/components/community/messages/composer-accessory-rail.dom.test.ts b/src/web/src/components/community/messages/composer-accessory-rail.dom.test.ts
index ddcb05ed5..d93f44a86 100644
--- a/src/web/src/components/community/messages/composer-accessory-rail.dom.test.ts
+++ b/src/web/src/components/community/messages/composer-accessory-rail.dom.test.ts
@@ -72,8 +72,9 @@ describe("ComposerAccessoryRail", () => {
it("centers the scroll control without owning composer geometry", () => {
const renderer = renderRail()
const rail = renderer.getByTestId(tid.composerAccessoryRail)
- expect(rail).toHaveClass("absolute", "bottom-2", "sm:bottom-4")
- expect(rail).not.toHaveAttribute("style")
+ expect(rail).not.toHaveClass("absolute", "bottom-2", "sm:bottom-4")
+ expect(rail).toHaveStyle({ height: "32px" })
+ expect(rail.firstElementChild).toHaveClass("h-full", "items-center")
const scroll = renderer.getByTestId(tid.scrollToPresent)
expect(scroll).toHaveAttribute("aria-label", "Jump to present, 4 unread below")
fireEvent.click(scroll)
diff --git a/src/web/src/components/community/messages/composer-accessory-rail.dom.test.tsx b/src/web/src/components/community/messages/composer-accessory-rail.dom.test.tsx
index ef1701d20..a68eb334f 100644
--- a/src/web/src/components/community/messages/composer-accessory-rail.dom.test.tsx
+++ b/src/web/src/components/community/messages/composer-accessory-rail.dom.test.tsx
@@ -1,8 +1,10 @@
import React from "react"
+import { createPortal } from "react-dom"
import { describe, expect, it, vi } from "vitest"
import { render } from "@/test/react-dom-harness"
import { tid } from "@/lib/community/testids"
import { ComposerAccessoryRail } from "./composer-accessory-rail"
+import { ConversationFooterShell, ConversationFooterSlotProvider, useConversationFooterSlot } from "./conversation-footer-shell"
vi.mock("@/components/ui/number-ticker", () => ({
NumberTicker: ({ value }: { value: number }) => React.createElement("span", null, value),
@@ -10,26 +12,37 @@ vi.mock("@/components/ui/number-ticker", () => ({
describe("ComposerAccessoryRail geometry", () => {
it("shares the composer's logical safe-area-aware inline edges", () => {
+ function Accessory() {
+ const target = useConversationFooterSlot()?.accessoryTarget
+ return target ? createPortal(
+ <ComposerAccessoryRail typingNames={["Alice"]} scrollCount={2} scrollMode="scroll" onScroll={vi.fn()} />,
+ target,
+ ) : null
+ }
const renderer = render(
- <ComposerAccessoryRail
- typingNames={["Alice"]}
- scrollCount={2}
- scrollMode="scroll"
- onScroll={vi.fn()}
- />,
+ <ConversationFooterSlotProvider>
+ <Accessory />
+ <ConversationFooterShell><div>composer</div></ConversationFooterShell>
+ </ConversationFooterSlotProvider>,
)
- expect(renderer.getByTestId(tid.composerAccessoryRail)).toHaveClass(
+ const slot = renderer.container.querySelector('[data-slot="community-composer-accessory-slot"]')!
+ expect(slot).toHaveClass(
"pl-(--community-composer-inline-start)",
"pr-(--community-composer-inline-end)",
)
+ expect(renderer.getByTestId(tid.composerAccessoryRail).parentElement).toBe(slot)
+ expect(renderer.getByTestId(tid.typingIndicator)).toHaveClass("h-full")
+ expect(renderer.getByTestId(tid.typingIndicator)).not.toHaveClass("h-8")
expect(renderer.getByTestId(tid.composerAccessoryRail)).not.toHaveClass(
+ "pl-(--community-composer-inline-start)",
+ "pr-(--community-composer-inline-end)",
"px-2",
"sm:px-4",
)
})
- it("keeps rail visibility out of layout flow", () => {
+ it("leaves positioning to the Footer box and fills the shared row height", () => {
const renderer = render(
<ComposerAccessoryRail
typingNames={[]}
@@ -39,11 +52,13 @@ describe("ComposerAccessoryRail geometry", () => {
/>,
)
- expect(renderer.getByTestId(tid.composerAccessoryRail)).toHaveClass(
+ expect(renderer.getByTestId(tid.composerAccessoryRail)).not.toHaveClass(
"absolute",
"inset-x-0",
"bottom-2",
"sm:bottom-4",
)
+ expect(renderer.getByTestId(tid.composerAccessoryRail)).toHaveStyle({ height: "32px" })
+ expect(renderer.getByTestId(tid.scrollToPresent)).toHaveClass("h-full")
})
})
diff --git a/src/web/src/components/community/messages/composer-accessory-rail.tsx b/src/web/src/components/community/messages/composer-accessory-rail.tsx
index f55281854..f50882930 100644
--- a/src/web/src/components/community/messages/composer-accessory-rail.tsx
+++ b/src/web/src/components/community/messages/composer-accessory-rail.tsx
@@ -6,6 +6,7 @@ import { NumberTicker } from "@/components/ui/number-ticker"
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
import { tid } from "@/lib/community/testids"
import { cn } from "@/lib/utils"
+import { COMPOSER_ACCESSORY_ROW_HEIGHT_PX } from "@/lib/community/conversation-layout"
import { allocateComposerAccessoryRail } from "./composer-accessory-rail-layout"
import { TypingIndicator } from "./typing-indicator"
@@ -34,22 +35,23 @@ export function ComposerAccessoryRail({
<div
data-testid={tid.composerAccessoryRail}
data-layout={layout}
- className="pointer-events-none absolute inset-x-0 bottom-2 z-20 pl-(--community-composer-inline-start) pr-(--community-composer-inline-end) sm:bottom-4"
+ className="pointer-events-none w-full"
+ style={{ height: COMPOSER_ACCESSORY_ROW_HEIGHT_PX }}
>
<div
className={cn(
- "grid w-full items-end gap-1 sm:gap-2",
+ "grid h-full w-full items-center gap-1 sm:gap-2",
layout === "centered" && "grid-cols-[minmax(0,1fr)_minmax(0,max-content)_minmax(0,1fr)]",
layout === "left-only" && "grid-cols-[minmax(0,1fr)]",
)}
>
{hasTyping && (
- <div className="col-start-1 min-w-0 max-w-full">
- <TypingIndicator names={typingNames} className="w-fit max-w-full" />
+ <div className="col-start-1 h-full min-w-0 max-w-full">
+ <TypingIndicator names={typingNames} className="h-full w-fit max-w-full" />
</div>
)}
{hasScroll && (
- <div className="col-start-2 min-w-0 max-w-full justify-self-center">
+ <div className="col-start-2 h-full min-w-0 max-w-full justify-self-center">
<ScrollControl count={scrollCount} mode={scrollMode} onClick={onScroll} />
</div>
)}
@@ -144,7 +146,7 @@ function ScrollControl({
data-testid={tid.scrollToPresent}
onClick={onClick}
aria-label={aria}
- className="pointer-events-auto flex h-8 items-center gap-1.5 justify-self-center rounded-full border border-border bg-background/90 pl-2 pr-3 text-xs font-medium text-foreground shadow-(--e1) backdrop-blur-sm transition-colors hover:bg-accent focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
+ className="pointer-events-auto flex h-full items-center gap-1.5 justify-self-center rounded-full border border-border bg-background/90 pl-2 pr-3 text-xs font-medium text-foreground shadow-(--e1) backdrop-blur-sm transition-colors hover:bg-accent focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
>
<ArrowDown className="size-3.5 text-muted-foreground" />
<NumberTicker value={count} />
diff --git a/src/web/src/components/community/messages/conversation-footer-shell.dom.test.tsx b/src/web/src/components/community/messages/conversation-footer-shell.dom.test.tsx
index 80cda8892..2babf06d0 100644
--- a/src/web/src/components/community/messages/conversation-footer-shell.dom.test.tsx
+++ b/src/web/src/components/community/messages/conversation-footer-shell.dom.test.tsx
@@ -1,4 +1,5 @@
import React from "react"
+import { createPortal } from "react-dom"
import { fireEvent, render } from "@/test/react-dom-harness"
import { describe, expect, it } from "vitest"
import {
@@ -24,15 +25,22 @@ describe("ConversationFooterShell", () => {
expect(footer.querySelector('[data-slot="community-selection-footer-slot"]'))
.toHaveClass("hidden")
expect(footer.querySelector('[data-slot="community-composer-overlay"]')).toBeNull()
+ const accessory = footer.querySelector('[data-slot="community-composer-accessory-slot"]')!
+ expect(accessory).toHaveClass("absolute", "bottom-full", "flex", "items-center", "pointer-events-none")
+ expect(accessory).toHaveStyle({ height: "40px" })
+ expect(accessory.parentElement).toBe(footer)
})
it("replaces the mounted composer with an explicit in-flow selection slot", () => {
function SelectionToggle() {
const footer = useConversationFooterSlot()!
return (
+ <>
<button type="button" onClick={() => footer.setSelectionActive(true)}>
select
</button>
+ {footer.accessoryTarget && !footer.selectionActive && createPortal(<span>typing</span>, footer.accessoryTarget)}
+ </>
)
}
const renderer = render(
@@ -45,15 +53,56 @@ describe("ConversationFooterShell", () => {
)
const footer = renderer.getByTestId("footer")
const editor = renderer.getByTestId("composer-editor")
+ const accessory = footer.querySelector('[data-slot="community-composer-accessory-slot"]')!
+ expect(accessory).toHaveTextContent("typing")
+ expect(accessory).not.toBe(editor.parentElement)
fireEvent.click(renderer.getByRole("button", { name: "select" }))
expect(footer).toHaveAttribute("data-selection-active", "true")
expect(editor).toBeInTheDocument()
expect(editor.parentElement).toHaveClass("invisible", "h-0", "overflow-hidden")
+ expect(accessory).toHaveClass("hidden")
+ expect(accessory).not.toHaveTextContent("typing")
expect(footer.querySelector('[data-slot="community-selection-footer-slot"]'))
.toHaveClass("relative", "h-[calc(3.75rem+var(--app-safe-area-bottom))]", "sm:h-15")
expect(footer.querySelector('[data-slot="community-selection-footer-slot"]'))
.not.toHaveClass("absolute", "inset-0", "hidden")
})
+
+ it("keeps split-surface targets independent and retires both handles when a Footer leaves", () => {
+ const slots: Record<string, NonNullable<ReturnType<typeof useConversationFooterSlot>>> = {}
+ function Probe({ id }: { id: string }) {
+ const slot = useConversationFooterSlot()!
+ React.useLayoutEffect(() => { slots[id] = slot }, [id, slot])
+ return slot.accessoryTarget ? createPortal(<span>{id} typing</span>, slot.accessoryTarget) : null
+ }
+ function Scope({ id, showFooter = true }: { id: string; showFooter?: boolean }) {
+ return <ConversationFooterSlotProvider>
+ <Probe id={id} />
+ {showFooter && <ConversationFooterShell data-testid={id}><div>{id} composer</div></ConversationFooterShell>}
+ </ConversationFooterSlotProvider>
+ }
+ const renderer = render(<><Scope id="parent" /><Scope id="thread" /></>)
+ const parent = slots.parent.accessoryTarget!
+ const thread = slots.thread.accessoryTarget!
+ expect(parent).not.toBe(thread)
+ expect(slots.parent.target).not.toBe(slots.thread.target)
+ expect(parent).toHaveTextContent("parent typing")
+ expect(thread).toHaveTextContent("thread typing")
+ expect(renderer.getByTestId("parent").contains(parent)).toBe(true)
+ expect(renderer.getByTestId("thread").contains(thread)).toBe(true)
+
+ renderer.rerender(<><Scope id="parent" showFooter={false} /><Scope id="thread" /></>)
+ expect(slots.parent.accessoryTarget).toBeNull()
+ expect(slots.parent.target).toBeNull()
+ expect(slots.thread.accessoryTarget).toBe(thread)
+ expect(parent).not.toBeInTheDocument()
+ expect(thread).toHaveTextContent("thread typing")
+
+ renderer.rerender(<><Scope id="parent" /><Scope id="thread" /></>)
+ expect(slots.parent.accessoryTarget).not.toBe(parent)
+ expect(slots.parent.accessoryTarget).toHaveTextContent("parent typing")
+ expect(slots.thread.accessoryTarget).toBe(thread)
+ })
})
diff --git a/src/web/src/components/community/messages/conversation-footer-shell.tsx b/src/web/src/components/community/messages/conversation-footer-shell.tsx
index ca14bf6bc..e7990a83b 100644
--- a/src/web/src/components/community/messages/conversation-footer-shell.tsx
+++ b/src/web/src/components/community/messages/conversation-footer-shell.tsx
@@ -2,10 +2,13 @@
import { useAtom, useCreateAtom, type Atom } from "@tanstack/react-store";
import { createContext, useCallback, useContext, useMemo, type HTMLAttributes, type ReactNode } from "react"
+import { CONVERSATION_TAIL_SPACE_PX } from "@/lib/community/conversation-layout"
type ConversationFooterSlot = {
target: HTMLDivElement | null
setTarget: Atom<HTMLDivElement | null>["set"]
+ accessoryTarget: HTMLDivElement | null
+ setAccessoryTarget: Atom<HTMLDivElement | null>["set"]
selectionActive: boolean
setSelectionActive: Atom<boolean>["set"]
}
@@ -13,14 +16,17 @@ type ConversationFooterSlot = {
const ConversationFooterSlotContext = createContext<ConversationFooterSlot | null>(null)
export function ConversationFooterSlotProvider({ children }: { children: ReactNode }) {
-const [target, setTarget] = useAtom(useCreateAtom<HTMLDivElement | null>(null))
+ const [target, setTarget] = useAtom(useCreateAtom<HTMLDivElement | null>(null))
+ const [accessoryTarget, setAccessoryTarget] = useAtom(useCreateAtom<HTMLDivElement | null>(null))
const [selectionActive, setSelectionActive] = useAtom(useCreateAtom(false))
const value = useMemo(() => ({
target,
setTarget,
+ accessoryTarget,
+ setAccessoryTarget,
selectionActive,
setSelectionActive,
- }), [selectionActive, setSelectionActive, setTarget, target])
+ }), [accessoryTarget, selectionActive, setAccessoryTarget, setSelectionActive, setTarget, target])
return (
<ConversationFooterSlotContext.Provider value={value}>
@@ -50,9 +56,13 @@ export function ConversationFooterShell({
}) {
const footerSlot = useConversationFooterSlot()
const setFooterTarget = footerSlot?.setTarget
+ const setAccessoryTarget = footerSlot?.setAccessoryTarget
const bindFooterTarget = useCallback((target: HTMLDivElement | null) => {
setFooterTarget?.(target)
}, [setFooterTarget])
+ const bindAccessoryTarget = useCallback((target: HTMLDivElement | null) => {
+ setAccessoryTarget?.(target)
+ }, [setAccessoryTarget])
const selectionActive = footerSlot?.selectionActive ?? false
return (
@@ -62,6 +72,12 @@ export function ConversationFooterShell({
data-selection-active={selectionActive ? "true" : "false"}
className={`relative shrink-0${className ? ` ${className}` : ""}`}
>
+ <div
+ ref={bindAccessoryTarget}
+ data-slot="community-composer-accessory-slot"
+ style={{ height: CONVERSATION_TAIL_SPACE_PX }}
+ className={`pointer-events-none absolute inset-x-0 bottom-full z-20 items-center pl-(--community-composer-inline-start) pr-(--community-composer-inline-end) ${selectionActive ? "hidden" : "flex"}`}
+ />
<div
aria-hidden={selectionActive || undefined}
inert={selectionActive || undefined}
diff --git a/src/web/src/components/community/messages/message-list-controller.dom.test.ts b/src/web/src/components/community/messages/message-list-controller.dom.test.ts
index a37821adb..dc4de162f 100644
--- a/src/web/src/components/community/messages/message-list-controller.dom.test.ts
+++ b/src/web/src/components/community/messages/message-list-controller.dom.test.ts
@@ -7,12 +7,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
import { useMessageListController, type MessageListController } from "./message-list-controller"
import type { ResolvedMessageListProps } from "./message-list-types"
import { INITIAL_POSITION_CROSSFADE_MS } from "./initial-position-transition"
+import { MESSAGE_RAIL_TAIL_PADDING_END_PX } from "@/lib/community/conversation-layout"
const webRoot = resolve(dirname(fileURLToPath(import.meta.url)), "../../../..")
const readWebSource = (path: string) => readFileSync(resolve(webRoot, path), "utf8")
const mocks = vi.hoisted(() => ({
- breakpoint: "desktop" as "unknown" | "desktop" | "mobile",
hookOrder: [] as string[],
scrollInputs: [] as unknown[],
paginationInputs: [] as unknown[],
@@ -26,13 +26,8 @@ const mocks = vi.hoisted(() => ({
captureNewerPageAnchor: vi.fn(),
}))
-vi.mock("@/hooks/use-mobile", () => ({
- useBreakpoint: () => mocks.breakpoint,
-}))
-
vi.mock("@/hooks/community/use-scroll-anchor", () => ({
- resolveMessageRailTailPaddingEnd: (breakpoint: string) => breakpoint === "mobile" ? 40 : 48,
- useScrollAnchor: (input: { scrollToMessageId?: string | null; items: Array<{ kind: string; m?: { id: string } }>; onScrollTargetPositioned: (id: string) => void; onInitialPositionSettled: () => void }) => {
+ useScrollAnchor: (input: { tailPaddingEnd?: number; scrollToMessageId?: string | null; items: Array<{ kind: string; m?: { id: string } }>; onScrollTargetPositioned: (id: string) => void; onInitialPositionSettled: () => void }) => {
const consumed = React.useRef<string | null>(null)
const loaded = input.items.some((item) => item.m?.id === input.scrollToMessageId)
React.useLayoutEffect(() => {
@@ -43,7 +38,7 @@ vi.mock("@/hooks/community/use-scroll-anchor", () => ({
}
}, [input, loaded])
mocks.hookOrder.push("anchor")
- mocks.scrollInputs.push(input)
+ mocks.scrollInputs.push({ ...input, tailPaddingEnd: input.tailPaddingEnd ?? MESSAGE_RAIL_TAIL_PADDING_END_PX })
return {
scrollRef: mocks.scrollRef,
virtualizer: mocks.virtualizer,
@@ -133,7 +128,6 @@ describe("useMessageListController", () => {
}
beforeEach(() => {
- mocks.breakpoint = "desktop"
currentScrollNode = scrollNode as unknown as HTMLDivElement
resizeCallback = null
disconnect.mockClear()
@@ -220,7 +214,7 @@ describe("useMessageListController", () => {
presentVersion: undefined,
localSubmitVersion: undefined,
hasMoreOlder: undefined,
- tailPaddingEnd: 48,
+ tailPaddingEnd: 32,
onInitialPositionSettled: expect.any(Function),
scrollToMessageId: undefined,
onScrollTargetCancelled: undefined,
@@ -268,13 +262,12 @@ describe("useMessageListController", () => {
expect(mocks.hookOrder.slice(-3)).toEqual(["anchor", "start", "end"])
})
- it("passes the breakpoint-owned fixed tail padding to the virtualizer", () => {
- mocks.breakpoint = "mobile"
+ it("delegates the shared tail padding to the original virtualizer hook", () => {
act(() => {
rtlRender(React.createElement(Probe, { value: props() }))
})
expect(mocks.scrollInputs.at(-1)).toEqual(expect.objectContaining({
- tailPaddingEnd: 40,
+ tailPaddingEnd: 32,
}))
})
@@ -294,7 +287,7 @@ describe("useMessageListController", () => {
})
const withTyping = mocks.scrollInputs.at(-1) as { tailPaddingEnd: number }
- expect(withoutTyping.tailPaddingEnd).toBe(48)
+ expect(withoutTyping.tailPaddingEnd).toBe(32)
expect(withTyping.tailPaddingEnd).toBe(withoutTyping.tailPaddingEnd)
})
@@ -367,7 +360,7 @@ describe("useMessageListController", () => {
presentVersion: 7,
localSubmitVersion: undefined,
hasMoreOlder: true,
- tailPaddingEnd: 48,
+ tailPaddingEnd: 32,
onInitialPositionSettled: expect.any(Function),
scrollToMessageId: undefined,
onScrollTargetCancelled: undefined,
diff --git a/src/web/src/components/community/messages/message-list-controller.ts b/src/web/src/components/community/messages/message-list-controller.ts
index 5d00e554f..cb74dfad9 100644
--- a/src/web/src/components/community/messages/message-list-controller.ts
+++ b/src/web/src/components/community/messages/message-list-controller.ts
@@ -4,11 +4,7 @@ import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useCallback, useEffect, useMemo, useRef } from "react"
import type { RenderMsg } from "@/lib/community/models/message"
import { flattenMessageItems } from "@/lib/community/message-list-items"
-import {
- resolveMessageRailTailPaddingEnd,
- useScrollAnchor,
-} from "@/hooks/community/use-scroll-anchor"
-import { useBreakpoint } from "@/hooks/use-mobile"
+import { useScrollAnchor } from "@/hooks/community/use-scroll-anchor"
import { useVirtualCursorPagination } from "@/hooks/community/use-virtual-cursor-pagination"
import { useInitialPositionTransition } from "./initial-position-transition"
import type { ResolvedMessageListProps } from "./message-list-types"
@@ -34,8 +30,6 @@ export function useMessageListController({
onScrollRoot,
onScrollTargetConsumed,
}: ResolvedMessageListProps) {
- const breakpoint = useBreakpoint()
- const tailPaddingEnd = resolveMessageRailTailPaddingEnd(breakpoint)
const [jumpRevision, setJumpRevision] = useAtom(useCreateAtom(0))
const [jumped, setJumped] = useAtom(useCreateAtom<string | null>(null))
const [anchorPositionSettled, setAnchorPositionSettled] = useAtom(useCreateAtom(false))
@@ -115,7 +109,6 @@ export function useMessageListController({
presentVersion,
localSubmitVersion,
hasMoreOlder: hasMore,
- tailPaddingEnd,
onInitialPositionSettled: settleAnchorPosition,
})
const initialPosition = useInitialPositionTransition({
diff --git a/src/web/src/components/community/messages/message-list-view.dom.test.ts b/src/web/src/components/community/messages/message-list-view.dom.test.ts
index 3e5551617..2c9a69fd1 100644
--- a/src/web/src/components/community/messages/message-list-view.dom.test.ts
+++ b/src/web/src/components/community/messages/message-list-view.dom.test.ts
@@ -1,7 +1,7 @@
import React from "react"
-import { beforeEach, describe, expect, it, vi } from "vitest"
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
import { fireEvent, render } from "@/test/react-dom-harness"
-import { MessageListSkeleton, renderMessageListView } from "./message-list-view"
+import { MessageListSkeleton, renderMessageListView as renderView } from "./message-list-view"
import { ComposerAccessoryRail } from "./composer-accessory-rail"
import { MessageShareDialog } from "./message-share-dialog"
import type { MessageListController } from "./message-list-controller"
@@ -92,7 +92,16 @@ function controller(overrides: Partial<MessageListController> = {}): MessageList
}
describe("renderMessageListView", () => {
- beforeEach(() => vi.clearAllMocks())
+ let accessoryFooterSlot: HTMLDivElement
+ function renderMessageListView(...args: Parameters<typeof renderView>) {
+ return renderView(args[0], args[1], args[2], args[3], accessoryFooterSlot)
+ }
+ beforeEach(() => {
+ vi.clearAllMocks()
+ accessoryFooterSlot = document.createElement("div")
+ document.body.appendChild(accessoryFooterSlot)
+ })
+ afterEach(() => accessoryFooterSlot.remove())
it("keeps warm non-empty loading data on the loaded DOM with typing and the away pill", () => {
const listProps = props()
@@ -105,13 +114,25 @@ describe("renderMessageListView", () => {
}), undefined)
expect(mockedRail.mock.calls.at(-1)?.[0]).not.toHaveProperty("composerOverlap")
const scrollerBoundary = renderer.container.querySelector("[data-message-scroller-boundary]")!
- expect(scrollerBoundary.querySelectorAll("accessory-rail")).toHaveLength(1)
+ expect(renderer.container.querySelector("[data-message-list-content]")).toHaveClass(
+ "pl-(--community-composer-inline-start)", "pr-(--community-composer-inline-end)",
+ )
+ expect(scrollerBoundary.querySelectorAll("accessory-rail")).toHaveLength(0)
+ expect(accessoryFooterSlot.querySelectorAll("accessory-rail")).toHaveLength(1)
expect(renderer.container.querySelectorAll("[data-message-typing-space]")).toHaveLength(0)
expect(renderRows).toHaveBeenCalledOnce()
expect(renderer.container.querySelectorAll("virtual-rows")).toHaveLength(1)
expect(renderer.container.querySelectorAll(".mb-6")).toHaveLength(0)
})
+
+ it("does not restore an accessory overlay inside the list while its Footer target is absent", () => {
+ const renderer = render(renderView(props(), controller(), () => React.createElement("virtual-rows")))
+ expect(mockedRail).not.toHaveBeenCalled()
+ expect(renderer.container.querySelector("accessory-rail")).toBeNull()
+ expect(renderer.getByTestId("community-message-scroller")).toBeInTheDocument()
+ })
+
it("keeps the same wrappers while true empty loading omits the interactive accessory rail", () => {
const listProps = props({ messages: [] })
const state = controller({
@@ -136,9 +157,8 @@ describe("renderMessageListView", () => {
const content = renderer.container.querySelector<HTMLElement>("[data-message-list-content]")!
expect(content).toHaveClass("opacity-100")
expect(content).not.toHaveClass("transition-opacity", "duration-300")
- expect(content.querySelector("[data-message-list-skeleton-tail]")).toHaveClass(
- "h-10", "sm:h-12", "shrink-0",
- )
+ expect(content.querySelector("[data-message-list-skeleton-tail]")).toHaveClass("shrink-0")
+ expect(content.querySelector("[data-message-list-skeleton-tail]")).toHaveStyle({ height: "40px" })
})
it("keeps positioned rows measurable but inert and hidden until reveal starts", () => {
@@ -168,19 +188,20 @@ describe("renderMessageListView", () => {
"absolute", "inset-0", "z-20", "pointer-events-none", "opacity-100",
)
expect(skeleton.querySelector('[data-slot="skeleton"]')).toBeInTheDocument()
- expect(skeleton.querySelector("[data-message-list-skeleton-tail]")).toHaveClass(
- "h-10", "sm:h-12", "shrink-0",
- )
+ expect(skeleton.querySelector("[data-message-list-skeleton-tail]")).toHaveClass("shrink-0")
+ expect(skeleton.querySelector("[data-message-list-skeleton-tail]")).toHaveStyle({ height: "40px" })
})
- it("reserves the responsive rail tail in the standalone skeleton", () => {
+ it("reserves the shared 40px rail tail in the standalone skeleton", () => {
const renderer = render(React.createElement(MessageListSkeleton))
const content = renderer.container.querySelector<HTMLElement>("[data-message-list-content]")!
const tail = content.querySelector("[data-message-list-skeleton-tail]")
expect(content).not.toHaveClass("pb-4", "sm:pb-6", "pb-14", "sm:pb-18")
expect(tail).toHaveAttribute("aria-hidden", "true")
- expect(tail).toHaveClass("h-10", "sm:h-12", "shrink-0")
+ expect(tail).toHaveClass("shrink-0")
+ expect(tail).toHaveStyle({ height: "40px" })
+ expect(content).toHaveClass("pl-(--community-composer-inline-start)", "pr-(--community-composer-inline-end)")
})
it("keeps the typed positioning skeleton through a timeout until settlement", () => {
diff --git a/src/web/src/components/community/messages/message-list-view.tsx b/src/web/src/components/community/messages/message-list-view.tsx
index fbaf487c3..26357f499 100644
--- a/src/web/src/components/community/messages/message-list-view.tsx
+++ b/src/web/src/components/community/messages/message-list-view.tsx
@@ -3,6 +3,7 @@ import { createPortal } from "react-dom"
import { ConversationResolutionErrorFrame } from "../channels/conversation-resolution-error-frame"
import { Skeleton } from "@/components/ui/skeleton"
import { tid } from "@/lib/community/testids"
+import { CONVERSATION_TAIL_SPACE_PX } from "@/lib/community/conversation-layout"
import { renderMessageListHero } from "./message-list-row"
import { ComposerAccessoryRail, MessageSelectionFooter } from "./composer-accessory-rail"
import { MessageShareDialog } from "./message-share-dialog"
@@ -14,6 +15,7 @@ export function renderMessageListView(
controller: MessageListController,
renderRows: () => ReactNode,
footerSlot: HTMLDivElement | null = null,
+ accessoryFooterSlot: HTMLDivElement | null = null,
) {
return (
<div className="relative flex min-h-0 flex-1 flex-col">
@@ -25,6 +27,15 @@ export function renderMessageListView(
/>,
footerSlot,
)}
+ {controller.initialPosition.contentInteractive && !controller.selectMode && accessoryFooterSlot && createPortal(
+ <ComposerAccessoryRail
+ typingNames={props.typingUsers ?? []}
+ scrollCount={controller.pillCount}
+ scrollMode={controller.pillMode}
+ onScroll={controller.pillOnClick}
+ />,
+ accessoryFooterSlot,
+ )}
{controller.shareOpen && controller.selectedMessages.length > 0 && (
<MessageShareDialog
m={controller.selectedMessages}
@@ -33,14 +44,6 @@ export function renderMessageListView(
/>
)}
<div data-message-scroller-boundary className="relative isolate min-h-0 flex-1">
- {controller.initialPosition.contentInteractive && !controller.selectMode && (
- <ComposerAccessoryRail
- typingNames={props.typingUsers ?? []}
- scrollCount={controller.pillCount}
- scrollMode={controller.pillMode}
- onScroll={controller.pillOnClick}
- />
- )}
<div
ref={controller.scrollRef}
data-testid={tid.messageScroller}
@@ -52,7 +55,7 @@ export function renderMessageListView(
data-read-position-ready={controller.readPositionReady ? "true" : "false"}
aria-hidden={!controller.initialPosition.showSkeleton && !controller.initialPosition.contentVisible}
inert={!controller.initialPosition.showSkeleton && !controller.initialPosition.contentInteractive}
- className={`${props.messages.length === 0 ? "flex min-h-full flex-col justify-end pt-8" : ""} px-4 ${
+ className={`${props.messages.length === 0 ? "flex min-h-full flex-col justify-end pt-8" : ""} pl-(--community-composer-inline-start) pr-(--community-composer-inline-end) ${
controller.initialPosition.phase === "revealing" && controller.initialPosition.contentVisible
? "opacity-100 transition-opacity duration-300 ease-linear motion-reduce:transition-opacity"
: controller.initialPosition.showSkeleton || controller.initialPosition.contentVisible
@@ -70,7 +73,7 @@ export function renderMessageListView(
{props.messages.length === 0
? <>
<div className="mb-6">{renderMessageListHero(props)}</div>
- <div aria-hidden="true" data-message-empty-tail className="h-10 shrink-0 sm:h-12" />
+ <div aria-hidden="true" data-message-empty-tail className="shrink-0" style={{ height: CONVERSATION_TAIL_SPACE_PX }} />
</>
: renderRows()}
</>
@@ -89,7 +92,7 @@ export function renderMessageListView(
: "opacity-100"
}`}
>
- <div className="flex min-h-full flex-col justify-end px-4 pt-8">
+ <div className="flex min-h-full flex-col justify-end pl-(--community-composer-inline-start) pr-(--community-composer-inline-end) pt-8">
<MessageListSkeletonContent variant={props.variant} />
</div>
</div>
@@ -113,7 +116,7 @@ export function MessageListSkeleton({ variant = "channel" }: { variant?: "channe
>
<div
data-message-list-content
- className="flex min-h-full flex-col justify-end px-4 pt-8"
+ className="flex min-h-full flex-col justify-end pl-(--community-composer-inline-start) pr-(--community-composer-inline-end) pt-8"
>
<MessageListSkeletonContent variant={variant} />
</div>
@@ -167,7 +170,8 @@ function MessageListSkeletonContent({ variant }: { variant: "channel" | "dm" })
<div
aria-hidden="true"
data-message-list-skeleton-tail
- className="h-10 shrink-0 sm:h-12"
+ className="shrink-0"
+ style={{ height: CONVERSATION_TAIL_SPACE_PX }}
/>
</>
)
diff --git a/src/web/src/components/community/messages/message-list.mount-identity.dom.test.ts b/src/web/src/components/community/messages/message-list.mount-identity.dom.test.ts
index dcc589272..bd372ceb1 100644
--- a/src/web/src/components/community/messages/message-list.mount-identity.dom.test.ts
+++ b/src/web/src/components/community/messages/message-list.mount-identity.dom.test.ts
@@ -1,6 +1,7 @@
import { afterEach, beforeEach, describe, it, expect, vi } from "vitest"
import React from "react"
import { MessageList } from "./message-list"
+import { ConversationFooterShell, ConversationFooterSlotProvider } from "./conversation-footer-shell"
import { render } from "@/test/react-dom-harness"
import { installMessageScrollFixture, restoreMessageScrollFixture, resize, scrollFixture } from "@/test/message-scroll-fixture"
import { tid } from "@/lib/community/testids"
@@ -32,17 +33,25 @@ describe("MessageList loading-to-loaded mount identity", () => {
})
it("keeps true-empty typing clearance and removes that spacer when the first native row arrives", () => {
const messages = [{ id: "m1", authorName: "Alice", content: "hi", createdAt: new Date(0).toISOString() }]
- const view = (empty: boolean) => React.createElement(MessageList, { channel: "general", messages: empty ? [] : messages, loading: false, typingUsers: ["Alice"], onOpenThread: vi.fn() })
+ const view = (empty: boolean) => React.createElement(ConversationFooterSlotProvider, null,
+ React.createElement(MessageList, { channel: "general", messages: empty ? [] : messages, loading: false, typingUsers: ["Alice"], onOpenThread: vi.fn() }),
+ React.createElement(ConversationFooterShell, null, React.createElement("div", { "data-testid": "composer" })),
+ )
const renderer = render(view(true))
resize()
expect(renderer.container.querySelector('[data-msg-id]')).toBeNull()
- expect(renderer.container.querySelector('[data-message-empty-tail]')).toHaveClass("h-10", "sm:h-12")
+ expect(renderer.container.querySelector('[data-message-empty-tail]')).toHaveStyle({ height: "40px" })
expect(renderer.getByTestId(tid.composerAccessoryRail)).toBeInTheDocument()
expect(renderer.getByTestId(tid.typingIndicator)).toHaveTextContent("Alice is typing")
const root = renderer.getByTestId(tid.messageScroller)
+ const typing = renderer.getByTestId(tid.typingIndicator)
+ const footer = renderer.container.querySelector('[data-slot="community-conversation-footer"]')!
+ expect(footer.contains(typing)).toBe(true)
+ expect(root.contains(typing)).toBe(false)
renderer.rerender(view(false))
resize()
expect(renderer.getByTestId(tid.messageScroller)).toBe(root)
+ expect(footer.contains(renderer.getByTestId(tid.typingIndicator))).toBe(true)
expect(renderer.container.querySelector('[data-message-empty-tail]')).toBeNull()
expect(renderer.container.querySelectorAll('[data-index]')).toHaveLength(3)
expect(renderer.container.querySelectorAll('[data-msg-id]')).toHaveLength(1)
diff --git a/src/web/src/components/community/messages/message-list.older-load.dom.test.ts b/src/web/src/components/community/messages/message-list.older-load.dom.test.ts
index b2f336f51..3a7a3903b 100644
--- a/src/web/src/components/community/messages/message-list.older-load.dom.test.ts
+++ b/src/web/src/components/community/messages/message-list.older-load.dom.test.ts
@@ -85,7 +85,7 @@ describe("MessageList native range pagination", () => {
})
beforeEach(() => { breakpoint.value = "desktop"; installMessageScrollFixture() })
afterEach(restoreMessageScrollFixture)
- it.each([["mobile", 40], ["desktop", 48]] as const)("keeps %s body-to-viewport clearance at %ipx with symmetric row padding", (stage, gap) => {
+ it.each([["mobile", 40], ["desktop", 40]] as const)("keeps %s body-to-viewport clearance at %ipx with symmetric row padding", (stage, gap) => {
breakpoint.value = stage
const messages = Array.from({ length: 14 }, (_, i) => ({ id: `m${i}`, authorName: "Alice", content: "hi", createdAt: new Date(0).toISOString() }))
const renderer = render(React.createElement(MessageList, { channel: "general", messages, loading: false, hasMore: false, onOpenThread: vi.fn() }))
diff --git a/src/web/src/components/community/messages/message-list.tsx b/src/web/src/components/community/messages/message-list.tsx
index d5a9046f9..46d5689d8 100644
--- a/src/web/src/components/community/messages/message-list.tsx
+++ b/src/web/src/components/community/messages/message-list.tsx
@@ -40,5 +40,5 @@ export function MessageList({
virtualizer={controller.virtualizer}
renderItem={(item, index) => renderMessageListRow(item, resolvedProps, controller, index)}
/>
- ), footerSlot?.target ?? null)
+ ), footerSlot?.target ?? null, footerSlot?.accessoryTarget ?? null)
}
diff --git a/src/web/src/hooks/community/use-scroll-anchor.repin.dom.test.ts b/src/web/src/hooks/community/use-scroll-anchor.repin.dom.test.ts
index bb970b660..104432825 100644
--- a/src/web/src/hooks/community/use-scroll-anchor.repin.dom.test.ts
+++ b/src/web/src/hooks/community/use-scroll-anchor.repin.dom.test.ts
@@ -417,10 +417,10 @@ describe("locked native adapter and existing message scroll owner", () => {
expect(bodyTop(h.root, "m0")).toBeGreaterThanOrEqual(0)
expect(bodyTop(h.root, "m0")).toBeLessThan(h.root.clientHeight)
})
- it("unifies native total and DOM max while keeping 40/48px rail clearance", () => {
+ it("unifies native total and DOM max with the shared 40px rail clearance", () => {
const h = mount()
expect(scrollFixture.latest.readPositionReady).toBe(true)
- expect(scrollFixture.latest.virtualizer.options).toMatchObject({ anchorTo: "end", followOnAppend: "auto", scrollEndThreshold: 1, scrollMargin: 0, paddingEnd: 40 })
+ expect(scrollFixture.latest.virtualizer.options).toMatchObject({ anchorTo: "end", followOnAppend: "auto", scrollEndThreshold: 1, scrollMargin: 0, paddingEnd: 32 })
expect(h.root.scrollHeight).toBe(scrollFixture.latest.virtualizer.getTotalSize())
expect(h.root.scrollTop).toBe(h.root.scrollHeight - scrollFixture.height)
h.update({ tailPaddingEnd: 40 })
diff --git a/src/web/src/hooks/community/use-scroll-anchor.test.ts b/src/web/src/hooks/community/use-scroll-anchor.test.ts
index a851a614f..8beee442f 100644
--- a/src/web/src/hooks/community/use-scroll-anchor.test.ts
+++ b/src/web/src/hooks/community/use-scroll-anchor.test.ts
@@ -3,19 +3,19 @@ import {
findMessageIndex,
findMountScrollTargetIndex,
measureMessageRow,
- MESSAGE_RAIL_TAIL_PADDING_END_PX,
MESSAGE_LIST_DISPLAY_END_THRESHOLD_PX,
- resolveMessageRailTailPaddingEnd,
resolveViewportResizeAnchor,
} from "./use-scroll-anchor"
-import type { FlatItem } from "@/lib/community/message-list-items"
+import { MESSAGE_ROW_VERTICAL_PADDING_PX, type FlatItem } from "@/lib/community/message-list-items"
+import { COMPOSER_ACCESSORY_ROW_HEIGHT_PX, CONVERSATION_TAIL_SPACE_PX, MESSAGE_RAIL_TAIL_PADDING_END_PX } from "@/lib/community/conversation-layout"
describe("message rail tail geometry", () => {
- it("counts the final row's 8px once in the 40px mobile and 48px desktop clearance", () => {
- expect(MESSAGE_RAIL_TAIL_PADDING_END_PX).toEqual({ mobile: 32, desktop: 40 })
- expect(resolveMessageRailTailPaddingEnd("mobile")).toBe(32)
- expect(resolveMessageRailTailPaddingEnd("desktop")).toBe(40)
- expect(resolveMessageRailTailPaddingEnd("unknown")).toBe(40)
+ it("counts the final row's 8px once in the shared 40px clearance", () => {
+ expect(MESSAGE_ROW_VERTICAL_PADDING_PX).toBe(8)
+ expect(MESSAGE_RAIL_TAIL_PADDING_END_PX).toBe(32)
+ expect(MESSAGE_RAIL_TAIL_PADDING_END_PX + MESSAGE_ROW_VERTICAL_PADDING_PX).toBe(CONVERSATION_TAIL_SPACE_PX)
+ expect(CONVERSATION_TAIL_SPACE_PX).toBe(40)
+ expect(COMPOSER_ACCESSORY_ROW_HEIGHT_PX).toBe(32)
})
})
diff --git a/src/web/src/hooks/community/use-scroll-anchor.ts b/src/web/src/hooks/community/use-scroll-anchor.ts
index cdafecc8a..31a2fcba2 100644
--- a/src/web/src/hooks/community/use-scroll-anchor.ts
+++ b/src/web/src/hooks/community/use-scroll-anchor.ts
@@ -2,24 +2,12 @@ import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useCallback, useLayoutEffect, useRef } from "react"
import { measureElement, useVirtualizer, type ReactVirtualizer } from "@tanstack/react-virtual"
import { COMMUNITY_VIRTUALIZER_REACT_OPTIONS } from "./virtualizer-react-options"
-import { estimateRowHeight, computeBelowCount, MESSAGE_ROW_VERTICAL_PADDING_PX, type FlatItem } from "@/lib/community/message-list-items"
+import { estimateRowHeight, computeBelowCount, type FlatItem } from "@/lib/community/message-list-items"
+import { MESSAGE_RAIL_TAIL_PADDING_END_PX } from "@/lib/community/conversation-layout"
export const INITIAL_POSITION_TIMEOUT_MS = 2_000
export const MESSAGE_LIST_DISPLAY_END_THRESHOLD_PX = 100
const VIEWPORT_RESIZE_TAIL_DISTANCE_PX = 100
-export const MESSAGE_RAIL_TAIL_PADDING_END_PX = {
- mobile: 40 - MESSAGE_ROW_VERTICAL_PADDING_PX,
- desktop: 48 - MESSAGE_ROW_VERTICAL_PADDING_PX,
-} as const
-
-export function resolveMessageRailTailPaddingEnd(
- breakpoint: "unknown" | "desktop" | "mobile",
-): number {
- return breakpoint === "mobile"
- ? MESSAGE_RAIL_TAIL_PADDING_END_PX.mobile
- : MESSAGE_RAIL_TAIL_PADDING_END_PX.desktop
-}
-
type ViewportResizeAnchor = "tail" | "start"
export interface ResolveViewportResizeAnchorInput {
@@ -96,7 +84,7 @@ export function useScrollAnchor({
isFetchingNewer,
presentVersion,
localSubmitVersion,
- tailPaddingEnd = MESSAGE_RAIL_TAIL_PADDING_END_PX.desktop,
+ tailPaddingEnd = MESSAGE_RAIL_TAIL_PADDING_END_PX,
onInitialPositionSettled,
}: {
items: FlatItem[]
diff --git a/src/web/src/lib/community/conversation-layout.ts b/src/web/src/lib/community/conversation-layout.ts
new file mode 100644
index 000000000..77b7403cb
--- /dev/null
+++ b/src/web/src/lib/community/conversation-layout.ts
@@ -0,0 +1,5 @@
+import { MESSAGE_ROW_VERTICAL_PADDING_PX } from "./message-list-items"
+
+export const CONVERSATION_TAIL_SPACE_PX = 40
+export const COMPOSER_ACCESSORY_ROW_HEIGHT_PX = 32
+export const MESSAGE_RAIL_TAIL_PADDING_END_PX = CONVERSATION_TAIL_SPACE_PX - MESSAGE_ROW_VERTICAL_PADDING_PX
diff --git a/src/web/src/test/e2e-ui/25-composer-accessory-rail-occupancy.spec.ts b/src/web/src/test/e2e-ui/25-composer-accessory-rail-occupancy.spec.ts
index fbb839000..34f6af8aa 100644
--- a/src/web/src/test/e2e-ui/25-composer-accessory-rail-occupancy.spec.ts
+++ b/src/web/src/test/e2e-ui/25-composer-accessory-rail-occupancy.spec.ts
@@ -34,6 +34,7 @@ async function sendExactMessage(sender: Page, receiver: Page, text: string) {
expect(response.status()).toBe(201)
const payload = await response.json() as { message: { id: string } }
await expect(receiver.getByTestId(tid.message(payload.message.id))).toBeVisible()
+ return payload.message.id
}
type Rect = {
@@ -57,6 +58,14 @@ type RailMetrics = {
firstVisibleOffset: number | null
}
composer: Rect
+ footer: Rect
+ accessorySlot: Rect
+ railInFooter: boolean
+ railInScroller: boolean
+ contentPaddingLeft: number
+ contentPaddingRight: number
+ composerPaddingLeft: number
+ composerPaddingRight: number
typing: Rect | null
center: Rect | null
finalMessage: Rect | null
@@ -84,6 +93,13 @@ async function railMetrics(page: Page, finalMessageId?: string): Promise<RailMet
const firstVisible = Array.from(scroller.querySelectorAll<HTMLElement>("[data-msg-id]"))
.find((row) => row.getBoundingClientRect().bottom > scrollerRect.top)
const content = document.querySelector<HTMLElement>("[data-message-list-content]")!
+ const composer = find(ids.composer)!
+ const footer = composer.closest<HTMLElement>('[data-slot="community-conversation-footer"]')!
+ const accessorySlot = footer.querySelector<HTMLElement>('[data-slot="community-composer-accessory-slot"]')!
+ const contentStyle = getComputedStyle(content)
+ const composerContent = composer.querySelector<HTMLElement>('[contenteditable="true"]')!
+ .closest<HTMLElement>('[class*="--community-composer-inline-start"]')!
+ const composerStyle = getComputedStyle(composerContent)
const finalMessage = ids.finalMessage ? find(ids.finalMessage) : null
const typingText = typing?.querySelector<HTMLElement>("span.min-w-0.truncate") ?? null
const style = typingText ? getComputedStyle(typingText) : null
@@ -111,11 +127,19 @@ async function railMetrics(page: Page, finalMessageId?: string): Promise<RailMet
? firstVisible.getBoundingClientRect().top - scrollerRect.top
: null,
},
- composer: toRect(find(ids.composer)!.getBoundingClientRect()),
+ composer: toRect(composer.getBoundingClientRect()),
+ footer: toRect(footer.getBoundingClientRect()),
+ accessorySlot: toRect(accessorySlot.getBoundingClientRect()),
+ railInFooter: !!rail && rail.parentElement === accessorySlot && rail.closest('[data-slot="community-conversation-footer"]') === footer,
+ railInScroller: !!rail && !!rail.closest("[data-message-scroller-boundary]"),
+ contentPaddingLeft: Number.parseFloat(contentStyle.paddingLeft),
+ contentPaddingRight: Number.parseFloat(contentStyle.paddingRight),
+ composerPaddingLeft: Number.parseFloat(composerStyle.paddingLeft),
+ composerPaddingRight: Number.parseFloat(composerStyle.paddingRight),
typing: typingVisible ? toRect(typing.getBoundingClientRect()) : null,
center: center ? toRect(center.getBoundingClientRect()) : null,
finalMessage: finalMessage ? toRect(finalMessage.getBoundingClientRect()) : null,
- contentPaddingBottom: Number.parseFloat(getComputedStyle(content).paddingBottom),
+ contentPaddingBottom: Number.parseFloat(contentStyle.paddingBottom),
documentClientWidth: document.documentElement.clientWidth,
documentScrollWidth: document.documentElement.scrollWidth,
typingText: typingText && style
@@ -212,10 +236,24 @@ function expectCheckpoint(
selection: boolean,
): void {
const evidence = `${state}@${width}: ${JSON.stringify(metrics)}`
- const expectedGap = width < 640 ? 8 : 16
- const expectedTailGap = width < 640 ? 40 : 48
+ const expectedGap = 4
+ const expectedTailGap = 40
expect(metrics.contentPaddingBottom, evidence).toBe(0)
+ expect(metrics.contentPaddingLeft, evidence).toBe(metrics.composerPaddingLeft)
+ expect(metrics.contentPaddingRight, evidence).toBe(metrics.composerPaddingRight)
expect(metrics.scroller.bottom, evidence).toBeLessThanOrEqual(metrics.composer.top + 1)
+ expect(Math.abs(metrics.scroller.bottom - metrics.footer.top), evidence).toBeLessThanOrEqual(1)
+ if (metrics.rail) {
+ expect(metrics.railInFooter, evidence).toBe(true)
+ expect(metrics.railInScroller, evidence).toBe(false)
+ expect(metrics.accessorySlot.height, evidence).toBe(40)
+ expect(metrics.rail.height, evidence).toBe(32)
+ expect(Math.abs(metrics.rail.top - metrics.accessorySlot.top - expectedGap), evidence).toBeLessThanOrEqual(1)
+ expect(Math.abs(metrics.accessorySlot.bottom - metrics.rail.bottom - expectedGap), evidence).toBeLessThanOrEqual(1)
+ expect(Math.abs(metrics.accessorySlot.bottom - metrics.footer.top), evidence).toBeLessThanOrEqual(1)
+ expect(Math.abs(metrics.rail.left - metrics.composer.left - metrics.composerPaddingLeft), evidence).toBeLessThanOrEqual(1)
+ expect(Math.abs(metrics.composer.right - metrics.composerPaddingRight - metrics.rail.right), evidence).toBeLessThanOrEqual(1)
+ }
if (metrics.typing?.width) {
expect(metrics.typing.height, `typing ${evidence}`).toBe(32)
expect(Math.abs(metrics.scroller.bottom - metrics.typing.bottom - expectedGap), evidence)
@@ -358,10 +396,14 @@ async function captureEmptyState(
expect(metrics.scroller.scrollHeight - metrics.scroller.clientHeight - metrics.scroller.scrollTop)
.toBeLessThanOrEqual(1)
await expect(page.getByTestId(tid.scrollToPresent)).toHaveCount(0)
- const expectedTailGap = width < 640 ? 40 : 48
+ const expectedTailGap = 40
expect(metrics.contentPaddingBottom).toBe(0)
+ expect(metrics.contentPaddingLeft).toBe(metrics.composerPaddingLeft)
+ expect(metrics.contentPaddingRight).toBe(metrics.composerPaddingRight)
expect(metrics.scroller.bottom - metrics.finalMessage!.bottom)
.toBeGreaterThanOrEqual(expectedTailGap - 1)
+ expect(Math.abs(metrics.scroller.bottom - metrics.finalMessage!.bottom - expectedTailGap))
+ .toBeLessThanOrEqual(1)
expect(metrics.scroller.bottom).toBeLessThanOrEqual(metrics.composer.top + 1)
const documentWidths = await page.evaluate(() => ({
client: document.documentElement.clientWidth,
@@ -425,7 +467,7 @@ test("composer accessory rail reallocates every occupied slot without overflow",
await expect(composerEditable(bob.page)).toBeVisible()
await expect(composerEditable(carol.page)).toBeVisible()
- const finalMessageId = selectableMessageId
+ let finalMessageId = selectableMessageId
await expect(alice.page.getByTestId(tid.message(finalMessageId))).toBeVisible()
const scrollRoot = alice.page.getByTestId(tid.messageScroller)
@@ -525,7 +567,7 @@ test("composer accessory rail reallocates every occupied slot without overflow",
expect(leftOnly[width].typing).not.toBeNull()
}
- await sendExactMessage(
+ finalMessageId = await sendExactMessage(
bob.page,
alice.page,
`long typing clear ${Date.now()}`,
@@ -577,12 +619,12 @@ test("composer accessory rail reallocates every occupied slot without overflow",
expect(selectionMultiple[width].center!.center).toBe(selectionNone[width].center!.center)
}
- await sendExactMessage(
+ finalMessageId = await sendExactMessage(
bob.page,
alice.page,
`multiple typing clear ${Date.now()}`,
)
- await sendExactMessage(
+ finalMessageId = await sendExactMessage(
carol.page,
alice.page,
`short typing clear ${Date.now()}`,
@@ -607,7 +649,7 @@ test("composer accessory rail reallocates every occupied slot without overflow",
expect(selectionLong[width].typing).toBeNull()
}
- await sendExactMessage(
+ finalMessageId = await sendExactMessage(
bob.page,
alice.page,
`theme typing clear ${Date.now()}`,
diff --git a/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts b/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts
index c53fbe02d..72486b083 100644
--- a/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts
+++ b/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts
@@ -655,7 +655,7 @@ test("mobile reply, avatar mention, and typing rail keep exact backend and WS id
expect(geometry.scroller!.bottom).toBeLessThanOrEqual(geometry.composer!.top + 1)
expect(geometry.rail!.bottom).toBeLessThanOrEqual(geometry.scroller!.bottom + 1)
expect(geometry.indicator!.height).toBe(32)
- expect(Math.abs(geometry.scroller!.bottom - geometry.indicator!.bottom - 8)).toBeLessThanOrEqual(1)
+ expect(Math.abs(geometry.scroller!.bottom - geometry.indicator!.bottom - 4)).toBeLessThanOrEqual(1)
expect(geometry.scroller!.bottom - geometry.finalMessage!.bottom).toBeGreaterThanOrEqual(39)
expect(geometry.scroller!.bottom - geometry.finalMessage!.bottom).toBeLessThanOrEqual(41)
expect(geometry.finalMessage!.bottom).toBeLessThanOrEqual(geometry.scroller!.bottom + 1)
@@ -683,7 +683,7 @@ test("mobile reply, avatar mention, and typing rail keep exact backend and WS id
})
expect(scrollTypingGeometry.rail!.bottom).toBeLessThanOrEqual(scrollTypingGeometry.scroller!.bottom + 1)
expect(scrollTypingGeometry.scroll!.bottom).toBeLessThanOrEqual(scrollTypingGeometry.scroller!.bottom + 1)
- expect(Math.abs(scrollTypingGeometry.scroller!.bottom - scrollTypingGeometry.indicator!.bottom - 8))
+ expect(Math.abs(scrollTypingGeometry.scroller!.bottom - scrollTypingGeometry.indicator!.bottom - 4))
.toBeLessThanOrEqual(1)
await alice.page.getByTestId(tid.scrollToPresent).click()
@@ -839,7 +839,7 @@ test("mobile reply, avatar mention, and typing rail keep exact backend and WS id
expect(dmGeometry.scroller!.bottom).toBeLessThanOrEqual(dmGeometry.composer!.top + 1)
expect(dmGeometry.rail!.bottom).toBeLessThanOrEqual(dmGeometry.scroller!.bottom + 1)
expect(dmGeometry.indicator!.height).toBe(32)
- expect(Math.abs(dmGeometry.scroller!.bottom - dmGeometry.indicator!.bottom - 8)).toBeLessThanOrEqual(1)
+ expect(Math.abs(dmGeometry.scroller!.bottom - dmGeometry.indicator!.bottom - 4)).toBeLessThanOrEqual(1)
expect(dmGeometry.horizontalOverflow).toBeLessThanOrEqual(0)
await bobDmEditable.fill("")
await expect(alice.page.getByTestId(tid.typingIndicator)).toBeHidden({ timeout: 15_000 })
diff --git a/src/web/src/test/e2e-ui/55-message-scroll-characterization.spec.ts b/src/web/src/test/e2e-ui/55-message-scroll-characterization.spec.ts
index ab7dc9d09..9e9a8b004 100644
--- a/src/web/src/test/e2e-ui/55-message-scroll-characterization.spec.ts
+++ b/src/web/src/test/e2e-ui/55-message-scroll-characterization.spec.ts
@@ -311,7 +311,11 @@ type MessageViewportGeometry = {
firstVisibleOffset: number | null
contentPaddingBottom: number
railPosition: string | null
- railRect: { top: number; bottom: number } | null
+ railRect: { top: number; bottom: number; height: number } | null
+ accessoryPosition: string | null
+ accessoryRect: { top: number; bottom: number; height: number } | null
+ railInFooter: boolean
+ railInScroller: boolean
composerRect: { top: number; bottom: number } | null
surfaceChannelId: string | null
scrollerRect: { top: number; bottom: number }
@@ -321,7 +325,6 @@ async function readMessageViewportGeometry(scroller: Locator): Promise<MessageVi
return scroller.evaluate((element, accessoryRailTestId) => {
const root = element as HTMLElement
const rootRect = root.getBoundingClientRect()
- const boundary = root.closest<HTMLElement>("[data-message-scroller-boundary]")
const surface = root.closest<HTMLElement>('[data-slot="community-conversation-surface"]')
const firstVisible = Array.from(root.querySelectorAll<HTMLElement>("[data-msg-id]"))
.find((row) => {
@@ -330,10 +333,12 @@ async function readMessageViewportGeometry(scroller: Locator): Promise<MessageVi
}) ?? null
const firstRect = firstVisible?.getBoundingClientRect() ?? null
const content = root.querySelector<HTMLElement>("[data-message-list-content]")
- const rail = boundary?.querySelector<HTMLElement>(`[data-testid="${accessoryRailTestId}"]`)
- const railRect = rail?.getBoundingClientRect() ?? null
const composer = surface?.querySelector<HTMLElement>('[data-slot="community-conversation-footer"]')
const composerRect = composer?.getBoundingClientRect() ?? null
+ const accessory = composer?.querySelector<HTMLElement>('[data-slot="community-composer-accessory-slot"]')
+ const accessoryRect = accessory?.getBoundingClientRect() ?? null
+ const rail = accessory?.querySelector<HTMLElement>(`[data-testid="${accessoryRailTestId}"]`)
+ const railRect = rail?.getBoundingClientRect() ?? null
return {
scrollTop: root.scrollTop,
scrollHeight: root.scrollHeight,
@@ -343,7 +348,11 @@ async function readMessageViewportGeometry(scroller: Locator): Promise<MessageVi
firstVisibleOffset: firstRect ? firstRect.top - rootRect.top : null,
contentPaddingBottom: content ? Number.parseFloat(getComputedStyle(content).paddingBottom) : 0,
railPosition: rail ? getComputedStyle(rail).position : null,
- railRect: railRect ? { top: railRect.top, bottom: railRect.bottom } : null,
+ railRect: railRect ? { top: railRect.top, bottom: railRect.bottom, height: railRect.height } : null,
+ accessoryPosition: accessory ? getComputedStyle(accessory).position : null,
+ accessoryRect: accessoryRect ? { top: accessoryRect.top, bottom: accessoryRect.bottom, height: accessoryRect.height } : null,
+ railInFooter: !!rail && rail.parentElement === accessory && rail.closest('[data-slot="community-conversation-footer"]') === composer,
+ railInScroller: !!rail && !!rail.closest("[data-message-scroller-boundary]"),
composerRect: composerRect ? { top: composerRect.top, bottom: composerRect.bottom } : null,
surfaceChannelId: surface?.dataset.channelId ?? null,
scrollerRect: { top: rootRect.top, bottom: rootRect.bottom },
@@ -370,7 +379,7 @@ async function waitForCommittedGeometry(scroller: Locator): Promise<MessageViewp
async function expectSkeletonTailGeometry(
page: Page,
- width: 390 | 1280,
+ _width: 390 | 1280,
label: string,
): Promise<void> {
const geometry = await page.locator("[data-message-list-skeleton-tail]").first().evaluate((tail, scrollerTestId) => {
@@ -388,7 +397,7 @@ async function expectSkeletonTailGeometry(
: null,
}
}, tid.messageScroller)
- const expectedTail = width < 640 ? 40 : 48
+ const expectedTail = 40
expect(geometry.contentPaddingBottom, `${label}: outer padding`).toBe(0)
expect(geometry.tailHeight, `${label}: placeholder height`).toBe(expectedTail)
expect(geometry.scrollerBottom, `${label}: scroller boundary`).not.toBeNull()
@@ -490,7 +499,16 @@ function expectInFlowMessageGeometry(geometry: MessageViewportGeometry, label: s
expect(geometry.contentPaddingBottom, `${label}: outer tail padding removed`).toBe(0)
expect(geometry.composerRect, `${label}: scoped composer`).not.toBeNull()
if (geometry.railRect) {
- expect(geometry.railPosition, `${label}: rail position`).toBe("absolute")
+ expect(geometry.railPosition, `${label}: rail position`).toBe("static")
+ expect(geometry.railInFooter, `${label}: Footer owns rail`).toBe(true)
+ expect(geometry.railInScroller, `${label}: rail outside scroller`).toBe(false)
+ expect(geometry.accessoryPosition, `${label}: accessory position`).toBe("absolute")
+ expect(geometry.accessoryRect, `${label}: accessory slot`).not.toBeNull()
+ expect(geometry.accessoryRect!.height, `${label}: accessory height`).toBe(40)
+ expect(geometry.railRect.height, `${label}: rail height`).toBe(32)
+ expect(Math.abs(geometry.railRect.top - geometry.accessoryRect!.top - 4), `${label}: upper center gap`).toBeLessThanOrEqual(1)
+ expect(Math.abs(geometry.accessoryRect!.bottom - geometry.railRect.bottom - 4), `${label}: lower center gap`).toBeLessThanOrEqual(1)
+ expect(Math.abs(geometry.accessoryRect!.bottom - geometry.composerRect!.top), `${label}: slot ends at Footer`).toBeLessThanOrEqual(1)
expect(geometry.railRect.top, `${label}: rail top`).toBeGreaterThanOrEqual(geometry.scrollerRect.top - 1)
expect(geometry.railRect.bottom, `${label}: rail bottom`).toBeLessThanOrEqual(geometry.scrollerRect.bottom + 1)
expect(geometry.railRect.bottom, `${label}: rail clears composer`).toBeLessThanOrEqual(
@@ -1176,8 +1194,8 @@ test.describe("message scroll characterization", () => {
messageId: tid.message(composerDmProfile.ids.at(-1)!),
})
expect(tailGeometry.paddingBottom).toBe(0)
- expect(tailGeometry.tailGap).toBeGreaterThanOrEqual(47)
- expect(tailGeometry.tailGap).toBeLessThanOrEqual(49)
+ expect(tailGeometry.tailGap).toBeGreaterThanOrEqual(39)
+ expect(tailGeometry.tailGap).toBeLessThanOrEqual(41)
expect(tailGeometry.scrollerBottom).toBeLessThanOrEqual(tailGeometry.composerTop + 1)
await startScrollTrace(alice.page, {
scenario: "dm-composer-clear-viewport",
@@ -1440,6 +1458,7 @@ test.describe("message scroll characterization", () => {
const typingOpen = await waitForCommittedGeometry(scroller)
expect(typingOpen.clientHeight).toBe(typingBase.clientHeight)
expectViewportAnchorPreserved(typingBase, typingOpen, "typing-rail-away")
+ expect(typingOpen.railRect, "typing-rail-away: scoped Footer rail exists").not.toBeNull()
expectInFlowMessageGeometry(typingOpen, "typing-rail-away")
await bobEditable.fill("")
await endScrollTraceAnalysis(alice.page, "typing-rail-away")