@pascal-app/editor 1.0.3 → 1.0.5

package/src/components/editor-2d/floorplan-registry-move-overlay.tsx

@@ -6,6 +6,8 @@ import {
   type AnyNodeId,
   bboxAnchors,
   bboxCornerAnchors,
+  beginSceneHistoryDraft,
+  beginSceneHistoryPauseSession,
   cascadeDirty,
   collectDescendants,
   createSceneApi,
@@ -15,8 +17,10 @@ import {
   getEffectiveNode,
   type MovableConfig,
   nodeRegistry,
-  pauseSceneHistory,
-  resumeSceneHistory,
+  runAsSingleSceneHistoryStep,
+  runSceneHistoryDraftWrite,
+  sceneHistoryDraftRevertUpdates,
+  settleSceneHistoryDrafts,
   useLiveNodeOverrides,
   useLiveTransforms,
   useScene,
@@ -35,6 +39,7 @@ import {
 import { movementSfxStepKey } from '../../lib/sfx/movement-tick'
 import { sfxEmitter } from '../../lib/sfx-bus'
 import { surfaceAttachmentId } from '../../lib/surface-attachment'
+import { isTypingTarget } from '../../lib/typing-target'
 import { resolveAlignmentForFloorplanView } from '../../lib/world-grid-snap'
 import useAlignmentGuides from '../../store/use-alignment-guides'
 import useEditor, {
@@ -146,15 +151,55 @@ export function FloorplanRegistryMoveOverlay() {
         }) => FloorplanMoveTargetSession
       )({ node: movingNode, nodes: sceneNodes, sceneApi })
 
-      // Capture snapshots of every affected node BEFORE the first apply
-      // so the single-undo dance has a clean baseline to revert to.
-      const snapshots = session.affectedIds
-        .map((id) => sceneNodes[id])
-        .filter((n): n is AnyNode => !!n)
-        .map((n) => snapshotNode(n))
+      const initialAffectedIds = session.affectedIds.filter((id) => sceneNodes[id])
 
-      pauseSceneHistory(useScene)
+      // History is paused only around this overlay's own writes (`ownWrite`): every affected
+      // node is a carried draft (core's history-drafts), so writes others make mid-move record
+      // as their own steps and space detection reconciles them. The drop writes through a
+      // session keyed by the moving node, which the 3D mover shares in split view.
+      const draftEnds = initialAffectedIds.map((id) =>
+        beginSceneHistoryDraft(
+          id,
+          isFreshPlacementMetadata(sceneNodes[id]!.metadata) ? null : sceneNodes[id]!,
+        ),
+      )
       let historyPaused = true
+      const endDrafts = () => {
+        for (const end of draftEnds) end()
+        historyPaused = false
+      }
+      const ownWrite = runSceneHistoryDraftWrite
+      // Puts back only the fields this move wrote and still holds; a rename or any other write
+      // someone made mid-move stays.
+      // The drop ends the carry: a transient marker (the 3D mover's, in split view) goes even
+      // when someone else edited the metadata meanwhile and the move no longer holds it.
+      const endTransientMarkers = () => {
+        const nodes = useScene.getState().nodes
+        const updates = session.affectedIds.flatMap((id) => {
+          const metadata = nodes[id]?.metadata as Record<string, unknown> | undefined
+          if (!metadata?.isTransient) return []
+          const { isTransient: _transient, ...rest } = metadata
+          return [{ id, data: { metadata: rest } }]
+        })
+        if (updates.length > 0) useScene.getState().updateNodes(updates)
+      }
+      const revertOwnWrites = () =>
+        ownWrite(() => {
+          const updates = sceneHistoryDraftRevertUpdates(session.affectedIds)
+          if (updates.length > 0) useScene.getState().updateNodes(updates)
+        })
+      const recordDrop = (write: () => void) => {
+        const drop = beginSceneHistoryPauseSession(useScene, { gesture: movingNode.id })
+        try {
+          // The move's write and its transient cleanup are one undo entry and one commit.
+          drop.commitStep(() => runAsSingleSceneHistoryStep(useScene, write))
+          // Only a successful drop ends ownership; a rejected write can still be retried.
+          settleSceneHistoryDrafts(session.affectedIds)
+          endDrafts()
+        } finally {
+          drop.end()
+        }
+      }
 
       const clearLivePreviews = () => {
         const liveTransforms = useLiveTransforms.getState()
@@ -229,15 +274,17 @@ export function FloorplanRegistryMoveOverlay() {
         hasMovedSinceStart = true
         lastPlanPoint = planPoint
         clearRejection()
-        session.apply({
-          planPoint,
-          modifiers: {
-            shiftKey: event.shiftKey,
-            altKey: event.altKey,
-            ctrlKey: event.ctrlKey,
-            metaKey: event.metaKey,
-          },
-        })
+        ownWrite(() =>
+          session.apply({
+            planPoint,
+            modifiers: {
+              shiftKey: event.shiftKey,
+              altKey: event.altKey,
+              ctrlKey: event.ctrlKey,
+              metaKey: event.metaKey,
+            },
+          }),
+        )
         // Move "tick" — same feedback the 3D move gives, which fires whenever the
         // resolved position changes (any snapping mode, not just grid), so it
         // ticks as the item lands on each new snapped/free position.
@@ -265,7 +312,14 @@ export function FloorplanRegistryMoveOverlay() {
       }
 
       const commitFinalStateOrRevert = () => {
-        const commitValid = session.canCommit()
+        if (!useScene.getState().nodes[movingNode.id]) {
+          revertOwnWrites()
+          endDrafts()
+          clearLivePreviews()
+          return
+        }
+        // Some registered sessions stage their final polygon from canCommit.
+        const commitValid = ownWrite(() => session.canCommit())
         const freshPlacement = isFreshPlacementMetadata(
           (useScene.getState().nodes[movingNode.id] as { metadata?: unknown } | undefined)
             ?.metadata,
@@ -283,7 +337,7 @@ export function FloorplanRegistryMoveOverlay() {
 
         // Keep ordinary teardown order. Validated replacements can refuse, so they
         // claim teardown only after success, before clearing the moving node.
-        if (!atomicPreview) setMovingNodeOrigin('2d')
+        if (!freshPlacement) setMovingNodeOrigin('2d')
 
         // Sessions with a `commit` hook own their atomic write (e.g.
         // wall move emits creates + deletes + updates via the junction
@@ -293,7 +347,7 @@ export function FloorplanRegistryMoveOverlay() {
         if (commitValid && freshPlacement) {
           // Subtrees finalize from the preview. Staging a session commit would publish
           // an unvalidated graph, including for presets created outside our factory.
-          if (!atomicPreview) session.commit?.()
+          if (!atomicPreview) ownWrite(() => session.commit?.())
           const stagedNode = useScene.getState().nodes[movingNode.id]
           const preview = usePlacementPreview.getState().node
           const effective = stagedNode ? getEffectiveNode(stagedNode) : null
@@ -310,67 +364,66 @@ export function FloorplanRegistryMoveOverlay() {
                 showRejection,
               )
             : null
-          if (!committedId && atomicPreview) return false
+          if (!committedId) return false
+          setMovingNodeOrigin('2d')
           if (atomicPreview) {
-            setMovingNodeOrigin('2d')
             for (const id of session.affectedIds) {
               useLiveTransforms.getState().clear(id)
               useLiveNodeOverrides.getState().clear(id)
             }
           }
-          if (historyPaused) {
-            resumeSceneHistory(useScene)
-            historyPaused = false
-          }
           if (committedId) {
+            settleSceneHistoryDrafts(session.affectedIds)
             sfxEmitter.emit('sfx:item-place')
             useViewer.getState().setSelection({ selectedIds: [committedId] })
           }
+          endDrafts()
           return
         }
 
         if (commitValid && session.commit) {
-          restoreSnapshots(snapshots)
-          if (historyPaused) {
-            resumeSceneHistory(useScene)
-            historyPaused = false
-          }
-          session.commit()
+          revertOwnWrites()
+          recordDrop(() => {
+            session.commit?.()
+            endTransientMarkers()
+          })
           sfxEmitter.emit('sfx:item-place')
-          useViewer.getState().setSelection({ selectedIds: snapshots.map((s) => s.id) })
+          useViewer.getState().setSelection({ selectedIds: initialAffectedIds })
           return
         }
 
         const sceneState = useScene.getState().nodes
         const finalUpdates: Array<{ id: AnyNodeId; data: Record<string, unknown> }> = []
-        for (const snap of snapshots) {
-          const current = sceneState[snap.id]
+        // Reapply everything the revert removes, including newly introduced fields and
+        // attachment entries held on hosts outside affectedIds. Foreign writes stay recorded.
+        for (const update of sceneHistoryDraftRevertUpdates(session.affectedIds)) {
+          const current = sceneState[update.id]
           if (!current) continue
           const data: Record<string, unknown> = {}
           let changed = false
-          for (const [key, before] of Object.entries(snap.data)) {
+          for (const [key, before] of Object.entries(update.data)) {
             const after = (current as unknown as Record<string, unknown>)[key]
             if (!deepEqual(before, after)) {
               data[key] = Array.isArray(after) ? [...(after as unknown[])] : after
               changed = true
             }
           }
-          if (changed) finalUpdates.push({ id: snap.id, data })
+          if (changed) finalUpdates.push({ id: update.id, data })
         }
 
-        for (const snap of snapshots) {
-          const current = sceneState[snap.id]
+        for (const id of initialAffectedIds) {
+          const current = sceneState[id]
           if (!current || !isFreshPlacementMetadata((current as { metadata?: unknown }).metadata)) {
             continue
           }
-          const existing = finalUpdates.find((update) => update.id === snap.id)
+          const existing = finalUpdates.find((update) => update.id === id)
           const metadata = stripPlacementMetadataFlags((current as { metadata?: unknown }).metadata)
           if (existing) {
             existing.data.metadata = metadata
             existing.data.visible = true
           } else {
             finalUpdates.push({
-              id: snap.id,
+              id,
               data: { metadata, visible: true },
             })
           }
@@ -381,25 +434,21 @@ export function FloorplanRegistryMoveOverlay() {
           //   1. Revert to baseline while history is still paused.
           //   2. Resume history.
           //   3. Re-apply the final state — recorded as one tracked change.
-          restoreSnapshots(snapshots)
-          if (historyPaused) {
-            resumeSceneHistory(useScene)
-            historyPaused = false
-          }
-          useScene.getState().updateNodes(finalUpdates)
+          revertOwnWrites()
+          recordDrop(() => {
+            useScene.getState().updateNodes(finalUpdates)
+            endTransientMarkers()
+          })
           sfxEmitter.emit('sfx:item-place')
           // Re-select the moved node(s) — mirrors the legacy 3D move
           // tool. The action menu cleared selection on Move click so
           // selection-gated affordances (slab/ceiling boundary editor,
           // etc.) would unmount during the drag; restoring it here
           // brings them back at the new position.
-          useViewer.getState().setSelection({ selectedIds: snapshots.map((s) => s.id) })
+          useViewer.getState().setSelection({ selectedIds: initialAffectedIds })
         } else {
-          restoreSnapshots(snapshots)
-          if (historyPaused) {
-            resumeSceneHistory(useScene)
-            historyPaused = false
-          }
+          revertOwnWrites()
+          endDrafts()
         }
       }
 
@@ -449,6 +498,7 @@ export function FloorplanRegistryMoveOverlay() {
       }
 
       const onKey = (event: KeyboardEvent) => {
+        if (isTypingTarget(event.target)) return
         // R flips a directional kind's facing mid-placement (door / window:
         // front ↔ back). The session records the flip and re-runs its last
         // apply so the 2D symbol updates immediately; kinds without a facing
@@ -468,13 +518,9 @@ export function FloorplanRegistryMoveOverlay() {
           if (event.metaKey || event.ctrlKey) return
           if (!(session.flipSide && hasMovedSinceStart && pointerOverFloorplan)) return
           if (event.repeat) return
-          const t = event.target as HTMLElement | null
-          if (t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || t.isContentEditable)) {
-            return
-          }
           event.preventDefault()
           event.stopImmediatePropagation()
-          session.flipSide()
+          ownWrite(() => session.flipSide?.())
           sfxEmitter.emit('sfx:item-rotate')
           return
         }
@@ -492,22 +538,16 @@ export function FloorplanRegistryMoveOverlay() {
         if (isFreshPlacementMetadata((movingNode as { metadata?: unknown }).metadata)) {
           emitter.emit('tool:cancel')
           if (!ownsSubtree && !isInteractionSubtreeDraft(movingNode.id))
-            useScene.getState().deleteNode(movingNode.id)
-          if (historyPaused) {
-            resumeSceneHistory(useScene)
-            historyPaused = false
-          }
+            ownWrite(() => useScene.getState().deleteNode(movingNode.id))
+          endDrafts()
           clearLivePreviews()
           useAlignmentGuides.getState().clear()
           setMovingNode(null)
           return
         }
-        // Revert untracked, then resume — no history entry.
-        restoreSnapshots(snapshots)
-        if (historyPaused) {
-          resumeSceneHistory(useScene)
-          historyPaused = false
-        }
+        // Revert as the overlay's own write: no history entry.
+        revertOwnWrites()
+        endDrafts()
         // Clear any live previews the session wrote. Slab / ceiling
         // 2D move stages a translation delta in `useLiveTransforms`;
         // wall move publishes `{ start, end, ... }` to
@@ -516,7 +556,7 @@ export function FloorplanRegistryMoveOverlay() {
         // position.
         clearLivePreviews()
         // Restore selection cleared by the action menu's Move click.
-        useViewer.getState().setSelection({ selectedIds: snapshots.map((s) => s.id) })
+        useViewer.getState().setSelection({ selectedIds: initialAffectedIds })
         setMovingNode(null)
       }
 
@@ -535,7 +575,7 @@ export function FloorplanRegistryMoveOverlay() {
         window.removeEventListener('keydown', onKey, true)
         // Unmount cleanup. `historyPaused === true` here means none of
         // our terminal paths (commit, Esc) ran in this overlay — they
-        // each call `resumeSceneHistory` and flip the flag.
+        // each end the drafts and flip the flag.
         //
         // If `movingNodeOrigin === '3d'`, a 3D move tool finalised
         // while our overlay was still mounted (split view); the live
@@ -554,10 +594,10 @@ export function FloorplanRegistryMoveOverlay() {
           const finalisedBy3D = useEditor.getState().movingNodeOrigin === '3d'
           if (!finalisedBy3D && !freshPlacement) {
             if (hasMovedSinceStart) {
-              restoreSnapshots(snapshots)
+              revertOwnWrites()
             }
           }
-          resumeSceneHistory(useScene)
+          endDrafts()
         }
         // Belt-and-suspenders: clear any live previews on abnormal
         // unmount paths too. Slab / ceiling sessions write to
@@ -922,6 +962,7 @@ export function FloorplanRegistryMoveOverlay() {
     }
 
     const onKey = (event: KeyboardEvent) => {
+      if (isTypingTarget(event.target)) return
       if (event.key !== 'Escape' && !isHistoryShortcut(event)) return
       if (isHistoryShortcut(event)) {
         // ⌘Z mid-move cancels like Escape — keep it from reaching the
@@ -933,11 +974,7 @@ export function FloorplanRegistryMoveOverlay() {
       if (isFreshPlacement) {
         emitter.emit('tool:cancel')
         if (!ownsSubtree && !isInteractionSubtreeDraft(movingNode.id)) {
-          const temporal = useScene.temporal.getState()
-          const wasTracking = (temporal as { isTracking?: boolean }).isTracking !== false
-          if (wasTracking) temporal.pause()
-          useScene.getState().deleteNode(movingNode.id)
-          if (wasTracking) temporal.resume()
+          runSceneHistoryDraftWrite(() => useScene.getState().deleteNode(movingNode.id))
         }
       }
       for (const relatedEntry of relatedEntries) {
@@ -970,33 +1007,6 @@ export function FloorplanRegistryMoveOverlay() {
   return null
 }
 
-// ── Snapshot helpers (shared shape with floorplan-registry-layer) ───
-//
-// Kept inline here to avoid a circular dependency through a shared
-// utility module. If a third call site shows up, extract.
-
-type NodeSnapshot = { id: AnyNodeId; data: Record<string, unknown> }
-
-function snapshotNode(node: AnyNode): NodeSnapshot {
-  const data: Record<string, unknown> = {}
-  for (const [key, value] of Object.entries(node)) {
-    if (key === 'id' || key === 'type' || key === 'object') continue
-    data[key] = Array.isArray(value) ? [...(value as unknown[])] : value
-  }
-  return { id: node.id, data }
-}
-
-function restoreSnapshots(snapshots: NodeSnapshot[]) {
-  const updates = snapshots
-    .filter(
-      (s) =>
-        !useScene.getState().nodes[s.id] ||
-        !deepEqual(s.data, snapshotNode(useScene.getState().nodes[s.id]!).data),
-    )
-    .map((s) => ({ id: s.id, data: s.data }))
-  if (updates.length) useScene.getState().updateNodes(updates)
-}
-
 function deepEqual(a: unknown, b: unknown): boolean {
   if (a === b) return true
   if (Array.isArray(a) && Array.isArray(b)) {

package/src/components/editor-2d/renderers/floorplan-dimension-edit-overlay.test.ts

@@ -0,0 +1,156 @@
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
+import type { AnyNode, AnyNodeId } from '@pascal-app/core'
+import { useScene } from '@pascal-app/core'
+import { commitDimensionValue, isDimensionEditAllowed } from './floorplan-dimension-edit-overlay'
+
+type Change = { id: AnyNodeId; data: Partial<AnyNode> }
+
+function wall(id: string, start: [number, number], end: [number, number]): AnyNode {
+  return {
+    object: 'node',
+    id,
+    type: 'wall',
+    parentId: 'level_1',
+    visible: true,
+    metadata: {},
+    start,
+    end,
+    thickness: 0.15,
+    children: [],
+  } as unknown as AnyNode
+}
+
+function nodes(): Record<string, AnyNode> {
+  return {
+    level_1: {
+      object: 'node',
+      id: 'level_1',
+      type: 'level',
+      parentId: null,
+      visible: true,
+      metadata: {},
+      level: 0,
+      children: ['wall_a', 'wall_b', 'dim_1'],
+    } as unknown as AnyNode,
+    wall_a: wall('wall_a', [0, 0], [3, 0]),
+    wall_b: wall('wall_b', [3, 0], [3, 4]),
+    dim_1: {
+      object: 'node',
+      id: 'dim_1',
+      type: 'construction-dimension',
+      parentId: 'level_1',
+      visible: true,
+      metadata: {},
+      children: [],
+    } as unknown as AnyNode,
+  }
+}
+
+let initial: ReturnType<typeof useScene.getState>
+let applied: Change[]
+let updated: Change[]
+let dirty: AnyNodeId[]
+
+beforeEach(() => {
+  initial = useScene.getState()
+  applied = []
+  updated = []
+  dirty = []
+  useScene.setState({
+    nodes: nodes() as ReturnType<typeof useScene.getState>['nodes'],
+    applyNodeChanges: ((changes: { update?: Change[] }) => {
+      applied.push(...(changes.update ?? []))
+    }) as ReturnType<typeof useScene.getState>['applyNodeChanges'],
+    updateNode: ((id: AnyNodeId, data: Partial<AnyNode>) => {
+      updated.push({ id, data })
+    }) as ReturnType<typeof useScene.getState>['updateNode'],
+    markDirty: ((id: AnyNodeId) => {
+      dirty.push(id)
+    }) as ReturnType<typeof useScene.getState>['markDirty'],
+  })
+})
+
+afterEach(() => {
+  useScene.setState(initial, true)
+})
+
+describe('commitDimensionValue', () => {
+  test('a wall dimension drives the wall end and the wall sharing that corner', () => {
+    const outcome = commitDimensionValue({
+      target: {
+        ownerNodeId: 'wall_a' as AnyNodeId,
+        witnessStart: [0, 0],
+        witnessEnd: [3, 0],
+        value: 3,
+      },
+      nextLength: 3.5,
+    })
+
+    expect(outcome).toEqual({ ok: true })
+    const byId = new Map(applied.map((change) => [change.id, change.data]))
+    expect(byId.get('wall_a' as AnyNodeId)).toEqual({ start: [0, 0], end: [3.5, 0] })
+    expect(byId.get('wall_b' as AnyNodeId)).toEqual({ start: [3.5, 0], end: [3, 4] })
+    expect(dirty.sort()).toEqual(['wall_a', 'wall_b'] as AnyNodeId[])
+    expect(updated).toEqual([])
+  })
+
+  test('an undrivable wall dimension is refused and nothing is written', () => {
+    const outcome = commitDimensionValue({
+      target: {
+        ownerNodeId: 'wall_a' as AnyNodeId,
+        witnessStart: [1.5, -1],
+        witnessEnd: [1.5, 1],
+        value: 2,
+      },
+      nextLength: 2.5,
+    })
+
+    expect(outcome.ok).toBe(false)
+    expect(applied).toEqual([])
+    expect(updated).toEqual([])
+  })
+
+  test('an undrivable construction dimension keeps the typed text as an override', () => {
+    const outcome = commitDimensionValue({
+      target: {
+        ownerNodeId: 'dim_1' as AnyNodeId,
+        witnessStart: [10, 10],
+        witnessEnd: [12, 10],
+        value: 2,
+      },
+      nextLength: 3,
+      unit: 'metric',
+    })
+
+    expect(outcome).toEqual({ ok: true })
+    expect(applied).toEqual([])
+    expect(updated).toHaveLength(1)
+    expect(updated[0]?.id).toBe('dim_1' as AnyNodeId)
+    expect(typeof (updated[0]!.data as { textOverride?: unknown }).textOverride).toBe('string')
+  })
+})
+
+describe('isDimensionEditAllowed', () => {
+  const idle = {
+    workspaceMode: 'edit',
+    mode: 'select',
+    isPreviewMode: false,
+    isCaptureMode: false,
+    isFirstPersonMode: false,
+  } as const
+
+  test('only an editable scene in select mode of the edit workspace', () => {
+    expect(isDimensionEditAllowed(idle, { readOnly: false })).toBe(true)
+    expect(isDimensionEditAllowed(idle, { readOnly: true })).toBe(false)
+    expect(isDimensionEditAllowed({ ...idle, workspaceMode: 'studio' }, { readOnly: false })).toBe(
+      false,
+    )
+    expect(isDimensionEditAllowed({ ...idle, workspaceMode: 'sheets' }, { readOnly: false })).toBe(
+      false,
+    )
+    expect(isDimensionEditAllowed({ ...idle, mode: 'delete' }, { readOnly: false })).toBe(false)
+    expect(isDimensionEditAllowed({ ...idle, isPreviewMode: true }, { readOnly: false })).toBe(
+      false,
+    )
+  })
+})