From 7a45f1d8853fe240c1bf946c1f36667d8219cd1e Mon Sep 17 00:00:00 2001 From: bchanot Date: Tue, 17 Nov 2026 18:10:24 +0100 Subject: [PATCH] fix(editor): message line lifecycle, own row, sound no-shift check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task 3 review, fix round 1. - The gesture message closes for good on any document or history change (store subscription): undo then redo no longer revives it. - Hover and focus hold only the message they were taken on: after « Défaire » the next message expires. - An accepted drop clears the strip's refusal hint again. - Controller ruling: the message has its own fixed row under the add buttons, column width; a refused gesture's full text also shows in the strip notice (red, aria-hidden copy of the row's alert). - expectNoShift: native requestAnimationFrame kept before page.clock (keepNativeFrames), every part box asserted non-null, message row measured; the e2e checks the message is not truncated. No assertion removed; the refused-drop unit test gains the strip copy. --- apps/app/e2e/shell/editor-annotations.spec.ts | 9 ++- apps/app/e2e/support/layout.ts | 41 +++++++++-- .../editor/annotations/EditStrip.tsx | 5 +- .../annotations/EditableAnnotations.tsx | 20 +++-- .../editor/annotations/GestureMessage.tsx | 23 +++--- .../editor/annotations/KeyboardAdd.tsx | 2 +- .../editor/annotations/useGestureMessage.ts | 73 +++++++++++++------ .../src/editor/annotations/usePlacement.ts | 4 +- .../unit/editor-annotations-tab.test.tsx | 70 ++++++++++++++++++ 9 files changed, 198 insertions(+), 49 deletions(-) diff --git a/apps/app/e2e/shell/editor-annotations.spec.ts b/apps/app/e2e/shell/editor-annotations.spec.ts index d53d2dca..bc86807a 100644 --- a/apps/app/e2e/shell/editor-annotations.spec.ts +++ b/apps/app/e2e/shell/editor-annotations.spec.ts @@ -22,7 +22,7 @@ import { standardShape, UNSAVED_LINE, } from '../support/editor' -import { expectNoShift } from '../support/layout' +import { expectNoShift, keepNativeFrames } from '../support/layout' // V1-2.6 A3 (contract C7, C8, C21): points, zones and links by clicks and by keyboard, // move by drag, numeric edits, undo and redo, then the save that carries them. @@ -300,6 +300,7 @@ test.describe('editor annotations (A3)', () => { async function openWithPoint(page: Page, width: number) { await page.setViewportSize({ width, height: 800 }) // Installed before any timer: the message's 6 s run on this clock (fast-forwarded below). + await keepNativeFrames(page) await page.clock.install() const actor = await editorActor('fr') const point = pointOf('p-a', 'main', { cx: 500, cy: 300, r: 40 }, 'Pt A') @@ -350,6 +351,12 @@ test.describe('editor annotations (A3)', () => { }, swaps, ) + // Its own row, the column's width: the message is read whole. + const cut = await line(page) + .locator('span') + .first() + .evaluate((span) => span.scrollWidth > span.clientWidth) + expect(cut, 'the message is cut short').toBe(false) // Its expiry, 6 s later. await expectNoShift(page, async () => { await page.clock.fastForward(6_100) diff --git a/apps/app/e2e/support/layout.ts b/apps/app/e2e/support/layout.ts index c9c1cdd8..9e8b7303 100644 --- a/apps/app/e2e/support/layout.ts +++ b/apps/app/e2e/support/layout.ts @@ -1,8 +1,8 @@ /** * The no-shift probe of U2 (adjustment A14, plan Task 3): a state change of the annotations - * tab moves no box. The boxes of the canvas, the strip, the aside and the draft header, - * the page's scroll height, its scrollbar gutter and its client width are read before and - * after `act`; a layout-shift observer adds up every entry in between, the ones following + * tab moves no box. The boxes of the canvas, the strip, the message row, the aside and the + * draft header, the page's scroll height, its scrollbar gutter and its client width are read + * before and after `act`; a layout-shift observer adds up every entry in between, the ones following * an input included (a message appearing after a drop is still a shift). */ import { expect, type Page } from '@playwright/test' @@ -31,6 +31,7 @@ interface Snapshot { const PARTS = { canvas: '[data-testid="annotation-canvas"]', strip: '[data-testid="edit-strip"]', + line: '[data-testid="gesture-line"]', aside: '[data-testid="editor-tab-annotations"] aside', header: 'header:has(> nav + div > h1)', } as const @@ -62,6 +63,23 @@ function snapshot(page: Page): Promise { interface ShiftScope { __shift: { total: number; moved: string[] } __shiftObserver?: PerformanceObserver + /** The browser's own requestAnimationFrame, kept before `page.clock` replaces it. */ + __nativeRaf?: (callback: FrameRequestCallback) => number +} + +/** + * Keeps the native requestAnimationFrame: call it before `page.clock.install()`, whose fake + * frames would let the two-frame wait end before the real layout (and its shift) happens. + */ +export async function keepNativeFrames(page: Page): Promise { + await page.addInitScript(() => { + const scope = window as unknown as ShiftScope + const raf = window.requestAnimationFrame + // Kept only when this script ran before the clock's (else the probe would wait on fakes). + if (String(raf).includes('[native code]')) + scope.__nativeRaf = raf.bind(window) + else throw new Error('keepNativeFrames ran after page.clock.install()') + }) } /** Starts summing layout-shift entries; read back with `shiftTotal`. */ @@ -100,10 +118,17 @@ function observeShifts(page: Page, asideExempt: boolean): Promise { /** Two frames for layout to settle, then the pending entries and the total. */ function shiftTotal(page: Page): Promise { return page.evaluate(async () => { - await new Promise((done) => - requestAnimationFrame(() => requestAnimationFrame(done)), - ) const scope = window as unknown as ShiftScope + const faked = !String(window.requestAnimationFrame).includes( + '[native code]', + ) + if (faked && !scope.__nativeRaf) { + throw new Error( + 'page.clock fakes the frames: call keepNativeFrames first', + ) + } + const frame = scope.__nativeRaf ?? window.requestAnimationFrame.bind(window) + await new Promise((done) => frame(() => frame(done))) const observer = scope.__shiftObserver! const pending = observer.takeRecords() observer.disconnect() @@ -125,6 +150,10 @@ export async function expectNoShift( exempt: readonly ShiftExemption[] = [], ): Promise { const before = await snapshot(page) + // A selector that stops matching would compare null with null: every part must be there. + for (const [name, box] of Object.entries(before.boxes)) { + expect(box, `${name} box before the act`).not.toBeNull() + } const loose = exempt.includes('aside-content') await observeShifts(page, loose) await act() diff --git a/apps/app/src/components/editor/annotations/EditStrip.tsx b/apps/app/src/components/editor/annotations/EditStrip.tsx index f8cfb50d..a7cf9b54 100644 --- a/apps/app/src/components/editor/annotations/EditStrip.tsx +++ b/apps/app/src/components/editor/annotations/EditStrip.tsx @@ -12,6 +12,8 @@ export interface StripNotice { /** How many more of the same kind are not shown (« +n »). */ more?: number link?: { label: string; onClick(): void } + /** Already announced elsewhere (the gesture line's alert): shown, not announced twice. */ + quiet?: boolean } /** @@ -86,7 +88,8 @@ function Notice({ notice }: { notice: StripNotice }) { const error = notice.tone === 'error' return (

- +

s.locale) - const notice = useStripNotice(scene) + const notice = useStripNotice(scene, message.message) const { ui, selected, doc } = scene return ( 0) { return { tone: 'error', text: issues[0]!, more: issues.length - 1 } } diff --git a/apps/app/src/components/editor/annotations/GestureMessage.tsx b/apps/app/src/components/editor/annotations/GestureMessage.tsx index 555c6e12..94300b60 100644 --- a/apps/app/src/components/editor/annotations/GestureMessage.tsx +++ b/apps/app/src/components/editor/annotations/GestureMessage.tsx @@ -4,9 +4,8 @@ import type { GestureMessages } from '@/editor/annotations/useGestureMessage' import { canUndo, useEditorStore } from '@/editor/state/editorStore' import { useT } from '@/i18n/useT' -// Compact: at 1 280 px the column leaves about 145 px beside the three add buttons. const PILL = - 'inline-flex h-9 max-w-full items-center gap-1.5 rounded-md px-2 text-xs' + 'inline-flex h-9 max-w-full items-center gap-2 rounded-md px-3 text-sm' /** The header's undo (T15): the same store step, under the same conditions. */ function undoLast(readOnly: boolean): void { @@ -15,9 +14,10 @@ function undoLast(readOnly: boolean): void { } /** - * The fixed line under the drawing (A14, R-2): the add buttons on the left, the message on - * the right, one line truncated. Its height never changes, so a message showing or leaving - * moves nothing. The status region (polite) is always mounted; a refusal is an alert of its own. + * Under the drawing (A14, R-2): the add buttons, then the message on a row of its own, the + * drawing column's full width, one line truncated. The row is always there at a fixed + * height, so a message showing or leaving moves nothing. The status region (polite) is + * always mounted; a refusal is an alert of its own (its full text is also in the strip). */ export default function GestureMessage({ messages, @@ -27,18 +27,16 @@ export default function GestureMessage({ children: ReactNode }) { return ( -
-
{children}
+ <> + {children}
-
+ ) } @@ -64,6 +62,7 @@ function Message({ messages }: { messages: GestureMessages }) { {message.undo && !error && ( <> +