fix(anatomy): V1-2.2 the visible wins on the editor canvas

Owner decision 2026-11-01. The canvas paints and hits every point hitbox,
then every zone and trigger, then every visible twin, which captures on
what it paints; a junction's disc is no longer taken by the zone drawn
after it. The PDF view keeps the document order and its bytes. Click
spec: the five fixme run unmarked, six projects incl. a 320 px phone.
This commit is contained in:
bchanot committed 2026-11-01 00:56:11 +01:00
1 parent e67715025c
commit 9c606aa567
13 files changed
+504 -64

No files matched your search

+14 -1
View File
@@ -42,7 +42,8 @@ export const PROJECTS: Project[] = [
/**
* The canvas click proof (V1-2.2, e2e/ui/canvas-clicks.spec.ts) also runs on Firefox and
* WebKit, desktop, and on the WebKit phone, when the pinned engine is installed
* WebKit, desktop, and on the WebKit phone, when the pinned engine is installed, and on a
* 320 px Chromium phone
* (`playwright install firefox webkit`, no sudo, never `--with-deps`). A missing engine is
* named in the run's output, never passed silently.
*/
@@ -55,6 +56,18 @@ function installed(name: string, executable: string): boolean {
}
export const CLICK_PROJECTS: Project[] = [
// The smallest preview the markers' visible size is measured on (owner decision 2026-11-01).
{
name: 'chromium-320',
testMatch: CANVAS_CLICKS,
use: {
...devices['Desktop Chrome'],
viewport: { width: 320, height: 568 },
deviceScaleFactor: 2,
isMobile: true,
hasTouch: true,
},
},
...(installed('firefox', firefox.executablePath())
? [
{
+231 -25
View File
@@ -6,11 +6,7 @@ import type { Page } from '@playwright/test'
// clicks (taps on the phone project) on the bundled equine sheet in AnatomyCanvas
// (e2e/harness/canvas.tsx); run on Chromium, Firefox and WebKit when installed.
/**
* The points of the equine main view whose visible disc no other marker covers, in document
* order. The three vertebral junctions sit on the edge of a zone painted after them: part of
* their disc records the zone (pre-existing, owner decision, see the fixme below).
*/
/** The points of the equine main view, in document order. */
const POINTS = [
'hind-fetlock',
'hock',
@@ -23,6 +19,11 @@ const POINTS = [
'fore-fetlock',
'fore-sesamoids',
]
/**
* The vertebral junctions sit on the edge of a zone. Until the canvas painted its markers in
* three passes (« the visible wins », owner decision 2026-11-01) the zone, drawn after them,
* took up to half of their disc.
*/
const JUNCTIONS = ['l6-s1', 't18-l1', 'c7-t1']
const DRAWINGS = ['plain', 'giant-stroke', 'invisible-stroke', 'hidden-stroke']
@@ -31,7 +32,9 @@ type Point = { x: number; y: number }
async function open(page: Page, drawing: string) {
await page.goto(`/e2e/harness/canvas.html?drawing=${drawing}`)
await expect(
page.locator('[data-testid="anatomy-canvas"] [data-anno-id="hock"]').first(),
page
.locator('[data-testid="anatomy-canvas"] [data-anno-id="hock"]')
.first(),
).toBeAttached()
}
@@ -66,16 +69,24 @@ async function clickRecords(page: Page, at: Point, touch = false) {
test.describe('canvas clicks', () => {
for (const drawing of DRAWINGS) {
test(`a click on the hock records the hock (${drawing})`, async ({ page }, info) => {
test(`a click on the hock records the hock (${drawing})`, async ({
page,
}, info) => {
await open(page, drawing)
const touch = info.project.use.hasTouch === true
expect(await clickRecords(page, await centreOf(page, 'hock'), touch)).toEqual(['hock'])
expect(
await clickRecords(page, await centreOf(page, 'hock'), touch),
).toEqual(['hock'])
})
test(`every point clear of the zones records itself (${drawing})`, async ({ page }) => {
test(`every point clear of the zones records itself (${drawing})`, async ({
page,
}) => {
await open(page, drawing)
for (const id of POINTS) {
expect(await clickRecords(page, await centreOf(page, id)), id).toEqual([id])
expect(await clickRecords(page, await centreOf(page, id)), id).toEqual([
id,
])
}
})
@@ -96,7 +107,7 @@ test.describe('canvas clicks', () => {
})
}
test('two close points each record themselves, their shared edge goes to the later one', async ({
test('two close points each record themselves, the gap between their discs goes to the later hitbox', async ({
page,
}) => {
await open(page, 'giant-stroke')
@@ -104,30 +115,225 @@ test.describe('canvas clicks', () => {
const sesamoids = await centreOf(page, 'fore-sesamoids')
expect(await clickRecords(page, fetlock)).toEqual(['fore-fetlock'])
expect(await clickRecords(page, sesamoids)).toEqual(['fore-sesamoids'])
// Halfway, outside both visible discs and inside both hitboxes: document order, the
// later marker is on top. One id, never two.
const half = { x: (fetlock.x + sesamoids.x) / 2, y: (fetlock.y + sesamoids.y) / 2 }
expect(await clickRecords(page, half)).toEqual(['fore-sesamoids'])
// On the perpendicular bisector, halfway between the visible discs' edge and the
// hitboxes' edge: outside both discs, inside both hitboxes, the later hitbox on top.
const twin = await page
.locator('[data-anno-id="fore-fetlock"]')
.last()
.boundingBox()
const hitbox = await page
.locator('[data-anno-id="fore-fetlock"]')
.first()
.boundingBox()
if (!twin || !hitbox) throw new Error('fore-fetlock has no box')
const [disc, ring] = [twin.width / 2, hitbox.width / 2]
const span = { x: sesamoids.x - fetlock.x, y: sesamoids.y - fetlock.y }
const half = Math.hypot(span.x, span.y) / 2
const reach = Math.sqrt(((disc + ring) / 2) ** 2 - half ** 2)
const at = {
x: (fetlock.x + sesamoids.x) / 2 - (span.y / (2 * half)) * reach,
y: (fetlock.y + sesamoids.y) / 2 + (span.x / (2 * half)) * reach,
}
// WebKit snaps a real press to whole pixels: below 1.5 px of margin on each side the
// browser's own hit test answers, at the exact point. One id, never two.
if ((ring - disc) / 2 >= 1.5) {
expect(await clickRecords(page, at)).toEqual(['fore-sesamoids'])
} else {
const hit = await page.evaluate(
({ x, y }) =>
document
.elementFromPoint(x, y)
?.closest('[data-anno-id]')
?.getAttribute('data-anno-id'),
at,
)
expect(hit).toBe('fore-sesamoids')
}
})
test('a click on a vertebral junction records the junction', async ({ page }) => {
test.fixme(
true,
'V1-2.2 finding: the zones are painted and hit after the points; c7-t1 records « thoracic » at its centre in Firefox and WebKit, and up to half of each junction disc records a zone in every engine (owner decision on the capture order)',
)
test('a click on a vertebral junction records the junction', async ({
page,
}, info) => {
await open(page, 'plain')
for (const id of JUNCTIONS) {
expect(await clickRecords(page, await centreOf(page, id)), id).toEqual([id])
const touch = info.project.use.hasTouch === true
for (const id of [...JUNCTIONS, 'fore-fetlock']) {
const centre = await centreOf(page, id)
expect(await clickRecords(page, centre, touch), id).toEqual([id])
// Four points towards the edge of the visible disc, on the zone side and the other ones.
const box = await page
.locator(`[data-testid="anatomy-canvas"] [data-anno-id="${id}"]`)
.last()
.boundingBox()
if (!box) throw new Error(`${id} has no box`)
// A real press is snapped to whole pixels by WebKit (taps and clicks, measured
// 2026-11-01): 80 % of the radius, at most the radius less 1.5 px.
const radius = box.width / 2
const reach = Math.min(radius * 0.8, radius - 1.5)
for (const [dx, dy] of [
[0, -1],
[1, 0],
[0, 1],
[-1, 0],
] as const) {
const at = { x: centre.x + dx * reach, y: centre.y + dy * reach }
expect(
await clickRecords(page, at, touch),
`${id} ${dx},${dy}`,
).toEqual([id])
}
}
})
test('every visible disc records its point on its whole surface', async ({
page,
}) => {
await open(page, 'plain')
expect(await page.evaluate(sampleDiscs), 'main').toEqual({})
await page.goto('/e2e/harness/canvas.html?view=head')
await expect(
page
.locator('[data-testid="anatomy-canvas"] [data-anno-id="atm"]')
.first(),
).toBeAttached()
expect(await page.evaluate(sampleDiscs), 'head').toEqual({})
})
test('every zone records itself wherever no disc covers it', async ({
page,
}) => {
await open(page, 'plain')
const missed = await page.evaluate(sampleZones)
expect(missed).toEqual({})
})
// @phone: the desktop projects leave it out (grepInvert), the touch projects run it.
test('a tap on the hock records the hock @phone', async ({ page }) => {
for (const drawing of DRAWINGS) {
await open(page, drawing)
expect(await clickRecords(page, await centreOf(page, 'hock'), true), drawing).toEqual([
'hock',
])
expect(
await clickRecords(page, await centreOf(page, 'hock'), true),
drawing,
).toEqual(['hock'])
}
})
})
/**
* In the page: the topmost visible disc decides. Samples every visible twin of the layer
* inside 95 % of its radius (anti-aliasing aside), every 2 units; the expected id is the last
* twin in document order whose disc holds the sample. Answers the twins that missed, with
* their counts.
*/
function sampleDiscs(): Record<string, string> {
const svg = document.querySelector(
'[data-testid="anatomy-canvas"] svg',
) as SVGSVGElement
const ctm = svg.getScreenCTM()
if (!ctm) throw new Error('no CTM')
const layer = svg.lastElementChild as SVGGElement
const twins = Array.from(layer.children).filter(
(k) => k.tagName === 'circle' && k.getAttribute('fill') !== 'transparent',
) as SVGCircleElement[]
const disc = (t: SVGCircleElement) => ({
id: t.getAttribute('data-anno-id') ?? '',
cx: t.cx.baseVal.value,
cy: t.cy.baseVal.value,
r: t.r.baseVal.value,
})
const discs = twins.map(disc)
const who = (x: number, y: number) => {
const p = new DOMPoint(x, y).matrixTransform(ctm)
return document
.elementFromPoint(p.x, p.y)
?.closest('[data-anno-id]')
?.getAttribute('data-anno-id')
}
const missed: Record<string, string> = {}
for (const d of discs) {
let n = 0
let own = 0
const reach = d.r * 0.95
for (let dx = -reach; dx <= reach; dx += 2) {
for (let dy = -reach; dy <= reach; dy += 2) {
if (Math.hypot(dx, dy) > reach) continue
const x = d.cx + dx
const y = d.cy + dy
const top = discs
.filter((o) => Math.hypot(x - o.cx, y - o.cy) <= o.r)
.pop()
n++
if (who(x, y) === top?.id) own++
}
}
if (own < n) missed[d.id] = `${own}/${n}`
}
return missed
}
/**
* In the page: every filled shape of the layer (zones, trigger), sampled every 4 units inside
* its fill, 2 CSS pixels from its edges; a sample counts where no visible disc lies within 2 CSS
* pixels and no later shape holds it in its fill or its stroke. Answers the shapes that missed, with their counts.
*/
function sampleZones(): Record<string, string> {
const svg = document.querySelector(
'[data-testid="anatomy-canvas"] svg',
) as SVGSVGElement
const ctm = svg.getScreenCTM()
if (!ctm) throw new Error('no CTM')
const margin = 2 / ctm.a
const layer = svg.lastElementChild as SVGGElement
const kids = Array.from(layer.children) as SVGGeometryElement[]
const twins = kids.filter(
(k) =>
k.tagName === 'circle' &&
k.getAttribute('pointer-events') === 'visiblePainted',
) as SVGCircleElement[]
const shapes = kids.filter(
(k) => k.tagName !== 'circle' || k.getAttribute('pointer-events') === 'all',
)
const nearDisc = (x: number, y: number) =>
twins.some(
(t) =>
Math.hypot(x - t.cx.baseVal.value, y - t.cy.baseVal.value) <=
t.r.baseVal.value + 0.75 + margin,
)
const who = (x: number, y: number) => {
const p = new DOMPoint(x, y).matrixTransform(ctm)
return document
.elementFromPoint(p.x, p.y)
?.closest('[data-anno-id]')
?.getAttribute('data-anno-id')
}
const missed: Record<string, string> = {}
shapes.forEach((shape, at) => {
const id = shape.getAttribute('data-anno-id') ?? ''
const later = shapes.slice(at + 1)
const b = shape.getBBox()
let n = 0
let own = 0
for (let x = b.x; x <= b.x + b.width; x += 4) {
for (let y = b.y; y <= b.y + b.height; y += 4) {
const point = new DOMPoint(x, y)
// Edges and vertices aside: a sample 2 CSS pixels inside the fill in each direction.
const inside = [
[margin, 0],
[-margin, 0],
[0, margin],
[0, -margin],
].every(([dx, dy]) => shape.isPointInFill(new DOMPoint(x + dx, y + dy)))
if (!shape.isPointInFill(point) || !inside || nearDisc(x, y)) continue
if (
later.some((o) => o.isPointInFill(point) || o.isPointInStroke(point))
)
continue
n++
const got = who(x, y)
if (got === id) own++
else missed[`${id} first miss`] ??= `${x},${y}: ${String(got)}`
}
}
if (own < n) missed[id] = `${own}/${n}`
})
return missed
}
+28 -2
View File
@@ -152,7 +152,8 @@ export function withDeclaredHitboxes(layer: unknown): unknown {
* Owner brief 2026-10-30 (V1-2.2, three MEDIUM): the composition root is the engine's. Applied
* to a frozen canvas tree (a deep copy): the root keeps its namespaces and `viewBox`; its other
* attributes and every child before the layer go into a `<g>` of the drawing; the layer's
* hitboxes are declared (`withDeclaredHitboxes`). Mirrors `crates/core/tests/common/svg_tree.rs`.
* hitboxes are declared (`withDeclaredHitboxes`) and its markers put in the canvas passes
* (`withCanvasPasses`, owner decision 2026-11-01). Mirrors `crates/core/tests/common/svg_tree.rs`.
*/
export function withIsolatedLayer(tree: unknown): unknown {
const root = structuredClone(tree) as {
@@ -169,6 +170,31 @@ export function withIsolatedLayer(tree: unknown): unknown {
}
const group = { ns: root.ns, name: 'g', attrs: moved, children: root.children }
root.attrs = kept
root.children = [group, withDeclaredHitboxes(layer)]
root.children = [group, withCanvasPasses(withDeclaredHitboxes(layer))]
return root
}
/** A marker's pass on the canvas: 0 a point hitbox, 1 a zone or a trigger, 2 a visible twin. */
function canvasPass(node: unknown): number {
const n = node as { name?: string; attrs?: Record<string, string> }
if (n.name !== 'circle') return 1
if (n.attrs?.fill === 'transparent') return 0
return n.attrs?.['pointer-events'] === 'none' ? 2 : 1
}
/**
* Owner decision 2026-11-01 (V1-2.2, « the visible wins »), the editor canvas only: applied to
* a frozen layer after `withDeclaredHitboxes` (a deep copy). Every point hitbox, then every
* other shape, then every visible twin, each pass in the frozen order; the twins capture on
* `visiblePainted`. Mirrors `with_canvas_passes` in `crates/core/tests/common/svg_tree.rs`.
*/
export function withCanvasPasses(layer: unknown): unknown {
const copy = structuredClone(layer) as { children?: unknown[] }
const ranked = (copy.children ?? []).map((child, at) => ({ child, at, pass: canvasPass(child) }))
ranked.sort((a, b) => a.pass - b.pass || a.at - b.at)
copy.children = ranked.map(({ child, pass }) => {
if (pass === 2) (child as { attrs: Record<string, string> }).attrs['pointer-events'] = 'visiblePainted'
return child
})
return copy
}
+2 -1
View File
@@ -21,6 +21,7 @@ import {
import {
checkR3Golden,
treeOf,
withCanvasPasses,
withDeclaredHitboxes,
withIdsScopedPerView,
withIsolatedLayer,
@@ -101,7 +102,7 @@ describe.each(VIEWS)('the %s canvas', (viewId) => {
Object.fromEntries(
Object.entries(declared(frozen) as Record<string, unknown>).map(([name, layer]) => [
name,
withDeclaredHitboxes(layer),
withCanvasPasses(withDeclaredHitboxes(layer)),
]),
),
)