fix(editor): guard keeps pending series, mode end said, R-9 hook

- guardDrawing commits a keyboard or size series the focus still holds
  (its blur) and ends only the mode: a pending series is never dropped.
- A started move ended by a selection change is said (R-13).
- handleSize: no module-level state; useHandleSizes reads the device
  once per handle layer. The layer reads ResizeObserver contentRect.
- Dead kind check removed in SelectionPointCommands; long lines wrapped
  (code, doc).
- e2e: the zoom check waits for the transform to change; the move-mode
  arrow clicks are under expectNoShift.
This commit is contained in:
bchanot committed 2026-11-17 19:25:04 +01:00
1 parent e01d8519ea
commit 463e0a2621
11 files changed
+157 -40

No files matched your search

@@ -173,7 +173,11 @@ type Work = ReturnType<typeof useWork>
function useModeFollowsSelection(selectedId: string | null) {
const modeId = useAnnotationWork((s) => s.mode?.annotationId ?? null)
useEffect(() => {
if (modeId !== null && modeId !== selectedId) endMode()
if (modeId === null || modeId === selectedId) return
const { mode } = useAnnotationWork.getState()
endMode()
// Never silent (R-13): a started move that ends this way is said.
if (mode?.started) useAnnotationWork.setState({ dropped: mode.kind })
}, [modeId, selectedId])
}
@@ -8,7 +8,10 @@ import {
} from 'react'
import type { Geometry } from '@faunosteo/core-wasm/types'
import { parseFrame } from '@/editor/annotations/frame'
import { handleSizes } from '@/editor/annotations/handleSize'
import {
useHandleSizes,
type HandleSizes,
} from '@/editor/annotations/handleSize'
import { useAnnotationWork } from '@/editor/annotations/workStore'
/** The selected point (or link circle) whose handle the layer draws. */
@@ -40,7 +43,10 @@ function useBoxSize(svg: RefObject<SVGSVGElement | null>) {
setSize({ w: element.clientWidth || 0, h: element.clientHeight || 0 })
read()
if (typeof ResizeObserver === 'undefined') return
const observer = new ResizeObserver(read)
const observer = new ResizeObserver(([entry]) => {
const box = entry?.contentRect
if (box) setSize({ w: box.width, h: box.height })
})
observer.observe(element)
return () => observer.disconnect()
}, [svg])
@@ -72,6 +78,7 @@ function unitsPerPx(
export default function HandleLayer(props: HandleLayerProps) {
const svg = useRef<SVGSVGElement | null>(null)
const unit = unitsPerPx(props.viewBox, useBoxSize(svg), props.scale)
const sizes = useHandleSizes()
return (
<svg
ref={svg}
@@ -81,7 +88,12 @@ export default function HandleLayer(props: HandleLayerProps) {
className="pointer-events-none absolute inset-0 h-full w-full overflow-visible"
>
{props.handle && (
<PointHandleShape {...props} handle={props.handle} unit={unit} />
<PointHandleShape
{...props}
handle={props.handle}
sizes={sizes}
unit={unit}
/>
)}
</svg>
)
@@ -92,19 +104,26 @@ function PointHandleShape({
unit,
onKeyDown,
onBlur,
}: HandleLayerProps & { handle: PointHandle; unit: number }) {
sizes,
}: HandleLayerProps & {
handle: PointHandle
unit: number
sizes: HandleSizes
}) {
const preview = useAnnotationWork((s) =>
s.preview?.annotationId === handle.annotationId ? s.preview.geometry : null,
)
const shown = preview ?? handle.stored
if (shown.type !== 'circle') return null
const r = Math.max(shown.r, handleSizes().hit * unit)
const r = Math.max(shown.r, sizes.hit * unit)
return (
<g
role="button"
tabIndex={0}
aria-label={handle.label}
data-testid="point-handle"
// Its arrow series commits on blur; the drawing guard blurs it before leaving.
data-series=""
className="group outline-none"
onKeyDown={onKeyDown}
onBlur={onBlur}
@@ -110,7 +110,7 @@ export function SelectionPointCommands(props: SelectionPointProps) {
}
return (
<>
{annotation.kind === 'point' && <SelectionSize {...props} />}
<SelectionSize {...props} />
<Button
// R-12: the focus comes back here when the mode ends (useMoveFocusReturn).
data-move-entry=""
@@ -82,6 +82,7 @@ export default function SizeSlider(props: SizeSliderProps) {
ref={input}
id={id}
type="range"
data-series=""
min={range.low}
max={range.high}
step={0.01}