refactor(editor): one press machine for clicks, drags and taps on the drawing
press.ts (pure: slop per pointer kind, nearest handle, press target, click and drag actions, double click, stepPress) is now the editor canvas's only decider; useCanvasGestures no longer uses clickHandler, useEmptyTap, swallowClick nor useMoveGesture (deleted), and the box has no onClick. canPan = dragAction(press target).type === 'pan' at pointer-down; framing keys only when the box itself is the target. workStore.ts holds the U2 work with stale stamps: dropStale on every documentText change, reset on a new session (editorStore subscription). The catalogue keeps useFraming defaults and useEmptyTap, unchanged. Named change (A13): a finger drag on a selected zone's (or circle link's) interior moves nothing; the selected point is its own handle and still moves by any pointer. Second observable change: touch and pen taps are decided at the pointer-up from the press target, no longer from the following click (no browser touch adjustment toward a marker). tests/setup.ts: happy-dom has no elementsFromPoint; a shim answers the pointerdown target and its ancestors. Rewritten tests (editor-annotations-tab.test.tsx, D6b): - "a touch tap deselects in its own click, not at the pointer-up" -> "a touch tap deselects at the pointer-up" (deselected after pointerup) - "a touch tap whose click lands on a marker (adjustment) selects that marker" -> "a touch tap is decided by its press: a click adjusted toward a marker selects nothing" (deselected, announced, marker b not current) - "a pen tap deselects in its own click, like a touch tap" -> "a pen tap deselects at the pointer-up, like a mouse tap" - "a pen tap whose click lands on a marker selects that marker" -> "a pen tap is decided by its press: a click landing on a marker selects nothing" Added: "a finger drags the selected point (its handle), never a selected zone (A13)". Drive-only changes, assertions unchanged: canvas fireEvent.click(x, y) -> pressAt (pointerdown + pointerup) in the tab suite (C26, tracing, paths, H3, H6, H8, filter reselect), editor-keep-alive and editor-sections; drag moves carry buttons: 1 (C34, polygon block move, H8 lostpointercapture and read-only, editor-no-loss drag in flight), since a move without a button is a hover.
This commit is contained in:
1 parent
5ca2b7e3ad
commit
08d266c89f
18 files changed
+1341
-311
No files matched your search
@@ -0,0 +1,52 @@
|
||||
/** U2 Task 2: the annotation work store and its stale stamp (R-13). */
|
||||
import { afterEach, describe, expect, it } from 'vitest'
|
||||
import {
|
||||
dropStale,
|
||||
resetWork,
|
||||
useAnnotationWork,
|
||||
type Preview,
|
||||
} from '@/editor/annotations/workStore'
|
||||
import { useEditorStore } from '@/editor/state/editorStore'
|
||||
|
||||
const preview = (base: string): Preview => ({
|
||||
annotationId: 'a',
|
||||
geometry: { type: 'circle', cx: 1, cy: 2, r: 3 },
|
||||
base,
|
||||
source: 'move',
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
resetWork()
|
||||
useEditorStore.setState({ documentText: '', session: 0 })
|
||||
})
|
||||
|
||||
describe('dropStale (R-13)', () => {
|
||||
it('drops what was computed on another text, keeps what was computed on this one', () => {
|
||||
useAnnotationWork.setState({
|
||||
preview: preview('one'),
|
||||
chosen: { annotationId: 'a', vertex: 1, base: 'one' },
|
||||
})
|
||||
dropStale('one')
|
||||
expect(useAnnotationWork.getState().preview).toEqual(preview('one'))
|
||||
expect(useAnnotationWork.getState().chosen).not.toBeNull()
|
||||
dropStale('two')
|
||||
expect(useAnnotationWork.getState().preview).toBeNull()
|
||||
expect(useAnnotationWork.getState().chosen).toBeNull()
|
||||
})
|
||||
|
||||
it('runs on every document change of the editor store', () => {
|
||||
useAnnotationWork.setState({ preview: preview('one') })
|
||||
useEditorStore.setState({ documentText: 'one' })
|
||||
expect(useAnnotationWork.getState().preview).not.toBeNull()
|
||||
useEditorStore.setState({ documentText: 'two' })
|
||||
expect(useAnnotationWork.getState().preview).toBeNull()
|
||||
})
|
||||
|
||||
it('a new session (another sheet, the editor closed) resets the work', () => {
|
||||
useAnnotationWork.setState({
|
||||
mode: { kind: 'move', annotationId: 'a', started: true },
|
||||
})
|
||||
useEditorStore.setState({ session: useEditorStore.getState().session + 1 })
|
||||
expect(useAnnotationWork.getState().mode).toBeNull()
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user