Canvas: make double-click-to-plant work on desktop #135
@@ -329,6 +329,16 @@ export const Canvas = forwardRef<
|
||||
if (!drag.current) drag.current = { t: 'pan', sx: e.clientX, sy: e.clientY, tx: st.vp.tx, ty: st.vp.ty, moved: false, th: thresh(e) }
|
||||
}
|
||||
|
||||
// The last press on an object, for double-click detection. Detected here
|
||||
// rather than with onDoubleClick on the object's <g>: track() captures the
|
||||
// pointer on the SVG root, and capture retargets the compatibility click
|
||||
// and dblclick events to the root, so a dblclick handler on the object
|
||||
// never fires — which is why "double-click a bed to plant it" did nothing
|
||||
// from the Organic rebuild until this was noticed (2026-08-23).
|
||||
const lastPress = useRef<{ id: number; at: number; x: number; y: number } | null>(null)
|
||||
|
|
||||
const DOUBLE_PRESS_MS = 400
|
||||
const DOUBLE_PRESS_PX = 12
|
||||
|
||||
const objDown = (o: EditorObject) => (e: ReactPointerEvent) => {
|
||||
e.stopPropagation()
|
||||
track(e)
|
||||
@@ -342,6 +352,17 @@ export const Canvas = forwardRef<
|
||||
}
|
||||
// Dimmed siblings stay inert inside a focused bed.
|
||||
if (st.focusId != null && o.id !== st.focusId) return
|
||||
const prev = lastPress.current
|
||||
|
gitea-actions
commented
🟠 Double-click detection accepts non-primary pointer buttons, unlike native dblclick correctness, error-handling · flagged by 2 models
🪰 Gadfly · advisory 🟠 **Double-click detection accepts non-primary pointer buttons, unlike native dblclick**
_correctness, error-handling · flagged by 2 models_
- **`web/src/editor/Canvas.tsx:357` — `lastPress` is updated for every pointer button, so non-primary clicks (right-click, middle-click) can participate in or complete a double-click.** Verified by reading `objDown`: the ref is written unconditionally before the `e.button` check, and the `if (prev && …)` block that fires `focusObject` does not inspect `e.button`. Native `dblclick` fires only for the primary button; right-clicking a bed twice within 400 ms should not focus it. Fix: gate the `last…
<sub>🪰 Gadfly · advisory</sub>
|
||||
const now = performance.now()
|
||||
lastPress.current = { id: o.id, at: now, x: e.clientX, y: e.clientY }
|
||||
if (prev && prev.id === o.id && now - prev.at < DOUBLE_PRESS_MS && Math.hypot(e.clientX - prev.x, e.clientY - prev.y) < DOUBLE_PRESS_PX) {
|
||||
// Second press of a double-click: focus the bed to plant it. No drag
|
||||
// starts, so the matching pointerup has nothing to select into Plot.
|
||||
lastPress.current = null
|
||||
drag.current = null
|
||||
if (o.plantable) focusObject(o)
|
||||
return
|
||||
}
|
||||
if (!latest.current.canEdit) {
|
||||
st.setSel({ type: 'object', id: o.id })
|
||||
st.setTab('plot')
|
||||
@@ -562,7 +583,6 @@ export const Canvas = forwardRef<
|
||||
opacity={dim ? DIM_OBJECT : 1}
|
||||
style={{ cursor: dim ? 'default' : canEdit ? 'grab' : 'pointer' }}
|
||||
onPointerDown={objDown(o)}
|
||||
onDoubleClick={o.plantable && !dim ? () => focusObject(o) : undefined}
|
||||
>
|
||||
{o.shape === 'circle' ? (
|
||||
<ellipse rx={o.widthCm / 2} ry={o.heightCm / 2} {...common} />
|
||||
|
||||
Reference in New Issue
Block a user
🟡 lastPress useRef declared far from the component's other refs (lines 87-97), breaking the established grouping pattern
maintainability · flagged by 3 models
lastPressref declared out-of-group (web/src/editor/Canvas.tsx:338): All otheruseRefhooks are declared together at lines 87–97.lastPressis inserted ~250 lines later, next to the function that uses it. A reader scanning for "which refs does this component own?" will miss it. It should sit with its peers at the top of the hook block — the proximity toobjDowndoesn't add anything because refs don't have render-time side-effects.🪰 Gadfly · advisory