Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): key composer send to input capability (#638)

Genereee00783f786
diff --git a/src/web/src/components/community/messages/FLUENT_SEND_FILLED_LICENSE.md b/src/web/src/components/community/messages/FLUENT_SEND_FILLED_LICENSE.md
new file mode 100644
index 000000000..a87a8ee25
--- /dev/null
+++ b/src/web/src/components/community/messages/FLUENT_SEND_FILLED_LICENSE.md
@@ -0,0 +1,29 @@
+# Fluent Send 24 Filled attribution
+
+Vendored asset: `assets/Send/SVG/ic_fluent_send_24_filled.svg`
+
+Source: `https://github.com/microsoft/fluentui-system-icons/blob/4d685f77b2cb8f3f412a74ec8d920c8c91149528/assets/Send/SVG/ic_fluent_send_24_filled.svg`
+
+The SVG path is unchanged. Its fixed `#212121` fill is adapted to `currentColor` for theme support.
+
+MIT License
+
+Copyright (c) 2020 Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/web/src/components/community/messages/composer-keydown.ts b/src/web/src/components/community/messages/composer-keydown.ts
index ed5bb569f..5b5517887 100644
--- a/src/web/src/components/community/messages/composer-keydown.ts
+++ b/src/web/src/components/community/messages/composer-keydown.ts
@@ -1,9 +1,8 @@
-import type { Breakpoint } from "@/hooks/use-mobile"
import type { EditorView } from "@tiptap/pm/view"
import { normalizeConsecutiveTerminalHardBreak } from "./consecutive-hard-break"
type ComposerKeyDownOptions = {
- breakpoint: Breakpoint
+ hoverCapable: boolean
channelRefOpen: boolean
isForumThreadBody: boolean
mentionOpen: boolean
@@ -23,7 +22,7 @@ function submitComposerForKeyDown(
event.key !== "Enter" ||
event.shiftKey ||
event.isComposing ||
- options.breakpoint !== "desktop"
+ !options.hoverCapable
) {
return false
}
diff --git a/src/web/src/components/community/messages/composer-view.test.ts b/src/web/src/components/community/messages/composer-view.test.ts
index 1f841ebee..5da72e52c 100644
--- a/src/web/src/components/community/messages/composer-view.test.ts
+++ b/src/web/src/components/community/messages/composer-view.test.ts
@@ -13,8 +13,6 @@ vi.mock("lucide-react", () => ({
createElement("image-icon", props),
PlusCircle: (props: Record<string, unknown>) =>
createElement("plus-icon", props),
- SendHorizontal: (props: Record<string, unknown>) =>
- createElement("send-icon", props),
Smile: (props: Record<string, unknown>) => createElement("smile-icon", props),
X: (props: Record<string, unknown>) => createElement("x-icon", props),
}))
@@ -369,7 +367,7 @@ describe("ComposerView", () => {
expect(textContent(preview)).toBe("Replying to Ada · Second target")
})
- it("renders the mobile send control after emoji with exact eligibility and padding", async () => {
+ it("renders the explicit send control after emoji with exact eligibility and styling", async () => {
const onSend = vi.fn()
let renderer!: TestRenderer.ReactTestRenderer
await act(async () => {
@@ -398,7 +396,23 @@ describe("ComposerView", () => {
disabled: true,
})
expect(send.props.className).toContain("right-2")
- expect(renderer.root.findAllByType("send-icon")).toHaveLength(1)
+ expect(send.props.className).toContain("size-8")
+ expect(send.props.className).toContain("rounded-[8px]")
+ expect(send.props.className).toContain("disabled:bg-transparent")
+ expect(send.props.className).toContain("disabled:text-muted-foreground")
+ expect(send.props.className).toContain("enabled:hover:bg-primary/90")
+ expect(send.props.className).toContain("enabled:active:bg-primary/80")
+ expect(send.props.className).not.toContain("rounded-full")
+ const icon = send.findByType("svg")
+ expect(icon.props).toMatchObject({
+ viewBox: "0 0 24 24",
+ "aria-hidden": "true",
+ className: "size-5",
+ })
+ expect(icon.findByType("path").props).toMatchObject({
+ d: "M12.8147 12.1969L5.28344 13.4521C5.10705 13.4815 4.95979 13.6029 4.89723 13.7704L2.29933 20.7278C2.05066 21.3673 2.72008 21.9773 3.33375 21.6705L21.3337 12.6705C21.8865 12.3941 21.8865 11.6052 21.3337 11.3288L3.33375 2.32885C2.72008 2.02201 2.05066 2.63206 2.29933 3.2715L4.89723 10.2289C4.95979 10.3964 5.10705 10.5178 5.28344 10.5472L12.8147 11.8024C12.9236 11.8205 12.9972 11.9236 12.9791 12.0325C12.965 12.1168 12.899 12.1829 12.8147 12.1969Z",
+ fill: "currentColor",
+ })
expect(
renderer.root
.findAllByType("button")
@@ -414,10 +428,14 @@ describe("ComposerView", () => {
),
)
})
+ const activeSend = renderer.root.find(
+ (node) => node.props["data-testid"] === tid.composerSend,
+ )
+ expect(activeSend.props.disabled).toBe(false)
+ expect(activeSend.props.className).toContain("bg-primary")
+ expect(activeSend.props.className).toContain("text-primary-foreground")
await act(async () => {
- renderer.root.find(
- (node) => node.props["data-testid"] === tid.composerSend,
- ).props.onClick()
+ activeSend.props.onClick()
})
expect(onSend).toHaveBeenCalledOnce()
@@ -436,6 +454,21 @@ describe("ComposerView", () => {
).toContain("px-12")
})
+ it("pins the vendored Fluent asset to its exact MIT attribution", () => {
+ const license = readFileSync(
+ new URL("./FLUENT_SEND_FILLED_LICENSE.md", import.meta.url),
+ "utf8",
+ )
+ expect(license).toContain(
+ "4d685f77b2cb8f3f412a74ec8d920c8c91149528/assets/Send/SVG/ic_fluent_send_24_filled.svg",
+ )
+ expect(license).toContain("Copyright (c) 2020 Microsoft Corporation")
+ expect(license).toContain("MIT License")
+ expect(license).toContain(
+ "The above copyright notice and this permission notice shall be included",
+ )
+ })
+
it("keeps the exact ComposerSkeleton footprint", async () => {
let renderer!: TestRenderer.ReactTestRenderer
await act(async () => {
diff --git a/src/web/src/components/community/messages/composer-view.tsx b/src/web/src/components/community/messages/composer-view.tsx
index a31452290..7f4748668 100644
--- a/src/web/src/components/community/messages/composer-view.tsx
+++ b/src/web/src/components/community/messages/composer-view.tsx
@@ -8,7 +8,6 @@ import {
FileIcon,
ImageIcon,
PlusCircle,
- SendHorizontal,
Smile,
X,
} from "lucide-react"
@@ -30,6 +29,7 @@ import {
CommunityMentionList,
} from "./composer-suggestion-popups"
import type { ComposerReplyTarget } from "./composer-types"
+import { FluentSendFilledIcon } from "./fluent-send-filled-icon"
export type ComposerViewProps = {
isForumThreadBody: boolean
@@ -226,12 +226,12 @@ export function ComposerView({
<button
type="button"
data-testid={tid.composerSend}
- className="absolute right-2 bottom-2 grid size-8 place-items-center rounded-full bg-primary text-primary-foreground hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:bg-transparent disabled:text-muted-foreground"
+ className="absolute right-2 bottom-2 grid size-8 place-items-center rounded-[8px] bg-primary text-primary-foreground enabled:hover:bg-primary/90 enabled:active:bg-primary/80 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:bg-transparent disabled:text-muted-foreground"
aria-label="Send message"
disabled={sendDisabled}
onClick={onSend}
>
- <SendHorizontal className="size-5" />
+ <FluentSendFilledIcon className="size-5" />
</button>
)}
</div>
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.ts
index 12b81d7ed..e056dab69 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
@@ -42,8 +42,8 @@ vi.mock("@/hooks/use-file-attachments", () => ({
useFileAttachments: (...args: unknown[]) => mocks.useFileAttachments(...args),
}))
-vi.mock("@/hooks/use-mobile", () => ({
- useBreakpoint: () => "desktop",
+vi.mock("@/hooks/use-hover-capable", () => ({
+ useHoverCapable: () => true,
}))
import { Composer, type ComposerProps } from "./composer"
diff --git a/src/web/src/components/community/messages/fluent-send-filled-icon.tsx b/src/web/src/components/community/messages/fluent-send-filled-icon.tsx
new file mode 100644
index 000000000..7be9baf35
--- /dev/null
+++ b/src/web/src/components/community/messages/fluent-send-filled-icon.tsx
@@ -0,0 +1,18 @@
+import type { SVGProps } from "react"
+
+export function FluentSendFilledIcon(props: SVGProps<SVGSVGElement>) {
+ return (
+ <svg
+ viewBox="0 0 24 24"
+ fill="none"
+ aria-hidden="true"
+ focusable="false"
+ {...props}
+ >
+ <path
+ d="M12.8147 12.1969L5.28344 13.4521C5.10705 13.4815 4.95979 13.6029 4.89723 13.7704L2.29933 20.7278C2.05066 21.3673 2.72008 21.9773 3.33375 21.6705L21.3337 12.6705C21.8865 12.3941 21.8865 11.6052 21.3337 11.3288L3.33375 2.32885C2.72008 2.02201 2.05066 2.63206 2.29933 3.2715L4.89723 10.2289C4.95979 10.3964 5.10705 10.5178 5.28344 10.5472L12.8147 11.8024C12.9236 11.8205 12.9972 11.9236 12.9791 12.0325C12.965 12.1168 12.899 12.1829 12.8147 12.1969Z"
+ fill="currentColor"
+ />
+ </svg>
+ )
+}
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.ts
index a1aafbc68..f52c6d0bf 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
@@ -26,7 +26,7 @@ const mocks = vi.hoisted(() => ({
fromSchema: vi.fn(),
parseSlice: vi.fn(),
normalizeHardBreak: vi.fn(),
- breakpoint: "desktop" as "unknown" | "desktop" | "mobile",
+ hoverCapable: true,
}))
vi.mock("@tiptap/react", () => ({
@@ -51,8 +51,8 @@ vi.mock("@/hooks/use-file-attachments", () => ({
useFileAttachments: (...args: unknown[]) =>
mocks.useFileAttachments(...args),
}))
-vi.mock("@/hooks/use-mobile", () => ({
- useBreakpoint: () => mocks.breakpoint,
+vi.mock("@/hooks/use-hover-capable", () => ({
+ useHoverCapable: () => mocks.hoverCapable,
}))
vi.mock("@/lib/community/composer-draft", () => ({
clearComposerDraft: (...args: unknown[]) => mocks.clearDraft(...args),
@@ -236,7 +236,7 @@ describe("useComposerController", () => {
mocks.readAttachmentSession.mockReturnValue([])
mocks.appendAttachmentSession.mockReturnValue({ accepted: true, evictedScopes: 0 })
mocks.restorePendingFiles.mockResolvedValue(undefined)
- mocks.breakpoint = "desktop"
+ mocks.hoverCapable = true
})
afterEach(() => {
@@ -398,6 +398,7 @@ describe("useComposerController", () => {
const rejected = vi.fn(async () => {
throw new Error("mutation failed")
})
+ mocks.hoverCapable = false
await act(async () => {
renderer.update(
createElement(Harness, { ...props, onDeferredSubmit: rejected }),
@@ -620,8 +621,8 @@ describe("useComposerController", () => {
expect(mocks.placeholderConfigure).toHaveBeenCalledTimes(2)
})
- it("keeps one live breakpoint contract across unknown, mobile, and desktop", async () => {
- mocks.breakpoint = "unknown"
+ it("keeps one live input-capability contract across coarse and hover-capable inputs", async () => {
+ mocks.hoverCapable = false
const accept = vi.fn(() => true)
const props = acceptedProps(accept)
let renderer!: TestRenderer.ReactTestRenderer
@@ -637,34 +638,23 @@ describe("useComposerController", () => {
...overrides,
}) as unknown as KeyboardEvent
- const unknownEnter = key()
- expect(stableHandleKeyDown({} as never, unknownEnter)).toBe(false)
- expect(unknownEnter.preventDefault).not.toHaveBeenCalled()
- expect(accept).not.toHaveBeenCalled()
- expect(setDomAttribute).toHaveBeenLastCalledWith("enterkeyhint", "enter")
- expect(renderer.root.findByType("controller-probe").props.view.showSend).toBe(false)
-
- mocks.breakpoint = "mobile"
- await act(async () => {
- renderer.update(createElement(Harness, props))
- })
- const mobileEnter = key()
- expect(stableHandleKeyDown({} as never, mobileEnter)).toBe(false)
- expect(mobileEnter.preventDefault).not.toHaveBeenCalled()
+ const coarseEnter = key()
+ expect(stableHandleKeyDown({} as never, coarseEnter)).toBe(false)
+ expect(coarseEnter.preventDefault).not.toHaveBeenCalled()
expect(accept).not.toHaveBeenCalled()
expect(setDomAttribute).toHaveBeenLastCalledWith("enterkeyhint", "enter")
expect(renderer.root.findByType("controller-probe").props.view.showSend).toBe(true)
- mocks.breakpoint = "desktop"
+ mocks.hoverCapable = true
await act(async () => {
renderer.update(createElement(Harness, props))
})
- const desktopShiftEnter = key({ shiftKey: true })
- expect(stableHandleKeyDown({} as never, desktopShiftEnter)).toBe(false)
- expect(desktopShiftEnter.preventDefault).not.toHaveBeenCalled()
- const desktopEnter = key()
- expect(stableHandleKeyDown({} as never, desktopEnter)).toBe(true)
- expect(desktopEnter.preventDefault).toHaveBeenCalledOnce()
+ const fineShiftEnter = key({ shiftKey: true })
+ expect(stableHandleKeyDown({} as never, fineShiftEnter)).toBe(false)
+ expect(fineShiftEnter.preventDefault).not.toHaveBeenCalled()
+ const fineEnter = key()
+ expect(stableHandleKeyDown({} as never, fineEnter)).toBe(true)
+ expect(fineEnter.preventDefault).toHaveBeenCalledOnce()
await act(async () => {
await Promise.resolve()
await Promise.resolve()
@@ -673,7 +663,7 @@ describe("useComposerController", () => {
expect(setDomAttribute).toHaveBeenLastCalledWith("enterkeyhint", "send")
expect(renderer.root.findByType("controller-probe").props.view.showSend).toBe(false)
- mocks.breakpoint = "mobile"
+ mocks.hoverCapable = false
await act(async () => {
renderer.update(createElement(Harness, props))
})
@@ -689,8 +679,8 @@ describe("useComposerController", () => {
expect(setDomAttribute).toHaveBeenLastCalledWith("enterkeyhint", "enter")
})
- it("projects mobile send eligibility from text, pending files, and single-flight", async () => {
- mocks.breakpoint = "mobile"
+ it("projects explicit send eligibility from text, pending files, and single-flight", async () => {
+ mocks.hoverCapable = false
editor.isEmpty = true
let releaseFiles!: () => void
const fileGate = new Promise<void>((resolve) => {
diff --git a/src/web/src/components/community/messages/use-composer-controller.ts b/src/web/src/components/community/messages/use-composer-controller.ts
index 194ef8098..34e3ced26 100644
--- a/src/web/src/components/community/messages/use-composer-controller.ts
+++ b/src/web/src/components/community/messages/use-composer-controller.ts
@@ -14,7 +14,7 @@ import Placeholder from "@tiptap/extension-placeholder"
import { DOMParser as PMDOMParser } from "@tiptap/pm/model"
import { MAX_ATTACHMENTS_PER_MESSAGE, MAX_ATTACHMENT_SIZE_BYTES } from "@alook/shared"
import { useFileAttachments } from "@/hooks/use-file-attachments"
-import { useBreakpoint } from "@/hooks/use-mobile"
+import { useHoverCapable } from "@/hooks/use-hover-capable"
import {
clearComposerDraft,
readComposerDraft,
@@ -59,13 +59,13 @@ export function useComposerController(
ref: ForwardedRef<ComposerHandle>,
): ComposerViewProps {
const isForumThreadBody = mode === "forumThreadBody"
- const breakpoint = useBreakpoint()
- const breakpointRef = useRef(breakpoint)
+ const hoverCapable = useHoverCapable()
+ const hoverCapableRef = useRef(hoverCapable)
const [editorHasContent, setEditorHasContent] = useState(false)
const [sendInFlight, setSendInFlight] = useState(false)
useLayoutEffect(() => {
- breakpointRef.current = breakpoint
- }, [breakpoint])
+ hoverCapableRef.current = hoverCapable
+ }, [hoverCapable])
const attachments = useFileAttachments({ maxFileSize: MAX_ATTACHMENT_SIZE_BYTES,
maxFiles: MAX_ATTACHMENTS_PER_MESSAGE, thumbnailPolicy: "community",
draftSessionScope: isForumThreadBody ? undefined : draftKey })
@@ -160,11 +160,11 @@ export function useComposerController(
attributes: {
class: "outline-none",
enterkeyhint:
- isForumThreadBody || breakpoint !== "desktop" ? "enter" : "send",
+ isForumThreadBody || !hoverCapable ? "enter" : "send",
},
handleKeyDown: (view, event) =>
handleComposerEditorKeyDown(view, event, {
- breakpoint: breakpointRef.current,
+ hoverCapable: hoverCapableRef.current,
channelRefOpen:
suggestions.channelRefPopupRef.current.items.length > 0 &&
suggestions.channelRefPopupRef.current.command !== null,
@@ -217,7 +217,7 @@ export function useComposerController(
},
})
const enterKeyHint =
- isForumThreadBody || breakpoint !== "desktop" ? "enter" : "send"
+ isForumThreadBody || !hoverCapable ? "enter" : "send"
useLayoutEffect(() => {
editor?.view?.dom?.setAttribute("enterkeyhint", enterKeyHint)
}, [editor, enterKeyHint])
@@ -383,7 +383,7 @@ export function useComposerController(
editor,
hideAttach,
hideEmoji,
- showSend: !isForumThreadBody && breakpoint === "mobile",
+ showSend: !isForumThreadBody && !hoverCapable,
sendDisabled:
sendInFlight || (!editorHasContent && pendingFiles.length === 0),
onSend: send,
diff --git a/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts b/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts
index 97add3dc8..98d53c510 100644
--- a/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts
+++ b/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts
@@ -1,6 +1,15 @@
-import type { Page } from "@playwright/test"
+import type { Page, TestInfo } from "@playwright/test"
import { test, expect, userId } from "./_fixtures/community-fixture"
-import { composerEditable, ignoreNextDevToolsPointerCapture } from "./_fixtures/actions"
+import {
+ composerEditable,
+ ignoreNextDevToolsPointerCapture,
+ installInputCapability,
+} from "./_fixtures/actions"
+import {
+ communityFrameEvents,
+ proxyCommunityWebSockets,
+ type CapturedCommunityFrame,
+} from "./_fixtures/community-ws-proxy"
import {
seedChannel,
seedDm,
@@ -12,18 +21,105 @@ import { tid } from "./_fixtures/testids"
test.use({ viewport: { width: 390, height: 844 } })
-async function expectExplicitMobileSend({
+function hasMessageFrame(
+ frames: CapturedCommunityFrame[],
+ channelId: string,
+ messageId: string,
+) {
+ return frames.flatMap(communityFrameEvents).some((event) => (
+ event.type === "community:message.create"
+ && event.channelId === channelId
+ && event.message?.id === messageId
+ ))
+}
+
+async function expectHoverKeyboardSend({
+ page,
+ route,
+ channelId,
+ frames,
+}: {
+ page: Page
+ route: string
+ channelId: string
+ frames: CapturedCommunityFrame[]
+}) {
+ let messagePosts = 0
+ page.on("request", (request) => {
+ if (
+ request.method() === "POST"
+ && new URL(request.url()).pathname === `/api/community/channels/${channelId}/messages`
+ ) messagePosts += 1
+ })
+ await page.goto(route, { waitUntil: "commit" })
+ await ignoreNextDevToolsPointerCapture(page)
+
+ const editable = composerEditable(page)
+ const send = page.getByTestId(tid.composerSend)
+ await expect(editable).toBeVisible({ timeout: 20_000 })
+ await expect(editable).toHaveAttribute("enterkeyhint", "send")
+ await expect(send).toHaveCount(0)
+
+ await editable.evaluate((element) => {
+ ;(element as HTMLElement).dataset.e2eEditorIdentity = "stable"
+ })
+ await page.setViewportSize({ width: 1280, height: 844 })
+ await expect(editable).toHaveAttribute("data-e2e-editor-identity", "stable")
+ await expect(editable).toHaveAttribute("enterkeyhint", "send")
+ await expect(send).toHaveCount(0)
+ await page.setViewportSize({ width: 390, height: 844 })
+ await expect(editable).toHaveAttribute("data-e2e-editor-identity", "stable")
+ await expect(editable).toHaveAttribute("enterkeyhint", "send")
+ await expect(send).toHaveCount(0)
+
+ const firstLine = `narrow PC first ${Date.now()}`
+ const secondLine = "narrow PC second"
+ await editable.click()
+ await editable.pressSequentially(firstLine)
+ await page.keyboard.press("Shift+Enter")
+ await editable.pressSequentially(secondLine)
+ await expect(editable.locator("br")).toHaveCount(1)
+ await expect(editable).toContainText(firstLine)
+ await expect(editable).toContainText(secondLine)
+ expect(messagePosts).toBe(0)
+
+ const responsePromise = page.waitForResponse((response) => (
+ response.request().method() === "POST"
+ && new URL(response.url()).pathname === `/api/community/channels/${channelId}/messages`
+ ))
+ await page.keyboard.press("Enter")
+ const response = await responsePromise
+ expect(response.status()).toBe(201)
+ const payload = await response.json() as { message: { id: string } }
+ await expect(page.getByTestId(tid.message(payload.message.id))).toHaveCount(1)
+ await expect(page.getByTestId(tid.message(payload.message.id))).toContainText(firstLine)
+ await expect(page.getByTestId(tid.message(payload.message.id))).toContainText(secondLine)
+ await expect(editable).toHaveText("")
+ expect(messagePosts).toBe(1)
+ await expect.poll(() => hasMessageFrame(frames, channelId, payload.message.id)).toBe(true)
+
+ await page.reload({ waitUntil: "commit" })
+ await expect(composerEditable(page)).toBeVisible({ timeout: 20_000 })
+ await expect(page.getByTestId(tid.message(payload.message.id))).toContainText(firstLine)
+ expect(messagePosts).toBe(1)
+}
+
+async function expectExplicitTouchSend({
page,
route,
channelId,
label,
+ frames,
exerciseResize = false,
+ testInfo,
}: {
page: Page
route: string
channelId: string
label: string
+ frames: CapturedCommunityFrame[]
exerciseResize?: boolean
+ testInfo?: TestInfo
}) {
let messagePosts = 0
page.on("request", (request) => {
@@ -41,16 +137,28 @@ async function expectExplicitMobileSend({
await expect(editable).toHaveAttribute("enterkeyhint", "enter")
await expect(send).toBeVisible()
await expect(send).toBeDisabled()
+ await expect(send).toHaveCSS("width", "32px")
+ await expect(send).toHaveCSS("height", "32px")
+ await expect(send).toHaveCSS("border-radius", "8px")
+ await expect(send).toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+ await expect(send.locator("svg")).toHaveAttribute("viewBox", "0 0 24 24")
+
+ if (testInfo) {
+ await testInfo.attach("390-touch-send-disabled.png", {
+ body: await page.screenshot(),
+ contentType: "image/png",
+ })
+ }
if (exerciseResize) {
await editable.evaluate((element) => {
;(element as HTMLElement).dataset.e2eEditorIdentity = "stable"
})
- await page.setViewportSize({ width: 640, height: 844 })
+ await page.setViewportSize({ width: 1280, height: 844 })
await expect(editable).toHaveAttribute("data-e2e-editor-identity", "stable")
- await expect(editable).toHaveAttribute("enterkeyhint", "send")
- await expect(send).toBeHidden()
- await page.setViewportSize({ width: 639, height: 844 })
+ await expect(editable).toHaveAttribute("enterkeyhint", "enter")
+ await expect(send).toBeVisible()
+ await page.setViewportSize({ width: 390, height: 844 })
await expect(editable).toHaveAttribute("data-e2e-editor-identity", "stable")
await expect(editable).toHaveAttribute("enterkeyhint", "enter")
await expect(send).toBeVisible()
@@ -76,9 +184,17 @@ async function expectExplicitMobileSend({
await expect(editable).toContainText(firstLine)
await expect(editable).toContainText(secondLine)
await expect(send).toBeEnabled()
+ await expect(send).not.toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
expect(messagePosts).toBe(0)
await expect(page.locator("[data-msg-id]").filter({ hasText: firstLine })).toHaveCount(0)
+ if (testInfo) {
+ await testInfo.attach("390-touch-send-active.png", {
+ body: await page.screenshot(),
+ contentType: "image/png",
+ })
+ }
+
const responsePromise = page.waitForResponse((response) => (
response.request().method() === "POST"
&& new URL(response.url()).pathname === `/api/community/channels/${channelId}/messages`
@@ -97,50 +213,78 @@ async function expectExplicitMobileSend({
await expect(editable).toHaveText("")
await expect(send).toBeDisabled()
expect(messagePosts).toBe(1)
+ await expect.poll(() => hasMessageFrame(frames, channelId, payload.message.id)).toBe(true)
+
+ await page.reload({ waitUntil: "commit" })
+ await expect(composerEditable(page)).toBeVisible({ timeout: 20_000 })
+ await expect(page.getByTestId(tid.message(payload.message.id))).toContainText(firstLine)
+ expect(messagePosts).toBe(1)
}
-test.describe.serial("mobile composer explicit send", () => {
+test.describe.serial("composer send by input capability", () => {
let serverId: string
let channelId: string
let threadId: string
let dmId: string
test.beforeAll(async () => {
- serverId = await seedServer("alice", `mobile-send-${Date.now()}`)
- channelId = await seedChannel("alice", serverId, "mobile-send")
- const openerId = await seedMessage("alice", channelId, "mobile send thread opener")
- threadId = await seedThread("alice", openerId, "mobile-send-thread")
+ serverId = await seedServer("alice", `capability-send-${Date.now()}`)
+ channelId = await seedChannel("alice", serverId, "capability-send")
+ const openerId = await seedMessage("alice", channelId, "capability send thread opener")
+ threadId = await seedThread("alice", openerId, "capability-send-thread")
dmId = await seedDm("alice", userId("bob"))
})
- test("text channel Enter stays multiline and the button sends once", async ({ asUser }) => {
- const { page } = await asUser("alice")
- await expectExplicitMobileSend({
+ test("narrow hover-capable PC keeps Enter send and Shift+Enter newline through resize", async ({ asUser }) => {
+ const { page, context } = await asUser("alice")
+ await installInputCapability(page, true)
+ const proxy = await proxyCommunityWebSockets(context)
+ await expectHoverKeyboardSend({
+ page,
+ route: `/c/channels/${serverId}/${channelId}`,
+ channelId,
+ frames: proxy.frames,
+ })
+ })
+
+ test("touch channel keeps multiline Enter and the explicit button sends once", async ({ asUser }, testInfo) => {
+ const { page, context } = await asUser("alice")
+ await installInputCapability(page, false)
+ const proxy = await proxyCommunityWebSockets(context)
+ await expectExplicitTouchSend({
page,
route: `/c/channels/${serverId}/${channelId}`,
channelId,
label: "channel",
+ frames: proxy.frames,
exerciseResize: true,
+ testInfo,
})
})
- test("child thread Enter stays multiline and the button targets the child", async ({ asUser }) => {
- const { page } = await asUser("alice")
- await expectExplicitMobileSend({
+ test("touch child thread button targets the child", async ({ asUser }) => {
+ const { page, context } = await asUser("alice")
+ await installInputCapability(page, false)
+ const proxy = await proxyCommunityWebSockets(context)
+ await expectExplicitTouchSend({
page,
route: `/c/channels/${serverId}/${threadId}`,
channelId: threadId,
label: "thread",
+ frames: proxy.frames,
})
})
- test("DM Enter stays multiline and the button targets the DM channel", async ({ asUser }) => {
- const { page } = await asUser("alice")
- await expectExplicitMobileSend({
+ test("touch DM button targets the DM channel", async ({ asUser }) => {
+ const { page, context } = await asUser("alice")
+ await installInputCapability(page, false)
+ const proxy = await proxyCommunityWebSockets(context)
+ await expectExplicitTouchSend({
page,
route: `/c/me/${dmId}`,
channelId: dmId,
label: "dm",
+ frames: proxy.frames,
})
})
})
diff --git a/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts b/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts
index 92266fe57..bd99d8256 100644
--- a/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts
+++ b/src/web/src/test/e2e-ui/39-mobile-message-interactions.spec.ts
@@ -5,6 +5,7 @@ import {
expectMessageVisible,
gotoAfterUserWsAuth,
ignoreNextDevToolsPointerCapture,
+ installInputCapability,
} from "./_fixtures/actions"
import {
memberInfo,
@@ -22,27 +23,6 @@ import {
} 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,
@@ -350,7 +330,7 @@ test("mobile reply, avatar mention, and typing rail keep exact backend and WS id
const alice = await asUser("alice")
const bob = await asUser("bob")
- await installTouchPrimaryPointer(alice.page)
+ await installInputCapability(alice.page, false)
await alice.page.setViewportSize({ width: 390, height: 844 })
await bob.page.setViewportSize({ width: 390, height: 844 })
const aliceProxy = await proxyCommunityWebSockets(alice.context)
@@ -542,6 +522,10 @@ test("mobile reply, avatar mention, and typing rail keep exact backend and WS id
frameHasMessage(frame, channelId, typingWsReadyId)
)), { timeout: 20_000 }).toBe(true)
await expect(alice.page.getByTestId(tid.message(typingWsReadyId))).toBeVisible()
+ await alice.page.getByTestId(tid.messageScroller).evaluate((element) => {
+ element.scrollTop = element.scrollHeight
+ element.dispatchEvent(new Event("scroll"))
+ })
const channelScrollerBeforeTyping = await settledScrollerGeometry(alice.page)
const beforeTypingSeq = await latestSeq(alice.page, channelId)
const bobEditable = composerEditable(bob.page)
diff --git a/src/web/src/test/e2e-ui/43-composer-attachment-drafts.spec.ts b/src/web/src/test/e2e-ui/43-composer-attachment-drafts.spec.ts
index 0b64163ee..84e23eaf8 100644
--- a/src/web/src/test/e2e-ui/43-composer-attachment-drafts.spec.ts
+++ b/src/web/src/test/e2e-ui/43-composer-attachment-drafts.spec.ts
@@ -1,6 +1,6 @@
import type { Page } from "@playwright/test"
import { test, expect, userId } from "./_fixtures/community-fixture"
-import { composerEditable } from "./_fixtures/actions"
+import { composerEditable, installInputCapability } from "./_fixtures/actions"
import { seedChannel, seedDm, seedMessage, seedServer, seedThread } from "./_fixtures/seed"
import { tid } from "./_fixtures/testids"
@@ -212,6 +212,7 @@ test.describe.serial("same-tab Community attachment drafts", () => {
test("mobile restores scoped attachments, sends explicitly once, and reload restores text only", async ({ asUser }) => {
test.setTimeout(120_000)
const { page } = await asUser("alice")
+ await installInputCapability(page, false)
await page.setViewportSize({ width: 390, height: 844 })
const channelA = `/c/channels/${serverId}/${channelAId}`
await page.goto(channelA, { waitUntil: "commit" })
diff --git a/src/web/src/test/e2e-ui/_fixtures/actions.ts b/src/web/src/test/e2e-ui/_fixtures/actions.ts
index fea0e0b94..5a4e01690 100644
--- a/src/web/src/test/e2e-ui/_fixtures/actions.ts
+++ b/src/web/src/test/e2e-ui/_fixtures/actions.ts
@@ -1,6 +1,29 @@
import { type Page, type WebSocket, expect } from "@playwright/test"
import { tid } from "./testids"
+const HOVER_FINE_QUERY = "(hover: hover) and (pointer: fine)"
+
+export async function installInputCapability(
+ page: Page,
+ hoverCapable: boolean,
+): Promise<void> {
+ await page.addInitScript(({ query, matches }) => {
+ const nativeMatchMedia = window.matchMedia.bind(window)
+ window.matchMedia = (candidate: string) => candidate === query
+ ? {
+ matches,
+ media: candidate,
+ onchange: null,
+ addListener: () => {},
+ removeListener: () => {},
+ addEventListener: () => {},
+ removeEventListener: () => {},
+ dispatchEvent: () => false,
+ } as MediaQueryList
+ : nativeMatchMedia(candidate)
+ }, { query: HOVER_FINE_QUERY, matches: hoverCapable })
+}
+
export async function gotoAfterUserWsAuth(page: Page, url: string): Promise<void> {
const frameHandlers = new Map<WebSocket, (event: { payload: string | Buffer }) => void>()
let cleanup = () => {}
@@ -114,14 +137,12 @@ export function composerEditable(page: Page) {
return page.getByTestId(tid.composerInput).locator("[contenteditable='true']")
}
-// Type into the TipTap composer and submit through the control for the current
-// breakpoint: the explicit send button below 640px, or Enter on desktop.
export async function sendMessage(page: Page, text: string): Promise<void> {
const editable = composerEditable(page)
await editable.click()
await editable.pressSequentially(text)
- if ((page.viewportSize()?.width ?? 640) < 640) {
- const sendButton = page.getByTestId(tid.composerSend)
+ const sendButton = page.getByTestId(tid.composerSend)
+ if (await sendButton.isVisible()) {
await expect(sendButton).toBeVisible()
await expect(sendButton).toBeEnabled()
await ignoreNextDevToolsPointerCapture(page)