@pascal-app/editor 1.0.3 → 1.0.4

package/src/components/tools/item/use-placement-coordinator.tsx

@@ -3,6 +3,7 @@ import {
   type AlignmentAnchor,
   type AnyNode,
   type AnyNodeId,
+  beginSceneHistoryPauseSession,
   type CeilingEvent,
   canHostSurfaceChild,
   collectAlignmentAnchors,
@@ -10,6 +11,8 @@ import {
   findLevelAncestorId,
   type GridEvent,
   getScaledDimensions,
+  getWallBodyCenterOffset,
+  getWallLocalFaceZ,
   type ItemEvent,
   movingFootprintAnchors,
   type NodeEvent,
@@ -25,7 +28,6 @@ import {
   useScene,
   useSpatialQuery,
   type WallEvent,
-  type WallNode,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
 import { Html } from '@react-three/drei'
@@ -55,7 +57,7 @@ import { sfxEmitter } from '../../../lib/sfx-bus'
 import {
   surfaceAttachmentId,
   surfaceFramePose,
-  updateSurfaceNode,
+  updateSurfaceNode as writeSurfaceNode,
 } from '../../../lib/surface-attachment'
 import {
   projectAlignmentGuidesWorldToActiveBuildingLocal,
@@ -68,6 +70,7 @@ import useEditor, {
   isMagneticSnapActive,
 } from '../../../store/use-editor'
 import useFacingPose from '../../../store/use-facing-pose'
+import { getMovingNode } from '../../../store/use-interaction-scope'
 import usePlacementPreview from '../../../store/use-placement-preview'
 import {
   createItemSurfaceGridDispatch,
@@ -116,7 +119,7 @@ import {
 } from './placement-strategies'
 import { resolveItemPlacementSurfaceNormal } from './placement-surface'
 import type { PlacementState, TransitionResult } from './placement-types'
-import type { DraftNodeHandle } from './use-draft-node'
+import { type DraftNodeHandle, type ItemCopy, pausedDraftWrite } from './use-draft-node'
 
 const DEFAULT_DIMENSIONS: [number, number, number] = [1, 1, 1]
 
@@ -262,20 +265,20 @@ basePlaneMaterial.opacityNode = radialOpacity
 
 export interface PlacementCoordinatorConfig {
   asset: AssetInput | null
+  /** Scale to use when lazily creating a draft (e.g. for wall/ceiling duplicates). Defaults to [1,1,1]. */
+  defaultScale?: [number, number, number]
   draftNode: DraftNodeHandle
   initDraft: (gridPosition: Vector3) => void
-  onCommitted: () => boolean
-  onCancel?: () => void
   initialState?: PlacementState
-  /** Scale to use when lazily creating a draft (e.g. for wall/ceiling duplicates). Defaults to [1,1,1]. */
-  defaultScale?: [number, number, number]
-  /** Painted slot overrides to seed onto a lazily-created draft (wall/ceiling
-   *  duplicates) so the duplicate keeps its materials. */
-  slots?: ItemNode['slots']
+  onCancel?: () => void
+  onCommitted: () => boolean
   /** Move-mode sessions keep the grabbed item offset from the first surface hit
    *  (floor / wall / ceiling / item-surface / shelf) instead of snapping the
    *  item's origin under the cursor. */
   preserveDragOffset?: boolean
+  /** The item a duplicate copies, for a lazily-created draft (wall/ceiling
+   *  duplicates) to keep its materials and collections. */
+  copied?: ItemCopy
 }
 
 export function usePlacementCoordinator(config: PlacementCoordinatorConfig): React.ReactNode {
@@ -528,7 +531,14 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
 
   useEffect(() => {
     if (!asset) return
-    useScene.temporal.getState().pause()
+    // History is paused only around the placement's own writes, never for the whole carry:
+    // the draft stays out of history snapshots (core's history-drafts), so writes others make
+    // mid-carry record as their own steps, with space detection. In split view the 2D move
+    // overlay co-owns the gesture (keyed by the moving node), and the drop's commitStep lifts
+    // its pause too.
+    const movingNodeId = getMovingNode()?.id
+    const updateSurfaceNode: typeof writeSurfaceNode = (...args) =>
+      pausedDraftWrite(() => writeSurfaceNode(...args))
 
     const validators = { canPlaceOnFloor, canPlaceOnWall, canPlaceOnCeiling }
 
@@ -608,7 +618,6 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
 
       useAlignmentGuides.getState().clear()
-      useScene.temporal.getState().resume()
       if (committedId) {
         useViewer.getState().setSelection({ selectedIds: [committedId as AnyNodeId] })
       }
@@ -631,14 +640,22 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     ) => {
       const draftId = draftNode.current?.id ?? null
       const wasAdopted = draftNode.isAdopted
-      const finalId = draftNode.commit(nodeUpdate, {
-        ...options,
-        onReject: (reason) => {
-          feedback.reject(reason)
-          edgeMaterial.color.setHex(0xef_44_44)
-          basePlaneMaterial.color.setHex(0xef_44_44)
-        },
-      })
+      const drop = beginSceneHistoryPauseSession(useScene, { gesture: movingNodeId })
+      let finalId: string | null
+      try {
+        finalId = drop.commitStep(() =>
+          draftNode.commit(nodeUpdate, {
+            ...options,
+            onReject: (reason) => {
+              feedback.reject(reason)
+              edgeMaterial.color.setHex(0xef_44_44)
+              basePlaneMaterial.color.setHex(0xef_44_44)
+            },
+          }),
+        )
+      } finally {
+        drop.end()
+      }
       if (finalId && draftId) {
         useLiveTransforms.getState().clear(draftId)
         useLiveNodeOverrides.getState().clearFields(draftId, faceHostClearFields(draftNode.current))
@@ -832,16 +849,15 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         asset,
         initRotation,
         configRef.current.defaultScale,
-        configRef.current.slots,
+        configRef.current.copied,
       )
 
       const draft = draftNode.current
       if (draft) {
         Object.assign(draft, result.nodeUpdate)
         // One-time setup: put node in the right parent so it renders correctly
-        if (result.surfaceId !== undefined)
-          draftNode.updateSurface(result.nodeUpdate, result.surfaceId)
-        else updateSurfaceNode(draft.id, result.nodeUpdate)
+        if (result.surfaceId === undefined) updateSurfaceNode(draft.id, result.nodeUpdate)
+        else draftNode.updateSurface(result.nodeUpdate, result.surfaceId)
         disableDraftRaycastNow()
       }
 
@@ -1276,7 +1292,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
           asset,
           currentRotation,
           configRef.current.defaultScale,
-          configRef.current.slots,
+          configRef.current.copied,
         )
         const previewBounds = expandBoundsToGrid(
           getFallbackPreviewBounds(draftNode.current, asset, asset.attachTo),
@@ -1427,12 +1443,13 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
           const rot = result.nodeUpdate?.rotation
           if (rot) mesh.rotation.y = rot[1]
 
-          // Push wall-side items out by half the parent wall's thickness
-          if (asset.attachTo === 'wall-side' && placementState.current.wallId) {
+          if (placementState.current.wallId) {
             const parentWall = useScene.getState().nodes[placementState.current.wallId as AnyNodeId]
             if (parentWall?.type === 'wall') {
-              const wallThickness = (parentWall as WallNode).thickness ?? 0.1
-              mesh.position.z = (wallThickness / 2) * (draft.side === 'front' ? 1 : -1)
+              mesh.position.z =
+                asset.attachTo === 'wall-side'
+                  ? getWallLocalFaceZ(parentWall, draft.side === 'front' ? 'a' : 'b')
+                  : draft.position[2] + getWallBodyCenterOffset(parentWall)
             }
           }
         }
@@ -1600,7 +1617,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
             const segment =
               useScene.getState().nodes[placementState.current.roofSegmentId as AnyNodeId]
             if (segment?.type === 'roof-segment') {
-              mesh.position.z = (segment.wallThickness ?? 0.1) / 2
+              mesh.position.z = getWallLocalFaceZ({ thickness: segment.wallThickness ?? 0.1 }, 'a')
             }
           }
           const rot = result.nodeUpdate?.rotation
@@ -1640,10 +1657,12 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         applyTransition(result)
         const draft = draftNode.current
         if (draft) {
-          useScene.getState().updateNode(draft.id, {
-            parentId: result.nodeUpdate.parentId as string,
-            roofSegmentId: undefined,
-          })
+          pausedDraftWrite(() =>
+            useScene.getState().updateNode(draft.id, {
+              parentId: result.nodeUpdate.parentId as string,
+              roofSegmentId: undefined,
+            }),
+          )
         }
       } else {
         // Create mode: destroy transient and reset state
@@ -1758,7 +1777,8 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
       if (draftNode.isAdopted) {
         applyTransition(result)
-        if (draft) useScene.getState().updateNode(draft.id, result.nodeUpdate)
+        if (draft)
+          pausedDraftWrite(() => useScene.getState().updateNode(draft.id, result.nodeUpdate))
       } else {
         draftNode.destroy()
         gridPosition.current.set(...result.gridPosition)
@@ -1863,6 +1883,8 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
       if (event.node.id === draftNode.current?.id) return
       has3DPointerDrivenMoveRef.current = true
+      // An authored object's underside takes ceiling items (a pendant under a vault).
+      if (enterFaceHost(event)) return
       const result = itemSurfaceStrategy.enter(surfaceContext(event, generic), event)
       if (!result) return
       feedback.clear()
@@ -1880,6 +1902,17 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
 
     const onItemMove = (event: NodeEvent<AnyNode>, generic = false) => {
       if (event.node.id === draftNode.current?.id) return
+      if (
+        placementState.current.surface === 'block-face' &&
+        placementState.current.blockId === event.node.id
+      ) {
+        onFaceHostMove(event)
+        return
+      }
+      if (placementState.current.surface !== 'block-face' && enterFaceHost(event)) {
+        releaseCommit = () => onFaceHostClick(event)
+        return
+      }
       releaseCommit = () => onItemClick(event)
       has3DPointerDrivenMoveRef.current = true
       if (!cursorGroupRef.current) return
@@ -1931,9 +1964,9 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       }
 
       const surfaceWorld =
-        ctx.state.surfaceItemId !== null
-          ? resolveHostSurfaceWorld(ctx.state.surfaceItemId, event.position)
-          : null
+        ctx.state.surfaceItemId === null
+          ? null
+          : resolveHostSurfaceWorld(ctx.state.surfaceItemId, event.position)
       const itemMoveEvent = surfaceWorld ? { ...event, position: surfaceWorld } : event
       lastRawPos.current.set(
         itemMoveEvent.position[0],
@@ -1980,6 +2013,13 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     const onItemLeave = (event: NodeEvent<AnyNode>) => {
       if (event.node.type === 'cabinet') return
       if (event.node.id === draftNode.current?.id) return
+      if (
+        placementState.current.surface === 'block-face' &&
+        placementState.current.blockId === event.node.id
+      ) {
+        onFaceHostLeave(event)
+        return
+      }
       if (placementState.current.surface !== 'item-surface') return
 
       event.stopPropagation()
@@ -1995,6 +2035,13 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     const onItemClick = (event: NodeEvent<AnyNode>) => {
       gridDispatch.flush()
       if (feedback.reason) return
+      if (
+        placementState.current.surface === 'block-face' &&
+        placementState.current.blockId === event.node.id
+      ) {
+        onFaceHostClick(event)
+        return
+      }
       // Click on the draft item itself. R3F dispatches click events to
       // the closest intersected mesh only — when the draft is hovering
       // on a host (shelf / table / etc.) the draft's mesh is *above*
@@ -2309,9 +2356,9 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         return
       }
       const shelfWorld =
-        ctx.state.shelfId !== null
-          ? resolveHostSurfaceWorld(ctx.state.shelfId, event.position)
-          : null
+        ctx.state.shelfId === null
+          ? null
+          : resolveHostSurfaceWorld(ctx.state.shelfId, event.position)
       const shelfMoveEvent = shelfWorld ? { ...event, position: shelfWorld } : event
       const result = shelfSurfaceStrategy.move(ctx, shelfMoveEvent)
       if (!result) return
@@ -2613,7 +2660,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
       if (event.button !== 2) return
       const down = rightDown
       rightDown = null
-      if (!down || !configRef.current.onCancel) return
+      if (!(down && configRef.current.onCancel)) return
       const movedSq = (event.clientX - down.x) ** 2 + (event.clientY - down.y) ** 2
       const elapsed = performance.now() - down.t
       if (movedSq <= RIGHT_CLICK_CANCEL_MAX_MOVE_PX ** 2 && elapsed <= RIGHT_CLICK_CANCEL_MAX_MS) {
@@ -2662,8 +2709,7 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         const draft = draftNode.current
         if (draft === null) return
         if (draft.id in useScene.getState().nodes) return
-        // Temporal is paused during placement, createNode won't be tracked
-        useScene.getState().createNode(draft, draft.parentId as AnyNodeId)
+        pausedDraftWrite(() => useScene.getState().createNode(draft, draft.parentId as AnyNodeId))
       })
     })
 
@@ -2765,7 +2811,6 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
         useLiveNodeOverrides.getState().clearFields(draftNode.current.id, ['rotation'])
       }
       draftNode.destroy()
-      useScene.temporal.getState().resume()
       gridDispatch.cancel()
       emitter.off('grid:move', gridDispatch.schedule)
       emitter.off('grid:click', onGridClick)
@@ -2862,7 +2907,9 @@ export function usePlacementCoordinator(config: PlacementCoordinatorConfig): Rea
     )
       return
     draft.parentId = viewerLevelId
-    useScene.getState().updateNode(draft.id as AnyNodeId, { parentId: viewerLevelId })
+    pausedDraftWrite(() =>
+      useScene.getState().updateNode(draft.id as AnyNodeId, { parentId: viewerLevelId }),
+    )
   }, [viewerLevelId, draftNode, asset])
 
   // Restore the draft mesh's raycast when the coordinator unmounts (tool change).

package/src/components/tools/paint-region/use-paint-tint.ts

@@ -0,0 +1,37 @@
+import {
+  getCatalogMaterialById,
+  parseMaterialRef,
+  type SceneMaterialId,
+  useScene,
+} from '@pascal-app/core'
+import { useMemo } from 'react'
+import { usePaintRegionMode } from '../../../lib/paint-region-mode'
+import useEditor from '../../../store/use-editor'
+
+/**
+ * The paint material's colour for a region preview: a library preset's
+ * preview colour, a scene material's colour, or a plain material colour;
+ * `fallback` for the eraser or a material with no cheap colour.
+ */
+export function usePaintTint(fallback: string): string {
+  const active = useEditor((state) => state.activePaintMaterial)
+  const eraser = usePaintRegionMode((state) => state.mode) === 'erase'
+  const materials = useScene((state) => state.materials)
+  return useMemo(() => {
+    if (eraser) return fallback
+    const parsed = parseMaterialRef(active?.materialPreset)
+    if (parsed?.kind === 'library') {
+      const color = getCatalogMaterialById(parsed.id)?.previewColor
+      if (color) return color
+    }
+    if (parsed?.kind === 'scene') {
+      const color = materials[parsed.id as SceneMaterialId]?.material.properties?.color
+      if (color) return color
+    }
+    return (
+      active?.material?.properties?.color ??
+      getCatalogMaterialById(active?.material?.id)?.previewColor ??
+      fallback
+    )
+  }, [active, eraser, materials, fallback])
+}