Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat(web): improve mobile message interactions (#607)
Gustavo Ye124d877fca03
diff --git a/scripts/ci/e2e-shards.mjs b/scripts/ci/e2e-shards.mjsindex 137792295..5e3ab7d12 100644--- a/scripts/ci/e2e-shards.mjs+++ b/scripts/ci/e2e-shards.mjs@@ -50,6 +50,7 @@ export const SPEC_SECONDS = {"36-server-switch-pending-checkpoint.spec.ts": 60,"37-server-rail-pdd.spec.ts": 10,"38-community-navigation-checkpoint-matrix.spec.ts": 60,+ "39-mobile-message-interactions.spec.ts": 20,"39-mobile-composer-send.spec.ts": 45,"40-mobile-server-header-hierarchy.spec.ts": 28,"40-server-rail-unread.spec.ts": 60,diff --git a/scripts/ci/e2e-shards.test.ts b/scripts/ci/e2e-shards.test.tsindex 90c847879..dae08896d 100644--- a/scripts/ci/e2e-shards.test.ts+++ b/scripts/ci/e2e-shards.test.ts@@ -70,7 +70,7 @@ describe("planE2eShards", () => {expect(first).toHaveLength(E2E_SHARD_COUNT)expect([...assigned].sort()).toEqual(specs)expect(new Set(assigned).size).toBe(specs.length)- expect(totals.sort((left, right) => left - right)).toEqual([366, 367, 367, 370, 370])+ expect(totals.sort((left, right) => left - right)).toEqual([369, 370, 373, 374, 374])expect(Math.max(...totals) / Math.min(...totals)).toBeLessThanOrEqual(1.15)})diff --git a/src/web/src/app/c/me/[dmId]/page.tsx b/src/web/src/app/c/me/[dmId]/page.tsxindex 2688241ea..5227e0ddc 100644--- a/src/web/src/app/c/me/[dmId]/page.tsx+++ b/src/web/src/app/c/me/[dmId]/page.tsx@@ -468,6 +468,7 @@ function DmView() {key={dmId}variant="dm"channel={dm.name}+ scrollMemoryKey={`dm:${dmId}`}messages={messages}loading={loadingOwnership.messageBodyLoading}newDividerBefore={newDividerBefore}diff --git a/src/web/src/components/community/channels/text-channel-surface.tsx b/src/web/src/components/community/channels/text-channel-surface.tsxindex 447f73b88..b3724335d 100644--- a/src/web/src/components/community/channels/text-channel-surface.tsx+++ b/src/web/src/components/community/channels/text-channel-surface.tsx@@ -10,6 +10,8 @@ import type { ChannelMemberPanelProps } from "@/components/community/members/chaimport { Composer } from "@/components/community/messages/composer"import { MessageContextSheet } from "@/components/community/messages/message-context-sheet"import { MessageList } from "@/components/community/messages/message-list"+import { useAuthorMentionInsertion } from "@/components/community/messages/use-author-mention-insertion"+import { readMessageScrollPosition } from "@/components/community/messages/message-scroll-memory"import {MessageChannelController,} from "@/components/community/messages/message-channel-controller"@@ -42,7 +44,7 @@ export function TextChannelSurface({serverId: stringserverParam: stringchannelName: string- viewer: { id: string; name: string; avatar: string }+ viewer: { id: string; name: string; discriminator?: string; avatar: string }anchorMessageId: string | nullheaderServer?: { id: string; name: string; icon: string | null; onNavigate: () => void }notificationLevel: ChannelNotifLevel@@ -63,12 +65,20 @@ export function TextChannelSurface({}) {const breakpoint = useBreakpoint()const [rightPanel, setRightPanel] = useState<RightPanel>(null)+ const mentionInsertion = useAuthorMentionInsertion({+ members: composerMembers,+ viewerUserId: viewer.id,+ viewerName: viewer.name,+ viewerDiscriminator: viewer.discriminator,+ })+ const scrollMemoryKey = `channel:${channelId}`const feed = useChannelMessageFeed({channelId,serverId,viewerUserId: viewer.id,isChildChannel: false,anchorMessageId,+ preferCachedWindowOnMount: readMessageScrollPosition(scrollMemoryKey) !== undefined,})useEffect(() => {setRightPanel(null)@@ -109,6 +119,7 @@ export function TextChannelSurface({<MessageListkey={channelId}channel={channelName}+ scrollMemoryKey={scrollMemoryKey}messages={feed.messages}loading={feed.isLoading}pinnedIds={controller.pinnedIds}@@ -118,6 +129,8 @@ export function TextChannelSurface({{...controller.messageActions}onOpenProfile={onOpenProfile}resolveUserName={resolveUserName}+ resolveAuthorMentionText={mentionInsertion.resolveAuthorMentionText}+ onInsertMentionText={mentionInsertion.insertMentionText}scrollToMessageId={controller.scrollTargetId}onScrollRoot={feed.setScrollRootEl}viewerUserId={viewer.id}@@ -139,6 +152,7 @@ export function TextChannelSurface({className="shrink-0"><Composer+ ref={mentionInsertion.composerRef}channel={channelName}context="channel"members={composerMembers}@@ -147,7 +161,7 @@ export function TextChannelSurface({sendContract="accepted"onAcceptSend={controller.acceptMessage}onTyping={controller.handleTyping}- replyingTo={controller.replyTo?.authorName}+ replyingTo={controller.replyTo ?? undefined}onCancelReply={() => controller.setReplyTo(null)}autoFocus={breakpoint === "desktop"}draftKey={`${serverId}/${channelId}`}diff --git a/src/web/src/components/community/channels/text-channel-surface.wiring.test.ts b/src/web/src/components/community/channels/text-channel-surface.wiring.test.tsnew file mode 100644index 000000000..2ebdfcf71--- /dev/null+++ b/src/web/src/components/community/channels/text-channel-surface.wiring.test.ts@@ -0,0 +1,123 @@+import React from "react"+import TestRenderer, { act } from "react-test-renderer"+import { describe, expect, it, vi } from "vitest"+import { TextChannelSurface } from "./text-channel-surface"+import { Composer } from "../messages/composer"+import type { MessageChannelControllerValue } from "../messages/message-channel-controller"++const mocks = vi.hoisted(() => ({+ replyTarget: {+ id: "reply_1",+ authorName: "Alice",+ text: "Exact channel target",+ },+}))++vi.mock("@/hooks/use-mobile", () => ({ useBreakpoint: () => "mobile" }))+vi.mock("@/hooks/community/use-channel-message-feed", () => ({+ useChannelMessageFeed: () => ({+ messages: [],+ isLoading: false,+ isFetchingOlder: false,+ isFetchingNewer: false,+ hasMoreOlder: false,+ hasMoreNewer: false,+ fetchOlder: vi.fn(),+ fetchNewer: vi.fn(),+ jumpToPresent: vi.fn(),+ readSnapshotFetching: false,+ anchorInCache: true,+ setScrollRootEl: vi.fn(),+ threads: [],+ pinned: [],+ }),+}))+vi.mock("@/components/community/channels/channel-header", () => ({+ ChannelHeader: () => null,+}))+vi.mock("@/components/community/channels/channel-shell", () => ({+ ChannelShell: ({ body }: { body: React.ReactNode }) => body,+}))+vi.mock("@/components/community/shell/community-panel", () => ({+ CommunityPanel: () => null,+}))+vi.mock("@/components/community/messages/composer", () => ({+ Composer: vi.fn(() => null),+}))+vi.mock("@/components/community/messages/message-context-sheet", () => ({+ MessageContextSheet: () => null,+}))+vi.mock("@/components/community/messages/message-list", () => ({+ MessageList: () => null,+}))+vi.mock("@/components/community/messages/use-author-mention-insertion", () => ({+ useAuthorMentionInsertion: () => ({+ composerRef: { current: null },+ resolveAuthorMentionText: vi.fn(),+ insertMentionText: vi.fn(),+ }),+}))+vi.mock("@/components/community/messages/message-scroll-memory", () => ({+ readMessageScrollPosition: () => undefined,+}))+vi.mock("@/components/community/messages/message-channel-controller", () => ({+ MessageChannelController: ({ children }: {+ children: (value: MessageChannelControllerValue) => React.ReactNode+ }) => children({+ feed: {} as MessageChannelControllerValue["feed"],+ pinnedIds: new Set(),+ replyTo: mocks.replyTarget,+ setReplyTo: vi.fn(),+ searchQuery: "",+ searchResults: [],+ search: vi.fn(),+ scrollTargetId: null,+ setScrollTargetId: vi.fn(),+ consumeScrollTarget: vi.fn(),+ contextTarget: null,+ setContextTarget: vi.fn(),+ openContextSeq: vi.fn(),+ onSheetReply: vi.fn(),+ jumpToSeq: vi.fn(),+ messageActions: {} as MessageChannelControllerValue["messageActions"],+ threadActions: {} as MessageChannelControllerValue["threadActions"],+ acceptMessage: vi.fn(() => true),+ handleTyping: vi.fn(),+ typingUsers: [],+ }),+}))++const mockedComposer = vi.mocked(Composer)++describe("TextChannelSurface reply target wiring", () => {+ it("passes the controller's exact reply target to Composer", () => {+ act(() => {+ TestRenderer.create(React.createElement(TextChannelSurface, {+ channelId: "channel_1",+ serverId: "server_1",+ serverParam: "server_1",+ channelName: "general",+ viewer: { id: "viewer_1", name: "Viewer", avatar: "V" },+ anchorMessageId: null,+ notificationLevel: "default",+ onSetNotificationLevel: vi.fn(),+ composerMembers: [],+ composerMentionCandidates: undefined,+ channelRefCandidates: [],+ memberPanelProps: {+ members: [],+ membersLoading: false,+ membersLoadingMore: false,+ membersHasMore: false,+ },+ manageMembersDialog: null,+ uiHandlers: {},+ onOpenThread: vi.fn(),+ onOpenProfile: vi.fn(),+ resolveUserName: (id: string) => id,+ }))+ })++ expect(mockedComposer.mock.calls.at(-1)?.[0].replyingTo).toBe(mocks.replyTarget)+ })+})diff --git a/src/web/src/components/community/channels/thread-channel-surface.test.ts b/src/web/src/components/community/channels/thread-channel-surface.test.tsindex 14e7c08f1..e2f402e7e 100644--- a/src/web/src/components/community/channels/thread-channel-surface.test.ts+++ b/src/web/src/components/community/channels/thread-channel-surface.test.ts@@ -168,7 +168,7 @@ function surfaceProps(overrides: Record<string, unknown> = {}) {serverId: "server_1",serverParam: "server_1",channelName: "Thread name",- viewer: { id: "viewer_1", name: "Viewer", avatar: "V" },+ viewer: { id: "viewer_1", name: "Viewer", discriminator: "1111", avatar: "V" },anchorMessageId: "m_target",parentChannelId: "parent_1",parentMessageId: "opener_1",@@ -185,7 +185,16 @@ function surfaceProps(overrides: Record<string, unknown> = {}) {onNavigateParent: vi.fn(),notificationLevel: "default" as const,onSetNotificationLevel: vi.fn(),- composerMembers: [{ id: "member_1", userId: "member_1", name: "Alice" }],+ composerMembers: [{+ id: "member_1",+ userId: "member_1",+ name: "Alice",+ discriminator: "0042",+ avatar: "A",+ status: "online",+ sub: "",+ role: "member",+ }],composerMentionCandidates: undefined,channelRefCandidates: [{ id: "parent_1", name: "general", serverId: "server_1", serverName: "Server", serverDiscriminator: "0001" }],memberPanelProps: {@@ -251,6 +260,7 @@ describe("ThreadChannelSurface ownership", () => {viewerUserId: "viewer_1",isChildChannel: true,anchorMessageId: "m_target",+ preferCachedWindowOnMount: false,})const messageListProps = mockedMessageList.mock.calls.at(-1)![0]const opener = messageListProps.hero as React.ReactElement<React.ComponentProps<typeof ThreadOpener>>@@ -259,6 +269,8 @@ describe("ThreadChannelSurface ownership", () => {parentMessageId: "opener_1",viewerUserId: "viewer_1",onOpenProfile: props.onOpenProfile,+ resolveAuthorMentionText: expect.any(Function),+ onInsertMentionText: expect.any(Function),}))act(() => opener.props.onJump?.())expect(mocks.router.push).toHaveBeenCalledWith("/c/channels/server_1/parent_1?msg=opener_1")@@ -281,6 +293,9 @@ describe("ThreadChannelSurface ownership", () => {onCreateThread: undefined,hero: expect.anything(),}), undefined)+ expect(messageListProps.resolveAuthorMentionText?.("member_1")).toBe("@Alice#0042")+ expect(messageListProps.resolveAuthorMentionText?.("viewer_1")).toBe("@Viewer#1111")+ expect(messageListProps.onInsertMentionText).toEqual(expect.any(Function))const composerProps = mockedComposer.mock.calls.at(-1)![0]expect(composerProps).toEqual(expect.objectContaining({channel: "Thread name",@@ -288,7 +303,7 @@ describe("ThreadChannelSurface ownership", () => {members: props.composerMembers,mentionCandidates: props.composerMentionCandidates,channelRefCandidates: props.channelRefCandidates,- replyingTo: "Alice",+ replyingTo: { id: "reply_1", authorName: "Alice", text: "hello" },autoFocus: true,draftKey: "server_1/thread_1",sendContract: "accepted",diff --git a/src/web/src/components/community/channels/thread-channel-surface.tsx b/src/web/src/components/community/channels/thread-channel-surface.tsxindex 38461b4e6..2ce53cf15 100644--- a/src/web/src/components/community/channels/thread-channel-surface.tsx+++ b/src/web/src/components/community/channels/thread-channel-surface.tsx@@ -13,6 +13,8 @@ import { Composer, ComposerSkeleton } from "@/components/community/messages/compimport { MessageChannelController } from "@/components/community/messages/message-channel-controller"import { MessageContextSheet } from "@/components/community/messages/message-context-sheet"import { MessageList } from "@/components/community/messages/message-list"+import { useAuthorMentionInsertion } from "@/components/community/messages/use-author-mention-insertion"+import { readMessageScrollPosition } from "@/components/community/messages/message-scroll-memory"import { ThreadOpener } from "@/components/community/messages/thread-opener"import type { FileAttachment, ImagePreview } from "@/lib/community/models/message"import type { OpenProfile } from "@/components/community/social/profile-types"@@ -58,7 +60,7 @@ export function ThreadChannelSurface({serverId: stringserverParam: stringchannelName: string- viewer: { id: string; name: string; avatar: string }+ viewer: { id: string; name: string; discriminator?: string; avatar: string }anchorMessageId: string | nullparentChannelId: string | nullparentMessageId: string | null@@ -89,14 +91,22 @@ export function ThreadChannelSurface({const breakpoint = useBreakpoint()const [rightPanel, setRightPanel] = useState<RightPanel>(null)const [localName, setLocalName] = useState<string | null>(null)+ const mentionInsertion = useAuthorMentionInsertion({+ members: composerMembers,+ viewerUserId: viewer.id,+ viewerName: viewer.name,+ viewerDiscriminator: viewer.discriminator,+ })const { mutateAsync: editMessageAsync } = useEditMessage()useClaimThreadOpenerReadHandoff(threadOpenerHandoff)+ const scrollMemoryKey = `thread:${channelId}`const feed = useChannelMessageFeed({channelId,serverId,viewerUserId: viewer.id,isChildChannel: true,anchorMessageId,+ preferCachedWindowOnMount: readMessageScrollPosition(scrollMemoryKey) !== undefined,})const displayName = localName ?? channelName@@ -157,6 +167,8 @@ export function ThreadChannelSurface({parentMessageId={parentMessageId}viewerUserId={viewer.id}onOpenProfile={onOpenProfile}+ resolveAuthorMentionText={mentionInsertion.resolveAuthorMentionText}+ onInsertMentionText={mentionInsertion.insertMentionText}onPreviewImage={(image) => uiHandlers.previewImage?.(image)}onPreviewAttachment={(attachment) => uiHandlers.previewAttachment?.(attachment)}onDownloadFile={(url, name) => {@@ -212,6 +224,7 @@ export function ThreadChannelSurface({<MessageListkey={channelId}channel={displayName}+ scrollMemoryKey={scrollMemoryKey}messages={controller.feed.messages}loading={controller.feed.isLoading}pinnedIds={controller.pinnedIds}@@ -221,6 +234,8 @@ export function ThreadChannelSurface({{...controller.threadActions}onOpenProfile={onOpenProfile}resolveUserName={resolveUserName}+ resolveAuthorMentionText={mentionInsertion.resolveAuthorMentionText}+ onInsertMentionText={mentionInsertion.insertMentionText}scrollToMessageId={controller.scrollTargetId}hero={opener}onScrollRoot={controller.feed.setScrollRootEl}@@ -243,6 +258,7 @@ export function ThreadChannelSurface({className="shrink-0"><Composer+ ref={mentionInsertion.composerRef}channel={displayName}context="thread"members={composerMembers}@@ -251,7 +267,7 @@ export function ThreadChannelSurface({sendContract="accepted"onAcceptSend={controller.acceptMessage}onTyping={controller.handleTyping}- replyingTo={controller.replyTo?.authorName}+ replyingTo={controller.replyTo ?? undefined}onCancelReply={() => controller.setReplyTo(null)}autoFocus={breakpoint === "desktop"}draftKey={`${serverId}/${channelId}`}diff --git a/src/web/src/components/community/messages/caret-text-insertion.test.ts b/src/web/src/components/community/messages/caret-text-insertion.test.tsnew file mode 100644index 000000000..d1a4da6cc--- /dev/null+++ b/src/web/src/components/community/messages/caret-text-insertion.test.ts@@ -0,0 +1,62 @@+import { describe, expect, it } from "vitest"+import { extractMentionedUserIds } from "@alook/shared"+import {+ mentionNodesForCaretInsertion,+ textNodeForCaretInsertion,+} from "./caret-text-insertion"++const ALICE = { userId: "alice_1", name: "Alice", discriminator: "0042" }+const TOKEN = "@Alice#0042"++function insertAtCaret(content: string, caret: number): string {+ const insertion = textNodeForCaretInsertion(TOKEN, {+ selection: { from: caret, to: caret },+ doc: {+ content: { size: content.length },+ textBetween: (from, to) => content.slice(from, to),+ },+ })+ expect(insertion.type).toBe("text")+ return `${content.slice(0, caret)}${insertion.text}${content.slice(caret)}`+}++describe("caret text boundaries", () => {+ it("separates an inserted token from identifier text on both sides", () => {+ const content = insertAtCaret("helloworld", 5)+ expect(content).toBe("hello @Alice#0042 world")+ expect(extractMentionedUserIds(content, [ALICE])).toEqual(["alice_1"])+ })++ it("does not add a leading space at the start of the document", () => {+ const content = insertAtCaret("hello", 0)+ expect(content).toBe("@Alice#0042 hello")+ expect(extractMentionedUserIds(content, [ALICE])).toEqual(["alice_1"])+ })++ it("does not duplicate existing whitespace or punctuation boundaries", () => {+ expect(insertAtCaret("hello world", 6)).toBe("hello @Alice#0042 world")+ expect(insertAtCaret("hello,world", 6)).toBe("hello,@Alice#0042 world")+ expect(insertAtCaret("hello , world", 7)).toBe("hello ,@Alice#0042 world")+ })++ it("wraps a structured mention in the same caret-aware boundaries", () => {+ const content = "helloworld"+ expect(mentionNodesForCaretInsertion({+ id: "member_1",+ label: "Alice#0042",+ }, {+ selection: { from: 5, to: 5 },+ doc: {+ content: { size: content.length },+ textBetween: (from, to) => content.slice(from, to),+ },+ })).toEqual([+ { type: "text", text: " " },+ {+ type: "mention",+ attrs: { id: "member_1", label: "Alice#0042" },+ },+ { type: "text", text: " " },+ ])+ })+})diff --git a/src/web/src/components/community/messages/caret-text-insertion.tiptap.test.ts b/src/web/src/components/community/messages/caret-text-insertion.tiptap.test.tsnew file mode 100644index 000000000..c81e63e1c--- /dev/null+++ b/src/web/src/components/community/messages/caret-text-insertion.tiptap.test.ts@@ -0,0 +1,35 @@+import { describe, expect, it } from "vitest"+import { Editor } from "@tiptap/react"+import StarterKit from "@tiptap/starter-kit"+import { textNodeForCaretInsertion } from "./caret-text-insertion"++function insertAtCaret(content: string, caret: number, token: string): string {+ const editor = new Editor({+ element: null,+ extensions: [StarterKit],+ content: {+ type: "doc",+ content: [{+ type: "paragraph",+ content: [{ type: "text", text: content }],+ }],+ },+ })+ editor.commands.setTextSelection(caret + 1)+ editor.commands.insertContent(textNodeForCaretInsertion(token, editor.state))+ const result = editor.getText()+ editor.destroy()+ return result+}++describe("caret text insertion through TipTap", () => {+ it("round-trips an HTML-shaped legal community name as literal text", () => {+ expect(insertAtCaret("helloworld", 5, "@<b>Alice</b>#0042"))+ .toBe("hello @<b>Alice</b>#0042 world")+ })++ it("round-trips an ampersand in a legal community name as literal text", () => {+ expect(insertAtCaret("saynow", 3, "@A&B#0043"))+ .toBe("say @A&B#0043 now")+ })+})diff --git a/src/web/src/components/community/messages/caret-text-insertion.ts b/src/web/src/components/community/messages/caret-text-insertion.tsnew file mode 100644index 000000000..7bde899c2--- /dev/null+++ b/src/web/src/components/community/messages/caret-text-insertion.ts@@ -0,0 +1,60 @@+const IDENTIFIER_CHAR = /[\p{L}\p{N}_-]/u++type CaretInsertionState = {+ selection: { from: number; to: number }+ doc: {+ content: { size: number }+ textBetween: (from: number, to: number, blockSeparator?: string, leafText?: string) => string+ }+}++function caretBoundarySpacing(state: CaretInsertionState): {+ leading: boolean+ trailing: boolean+} {+ const { from, to } = state.selection+ const beforeText = state.doc.textBetween(Math.max(0, from - 2), from, "\n", "\n")+ const afterText = state.doc.textBetween(to, Math.min(state.doc.content.size, to + 2), "\n", "\n")+ const before = Array.from(beforeText).at(-1)+ const after = Array.from(afterText)[0]+ return {+ leading: !!before && IDENTIFIER_CHAR.test(before),+ trailing: after === undefined || IDENTIFIER_CHAR.test(after),+ }+}++function textWithCaretBoundaries(+ text: string,+ spacing: { leading: boolean; trailing: boolean },+): string {+ if (!text) return text+ const leadingSpace = spacing.leading && !/^\s/u.test(text) ? " " : ""+ const trailingSpace = spacing.trailing && !/\s$/u.test(text) ? " " : ""+ return `${leadingSpace}${text}${trailingSpace}`+}++export function textNodeForCaretInsertion(+ text: string,+ state: CaretInsertionState,+): { type: "text"; text: string } {+ const spacing = caretBoundarySpacing(state)+ return {+ type: "text",+ text: textWithCaretBoundaries(text, spacing),+ }+}++export function mentionNodesForCaretInsertion(+ mention: { id: string; label: string },+ state: CaretInsertionState,+): Array<+ | { type: "text"; text: string }+ | { type: "mention"; attrs: { id: string; label: string } }+> {+ const spacing = caretBoundarySpacing(state)+ return [+ ...(spacing.leading ? [{ type: "text" as const, text: " " }] : []),+ { type: "mention" as const, attrs: mention },+ ...(spacing.trailing ? [{ type: "text" as const, text: " " }] : []),+ ]+}diff --git a/src/web/src/components/community/messages/composer-accessory-rail.test.ts b/src/web/src/components/community/messages/composer-accessory-rail.test.tsindex 0cfad582c..69c3b54f7 100644--- a/src/web/src/components/community/messages/composer-accessory-rail.test.ts+++ b/src/web/src/components/community/messages/composer-accessory-rail.test.ts@@ -23,7 +23,6 @@ vi.mock("@/components/ui/tooltip", () => ({}))const baseProps = {- typingNames: ["A very long teammate name that must not cover the center control"],scrollCount: 4,scrollMode: "jump" as const,onScroll: vi.fn(),@@ -66,32 +65,26 @@ describe("ComposerAccessoryRail", () => {}it.each([- [false, false, "empty"],- [true, false, "left-only"],- [false, true, "centered"],- [true, true, "centered"],+ [false, "empty"],+ [true, "centered"],] as const)(- "renders normal DOM matrix left=%s center=%s as %s",- (left, center, layout) => {+ "renders scroll=%s as %s",+ (center, layout) => {const renderer = render({- typingNames: left ? ["Alice"] : [],scrollCount: center ? 2 : 0,})const rails = renderer.root.findAllByProps({ "data-testid": tid.composerAccessoryRail })expect(rails).toHaveLength(layout === "empty" ? 0 : 1)- expect(renderer.root.findAllByProps({ "data-testid": tid.typingIndicator }))- .toHaveLength(left ? 1 : 0)expect(renderer.root.findAllByProps({ "data-testid": tid.scrollToPresent })).toHaveLength(center ? 1 : 0)if (layout === "empty") returnexpect(rails[0].props["data-layout"]).toBe(layout)- if (left) expect(slotClassName(renderer, tid.typingIndicator)).toContain("col-start-1")if (center) expect(slotClassName(renderer, tid.scrollToPresent)).toContain("col-start-2")},)- it("keeps selection centered, hides typing on mobile, and wires its actions", () => {+ it("keeps selection centered and wires its actions", () => {const renderer = render({ selectMode: true, selectedCount: 12 })const rail = renderer.root.findByProps({ "data-testid": tid.composerAccessoryRail })expect(rail.props).toMatchObject({@@ -101,10 +94,6 @@ describe("ComposerAccessoryRail", () => {expect(renderer.root.findAllByProps({ "data-testid": tid.scrollToPresent })).toHaveLength(0)expect(slotClassName(renderer, tid.messageSelectionToolbar)).toContain("col-start-2")- const typingSlotClassName = slotClassName(renderer, tid.typingIndicator)- expect(typingSlotClassName).toContain("hidden")- expect(typingSlotClassName).toContain("sm:block")-const toolbar = renderer.root.findByProps({ "data-testid": tid.messageSelectionToolbar })expect(toolbar.props.className).toContain("h-10")expect(toolbar.props.className).toContain("max-w-full")@@ -140,14 +129,13 @@ describe("ComposerAccessoryRail", () => {it("never reserves composer space for WebSocket state", () => {useCommunityWsStore.getState().setConnectionStatus("reconnecting")- const empty = render({ typingNames: [], scrollCount: 0 })+ const empty = render({ scrollCount: 0 })expect(empty.root.findAllByProps({ "data-testid": tid.composerAccessoryRail })).toHaveLength(0)useCommunityWsStore.getState().setConnectionStatus("failed")- const typing = render({ scrollCount: 0 })- expect(typing.root.findByProps({ "data-testid": tid.composerAccessoryRail }).props["data-layout"])- .toBe("left-only")- expect(typing.root.findAllByProps({ "data-testid": tid.wsRetry })).toHaveLength(0)+ const failed = render({ scrollCount: 0 })+ expect(failed.root.findAllByProps({ "data-testid": tid.composerAccessoryRail })).toHaveLength(0)+ expect(failed.root.findAllByProps({ "data-testid": tid.wsRetry })).toHaveLength(0)})it("does not reintroduce WS ownership or a viewport-derived width cap", () => {diff --git a/src/web/src/components/community/messages/composer-accessory-rail.tsx b/src/web/src/components/community/messages/composer-accessory-rail.tsxindex 94512101a..587eb789d 100644--- a/src/web/src/components/community/messages/composer-accessory-rail.tsx+++ b/src/web/src/components/community/messages/composer-accessory-rail.tsx@@ -7,10 +7,8 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltipimport { tid } from "@/lib/community/testids"import { cn } from "@/lib/utils"import { allocateComposerAccessoryRail } from "./composer-accessory-rail-layout"-import { TypingIndicator } from "./typing-indicator"export function ComposerAccessoryRail({- typingNames,scrollCount,scrollMode,onScroll,@@ -19,7 +17,6 @@ export function ComposerAccessoryRail({onCancelSelection,onShareSelection,}: {- typingNames: string[]scrollCount: numberscrollMode: "scroll" | "jump"onScroll: () => void@@ -28,11 +25,10 @@ export function ComposerAccessoryRail({onCancelSelection: () => voidonShareSelection: () => void}) {- const hasTyping = typingNames.length > 0const hasScroll = scrollCount > 0const layout = allocateComposerAccessoryRail(selectMode? { mode: "selection" }- : { mode: "normal", left: hasTyping, center: hasScroll })+ : { mode: "normal", left: false, center: hasScroll })if (layout === "empty") return null@@ -51,33 +47,19 @@ export function ComposerAccessoryRail({)}>{selectMode ? (- <>- {hasTyping && (- <div key="left" className="hidden min-w-0 max-w-full sm:col-start-1 sm:block">- <TypingIndicator names={typingNames} className="w-fit max-w-full" />- </div>- )}+ <div key="center" className="col-start-2 min-w-0 max-w-full justify-self-center">+ <SelectionToolbar+ selectedCount={selectedCount}+ onCancel={onCancelSelection}+ onShare={onShareSelection}+ />+ </div>+ ) : (+ hasScroll && (<div key="center" className="col-start-2 min-w-0 max-w-full justify-self-center">- <SelectionToolbar- selectedCount={selectedCount}- onCancel={onCancelSelection}- onShare={onShareSelection}- />+ <ScrollControl count={scrollCount} mode={scrollMode} onClick={onScroll} /></div>- </>- ) : (- <>- {hasTyping && (- <div key="left" className="col-start-1 min-w-0 max-w-full">- <TypingIndicator names={typingNames} className="w-fit max-w-full" />- </div>- )}- {hasScroll && (- <div key="center" className="col-start-2 min-w-0 max-w-full justify-self-center">- <ScrollControl count={scrollCount} mode={scrollMode} onClick={onScroll} />- </div>- )}- </>+ ))}</div></div>diff --git a/src/web/src/components/community/messages/composer-facade.contract.test.ts b/src/web/src/components/community/messages/composer-facade.contract.test.tsindex 9b39dbc6a..bb0dc229f 100644--- a/src/web/src/components/community/messages/composer-facade.contract.test.ts+++ b/src/web/src/components/community/messages/composer-facade.contract.test.ts@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url"import type { ComponentProps, ComponentRef } from "react"import { describe, expect, expectTypeOf, it } from "vitest"import { Composer } from "./composer"-import type { ComposerHandle, ComposerProps } from "./composer"+import type { ComposerHandle, ComposerMention, ComposerProps } from "./composer"const messagesDirectory = dirname(fileURLToPath(import.meta.url))const webRoot = resolve(messagesDirectory, "../../../..")@@ -12,11 +12,14 @@ const readWeb = (path: string) =>readFileSync(resolve(webRoot, path), "utf8")describe("Composer public facade", () => {- it("keeps the exact props and five-method forwarded handle", () => {+ it("keeps the exact props and seven-method forwarded handle", () => {expectTypeOf<ComponentProps<typeof Composer>>().toEqualTypeOf<ComposerProps>()expectTypeOf<ComponentRef<typeof Composer>>().toEqualTypeOf<ComposerHandle>()+ expectTypeOf<ComposerMention>().toEqualTypeOf<{ id: string; label: string }>()expectTypeOf<keyof ComposerHandle>().toEqualTypeOf<| "focusEditor"+ | "insertTextAtCaret"+ | "insertMentionAtCaret"| "submitNow"| "resetAfterSubmit"| "isEmpty"@@ -24,7 +27,7 @@ describe("Composer public facade", () => {>()})- it("retains the original-path seven-export facade", () => {+ it("retains the original-path eight-export facade", () => {const source = readWeb("src/components/community/messages/composer.tsx")const namesFromBlocks = (pattern: RegExp) =>[...source.matchAll(pattern)].flatMap((match) =>@@ -41,7 +44,7 @@ describe("Composer public facade", () => {),]expect(new Set(typeExports)).toEqual(- new Set(["ComposerHandle", "ComposerProps", "SendAttachment"]),+ new Set(["ComposerHandle", "ComposerMention", "ComposerProps", "SendAttachment"]),)expect(new Set(valueExports)).toEqual(new Set([diff --git a/src/web/src/components/community/messages/composer-types.ts b/src/web/src/components/community/messages/composer-types.tsindex 46315ea2a..dacc8fcd3 100644--- a/src/web/src/components/community/messages/composer-types.ts+++ b/src/web/src/components/community/messages/composer-types.ts@@ -6,6 +6,16 @@ import type { Member } from "@/lib/community/models/people"type ComposerMode = "chat" | "forumThreadBody"+export type ComposerReplyTarget = {+ authorName: string+ text: string+}++export type ComposerMention = {+ id: string+ label: string+}+export type MentionCandidateSource = {loading: booleanloadingMore: boolean@@ -30,6 +40,8 @@ export type ChannelRefCandidateSource = {export type ComposerHandle = {focusEditor: () => void+ insertTextAtCaret: (text: string) => void+ insertMentionAtCaret: (mention: ComposerMention) => voidsubmitNow: () => voidresetAfterSubmit: () => voidisEmpty: () => boolean@@ -45,7 +57,7 @@ type ComposerBaseProps = {channelRefCandidateSource?: ChannelRefCandidateSourceonChannelRefIntent?: () => voidonTyping?: () => void- replyingTo?: string+ replyingTo?: ComposerReplyTarget | stringonCancelReply?: () => voidautoFocus?: booleanmode?: ComposerModediff --git a/src/web/src/components/community/messages/composer-view.test.ts b/src/web/src/components/community/messages/composer-view.test.tsindex 6bcec79e0..b47a061be 100644--- a/src/web/src/components/community/messages/composer-view.test.ts+++ b/src/web/src/components/community/messages/composer-view.test.ts@@ -16,25 +16,8 @@ vi.mock("lucide-react", () => ({SendHorizontal: (props: Record<string, unknown>) =>createElement("send-icon", props),Smile: (props: Record<string, unknown>) => createElement("smile-icon", props),- Upload: (props: Record<string, unknown>) =>- createElement("upload-icon", props),X: (props: Record<string, unknown>) => createElement("x-icon", props),}))-vi.mock("@/components/ui/dropdown-menu", () => ({- DropdownMenu: (props: Record<string, unknown>) =>- createElement("dropdown-menu", props),- DropdownMenuTrigger: (props: Record<string, unknown>) =>- createElement(- "dropdown-trigger",- props,- props.render as never,- props.children as never,- ),- DropdownMenuContent: (props: Record<string, unknown>) =>- createElement("dropdown-content", props),- DropdownMenuItem: (props: Record<string, unknown>) =>- createElement("dropdown-item", props),-}))vi.mock("@/components/ui/skeleton", () => ({Skeleton: (props: Record<string, unknown>) => createElement("skeleton", props),}))@@ -84,7 +67,6 @@ function baseProps(showSend: false,sendDisabled: true,onSend: vi.fn(),- onAttachOpenChange: vi.fn(),onUploadFile: vi.fn(),onEmojiPick: vi.fn(),...overrides,@@ -149,7 +131,7 @@ describe("ComposerView", () => {createElement(ComposerView,baseProps({- replyingTo: "Ada",+ replyingTo: { authorName: "Ada", text: "First target" },onCancelReply,pendingFiles,removePendingFile,@@ -190,6 +172,7 @@ describe("ComposerView", () => {.join(" ")expect(renderedText).toContain("Replying to")expect(renderedText).toContain("Ada")+ expect(renderedText).toContain("First target")expect(renderedText).toContain("photo.png")expect(renderedText).toContain("notes.txt")expect(renderedText).toContain("Drop files here")@@ -244,9 +227,9 @@ describe("ComposerView", () => {expect(renderer.root.find((node) => node.props["data-testid"] === tid.composerAttach,- ).props["aria-label"],- ).toBe("Add")- for (const label of ["Cancel reply", "Remove file", "Add", "Emoji picker"]) {+ ).props["aria-label"],+ ).toBe("Add file")+ for (const label of ["Cancel reply", "Remove file", "Add file", "Emoji picker"]) {expect(renderer.root.findAll((node) => node.type === "button" && node.props["aria-label"] === label,@@ -267,7 +250,7 @@ describe("ComposerView", () => {node.type === "div" && node.props.className?.includes("flex-wrap"),).props.className,).not.toContain("rounded-t-xl")- expect(renderer.root.findAllByType("dropdown-menu")).toHaveLength(1)+ expect(renderer.root.findAllByType("dropdown-menu")).toHaveLength(0)expect(renderer.root.findAllByType("emoji-picker")).toHaveLength(1)await act(async () => {@@ -286,8 +269,7 @@ describe("ComposerView", () => {).toContain("rounded-t-xl border-t")})- it("forwards only event wiring and honors forum/hide flags", async () => {- const onAttachOpenChange = vi.fn()+ it("opens the file picker directly and honors forum/hide flags", async () => {const onUploadFile = vi.fn()const onEmojiPick = vi.fn()let renderer!: TestRenderer.ReactTestRenderer@@ -295,20 +277,18 @@ describe("ComposerView", () => {renderer = TestRenderer.create(createElement(ComposerView,- baseProps({ onAttachOpenChange, onUploadFile, onEmojiPick }),+ baseProps({ onUploadFile, onEmojiPick }),),)})await act(async () =>- renderer.root.findByType("dropdown-menu").props.onOpenChange(false),- )- await act(async () =>- renderer.root.findByType("dropdown-item").props.onClick(),+ renderer.root.findByProps({+ "data-testid": tid.composerAttach,+ }).props.onClick(),)await act(async () =>renderer.root.findByType("emoji-picker").props.onPick("🌱"),)- expect(onAttachOpenChange).toHaveBeenCalledWith(false)expect(onUploadFile).toHaveBeenCalledOnce()expect(onEmojiPick).toHaveBeenCalledWith("🌱")expect(@@ -346,6 +326,51 @@ describe("ComposerView", () => {)})+ it("shows the exact same-author reply target as one stripped, truncated line", async () => {+ const first = {+ authorName: "Ada",+ text: "**First** target with [docs](https://example.test) " + "x".repeat(320),+ }+ const second = {+ authorName: "Ada",+ text: "_Second_ target",+ }+ let renderer!: TestRenderer.ReactTestRenderer+ await act(async () => {+ renderer = TestRenderer.create(+ createElement(ComposerView, baseProps({ replyingTo: first })),+ )+ })++ let preview = renderer.root.findByProps({+ "data-slot": "composer-reply-preview",+ })+ expect(preview.children.join("")).toBe(+ "First target with docs " + "x".repeat(320),+ )+ expect(preview.props.className).toContain("truncate")+ expect(preview.parent?.props.className).toContain("min-w-0")++ await act(async () => {+ renderer.update(+ createElement(ComposerView, baseProps({ replyingTo: second })),+ )+ })+ preview = renderer.root.findByProps({+ "data-slot": "composer-reply-preview",+ })+ expect(preview.children.join("")).toBe("Second target")++ await act(async () => {+ renderer.update(+ createElement(ComposerView, baseProps({ replyingTo: "Legacy DM" })),+ )+ })+ expect(renderer.root.findAllByProps({+ "data-slot": "composer-reply-preview",+ })).toHaveLength(0)+ })+it("renders the mobile send control after emoji with exact eligibility and padding", async () => {const onSend = vi.fn()let renderer!: TestRenderer.ReactTestRenderer@@ -381,7 +406,7 @@ describe("ComposerView", () => {.findAllByType("button").map((node) => node.props["aria-label"]).filter(Boolean),- ).toEqual(["Add", "Emoji picker", "Send message"])+ ).toEqual(["Add file", "Emoji picker", "Send message"])await act(async () => {renderer.update(diff --git a/src/web/src/components/community/messages/composer-view.tsx b/src/web/src/components/community/messages/composer-view.tsxindex 730a642c1..ca7808ea9 100644--- a/src/web/src/components/community/messages/composer-view.tsx+++ b/src/web/src/components/community/messages/composer-view.tsx@@ -10,15 +10,9 @@ import {PlusCircle,SendHorizontal,Smile,- Upload,X,} from "lucide-react"-import {- DropdownMenu,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuTrigger,-} from "@/components/ui/dropdown-menu"+import { stripInlineMarkup } from "@alook/shared"import { Skeleton } from "@/components/ui/skeleton"import type { PendingFile } from "@/hooks/use-file-attachments"import type {@@ -35,6 +29,7 @@ import {ChannelRefList,CommunityMentionList,} from "./composer-suggestion-popups"+import type { ComposerReplyTarget } from "./composer-types"export type ComposerViewProps = {isForumThreadBody: boolean@@ -47,7 +42,7 @@ export type ComposerViewProps = {mentionPresentation: MentionCandidatePresentationchannelRefPopup: ChannelRefPopupStatechannelRefPresentation?: ChannelRefCandidatePresentation- replyingTo?: string+ replyingTo?: ComposerReplyTarget | stringonCancelReply?: () => voidpendingFiles: PendingFile[]removePendingFile: (index: number) => void@@ -59,7 +54,6 @@ export type ComposerViewProps = {showSend: booleansendDisabled: booleanonSend: () => void- onAttachOpenChange: (open: boolean) => voidonUploadFile: () => voidonEmojiPick: (emoji: string) => void}@@ -87,10 +81,18 @@ export function ComposerView({showSend,sendDisabled,onSend,- onAttachOpenChange,onUploadFile,onEmojiPick,}: ComposerViewProps) {+ const replyAuthorName = typeof replyingTo === "string"+ ? replyingTo+ : replyingTo?.authorName+ const replyPreview = typeof replyingTo === "string"+ ? null+ : replyingTo+ ? stripInlineMarkup(replyingTo.text)+ : null+return (<divclassName={@@ -111,11 +113,21 @@ export function ComposerView({/>{replyingTo && (- <div className="flex items-center gap-2 rounded-t-xl border border-b-0 border-border/40 bg-muted/60 px-4 py-2 text-xs text-muted-foreground">- <span className="min-w-0 truncate">- Replying to{" "}- <span className="font-medium text-foreground">{replyingTo}</span>- </span>+ <div className="flex items-start gap-2 rounded-t-xl border border-b-0 border-border/40 bg-muted/60 px-4 py-2 text-xs text-muted-foreground">+ <div className="min-w-0 flex-1">+ <div className="truncate">+ Replying to{" "}+ <span className="font-medium text-foreground">{replyAuthorName}</span>+ </div>+ {replyPreview !== null && (+ <div+ data-slot="composer-reply-preview"+ className="mt-0.5 truncate text-foreground/70"+ >+ {replyPreview}+ </div>+ )}+ </div><buttononClick={onCancelReply}className="ml-auto grid size-4 shrink-0 place-items-center rounded-full hover:bg-foreground/10 hover:text-foreground"@@ -198,24 +210,15 @@ export function ComposerView({/></div>{!hideAttach && (- <DropdownMenu onOpenChange={onAttachOpenChange}>- <DropdownMenuTrigger- render={- <button- data-testid={tid.composerAttach}- className="absolute left-2 bottom-2 grid size-8 place-items-center rounded-full text-muted-foreground hover:bg-accent hover:text-foreground aria-expanded:bg-accent aria-expanded:text-foreground"- aria-label="Add"- />- }- >- <PlusCircle className="size-5" />- </DropdownMenuTrigger>- <DropdownMenuContent side="top" align="start" className="w-44">- <DropdownMenuItem onClick={onUploadFile}>- <Upload className="size-4" /> Upload a File- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>+ <button+ type="button"+ data-testid={tid.composerAttach}+ className="absolute left-2 bottom-2 grid size-8 place-items-center rounded-full text-muted-foreground hover:bg-accent hover:text-foreground"+ aria-label="Add file"+ onClick={onUploadFile}+ >+ <PlusCircle className="size-5" />+ </button>)}{!hideEmoji && (<EmojiPickerPopover side="top" align="end" onPick={onEmojiPick}>diff --git a/src/web/src/components/community/messages/composer.send-lifecycle.test.ts b/src/web/src/components/community/messages/composer.send-lifecycle.test.tsindex e02e531c0..69ae91bcc 100644--- a/src/web/src/components/community/messages/composer.send-lifecycle.test.ts+++ b/src/web/src/components/community/messages/composer.send-lifecycle.test.ts@@ -136,7 +136,7 @@ describe("Composer committed send lifecycle", () => {await act(async () => {renderer.update(React.createElement(Composer, {...baseProps,- replyingTo: "Latest reply",+ replyingTo: { authorName: "Latest reply", text: "First target" },onAcceptSend: rejectLatest,} satisfies ComposerProps))})@@ -167,7 +167,7 @@ describe("Composer committed send lifecycle", () => {await act(async () => {renderer.update(React.createElement(Composer, {...baseProps,- replyingTo: "Latest reply",+ replyingTo: { authorName: "Latest reply", text: "First target" },onAcceptSend: acceptedLatest,} satisfies ComposerProps))})diff --git a/src/web/src/components/community/messages/composer.tsx b/src/web/src/components/community/messages/composer.tsxindex d983499c3..2453c7f5d 100644--- a/src/web/src/components/community/messages/composer.tsx+++ b/src/web/src/components/community/messages/composer.tsx@@ -7,7 +7,7 @@ import { useComposerController } from "./use-composer-controller"import type { ComposerHandle, ComposerProps } from "./composer-types"export type { SendAttachment }-export type { ComposerHandle, ComposerProps } from "./composer-types"+export type { ComposerHandle, ComposerMention, ComposerProps } from "./composer-types"export {clipboardFiles,pendingFilesToSendAttachments,diff --git a/src/web/src/components/community/messages/message-channel-controller-actions.test.ts b/src/web/src/components/community/messages/message-channel-controller-actions.test.tsindex 14c0c2e1c..24f67b00d 100644--- a/src/web/src/components/community/messages/message-channel-controller-actions.test.ts+++ b/src/web/src/components/community/messages/message-channel-controller-actions.test.ts@@ -242,6 +242,40 @@ describe("createMessageActions", () => {expect("onDelete" in harness.actions).toBe(false)})+ it("selects the exact reply content for two messages by the same author", () => {+ const harness = setup()+ harness.actionContext.current.messages = [+ {+ id: "same_author_a",+ type: "chat",+ authorName: "Alice",+ content: "Target A",+ createdAt: new Date(1).toISOString(),+ },+ {+ id: "same_author_b",+ type: "chat",+ authorName: "Alice",+ content: "Target B",+ createdAt: new Date(2).toISOString(),+ },+ ]++ harness.actions.onReply("same_author_a")+ harness.actions.onReply("same_author_b")++ expect(harness.setReplyTo).toHaveBeenNthCalledWith(1, {+ id: "same_author_a",+ authorName: "Alice",+ text: "Target A",+ })+ expect(harness.setReplyTo).toHaveBeenNthCalledWith(2, {+ id: "same_author_b",+ authorName: "Alice",+ text: "Target B",+ })+ })+it("uses projected reply text for actions and restores one canonical prefix on edit", async () => {const harness = setup()harness.actionContext.current.messages = [{diff --git a/src/web/src/components/community/messages/message-list-controller.test.ts b/src/web/src/components/community/messages/message-list-controller.test.tsindex b3336ea37..28a04fcd1 100644--- a/src/web/src/components/community/messages/message-list-controller.test.ts+++ b/src/web/src/components/community/messages/message-list-controller.test.ts@@ -6,6 +6,12 @@ import TestRenderer, { act } from "react-test-renderer"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 {+ clearMessageScrollPositions,+ captureActiveMessageScrollPosition,+ readMessageScrollPosition,+ writeMessageScrollPosition,+} from "./message-scroll-memory"const webRoot = resolve(dirname(fileURLToPath(import.meta.url)), "../../../..")const readWebSource = (path: string) => readFileSync(resolve(webRoot, path), "utf8")@@ -16,7 +22,7 @@ const mocks = vi.hoisted(() => ({sentinelInputs: [] as unknown[],sentinelRefs: [] as Array<{ current: null }>,scrollRef: { current: null as HTMLDivElement | null },- virtualizer: {},+ virtualizer: { scrollToOffset: vi.fn(), containerRef: { current: null } },jumpToIndex: vi.fn(),scrollToBottom: vi.fn(),onImageLoad: vi.fn(),@@ -91,12 +97,23 @@ describe("useMessageListController", () => {let requestFrame: ReturnType<typeof vi.fn>let cancelFrame: ReturnType<typeof vi.fn>let visibleMessageIds: string[]+ let selectionRailTop: number | null+ let selectedRowBottom: numberconst disconnect = vi.fn()const heroNode = { offsetHeight: 0 }const scrollNode = {+ scrollTop: 0,+ scrollHeight: 3206,+ clientHeight: 692,+ isConnected: true,+ parentElement: {+ querySelector: () => selectionRailTop === null ? null : ({+ getBoundingClientRect: () => ({ top: selectionRailTop }),+ }),+ },querySelectorAll: () => visibleMessageIds.map((id) => ({dataset: { msgId: id },- getBoundingClientRect: () => ({ top: 10, bottom: 20 }),+ getBoundingClientRect: () => ({ top: 10, bottom: selectedRowBottom }),})),getBoundingClientRect: () => ({ top: 0, bottom: 100 }),}@@ -111,9 +128,15 @@ describe("useMessageListController", () => {mocks.scrollRef.current = nullmocks.jumpToIndex.mockClear()mocks.scrollToBottom.mockClear()+ mocks.virtualizer.scrollToOffset.mockClear()nextFrameId = 0frameCallbacks = new Map()visibleMessageIds = ["m1"]+ selectionRailTop = null+ selectedRowBottom = 20+ scrollNode.scrollTop = 0+ scrollNode.clientHeight = 692+ clearMessageScrollPositions()heroNode.offsetHeight = 0requestFrame = vi.fn((callback: FrameRequestCallback) => {const id = ++nextFrameId@@ -129,6 +152,7 @@ describe("useMessageListController", () => {})vi.stubGlobal("window", {setTimeout,+ clearTimeout,requestAnimationFrame: requestFrame,cancelAnimationFrame: cancelFrame,})@@ -170,6 +194,7 @@ describe("useMessageListController", () => {viewerUserId: undefined,heroHeight: 0,heroMeasured: false,+ restoredScrollTop: undefined,})expect(mocks.sentinelInputs.slice(0, 2)).toEqual([{@@ -235,6 +260,7 @@ describe("useMessageListController", () => {viewerUserId: "viewer_1",heroHeight: 0,heroMeasured: true,+ restoredScrollTop: undefined,})expect(mocks.sentinelInputs.slice(-2)).toEqual([{@@ -297,6 +323,80 @@ describe("useMessageListController", () => {expect(disconnect).toHaveBeenCalled()})+ it("restores through the virtualizer and captures scroll before route teardown", () => {+ writeMessageScrollPosition("channel:one", 2200)+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(+ React.createElement(Probe, { value: props({ scrollMemoryKey: "channel:one" }) }),+ { createNodeMock },+ )+ })+ expect(mocks.virtualizer.scrollToOffset).toHaveBeenCalledWith(2200, { align: "start" })+ scrollNode.scrollTop = 2200+ runNextFrame()+ runNextFrame()++ scrollNode.scrollTop = 1880+ runNextFrame()+ expect(scrollNode.scrollTop).toBe(1880)++ act(() => {+ renderer!.update(React.createElement(Probe, {+ value: props({ scrollMemoryKey: "channel:one" }),+ }))+ })+ expect(mocks.virtualizer.scrollToOffset).toHaveBeenCalledTimes(3)++ act(() => renderer!.unmount())+ })++ it("waits through delayed viewport resize compensation before restoring", () => {+ writeMessageScrollPosition("channel:one", 2200)+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(+ React.createElement(Probe, { value: props({ scrollMemoryKey: "channel:one" }) }),+ { createNodeMock },+ )+ })+ scrollNode.scrollTop = 2200+ runNextFrame()+ runNextFrame()++ // A restored draft can wrap the mobile composer after the first stable+ // frames, shrinking the viewport and triggering +24px compensation.+ scrollNode.clientHeight = 668+ scrollNode.scrollTop = 2224+ runNextFrame()+ expect(scrollNode.scrollTop).toBe(2200)+ runNextFrame()+ runNextFrame()+ runNextFrame()+ runNextFrame()++ act(() => renderer!.unmount())+ })++ it("claims an empty scroll key without starting a restore loop", () => {+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(+ React.createElement(Probe, { value: props({ scrollMemoryKey: "channel:empty" }) }),+ { createNodeMock },+ )+ })+ expect(mocks.virtualizer.scrollToOffset).not.toHaveBeenCalled()++ scrollNode.scrollTop = 1400+ captureActiveMessageScrollPosition()+ expect(readMessageScrollPosition("channel:empty")).toBe(1400)++ scrollNode.scrollTop = 0+ act(() => renderer!.unmount())+ expect(readMessageScrollPosition("channel:empty")).toBe(1400)+ })+it("combines initial readiness with loaded-target readiness and preserves state across channel-only changes", () => {const consumed = vi.fn()let renderer: TestRenderer.ReactTestRenderer@@ -393,6 +493,28 @@ describe("useMessageListController", () => {.toEqual([["ordinary", false], ["reply", false]])})+ it("minimally scrolls a selected row above the active accessory rail", () => {+ selectionRailTop = 692+ selectedRowBottom = 747.5+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(+ React.createElement(Probe, { value: props() }),+ { createNodeMock },+ )+ })++ act(() => latest.onEnterSelectId("m1"))+ runNextFrame()++ expect(scrollNode.scrollTop).toBe(55.5)+ selectedRowBottom = 692+ runNextFrame()+ selectionRailTop = null+ runNextFrame()+ act(() => renderer!.unmount())+ })+it("closes the share dialog before exiting selection mode", () => {const source = readWebSource("src/components/community/messages/message-list-controller.ts",diff --git a/src/web/src/components/community/messages/message-list-controller.ts b/src/web/src/components/community/messages/message-list-controller.tsindex 3767b9232..128f988b2 100644--- a/src/web/src/components/community/messages/message-list-controller.ts+++ b/src/web/src/components/community/messages/message-list-controller.ts@@ -1,14 +1,19 @@"use client"-import { useCallback, useEffect, useMemo, useRef, useState } from "react"+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"import type { RenderMsg } from "@/lib/community/models/message"import { flattenMessageItems } from "@/lib/community/message-list-items"import { useScrollAnchor } from "@/hooks/community/use-scroll-anchor"import { useVirtualCursorSentinel } from "@/hooks/community/use-virtual-cursor-sentinel"import type { ResolvedMessageListProps } from "./message-list-types"+import {+ readMessageScrollPosition,+ registerActiveMessageScrollCapture,+} from "./message-scroll-memory"export function useMessageListController({messages,+ scrollMemoryKey,loading,newDividerBefore,scrollToMessageId,@@ -80,6 +85,9 @@ export function useMessageListController({const [heroHeight, setHeroHeight] = useState(0)const [heroMeasured, setHeroMeasured] = useState(false)const isLoading = !!loading && messages.length === 0+ const rememberedScrollTop = scrollMemoryKey && !scrollToMessageId+ ? readMessageScrollPosition(scrollMemoryKey)+ : undefineduseEffect(() => {const element = heroRef.currentif (!element) return@@ -110,8 +118,130 @@ export function useMessageListController({viewerUserId,heroHeight,heroMeasured,+ restoredScrollTop: rememberedScrollTop,})+ const restoredScrollKeyRef = useRef<string | null>(null)+ useLayoutEffect(() => {+ const element = scrollRef.current+ if (!element || !scrollMemoryKey || isLoading) return+ if (!scrollAnchorReady || !heroMeasured || scrollToMessageId) return+ if (restoredScrollKeyRef.current === scrollMemoryKey) return+ const saved = rememberedScrollTop+ if (saved === undefined) {+ restoredScrollKeyRef.current = scrollMemoryKey+ return+ }++ let frame = 0+ let attempts = 0+ let stableFrames = 0+ let lastClientHeight = element.clientHeight+ let lastScrollHeight = element.scrollHeight+ const restore = () => {+ const target = Math.min(saved, Math.max(0, element.scrollHeight - element.clientHeight))+ virtualizer.scrollToOffset(+ target,+ { align: "start" },+ )+ element.scrollTop = target+ return target+ }+ const restoreUntilSettled = () => {+ const target = restore()+ frame = window.requestAnimationFrame(() => {+ attempts += 1+ const dimensionsStable = element.clientHeight === lastClientHeight+ && element.scrollHeight === lastScrollHeight+ const movedAwayFromTarget = Math.abs(element.scrollTop - target) > 1+ lastClientHeight = element.clientHeight+ lastScrollHeight = element.scrollHeight+ // Once layout is stable, an offset change is the viewer taking over+ // the viewport. Stop restoring instead of yanking them back to a+ // snapshot captured before a same-channel reconnect/remount. A+ // composer resize is intentionally different: its dimensions change,+ // so the loop still corrects the resulting compensation on the next+ // frame.+ if (dimensionsStable && movedAwayFromTarget) {+ restoredScrollKeyRef.current = scrollMemoryKey+ return+ }+ stableFrames = target === saved+ && Math.abs(element.scrollTop - target) <= 1+ && dimensionsStable+ ? stableFrames + 1+ : 0+ // Draft hydration can resize the mobile composer one or two frames+ // after the list first reaches its saved offset. Wait through that+ // delayed viewport measurement so its normal resize compensation+ // cannot become the final restored position.+ if (stableFrames < 4 && attempts < 120) {+ restoreUntilSettled()+ } else {+ restoredScrollKeyRef.current = scrollMemoryKey+ }+ })+ }+ restoreUntilSettled()+ return () => {+ window.cancelAnimationFrame(frame)+ }+ }, [+ heroMeasured,+ isLoading,+ rememberedScrollTop,+ scrollAnchorReady,+ scrollMemoryKey,+ scrollRef,+ scrollToMessageId,+ virtualizer,+ ])+ useLayoutEffect(() => {+ const element = scrollRef.current+ if (!element || !scrollMemoryKey) return+ return registerActiveMessageScrollCapture(scrollMemoryKey, element)+ }, [scrollMemoryKey, scrollRef])++ useLayoutEffect(() => {+ const element = scrollRef.current+ if (!element || !selectMode || selectedIds.size === 0) return++ let frame = 0+ let attempts = 0+ let stableFrames = 0+ const keepSelectionClearOfRail = () => {+ frame = window.requestAnimationFrame(() => {+ attempts += 1+ const rail = element.parentElement?.querySelector<HTMLElement>(+ '[data-selection="active"]',+ )+ const selectedRows = Array.from(+ element.querySelectorAll<HTMLElement>("[data-msg-id]"),+ ).filter((row) => selectedIds.has(row.dataset.msgId ?? ""))++ if (rail && selectedRows.length > 0) {+ const railTop = rail.getBoundingClientRect().top+ const lowestSelectedBottom = Math.max(...selectedRows.map(+ (row) => row.getBoundingClientRect().bottom,+ ))+ const overlap = lowestSelectedBottom - railTop+ if (overlap > 1) {+ element.scrollTop += overlap+ stableFrames = 0+ } else {+ stableFrames += 1+ }+ } else {+ stableFrames = 0+ }++ if (stableFrames < 2 && attempts < 120) keepSelectionClearOfRail()+ })+ }+ keepSelectionClearOfRail()+ return () => window.cancelAnimationFrame(frame)+ }, [selectMode, selectedIds, scrollRef])+useEffect(() => {if (!onScrollRoot) returnonScrollRoot(scrollRef.current)diff --git a/src/web/src/components/community/messages/message-list-facade.contract.test.ts b/src/web/src/components/community/messages/message-list-facade.contract.test.tsindex 577e85b02..d3d7a6b65 100644--- a/src/web/src/components/community/messages/message-list-facade.contract.test.ts+++ b/src/web/src/components/community/messages/message-list-facade.contract.test.ts@@ -19,6 +19,8 @@ type ExpectedMessageListProps = {onToggleReaction?: (id: string, emoji: string) => voidonReact?: (id: string, emoji: string) => voidonReply?: (id: string) => void+ resolveAuthorMentionText?: (authorId: string) => string | null+ onInsertMentionText?: (text: string) => voidonPin?: (id: string) => voidonMark?: (id: string) => voidonCreateThread?: (id: string) => voiddiff --git a/src/web/src/components/community/messages/message-list-row.test.ts b/src/web/src/components/community/messages/message-list-row.test.tsindex b007346d0..135079f48 100644--- a/src/web/src/components/community/messages/message-list-row.test.ts+++ b/src/web/src/components/community/messages/message-list-row.test.ts@@ -21,6 +21,8 @@ const callbacks = {onToggleReaction: vi.fn(),onReact: vi.fn(),onReply: vi.fn(),+ resolveAuthorMentionText: vi.fn(() => "@Viewer#1234 "),+ onInsertMentionText: vi.fn(),onPin: vi.fn(),onMark: vi.fn(),onCreateThread: vi.fn(),@@ -107,6 +109,8 @@ describe("renderMessageListRow", () => {onToggleReactionId: callbacks.onToggleReaction,onReactId: callbacks.onReact,onReplyId: callbacks.onReply,+ mentionText: "@Viewer#1234 ",+ onInsertMentionText: callbacks.onInsertMentionText,onPinId: callbacks.onPin,onMarkId: callbacks.onMark,onCreateThreadId: callbacks.onCreateThread,diff --git a/src/web/src/components/community/messages/message-list-row.tsx b/src/web/src/components/community/messages/message-list-row.tsxindex 1497eee7a..028a5952a 100644--- a/src/web/src/components/community/messages/message-list-row.tsx+++ b/src/web/src/components/community/messages/message-list-row.tsx@@ -27,6 +27,10 @@ export function renderMessageListRow(onToggleReactionId={props.onToggleReaction}onReactId={props.onReact}onReplyId={props.onReply}+ mentionText={item.m.authorId+ ? props.resolveAuthorMentionText?.(item.m.authorId) ?? undefined+ : undefined}+ onInsertMentionText={props.onInsertMentionText}onPinId={props.onPin}onMarkId={props.onMark}onCreateThreadId={props.onCreateThread}diff --git a/src/web/src/components/community/messages/message-list-types.ts b/src/web/src/components/community/messages/message-list-types.tsindex 0e723ec49..5985543e4 100644--- a/src/web/src/components/community/messages/message-list-types.ts+++ b/src/web/src/components/community/messages/message-list-types.ts@@ -4,6 +4,7 @@ import type { OpenProfile } from "@/components/community/social/profile-types"export type MessageListProps = {channel: string+ scrollMemoryKey?: stringmessages: Msg[]loading?: booleanpinnedIds?: Set<string>@@ -14,6 +15,8 @@ export type MessageListProps = {onToggleReaction?: (id: string, emoji: string) => voidonReact?: (id: string, emoji: string) => voidonReply?: (id: string) => void+ resolveAuthorMentionText?: (authorId: string) => string | null+ onInsertMentionText?: (text: string) => voidonPin?: (id: string) => voidonMark?: (id: string) => voidonCreateThread?: (id: string) => voiddiff --git a/src/web/src/components/community/messages/message-list-view.test.ts b/src/web/src/components/community/messages/message-list-view.test.tsindex 0c7b2e8c3..e6a77362c 100644--- a/src/web/src/components/community/messages/message-list-view.test.ts+++ b/src/web/src/components/community/messages/message-list-view.test.ts@@ -77,10 +77,17 @@ describe("renderMessageListView", () => {renderer = TestRenderer.create(renderMessageListView(listProps, state, renderRows))})expect(mockedRail).toHaveBeenCalledWith(expect.objectContaining({- typingNames: ["Alice"],scrollCount: 3,selectMode: false,}), undefined)+ const typingSpace = renderer!.root.findByProps({ "data-message-typing-space": true })+ const scrollerBoundary = renderer!.root.findByProps({ "data-message-scroller-boundary": true })+ expect(typingSpace.props.className).toContain("shrink-0")+ expect(typingSpace.props.className).not.toContain("absolute")+ expect(scrollerBoundary.findAllByType("accessory-rail")).toHaveLength(1)+ expect(typingSpace.findAllByType("accessory-rail")).toHaveLength(0)+ expect(renderer!.root.findByProps({ "data-testid": "community-typing-indicator" }).props)+ .toMatchObject({ role: "status", "aria-live": "polite" })expect(renderRows).toHaveBeenCalledOnce()expect(renderer!.root.findAllByType("virtual-rows")).toHaveLength(1)expect(renderer!.root.findAll((node) => node.props.className === "mb-6")).toHaveLength(1)@@ -98,6 +105,91 @@ describe("renderMessageListView", () => {expect(mockedRail).not.toHaveBeenCalled()expect(renderRows).not.toHaveBeenCalled()expect(renderer!.root.findAll((node) => node.props.className === "mb-6")).toHaveLength(1)+ const typingSpace = renderer!.root.findByProps({ "data-message-typing-space": true })+ expect(typingSpace.props.className).toContain("h-0")+ expect(typingSpace.props["data-occupied"]).toBe("idle")+ expect(renderer!.root.findAllByProps({ "data-testid": "community-typing-indicator" })).toHaveLength(0)+ })++ it("keeps the typing-space wrapper while expanding it only for live typing", () => {+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(renderMessageListView(+ props({ messages: [] }),+ controller({ isLoading: true }),+ () => React.createElement("virtual-rows"),+ ))+ })+ const loadingClass = renderer.root.findByProps({ "data-message-typing-space": true }).props.className+ expect(loadingClass).toContain("h-0")+ act(() => {+ renderer.update(renderMessageListView(+ props({ loading: false, typingUsers: ["Alice"] }),+ controller({ isLoading: false }),+ () => React.createElement("virtual-rows"),+ ))+ })+ const loadedSpace = renderer.root.findByProps({ "data-message-typing-space": true })+ expect(loadedSpace.props.className).toContain("h-11")+ expect(loadedSpace.props["data-occupied"]).toBe("typing")+ expect(renderer.root.findByProps({ "data-testid": "community-typing-indicator" })).toBeTruthy()+ })++ it("collapses typing space when presence turns off", () => {+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(renderMessageListView(+ props({ typingUsers: ["Alice"] }),+ controller(),+ () => React.createElement("virtual-rows"),+ ))+ })+ expect(renderer.root.findByProps({ "data-message-typing-space": true }).props.className)+ .toContain("h-11")+ act(() => {+ renderer.update(renderMessageListView(+ props({ typingUsers: [] }),+ controller(),+ () => React.createElement("virtual-rows"),+ ))+ })+ const typingSpace = renderer.root.findByProps({ "data-message-typing-space": true })+ expect(typingSpace.props.className).toContain("h-0")+ expect(typingSpace.props["data-occupied"]).toBe("idle")+ expect(renderer.root.findAllByProps({ "data-testid": "community-typing-indicator" })).toHaveLength(0)+ })++ it("keeps scroll geometry stable and reserves extra clearance only for selection", () => {+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(renderMessageListView(+ props({ typingUsers: [] }),+ controller({ pillCount: 0 }),+ () => React.createElement("virtual-rows"),+ ))+ })+ const content = () => renderer.root.findByProps({ "data-message-list-content": true })+ expect(content().props.className).toContain("pb-8")+ expect(content().props.className).not.toContain("pb-14")++ act(() => {+ renderer.update(renderMessageListView(+ props({ typingUsers: [] }),+ controller({ pillCount: 2 }),+ () => React.createElement("virtual-rows"),+ ))+ })+ expect(content().props.className).toContain("pb-8")+ expect(content().props.className).not.toContain("pb-14")++ act(() => {+ renderer.update(renderMessageListView(+ props({ typingUsers: [] }),+ controller({ pillCount: 0, selectMode: true }),+ () => React.createElement("virtual-rows"),+ ))+ })+ expect(content().props.className).toContain("pb-14")})it("wires selection actions and dialog close without changing overlay order", () => {@@ -125,7 +217,6 @@ describe("renderMessageListView", () => {expect(rail.props).toMatchObject({selectMode: true,selectedCount: 1,- typingNames: ["Alice"],})act(() => rail.props.onCancelSelection())expect(exitSelect).toHaveBeenCalledOnce()@@ -186,9 +277,8 @@ describe("renderMessageListView", () => {expect(renderer!.root.findAllByType("div").some((node) =>node.children.includes("Loading newer messages…"))).toBe(true)- const content = renderer!.root.findByProps({- className: "flex min-h-full flex-col justify-end px-4 py-8",- })+ const content = renderer!.root.findByProps({ "data-message-list-content": true })+ expect(content.props.className).toContain("pb-8")const elementChildren = content.children.filter((child) => typeof child !== "string")expect(elementChildren).toHaveLength(3)expect(elementChildren[0].props.className).toBe("mb-6")diff --git a/src/web/src/components/community/messages/message-list-view.tsx b/src/web/src/components/community/messages/message-list-view.tsxindex 99cba495d..92337bb4b 100644--- a/src/web/src/components/community/messages/message-list-view.tsx+++ b/src/web/src/components/community/messages/message-list-view.tsx@@ -1,9 +1,11 @@import type { ReactNode } from "react"import { Skeleton } from "@/components/ui/skeleton"import { tid } from "@/lib/community/testids"+import { cn } from "@/lib/utils"import { ChannelIcon } from "../channels/channel-icon"import { ComposerAccessoryRail } from "./composer-accessory-rail"import { MessageShareDialog } from "./message-share-dialog"+import { TypingIndicator } from "./typing-indicator"import type { MessageListController } from "./message-list-controller"import type { ResolvedMessageListProps } from "./message-list-types"@@ -12,20 +14,11 @@ export function renderMessageListView(controller: MessageListController,renderRows: () => ReactNode,) {+ const showTyping = !controller.isLoading && (props.typingUsers?.length ?? 0) > 0+ const needsSelectionClearance = !controller.isLoading && controller.selectMode+return (<div className="relative flex min-h-0 flex-1 flex-col">- {!controller.isLoading && (- <ComposerAccessoryRail- typingNames={props.typingUsers ?? []}- scrollCount={controller.pillCount}- scrollMode={controller.pillMode}- onScroll={controller.pillOnClick}- selectMode={controller.selectMode}- selectedCount={controller.selectedIds.size}- onCancelSelection={controller.exitSelect}- onShareSelection={() => controller.setShareOpen(true)}- />- )}{controller.shareOpen && controller.selectedMessages.length > 0 && (<MessageShareDialogm={controller.selectedMessages}@@ -33,12 +26,30 @@ export function renderMessageListView(onClose={controller.closeShare}/>)}- <div- ref={controller.scrollRef}- data-testid={tid.messageScroller}- className="flex-1 overflow-x-clip overflow-y-auto thin-scrollbar"- >- <div className="flex min-h-full flex-col justify-end px-4 py-8">+ <div data-message-scroller-boundary className="relative min-h-0 flex-1">+ {!controller.isLoading && (+ <ComposerAccessoryRail+ scrollCount={controller.pillCount}+ scrollMode={controller.pillMode}+ onScroll={controller.pillOnClick}+ selectMode={controller.selectMode}+ selectedCount={controller.selectedIds.size}+ onCancelSelection={controller.exitSelect}+ onShareSelection={() => controller.setShareOpen(true)}+ />+ )}+ <div+ ref={controller.scrollRef}+ data-testid={tid.messageScroller}+ className="h-full overflow-x-clip overflow-y-auto thin-scrollbar"+ >+ <div+ data-message-list-content+ className={cn(+ "flex min-h-full flex-col justify-end px-4 pt-8",+ needsSelectionClearance ? "pb-14" : "pb-8",+ )}+ >{controller.isLoading ? (<MessageListSkeletonContent variant={props.variant} />) : (@@ -78,8 +89,21 @@ export function renderMessageListView()}</>)}+ </div></div></div>+ <div+ data-message-typing-space+ data-occupied={showTyping ? "typing" : "idle"}+ className={cn(+ "shrink-0",+ showTyping ? "h-11 px-4 pb-2 pt-1" : "h-0",+ )}+ >+ {showTyping && (+ <TypingIndicator names={props.typingUsers ?? []} className="w-fit max-w-full" />+ )}+ </div></div>)}diff --git a/src/web/src/components/community/messages/message-list.jump-target.test.ts b/src/web/src/components/community/messages/message-list.jump-target.test.tsindex 8f46a091e..5cd366f48 100644--- a/src/web/src/components/community/messages/message-list.jump-target.test.ts+++ b/src/web/src/components/community/messages/message-list.jump-target.test.ts@@ -12,6 +12,7 @@ const mocks = vi.hoisted(() => {scrollToEnd,onScrollTargetConsumed,virtualizer: {+ options: { anchorTo: "end" },scrollToIndex,scrollToEnd,isAtEnd: () => true,diff --git a/src/web/src/components/community/messages/message-row.test.ts b/src/web/src/components/community/messages/message-row.test.tsnew file mode 100644index 000000000..cce4f71f7--- /dev/null+++ b/src/web/src/components/community/messages/message-row.test.ts@@ -0,0 +1,60 @@+import React from "react"+import TestRenderer, { act } from "react-test-renderer"+import { beforeEach, describe, expect, it, vi } from "vitest"+import { Message } from "./message"+import { MessageRow } from "./message-row"++vi.mock("./message", () => ({ Message: vi.fn(() => null) }))++const mockedMessage = vi.mocked(Message)++describe("MessageRow", () => {+ beforeEach(() => vi.clearAllMocks())++ it("binds reply to the exact row id and passes canonical mention text unchanged", () => {+ const onReplyId = vi.fn()+ const onInsertMentionText = vi.fn()+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(React.createElement(MessageRow, {+ m: {+ id: "message_42",+ type: "chat",+ authorId: "user_7",+ authorName: "Alice",+ content: "hello",+ grouped: false,+ },+ hoverCapable: false,+ onOpenThread: vi.fn(),+ onReplyId,+ mentionText: "@Alice#1234 ",+ onInsertMentionText,+ }))+ })++ const messageProps = mockedMessage.mock.calls.at(-1)![0]+ act(() => messageProps.onReply?.())+ act(() => messageProps.onMentionAuthor?.())+ expect(onReplyId).toHaveBeenCalledOnce()+ expect(onReplyId).toHaveBeenCalledWith("message_42")+ expect(onInsertMentionText).toHaveBeenCalledOnce()+ expect(onInsertMentionText).toHaveBeenCalledWith("@Alice#1234 ")++ act(() => renderer.unmount())+ })++ it("does not expose mention behavior without both text and an insertion seam", () => {+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(React.createElement(MessageRow, {+ m: { id: "m1", type: "chat", grouped: false },+ hoverCapable: false,+ onOpenThread: vi.fn(),+ mentionText: "@Alice#1234 ",+ }))+ })+ expect(mockedMessage.mock.calls.at(-1)![0].onMentionAuthor).toBeUndefined()+ act(() => renderer.unmount())+ })+})diff --git a/src/web/src/components/community/messages/message-row.tsx b/src/web/src/components/community/messages/message-row.tsxindex 6d76be224..a4d3d9fd7 100644--- a/src/web/src/components/community/messages/message-row.tsx+++ b/src/web/src/components/community/messages/message-row.tsx@@ -27,6 +27,8 @@ export interface MessageRowProps {onToggleReactionId?: (id: string, emoji: string) => voidonReactId?: (id: string, emoji: string) => voidonReplyId?: (id: string) => void+ mentionText?: string+ onInsertMentionText?: (text: string) => voidonPinId?: (id: string) => voidonMarkId?: (id: string) => voidonCreateThreadId?: (id: string) => void@@ -55,7 +57,7 @@ export interface MessageRowProps {function MessageRowImpl(props: MessageRowProps) {const {m, viewerUserId, hoverCapable, pinned, highlighted, onOpenThread, onOpenProfile,- onToggleReactionId, onReactId, onReplyId, onPinId, onMarkId, onCreateThreadId,+ onToggleReactionId, onReactId, onReplyId, mentionText, onInsertMentionText, onPinId, onMarkId, onCreateThreadId,onCopyId, onEditId, onRetryId, onDismissId, onJumpToId, onPreviewImage, onPreviewAttachment, onDownloadFile,resolveUserName, onImageLoad,selectMode, selected, onToggleSelectId, onEnterSelectId, onShareSingleId,@@ -72,6 +74,9 @@ function MessageRowImpl(props: MessageRowProps) {const onToggleReaction = useCallback((emoji: string) => onToggleReactionId?.(id, emoji), [onToggleReactionId, id])const onReact = useCallback((emoji: string) => onReactId?.(id, emoji), [onReactId, id])const onReply = useCallback(() => onReplyId?.(id), [onReplyId, id])+ const onMentionAuthor = useCallback(() => {+ if (mentionText) onInsertMentionText?.(mentionText)+ }, [mentionText, onInsertMentionText])const onPin = useCallback(() => onPinId?.(id), [onPinId, id])const onMark = useCallback(() => onMarkId?.(id), [onMarkId, id])const onCreateThread = useCallback(() => onCreateThreadId?.(id), [onCreateThreadId, id])@@ -102,6 +107,7 @@ function MessageRowImpl(props: MessageRowProps) {onToggleReaction={onToggleReactionId ? onToggleReaction : undefined}onReact={onReactId ? onReact : undefined}onReply={onReplyId ? onReply : undefined}+ onMentionAuthor={mentionText && onInsertMentionText ? onMentionAuthor : undefined}onPin={onPinId ? onPin : undefined}onMark={onMarkId ? onMark : undefined}onCreateThread={onCreateThreadId ? onCreateThread : undefined}diff --git a/src/web/src/components/community/messages/message-scroll-memory.test.ts b/src/web/src/components/community/messages/message-scroll-memory.test.tsnew file mode 100644index 000000000..6e0eb7a5d--- /dev/null+++ b/src/web/src/components/community/messages/message-scroll-memory.test.ts@@ -0,0 +1,49 @@+import { beforeEach, describe, expect, it } from "vitest"+import {+ captureActiveMessageScrollPosition,+ clearMessageScrollPositions,+ readMessageScrollPosition,+ registerActiveMessageScrollCapture,+ writeMessageScrollPosition,+} from "./message-scroll-memory"++describe("message scroll memory", () => {+ beforeEach(clearMessageScrollPositions)++ it("keeps the latest non-negative position for a surface", () => {+ writeMessageScrollPosition("channel:a", 220)+ writeMessageScrollPosition("channel:a", 180)+ writeMessageScrollPosition("channel:b", -10)+ expect(readMessageScrollPosition("channel:a")).toBe(180)+ expect(readMessageScrollPosition("channel:b")).toBe(0)+ })++ it("bounds old surface positions", () => {+ for (let index = 0; index < 51; index += 1) {+ writeMessageScrollPosition(`channel:${index}`, index)+ }+ expect(readMessageScrollPosition("channel:0")).toBeUndefined()+ expect(readMessageScrollPosition("channel:50")).toBe(50)+ })++ it("captures every connected visible scroller and unregisters exactly", () => {+ const connected = { isConnected: true, clientHeight: 692, scrollTop: 2200 } as HTMLElement+ const hidden = { isConnected: true, clientHeight: 0, scrollTop: 900 } as HTMLElement+ const detached = { isConnected: false, clientHeight: 692, scrollTop: 700 } as HTMLElement+ const unregisterConnected = registerActiveMessageScrollCapture("channel:a", connected)+ const unregisterHidden = registerActiveMessageScrollCapture("channel:hidden", hidden)+ const unregisterDetached = registerActiveMessageScrollCapture("channel:detached", detached)++ captureActiveMessageScrollPosition()+ expect(readMessageScrollPosition("channel:a")).toBe(2200)+ expect(readMessageScrollPosition("channel:hidden")).toBeUndefined()+ expect(readMessageScrollPosition("channel:detached")).toBeUndefined()++ unregisterConnected()+ unregisterHidden()+ unregisterDetached()+ connected.scrollTop = 1400+ captureActiveMessageScrollPosition()+ expect(readMessageScrollPosition("channel:a")).toBe(2200)+ })+})diff --git a/src/web/src/components/community/messages/message-scroll-memory.ts b/src/web/src/components/community/messages/message-scroll-memory.tsnew file mode 100644index 000000000..2e9407537--- /dev/null+++ b/src/web/src/components/community/messages/message-scroll-memory.ts@@ -0,0 +1,38 @@+const MAX_REMEMBERED_MESSAGE_SCROLLS = 50+const positions = new Map<string, number>()+const activeCaptures = new Map<symbol, () => void>()++export function readMessageScrollPosition(key: string): number | undefined {+ return positions.get(key)+}++export function writeMessageScrollPosition(key: string, scrollTop: number): void {+ positions.delete(key)+ positions.set(key, Math.max(0, scrollTop))+ while (positions.size > MAX_REMEMBERED_MESSAGE_SCROLLS) {+ const oldest = positions.keys().next().value+ if (oldest === undefined) break+ positions.delete(oldest)+ }+}++export function clearMessageScrollPositions(): void {+ positions.clear()+}++export function registerActiveMessageScrollCapture(+ key: string,+ element: HTMLElement,+): () => void {+ const token = Symbol(key)+ activeCaptures.set(token, () => {+ if (element.isConnected && element.clientHeight > 0) {+ writeMessageScrollPosition(key, element.scrollTop)+ }+ })+ return () => activeCaptures.delete(token)+}++export function captureActiveMessageScrollPosition(): void {+ activeCaptures.forEach((capture) => capture())+}diff --git a/src/web/src/components/community/messages/message.render.test.ts b/src/web/src/components/community/messages/message.render.test.tsindex d747a6568..a5078c4e9 100644--- a/src/web/src/components/community/messages/message.render.test.ts+++ b/src/web/src/components/community/messages/message.render.test.ts@@ -169,6 +169,7 @@ beforeEach(() => {g.IntersectionObserver = class { observe() {} disconnect() {} unobserve() {} }})afterEach(() => {+ vi.useRealTimers()vi.restoreAllMocks()vi.unstubAllGlobals()})@@ -425,6 +426,165 @@ describe("Message reaction picker", () => {})describe("Message touch action menu", () => {+ it("swipes right past threshold into the existing reply callback exactly once", async () => {+ vi.stubGlobal("window", { getSelection: () => null })+ const vibrate = vi.fn()+ vi.stubGlobal("navigator", { vibrate })+ const onReply = vi.fn()+ let renderer: TestRenderer.ReactTestRenderer+ await act(async () => {+ renderer = TestRenderer.create(makeTree({+ m: baseMsg(),+ hoverCapable: false,+ onOpenThread: vi.fn(),+ onReply,+ }), { createNodeMock: () => genericMock })+ })+ const row = renderer!.root.find(+ (node) => typeof node.props.className === "string"+ && node.props.className.includes("group relative -mx-2"),+ )+ const currentTarget = { contains: () => false, setPointerCapture: vi.fn() }+ act(() => row.props.onPointerDown({+ pointerType: "touch", clientX: 80, clientY: 100,+ target: { closest: () => null }, currentTarget,+ }))+ act(() => row.props.onPointerMove({+ pointerType: "touch", pointerId: 1, clientX: 148, clientY: 102,+ currentTarget, preventDefault: vi.fn(),+ }))+ expect(renderer!.root.findByProps({ "data-mobile-reply-affordance": true }).props)+ .toMatchObject({ "data-threshold-crossed": true })+ act(() => row.props.onPointerUp({ pointerType: "touch" }))+ expect(onReply).toHaveBeenCalledOnce()+ expect(vibrate).toHaveBeenCalledOnce()+ expect(currentTarget.setPointerCapture).toHaveBeenCalledWith(1)+ expect(row.props.style).toBeUndefined()+ })++ it("rejects vertical movement without replying or vibrating", async () => {+ vi.stubGlobal("window", { getSelection: () => null })+ const vibrate = vi.fn()+ vi.stubGlobal("navigator", { vibrate })+ const onReply = vi.fn()+ let renderer: TestRenderer.ReactTestRenderer+ await act(async () => {+ renderer = TestRenderer.create(makeTree({+ m: baseMsg(), hoverCapable: false, onOpenThread: vi.fn(), onReply,+ }), { createNodeMock: () => genericMock })+ })+ const row = renderer!.root.find(+ (node) => typeof node.props.className === "string"+ && node.props.className.includes("group relative -mx-2"),+ )+ const currentTarget = { contains: () => false, setPointerCapture: vi.fn() }+ act(() => row.props.onPointerDown({+ pointerType: "touch", clientX: 80, clientY: 100,+ target: { closest: () => null }, currentTarget,+ }))+ act(() => row.props.onPointerMove({+ pointerType: "touch", pointerId: 1, clientX: 86, clientY: 130,+ currentTarget, preventDefault: vi.fn(),+ }))+ act(() => row.props.onPointerUp({ pointerType: "touch" }))+ expect(onReply).not.toHaveBeenCalled()+ expect(vibrate).not.toHaveBeenCalled()+ })++ it("cancels a pending swipe when text selection starts inside the row", async () => {+ const selectedNode = {}+ let selection: Pick<Selection, "isCollapsed" | "anchorNode" | "focusNode"> | null = null+ vi.stubGlobal("window", { getSelection: () => selection })+ const vibrate = vi.fn()+ vi.stubGlobal("navigator", { vibrate })+ const onReply = vi.fn()+ let renderer: TestRenderer.ReactTestRenderer+ await act(async () => {+ renderer = TestRenderer.create(makeTree({+ m: baseMsg(), hoverCapable: false, onOpenThread: vi.fn(), onReply,+ }), { createNodeMock: () => genericMock })+ })+ const row = renderer!.root.find(+ (node) => typeof node.props.className === "string"+ && node.props.className.includes("group relative -mx-2"),+ )+ const currentTarget = {+ contains: (node: unknown) => node === selectedNode,+ setPointerCapture: vi.fn(),+ }+ act(() => row.props.onPointerDown({+ pointerType: "touch", clientX: 80, clientY: 100,+ target: { closest: () => null }, currentTarget,+ }))+ selection = {+ isCollapsed: false,+ anchorNode: selectedNode as Node,+ focusNode: selectedNode as Node,+ }+ act(() => row.props.onPointerMove({+ pointerType: "touch", pointerId: 1, clientX: 150, clientY: 102,+ currentTarget, preventDefault: vi.fn(),+ }))+ act(() => row.props.onPointerUp({ pointerType: "touch" }))+ expect(onReply).not.toHaveBeenCalled()+ expect(vibrate).not.toHaveBeenCalled()+ expect(currentTarget.setPointerCapture).not.toHaveBeenCalled()+ expect(renderer!.root.findByProps({ "data-mobile-reply-affordance": true }).props["data-threshold-crossed"])+ .toBeUndefined()+ })++ it("long-presses an avatar once, suppresses profile click, and cancels on movement", async () => {+ vi.useFakeTimers()+ vi.stubGlobal("navigator", { vibrate: vi.fn() })+ const onMentionAuthor = vi.fn()+ const onOpenProfile = vi.fn()+ let renderer: TestRenderer.ReactTestRenderer+ await act(async () => {+ renderer = TestRenderer.create(makeTree({+ m: baseMsg(),+ hoverCapable: false,+ onOpenThread: vi.fn(),+ onReply: vi.fn(),+ onMentionAuthor,+ onOpenProfile,+ }), { createNodeMock: () => genericMock })+ })+ const avatar = renderer!.root.findByProps({+ "aria-label": "Open Alice profile; long press to mention",+ })+ act(() => avatar.props.onPointerDown({ pointerType: "mouse", clientX: 30, clientY: 40 }))+ act(() => avatar.props.onPointerMove({ pointerType: "mouse", clientX: 50, clientY: 40 }))+ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 30, clientY: 40 }))+ act(() => vi.advanceTimersByTime(500))+ expect(onMentionAuthor).toHaveBeenCalledOnce()+ const preventDefault = vi.fn()+ const stopPropagation = vi.fn()+ act(() => avatar.props.onContextMenu({ preventDefault }))+ expect(preventDefault).toHaveBeenCalledOnce()+ act(() => avatar.props.onClick({ preventDefault, stopPropagation }))+ expect(onOpenProfile).not.toHaveBeenCalled()+ expect(preventDefault).toHaveBeenCalledTimes(2)++ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 30, clientY: 40 }))+ act(() => avatar.props.onPointerMove({ pointerType: "touch", clientX: 50, clientY: 40 }))+ act(() => vi.advanceTimersByTime(500))+ expect(onMentionAuthor).toHaveBeenCalledOnce()+ act(() => avatar.props.onClick({ preventDefault, stopPropagation }))+ expect(onOpenProfile).not.toHaveBeenCalled()++ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 30, clientY: 40 }))+ act(() => avatar.props.onPointerCancel({ pointerType: "touch" }))+ act(() => avatar.props.onClick({ preventDefault, stopPropagation }))+ expect(onOpenProfile).not.toHaveBeenCalled()++ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 30, clientY: 40 }))+ act(() => avatar.props.onPointerUp({ pointerType: "touch" }))+ act(() => avatar.props.onClick({ preventDefault, stopPropagation }))+ expect(onOpenProfile).toHaveBeenCalledOnce()+ act(() => renderer!.unmount())+ expect(vi.getTimerCount()).toBe(0)+ })+it("creates a zero-size virtual anchor at the viewport click coordinates", () => {const rect = createMessageMenuPointAnchor(123, 456).getBoundingClientRect()diff --git a/src/web/src/components/community/messages/message.tsx b/src/web/src/components/community/messages/message.tsxindex e4c1cc38d..0ef82f842 100644--- a/src/web/src/components/community/messages/message.tsx+++ b/src/web/src/components/community/messages/message.tsx@@ -26,6 +26,14 @@ import type { OpenProfile } from "@/components/community/social/profile-types"import { attachmentAspectRatio } from "./attachment-layout"import { AttachmentCard } from "./attachment-card"import { displayReplyContent } from "@/lib/community/reply-content"+import {+ advanceMobileReplyGesture,+ beginMobileReplyGesture,+ shouldCommitMobileReply,+ shouldSuppressClickAfterMobileReplyGesture,+ type MobileReplyGesture,+} from "./mobile-message-gesture"+import { useMobileAvatarMention } from "./use-mobile-avatar-mention"// Whether the "Share as Image" action is offered for a message. Share is// computed inside `Message` from the message alone (no handler is threaded in),@@ -100,7 +108,7 @@ export function createMessageMenuPointAnchor(clientX: number, clientY: number) {function MessageImpl({m, compact, pinned, onOpenThread, onOpenProfile, onJumpReply,- onToggleReaction, onReact, onReply, onPin, onMark, onCreateThread, onCopy, onEdit, onRetry, onDismiss,+ onToggleReaction, onReact, onReply, onMentionAuthor, onPin, onMark, onCreateThread, onCopy, onEdit, onRetry, onDismiss,onPreviewImage, onPreviewAttachment, onDownloadFile, highlighted, resolveUserName, onImageLoad,selectMode, selected, onToggleSelect, onEnterSelect, onShareSingle,viewerUserId, hoverCapable = true,@@ -114,6 +122,7 @@ function MessageImpl({onToggleReaction?: (emoji: string) => voidonReact?: (emoji: string) => voidonReply?: () => void+ onMentionAuthor?: () => voidonPin?: () => void// Toggle this message in the viewer's private saved ("marked") set. The// Mark/Unmark label is driven by a lazy per-message read (see `marked`@@ -163,6 +172,14 @@ function MessageImpl({const [touchMenuAnchor, setTouchMenuAnchor] = useState<ReturnType<typeof createMessageMenuPointAnchor> | null>(null)const touchStartedAt = useRef<number | null>(null)const suppressLongPressClick = useRef(false)+ const swipeGestureRef = useRef<MobileReplyGesture | null>(null)+ const [swipeVisual, setSwipeVisual] = useState({ offset: 0, active: false, crossed: false })+ const avatarMention = useMobileAvatarMention({+ onMention: onMentionAuthor,+ onProfileClick: (event) => {+ onOpenProfile?.(m.authorName ?? "", event, undefined, m.authorId)+ },+ })// The Mark/Unmark label needs to know if THIS message is already in the// viewer's saved set. That's a single indexed row read, fired lazily only// while a menu that shows the item is open (never per-row on mount) — so a@@ -205,6 +222,7 @@ function MessageImpl({}const showMenu = hasMessageMenu(menuHandlers)const interactive = !compact && !m.failed && showMenu+ const swipeReplyEnabled = interactive && !hoverCapable && !selectMode && !!onReplyconst activate = interactive && hoverCapable && !activated? (event: React.SyntheticEvent<HTMLElement>) => {if (shouldActivateMessageOverlays(event.target)) setActivated(true)@@ -240,11 +258,73 @@ function MessageImpl({<divclassName={["group relative -mx-2 flex gap-2 rounded px-2 transition-colors",+ swipeReplyEnabled ? "z-10 touch-pan-y bg-background" : "",+ swipeVisual.active ? "transition-none" : "transition-transform duration-150 ease-out",m.grouped ? "py-0" : "mt-3 pt-1.5 pb-0",selectable ? "cursor-pointer pl-9" : "",selected ? "bg-primary/10" : highlighted ? "bg-primary/10" : selectable ? "hover:bg-accent/40" : "hover:bg-accent/40",].join(" ")}+ style={swipeVisual.offset > 0+ ? { transform: `translate3d(${swipeVisual.offset}px, 0, 0)` }+ : undefined}onPointerEnter={activate}+ onPointerDown={swipeReplyEnabled+ ? (event) => {+ if (event.pointerType !== "touch") return+ const nested = (event.target as Element).closest?.(+ "button, a, input, textarea, select, [role=button]",+ )+ if (nested || selectionBelongsToRow(window.getSelection(), event.currentTarget)) return+ const gesture = beginMobileReplyGesture(event.clientX, event.clientY)+ if (!gesture) return+ swipeGestureRef.current = gesture+ setSwipeVisual({ offset: 0, active: true, crossed: false })+ }+ : undefined}+ onPointerMove={swipeReplyEnabled+ ? (event) => {+ const current = swipeGestureRef.current+ if (!current || event.pointerType !== "touch") return+ if (selectionBelongsToRow(window.getSelection(), event.currentTarget)) {+ swipeGestureRef.current = null+ setSwipeVisual({ offset: 0, active: false, crossed: false })+ return+ }+ const next = advanceMobileReplyGesture(current, event.clientX, event.clientY)+ swipeGestureRef.current = next.gesture+ if (next.gesture.intent === "horizontal") {+ if (current.intent !== "horizontal") {+ event.currentTarget.setPointerCapture?.(event.pointerId)+ }+ event.preventDefault()+ }+ if (next.fireHaptic) navigator.vibrate?.(10)+ setSwipeVisual({+ offset: next.gesture.offset,+ active: next.gesture.intent !== "rejected",+ crossed: next.gesture.thresholdCrossed,+ })+ }+ : undefined}+ onPointerUp={swipeReplyEnabled+ ? (event) => {+ const gesture = swipeGestureRef.current+ if (!gesture || event.pointerType !== "touch") return+ const commit = shouldCommitMobileReply(gesture)+ swipeGestureRef.current = null+ suppressLongPressClick.current = suppressLongPressClick.current+ || shouldSuppressClickAfterMobileReplyGesture(gesture)+ setSwipeVisual({ offset: 0, active: false, crossed: false })+ if (commit) onReply?.()+ }+ : undefined}+ onPointerCancel={swipeReplyEnabled+ ? () => {+ swipeGestureRef.current = null+ suppressLongPressClick.current = true+ setSwipeVisual({ offset: 0, active: false, crossed: false })+ }+ : undefined}onFocusCapture={activate}onKeyDownCapture={activate}onContextMenuCapture={interactive && hoverCapable@@ -266,8 +346,9 @@ function MessageImpl({onTouchEnd={interactive && !hoverCapable? () => {const startedAt = touchStartedAt.current- suppressLongPressClick.current = startedAt !== null- && performance.now() - startedAt >= 500+ suppressLongPressClick.current = suppressLongPressClick.current || (+ startedAt !== null && performance.now() - startedAt >= 500+ )touchStartedAt.current = null}: undefined}@@ -380,7 +461,13 @@ function MessageImpl({{m.grouped ? (<div className="w-10 shrink-0" />) : (- <button onClick={(e) => onOpenProfile?.(m.authorName ?? "", e, undefined, m.authorId)} className="shrink-0 self-start">+ <button+ {...avatarMention}+ className="shrink-0 self-start"+ aria-label={onMentionAuthor+ ? `Open ${m.authorName ?? "member"} profile; long press to mention`+ : undefined}+ ><Avatar label={m.authorAvatar ?? "?"} seed={m.authorId} size={40} /></button>)}@@ -594,6 +681,17 @@ function MessageImpl({return (<DropdownMenu open={touchMenuOpen} onOpenChange={setTouchMenuOpen}><div className="relative">+ {swipeReplyEnabled && (+ <div+ aria-hidden+ data-mobile-reply-affordance+ data-threshold-crossed={swipeVisual.crossed || undefined}+ className="absolute inset-y-0 left-0 z-0 flex w-14 items-center justify-center text-muted-foreground"+ style={{ opacity: Math.min(1, swipeVisual.offset / 48) }}+ >+ <Reply className="size-5" />+ </div>+ )}{row}<DropdownMenuTriggerrender={(@@ -687,6 +785,7 @@ function messagePropsEqual(prev: MessageProps, next: MessageProps): boolean {prev.onToggleReaction === next.onToggleReaction &&prev.onReact === next.onReact &&prev.onReply === next.onReply &&+ prev.onMentionAuthor === next.onMentionAuthor &&prev.onPin === next.onPin &&prev.onMark === next.onMark &&prev.onCreateThread === next.onCreateThread &&diff --git a/src/web/src/components/community/messages/mobile-message-gesture.test.ts b/src/web/src/components/community/messages/mobile-message-gesture.test.tsnew file mode 100644index 000000000..038d2164e--- /dev/null+++ b/src/web/src/components/community/messages/mobile-message-gesture.test.ts@@ -0,0 +1,68 @@+import { describe, expect, it } from "vitest"+import {+ MOBILE_REPLY_MAX_OFFSET_PX,+ advanceMobileReplyGesture,+ beginMobileReplyGesture,+ movedBeyondLongPressTolerance,+ shouldCommitMobileReply,+ shouldSuppressClickAfterMobileReplyGesture,+} from "./mobile-message-gesture"++describe("mobile message gesture", () => {+ it("guards the platform back edge", () => {+ expect(beginMobileReplyGesture(24, 20)).toBeNull()+ expect(beginMobileReplyGesture(25, 20)).not.toBeNull()+ })++ it("accepts only rightward horizontal intent and rejects vertical or leftward starts", () => {+ const start = beginMobileReplyGesture(80, 100)!+ expect(advanceMobileReplyGesture(start, 84, 104).gesture.intent).toBe("pending")+ expect(advanceMobileReplyGesture(start, 86, 120).gesture.intent).toBe("rejected")+ expect(advanceMobileReplyGesture(start, 60, 102).gesture.intent).toBe("rejected")+ expect(advanceMobileReplyGesture(start, 100, 104).gesture.intent).toBe("horizontal")+ })++ it("crosses once, clamps the visual offset, and commits the exact release", () => {+ const start = beginMobileReplyGesture(80, 100)!+ const crossed = advanceMobileReplyGesture(start, 146, 103)+ expect(crossed.gesture.thresholdCrossed).toBe(true)+ expect(crossed.fireHaptic).toBe(true)+ expect(shouldCommitMobileReply(crossed.gesture)).toBe(true)++ const farther = advanceMobileReplyGesture(crossed.gesture, 400, 103)+ expect(farther.gesture.offset).toBe(MOBILE_REPLY_MAX_OFFSET_PX)+ expect(farther.fireHaptic).toBe(false)+ })++ it("reversal below threshold cancels reply without a second haptic", () => {+ const start = beginMobileReplyGesture(80, 100)!+ const crossed = advanceMobileReplyGesture(start, 146, 101).gesture+ const reversed = advanceMobileReplyGesture(crossed, 110, 101)+ expect(reversed.gesture.thresholdCrossed).toBe(false)+ expect(reversed.gesture.hapticFired).toBe(true)+ expect(reversed.fireHaptic).toBe(false)+ expect(shouldCommitMobileReply(reversed.gesture)).toBe(false)+ })++ it("suppresses the synthesized click after a horizontal session even when reversal returns to zero", () => {+ const start = beginMobileReplyGesture(80, 100)!+ const crossed = advanceMobileReplyGesture(start, 156, 101).gesture+ const returnedToZero = advanceMobileReplyGesture(crossed, 80, 101).gesture+ expect(returnedToZero.offset).toBe(0)+ expect(shouldCommitMobileReply(returnedToZero)).toBe(false)+ expect(shouldSuppressClickAfterMobileReplyGesture(returnedToZero)).toBe(true)+ })++ it("suppresses the synthesized click after a below-threshold horizontal release, but not a tap", () => {+ const start = beginMobileReplyGesture(80, 100)!+ const belowThreshold = advanceMobileReplyGesture(start, 112, 101).gesture+ expect(shouldCommitMobileReply(belowThreshold)).toBe(false)+ expect(shouldSuppressClickAfterMobileReplyGesture(belowThreshold)).toBe(true)+ expect(shouldSuppressClickAfterMobileReplyGesture(start)).toBe(false)+ })++ it("uses normal touch tolerance for avatar long press cancellation", () => {+ expect(movedBeyondLongPressTolerance(10, 10, 16, 17)).toBe(false)+ expect(movedBeyondLongPressTolerance(10, 10, 21, 10)).toBe(true)+ })+})diff --git a/src/web/src/components/community/messages/mobile-message-gesture.ts b/src/web/src/components/community/messages/mobile-message-gesture.tsnew file mode 100644index 000000000..8d8d515bd--- /dev/null+++ b/src/web/src/components/community/messages/mobile-message-gesture.ts@@ -0,0 +1,86 @@+const MOBILE_REPLY_EDGE_GUARD_PX = 24+const MOBILE_REPLY_INTENT_PX = 8+const MOBILE_REPLY_THRESHOLD_PX = 64+export const MOBILE_REPLY_MAX_OFFSET_PX = 88+const MOBILE_LONG_PRESS_TOLERANCE_PX = 10++export type MobileReplyGesture = {+ startX: number+ startY: number+ offset: number+ intent: "pending" | "horizontal" | "rejected"+ thresholdCrossed: boolean+ hapticFired: boolean+}++export function beginMobileReplyGesture(+ clientX: number,+ clientY: number,+): MobileReplyGesture | null {+ if (clientX <= MOBILE_REPLY_EDGE_GUARD_PX) return null+ return {+ startX: clientX,+ startY: clientY,+ offset: 0,+ intent: "pending",+ thresholdCrossed: false,+ hapticFired: false,+ }+}++export function advanceMobileReplyGesture(+ gesture: MobileReplyGesture,+ clientX: number,+ clientY: number,+): { gesture: MobileReplyGesture; fireHaptic: boolean } {+ if (gesture.intent === "rejected") return { gesture, fireHaptic: false }++ const dx = clientX - gesture.startX+ const dy = clientY - gesture.startY+ const absX = Math.abs(dx)+ const absY = Math.abs(dy)+ let intent: MobileReplyGesture["intent"] = gesture.intent++ if (intent === "pending" && Math.max(absX, absY) >= MOBILE_REPLY_INTENT_PX) {+ intent = dx > 0 && absX > absY ? "horizontal" : "rejected"+ }+ if (intent !== "horizontal") {+ return {+ gesture: { ...gesture, intent, offset: 0, thresholdCrossed: false },+ fireHaptic: false,+ }+ }++ const offset = Math.min(MOBILE_REPLY_MAX_OFFSET_PX, Math.max(0, dx))+ const thresholdCrossed = offset >= MOBILE_REPLY_THRESHOLD_PX+ const fireHaptic = thresholdCrossed && !gesture.hapticFired+ return {+ gesture: {+ ...gesture,+ intent,+ offset,+ thresholdCrossed,+ hapticFired: gesture.hapticFired || fireHaptic,+ },+ fireHaptic,+ }+}++export function shouldCommitMobileReply(gesture: MobileReplyGesture | null): boolean {+ return gesture?.intent === "horizontal" && gesture.thresholdCrossed+}++export function shouldSuppressClickAfterMobileReplyGesture(+ gesture: MobileReplyGesture | null,+): boolean {+ return gesture?.intent === "horizontal"+}++export function movedBeyondLongPressTolerance(+ startX: number,+ startY: number,+ clientX: number,+ clientY: number,+): boolean {+ return Math.hypot(clientX - startX, clientY - startY) > MOBILE_LONG_PRESS_TOLERANCE_PX+}diff --git a/src/web/src/components/community/messages/platform-link-badge.test.ts b/src/web/src/components/community/messages/platform-link-badge.test.tsindex 75efa2f17..a2fa4b318 100644--- a/src/web/src/components/community/messages/platform-link-badge.test.ts+++ b/src/web/src/components/community/messages/platform-link-badge.test.ts@@ -4,6 +4,28 @@ import { describe, expect, it } from "vitest"import { PlatformLinkBadge } from "./platform-link-badge"describe("PlatformLinkBadge", () => {+ it("uses the existing Alook favicon for first-party links", () => {+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(+ React.createElement(+ PlatformLinkBadge,+ { href: "https://alook.ai/c/invite/abcdef" },+ "https://alook.ai/c/invite/abcdef",+ ),+ )+ })++ const link = renderer!.root.findByType("a")+ expect(link.props["data-platform-link"]).toBe("alook")+ expect(link.props["aria-label"]).toBe(+ "Alook: https://alook.ai/c/invite/abcdef",+ )+ const icon = renderer!.root.findByType("img")+ expect(icon.props.src).toBe("/favicon.ico")+ expect(icon.props.alt).toBe("")+ })+it("adds a platform icon and accessible label to a supported URL", () => {let renderer: TestRenderer.ReactTestRendereract(() => {diff --git a/src/web/src/components/community/messages/platform-link-badge.tsx b/src/web/src/components/community/messages/platform-link-badge.tsxindex 2c18e5ced..eea8a832f 100644--- a/src/web/src/components/community/messages/platform-link-badge.tsx+++ b/src/web/src/components/community/messages/platform-link-badge.tsx@@ -1,4 +1,5 @@import type { ComponentPropsWithoutRef } from "react"+import Image from "next/image"import { Link2 } from "lucide-react"import {SiDiscord,@@ -21,7 +22,7 @@ const ICONS = {figma: SiFigma,notion: SiNotion,discord: SiDiscord,-} satisfies Record<PlatformLinkKind, typeof SiGithub>+} satisfies Record<Exclude<PlatformLinkKind, "alook">, typeof SiGithub>type PlatformLinkBadgeProps = ComponentPropsWithoutRef<"a"> & {node?: unknown@@ -51,7 +52,22 @@ export function PlatformLinkBadge({)}- const Icon = ICONS[platform.kind]+ const icon = platform.kind === "alook"+ ? (+ <Image+ src="/favicon.ico"+ alt=""+ width={16}+ height={16}+ unoptimized+ className="platform-link-badge-icon"+ aria-hidden="true"+ />+ )+ : (() => {+ const Icon = ICONS[platform.kind]+ return <Icon className="platform-link-badge-icon" aria-hidden="true" />+ })()return (<a{...props}@@ -60,7 +76,7 @@ export function PlatformLinkBadge({data-platform-link={platform.kind}aria-label={props["aria-label"] ?? `${platform.label}: ${href}`}>- <Icon className="platform-link-badge-icon" aria-hidden="true" />+ {icon}<span className="platform-link-badge-label">{children}</span></a>)diff --git a/src/web/src/components/community/messages/thread-opener.test.ts b/src/web/src/components/community/messages/thread-opener.test.tsindex f22eae4cb..75e650025 100644--- a/src/web/src/components/community/messages/thread-opener.test.ts+++ b/src/web/src/components/community/messages/thread-opener.test.ts@@ -1,4 +1,4 @@-import { describe, expect, it, vi } from "vitest"+import { afterEach, describe, expect, it, vi } from "vitest"import React from "react"import TestRenderer, { act } from "react-test-renderer"@@ -22,6 +22,11 @@ function textContent(node: TestRenderer.ReactTestInstance): string {}describe("ThreadOpener image attachment layout", () => {+ afterEach(() => {+ vi.useRealTimers()+ vi.unstubAllGlobals()+ })+it("renders projected reply content in the opener", () => {useMessageMock.mockReturnValue({isLoading: false,@@ -187,4 +192,56 @@ describe("ThreadOpener image attachment layout", () => {.toBe("video")expect(renderer!.root.findAllByType("video")).toHaveLength(0)})++ it("uses the shared mobile avatar long press without leaking cancelled clicks to profile", () => {+ vi.useFakeTimers()+ vi.stubGlobal("navigator", { vibrate: vi.fn() })+ useMessageMock.mockReturnValue({+ isLoading: false,+ isError: false,+ message: {+ id: "opener_1",+ type: "chat",+ authorId: "user_1",+ authorName: "Alice",+ content: "Thread opener",+ createdAt: "2026-08-08T00:00:00.000Z",+ },+ })+ const onInsertMentionText = vi.fn()+ const onOpenProfile = vi.fn()+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(React.createElement(ThreadOpener, {+ parentMessageId: "opener_1",+ viewerUserId: "viewer_1",+ onOpenProfile,+ resolveAuthorMentionText: () => "@Alice#0042",+ onInsertMentionText,+ }), { createNodeMock: () => genericMock })+ })+ const avatar = renderer!.root.findByProps({+ "aria-label": "Open Alice profile; long press to mention",+ })+ const clickEvent = () => ({ preventDefault: vi.fn(), stopPropagation: vi.fn() })++ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 20, clientY: 20 }))+ act(() => vi.advanceTimersByTime(500))+ expect(onInsertMentionText).toHaveBeenCalledOnce()+ expect(onInsertMentionText).toHaveBeenCalledWith("@Alice#0042")+ act(() => avatar.props.onClick(clickEvent()))+ expect(onOpenProfile).not.toHaveBeenCalled()++ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 20, clientY: 20 }))+ act(() => avatar.props.onPointerCancel({ pointerType: "touch" }))+ act(() => avatar.props.onClick(clickEvent()))+ expect(onOpenProfile).not.toHaveBeenCalled()++ act(() => avatar.props.onPointerDown({ pointerType: "touch", clientX: 20, clientY: 20 }))+ act(() => avatar.props.onPointerUp({ pointerType: "touch" }))+ act(() => avatar.props.onClick(clickEvent()))+ expect(onOpenProfile).toHaveBeenCalledOnce()+ act(() => renderer!.unmount())+ expect(vi.getTimerCount()).toBe(0)+ })})diff --git a/src/web/src/components/community/messages/thread-opener.tsx b/src/web/src/components/community/messages/thread-opener.tsxindex 27592255b..b2e224fb7 100644--- a/src/web/src/components/community/messages/thread-opener.tsx+++ b/src/web/src/components/community/messages/thread-opener.tsx@@ -14,6 +14,7 @@ import type { FileAttachment, ImagePreview } from "@/lib/community/models/messagimport type { OpenProfile } from "@/components/community/social/profile-types"import { AttachmentCard } from "./attachment-card"import { displayReplyContent } from "@/lib/community/reply-content"+import { useMobileAvatarMention } from "./use-mobile-avatar-mention"// Thread opener — the parent message the thread was created from, pinned at// the top of the thread's message list. Deliberately styled like a REGULAR@@ -37,6 +38,8 @@ export function ThreadOpener({onPreviewAttachment,onDownloadFile,onJump,+ resolveAuthorMentionText,+ onInsertMentionText,}: {parentMessageId: stringviewerUserId: string@@ -44,11 +47,22 @@ export function ThreadOpener({onPreviewImage?: (image: ImagePreview) => voidonPreviewAttachment?: (attachment: FileAttachment) => voidonDownloadFile?: (url: string, name: string) => void+ resolveAuthorMentionText?: (authorId: string) => string | null+ onInsertMentionText?: (text: string) => void// Jump to the parent message in its channel. When provided, a hover-revealed// "Jump" button appears in the opener's top-right.onJump?: () => void}) {const { message: msg, isLoading, isError } = useMessage(parentMessageId)+ const mentionText = msg ? resolveAuthorMentionText?.(msg.authorId) ?? null : null+ const avatarMention = useMobileAvatarMention({+ onMention: mentionText && onInsertMentionText+ ? () => onInsertMentionText(mentionText)+ : undefined,+ onProfileClick: (event) => {+ if (msg) onOpenProfile?.(msg.authorName, event, undefined, msg.authorId)+ },+ })if (isLoading) return <ThreadOpenerSkeleton />@@ -71,7 +85,7 @@ export function ThreadOpener({const visibleContent = displayReplyContent(msg.content ?? "", msg.replyTo)return (- <div className="group relative">+ <div data-thread-opener className="group relative"><div className="mb-2 flex items-center gap-2 text-xs font-medium text-muted-foreground"><MessagesSquare className="size-3.5" /><span>Thread started from</span>@@ -92,8 +106,11 @@ export function ThreadOpener({<div className="flex gap-3"><button- onClick={(e) => onOpenProfile?.(msg.authorName, e, undefined, msg.authorId)}+ {...avatarMention}className="shrink-0 self-start"+ aria-label={mentionText && onInsertMentionText+ ? `Open ${msg.authorName} profile; long press to mention`+ : undefined}><Avatar label={avatarLabel} seed={msg.authorId} size={40} /></button>diff --git a/src/web/src/components/community/messages/typing-indicator.test.ts b/src/web/src/components/community/messages/typing-indicator.test.tsnew file mode 100644index 000000000..57ad35310--- /dev/null+++ b/src/web/src/components/community/messages/typing-indicator.test.ts@@ -0,0 +1,44 @@+import React from "react"+import TestRenderer, { act } from "react-test-renderer"+import { describe, expect, it } from "vitest"+import { tid } from "@/lib/community/testids"+import { TypingIndicator } from "./typing-indicator"++function textContent(node: TestRenderer.ReactTestInstance): string {+ return node.children.map((child) => (+ typeof child === "string" ? child : textContent(child)+ )).join("")+}++describe("TypingIndicator", () => {+ it("keeps a long single name in one bounded live status", () => {+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(React.createElement(TypingIndicator, {+ names: ["A teammate with an exceptionally long account name"],+ }))+ })+ const status = renderer.root.findByProps({ "data-testid": tid.typingIndicator })+ expect(status.props).toMatchObject({+ role: "status",+ "aria-live": "polite",+ "aria-atomic": "true",+ })+ expect(status.props.className).toContain("max-w-full")+ const label = status.findAllByType("span").find((node) => node.props.className === "min-w-0 truncate")+ expect(label).toBeDefined()+ expect(textContent(label!)).toContain("is typing…")+ })++ it("summarizes four or more typers without rendering every long name", () => {+ let renderer!: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(React.createElement(TypingIndicator, {+ names: ["Alice", "Bob", "Carol", "Dorothy"],+ }))+ })+ const status = renderer.root.findByProps({ "data-testid": tid.typingIndicator })+ expect(textContent(status)).toContain("4 people are typing…")+ expect(textContent(status)).not.toContain("Dorothy")+ })+})diff --git a/src/web/src/components/community/messages/typing-indicator.tsx b/src/web/src/components/community/messages/typing-indicator.tsxindex 03b430f78..6759451b8 100644--- a/src/web/src/components/community/messages/typing-indicator.tsx+++ b/src/web/src/components/community/messages/typing-indicator.tsx@@ -13,6 +13,9 @@ export function TypingIndicator({ names, className }: { names: string[]; classNareturn (<divdata-testid={tid.typingIndicator}+ role="status"+ aria-live="polite"+ aria-atomic="true"className={cn("pointer-events-none flex h-8 min-w-0 max-w-full items-center gap-2 rounded-full border border-border bg-background/90 px-3 text-xs text-muted-foreground shadow-(--e1) backdrop-blur-sm",className,diff --git a/src/web/src/components/community/messages/use-author-mention-insertion.test.ts b/src/web/src/components/community/messages/use-author-mention-insertion.test.tsnew file mode 100644index 000000000..0116e21b3--- /dev/null+++ b/src/web/src/components/community/messages/use-author-mention-insertion.test.ts@@ -0,0 +1,46 @@+import { createElement } from "react"+import TestRenderer, { act } from "react-test-renderer"+import { describe, expect, it, vi } from "vitest"+import {+ canonicalAuthorMentionText,+ useAuthorMentionInsertion,+} from "./use-author-mention-insertion"+import type { ComposerHandle } from "./composer"++describe("author mention insertion", () => {+ it("builds the existing canonical plain-text token with trailing spacing", () => {+ expect(canonicalAuthorMentionText({+ name: "Alice Smith",+ discriminator: "0042",+ })).toBe("@Alice Smith#0042")+ })++ it("resolves roster and viewer authors and inserts the exact structured mention", () => {+ let latest!: ReturnType<typeof useAuthorMentionInsertion>+ function Probe() {+ latest = useAuthorMentionInsertion({+ members: [{ id: "member_1", userId: "alice_1", name: "Alice Smith", discriminator: "0042" }],+ viewerUserId: "viewer_1",+ viewerName: "Viewer",+ viewerDiscriminator: "1111",+ })+ return null+ }+ act(() => {+ TestRenderer.create(createElement(Probe))+ })++ expect(latest.resolveAuthorMentionText("alice_1")).toBe("@Alice Smith#0042")+ expect(latest.resolveAuthorMentionText("viewer_1")).toBe("@Viewer#1111")+ expect(latest.resolveAuthorMentionText("missing")).toBeNull()++ const insertMentionAtCaret = vi.fn()+ latest.composerRef.current = { insertMentionAtCaret } as unknown as ComposerHandle+ act(() => latest.insertMentionText("@Alice Smith#0042"))+ expect(insertMentionAtCaret).toHaveBeenCalledOnce()+ expect(insertMentionAtCaret).toHaveBeenCalledWith({+ id: "member_1",+ label: "Alice Smith#0042",+ })+ })+})diff --git a/src/web/src/components/community/messages/use-author-mention-insertion.ts b/src/web/src/components/community/messages/use-author-mention-insertion.tsnew file mode 100644index 000000000..504208165--- /dev/null+++ b/src/web/src/components/community/messages/use-author-mention-insertion.ts@@ -0,0 +1,61 @@+"use client"++import { useCallback, useMemo, useRef } from "react"+import { formatHandle } from "@alook/shared"+import type { Member } from "@/lib/community/models/people"+import type { ComposerHandle, ComposerMention } from "./composer"++type MentionIdentity = Pick<Member, "id" | "userId" | "name" | "discriminator">++export function canonicalAuthorMentionText(+ identity: Pick<MentionIdentity, "name" | "discriminator">,+): string {+ return `@${formatHandle(identity.name, identity.discriminator)}`+}++export function useAuthorMentionInsertion({+ members,+ viewerUserId,+ viewerName,+ viewerDiscriminator,+}: {+ members: MentionIdentity[]+ viewerUserId: string+ viewerName: string+ viewerDiscriminator?: string+}) {+ const composerRef = useRef<ComposerHandle>(null)+ const mentionByUserId = useMemo(() => {+ const identities: MentionIdentity[] = [...members]+ if (viewerDiscriminator && !identities.some(({ userId }) => userId === viewerUserId)) {+ identities.push({+ id: viewerUserId,+ userId: viewerUserId,+ name: viewerName,+ discriminator: viewerDiscriminator,+ })+ }+ return new Map(identities.map((identity) => [+ identity.userId,+ {+ id: identity.id,+ label: formatHandle(identity.name, identity.discriminator),+ } satisfies ComposerMention,+ ]))+ }, [members, viewerDiscriminator, viewerName, viewerUserId])+ const resolveAuthorMentionText = useCallback(+ (authorId: string) => {+ const mention = mentionByUserId.get(authorId)+ return mention ? `@${mention.label}` : null+ },+ [mentionByUserId],+ )+ const insertMentionText = useCallback((text: string) => {+ const mention = Array.from(mentionByUserId.values()).find(+ (candidate) => `@${candidate.label}` === text,+ )+ if (mention) composerRef.current?.insertMentionAtCaret(mention)+ }, [mentionByUserId])++ return { composerRef, resolveAuthorMentionText, insertMentionText }+}diff --git a/src/web/src/components/community/messages/use-composer-controller.test.ts b/src/web/src/components/community/messages/use-composer-controller.test.tsindex a036aa46b..64eea7c92 100644--- a/src/web/src/components/community/messages/use-composer-controller.test.ts+++ b/src/web/src/components/community/messages/use-composer-controller.test.ts@@ -81,6 +81,11 @@ type TestEditor = {getJSON: ReturnType<typeof vi.fn>state: {tr: object+ selection: { from: number; to: number }+ doc: {+ content: { size: number }+ textBetween: ReturnType<typeof vi.fn>+ }}view: {dispatch: ReturnType<typeof vi.fn>@@ -149,7 +154,14 @@ describe("useComposerController", () => {isEmpty: false,getText: vi.fn(() => " hello @everyone "),getJSON: vi.fn(() => ({ type: "doc" })),- state: { tr: transaction },+ state: {+ tr: transaction,+ selection: { from: 5, to: 5 },+ doc: {+ content: { size: 10 },+ textBetween: vi.fn((from: number, to: number) => to === 5 ? "o" : from === 5 ? "w" : ""),+ },+ },view: { dispatch, dom: { setAttribute: setDomAttribute } },commands: {clearContent,@@ -434,6 +446,26 @@ describe("useComposerController", () => {handleRef.current?.focusEditor()expect(focus).toHaveBeenCalledWith("end")+ handleRef.current?.insertTextAtCaret("@Alice Smith#0042")+ expect(editor.chain).toHaveBeenCalled()+ expect(chainFocus).toHaveBeenCalled()+ expect(insertContent).toHaveBeenCalledWith({+ type: "text",+ text: " @Alice Smith#0042 ",+ })+ handleRef.current?.insertMentionAtCaret({+ id: "member_1",+ label: "Alice Smith#0042",+ })+ expect(insertContent).toHaveBeenLastCalledWith([+ { type: "text", text: " " },+ {+ type: "mention",+ attrs: { id: "member_1", label: "Alice Smith#0042" },+ },+ { type: "text", text: " " },+ ])+ expect(run).toHaveBeenCalled()handleRef.current?.openFilePicker()expect(filePickerClick).toHaveBeenCalledOnce()expect(handleRef.current?.isEmpty()).toBe(false)@@ -833,7 +865,10 @@ describe("useComposerController", () => {expect(focus).not.toHaveBeenCalled()await act(async () => {renderer.update(- createElement(Harness, { ...props, replyingTo: "Ada" }),+ createElement(Harness, {+ ...props,+ replyingTo: { authorName: "Ada", text: "First target" },+ }),)})expect(focus).not.toHaveBeenCalled()@@ -883,7 +918,7 @@ describe("useComposerController", () => {...acceptedProps(accept),channel: "random",draftKey: "server/random",- replyingTo: "Ada",+ replyingTo: { authorName: "Ada", text: "First target" },}),)})@@ -895,7 +930,7 @@ describe("useComposerController", () => {...acceptedProps(accept),channel: "random",draftKey: "server/random",- replyingTo: "Grace",+ replyingTo: { authorName: "Grace", text: "Second target" },}),)})@@ -915,7 +950,7 @@ describe("useComposerController", () => {...acceptedProps(accept),channel: "random",draftKey: "server/random",- replyingTo: "Ada",+ replyingTo: { authorName: "Ada", text: "First target" },}),)})@@ -930,12 +965,6 @@ describe("useComposerController", () => {focus.mock.invocationCallOrder[0],)- focus.mockClear()- view.onAttachOpenChange(true)- expect(focus).not.toHaveBeenCalled()- view.onAttachOpenChange(false)- expect(focus).toHaveBeenCalledWith()-focus.mockClear()view.onUploadFile()expect(filePickerClick).toHaveBeenCalled()diff --git a/src/web/src/components/community/messages/use-composer-controller.ts b/src/web/src/components/community/messages/use-composer-controller.tsindex 93a77e058..981469289 100644--- a/src/web/src/components/community/messages/use-composer-controller.ts+++ b/src/web/src/components/community/messages/use-composer-controller.ts@@ -29,6 +29,7 @@ import {} from "./composer-file-utils"import { handleComposerKeyDown } from "./composer-keydown"import type { ComposerHandle, ComposerProps } from "./composer-types"+import { mentionNodesForCaretInsertion, textNodeForCaretInsertion } from "./caret-text-insertion"import type { ComposerViewProps } from "./composer-view"import { useComposerSuggestions } from "./use-composer-suggestions"@@ -116,7 +117,6 @@ export function useComposerController((context === "channel" ? `Message /${channel}` : `Message ${channel}`)const placeholderRef = useRef(resolvedPlaceholder)const resolvePlaceholder = useCallback(() => placeholderRef.current, [])-const suggestions = useComposerSuggestions({members,context,@@ -125,7 +125,6 @@ export function useComposerController(channelRefCandidateSource,onChannelRefIntent,})-const fireTyping = () => {if (!onTyping || typingTimer.current) returnonTyping()@@ -133,7 +132,6 @@ export function useComposerController(typingTimer.current = null}, 3_000)}-const editor = useEditor({immediatelyRender: false,extensions: [@@ -218,20 +216,17 @@ export function useComposerController(}},})-const enterKeyHint =isForumThreadBody || breakpoint !== "desktop" ? "enter" : "send"useLayoutEffect(() => {editor?.view?.dom?.setAttribute("enterkeyhint", enterKeyHint)}, [editor, enterKeyHint])-useLayoutEffect(() => {if (placeholderRef.current === resolvedPlaceholder) returnplaceholderRef.current = resolvedPlaceholderif (!editor) returneditor.view?.dispatch(editor.state.tr)}, [editor, resolvedPlaceholder])-useEffect(() => {if (!editor || isForumThreadBody || !draftKey) returnconst doc = readComposerDraft(draftKey)@@ -324,6 +319,14 @@ export function useComposerController(focusEditor: () => {editor?.commands.focus("end")},+ insertTextAtCaret: (text) => {+ if (!editor || !text) return+ const insertion = textNodeForCaretInsertion(text, editor.state)+ editor.chain().focus().insertContent(insertion).run()+ },+ insertMentionAtCaret: (mention) => {+ if (editor && mention.id && mention.label) editor.chain().focus().insertContent(mentionNodesForCaretInsertion(mention, editor.state)).run()+ },submitNow: () => {send()},@@ -384,9 +387,6 @@ export function useComposerController(sendDisabled:sendInFlight || (!editorHasContent && pendingFiles.length === 0),onSend: send,- onAttachOpenChange: (open) => {- if (!open) editor?.commands.focus()- },onUploadFile: () => {fileInputRef.current?.click()editor?.commands.focus()diff --git a/src/web/src/components/community/messages/use-mobile-avatar-mention.ts b/src/web/src/components/community/messages/use-mobile-avatar-mention.tsnew file mode 100644index 000000000..7acb02583--- /dev/null+++ b/src/web/src/components/community/messages/use-mobile-avatar-mention.ts@@ -0,0 +1,84 @@+"use client"++import { useCallback, useEffect, useRef } from "react"+import type React from "react"+import { movedBeyondLongPressTolerance } from "./mobile-message-gesture"++const AVATAR_MENTION_LONG_PRESS_MS = 500++export function useMobileAvatarMention({+ onMention,+ onProfileClick,+}: {+ onMention?: () => void+ onProfileClick: (event: React.MouseEvent<HTMLButtonElement>) => void+}) {+ const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)+ const startRef = useRef<{ x: number; y: number } | null>(null)+ const suppressClickRef = useRef(false)++ const clear = useCallback(() => {+ if (timerRef.current) clearTimeout(timerRef.current)+ timerRef.current = null+ startRef.current = null+ }, [])+ const cancelAndSuppressClick = useCallback(() => {+ clear()+ suppressClickRef.current = true+ }, [clear])++ useEffect(() => clear, [clear])++ return {+ onPointerDown: onMention+ ? (event: React.PointerEvent<HTMLButtonElement>) => {+ if (event.pointerType !== "touch") return+ clear()+ suppressClickRef.current = false+ startRef.current = { x: event.clientX, y: event.clientY }+ timerRef.current = setTimeout(() => {+ timerRef.current = null+ suppressClickRef.current = true+ navigator.vibrate?.(10)+ onMention()+ }, AVATAR_MENTION_LONG_PRESS_MS)+ }+ : undefined,+ onPointerMove: onMention+ ? (event: React.PointerEvent<HTMLButtonElement>) => {+ if (event.pointerType !== "touch") return+ const start = startRef.current+ if (start && movedBeyondLongPressTolerance(+ start.x,+ start.y,+ event.clientX,+ event.clientY,+ )) cancelAndSuppressClick()+ }+ : undefined,+ onPointerUp: onMention+ ? (event: React.PointerEvent<HTMLButtonElement>) => {+ if (event.pointerType === "touch") clear()+ }+ : undefined,+ onPointerCancel: onMention+ ? (event: React.PointerEvent<HTMLButtonElement>) => {+ if (event.pointerType === "touch") cancelAndSuppressClick()+ }+ : undefined,+ onContextMenu: onMention+ ? (event: React.MouseEvent<HTMLButtonElement>) => {+ if (suppressClickRef.current) event.preventDefault()+ }+ : undefined,+ onClick: (event: React.MouseEvent<HTMLButtonElement>) => {+ if (suppressClickRef.current) {+ suppressClickRef.current = false+ event.preventDefault()+ event.stopPropagation()+ return+ }+ onProfileClick(event)+ },+ }+}diff --git a/src/web/src/components/community/shell/shell-frame-view.test.ts b/src/web/src/components/community/shell/shell-frame-view.test.tsindex 06559803c..ba7194c36 100644--- a/src/web/src/components/community/shell/shell-frame-view.test.ts+++ b/src/web/src/components/community/shell/shell-frame-view.test.ts@@ -61,14 +61,15 @@ function committedCheckpoint(}}-function pendingCheckpoint(- href: string,- surface: CommunitySurface,+function sameScopePendingCheckpoint(+ committedHref: string,+ committedSurface: CommunitySurface,+ targetHref: string,): CommunityCheckpointPlan {return {- ...committedCheckpoint(href, surface),+ ...committedCheckpoint(committedHref, committedSurface),mode: "same-scope-leaf",- main: { kind: "target-skeleton", href },+ targetHref,}}@@ -91,6 +92,7 @@ const inbox = {describe("ShellFrameView", () => {beforeEach(() => {+ vi.unstubAllGlobals()mocks.observe.mockClear()mocks.disconnect.mockClear()mocks.resizeCallback.current = undefined@@ -102,6 +104,7 @@ describe("ShellFrameView", () => {disconnect = mocks.disconnect}vi.stubGlobal("ResizeObserver", ResizeObserverMock)+ vi.stubGlobal("matchMedia", vi.fn(() => ({ matches: false })))})it("keeps responsive detail shell zones while the breakpoint is unknown", async () => {@@ -269,6 +272,8 @@ describe("ShellFrameView", () => {expect(renderer.root.findByType("panel-group").props.disabled).toBe(true)expect(renderer.root.findByType("panel-group").props.className).toContain("*:data-[mobile-active=true]:flex-1!")expect(renderer.root.findAllByType("shell-overlays")).toHaveLength(1)+ const listMotion = renderer.root.findByProps({ "data-community-mobile-surface": "list" })+ expect(listMotion.props.className).toContain("flex")expect("profileStatusSeeds" in renderer.root.findByType("shell-overlays").props).toBe(false)expect(sidebar).toHaveBeenCalledWith({ noHeader: false })@@ -294,6 +299,57 @@ describe("ShellFrameView", () => {expect(renderer.root.findAllByType("panel")[0]?.props["data-mobile-active"]).toBeUndefined()expect(renderer.root.findAllByType("panel")[1]?.props["data-mobile-active"]).toBe(true)expect(renderer.root.findAllByType("shell-overlays")).toHaveLength(1)+ const detailMotion = renderer.root.findByProps({ "data-community-mobile-surface": "detail" })+ expect(detailMotion.props.className).toContain("flex")+ })++ it("animates committed mobile switches without remounting and skips reduced motion", async () => {+ const cancel = vi.fn()+ const animate = vi.fn(() => ({ cancel }))+ const sidebar = () => createElement("sidebar-content")+ const common = {+ breakpoint: "mobile" as const,+ sidebar,+ cancelPendingNavigation: vi.fn(),+ rail,+ profile,+ inbox,+ }+ let renderer!: TestRenderer.ReactTestRenderer+ await act(async () => {+ renderer = TestRenderer.create(createElement(+ ShellFrameView,+ { ...common, checkpoint: committedCheckpoint("/c/channels/s1/c1", "detail") },+ createElement("main-content"),+ ), { createNodeMock: () => ({ offsetWidth: 240, animate }) })+ })+ expect(animate).not.toHaveBeenCalled()++ await act(async () => {+ renderer.update(createElement(+ ShellFrameView,+ { ...common, checkpoint: committedCheckpoint("/c/channels/s1/c2", "detail") },+ createElement("main-content"),+ ))+ })+ expect(animate).toHaveBeenCalledOnce()+ expect(animate).toHaveBeenLastCalledWith([+ { opacity: 0.92, transform: "translate3d(8px, 0, 0)" },+ { opacity: 1, transform: "translate3d(0, 0, 0)" },+ ], {+ duration: 180,+ easing: "cubic-bezier(0.22, 1, 0.36, 1)",+ })++ vi.stubGlobal("matchMedia", vi.fn(() => ({ matches: true })))+ await act(async () => {+ renderer.update(createElement(+ ShellFrameView,+ { ...common, checkpoint: committedCheckpoint("/c/channels/s1/c3", "detail") },+ createElement("main-content"),+ ))+ })+ expect(animate).toHaveBeenCalledOnce()})it("preserves child component identity across the 639 to 640 breakpoint", async () => {@@ -376,7 +432,7 @@ describe("ShellFrameView", () => {expect(mocks.disconnect).toHaveBeenCalledTimes(2)})- it("replaces committed content with immediate pending feedback in every shell zone", async () => {+ it("keeps committed content mounted while same-scope navigation is pending", async () => {const sidebar = vi.fn(() => createElement("sidebar-content"))const common = {sidebar,@@ -389,46 +445,35 @@ describe("ShellFrameView", () => {await act(async () => {renderer = TestRenderer.create(createElement(ShellFrameView,- { ...common, breakpoint: "desktop", checkpoint: pendingCheckpoint("/c/me/friends", "detail") },+ {+ ...common,+ breakpoint: "desktop",+ checkpoint: sameScopePendingCheckpoint("/c/me", "list", "/c/me/friends"),+ },createElement("main-content"),), { createNodeMock: () => ({ offsetWidth: 240 }) })})- expect(renderer.root.findAllByType("channel-loading-frame")).toHaveLength(1)- expect(renderer.root.findAllByType("main-content")).toHaveLength(0)+ expect(renderer.root.findAllByType("channel-loading-frame")).toHaveLength(0)+ expect(renderer.root.findAllByType("main-content")).toHaveLength(1)expect(renderer.root.findAllByType("server-rail")).toHaveLength(1)expect(renderer.root.findAllByType("user-bar")).toHaveLength(1)await act(async () => {renderer.update(createElement(ShellFrameView,- { ...common, breakpoint: "mobile", checkpoint: pendingCheckpoint("/c/me", "list") },+ {+ ...common,+ breakpoint: "mobile",+ checkpoint: sameScopePendingCheckpoint("/c/me", "list", "/c/me/friends"),+ },createElement("main-content"),))})- expect(renderer.root.findAllByType("channel-loading-frame")).toHaveLength(1)+ expect(renderer.root.findAllByType("channel-loading-frame")).toHaveLength(0)expect(renderer.root.findAllByType("server-rail")).toHaveLength(1)expect(renderer.root.findAllByType("sidebar-content")).toHaveLength(1)expect(renderer.root.findAllByType("user-bar")).toHaveLength(1)- expect(renderer.root.findAll((node) =>- typeof node.props.className === "string" &&- node.props.className.includes("absolute inset-0 z-20")))- .toHaveLength(0)- expect(renderer.root.findAllByType("panel")[1]!.findAllByType("channel-loading-frame"))- .toHaveLength(1)-- await act(async () => {- renderer.update(createElement(- ShellFrameView,- { ...common, breakpoint: "mobile", checkpoint: pendingCheckpoint("/c/me/friends", "detail") },- createElement("main-content"),- ))- })- expect(renderer.root.findAllByType("channel-loading-frame")).toHaveLength(1)- expect(renderer.root.findAllByType("main-content")).toHaveLength(0)- expect(renderer.root.findAllByType("server-rail")).toHaveLength(0)- expect(renderer.root.findAllByType("user-bar")).toHaveLength(0)- expect(renderer.root.findByType("channel-loading-frame").props.reserveBackSlot).toBe(true)- expect(renderer.root.findByType("channel-loading-frame").props.onBack).toBeUndefined()+ expect(renderer.root.findAllByType("main-content")).toHaveLength(1)})it("replaces the committed sidebar with one target-scoped cold server checkpoint", async () => {diff --git a/src/web/src/components/community/shell/shell-frame-view.tsx b/src/web/src/components/community/shell/shell-frame-view.tsxindex 9d574f7bf..35c02242a 100644--- a/src/web/src/components/community/shell/shell-frame-view.tsx+++ b/src/web/src/components/community/shell/shell-frame-view.tsx@@ -34,6 +34,7 @@ type Props = Pick<ShellFrameProps, "sidebar" | "children" | "extraDialogs"> & {}const SHELL_SURFACE_CLASS = "rounded-tl-xl rounded-tr-none rounded-br-none rounded-bl-none ring-0 border-l border-t border-border/40 shadow-none"+const MOBILE_SURFACE_TRANSITION_MS = 180export function ShellFrameView({breakpoint,@@ -52,6 +53,9 @@ export function ShellFrameView({onlySaveAfterUserInteractions: true,})const sidebarPanelRef = useRef<HTMLDivElement>(null)+ const mainPanelRef = useRef<HTMLDivElement>(null)+ const previousCommittedHrefRef = useRef<string | null>(null)+ const mobileSurfaceAnimationRef = useRef<Animation | null>(null)const [sidebarWidth, setSidebarWidth] = useState(240)useEffect(() => {if (breakpoint !== "desktop") return@@ -76,6 +80,32 @@ export function ShellFrameView({const isInitial = breakpoint === "unknown"const isInitialDetail = isInitial && surface === "detail"const showUserBar = isDesktop || isMobileList || isInitial+ useEffect(() => {+ if (checkpoint.mode !== "committed") return+ const previousHref = previousCommittedHrefRef.current+ previousCommittedHrefRef.current = checkpoint.targetHref+ if (+ breakpoint !== "mobile"+ || !previousHref+ || previousHref === checkpoint.targetHref+ || globalThis.matchMedia?.("(prefers-reduced-motion: reduce)").matches+ ) return++ const element = surface === "list" ? sidebarPanelRef.current : mainPanelRef.current+ if (!element?.animate) return+ mobileSurfaceAnimationRef.current?.cancel()+ mobileSurfaceAnimationRef.current = element.animate([+ {+ opacity: 0.92,+ transform: `translate3d(${surface === "list" ? -8 : 8}px, 0, 0)`,+ },+ { opacity: 1, transform: "translate3d(0, 0, 0)" },+ ], {+ duration: MOBILE_SURFACE_TRANSITION_MS,+ easing: "cubic-bezier(0.22, 1, 0.36, 1)",+ })+ }, [breakpoint, checkpoint.mode, checkpoint.targetHref, surface])+ useEffect(() => () => mobileSurfaceAnimationRef.current?.cancel(), [])const initialUserBarStyle = {"--community-desktop-user-bar-width": `${desktopUserBarOverlayWidth(sidebarWidth)}px`,marginLeft: -COMMUNITY_RAIL_WIDTH,@@ -127,7 +157,11 @@ export function ShellFrameView({isInitialDetail && "max-sm:hidden",)}>- <div ref={sidebarPanelRef} className="flex min-h-0 min-w-0 flex-1 flex-col">+ <div+ ref={sidebarPanelRef}+ data-community-mobile-surface={isMobileList ? "list" : undefined}+ className="flex min-h-0 min-w-0 flex-1 flex-col"+ >{!isMobileDetail && (checkpoint.sidebar.kind === "server-skeleton"? <ChannelSidebarSkeleton targetServerId={checkpoint.sidebar.serverId} />@@ -149,12 +183,18 @@ export function ShellFrameView({isInitialDetail && "max-sm:flex-1!",)}>- {checkpoint.main.kind === "target-skeleton" || isInitial ? (- <CommunityPendingFrame- href={checkpoint.targetHref}- reserveBackSlot={surface === "detail"}- />- ) : children}+ <div+ ref={mainPanelRef}+ data-community-mobile-surface={isMobileDetail ? "detail" : undefined}+ className="flex min-h-0 flex-1 flex-col"+ >+ {checkpoint.main.kind === "target-skeleton" || isInitial ? (+ <CommunityPendingFrame+ href={checkpoint.targetHref}+ reserveBackSlot={surface === "detail"}+ />+ ) : children}+ </div></ResizablePanel></ResizablePanelGroup></AppSurface>diff --git a/src/web/src/components/community/shell/shell-frame.test.ts b/src/web/src/components/community/shell/shell-frame.test.tsindex 0a9cba899..f7bb7dacd 100644--- a/src/web/src/components/community/shell/shell-frame.test.ts+++ b/src/web/src/components/community/shell/shell-frame.test.ts@@ -146,7 +146,7 @@ describe("ShellFrame orchestration", () => {.toBe("committed")})- it("uses the pending destination surface before the committed href changes", async () => {+ it("keeps the committed surface until exact frame evidence arrives", async () => {mocks.currentHref.current = "/c/channels/s1/c1"mocks.pendingHref.current = "/c/channels/s1"mocks.navigationPending.current = true@@ -156,9 +156,9 @@ describe("ShellFrame orchestration", () => {renderer = TestRenderer.create(createElement(ShellFrame, sourceProps))})expect(renderer.root.findByType("shell-frame-view").props.checkpoint).toMatchObject({- surface: "list",+ surface: "detail",targetHref: "/c/channels/s1",- main: { kind: "target-skeleton", href: "/c/channels/s1" },+ main: { kind: "keep" },})expect(mocks.inboxOptions).toHaveBeenLastCalledWith(expect.objectContaining({publishedHref: "/c/channels/s1/c1",diff --git a/src/web/src/components/community/shell/use-community-navigation-controller.test.ts b/src/web/src/components/community/shell/use-community-navigation-controller.test.tsindex 4e98ced3d..ad2f106f9 100644--- a/src/web/src/components/community/shell/use-community-navigation-controller.test.ts+++ b/src/web/src/components/community/shell/use-community-navigation-controller.test.ts@@ -10,6 +10,7 @@ const mocks = vi.hoisted(() => ({push: vi.fn(),replace: vi.fn(),prefetch: vi.fn(),+ captureScroll: vi.fn(),frame: {current: null as CommunityCommittedFrame | null,},@@ -24,6 +25,9 @@ vi.mock("next/navigation", () => ({prefetch: mocks.prefetch,}),}))+vi.mock("@/components/community/messages/message-scroll-memory", () => ({+ captureActiveMessageScrollPosition: mocks.captureScroll,+}))type Result = ReturnType<typeof useCommunityNavigationController>@@ -44,6 +48,9 @@ async function renderController() {rerender: async () => {await act(async () => renderer.update(createElement(Capture, { onResult })))},+ unmount: async () => {+ await act(async () => renderer.unmount())+ },}}@@ -54,8 +61,11 @@ describe("useCommunityNavigationController", () => {mocks.push.mockReset()mocks.replace.mockReset()mocks.prefetch.mockReset()+ mocks.captureScroll.mockReset()mocks.frame.current = { ...normalizeCommunityHref("/c/me"), revision: 0 }- vi.stubGlobal("window", new EventTarget())+ const windowTarget = new EventTarget() as EventTarget & { navigation: EventTarget }+ windowTarget.navigation = new EventTarget()+ vi.stubGlobal("window", windowTarget)})afterEach(() => vi.unstubAllGlobals())@@ -153,6 +163,34 @@ describe("useCommunityNavigationController", () => {expect(mocks.push).toHaveBeenCalledTimes(1)})+ it("captures scroll before imperative and browser-history navigation", async () => {+ const hook = await renderController()+ await act(async () => hook.current.push("/c/me/friends"))+ expect(mocks.captureScroll).toHaveBeenCalledTimes(1)++ await act(async () => (+ window as unknown as { navigation: EventTarget }+ ).navigation.dispatchEvent(new Event("navigate")))+ expect(mocks.captureScroll).toHaveBeenCalledTimes(2)++ await act(async () => window.dispatchEvent(new Event("popstate")))+ expect(mocks.captureScroll).toHaveBeenCalledTimes(2)+ await hook.unmount()+ ;(window as unknown as { navigation: EventTarget }).navigation.dispatchEvent(new Event("navigate"))+ expect(mocks.captureScroll).toHaveBeenCalledTimes(2)+ })++ it("captures browser history through popstate when the Navigation API is unavailable", async () => {+ delete (window as unknown as { navigation?: EventTarget }).navigation+ const hook = await renderController()++ await act(async () => window.dispatchEvent(new Event("popstate")))+ expect(mocks.captureScroll).toHaveBeenCalledOnce()+ await hook.unmount()+ window.dispatchEvent(new Event("popstate"))+ expect(mocks.captureScroll).toHaveBeenCalledOnce()+ })+it("commits only the latest async destination", async () => {const hook = await renderController()let resolveFirst!: (href: string) => voiddiff --git a/src/web/src/components/community/shell/use-community-navigation-controller.ts b/src/web/src/components/community/shell/use-community-navigation-controller.tsindex 4da3cfe1d..1763f4f7f 100644--- a/src/web/src/components/community/shell/use-community-navigation-controller.ts+++ b/src/web/src/components/community/shell/use-community-navigation-controller.ts@@ -14,6 +14,7 @@ import {type CommunityCommittedFrame,} from "@/lib/community/community-route"import type { ShellRouter } from "./shell-frame-types"+import { captureActiveMessageScrollPosition } from "@/components/community/messages/message-scroll-memory"export type CommunityNavigationController = {publishedHref: string@@ -64,13 +65,27 @@ export function useCommunityNavigationController(useEffect(() => {if (typeof window === "undefined") return+ const navigationApi = (window as Window & { navigation?: EventTarget }).navigation+ const onNavigate = () => captureActiveMessageScrollPosition()+ const onPopStateCapture = () => captureActiveMessageScrollPosition()const onPopState = () => cancelPendingNavigation()+ navigationApi?.addEventListener("navigate", onNavigate)+ if (!navigationApi) {+ window.addEventListener("popstate", onPopStateCapture, { capture: true })+ }window.addEventListener("popstate", onPopState)- return () => window.removeEventListener("popstate", onPopState)+ return () => {+ navigationApi?.removeEventListener("navigate", onNavigate)+ if (!navigationApi) {+ window.removeEventListener("popstate", onPopStateCapture, { capture: true })+ }+ window.removeEventListener("popstate", onPopState)+ }}, [cancelPendingNavigation])const push = useCallback((href: string) => {if (href === publishedHref) return+ captureActiveMessageScrollPosition()supersedeNavigationIntent(gateRef.current)pendingBaselineRevisionRef.current = committedFrame.revisionpendingBaselineLeafRef.current = committedFrame.leafKey@@ -81,6 +96,7 @@ export function useCommunityNavigationController(const replace = useCallback((href: string) => {if (href === publishedHref) return+ captureActiveMessageScrollPosition()supersedeNavigationIntent(gateRef.current)pendingBaselineRevisionRef.current = committedFrame.revisionpendingBaselineLeafRef.current = committedFrame.leafKey@@ -101,6 +117,7 @@ export function useCommunityNavigationController(setPendingHref(null)return}+ captureActiveMessageScrollPosition()setPendingHref(href)router.push(href)})diff --git a/src/web/src/hooks/community/use-channel-message-feed.test.ts b/src/web/src/hooks/community/use-channel-message-feed.test.tsnew file mode 100644index 000000000..026bba790--- /dev/null+++ b/src/web/src/hooks/community/use-channel-message-feed.test.ts@@ -0,0 +1,102 @@+import { createElement } from "react"+import TestRenderer, { act } from "react-test-renderer"+import { beforeEach, describe, expect, it, vi } from "vitest"+import { useChannelMessageFeed } from "./use-channel-message-feed"++const mocks = vi.hoisted(() => ({+ readState: {+ snapshot: { lastReadMessageId: null as string | null, lastReadSeq: 2 },+ isFetching: false,+ },+ messages: {+ messages: [+ { id: "self", authorId: "viewer" },+ { id: "peer", authorId: "peer" },+ ],+ anchorReconciled: true,+ latestSeq: 5,+ isPending: false,+ isError: false,+ hasMoreNewer: false,+ refetch: vi.fn(),+ },+ useMessages: vi.fn(),+ watermark: vi.fn(),+}))++vi.mock("./use-channel-read-state", () => ({+ useChannelReadStateSnapshot: () => mocks.readState,+}))+vi.mock("./use-messages", () => ({+ useMessages: (...args: unknown[]) => {+ mocks.useMessages(...args)+ return mocks.messages+ },+}))+vi.mock("./use-channel-watermark", () => ({+ useChannelWatermark: (input: unknown) => mocks.watermark(input),+}))+vi.mock("./use-channel-panels", () => ({+ useThreads: () => ({ threads: [], isLoading: false }),+ usePins: () => ({ pins: [], isLoading: false }),+}))++function Capture({ preferCachedWindowOnMount = false }: { preferCachedWindowOnMount?: boolean }) {+ const result = useChannelMessageFeed({+ channelId: "channel",+ serverId: "server",+ viewerUserId: "viewer",+ isChildChannel: false,+ anchorMessageId: null,+ preferCachedWindowOnMount,+ })+ return createElement("output", {+ "data-divider": result.newDividerBefore,+ "data-unread": result.unreadCount,+ })+}++function CaptureDefaultMount() {+ const result = useChannelMessageFeed({+ channelId: "channel",+ serverId: "server",+ viewerUserId: "viewer",+ isChildChannel: false,+ anchorMessageId: null,+ })+ return createElement("output", {+ "data-divider": result.newDividerBefore,+ "data-unread": result.unreadCount,+ })+}++describe("useChannelMessageFeed", () => {+ beforeEach(() => {+ mocks.useMessages.mockReset()+ mocks.watermark.mockReset()+ })++ it("revalidates a normal mount and preserves the cached window on a restored mount", () => {+ let renderer: TestRenderer.ReactTestRenderer+ act(() => {+ renderer = TestRenderer.create(createElement(CaptureDefaultMount))+ })+ expect(mocks.useMessages).toHaveBeenLastCalledWith("channel", expect.objectContaining({+ reconcileLateAnchor: true,+ revalidateOnMount: true,+ }))+ expect(renderer!.root.findByType("output").props).toMatchObject({+ "data-divider": "peer",+ "data-unread": 3,+ })++ act(() => {+ renderer!.update(createElement(Capture, { preferCachedWindowOnMount: true }))+ })+ expect(mocks.useMessages).toHaveBeenLastCalledWith("channel", expect.objectContaining({+ reconcileLateAnchor: false,+ revalidateOnMount: false,+ }))+ act(() => renderer!.unmount())+ })+})diff --git a/src/web/src/hooks/community/use-channel-message-feed.ts b/src/web/src/hooks/community/use-channel-message-feed.tsindex 1e0850ee0..2d1aaf2d0 100644--- a/src/web/src/hooks/community/use-channel-message-feed.ts+++ b/src/web/src/hooks/community/use-channel-message-feed.ts@@ -12,12 +12,14 @@ export function useChannelMessageFeed({viewerUserId,isChildChannel: _isChildChannel,anchorMessageId,+ preferCachedWindowOnMount = false,}: {channelId: string | nullserverId: stringviewerUserId: stringisChildChannel: booleananchorMessageId: string | null+ preferCachedWindowOnMount?: boolean}) {const readState = useChannelReadStateSnapshot(channelId)const readSnapshot = readState.snapshot@@ -28,6 +30,8 @@ export function useChannelMessageFeed({: (readSnapshot?.lastReadMessageId ?? null),anchorMessageId,waitForAnchor: false,+ reconcileLateAnchor: !preferCachedWindowOnMount,+ revalidateOnMount: !preferCachedWindowOnMount,})const { newDividerBefore, anchorFound } = useMemo(() => {if (!readSnapshot) return { newDividerBefore: undefined, anchorFound: false }diff --git a/src/web/src/hooks/community/use-messages.activation-refetch.test.ts b/src/web/src/hooks/community/use-messages.activation-refetch.test.tsindex 2a496f9aa..71cb2ecd5 100644--- a/src/web/src/hooks/community/use-messages.activation-refetch.test.ts+++ b/src/web/src/hooks/community/use-messages.activation-refetch.test.ts@@ -80,6 +80,26 @@ function IndependentChannelCapture({ lastReadMessageId, onRender }: {return null}+function WarmReturnChannelCapture({ lastReadMessageId, onRender }: {+ lastReadMessageId: string | null+ onRender: (snapshot: Snapshot) => void+}) {+ const result = useMessages("ch_activation", {+ serverId: "server_1",+ lastReadMessageId,+ waitForAnchor: false,+ reconcileLateAnchor: false,+ revalidateOnMount: false,+ })+ onRender({+ anchorReconciled: result.anchorReconciled,+ hasMoreNewer: result.hasMoreNewer,+ ids: result.messages.map((message) => message.id),+ isFetching: result.isFetching,+ })+ return null+}+function renderCapture(queryClient: QueryClient,element: React.ReactElement,@@ -219,6 +239,72 @@ describe("useMessagesInner — disabled-to-enabled cache revalidation", () => {renderer.unmount()})+ it("warm return keeps its WS-live cache without StrictMode mount refetch when the read pointer is already cached", async () => {+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })+ const key = communityKeys.channelMessages("ch_activation")+ const page = {+ messages: [+ { id: "m_read", seq: 1, createdAt: "2026-08-09T00:00:01.000Z" },+ { id: "m_new", seq: 2, createdAt: "2026-08-09T00:00:02.000Z" },+ ],+ hasMore: false,+ latestSeq: 2,+ } satisfies MessagesPage+ queryClient.setQueryData(key, {+ pages: [page],+ pageParams: [{ mode: "newest" }],+ })+ apiFetchMock.mockResolvedValue(page)+ const snapshots: Snapshot[] = []+ const renderer = renderCapture(+ queryClient,+ React.createElement(WarmReturnChannelCapture, {+ lastReadMessageId: "m_read",+ onRender: (snapshot) => { snapshots.push(snapshot) },+ }),+ )++ await act(async () => { await Promise.resolve() })+ expect(apiFetchMock).not.toHaveBeenCalled()+ expect(snapshots.at(-1)?.anchorReconciled).toBe(true)+ expect(snapshots.at(-1)?.ids).toEqual(["m_read", "m_new"])+ renderer.unmount()+ })++ it("warm return performs one anchor repair when the read pointer is genuinely absent", async () => {+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })+ const key = communityKeys.channelMessages("ch_activation")+ queryClient.setQueryData(key, {+ pages: [{+ messages: [{ id: "m_new", seq: 2, createdAt: "2026-08-09T00:00:02.000Z" }],+ hasMore: true,+ latestSeq: 2,+ }],+ pageParams: [{ mode: "newest" }],+ })+ apiFetchMock.mockResolvedValue({+ messages: [{ id: "m_read", seq: 1, createdAt: "2026-08-09T00:00:01.000Z" }],+ hasMoreOlder: false,+ hasMoreNewer: true,+ latestSeq: 2,+ } satisfies MessagesPage)+ const snapshots: Snapshot[] = []+ const renderer = renderCapture(+ queryClient,+ React.createElement(WarmReturnChannelCapture, {+ lastReadMessageId: "m_read",+ onRender: (snapshot) => { snapshots.push(snapshot) },+ }),+ )++ await waitFor(() => snapshots.at(-1)?.anchorReconciled === true)+ expect(apiFetchMock.mock.calls.map(([url]) => url)).toEqual([+ "/api/community/channels/ch_activation/messages?anchor=m_read",+ ])+ expect(snapshots.at(-1)?.ids).toEqual(["m_read", "m_new"])+ renderer.unmount()+ })+it("leaves browser network reconnect reconciliation to the bounded WS path", () => {const queryClient = new QueryClient()queryClient.setQueryData(communityKeys.dmMessages("dm_activation"), {diff --git a/src/web/src/hooks/community/use-messages.ts b/src/web/src/hooks/community/use-messages.tsindex fc56607b6..e665bbf38 100644--- a/src/web/src/hooks/community/use-messages.ts+++ b/src/web/src/hooks/community/use-messages.ts@@ -259,6 +259,20 @@ type MessagesOpts = {* pointer is reconciled by the existing anchor-repair effect.*/waitForAnchor?: boolean+ /**+ * Defaults to the inverse of `waitForAnchor`. A warm semantic return can+ * disable the extra late-anchor window fetch when its cached messages+ * already contain the resolved read pointer; a genuinely missing anchor+ * still repairs once.+ */+ reconcileLateAnchor?: boolean+ /**+ * A warm same-session return can skip observer-subscribe revalidation+ * because WS and reconnect reconciliation already keep that cache current;+ * cold or cache-miss mounts still fetch normally. When omitted, defer to+ * the QueryClient's existing refetch-on-mount policy.+ */+ revalidateOnMount?: boolean}type ChannelMessagesOpts = MessagesOpts & {@@ -296,6 +310,8 @@ function useMessagesInner(// Jump target wins over the read pointer for the initial anchor window.const anchorId = opts?.anchorMessageId ?? opts?.lastReadMessageId ?? nullconst enabled = !!scopeId && anchorResolved+ const reconcileLateAnchor = opts?.reconcileLateAnchor+ ?? (opts?.waitForAnchor === false)const viewKey = useMemo(() => JSON.stringify([queryKey, opts?.anchorMessageId ?? null]),[queryKey, opts?.anchorMessageId],@@ -348,6 +364,7 @@ function useMessagesInner(return { mode: "newer", cursor }},enabled,+ ...(opts?.revalidateOnMount === false ? { refetchOnMount: false } : {}),refetchOnReconnect: false,// Message bases are persisted, while accepted/session rows live in an// in-memory overlay. Treat each ordinary active message query as stale so@@ -359,7 +376,7 @@ function useMessagesInner(staleTime: (cachedQuery) => cachedWindowNeedsAnchorReconcile(cachedQuery.state.data as PageCache | undefined,forceNewest ? null : anchorId,- opts?.waitForAnchor === false,+ reconcileLateAnchor,) ? Infinity : 0,})@@ -440,7 +457,7 @@ function useMessagesInner(if (!cachedWindowNeedsAnchorReconcile(query.data,anchorId,- opts?.waitForAnchor === false,+ reconcileLateAnchor,)) returnconst resetKey = `${scopeId ?? ""}::${anchorId}`if (anchorResetKeyRef.current === resetKey) return@@ -531,6 +548,7 @@ function useMessagesInner(queryKey,queryFn,opts?.waitForAnchor,+ reconcileLateAnchor,])const messages = useMemo<Msg[]>(() => {@@ -612,7 +630,9 @@ function useMessagesInner(presentVersion: forceNewest && presentOverride?.phase === "present"? presentOverride.attemptId: 0,- anchorReconciled: !anchorId || cacheHasAnchorPage(query.data, anchorId),+ anchorReconciled: !anchorId+ || cacheHasAnchorPage(query.data, anchorId)+ || (!reconcileLateAnchor && !cachedWindowNeedsAnchor(query.data?.pages, anchorId)),hasMore: hasMoreOlder,}}diff --git a/src/web/src/hooks/community/use-scroll-anchor.repin.test.ts b/src/web/src/hooks/community/use-scroll-anchor.repin.test.tsindex d19ad69d4..f670a6238 100644--- a/src/web/src/hooks/community/use-scroll-anchor.repin.test.ts+++ b/src/web/src/hooks/community/use-scroll-anchor.repin.test.ts@@ -25,6 +25,7 @@ vi.mock("react", () => ({}))const virtualizer = {+ options: { anchorTo: "end" },isAtEnd: vi.fn(() => true),scrollToEnd: vi.fn(),scrollToIndex: vi.fn(),@@ -45,6 +46,7 @@ function resetHarness() {refIndex = 0layoutEffects = []virtualizerOptions = undefined+ virtualizer.options.anchorTo = "end"virtualizer.isAtEnd.mockReturnValue(true)virtualizer.scrollToEnd.mockReset()virtualizer.scrollToIndex.mockReset()@@ -82,7 +84,7 @@ async function mountHook() {// The first layout effect installs the real scroll/wheel intent listeners.layoutEffects[0]?.()- return { listeners, scrollWrites }+ return { listeners, scrollWrites, scroller }}function growingRow(requestFrame: (callback: FrameRequestCallback) => void) {@@ -145,4 +147,25 @@ describe("useScrollAnchor delayed row-growth re-pin", () => {expect(scrollWrites).toEqual([])expect(frame).toBeUndefined()})++ it("switches live resize anchoring with scroll and keyboard intent", async () => {+ const { listeners, scroller } = await mountHook()+ expect(virtualizer.options.anchorTo).toBe("end")++ virtualizer.isAtEnd.mockReturnValue(false)+ scroller.scrollTop = 40+ listeners.get("scroll")?.(new Event("scroll"))+ expect(virtualizer.options.anchorTo).toBe("start")++ const adjust = virtualizer.shouldAdjustScrollPositionOnItemSizeChange+ expect(adjust).toBeTypeOf("function")+ expect(adjust!({} as never, 20, {} as never)).toBe(false)++ virtualizer.isAtEnd.mockReturnValue(true)+ listeners.get("scroll")?.(new Event("scroll"))+ expect(virtualizer.options.anchorTo).toBe("end")++ listeners.get("keydown")?.({ key: "PageUp" } as KeyboardEvent)+ expect(virtualizer.options.anchorTo).toBe("start")+ })})diff --git a/src/web/src/hooks/community/use-scroll-anchor.test.ts b/src/web/src/hooks/community/use-scroll-anchor.test.tsindex c6413377a..41ab2dba4 100644--- a/src/web/src/hooks/community/use-scroll-anchor.test.ts+++ b/src/web/src/hooks/community/use-scroll-anchor.test.ts@@ -308,6 +308,16 @@ describe("shouldAdjustMessageScrollPosition", () => {expect(shouldAdjustMessageScrollPosition(item, 96, instance({ scrollDirection: "backward" }))).toBe(false)})+ it("does not compensate later row growth after the viewer deliberately leaves the bottom", () => {+ const measured = new Map([[item.key, item.size]])+ expect(shouldAdjustMessageScrollPosition(+ item,+ 240,+ instance({ itemSizeCache: measured }),+ true,+ )).toBe(false)+ })+it("keeps first-measurement compensation above the fold while idle or scrolling forward", () => {expect(shouldAdjustMessageScrollPosition(item, 96, instance())).toBe(true)expect(shouldAdjustMessageScrollPosition(item, 96, instance({ scrollDirection: "forward" }))).toBe(true)diff --git a/src/web/src/hooks/community/use-scroll-anchor.ts b/src/web/src/hooks/community/use-scroll-anchor.tsindex 699b29a84..76075f4b8 100644--- a/src/web/src/hooks/community/use-scroll-anchor.ts+++ b/src/web/src/hooks/community/use-scroll-anchor.ts@@ -87,7 +87,9 @@ export function shouldAdjustMessageScrollPosition(item: VirtualItem,_delta: number,instance: SizeAdjustmentVirtualizer,+ userScrolledAway = false,): boolean {+ if (userScrolledAway) return falseif (instance.scrollDirection === "backward") return falseconst offset = (instance.scrollOffset ?? 0) + instance.scrollAdjustments@@ -393,6 +395,7 @@ export function useScrollAnchor({viewerUserId,heroHeight,heroMeasured,+ restoredScrollTop,}: {items: FlatItem[]newDividerBefore?: string@@ -412,6 +415,7 @@ export function useScrollAnchor({// `DecideScrollActionInput.heroMeasured`'s doc comment for the bug this// prevents (mount firing on a stale, default-0 `scrollMargin`).heroMeasured: boolean+ restoredScrollTop?: number}): {scrollRef: React.RefObject<HTMLDivElement | null>virtualizer: ReactVirtualizer<HTMLDivElement, Element>@@ -424,8 +428,8 @@ export function useScrollAnchor({const stateRef = useRef<ScrollAnchorState>(createScrollAnchorState())const messages = extractScrollAnchorMessages(items)const tailId = messages[messages.length - 1]?.id ?? null- const wasAtEndRef = useRef(true)- const userScrolledAwayRef = useRef(false)+ const wasAtEndRef = useRef(restoredScrollTop === undefined)+ const userScrolledAwayRef = useRef(restoredScrollTop !== undefined)const measuredRowHeightsRef = useRef(new WeakMap<Element, number>())const bottomRepinQueuedRef = useRef(false)@@ -501,8 +505,26 @@ export function useScrollAnchor({// it is already installed when React attaches row refs in the commit.// Cast: our helper takes a structural subset; Virtualizer keeps some of// those fields private in the public type.- virtualizer.shouldAdjustScrollPositionOnItemSizeChange =- shouldAdjustMessageScrollPosition as unknown as typeof virtualizer.shouldAdjustScrollPositionOnItemSizeChange+ virtualizer.shouldAdjustScrollPositionOnItemSizeChange = ((item, delta, instance) => {+ return shouldAdjustMessageScrollPosition(+ item,+ delta,+ instance as unknown as SizeAdjustmentVirtualizer,+ userScrolledAwayRef.current,+ )+ }) as typeof virtualizer.shouldAdjustScrollPositionOnItemSizeChange++ // `anchorTo: "end"` is still needed while React applies edge-key changes:+ // that is what preserves the visible row across an older-page prepend.+ // Between renders, however, virtual-core also uses `anchorTo: "end"` to+ // decide whether a row resize should keep the viewport pinned. Its internal+ // distance excludes `scrollMargin` (the hero) while its scroll offset+ // includes it, so a viewer who moved upward by less than the hero height can+ // be mistaken for still-at-end and yanked down by the resize delta. Switch+ // only that between-render mode to `start` once the user has moved away;+ // the next render's `setOptions({ anchorTo: "end" })` still performs prepend+ // anchoring before this assignment restores the live resize mode.+ virtualizer.options.anchorTo = userScrolledAwayRef.current ? "start" : "end"// Whether the viewer was within NEAR_BOTTOM_PX of the end BEFORE this// commit's append — the semantics `decideScrollAction` documents for its@@ -522,17 +544,27 @@ export function useScrollAnchor({const onScroll = () => {const nextScrollTop = el.scrollTopconst isAtEnd = virtualizer.isAtEnd(NEAR_BOTTOM_PX)+ const leftEnd = wasAtEndRef.current && !isAtEndwasAtEndRef.current = isAtEnd- if (isAtEnd) userScrolledAwayRef.current = false- else if (nextScrollTop < lastScrollTop - 1) userScrolledAwayRef.current = true+ if (isAtEnd) {+ userScrolledAwayRef.current = false+ virtualizer.options.anchorTo = "end"+ } else if (leftEnd || nextScrollTop < lastScrollTop - 1) {+ userScrolledAwayRef.current = true+ virtualizer.options.anchorTo = "start"+ }lastScrollTop = nextScrollTop}const onWheel = (event: WheelEvent) => {- if (event.deltaY < 0) userScrolledAwayRef.current = true+ if (event.deltaY < 0) {+ userScrolledAwayRef.current = true+ virtualizer.options.anchorTo = "start"+ }}const onKeyDown = (event: KeyboardEvent) => {if (["ArrowUp", "PageUp", "Home"].includes(event.key)) {userScrolledAwayRef.current = true+ virtualizer.options.anchorTo = "start"}}el.addEventListener("scroll", onScroll, { passive: true })@@ -561,6 +593,7 @@ export function useScrollAnchor({switch (action.type) {case "mount": {+ if (restoredScrollTop !== undefined) returnconst idx = action.newDividerBefore ? findMountScrollTargetIndex(items, action.newDividerBefore) : nullif (idx !== null) {virtualizer.scrollToIndex(idx, { align: "center" })@@ -579,7 +612,7 @@ export function useScrollAnchor({// derives from items) — `items` alone is the correct dep, not a// secondary `messages` dep, avoiding a re-derivation-triggered re-fire.// eslint-disable-next-line react-hooks/exhaustive-deps- }, [items, newDividerBefore, initialScrollReady, heroMeasured, hasMoreNewer, viewerUserId, virtualizer])+ }, [items, newDividerBefore, initialScrollReady, heroMeasured, hasMoreNewer, viewerUserId, virtualizer, restoredScrollTop])const consumedPresentVersionRef = useRef(0)useLayoutEffect(() => {diff --git a/src/web/src/lib/community/channel-ref-extension.ts b/src/web/src/lib/community/channel-ref-extension.tsindex 703880f03..6223758ac 100644--- a/src/web/src/lib/community/channel-ref-extension.ts+++ b/src/web/src/lib/community/channel-ref-extension.ts@@ -1,6 +1,10 @@import Mention from "@tiptap/extension-mention"import { PluginKey } from "@tiptap/pm/state"import { formatHandle } from "@alook/shared"+import {+ createSuggestionCaretRectResolver,+ type SuggestionCaretAnchorProps,+} from "@/lib/community/suggestion-caret-anchor"export type ChannelRefCandidate = {id: string // channelId (nanoid)@@ -100,7 +104,7 @@ export function rankChannelRefItems(return [...prefix, ...substr].slice(0, CHANNEL_REF_LIMIT)}-type SuggestionProps = {+type SuggestionProps = SuggestionCaretAnchorProps & {items: ChannelRefCandidate[]query?: stringcommand: (props: ChannelRefCommandProps) => void@@ -211,7 +215,7 @@ export function buildCommunityChannelRefExtension(opts: {query: props.query ?? "",selectedIndex: 0,command: props.command,- getRect: props.clientRect ?? null,+ getRect: createSuggestionCaretRectResolver(props),})},onUpdate: (props: SuggestionProps) => {@@ -223,7 +227,7 @@ export function buildCommunityChannelRefExtension(opts: {? cur.selectedIndex: 0,command: props.command,- getRect: props.clientRect ?? null,+ getRect: createSuggestionCaretRectResolver(props),}))},onKeyDown: ({ event }: { event: KeyboardEvent }) => {diff --git a/src/web/src/lib/community/community-route.test.ts b/src/web/src/lib/community/community-route.test.tsindex 3c810da86..ce4fba6db 100644--- a/src/web/src/lib/community/community-route.test.ts+++ b/src/web/src/lib/community/community-route.test.ts@@ -154,6 +154,26 @@ describe("community route", () => {}).mode).toBe(mode)})+ it("keeps the committed surface and child alive during same-scope navigation", () => {+ const committedFrame = {+ ...normalizeCommunityHref("/c/channels/s1"),+ revision: 4,+ }+ expect(resolveCommunityCheckpointPlan({+ committedFrame,+ targetHref: "/c/channels/s1/c1",+ pending: true,+ targetReady: true,+ })).toEqual({+ mode: "same-scope-leaf",+ surface: "list",+ targetHref: "/c/channels/s1/c1",+ rail: { kind: "keep" },+ sidebar: { kind: "keep" },+ main: { kind: "keep" },+ })+ })+it("keeps committed A as the source after the router publishes B", () => {const committedFrame = {...normalizeCommunityHref("/c/channels/s1/c1"),diff --git a/src/web/src/lib/community/community-route.ts b/src/web/src/lib/community/community-route.tsindex 7f41cbf4d..f9b22f13b 100644--- a/src/web/src/lib/community/community-route.ts+++ b/src/web/src/lib/community/community-route.ts@@ -302,11 +302,11 @@ export function resolveCommunityCheckpointPlan({if (communityScopeEqual(committedFrame.scope, target.scope)) {return {mode: "same-scope-leaf",- surface: target.surface,+ surface: committedFrame.surface,targetHref: target.href,rail: { kind: "keep" },sidebar: { kind: "keep" },- main: { kind: "target-skeleton", href: target.href },+ main: { kind: "keep" },}}diff --git a/src/web/src/lib/community/mention-extension.ts b/src/web/src/lib/community/mention-extension.tsindex eb64aa7d3..6bad36027 100644--- a/src/web/src/lib/community/mention-extension.ts+++ b/src/web/src/lib/community/mention-extension.ts@@ -1,6 +1,10 @@import Mention from "@tiptap/extension-mention"import { MENTION_TYPES, type MentionType } from "@alook/shared"import type { Member } from "@/lib/community/models/people"+import {+ createSuggestionCaretRectResolver,+ type SuggestionCaretAnchorProps,+} from "@/lib/community/suggestion-caret-anchor"export type MentionContext = "channel" | "thread" | "dm"@@ -110,7 +114,7 @@ export const EMPTY_MENTION_STATE: MentionPopupState = {getRect: null,}-type SuggestionProps = {+type SuggestionProps = SuggestionCaretAnchorProps & {items: MentionItem[]query?: stringcommand: (props: { id: string; label: string }) => void@@ -181,7 +185,7 @@ export function buildCommunityMentionExtension(opts: {query: queryRef?.current ?? props.query ?? "",selectedIndex: 0,command: props.command,- getRect: props.clientRect ?? null,+ getRect: createSuggestionCaretRectResolver(props),})},onUpdate: (props: SuggestionProps) => {@@ -194,7 +198,7 @@ export function buildCommunityMentionExtension(opts: {? cur.selectedIndex: 0,command: props.command,- getRect: props.clientRect ?? null,+ getRect: createSuggestionCaretRectResolver(props),}))},onKeyDown: ({ event }: { event: KeyboardEvent }) => {diff --git a/src/web/src/lib/community/platform-link.test.ts b/src/web/src/lib/community/platform-link.test.tsindex ec4d48637..a6f59396d 100644--- a/src/web/src/lib/community/platform-link.test.ts+++ b/src/web/src/lib/community/platform-link.test.ts@@ -3,6 +3,8 @@ import { matchPlatformLink } from "./platform-link"describe("matchPlatformLink", () => {it.each([+ ["https://alook.ai/c/invite/abcdef", "alook", "Alook"],+ ["https://www.alook.ai/c/invite/abcdef", "alook", "Alook"],["https://github.com/alookai/alook/pull/598", "github", "GitHub"],["https://gist.github.com/alookai/abc", "github", "GitHub"],["https://x.com/alookai/status/1", "x", "X"],@@ -21,6 +23,7 @@ describe("matchPlatformLink", () => {it.each(["https://github.com.evil.example/alookai/alook","https://notgithub.com/alookai/alook",+ "https://alook.ai.evil.example/c/invite/abcdef","https://example.com/story","ftp://github.com/alookai/alook","/c/invite/abcdef",diff --git a/src/web/src/lib/community/platform-link.ts b/src/web/src/lib/community/platform-link.tsindex 1acad3f58..3c9619adf 100644--- a/src/web/src/lib/community/platform-link.ts+++ b/src/web/src/lib/community/platform-link.ts@@ -1,4 +1,5 @@export type PlatformLinkKind =+ | "alook"| "github"| "x"| "reddit"@@ -17,6 +18,7 @@ type PlatformDefinition = PlatformLinkMatch & {}const PLATFORM_DEFINITIONS: readonly PlatformDefinition[] = [+ { kind: "alook", label: "Alook", domains: ["alook.ai"] },{ kind: "github", label: "GitHub", domains: ["github.com"] },{ kind: "x", label: "X", domains: ["x.com", "twitter.com"] },{ kind: "reddit", label: "Reddit", domains: ["reddit.com", "redd.it"] },diff --git a/src/web/src/lib/community/suggestion-caret-anchor.test.ts b/src/web/src/lib/community/suggestion-caret-anchor.test.tsnew file mode 100644index 000000000..3fba98418--- /dev/null+++ b/src/web/src/lib/community/suggestion-caret-anchor.test.ts@@ -0,0 +1,67 @@+import { describe, expect, it, vi } from "vitest"+import { createSuggestionCaretRectResolver } from "./suggestion-caret-anchor"++describe("createSuggestionCaretRectResolver", () => {+ it("anchors to the live collapsed selection endpoint instead of the multiline suggestion range", () => {+ const selection = { head: 42, to: 42 }+ const coordsAtPos = vi.fn((position: number) => ({+ top: position * 10,+ bottom: position * 10 + 20,+ left: 80,+ right: 80,+ }))+ const rangeRect = vi.fn(() => ({ top: 100 } as DOMRect))+ const getRect = createSuggestionCaretRectResolver({+ editor: { state: { selection }, view: { coordsAtPos } },+ range: { to: 12 },+ clientRect: rangeRect,+ })++ const initialRect = getRect?.()+ expect(initialRect).toMatchObject({+ top: 420,+ bottom: 440,+ left: 80,+ right: 80,+ width: 0,+ height: 20,+ })+ expect(coordsAtPos).toHaveBeenLastCalledWith(42)+ expect(rangeRect).not.toHaveBeenCalled()+ expect(initialRect?.toJSON()).toEqual({+ top: 420,+ bottom: 440,+ left: 80,+ right: 80,+ })++ selection.head = 57+ selection.to = 57+ expect(getRect?.()).toMatchObject({ top: 570, bottom: 590 })+ expect(coordsAtPos).toHaveBeenLastCalledWith(57)+ })++ it("falls back to the range rect when the editor is absent or tearing down", () => {+ const fallback = { top: 10, bottom: 20, left: 30, right: 30 } as DOMRect+ const clientRect = vi.fn(() => fallback)+ expect(createSuggestionCaretRectResolver({ clientRect })).toBe(clientRect)++ const getRect = createSuggestionCaretRectResolver({+ editor: {+ state: { selection: { to: 9 } },+ view: { coordsAtPos: () => { throw new Error("destroyed") } },+ },+ clientRect,+ })+ expect(getRect?.()).toBe(fallback)++ const missingPosition = createSuggestionCaretRectResolver({+ editor: {+ state: { selection: {} },+ view: { coordsAtPos: vi.fn() },+ },+ clientRect,+ })+ expect(missingPosition?.()).toBe(fallback)+ })+})diff --git a/src/web/src/lib/community/suggestion-caret-anchor.ts b/src/web/src/lib/community/suggestion-caret-anchor.tsnew file mode 100644index 000000000..b7c5a158f--- /dev/null+++ b/src/web/src/lib/community/suggestion-caret-anchor.ts@@ -0,0 +1,73 @@+export type SuggestionCaretAnchorProps = {+ editor?: {+ state?: {+ selection?: {+ head?: number+ to?: number+ }+ }+ view?: {+ coordsAtPos: (position: number) => {+ top: number+ bottom: number+ left: number+ right: number+ }+ }+ }+ range?: { to: number }+ clientRect?: (() => DOMRect | null) | null+}++type CaretCoordinates = {+ top: number+ bottom: number+ left: number+ right: number+}++function rectFromCaretCoordinates(+ coordinates: CaretCoordinates,+): DOMRect {+ const { top, bottom, left, right } = coordinates+ return {+ top,+ bottom,+ left,+ right,+ x: left,+ y: top,+ width: Math.max(0, right - left),+ height: Math.max(0, bottom - top),+ toJSON: () => ({ top, bottom, left, right }),+ }+}++/**+ * TipTap's suggestion `clientRect` spans the whole trigger/query range. Once+ * that text wraps, its top edge stays on the first line even though the live+ * caret has moved several lines below. Resolve the collapsed terminal caret+ * from the editor selection instead; both @ mentions and / channel refs share+ * this seam so their popup geometry cannot drift apart again.+ */+export function createSuggestionCaretRectResolver(+ props: SuggestionCaretAnchorProps,+): (() => DOMRect | null) | null {+ const view = props.editor?.view+ if (!view) return props.clientRect ?? null++ return () => {+ const position = props.editor?.state?.selection?.head+ ?? props.editor?.state?.selection?.to+ ?? props.range?.to+ if (position === undefined) return props.clientRect?.() ?? null++ try {+ return rectFromCaretCoordinates(view.coordsAtPos(position))+ } catch {+ // The suggestion lifecycle can race an editor teardown. The range rect+ // is imperfect for wrapped text, but is the safest transient fallback.+ return props.clientRect?.() ?? null+ }+ }+}diff --git a/src/web/src/test/e2e-ui/24-composer-overflow.spec.ts b/src/web/src/test/e2e-ui/24-composer-overflow.spec.tsindex c58f26433..10385fd57 100644--- a/src/web/src/test/e2e-ui/24-composer-overflow.spec.ts+++ b/src/web/src/test/e2e-ui/24-composer-overflow.spec.ts@@ -240,9 +240,25 @@ test.describe.serial("community composer text containment", () => {await page.setViewportSize({ width: 375, height: 800 })const attach = page.getByTestId(tid.composerAttach)+ const editable = composerEditable(page)+ const beforeCancel = await editable.textContent()+ const cancelledChooser = page.waitForEvent("filechooser")await attach.click()- await expect(page.getByRole("menuitem", { name: "Upload a File" })).toBeVisible()- await page.keyboard.press("Escape")+ expect((await cancelledChooser).isMultiple()).toBe(true)+ await expect(page.getByRole("menuitem", { name: "Upload a File" })).toHaveCount(0)+ expect(await editable.textContent()).toBe(beforeCancel)++ const selectedChooser = page.waitForEvent("filechooser")+ await attach.click()+ await (await selectedChooser).setFiles({+ name: "direct-picker.txt",+ mimeType: "text/plain",+ buffer: Buffer.from("direct native picker"),+ })+ await expect(page.getByText("direct-picker.txt", { exact: true })).toBeVisible()+ await page.getByRole("button", { name: "Remove file" }).click()+ await expect(page.getByText("direct-picker.txt", { exact: true })).toHaveCount(0)+const emoji = page.getByRole("button", { name: "Emoji picker" })await emoji.click()await expect(emoji).toHaveAttribute("aria-expanded", "true")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.tsindex 3d825c0e2..f0228b299 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@@ -19,7 +19,9 @@ type Rect = {type RailMetrics = {layout: string | null- rail: Rect+ rail: Rect | null+ scroller: Rect+ typingSpace: Rectcomposer: Recttyping: Rect | nullcenter: Rect | null@@ -35,11 +37,10 @@ type RailMetrics = {}async function railMetrics(page: Page): Promise<RailMetrics> {- const rail = page.getByTestId(tid.composerAccessoryRail)const composer = page.getByTestId(tid.channelComposerShell)- return rail.evaluate((element, ids) => {- const target = element as HTMLElement- const find = (id: string) => target.querySelector<HTMLElement>(`[data-testid='${id}']`)+ return page.evaluate((ids) => {+ const find = (id: string) => document.querySelector<HTMLElement>(`[data-testid='${id}']`)+ const rail = find(ids.rail)const typing = find(ids.typing)const center = find(ids.scroll) ?? find(ids.selection)const typingText = typing?.querySelector<HTMLElement>("span.min-w-0.truncate") ?? null@@ -54,9 +55,11 @@ async function railMetrics(page: Page): Promise<RailMetrics> {center: value.left + value.width / 2,})return {- layout: target.dataset.layout ?? null,- rail: toRect(target.getBoundingClientRect()),- composer: toRect(document.querySelector<HTMLElement>(`[data-testid='${ids.composer}']`)!.getBoundingClientRect()),+ layout: rail?.dataset.layout ?? null,+ rail: rail ? toRect(rail.getBoundingClientRect()) : null,+ scroller: toRect(find(ids.scroller)!.getBoundingClientRect()),+ typingSpace: toRect(document.querySelector<HTMLElement>("[data-message-typing-space]")!.getBoundingClientRect()),+ composer: toRect(find(ids.composer)!.getBoundingClientRect()),typing: typing ? toRect(typing.getBoundingClientRect()) : null,center: center ? toRect(center.getBoundingClientRect()) : null,documentClientWidth: document.documentElement.clientWidth,@@ -72,9 +75,11 @@ async function railMetrics(page: Page): Promise<RailMetrics> {: null,}}, {+ rail: tid.composerAccessoryRail,typing: tid.typingIndicator,scroll: tid.scrollToPresent,selection: tid.messageSelectionToolbar,+ scroller: tid.messageScroller,composer: tid.channelComposerShell,}).then(async (metrics) => {await expect(composer).toBeVisible()@@ -87,8 +92,12 @@ function expectContained(metrics: RailMetrics, state: string, width: number): voexpect(metrics.documentScrollWidth, evidence).toBe(metrics.documentClientWidth)for (const control of [metrics.typing, metrics.center]) {if (!control || control.width === 0) continue- expect(control.left, evidence).toBeGreaterThanOrEqual(metrics.rail.left - 0.5)- expect(control.right, evidence).toBeLessThanOrEqual(metrics.rail.right + 0.5)+ expect(control.left, evidence).toBeGreaterThanOrEqual(-0.5)+ expect(control.right, evidence).toBeLessThanOrEqual(metrics.documentClientWidth + 0.5)+ }+ if (metrics.rail && metrics.center) {+ expect(metrics.center.left, evidence).toBeGreaterThanOrEqual(metrics.rail.left - 0.5)+ expect(metrics.center.right, evidence).toBeLessThanOrEqual(metrics.rail.right + 0.5)}}@@ -97,21 +106,24 @@ function expectCheckpoint(state: string,width: number,selection: boolean,+ typing: boolean,): void {const evidence = `${state}@${width}: ${JSON.stringify(metrics)}`const expectedGap = width < 640 ? 8 : 16- for (const [name, control] of [- ["typing", metrics.typing],- [selection ? "selection" : "scroll", metrics.center],- ] as const) {- if (!control || control.width === 0) continue- expect(Math.abs(metrics.composer.top - control.bottom - expectedGap), `${name} ${evidence}`)- .toBeLessThanOrEqual(1)- }+ expect(metrics.typingSpace.height, evidence).toBe(typing ? 44 : 0)+ expect(metrics.scroller.bottom, evidence).toBeLessThanOrEqual(metrics.typingSpace.top + 1)+ expect(metrics.typingSpace.bottom, evidence).toBeLessThanOrEqual(metrics.composer.top + 1)if (metrics.typing?.width) {expect(metrics.typing.height, `typing ${evidence}`).toBe(32)+ expect(metrics.typing.top, evidence).toBeGreaterThanOrEqual(metrics.typingSpace.top - 1)+ expect(metrics.typing.bottom, evidence).toBeLessThanOrEqual(metrics.typingSpace.bottom + 1)}if (metrics.center?.width) {+ expect(metrics.rail, evidence).not.toBeNull()+ expect(Math.abs(metrics.scroller.bottom - metrics.center.bottom - expectedGap), evidence)+ .toBeLessThanOrEqual(1)+ expect(metrics.rail!.bottom, evidence).toBeLessThanOrEqual(metrics.typingSpace.top + 1)+ expect(metrics.center.bottom, evidence).toBeLessThanOrEqual(metrics.typingSpace.top + 1)if (!selection) {expect(metrics.center.height, `scroll ${evidence}`).toBe(32)} else if (width === 390) {@@ -120,10 +132,6 @@ function expectCheckpoint(expect(metrics.center.height, `selection ${evidence}`).toBe(38)}}- if (metrics.typing?.width && metrics.center?.width) {- expect(Math.abs(metrics.typing.bottom - metrics.center.bottom), `shared baseline ${evidence}`)- .toBeLessThanOrEqual(1)- }}async function captureState(args: {@@ -163,7 +171,8 @@ async function captureState(args: {: rect.left > 1 && Math.abs(rect.right - viewportWidth) <= 1}, width)).toBe(true)const rail = page.getByTestId(tid.composerAccessoryRail)- await expect(rail).toHaveAttribute("data-layout", layout!)+ await expect(rail).toHaveCount(center ? 1 : 0)+ if (center) await expect(rail).toHaveAttribute("data-layout", layout!)await expect(page.getByTestId(tid.typingIndicator)).toHaveCount(typing ? 1 : 0)await expect(page.getByTestId(tid.messageSelectionToolbar)).toHaveCount(selection ? 1 : 0)if (selection && (width === 390 || width === 1280)) {@@ -173,7 +182,7 @@ async function captureState(args: {}const metrics = await railMetrics(page)expectContained(metrics, state, width)- expectCheckpoint(metrics, state, width, selection)+ expectCheckpoint(metrics, state, width, selection, typing)if (center) {expect(metrics.center, `${state}@${width}`).not.toBeNull()expect(Math.abs(metrics.center!.center - metrics.composer.center), `${state}@${width}`)@@ -198,6 +207,7 @@ async function captureEmptyState(page: Page, testInfo: TestInfo): Promise<void>await expect(page.getByTestId(tid.scrollToPresent)).toHaveCount(0)await expect(page.getByTestId(tid.composerAccessoryRail)).toHaveCount(0)await expect(page.getByTestId(tid.channelComposerShell)).toBeVisible()+ expect((await page.locator("[data-message-typing-space]").boundingBox())?.height).toBe(0)const documentWidths = await page.evaluate(() => ({client: document.documentElement.clientWidth,scroll: document.documentElement.scrollWidth,@@ -310,7 +320,7 @@ test("composer accessory rail reallocates every occupied slot without overflow",page: alice.page,testInfo,state: "l-only",- layout: "left-only",+ layout: null,center: false,typing: true,})diff --git a/src/web/src/test/e2e-ui/31-mention-candidate-pagination.spec.ts b/src/web/src/test/e2e-ui/31-mention-candidate-pagination.spec.tsindex 19a5cdced..6049f1615 100644--- a/src/web/src/test/e2e-ui/31-mention-candidate-pagination.spec.ts+++ b/src/web/src/test/e2e-ui/31-mention-candidate-pagination.spec.ts@@ -125,7 +125,12 @@ test("@ candidates page to completion, expose first search page, and keep statusconst editable = composerEditable(page)await expect(editable).toBeVisible({ timeout: 20_000 })await editable.click()- await editable.pressSequentially("@")+ const wrappedPrefix = Array.from(+ { length: 6 },+ (_, index) => `wrapped composer line ${index + 1} keeps the terminal caret moving`,+ ).join(" ")+ await editable.fill(wrappedPrefix)+ await editable.pressSequentially(" @")await expect(page.getByTestId(tid.mentionOption(browse[11]!.id))).toHaveCount(1)await editable.pressSequentially("CapMatch")@@ -138,7 +143,7 @@ test("@ candidates page to completion, expose first search page, and keep statusawait expect(page.getByTestId(tid.mentionOption(matches[204]!.id))).toHaveCount(1)await expect(mentionOptions).toHaveCount(205)- const readBounds = () => page.getByTestId(tid.mentionPopup).evaluate((element) => {+ const readBounds = (popupTestId: string) => page.getByTestId(popupTestId).evaluate((element) => {const popup = element.getBoundingClientRect()const selection = window.getSelection()if (!selection || selection.rangeCount === 0) throw new Error("Missing composer caret")@@ -161,18 +166,25 @@ test("@ candidates page to completion, expose first search page, and keep status}})- const expectAnchoredAbove = (bounds: Awaited<ReturnType<typeof readBounds>>) => {+ const expectAnchoredToCaret = (bounds: Awaited<ReturnType<typeof readBounds>>) => {+ const margin = 8expect(bounds.caret.top).toBeGreaterThanOrEqual(bounds.viewport.top)expect(bounds.caret.bottom).toBeLessThanOrEqual(bounds.viewport.bottom)- expect(bounds.popup.top).toBeGreaterThanOrEqual(bounds.viewport.top)- expect(bounds.popup.bottom).toBeLessThanOrEqual(bounds.viewport.bottom)- expect(bounds.popup.left).toBeGreaterThanOrEqual(bounds.viewport.left)- expect(bounds.popup.right).toBeLessThanOrEqual(bounds.viewport.right)- expect(bounds.popup.bottom - bounds.caret.top).toBeGreaterThanOrEqual(-5)- expect(bounds.popup.bottom - bounds.caret.top).toBeLessThanOrEqual(-3)+ expect(bounds.popup.top).toBeGreaterThanOrEqual(bounds.viewport.top + margin - 0.5)+ expect(bounds.popup.bottom).toBeLessThanOrEqual(bounds.viewport.bottom - margin + 0.5)+ expect(bounds.popup.left).toBeGreaterThanOrEqual(bounds.viewport.left + margin - 0.5)+ expect(bounds.popup.right).toBeLessThanOrEqual(bounds.viewport.right - margin + 0.5)+ const nearestEdgeGaps = [+ bounds.caret.top - bounds.popup.bottom,+ bounds.popup.top - bounds.caret.bottom,+ ]+ expect(+ nearestEdgeGaps.some((gap) => gap >= 3 && gap <= 5),+ `popup did not stay 4px from terminal caret: ${JSON.stringify(bounds)}`,+ ).toBe(true)}- expectAnchoredAbove(await readBounds())+ expectAnchoredToCaret(await readBounds(tid.mentionPopup))await page.evaluate(() => {const setViewport = Reflect.get(window, "__setMentionTestVisualViewport") as| ((geometry: { offsetTop: number; height: number }) => void)@@ -183,9 +195,21 @@ test("@ candidates page to completion, expose first search page, and keep statusawait page.evaluate(() => new Promise<void>((resolve) => {requestAnimationFrame(() => requestAnimationFrame(() => resolve()))}))- expectAnchoredAbove(await readBounds())+ expectAnchoredToCaret(await readBounds(tid.mentionPopup))await page.waitForTimeout(250)- expectAnchoredAbove(await readBounds())+ expectAnchoredToCaret(await readBounds(tid.mentionPopup))++ await page.keyboard.press("Escape")+ await editable.press("ControlOrMeta+A")+ await editable.press("Backspace")+ await editable.fill(wrappedPrefix)+ await editable.pressSequentially(" /")+ await expect(page.getByTestId(tid.channelRefPopup)).toBeVisible()+ expectAnchoredToCaret(await readBounds(tid.channelRefPopup))+ await page.evaluate(() => new Promise<void>((resolve) => {+ requestAnimationFrame(() => requestAnimationFrame(() => resolve()))+ }))+ expectAnchoredToCaret(await readBounds(tid.channelRefPopup))await page.keyboard.press("Escape")await editable.press("ControlOrMeta+A")diff --git a/src/web/src/test/e2e-ui/37-server-rail-pdd.spec.ts b/src/web/src/test/e2e-ui/37-server-rail-pdd.spec.tsindex d62ced4bb..73cc2502a 100644--- a/src/web/src/test/e2e-ui/37-server-rail-pdd.spec.ts+++ b/src/web/src/test/e2e-ui/37-server-rail-pdd.spec.ts@@ -1,4 +1,4 @@-import type { Page } from "@playwright/test"+import type { Locator, Page } from "@playwright/test"import { expect, test } from "./_fixtures/community-fixture"import { seedChannel, seedServer } from "./_fixtures/seed"import { tid } from "./_fixtures/testids"@@ -57,6 +57,27 @@ async function openMove(page: Page, serverId: string) {await expect(page.getByRole("heading", { name: "Move server" })).toBeVisible()}+async function dragUntilNativeDrop(+ page: Page,+ source: Locator,+ target: Locator,+ hasCommitted: () => boolean,+): Promise<void> {+ for (let attempt = 0; attempt < 3; attempt += 1) {+ await source.dragTo(target, {+ targetPosition: { x: 28, y: 34 },+ force: true,+ })+ await page.waitForTimeout(250)+ const dropped = await page.evaluate(() => (+ (Reflect.get(window, "__railDragEvents") as string[]).includes("drop")+ ))+ // A commit without our capture listener seeing `drop` should still fail+ // the assertions below, but it must never trigger a second PATCH.+ if (dropped || hasCommitted()) return+ }+}+test("server rail commits one PDD drop and exposes mobile Move parity", async ({ asUser }) => {test.setTimeout(150_000)const stamp = Date.now()@@ -102,11 +123,7 @@ test("server rail commits one PDD drop and exposes mobile Move parity", async ({const targetDraggable = target.locator("xpath=ancestor::*[@draggable='true'][1]")await expect(sourceDraggable).toHaveCount(1)await expect(targetDraggable).toHaveCount(1)- await sourceDraggable.dragTo(targetDraggable, {- targetPosition: { x: 28, y: 34 },- force: true,- })- await page.waitForTimeout(500)+ await dragUntilNativeDrop(page, sourceDraggable, targetDraggable, () => railRequests.length > 0)const dragEvents = await page.evaluate(() => Reflect.get(window, "__railDragEvents"))expect(dragEvents).toContain("dragstart")expect(dragEvents).toContain("drop")@@ -124,6 +141,8 @@ test("server rail commits one PDD drop and exposes mobile Move parity", async ({await rail.evaluate((element) => { element.scrollTop = element.scrollHeight })await expect.poll(async () => (await railGeometry(page, tail)).railScrollTop).toBeGreaterThan(0)+ await expect.poll(async () => (await railGeometry(page, tail)).targetOwnsCenter)+ .toBe(true)const mobileTail = await railGeometry(page, tail)expect(mobileTail.rootScrollTop).toBe(0)expect(mobileTail.railScrollTop).toBe(mobileTail.railMaxScrollTop)@@ -147,6 +166,8 @@ test("server rail commits one PDD drop and exposes mobile Move parity", async ({await expect(page.getByTestId(tid.serverIcon(first))).toBeVisible()await expect(page.getByTestId(tid.serverIcon(second))).toBeVisible()await rail.evaluate((element) => { element.scrollTop = element.scrollHeight })+ await expect.poll(async () => (await railGeometry(page, tail)).targetOwnsCenter)+ .toBe(true)const expandedTail = await railGeometry(page, tail)expect(expandedTail.rootScrollTop).toBe(0)expect(expandedTail.target.bottom).toBeLessThanOrEqual(expandedTail.userBar.top + 0.5)diff --git a/src/web/src/test/e2e-ui/38-community-navigation-checkpoint-matrix.spec.ts b/src/web/src/test/e2e-ui/38-community-navigation-checkpoint-matrix.spec.tsindex 4c326576d..dc3aaf436 100644--- a/src/web/src/test/e2e-ui/38-community-navigation-checkpoint-matrix.spec.ts+++ b/src/web/src/test/e2e-ui/38-community-navigation-checkpoint-matrix.spec.ts@@ -24,7 +24,7 @@ async function holdRoute(page: Page, pathname: string) {}}-test("community checkpoint waits for layout-owned frame commits", async ({ asUser }) => {+test("community checkpoint keeps the committed frame live until navigation commits", async ({ asUser }) => {test.setTimeout(120_000)const stamp = Date.now()const serverId = await seedServer("alice", `Frame Gate ${stamp}`)@@ -55,10 +55,11 @@ test("community checkpoint waits for layout-owned frame commits", async ({ asUseconst leafGate = await holdRoute(page, `/c/channels/${serverId}/${channelB}`)await page.getByTestId(tid.channelRow(channelB)).click({ noWaitAfter: true })await expect.poll(leafGate.held).toBeGreaterThan(0)- await expect(page.getByLabel("Loading conversation")).toBeVisible()- await expect(page.getByRole("heading", { name: channelAName })).toHaveCount(0)+ await expect(page.getByLabel("Loading conversation")).toHaveCount(0)+ await expect(page.getByRole("heading", { name: channelAName })).toBeVisible()await page.waitForTimeout(150)- await expect(page.getByLabel("Loading conversation")).toBeVisible()+ await expect(page.getByLabel("Loading conversation")).toHaveCount(0)+ await expect(page.getByRole("heading", { name: channelAName })).toBeVisible()await leafGate.release()await expect(page.getByRole("heading", { name: channelBName })).toBeVisible({ timeout: 30_000 })@@ -67,10 +68,11 @@ test("community checkpoint waits for layout-owned frame commits", async ({ asUseawait page.getByTestId(tid.channelHeaderServer(serverId)).click({ noWaitAfter: true })await expect.poll(rootGate.held).toBeGreaterThan(0)await page.setViewportSize({ width: 1280, height: 900 })- await expect(page.getByTestId(tid.pendingMain("server-landing"))).toBeVisible()- await expect(page.getByRole("heading", { name: channelBName })).toHaveCount(0)+ await expect(page.getByLabel("Loading conversation")).toHaveCount(0)+ await expect(page.getByRole("heading", { name: channelBName })).toBeVisible()await page.waitForTimeout(150)- await expect(page.getByTestId(tid.pendingMain("server-landing"))).toBeVisible()+ await expect(page.getByLabel("Loading conversation")).toHaveCount(0)+ await expect(page.getByRole("heading", { name: channelBName })).toBeVisible()await rootGate.release()await expect(page.getByRole("heading", { name: channelBName })).toBeVisible({ timeout: 30_000 })@@ -80,11 +82,9 @@ test("community checkpoint waits for layout-owned frame commits", async ({ asUseawait page.getByRole("button", { name: "Machines", exact: true }).click({ noWaitAfter: true })await expect.poll(machinesGate.held).toBeGreaterThan(0)await expect(page.getByLabel("Loading conversation")).toHaveCount(0)- await expect(page.getByRole("button", { name: "Machines", exact: true }))- .toHaveClass(/bg-sidebar-accent/)- await expect(page.getByPlaceholder("Search friends")).toHaveCount(0)+ await expect(page.getByPlaceholder("Search friends")).toBeVisible()await page.waitForTimeout(150)- await expect(page.getByPlaceholder("Search friends")).toHaveCount(0)+ await expect(page.getByPlaceholder("Search friends")).toBeVisible()await machinesGate.release()await expect(page.getByRole("heading", { name: "No machines yet", exact: true })).toBeVisible({ timeout: 30_000 })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.tsnew file mode 100644index 000000000..6269784e1--- /dev/null+++ b/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts@@ -0,0 +1,642 @@+import type { Locator, Page } from "@playwright/test"+import { test, expect, userId } from "./_fixtures/community-fixture"+import {+ composerEditable,+ expectMessageVisible,+ gotoAfterUserWsAuth,+ ignoreNextDevToolsPointerCapture,+} from "./_fixtures/actions"+import {+ memberInfo,+ seedChannel,+ seedDm,+ seedJoinServer,+ seedMessage,+ seedServer,+ seedThread,+} from "./_fixtures/seed"+import {+ communityFrameEvents,+ proxyCommunityWebSockets,+ type CapturedCommunityFrame,+} from "./_fixtures/community-ws-proxy"+import { tid } from "./_fixtures/testids"++const TOUCH_QUERY = "(hover: hover) and (pointer: fine)"++async function installTouchPrimaryPointer(page: Page): Promise<void> {+ await page.addInitScript((touchQuery) => {+ const nativeMatchMedia = window.matchMedia.bind(window)+ window.matchMedia = (query: string) => {+ if (query !== touchQuery) return nativeMatchMedia(query)+ return {+ matches: false,+ media: query,+ onchange: null,+ addListener: () => {},+ removeListener: () => {},+ addEventListener: () => {},+ removeEventListener: () => {},+ dispatchEvent: () => false,+ } as MediaQueryList+ }+ }, TOUCH_QUERY)+}++function frameHasMessage(+ frame: CapturedCommunityFrame,+ channelId: string,+ messageId: string,+): boolean {+ return communityFrameEvents(frame).some((event) => (+ event.type === "community:message.create"+ && event.channelId === channelId+ && event.message?.id === messageId+ ))+}++async function dispatchSwipe(+ page: Page,+ messageId: string,+ delta: { x: number; y: number },+): Promise<void> {+ const message = page.getByTestId(tid.message(messageId))+ const row = message.locator("div.group").first()+ await expect(row).toBeVisible()+ await row.evaluate((element) => {+ ;(element as HTMLElement).setPointerCapture = () => {}+ })+ const box = await row.boundingBox()+ if (!box) throw new Error(`message row ${messageId} has no box`)+ const start = { x: box.x + Math.min(100, box.width / 2), y: box.y + box.height / 2 }+ const pointer = { pointerType: "touch", pointerId: 17, isPrimary: true, button: 0 }+ await row.dispatchEvent("pointerdown", { ...pointer, clientX: start.x, clientY: start.y })+ await row.dispatchEvent("pointermove", {+ ...pointer,+ buttons: 1,+ clientX: start.x + delta.x,+ clientY: start.y + delta.y,+ })+ await row.dispatchEvent("pointerup", {+ ...pointer,+ clientX: start.x + delta.x,+ clientY: start.y + delta.y,+ })+}++async function dispatchSwipePathAndClick(+ page: Page,+ messageId: string,+ deltas: Array<{ x: number; y: number }>,+): Promise<void> {+ const message = page.getByTestId(tid.message(messageId))+ const row = message.locator("div.group").first()+ await expect(row).toBeVisible()+ await row.evaluate((element) => {+ ;(element as HTMLElement).setPointerCapture = () => {}+ })+ const box = await row.boundingBox()+ if (!box) throw new Error(`message row ${messageId} has no box`)+ const start = { x: box.x + Math.min(100, box.width / 2), y: box.y + box.height / 2 }+ const pointer = { pointerType: "touch", pointerId: 19, isPrimary: true, button: 0 }+ await row.dispatchEvent("pointerdown", { ...pointer, clientX: start.x, clientY: start.y })+ for (const delta of deltas) {+ await row.dispatchEvent("pointermove", {+ ...pointer,+ buttons: 1,+ clientX: start.x + delta.x,+ clientY: start.y + delta.y,+ })+ }+ const release = deltas.at(-1) ?? { x: 0, y: 0 }+ await row.dispatchEvent("pointerup", {+ ...pointer,+ clientX: start.x + release.x,+ clientY: start.y + release.y,+ })+ await row.dispatchEvent("click", {+ clientX: start.x + release.x,+ clientY: start.y + release.y,+ })+}++async function dispatchLongPress(page: Page, target: Locator): Promise<void> {+ const box = await target.boundingBox()+ if (!box) throw new Error("long-press target has no box")+ const point = { x: box.x + box.width / 2, y: box.y + box.height / 2 }+ const pointer = { pointerType: "touch", pointerId: 23, isPrimary: true, button: 0 }+ await target.dispatchEvent("pointerdown", { ...pointer, clientX: point.x, clientY: point.y })+ await page.waitForTimeout(550)+ await target.dispatchEvent("pointerup", { ...pointer, clientX: point.x, clientY: point.y })+}++async function dispatchCancelledAvatarPress(+ target: Locator,+ mode: "move" | "cancel",+): Promise<void> {+ const box = await target.boundingBox()+ if (!box) throw new Error("avatar target has no box")+ const point = { x: box.x + box.width / 2, y: box.y + box.height / 2 }+ const pointer = { pointerType: "touch", pointerId: 29, isPrimary: true, button: 0 }+ await target.dispatchEvent("pointerdown", { ...pointer, clientX: point.x, clientY: point.y })+ if (mode === "move") {+ await target.dispatchEvent("pointermove", {+ ...pointer,+ buttons: 1,+ clientX: point.x + 20,+ clientY: point.y,+ })+ } else {+ await target.dispatchEvent("pointercancel", { ...pointer, clientX: point.x, clientY: point.y })+ }+ await target.dispatchEvent("click", { clientX: point.x, clientY: point.y })+}++async function latestSeq(page: Page, channelId: string): Promise<number> {+ const response = await page.request.get(`/api/community/channels/${channelId}/messages`)+ expect(response.ok()).toBe(true)+ return ((await response.json()) as { latestSeq: number }).latestSeq+}++test("mobile reply, avatar mention, and typing space keep exact backend and WS identity", async ({ asUser }) => {+ test.setTimeout(240_000)+ const stamp = Date.now()+ const serverName = `Mobile-interactions-${stamp}`+ const serverId = await seedServer("alice", serverName)+ const channelId = await seedChannel("alice", serverId, "mobile-interactions")+ await seedJoinServer("alice", "bob", serverId)+ const channelBobMessageId = await seedMessage("bob", channelId, `channel target ${stamp}`)+ await seedMessage("alice", channelId, Array.from(+ { length: 80 },+ (_, index) => `scroll restoration line ${index} ${stamp}`,+ ).join("\n\n"))+ const openerId = await seedMessage("alice", channelId, `thread opener ${stamp}`)+ const threadId = await seedThread("alice", openerId, `mobile-thread-${stamp}`)+ const threadBobMessageId = await seedMessage("bob", threadId, `thread target ${stamp}`)+ const dmId = await seedDm("alice", userId("bob"))+ const bobInfo = await memberInfo("alice", serverId, userId("bob"))+ const aliceInfo = await memberInfo("alice", serverId, userId("alice"))++ const alice = await asUser("alice")+ const bob = await asUser("bob")+ await installTouchPrimaryPointer(alice.page)+ await alice.page.setViewportSize({ width: 390, height: 844 })+ await bob.page.setViewportSize({ width: 390, height: 844 })+ const aliceProxy = await proxyCommunityWebSockets(alice.context)+ const bobProxy = await proxyCommunityWebSockets(bob.context)+ await gotoAfterUserWsAuth(alice.page, `/c/channels/${serverId}/${channelId}`)+ await gotoAfterUserWsAuth(bob.page, `/c/channels/${serverId}/${channelId}`)+ await ignoreNextDevToolsPointerCapture(alice.page)+ await ignoreNextDevToolsPointerCapture(bob.page)+ await expect(composerEditable(alice.page)).toBeVisible()+ await expect(composerEditable(bob.page)).toBeVisible()+ await expect(alice.page.getByTestId(tid.message(channelBobMessageId))).toBeVisible()+ const channelWsReadyId = await seedMessage("alice", channelId, `channel ws ready ${stamp}`)+ await expect.poll(() => bobProxy.frames.some((frame) => (+ frameHasMessage(frame, channelId, channelWsReadyId)+ )), { timeout: 20_000 }).toBe(true)++ const channelTarget = alice.page.getByTestId(tid.message(channelBobMessageId))+ const beforeTapSeq = await latestSeq(alice.page, channelId)+ const channelAvatar = channelTarget.getByRole("button", {+ name: `Open ${bobInfo.name} profile; long press to mention`,+ })+ await dispatchCancelledAvatarPress(channelAvatar, "move")+ await expect(alice.page.getByTestId(tid.profileCard)).toBeHidden()+ await dispatchCancelledAvatarPress(channelAvatar, "cancel")+ await expect(alice.page.getByTestId(tid.profileCard)).toBeHidden()+ await channelAvatar.click()+ await expect(alice.page.getByTestId(tid.profileCard)).toBeVisible()+ const mobileProfileSheet = alice.page.locator('[data-slot="sheet-content"][data-side="bottom"]')+ await expect(mobileProfileSheet).toHaveCSS("border-top-width", "0px")+ await alice.page.keyboard.press("Escape")+ await expect(alice.page.getByTestId(tid.profileCard)).toBeHidden()+ const manualMentionEditable = composerEditable(alice.page)+ await manualMentionEditable.click()+ await manualMentionEditable.pressSequentially(`@${bobInfo.name.slice(0, 3)}`)+ await alice.page.getByTestId(tid.mentionOption(bobInfo.id)).click()+ await expect(manualMentionEditable).toContainText(`@${bobInfo.name}`)+ await manualMentionEditable.fill("")+ expect(await latestSeq(alice.page, channelId)).toBe(beforeTapSeq)++ const beforeRejectedSwipeSeq = await latestSeq(alice.page, channelId)+ const beforeRejectedSwipeFrames = bobProxy.frames.length+ await dispatchSwipePathAndClick(alice.page, channelBobMessageId, [+ { x: 76, y: 1 },+ { x: 0, y: 1 },+ ])+ await expect(alice.page.getByText("Replying to", { exact: false })).toHaveCount(0)+ await expect(alice.page.getByRole("menuitem")).toHaveCount(0)+ await dispatchSwipePathAndClick(alice.page, channelBobMessageId, [{ x: 32, y: 1 }])+ await expect(alice.page.getByText("Replying to", { exact: false })).toHaveCount(0)+ await expect(alice.page.getByRole("menuitem")).toHaveCount(0)+ await dispatchSwipe(alice.page, channelBobMessageId, { x: 6, y: 48 })+ await expect(alice.page.getByText("Replying to", { exact: false })).toHaveCount(0)+ expect(await latestSeq(alice.page, channelId)).toBe(beforeRejectedSwipeSeq)+ expect(bobProxy.frames).toHaveLength(beforeRejectedSwipeFrames)++ await dispatchSwipe(alice.page, channelBobMessageId, { x: 72, y: 2 })+ await expect(alice.page.getByText(`Replying to ${bobInfo.name}`, { exact: false })).toBeVisible()+ const replyBody = `swipe reply ${stamp}`+ const replyResponsePromise = alice.page.waitForResponse((response) => (+ response.request().method() === "POST"+ && new URL(response.url()).pathname === `/api/community/channels/${channelId}/messages`+ ))+ await composerEditable(alice.page).fill(replyBody)+ await alice.page.getByTestId(tid.composerSend).click()+ const replyResponse = await replyResponsePromise+ expect(replyResponse.status()).toBe(201)+ const replyPayload = await replyResponse.json() as {+ message: { id: string; content: string; replyToId: string | null }+ }+ expect(replyPayload.message.replyToId).toBe(channelBobMessageId)+ expect(replyPayload.message.content).toContain(replyBody)+ await expect.poll(() => bobProxy.frames.some((frame) => (+ frameHasMessage(frame, channelId, replyPayload.message.id)+ && communityFrameEvents(frame).some((event) => (+ (event.message as { replyTo?: { id: string } } | undefined)?.replyTo?.id === channelBobMessageId+ ))+ )), { timeout: 20_000 }).toBe(true)+ await expectMessageVisible(bob.page, replyBody)++ await alice.page.goto(`/c/channels/${serverId}/${threadId}`, { waitUntil: "commit" })+ await bob.page.goto(`/c/channels/${serverId}/${threadId}`, { waitUntil: "commit" })+ await ignoreNextDevToolsPointerCapture(alice.page)+ await ignoreNextDevToolsPointerCapture(bob.page)+ await expect(composerEditable(alice.page)).toBeVisible()+ await expect(composerEditable(bob.page)).toBeVisible()+ const threadTarget = alice.page.getByTestId(tid.message(threadBobMessageId))+ await expect(threadTarget).toBeVisible()+ const restingThreadGap = await alice.page.evaluate(({ targetId, composerId }) => {+ const target = document.querySelector(`[data-testid="${targetId}"]`)?.getBoundingClientRect()+ const composer = document.querySelector(`[data-testid="${composerId}"]`)?.getBoundingClientRect()+ return target && composer ? composer.top - target.bottom : null+ }, {+ targetId: tid.message(threadBobMessageId),+ composerId: tid.channelComposerShell,+ })+ expect(restingThreadGap).not.toBeNull()+ expect(restingThreadGap!).toBeGreaterThanOrEqual(0)+ expect(restingThreadGap!).toBeLessThanOrEqual(40)+ const threadWsReadyId = await seedMessage("alice", threadId, `thread ws ready ${stamp}`)+ await expect.poll(() => bobProxy.frames.some((frame) => (+ frameHasMessage(frame, threadId, threadWsReadyId)+ )), { timeout: 20_000 }).toBe(true)+ const editable = composerEditable(alice.page)+ await editable.fill("openerhere")+ await editable.click()+ for (let index = 0; index < 4; index += 1) await alice.page.keyboard.press("ArrowLeft")+ await dispatchLongPress(+ alice.page,+ alice.page.locator("[data-thread-opener]").getByRole("button", {+ name: `Open ${aliceInfo.name} profile; long press to mention`,+ }),+ )+ await expect(editable).toHaveText(`opener @${aliceInfo.name} here`)+ await expect(editable.locator(".mention-highlight")).toHaveText(`@${aliceInfo.name}`)++ await editable.fill("helloworld")+ await editable.click()+ for (let index = 0; index < 5; index += 1) await alice.page.keyboard.press("ArrowLeft")+ const avatar = threadTarget.getByRole("button", {+ name: `Open ${bobInfo.name} profile; long press to mention`,+ })+ await dispatchLongPress(alice.page, avatar)+ const mentionBody = `hello @${bobInfo.name}#${bobInfo.discriminator} world`+ await expect(editable).toHaveText(`hello @${bobInfo.name} world`)+ const insertedMention = editable.locator(".mention-highlight")+ await expect(insertedMention).toHaveText(`@${bobInfo.name}`)+ await expect(insertedMention).toHaveAttribute("data-id", bobInfo.id)+ await expect(insertedMention).toHaveAttribute(+ "data-label",+ `${bobInfo.name}#${bobInfo.discriminator}`,+ )++ const mentionResponsePromise = alice.page.waitForResponse((response) => (+ response.request().method() === "POST"+ && new URL(response.url()).pathname === `/api/community/channels/${threadId}/messages`+ ))+ await alice.page.getByTestId(tid.composerSend).click()+ const mentionResponse = await mentionResponsePromise+ expect(mentionResponse.status()).toBe(201)+ const mentionPayload = await mentionResponse.json() as {+ message: { id: string; content: string; replyToId: string | null }+ }+ expect(mentionPayload.message).toMatchObject({ content: mentionBody, replyToId: null })+ await expect.poll(() => bobProxy.frames.some((frame) => (+ frameHasMessage(frame, threadId, mentionPayload.message.id)+ && communityFrameEvents(frame).some((event) => event.type === "community:mention.create")+ )), { timeout: 20_000 }).toBe(true)+ await expect(bob.page.getByTestId(tid.message(mentionPayload.message.id))).toBeVisible()++ await dispatchSwipe(alice.page, threadBobMessageId, { x: 72, y: 1 })+ await expect(alice.page.getByText(`Replying to ${bobInfo.name}`, { exact: false })).toBeVisible()+ const threadReplyBody = `thread swipe reply ${stamp}`+ const threadReplyResponsePromise = alice.page.waitForResponse((response) => (+ response.request().method() === "POST"+ && new URL(response.url()).pathname === `/api/community/channels/${threadId}/messages`+ ))+ await composerEditable(alice.page).fill(threadReplyBody)+ await alice.page.getByTestId(tid.composerSend).click()+ const threadReplyResponse = await threadReplyResponsePromise+ expect(threadReplyResponse.status()).toBe(201)+ const threadReplyPayload = await threadReplyResponse.json() as {+ message: { id: string; content: string; replyToId: string | null }+ }+ expect(threadReplyPayload.message.replyToId).toBe(threadBobMessageId)+ expect(threadReplyPayload.message.content).toContain(threadReplyBody)+ await expect.poll(() => bobProxy.frames.some((frame) => (+ frameHasMessage(frame, threadId, threadReplyPayload.message.id)+ && communityFrameEvents(frame).some((event) => (+ (event.message as { replyTo?: { id: string } } | undefined)?.replyTo?.id === threadBobMessageId+ ))+ )), { timeout: 20_000 }).toBe(true)++ await alice.page.goto(`/c/channels/${serverId}/${channelId}`, { waitUntil: "commit" })+ await bob.page.goto(`/c/channels/${serverId}/${channelId}`, { waitUntil: "commit" })+ await ignoreNextDevToolsPointerCapture(alice.page)+ await ignoreNextDevToolsPointerCapture(bob.page)+ await expect(composerEditable(alice.page)).toBeVisible()+ await expect(composerEditable(bob.page)).toBeVisible()+ await expect(alice.page.getByTestId(tid.message(replyPayload.message.id))).toBeVisible()+ const typingWsReadyId = await seedMessage("bob", channelId, `typing ws ready ${stamp}`)+ await expect.poll(() => aliceProxy.frames.some((frame) => (+ frameHasMessage(frame, channelId, typingWsReadyId)+ )), { timeout: 20_000 }).toBe(true)+ const typingSpace = alice.page.locator("[data-message-typing-space]")+ const spaceBefore = await typingSpace.boundingBox()+ expect(spaceBefore?.height).toBe(0)+ const beforeTypingSeq = await latestSeq(alice.page, channelId)+ const bobEditable = composerEditable(bob.page)+ await expect(async () => {+ await bobEditable.fill("")+ await bobEditable.pressSequentially("typing geometry")+ await expect(alice.page.getByTestId(tid.typingIndicator)).toBeVisible({ timeout: 4_000 })+ }).toPass({ timeout: 20_000 })+ await expect.poll(() => aliceProxy.frames.some((frame) => (+ communityFrameEvents(frame).some((event) => (+ event.type === "community:typing.start" && event.channelId === channelId+ ))+ )), { timeout: 20_000 }).toBe(true)++ const geometry = await alice.page.evaluate(({+ scrollerId,+ composerId,+ indicatorId,+ replyMessageTestId,+ }) => {+ const rect = (element: Element | null) => element?.getBoundingClientRect() ?? null+ return {+ scroller: rect(document.querySelector(`[data-testid="${scrollerId}"]`)),+ space: rect(document.querySelector("[data-message-typing-space]")),+ indicator: rect(document.querySelector(`[data-testid="${indicatorId}"]`)),+ composer: rect(document.querySelector(`[data-testid="${composerId}"]`)),+ finalMessage: rect(document.querySelector(`[data-testid="${replyMessageTestId}"]`)),+ horizontalOverflow: document.documentElement.scrollWidth - document.documentElement.clientWidth,+ }+ }, {+ scrollerId: tid.messageScroller,+ composerId: tid.channelComposerShell,+ indicatorId: tid.typingIndicator,+ replyMessageTestId: tid.message(replyPayload.message.id),+ })+ expect(geometry.scroller!.bottom).toBeLessThanOrEqual(geometry.space!.top + 1)+ expect(geometry.space!.height).toBe(44)+ expect(geometry.space!.bottom).toBeLessThanOrEqual(geometry.composer!.top + 1)+ expect(geometry.indicator!.top).toBeGreaterThanOrEqual(geometry.space!.top - 1)+ expect(geometry.indicator!.bottom).toBeLessThanOrEqual(geometry.space!.bottom + 1)+ expect(geometry.finalMessage!.bottom).toBeLessThanOrEqual(geometry.scroller!.bottom + 1)+ expect(geometry.horizontalOverflow).toBeLessThanOrEqual(0)++ const scroller = alice.page.getByTestId(tid.messageScroller)+ await scroller.evaluate((element) => {+ element.scrollTop = 0+ element.dispatchEvent(new Event("scroll"))+ })+ await expect(alice.page.getByTestId(tid.scrollToPresent)).toBeVisible()+ const scrollTypingGeometry = await alice.page.evaluate((ids) => {+ const rect = (element: Element | null) => element?.getBoundingClientRect() ?? null+ return {+ scroller: rect(document.querySelector(`[data-testid="${ids.scroller}"]`)),+ rail: rect(document.querySelector(`[data-testid="${ids.rail}"]`)),+ scroll: rect(document.querySelector(`[data-testid="${ids.scroll}"]`)),+ space: rect(document.querySelector("[data-message-typing-space]")),+ indicator: rect(document.querySelector(`[data-testid="${ids.indicator}"]`)),+ }+ }, {+ scroller: tid.messageScroller,+ rail: tid.composerAccessoryRail,+ scroll: tid.scrollToPresent,+ indicator: tid.typingIndicator,+ })+ expect(scrollTypingGeometry.rail!.bottom).toBeLessThanOrEqual(scrollTypingGeometry.space!.top + 1)+ expect(scrollTypingGeometry.scroll!.bottom).toBeLessThanOrEqual(scrollTypingGeometry.space!.top + 1)+ expect(scrollTypingGeometry.scroll!.bottom).toBeLessThanOrEqual(scrollTypingGeometry.scroller!.bottom + 1)+ expect(scrollTypingGeometry.indicator!.top).toBeGreaterThanOrEqual(scrollTypingGeometry.space!.top - 1)++ await alice.page.getByTestId(tid.scrollToPresent).click()+ await expect(alice.page.getByTestId(tid.scrollToPresent)).toHaveCount(0)+ await bobEditable.pressSequentially(" selection")+ await expect(alice.page.getByTestId(tid.typingIndicator)).toBeVisible({ timeout: 4_000 })+ const finalChannelMessage = alice.page.getByTestId(tid.message(typingWsReadyId))+ await finalChannelMessage.getByText(`typing ws ready ${stamp}`, { exact: true }).click()+ await alice.page.getByRole("menuitem", { name: "Share as Image" }).click()+ await expect(alice.page.getByTestId(tid.messageSelectionToolbar)).toBeVisible()+ const selectionTypingGeometry = await alice.page.evaluate((ids) => {+ const rect = (element: Element | null) => element?.getBoundingClientRect() ?? null+ return {+ finalMessage: rect(document.querySelector(`[data-testid="${ids.finalMessage}"]`)),+ scroller: rect(document.querySelector(`[data-testid="${ids.scroller}"]`)),+ rail: rect(document.querySelector(`[data-testid="${ids.rail}"]`)),+ selection: rect(document.querySelector(`[data-testid="${ids.selection}"]`)),+ space: rect(document.querySelector("[data-message-typing-space]")),+ indicator: rect(document.querySelector(`[data-testid="${ids.indicator}"]`)),+ composer: rect(document.querySelector(`[data-testid="${ids.composer}"]`)),+ }+ }, {+ finalMessage: tid.message(typingWsReadyId),+ scroller: tid.messageScroller,+ rail: tid.composerAccessoryRail,+ selection: tid.messageSelectionToolbar,+ indicator: tid.typingIndicator,+ composer: tid.channelComposerShell,+ })+ expect(selectionTypingGeometry.finalMessage!.bottom).toBeLessThanOrEqual(selectionTypingGeometry.rail!.top + 1)+ expect(selectionTypingGeometry.rail!.bottom).toBeLessThanOrEqual(selectionTypingGeometry.space!.top + 1)+ expect(selectionTypingGeometry.selection!.bottom).toBeLessThanOrEqual(selectionTypingGeometry.space!.top + 1)+ expect(selectionTypingGeometry.space!.bottom).toBeLessThanOrEqual(selectionTypingGeometry.composer!.top + 1)+ expect(selectionTypingGeometry.finalMessage!.bottom).toBeLessThanOrEqual(selectionTypingGeometry.scroller!.bottom + 1)+ expect(selectionTypingGeometry.indicator!.bottom).toBeLessThanOrEqual(selectionTypingGeometry.space!.bottom + 1)+ await alice.page.getByRole("button", { name: "Cancel message selection" }).click()++ await bobEditable.fill("")+ await expect(alice.page.getByTestId(tid.typingIndicator)).toBeHidden({ timeout: 15_000 })+ const spaceAfter = await typingSpace.boundingBox()+ expect(spaceAfter?.height).toBe(0)+ expect(spaceAfter?.y).toBeCloseTo(spaceBefore!.y, 0)+ expect(await latestSeq(alice.page, channelId)).toBe(beforeTypingSeq)++ await alice.page.goto(`/c/me/${dmId}`, { waitUntil: "commit" })+ await bob.page.goto(`/c/me/${dmId}`, { waitUntil: "commit" })+ await ignoreNextDevToolsPointerCapture(alice.page)+ await ignoreNextDevToolsPointerCapture(bob.page)+ await expect(composerEditable(alice.page)).toBeVisible()+ await expect(composerEditable(bob.page)).toBeVisible()+ const dmWsReadyId = await seedMessage("bob", dmId, `dm typing ws ready ${stamp}`)+ await expect.poll(() => aliceProxy.frames.some((frame) => (+ frameHasMessage(frame, dmId, dmWsReadyId)+ )), { timeout: 20_000 }).toBe(true)+ const beforeDmTypingSeq = await latestSeq(alice.page, dmId)+ const dmTypingSpace = alice.page.locator("[data-message-typing-space]")+ const dmSpaceBefore = await dmTypingSpace.boundingBox()+ expect(dmSpaceBefore?.height).toBe(0)+ const bobDmEditable = composerEditable(bob.page)+ await expect(async () => {+ await bobDmEditable.fill("")+ await bobDmEditable.pressSequentially("dm typing geometry")+ await expect(alice.page.getByTestId(tid.typingIndicator)).toBeVisible({ timeout: 4_000 })+ }).toPass({ timeout: 20_000 })+ const dmGeometry = await alice.page.evaluate(({ scrollerId, indicatorId }) => {+ const rect = (element: Element | null) => element?.getBoundingClientRect() ?? null+ return {+ scroller: rect(document.querySelector(`[data-testid="${scrollerId}"]`)),+ space: rect(document.querySelector("[data-message-typing-space]")),+ indicator: rect(document.querySelector(`[data-testid="${indicatorId}"]`)),+ horizontalOverflow: document.documentElement.scrollWidth - document.documentElement.clientWidth,+ }+ }, { scrollerId: tid.messageScroller, indicatorId: tid.typingIndicator })+ expect(dmGeometry.scroller!.bottom).toBeLessThanOrEqual(dmGeometry.space!.top + 1)+ expect(dmGeometry.space!.height).toBe(44)+ expect(dmGeometry.indicator!.bottom).toBeLessThanOrEqual(dmGeometry.space!.bottom + 1)+ expect(dmGeometry.horizontalOverflow).toBeLessThanOrEqual(0)+ await bobDmEditable.fill("")+ await expect(alice.page.getByTestId(tid.typingIndicator)).toBeHidden({ timeout: 15_000 })+ expect((await dmTypingSpace.boundingBox())?.height).toBe(0)+ expect(await latestSeq(alice.page, dmId)).toBe(beforeDmTypingSeq)++ await alice.page.emulateMedia({ reducedMotion: "reduce" })+ await alice.page.evaluate(() => {+ const original = Element.prototype.animate+ ;(window as typeof window & { __mobileSurfaceAnimations?: number }).__mobileSurfaceAnimations = 0+ Element.prototype.animate = function (...args) {+ if ((this as HTMLElement).dataset.communityMobileSurface) {+ const state = window as typeof window & { __mobileSurfaceAnimations?: number }+ state.__mobileSurfaceAnimations = (state.__mobileSurfaceAnimations ?? 0) + 1+ }+ return original.apply(this, args)+ }+ })+ await alice.page.getByRole("button", { name: "Back" }).click()+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe("/c/me")+ await alice.page.getByTestId(tid.serverIcon(serverId)).click()+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}`)+ await alice.page.getByTestId(tid.channelRow(channelId)).evaluate((element) => (+ (element as HTMLElement).click()+ ))+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}/${channelId}`)+ await expect(composerEditable(alice.page)).toBeVisible()+ expect(await alice.page.evaluate(() => (+ window as typeof window & { __mobileSurfaceAnimations?: number }+ ).__mobileSurfaceAnimations)).toBe(0)++ const navigationDraft = `navigation draft ${stamp}`+ const navigationEditable = composerEditable(alice.page)+ await navigationEditable.fill(navigationDraft)+ const readingPosition = await scroller.evaluate((element) => {+ element.scrollTop = Math.min(2200, Math.max(0, element.scrollHeight - element.clientHeight))+ return element.scrollTop+ })+ expect(readingPosition).toBe(2200)+ const getObservationStartedAt = Date.now()+ const channelMessageGets: Array<{ route: string; sinceMs: number; url: string }> = []+ alice.page.on("request", (request) => {+ if (+ request.method() === "GET"+ && new URL(request.url()).pathname === `/api/community/channels/${channelId}/messages`+ ) {+ channelMessageGets.push({+ route: new URL(request.frame().url()).pathname,+ sinceMs: Date.now() - getObservationStartedAt,+ url: request.url(),+ })+ }+ })+ await alice.page.getByRole("button", { name: `Go to server ${serverName}` }).click()+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}`)+ await alice.page.getByTestId(tid.channelRow(channelId)).evaluate((element) => (+ (element as HTMLElement).click()+ ))+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}/${channelId}`)+ await expect(composerEditable(alice.page)).toContainText(navigationDraft)+ await alice.page.waitForTimeout(1600)+ expect(await scroller.evaluate((element) => element.scrollTop)).toBeCloseTo(readingPosition, 0)+ expect(+ channelMessageGets.length,+ `channel message GETs after list return: ${JSON.stringify(channelMessageGets)}`,+ ).toBeLessThanOrEqual(1)+})++test("mobile channel scroll restoration remains stable after navigation settles", async ({ asUser }) => {+ const stamp = Date.now()+ const serverName = `Mobile-scroll-${stamp}`+ const serverId = await seedServer("alice", serverName)+ const channelId = await seedChannel("alice", serverId, "mobile-scroll")+ for (let index = 0; index < 24; index += 1) {+ await seedMessage("alice", channelId, `scroll row ${index} ${stamp}`)+ }+ await seedMessage("alice", channelId, Array.from(+ { length: 95 },+ (_, index) => `scroll line ${index} ${stamp}`,+ ).join("\n\n"))+ const openerId = await seedMessage("alice", channelId, `scroll thread opener ${stamp}`)+ const threadId = await seedThread("alice", openerId, `scroll-thread-${stamp}`)+ const threadReplyId = await seedMessage("alice", threadId, `scroll thread reply ${stamp}`)++ const alice = await asUser("alice")+ await alice.page.setViewportSize({ width: 390, height: 844 })+ await alice.page.goto(`/c/channels/${serverId}/${channelId}`, { waitUntil: "commit" })+ await ignoreNextDevToolsPointerCapture(alice.page)+ const editable = composerEditable(alice.page)+ const scroller = alice.page.getByTestId(tid.messageScroller)+ await expect(editable).toBeVisible()+ await expect.poll(() => scroller.evaluate((element) => (+ element.scrollHeight - element.clientHeight+ ))).toBeGreaterThanOrEqual(2200)++ const draft = `stable navigation draft ${stamp}`+ await editable.fill(draft)+ expect(await scroller.evaluate((element) => {+ element.scrollTop = 2200+ return element.scrollTop+ })).toBe(2200)++ await alice.page.getByRole("button", { name: `Go to server ${serverName}` }).click()+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}`)+ await alice.page.getByTestId(tid.channelRow(channelId)).click()+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}/${channelId}`)+ await expect(composerEditable(alice.page)).toContainText(draft)+ await alice.page.waitForTimeout(1600)+ expect(await scroller.evaluate((element) => element.scrollTop)).toBeCloseTo(2200, 0)++ await alice.page.getByTestId(tid.scrollToPresent).click()+ const threadIndicator = alice.page.getByTestId(tid.threadIndicator(openerId))+ await expect(threadIndicator).toBeVisible()+ await alice.page.waitForTimeout(500)+ await threadIndicator.focus()+ await expect.poll(async () => {+ const before = await scroller.evaluate((element) => element.scrollTop)+ await alice.page.waitForTimeout(50)+ const after = await scroller.evaluate((element) => element.scrollTop)+ return after - before+ }).toBe(0)+ const channelBackPosition = await scroller.evaluate((element) => element.scrollTop)+ expect(channelBackPosition).toBeGreaterThan(2200)+ await threadIndicator.click()+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}/${threadId}`)+ await expect(alice.page.getByTestId(tid.message(threadReplyId))).toBeVisible()+ await alice.page.goBack({ waitUntil: "commit" })+ await expect.poll(() => new URL(alice.page.url()).pathname).toBe(`/c/channels/${serverId}/${channelId}`)+ await expect(composerEditable(alice.page)).toContainText(draft)+ await alice.page.waitForTimeout(1600)+ expect(await scroller.evaluate((element) => element.scrollTop)).toBeCloseTo(channelBackPosition, 0)+})