@pascal-app/editor 0.7.0 → 0.9.1

package/src/components/tools/fence/move-fence-tool.tsx

@@ -1,298 +0,0 @@
-'use client'
-
-import {
-  type AnyNodeId,
-  emitter,
-  type FenceNode,
-  type GridEvent,
-  type LevelNode,
-  sceneRegistry,
-  useLiveTransforms,
-  useScene,
-  type WallNode,
-} from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
-import { useCallback, useEffect, useRef, useState } from 'react'
-import type * as THREE from 'three'
-import { markToolCancelConsumed } from '../../../hooks/use-keyboard'
-import { sfxEmitter } from '../../../lib/sfx-bus'
-import useEditor from '../../../store/use-editor'
-import { snapFenceDraftPoint } from './fence-drafting'
-import { CursorSphere } from '../shared/cursor-sphere'
-
-function samePoint(a: [number, number], b: [number, number]) {
-  return a[0] === b[0] && a[1] === b[1]
-}
-
-type LinkedFenceSnapshot = {
-  id: FenceNode['id']
-  start: [number, number]
-  end: [number, number]
-}
-
-function getLinkedFenceSnapshots(args: {
-  fenceId: FenceNode['id']
-  fenceParentId: string | null
-  originalStart: [number, number]
-  originalEnd: [number, number]
-}) {
-  const { fenceId, fenceParentId, originalStart, originalEnd } = args
-  const { nodes } = useScene.getState()
-  const snapshots: LinkedFenceSnapshot[] = []
-
-  for (const node of Object.values(nodes)) {
-    if (!(node?.type === 'fence' && node.id !== fenceId)) {
-      continue
-    }
-
-    if ((node.parentId ?? null) !== fenceParentId) {
-      continue
-    }
-
-    if (
-      !samePoint(node.start, originalStart) &&
-      !samePoint(node.start, originalEnd) &&
-      !samePoint(node.end, originalStart) &&
-      !samePoint(node.end, originalEnd)
-    ) {
-      continue
-    }
-
-    snapshots.push({
-      id: node.id,
-      start: [...node.start] as [number, number],
-      end: [...node.end] as [number, number],
-    })
-  }
-
-  return snapshots
-}
-
-function getLinkedFenceUpdates(
-  linkedFences: LinkedFenceSnapshot[],
-  originalStart: [number, number],
-  originalEnd: [number, number],
-  nextStart: [number, number],
-  nextEnd: [number, number],
-) {
-  return linkedFences.map((fence) => ({
-    id: fence.id,
-    start: samePoint(fence.start, originalStart)
-      ? nextStart
-      : samePoint(fence.start, originalEnd)
-        ? nextEnd
-        : fence.start,
-    end: samePoint(fence.end, originalStart)
-      ? nextStart
-      : samePoint(fence.end, originalEnd)
-        ? nextEnd
-        : fence.end,
-  }))
-}
-
-export const MoveFenceTool: React.FC<{ node: FenceNode }> = ({ node }) => {
-  const activatedAtRef = useRef<number>(Date.now())
-  const previousGridPosRef = useRef<[number, number] | null>(null)
-  const originalStartRef = useRef<[number, number]>([...node.start] as [number, number])
-  const originalEndRef = useRef<[number, number]>([...node.end] as [number, number])
-  const linkedOriginalsRef = useRef(
-    getLinkedFenceSnapshots({
-      fenceId: node.id,
-      fenceParentId: node.parentId ?? null,
-      originalStart: node.start,
-      originalEnd: node.end,
-    }),
-  )
-  const dragAnchorRef = useRef<[number, number] | null>(null)
-  const nodeIdRef = useRef(node.id)
-  const previewRef = useRef<{ start: [number, number]; end: [number, number] } | null>(null)
-
-  const [cursorLocalPos, setCursorLocalPos] = useState<[number, number, number]>(() => {
-    const centerX = (node.start[0] + node.end[0]) / 2
-    const centerZ = (node.start[1] + node.end[1]) / 2
-    return [centerX, 0, centerZ]
-  })
-
-  const exitMoveMode = useCallback(() => {
-    useEditor.getState().setMovingNode(null)
-  }, [])
-
-  useEffect(() => {
-    const nodeId = nodeIdRef.current
-    const originalStart = originalStartRef.current
-    const originalEnd = originalEndRef.current
-    const levelNode =
-      node.parentId && useScene.getState().nodes[node.parentId as AnyNodeId]?.type === 'level'
-        ? (useScene.getState().nodes[node.parentId as AnyNodeId] as LevelNode)
-        : null
-    const levelChildren = levelNode?.children ?? []
-    const levelWalls = levelChildren
-      .map((childId) => useScene.getState().nodes[childId as AnyNodeId])
-      .filter((child): child is WallNode => child?.type === 'wall')
-    const levelFences = levelChildren
-      .map((childId) => useScene.getState().nodes[childId as AnyNodeId])
-      .filter((child): child is FenceNode => child?.type === 'fence')
-
-    useScene.temporal.getState().pause()
-    let wasCommitted = false
-
-    const setMeshOffset = (fenceId: FenceNode['id'], deltaX: number, deltaZ: number) => {
-      const mesh = sceneRegistry.nodes.get(fenceId) as THREE.Object3D | undefined
-      if (!mesh) {
-        return
-      }
-
-      mesh.position.set(deltaX, 0, deltaZ)
-    }
-
-    const setFenceLiveTransform = (fence: FenceNode, deltaX: number, deltaZ: number) => {
-      const originalCenterX = (fence.start[0] + fence.end[0]) / 2
-      const originalCenterZ = (fence.start[1] + fence.end[1]) / 2
-      useLiveTransforms.getState().set(fence.id, {
-        position: [originalCenterX + deltaX, 0, originalCenterZ + deltaZ],
-        rotation: 0,
-      })
-    }
-
-    const clearPreviewState = () => {
-      setMeshOffset(nodeId, 0, 0)
-      useLiveTransforms.getState().clear(nodeId)
-
-      for (const linkedFence of linkedOriginalsRef.current) {
-        setMeshOffset(linkedFence.id, 0, 0)
-        useLiveTransforms.getState().clear(linkedFence.id)
-      }
-    }
-
-    const applyNodePreview = (updates: Array<{ id: FenceNode['id']; start: [number, number]; end: [number, number] }>) => {
-      useScene.getState().updateNodes(
-        updates.map((entry) => ({
-          id: entry.id as AnyNodeId,
-          data: { start: entry.start, end: entry.end },
-        })),
-      )
-      for (const entry of updates) {
-        useScene.getState().markDirty(entry.id as AnyNodeId)
-      }
-    }
-
-    const applyPreview = (nextStart: [number, number], nextEnd: [number, number]) => {
-      previewRef.current = { start: nextStart, end: nextEnd }
-      const centerX = (nextStart[0] + nextEnd[0]) / 2
-      const centerZ = (nextStart[1] + nextEnd[1]) / 2
-      setCursorLocalPos([centerX, 0, centerZ])
-      const deltaX = nextStart[0] - originalStart[0]
-      const deltaZ = nextStart[1] - originalStart[1]
-      setMeshOffset(nodeId, deltaX, deltaZ)
-      setFenceLiveTransform(node, deltaX, deltaZ)
-
-      for (const linkedFence of linkedOriginalsRef.current) {
-        setMeshOffset(linkedFence.id, deltaX, deltaZ)
-        setFenceLiveTransform(
-          {
-            ...node,
-            id: linkedFence.id,
-            start: linkedFence.start,
-            end: linkedFence.end,
-          },
-          deltaX,
-          deltaZ,
-        )
-      }
-    }
-
-    const onGridMove = (event: GridEvent) => {
-      const [localX, localZ] = snapFenceDraftPoint({
-        point: [event.localPosition[0], event.localPosition[2]],
-        walls: levelWalls,
-        fences: levelFences,
-        ignoreFenceIds: [nodeId],
-      })
-
-      if (
-        previousGridPosRef.current &&
-        (localX !== previousGridPosRef.current[0] || localZ !== previousGridPosRef.current[1])
-      ) {
-        sfxEmitter.emit('sfx:grid-snap')
-      }
-      previousGridPosRef.current = [localX, localZ]
-
-      const anchor = dragAnchorRef.current ?? [localX, localZ]
-      dragAnchorRef.current = anchor
-
-      const deltaX = localX - anchor[0]
-      const deltaZ = localZ - anchor[1]
-
-      const nextStart: [number, number] = [originalStart[0] + deltaX, originalStart[1] + deltaZ]
-      const nextEnd: [number, number] = [originalEnd[0] + deltaX, originalEnd[1] + deltaZ]
-
-      applyPreview(nextStart, nextEnd)
-    }
-
-    const onGridClick = (event: GridEvent) => {
-      if (Date.now() - activatedAtRef.current < 150) {
-        event.nativeEvent?.stopPropagation?.()
-        return
-      }
-
-      const preview = previewRef.current ?? { start: originalStart, end: originalEnd }
-
-      wasCommitted = true
-
-      useScene.temporal.getState().resume()
-      applyNodePreview([
-        { id: nodeId, start: preview.start, end: preview.end },
-        ...getLinkedFenceUpdates(
-          linkedOriginalsRef.current,
-          originalStart,
-          originalEnd,
-          preview.start,
-          preview.end,
-        ),
-      ])
-      useLiveTransforms.getState().clear(nodeId)
-      for (const linkedFence of linkedOriginalsRef.current) {
-        useLiveTransforms.getState().clear(linkedFence.id)
-      }
-      useScene.temporal.getState().pause()
-
-      sfxEmitter.emit('sfx:item-place')
-      useViewer.getState().setSelection({ selectedIds: [nodeId] })
-      exitMoveMode()
-      event.nativeEvent?.stopPropagation?.()
-    }
-
-    const onCancel = () => {
-      clearPreviewState()
-      useViewer.getState().setSelection({ selectedIds: [nodeId] })
-      useScene.temporal.getState().resume()
-      markToolCancelConsumed()
-      exitMoveMode()
-    }
-
-    emitter.on('grid:move', onGridMove)
-    emitter.on('grid:click', onGridClick)
-    emitter.on('tool:cancel', onCancel)
-
-    return () => {
-      if (!wasCommitted) {
-        clearPreviewState()
-      } else {
-        useLiveTransforms.getState().clear(nodeId)
-        for (const linkedFence of linkedOriginalsRef.current) {
-          useLiveTransforms.getState().clear(linkedFence.id)
-        }
-      }
-      useScene.temporal.getState().resume()
-      emitter.off('grid:move', onGridMove)
-      emitter.off('grid:click', onGridClick)
-      emitter.off('tool:cancel', onCancel)
-    }
-  }, [exitMoveMode, node])
-
-  return (
-    <group>
-      <CursorSphere position={cursorLocalPos} showTooltip={false} />
-    </group>
-  )
-}

package/src/components/tools/item/item-tool.tsx

@@ -1,26 +0,0 @@
-import { sfxEmitter } from '../../../lib/sfx-bus'
-import useEditor from '../../../store/use-editor'
-import { useDraftNode } from './use-draft-node'
-import { usePlacementCoordinator } from './use-placement-coordinator'
-
-export const ItemTool: React.FC = () => {
-  const selectedItem = useEditor((state) => state.selectedItem)
-  const draftNode = useDraftNode()
-
-  const cursor = usePlacementCoordinator({
-    asset: selectedItem,
-    draftNode,
-    initDraft: (gridPosition) => {
-      if (selectedItem && !selectedItem.attachTo) {
-        draftNode.create(gridPosition, selectedItem)
-      }
-    },
-    onCommitted: () => {
-      sfxEmitter.emit('sfx:item-place')
-      return true
-    },
-  })
-
-  if (!selectedItem) return null
-  return <>{cursor}</>
-}

package/src/components/tools/roof/move-roof-tool.tsx

@@ -1,359 +0,0 @@
-import {
-  type AnyNodeId,
-  emitter,
-  type FenceNode,
-  type GridEvent,
-  type LevelNode,
-  type RoofNode,
-  type RoofSegmentNode,
-  type StairNode,
-  type StairSegmentNode,
-  sceneRegistry,
-  useLiveTransforms,
-  useScene,
-  type WallNode,
-} from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
-import { useCallback, useEffect, useRef, useState } from 'react'
-import * as THREE from 'three'
-import { clearRoofDuplicateMetadata } from '../../../lib/roof-duplication'
-import { sfxEmitter } from '../../../lib/sfx-bus'
-import useEditor from '../../../store/use-editor'
-import { snapFenceDraftPoint } from '../fence/fence-drafting'
-import { CursorSphere } from '../shared/cursor-sphere'
-import type { WallPlanPoint } from '../wall/wall-drafting'
-
-export const MoveRoofTool: React.FC<{
-  node: RoofNode | RoofSegmentNode | StairNode | StairSegmentNode
-}> = ({ node: movingNode }) => {
-  const exitMoveMode = useCallback(() => {
-    useEditor.getState().setMovingNode(null)
-  }, [])
-
-  const previousGridPosRef = useRef<[number, number] | null>(null)
-
-  const [cursorWorldPos, setCursorWorldPos] = useState<[number, number, number]>(() => {
-    const obj = sceneRegistry.nodes.get(movingNode.id)
-    if (obj) {
-      const worldPos = obj.getWorldPosition(new THREE.Vector3())
-      // Cursor renders inside the building-local ToolManager group, so convert
-      // world → building-local to honor any building rotation.
-      const buildingId = useViewer.getState().selection.buildingId
-      const buildingObj = buildingId ? sceneRegistry.nodes.get(buildingId as AnyNodeId) : null
-      if (buildingObj) buildingObj.worldToLocal(worldPos)
-      return [worldPos.x, worldPos.y, worldPos.z]
-    }
-    // Fallback if not registered (e.g. newly created duplicate without mesh yet)
-    if (
-      (movingNode.type === 'roof-segment' || movingNode.type === 'stair-segment') &&
-      movingNode.parentId
-    ) {
-      const parentNode = useScene.getState().nodes[movingNode.parentId as AnyNodeId]
-      if (parentNode && 'position' in parentNode && 'rotation' in parentNode) {
-        const parentAngle = parentNode.rotation as number
-        const px = parentNode.position[0] as number
-        const py = parentNode.position[1] as number
-        const pz = parentNode.position[2] as number
-        const lx = movingNode.position[0]
-        const ly = movingNode.position[1]
-        const lz = movingNode.position[2]
-
-        const wx = lx * Math.cos(parentAngle) - lz * Math.sin(parentAngle) + px
-        const wz = lx * Math.sin(parentAngle) + lz * Math.cos(parentAngle) + pz
-        return [wx, py + ly, wz]
-      }
-    }
-    return [movingNode.position[0], movingNode.position[1], movingNode.position[2]]
-  })
-
-  useEffect(() => {
-    useScene.temporal.getState().pause()
-
-    const meta =
-      typeof movingNode.metadata === 'object' && movingNode.metadata !== null
-        ? (movingNode.metadata as Record<string, unknown>)
-        : {}
-    const isNew = !!meta.isNew
-    const committedMeta: RoofNode['metadata'] = (() => {
-      if (
-        typeof movingNode.metadata !== 'object' ||
-        movingNode.metadata === null ||
-        Array.isArray(movingNode.metadata)
-      ) {
-        return movingNode.metadata
-      }
-
-      const nextMeta = { ...movingNode.metadata } as Record<string, unknown>
-      delete nextMeta.isNew
-      delete nextMeta.isTransient
-      return nextMeta as RoofNode['metadata']
-    })()
-
-    const original = {
-      position: [...movingNode.position] as [number, number, number],
-      rotation: movingNode.rotation,
-      parentId: movingNode.parentId,
-      metadata: movingNode.metadata,
-    }
-
-    // Track whether the move was committed so cleanup knows whether to revert.
-    // We avoid setting isTransient on the store to prevent RoofSystem from
-    // resetting the mesh position (it resets on dirty) and from triggering
-    // expensive merged-mesh CSG rebuilds on every frame.
-    let wasCommitted = false
-    let wasCancelled = false
-
-    // Track pending rotation — no store updates during drag
-    let pendingRotation: number = movingNode.rotation as number
-
-    // For roof-segment moves: the selection was cleared before entering move mode,
-    // so isSelected=false on the parent roof, hiding individual segment meshes and
-    // showing only the merged mesh. We directly flip Three.js visibility so the
-    // user sees the individual segment tracking the cursor.
-    let segmentWrapperGroup: THREE.Object3D | null = null
-    let mergedRoofMesh: THREE.Object3D | null = null
-    if (movingNode.type === 'roof-segment' || movingNode.type === 'stair-segment') {
-      const segmentMesh = sceneRegistry.nodes.get(movingNode.id)
-      if (segmentMesh?.parent) {
-        // segmentMesh.parent = <group visible={isSelected}> wrapper in Roof/StairRenderer
-        // segmentMesh.parent.parent = the registered roof/stair group
-        segmentWrapperGroup = segmentMesh.parent
-        const mergedName = movingNode.type === 'stair-segment' ? 'merged-stair' : 'merged-roof'
-        mergedRoofMesh = segmentMesh.parent.parent?.getObjectByName(mergedName) ?? null
-        segmentWrapperGroup.visible = true
-        if (mergedRoofMesh) mergedRoofMesh.visible = false
-      }
-    }
-
-    const resolveLevelId = () => {
-      if (movingNode.type === 'roof' || movingNode.type === 'stair') {
-        return movingNode.parentId ?? null
-      }
-
-      if (
-        (movingNode.type === 'roof-segment' || movingNode.type === 'stair-segment') &&
-        movingNode.parentId
-      ) {
-        const parentNode = useScene.getState().nodes[movingNode.parentId as AnyNodeId]
-        return parentNode && 'parentId' in parentNode ? (parentNode.parentId ?? null) : null
-      }
-
-      return null
-    }
-
-    const levelId = resolveLevelId()
-    const levelNode =
-      levelId && useScene.getState().nodes[levelId as AnyNodeId]?.type === 'level'
-        ? (useScene.getState().nodes[levelId as AnyNodeId] as LevelNode)
-        : null
-    const levelChildren = levelNode?.children ?? []
-    const levelWalls = levelChildren
-      .map((childId) => useScene.getState().nodes[childId as AnyNodeId])
-      .filter((node): node is WallNode => node?.type === 'wall')
-    const levelFences = levelChildren
-      .map((childId) => useScene.getState().nodes[childId as AnyNodeId])
-      .filter((node): node is FenceNode => node?.type === 'fence')
-    const buildingId = useViewer.getState().selection.buildingId
-    const buildingObj = buildingId ? sceneRegistry.nodes.get(buildingId as AnyNodeId) : null
-
-    const localToWorldPoint = (localPoint: WallPlanPoint, y: number): [number, number, number] => {
-      if (buildingObj) {
-        const worldPoint = buildingObj.localToWorld(new THREE.Vector3(localPoint[0], y, localPoint[1]))
-        return [worldPoint.x, worldPoint.y, worldPoint.z]
-      }
-
-      return [localPoint[0], y, localPoint[1]]
-    }
-
-    const computeLocal = (
-      gridX: number,
-      gridZ: number,
-      y: number,
-      buildingLocalX: number,
-      buildingLocalZ: number,
-    ): [number, number] => {
-      // Segments have a transformed parent (stair/roof). Convert world → parent-local
-      // via Three.js hierarchy so the segment's stored position stays parent-relative.
-      if (
-        (movingNode.type === 'roof-segment' || movingNode.type === 'stair-segment') &&
-        movingNode.parentId
-      ) {
-        const parentNode = useScene.getState().nodes[movingNode.parentId as AnyNodeId]
-        if (parentNode && 'position' in parentNode && 'rotation' in parentNode) {
-          const parentObj = sceneRegistry.nodes.get(movingNode.parentId)
-          if (parentObj) {
-            const worldVec = new THREE.Vector3(gridX, y, gridZ)
-            parentObj.worldToLocal(worldVec)
-            return [worldVec.x, worldVec.z]
-          }
-          const dx = gridX - (parentNode.position[0] as number)
-          const dz = gridZ - (parentNode.position[2] as number)
-          const angle = -(parentNode.rotation as number)
-          return [
-            dx * Math.cos(angle) - dz * Math.sin(angle),
-            dx * Math.sin(angle) + dz * Math.cos(angle),
-          ]
-        }
-      }
-
-      // Stair/roof live directly in the level — their stored position is building-local.
-      // event.localPosition is already building-local, so using it handles building rotation.
-      return [buildingLocalX, buildingLocalZ]
-    }
-
-    const onGridMove = (event: GridEvent) => {
-      const y = event.position[1]
-
-      const snappedLocal = snapFenceDraftPoint({
-        point: [event.localPosition[0], event.localPosition[2]],
-        walls: levelWalls,
-        fences: levelFences,
-      })
-      const [gridX, , gridZ] = localToWorldPoint(snappedLocal, y)
-
-      if (previousGridPosRef.current && (gridX !== previousGridPosRef.current[0] || gridZ !== previousGridPosRef.current[1])) {
-        sfxEmitter.emit('sfx:grid-snap')
-      }
-
-      previousGridPosRef.current = [gridX, gridZ]
-      const [lx, lz] = snappedLocal
-      setCursorWorldPos([lx, event.localPosition[1], lz])
-
-      const [localX, localZ] = computeLocal(gridX, gridZ, y, lx, lz)
-
-      // Directly update the Three.js mesh — no store update during drag
-      const mesh = sceneRegistry.nodes.get(movingNode.id)
-      if (mesh) {
-        mesh.position.x = localX
-        mesh.position.z = localZ
-      }
-
-      // Publish world-space position so the 2D floorplan can track the drag
-      useLiveTransforms.getState().set(movingNode.id, {
-        position: [gridX, y, gridZ],
-        rotation: pendingRotation,
-      })
-    }
-
-    const onGridClick = (event: GridEvent) => {
-      const y = event.position[1]
-      const snappedLocal = snapFenceDraftPoint({
-        point: [event.localPosition[0], event.localPosition[2]],
-        walls: levelWalls,
-        fences: levelFences,
-      })
-      const [gridX, , gridZ] = localToWorldPoint(snappedLocal, y)
-      const [lx, lz] = snappedLocal
-
-      const [localX, localZ] = computeLocal(gridX, gridZ, y, lx, lz)
-
-      wasCommitted = true
-
-      // The store still holds the original values (we didn't update during drag).
-      // Resume temporal and apply the final state as a single undoable step.
-      useScene.temporal.getState().resume()
-
-      if (isNew && movingNode.type === 'roof') {
-        clearRoofDuplicateMetadata(movingNode.id as AnyNodeId, {
-          position: [localX, movingNode.position[1], localZ],
-          rotation: pendingRotation,
-          metadata: committedMeta,
-        })
-      } else {
-        useScene.getState().updateNode(movingNode.id, {
-          position: [localX, movingNode.position[1], localZ],
-          rotation: pendingRotation,
-          metadata: committedMeta,
-        })
-      }
-
-      useScene.temporal.getState().pause()
-
-      sfxEmitter.emit('sfx:item-place')
-      useViewer.getState().setSelection({ selectedIds: [movingNode.id] })
-      useLiveTransforms.getState().clear(movingNode.id)
-      exitMoveMode()
-      event.nativeEvent?.stopPropagation?.()
-    }
-
-    const onCancel = () => {
-      wasCancelled = true
-      useLiveTransforms.getState().clear(movingNode.id)
-      if (isNew) {
-        useScene.getState().deleteNode(movingNode.id)
-      } else {
-        useScene.getState().updateNode(movingNode.id, {
-          position: original.position,
-          rotation: original.rotation,
-          metadata: original.metadata,
-        })
-      }
-      useScene.temporal.getState().resume()
-      exitMoveMode()
-    }
-
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement) {
-        return
-      }
-
-      const ROTATION_STEP = Math.PI / 4
-      let rotationDelta = 0
-      if (event.key === 'r' || event.key === 'R') rotationDelta = ROTATION_STEP
-      else if (event.key === 't' || event.key === 'T') rotationDelta = -ROTATION_STEP
-
-      if (rotationDelta !== 0) {
-        event.preventDefault()
-        sfxEmitter.emit('sfx:item-rotate')
-
-        pendingRotation += rotationDelta
-
-        // Directly update the Three.js mesh — no store update during drag
-        const mesh = sceneRegistry.nodes.get(movingNode.id)
-        if (mesh) mesh.rotation.y = pendingRotation
-
-        // Update live transform rotation for 2D floorplan
-        const currentLive = useLiveTransforms.getState().get(movingNode.id)
-        if (currentLive) {
-          useLiveTransforms.getState().set(movingNode.id, {
-            ...currentLive,
-            rotation: pendingRotation,
-          })
-        }
-      }
-    }
-
-    emitter.on('grid:move', onGridMove)
-    emitter.on('grid:click', onGridClick)
-    emitter.on('tool:cancel', onCancel)
-    window.addEventListener('keydown', onKeyDown)
-
-    return () => {
-      // Restore segment wrapper visibility (React will re-sync on next render)
-      if (segmentWrapperGroup) segmentWrapperGroup.visible = false
-      if (mergedRoofMesh) mergedRoofMesh.visible = true
-
-      // Clear ephemeral live transform
-      useLiveTransforms.getState().clear(movingNode.id)
-
-      if (!(wasCommitted || wasCancelled || isNew)) {
-        useScene.getState().updateNode(movingNode.id, {
-          position: original.position,
-          rotation: original.rotation,
-          metadata: original.metadata,
-        })
-      }
-      useScene.temporal.getState().resume()
-      emitter.off('grid:move', onGridMove)
-      emitter.off('grid:click', onGridClick)
-      emitter.off('tool:cancel', onCancel)
-      window.removeEventListener('keydown', onKeyDown)
-    }
-  }, [movingNode, exitMoveMode])
-
-  return (
-    <group>
-      <CursorSphere position={cursorWorldPos} showTooltip={false} />
-    </group>
-  )
-}