Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): anchor message menu to tap position (#486)

Gustavo Ye3fc5e422027b
diff --git a/src/web/src/components/community/messages/message.render.test.ts b/src/web/src/components/community/messages/message.render.test.ts
index 6e1baf1cc..581ae110f 100644
--- a/src/web/src/components/community/messages/message.render.test.ts
+++ b/src/web/src/components/community/messages/message.render.test.ts
@@ -4,6 +4,7 @@ import React from "react"
import TestRenderer, { act } from "react-test-renderer"
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
import {
+ createMessageMenuPointAnchor,
Message,
shouldActivateMessageOverlays,
shouldSuppressTouchMenuOpen,
@@ -60,6 +61,7 @@ beforeEach(() => {
})
afterEach(() => {
vi.restoreAllMocks()
+ vi.unstubAllGlobals()
})
describe("Message memo comparator", () => {
@@ -128,6 +130,21 @@ describe("Message memo comparator", () => {
})
describe("Message touch action menu", () => {
+ it("creates a zero-size virtual anchor at the viewport click coordinates", () => {
+ const rect = createMessageMenuPointAnchor(123, 456).getBoundingClientRect()
+
+ expect(rect).toMatchObject({
+ x: 123,
+ y: 456,
+ top: 456,
+ right: 123,
+ bottom: 456,
+ left: 123,
+ width: 0,
+ height: 0,
+ })
+ })
+
it("uses row taps with an invisible dropdown anchor and no persistent ellipsis", async () => {
let renderer: TestRenderer.ReactTestRenderer | undefined
await act(async () => {
@@ -167,6 +184,53 @@ describe("Message touch action menu", () => {
act(() => renderer!.unmount())
})
+ it("anchors an accepted row tap to its viewport coordinates", async () => {
+ vi.stubGlobal("window", { getSelection: () => null })
+ let renderer: TestRenderer.ReactTestRenderer | undefined
+ await act(async () => {
+ renderer = TestRenderer.create(
+ makeTree({
+ m: baseMsg({ content: "long message\n".repeat(200) }),
+ hoverCapable: false,
+ onOpenThread: vi.fn(),
+ onReply: vi.fn(),
+ onCopy: vi.fn(),
+ }),
+ { createNodeMock: () => genericMock },
+ )
+ })
+
+ const row = renderer!.root.find(
+ (node) => typeof node.props.className === "string"
+ && node.props.className.includes("group relative -mx-2"),
+ )
+ await act(async () => {
+ row.props.onClick({
+ clientX: 271,
+ clientY: 603,
+ currentTarget: { contains: () => false },
+ target: { closest: () => null },
+ })
+ })
+
+ const positioner = renderer!.root.find(
+ (node) => node.props.positionMethod === "fixed" && node.props.anchor,
+ )
+ expect(positioner.props.anchor.getBoundingClientRect()).toMatchObject({
+ x: 271,
+ y: 603,
+ width: 0,
+ height: 0,
+ })
+ expect(positioner.props.collisionPadding).toBe(8)
+ expect(positioner.props.collisionAvoidance).toEqual({
+ side: "flip",
+ align: "shift",
+ fallbackAxisSide: "none",
+ })
+ act(() => renderer!.unmount())
+ })
+
it("lets a short row tap reach the menu but suppresses long-press, selection, and nested-control taps", () => {
expect(shouldSuppressTouchMenuOpen({
nestedControl: false, selectionInsideRow: false, longPress: false,
diff --git a/src/web/src/components/community/messages/message.tsx b/src/web/src/components/community/messages/message.tsx
index c0fce270f..71db4236e 100644
--- a/src/web/src/components/community/messages/message.tsx
+++ b/src/web/src/components/community/messages/message.tsx
@@ -58,6 +58,31 @@ export function shouldSuppressTouchMenuOpen({
return nestedControl || selectionInsideRow || longPress
}
+export function createMessageMenuPointAnchor(clientX: number, clientY: number) {
+ const rect = {
+ x: clientX,
+ y: clientY,
+ top: clientY,
+ right: clientX,
+ bottom: clientY,
+ left: clientX,
+ width: 0,
+ height: 0,
+ toJSON: () => ({
+ x: clientX,
+ y: clientY,
+ top: clientY,
+ right: clientX,
+ bottom: clientY,
+ left: clientX,
+ width: 0,
+ height: 0,
+ }),
+ } satisfies DOMRect
+
+ return { getBoundingClientRect: () => rect }
+}
+
function MessageImpl({
m, compact, pinned, onOpenThread, onOpenProfile, onJumpReply,
onToggleReaction, onReact, onReply, onPin, onMark, onCreateThread, onCopy, onEdit, onRetry, onDismiss,
@@ -119,6 +144,7 @@ function MessageImpl({
// Touch devices use a normal tap-triggered dropdown. Long-press is left to
// the browser so message text keeps native selection/copy behavior.
const [touchMenuOpen, setTouchMenuOpen] = useState(false)
+ const [touchMenuAnchor, setTouchMenuAnchor] = useState<ReturnType<typeof createMessageMenuPointAnchor> | null>(null)
const touchStartedAt = useRef<number | null>(null)
const suppressLongPressClick = useRef(false)
// The Mark/Unmark label needs to know if THIS message is already in the
@@ -226,6 +252,7 @@ function MessageImpl({
// short tap on its non-control body opens the controlled menu;
// nested buttons/links and native long-press selection stay intact.
if (!suppress) {
+ setTouchMenuAnchor(createMessageMenuPointAnchor(event.clientX, event.clientY))
setTouchMenuOpen(true)
}
}
@@ -537,7 +564,15 @@ function MessageImpl({
)}
/>
</div>
- <DropdownMenuContent align="end" className="w-48 select-none">
+ <DropdownMenuContent
+ anchor={touchMenuAnchor ?? undefined}
+ positionMethod="fixed"
+ side="bottom"
+ align="start"
+ collisionPadding={8}
+ collisionAvoidance={{ side: "flip", align: "shift", fallbackAxisSide: "none" }}
+ className="w-48 select-none"
+ >
<MessageDropdownItems {...menuHandlers} touch />
</DropdownMenuContent>
</DropdownMenu>
diff --git a/src/web/src/components/ui/dropdown-menu.tsx b/src/web/src/components/ui/dropdown-menu.tsx
index 59374d611..6c85f3ac3 100644
--- a/src/web/src/components/ui/dropdown-menu.tsx
+++ b/src/web/src/components/ui/dropdown-menu.tsx
@@ -23,12 +23,23 @@ function DropdownMenuContent({
alignOffset = 0,
side = "bottom",
sideOffset = 4,
+ anchor,
+ positionMethod,
+ collisionPadding,
+ collisionAvoidance,
className,
...props
}: MenuPrimitive.Popup.Props &
Pick<
MenuPrimitive.Positioner.Props,
- "align" | "alignOffset" | "side" | "sideOffset"
+ | "align"
+ | "alignOffset"
+ | "side"
+ | "sideOffset"
+ | "anchor"
+ | "positionMethod"
+ | "collisionPadding"
+ | "collisionAvoidance"
>) {
return (
<MenuPrimitive.Portal>
@@ -38,6 +49,10 @@ function DropdownMenuContent({
alignOffset={alignOffset}
side={side}
sideOffset={sideOffset}
+ anchor={anchor}
+ positionMethod={positionMethod}
+ collisionPadding={collisionPadding}
+ collisionAvoidance={collisionAvoidance}
>
<MenuPrimitive.Popup
data-slot="dropdown-menu-content"