@pascal-app/editor 1.0.0-beta.4 → 1.0.0

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

@@ -1,17 +1,21 @@
 import {
   type AnyNode,
   collectAlignmentAnchors,
+  createDefaultStairSegment,
   createSurfaceOpeningPreviewController,
-  type EventSuffix,
+  DEFAULT_LEVEL_HEIGHT,
   emitter,
   type GridEvent,
+  getFloorStackedPosition,
+  getLevelFloorToFloorHeight,
   type LevelNode,
   movingAlignmentAnchors,
   type NodeEvent,
   resolveAlignment,
+  resolveFrozenFloorPlacementPatch,
   resolveSupportSlabPatch,
   StairNode,
-  StairSegmentNode,
+  type StairSegmentNode,
   syncAutoStairOpenings,
   useScene,
 } from '@pascal-app/core'
@@ -36,7 +40,10 @@ import useFacingPose from '../../../store/use-facing-pose'
 import { useStairBuildPreview } from '../../../store/use-stair-build-preview'
 import { CursorSphere } from '../shared/cursor-sphere'
 import { getFloorStackPreviewPosition } from '../shared/floor-stack-preview'
-import { resolvePointerSupportSurface } from '../shared/pointer-support-cap'
+import {
+  type PointerSupportSurface,
+  resolvePointerSupportSurface,
+} from '../shared/pointer-support-cap'
 import { createStairCommitGate, swallowFollowUpBrowserClick } from './stair-click-guard'
 import {
   DEFAULT_CURVED_STAIR_INNER_RADIUS,
@@ -47,7 +54,6 @@ import {
   DEFAULT_SPIRAL_TOP_LANDING_MODE,
   DEFAULT_STAIR_ATTACHMENT_SIDE,
   DEFAULT_STAIR_FILL_TO_FLOOR,
-  DEFAULT_STAIR_HEIGHT,
   DEFAULT_STAIR_LENGTH,
   DEFAULT_STAIR_OPENING_OFFSET,
   DEFAULT_STAIR_RAILING_HEIGHT,
@@ -64,26 +70,12 @@ const ALIGNMENT_THRESHOLD_M = 0.08
 type ClickTriggerEvent = GridEvent | NodeEvent<AnyNode>
 type MoveTriggerEvent = GridEvent | NodeEvent<AnyNode>
 
-const CLICK_TRIGGER_KINDS = [
-  'shelf',
-  'item',
-  'slab',
-  'ceiling',
-  'wall',
-  'fence',
-  'column',
-  'roof',
-  'roof-segment',
-  'stair',
-  'stair-segment',
-] as const
-
 /**
  * Generates the step-profile geometry for the ghost preview.
  * Same algorithm as StairSystem's generateStairSegmentGeometry.
  */
-function createStairPreviewGeometry(): THREE.BufferGeometry {
-  const riserHeight = DEFAULT_STAIR_HEIGHT / DEFAULT_STAIR_STEP_COUNT
+function createStairPreviewGeometry(rise: number): THREE.BufferGeometry {
+  const riserHeight = rise / DEFAULT_STAIR_STEP_COUNT
   const treadDepth = DEFAULT_STAIR_LENGTH / DEFAULT_STAIR_STEP_COUNT
 
   const shape = new THREE.Shape()
@@ -114,19 +106,40 @@ function createStairPreviewGeometry(): THREE.BufferGeometry {
 }
 
 /**
- * Creates a default straight stair segment.
+ * Creates a default straight stair segment climbing `rise` — the storey it is
+ * dropped on, not a constant: the placed stair has no explicit `totalRise`, so
+ * this is the height `syncStairRises` immediately converges it to anyway.
  */
-function createDefaultStairSegment() {
-  return StairSegmentNode.parse({
-    segmentType: 'stair',
+function resolvePlacedStairRise(
+  nodes: Record<string, AnyNode>,
+  levelId: LevelNode['id'],
+  stair: StairNode,
+  supportSurface: PointerSupportSurface | null,
+): number {
+  // Same contract as `resolveStairTotalRise` for a stair that is not in the
+  // scene yet: the storey height minus whatever slab lifts the drop point,
+  // capped by the surface the pointer actually aims at (a floor under an
+  // overlapping deck must not elect the deck).
+  const base = getFloorStackedPosition({
+    node: stair,
+    nodes,
+    position: stair.position,
+    rotation: stair.rotation,
+    levelId,
+    maxElevation: supportSurface?.elevation ?? null,
+  })[1]
+  return getLevelFloorToFloorHeight(levelId, nodes) - base
+}
+
+function createSeedStairSegment(rise: number) {
+  return createDefaultStairSegment({
     width: DEFAULT_STAIR_WIDTH,
     length: DEFAULT_STAIR_LENGTH,
-    height: DEFAULT_STAIR_HEIGHT,
+    height: rise,
     stepCount: DEFAULT_STAIR_STEP_COUNT,
     attachmentSide: DEFAULT_STAIR_ATTACHMENT_SIDE,
     fillToFloor: DEFAULT_STAIR_FILL_TO_FLOOR,
     thickness: DEFAULT_STAIR_THICKNESS,
-    position: [0, 0, 0],
   })
 }
 
@@ -177,7 +190,7 @@ function commitStairPlacement(
   levelId: LevelNode['id'],
   position: [number, number, number],
   rotation: number,
-  supportElevationCap: number | null,
+  supportSurface: PointerSupportSurface | null,
 ): void {
   const { createNodes, nodes } = useScene.getState()
   const placementLevelId = resolveStairPlacementLevelId(
@@ -189,7 +202,7 @@ function commitStairPlacement(
 
   const stairCount = Object.values(nodes).filter((n) => n.type === 'stair').length
   const name = `Staircase ${stairCount + 1}`
-  const segment = createDefaultStairSegment()
+  const seed = createSeedStairSegment(getLevelFloorToFloorHeight(placementLevelId, nodes))
 
   const destinationPlan = resolveStairDestinationLevel({
     createMissing: true,
@@ -205,20 +218,35 @@ function commitStairPlacement(
       nextLevelId,
       position,
       rotation,
-      segmentId: segment.id,
+      segmentId: seed.id,
     }),
     parentId: placementLevelId,
   })
+  const segment = {
+    ...seed,
+    height: resolvePlacedStairRise(nodes, placementLevelId, stair, supportSurface),
+  }
   const prospectiveNodes = {
     ...nodes,
     [stair.id]: stair,
     [segment.id]: { ...segment, parentId: stair.id },
   } as Record<string, AnyNode>
+  const placementPatch = supportSurface?.sourceNodeId
+    ? resolveFrozenFloorPlacementPatch(stair, prospectiveNodes, {
+        position,
+        rotation,
+        elevation: supportSurface.elevation,
+        preferredSlabId: supportSurface.supportSlabId,
+      })
+    : {
+        position,
+        ...resolveSupportSlabPatch(stair, prospectiveNodes, {
+          maxElevation: supportSurface?.elevation,
+        }),
+      }
   const committedStair = StairNode.parse({
     ...stair,
-    ...resolveSupportSlabPatch(stair, prospectiveNodes, {
-      maxElevation: supportElevationCap,
-    }),
+    ...placementPatch,
   })
 
   const createdLevel = destinationPlan?.createdLevel
@@ -243,12 +271,18 @@ export const StairTool: React.FC = () => {
   const cursorRef = useRef<THREE.Group>(null)
   const previewRef = useRef<THREE.Group>(null)
   const rotationRef = useRef(0)
-  const supportCapRef = useRef<number | null>(null)
+  const supportSurfaceRef = useRef<PointerSupportSurface | null>(null)
   const previousGridPosRef = useRef<[number, number] | null>(null)
   const lastCanonicalPositionRef = useRef<[number, number, number] | null>(null)
   const currentLevelId = useViewer((state) => state.selection.levelId)
 
-  const previewGeometry = useMemo(() => createStairPreviewGeometry(), [])
+  const previewRise = useScene((state) =>
+    currentLevelId ? getLevelFloorToFloorHeight(currentLevelId, state.nodes) : DEFAULT_LEVEL_HEIGHT,
+  )
+  const previewRiseRef = useRef(previewRise)
+  previewRiseRef.current = previewRise
+  const previewGeometry = useMemo(() => createStairPreviewGeometry(previewRise), [previewRise])
+  useEffect(() => () => previewGeometry.dispose(), [previewGeometry])
 
   useEffect(() => {
     if (!currentLevelId) return
@@ -261,11 +295,18 @@ export const StairTool: React.FC = () => {
     // Reset rotation when tool activates
     rotationRef.current = 0
     useStairBuildPreview.getState().reset()
-    if (previewRef.current) previewRef.current.rotation.y = 0
+    if (previewRef.current) {
+      previewRef.current.rotation.y = 0
+      previewRef.current.scale.y = 1
+    }
     lastCanonicalPositionRef.current = null
-    supportCapRef.current = null
+    supportSurfaceRef.current = null
 
-    const buildPreviewScene = (position: [number, number, number], rotation: number) => {
+    const buildPreviewScene = (
+      position: [number, number, number],
+      rotation: number,
+      supportSurface: PointerSupportSurface | null,
+    ) => {
       const nodes = useScene.getState().nodes
       const placementLevelId = resolveStairPlacementLevelId(
         nodes,
@@ -280,15 +321,19 @@ export const StairTool: React.FC = () => {
         nodes,
       })
       const nextLevelId = destinationPlan?.toLevel.id ?? placementLevelId
-      const segment = createDefaultStairSegment()
+      const seed = createSeedStairSegment(getLevelFloorToFloorHeight(placementLevelId, nodes))
       const stair = createDefaultStairNode({
         name: 'Staircase Preview',
         levelId: placementLevelId,
         nextLevelId,
         position,
         rotation,
-        segmentId: segment.id,
+        segmentId: seed.id,
       })
+      const segment = {
+        ...seed,
+        height: resolvePlacedStairRise(nodes, placementLevelId, stair, supportSurface),
+      }
       const previewNodes = {
         ...nodes,
         ...(destinationPlan?.createdLevel
@@ -298,7 +343,7 @@ export const StairTool: React.FC = () => {
         [segment.id]: { ...segment, parentId: stair.id },
       } as Record<string, AnyNode>
 
-      return { placementLevelId, previewNodes, stair }
+      return { placementLevelId, previewNodes, stair, rise: segment.height }
     }
 
     // The preview rebuild (full-scene copy + destination-level resolution +
@@ -313,23 +358,37 @@ export const StairTool: React.FC = () => {
     const applyDraftPreview = (
       position: [number, number, number],
       rotation: number,
-      supportElevationCap: number | null,
+      supportSurface: PointerSupportSurface | null,
     ) => {
-      const key = `${position[0].toFixed(3)},${position[2].toFixed(3)},${rotation.toFixed(4)},${supportElevationCap?.toFixed(3) ?? 'none'}`
+      const key = `${position[0].toFixed(3)},${position[2].toFixed(3)},${rotation.toFixed(4)},${supportSurface?.elevation.toFixed(3) ?? 'none'},${supportSurface?.sourceNodeId ?? 'floor'}`
       if (key === lastPreviewKey) return
       lastPreviewKey = key
       useStairBuildPreview.getState().setPreview([position[0], position[2]], rotation)
-      const preview = buildPreviewScene(position, rotation)
-      const visualPosition = preview
-        ? getFloorStackPreviewPosition({
-            node: preview.stair,
-            position,
-            rotation,
-            levelId: preview.placementLevelId,
-            nodes: preview.previewNodes,
-            maxElevation: supportElevationCap,
-          })
-        : position
+      const preview = buildPreviewScene(position, rotation, supportSurface)
+      const frozenPatch =
+        preview && supportSurface?.sourceNodeId
+          ? resolveFrozenFloorPlacementPatch(preview.stair, preview.previewNodes, {
+              position,
+              rotation,
+              elevation: supportSurface.elevation,
+              preferredSlabId: supportSurface.supportSlabId,
+            })
+          : null
+      const previewPosition = frozenPatch?.position ?? position
+      const previewStair = frozenPatch
+        ? ({ ...preview?.stair, ...frozenPatch } as AnyNode)
+        : preview?.stair
+      const visualPosition =
+        preview && previewStair
+          ? getFloorStackPreviewPosition({
+              node: previewStair,
+              position: previewPosition,
+              rotation,
+              levelId: preview.placementLevelId,
+              nodes: preview.previewNodes,
+              maxElevation: supportSurface?.sourceNodeId ? null : supportSurface?.elevation,
+            })
+          : previewPosition
       if (cursorRef.current) {
         cursorRef.current.position.set(
           visualPosition[0],
@@ -341,6 +400,9 @@ export const StairTool: React.FC = () => {
       if (previewRef.current) {
         previewRef.current.position.set(...visualPosition)
         previewRef.current.rotation.y = rotation
+        // The ghost geometry is built for the storey height; squash it to the
+        // rise the placed flight will get on this surface.
+        previewRef.current.scale.y = preview ? preview.rise / previewRiseRef.current : 1
       }
 
       // Forward-facing triangle (editor-side overlay). The run ascends along
@@ -374,7 +436,7 @@ export const StairTool: React.FC = () => {
       z: number,
       rotation: number,
     ): ReturnType<typeof resolveAlignment> | null => {
-      const preview = buildPreviewScene([x, 0, z], rotation)
+      const preview = buildPreviewScene([x, 0, z], rotation, supportSurfaceRef.current)
       const moving = preview
         ? movingAlignmentAnchors(preview.stair, preview.previewNodes, x, z, rotation)
         : []
@@ -424,8 +486,10 @@ export const StairTool: React.FC = () => {
     }
 
     const resolveStairPosition = (event: MoveTriggerEvent): [number, number, number] | null => {
-      const pointed = resolvePointerSupportSurface(cameraRef.current, event.position)
-      supportCapRef.current = pointed?.elevation ?? null
+      const pointed = resolvePointerSupportSurface(cameraRef.current, event.position, {
+        includeNodeTopSurfaces: true,
+      })
+      supportSurfaceRef.current = pointed
       const fallbackPosition =
         'node' in event ? lastCanonicalPositionRef.current : event.localPosition
       if (!pointed?.localPoint && !fallbackPosition) return null
@@ -450,7 +514,7 @@ export const StairTool: React.FC = () => {
       if (!position) return
       const [gridX, , gridZ] = position
       lastCanonicalPositionRef.current = position
-      applyDraftPreview(position, rotationRef.current, supportCapRef.current)
+      applyDraftPreview(position, rotationRef.current, supportSurfaceRef.current)
 
       if (
         (isGridSnapActive() || isMagneticSnapActive()) &&
@@ -484,7 +548,7 @@ export const StairTool: React.FC = () => {
       const position = resolveStairPosition(event)
       if (!position) return
 
-      commitStairPlacement(currentLevelId, position, rotationRef.current, supportCapRef.current)
+      commitStairPlacement(currentLevelId, position, rotationRef.current, supportSurfaceRef.current)
       openingPreview.clear()
       // Commit cleared the opening preview, so force the next hover (even on the
       // same cell) to rebuild rather than dedupe against the just-placed key.
@@ -526,7 +590,7 @@ export const StairTool: React.FC = () => {
           applyDraftPreview(
             lastCanonicalPositionRef.current,
             rotationRef.current,
-            supportCapRef.current,
+            supportSurfaceRef.current,
           )
         } else if (previewRef.current) {
           previewRef.current.rotation.y = rotationRef.current
@@ -536,26 +600,15 @@ export const StairTool: React.FC = () => {
 
     emitter.on('grid:move', onPointerMove)
     emitter.on('grid:click', commitAtCursor)
-    type SuffixedKey<K extends string> = `${K}:${EventSuffix}`
-    type ClickKey = SuffixedKey<(typeof CLICK_TRIGGER_KINDS)[number]>
-    type MoveKey = SuffixedKey<(typeof CLICK_TRIGGER_KINDS)[number]>
-    for (const kind of CLICK_TRIGGER_KINDS) {
-      const key = `${kind}:click` as ClickKey
-      emitter.on(key, commitAtCursor as never)
-      const moveKey = `${kind}:move` as MoveKey
-      emitter.on(moveKey, onPointerMove as never)
-    }
+    emitter.on('node:click', commitAtCursor)
+    emitter.on('node:move', onPointerMove)
     window.addEventListener('keydown', onKeyDown)
 
     return () => {
       emitter.off('grid:move', onPointerMove)
       emitter.off('grid:click', commitAtCursor)
-      for (const kind of CLICK_TRIGGER_KINDS) {
-        const key = `${kind}:click` as ClickKey
-        emitter.off(key, commitAtCursor as never)
-        const moveKey = `${kind}:move` as MoveKey
-        emitter.off(moveKey, onPointerMove as never)
-      }
+      emitter.off('node:click', commitAtCursor)
+      emitter.off('node:move', onPointerMove)
       window.removeEventListener('keydown', onKeyDown)
       useAlignmentGuides.getState().clear()
       openingPreview.clear()

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

@@ -3,6 +3,7 @@ import {
   type AnyNodeId,
   type BuildingNode,
   type CeilingNode,
+  createSceneApi,
   type FenceNode,
   nodeRegistry,
   type SlabNode,
@@ -11,9 +12,10 @@ import {
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
 import { type ComponentType, lazy, Suspense, useMemo } from 'react'
+import { useRegisteredToolEnabled } from '../../hooks/use-registered-tool-enabled'
 import { siteBoundaryHandlesEnabled } from '../../lib/site-boundary'
 import useEditor, { type Phase, type Tool } from '../../store/use-editor'
-import {
+import useInteractionScope, {
   useControlPointReshape,
   useEditingHole,
   useEndpointReshape,
@@ -30,7 +32,7 @@ import { OpeningGuides3DLayer } from '../editor/opening-guides-3d-layer'
 import { WallSnapBeaconLayer } from '../editor/wall-snap-beacon-layer'
 import { ElevatorTool } from './elevator/elevator-tool'
 import { MoveTool } from './item/move-tool'
-import { RoofTool } from './roof/roof-tool'
+import { RegistryToolProvider } from './registry-tool-context'
 import { getRegistryAffordanceTool } from './shared/affordance-dispatch'
 import { FacingPoseIndicator } from './shared/facing-pose-indicator'
 import { SiteBoundaryEditor } from './site/site-boundary-editor'
@@ -91,7 +93,6 @@ const tools: Record<Phase, Partial<Record<Tool, React.FC>>> = {
     'property-line': SiteBoundaryEditor,
   },
   structure: {
-    roof: RoofTool,
     stair: StairTool,
     zone: ZoneTool,
   },
@@ -102,7 +103,11 @@ export const ToolManager: React.FC = () => {
   const phase = useEditor((state) => state.phase)
   const mode = useEditor((state) => state.mode)
   const tool = useEditor((state) => state.tool)
+  const registeredToolEnabled = useRegisteredToolEnabled(tool)
   const movingNode = useMovingNode()
+  const registryToolOwnsPlacement = useInteractionScope(
+    (state) => state.scope.kind === 'placing' && state.scope.driver === 'registry-tool',
+  )
   const movingNodeOrigin = useEditor((state) => state.movingNodeOrigin)
   const endpointReshape = useEndpointReshape()
   const controlPointReshape = useControlPointReshape()
@@ -139,8 +144,20 @@ export const ToolManager: React.FC = () => {
   const selectedIds = useViewer((state) => state.selection.selectedIds)
   const buildingId = useViewer((state) => state.selection.buildingId)
   const activeLevelId = useViewer((state) => state.selection.levelId)
+  const unit = useViewer((state) => state.unit)
   const setSelection = useViewer((state) => state.setSelection)
   const nodes = useScene((state) => state.nodes)
+  const registrySceneApi = useMemo(() => createSceneApi(useScene), [])
+  const registryToolContext = useMemo(
+    () => ({
+      activeLevelId: activeLevelId ?? null,
+      isCameraDragging: () => useViewer.getState().cameraDragging,
+      sceneApi: registrySceneApi,
+      selectNode: (nodeId: AnyNodeId) => setSelection({ selectedIds: [nodeId] }),
+      unit,
+    }),
+    [activeLevelId, registrySceneApi, setSelection, unit],
+  )
 
   // Building transform for the local group — all building-relative tools live inside this group
   // so their cursor positions and committed data are naturally in building-local space.
@@ -223,7 +240,7 @@ export const ToolManager: React.FC = () => {
     !showCeilingBoundaryEditor
 
   // Show build tools when in build mode
-  const showBuildTool = mode === 'build' && tool !== null
+  const showBuildTool = mode === 'build' && tool !== null && registeredToolEnabled
 
   // A move initiated from the 2D floor-plan (orange move-dot) is owned end-to-
   // end by `FloorplanRegistryMoveOverlay`, which marks the origin `'2d'` at
@@ -233,7 +250,7 @@ export const ToolManager: React.FC = () => {
   // (the scene writes the overlay makes still mirror into the 3D view). A
   // 3D-initiated move leaves the origin null until its own commit, so this only
   // suppresses the 3D tool for genuinely 2D-owned moves.
-  const showMover = movingNode != null && movingNodeOrigin !== '2d'
+  const showMover = movingNode != null && movingNodeOrigin !== '2d' && !registryToolOwnsPlacement
 
   // Registry-first: if the active tool's kind has a NodeDefinition with a
   // tool contribution, the registry-driven tool takes over.
@@ -261,7 +278,7 @@ export const ToolManager: React.FC = () => {
   }
 
   return (
-    <>
+    <RegistryToolProvider value={registryToolContext}>
       {/* World-space tools: site boundary and building movement operate in world coordinates */}
       {showSiteBoundaryEditor && <SiteBoundaryEditor />}
       {/* Terrain sculpting is a mode rather than a `tools[phase][tool]` entry —
@@ -375,7 +392,7 @@ export const ToolManager: React.FC = () => {
         )}
         {/* Registry-first: when the active tool's kind has a registered
             NodeDefinition with a tool contribution, mount it here. */}
-        {!movingNode && useRegistryTool && RegistryToolComponent && (
+        {(!movingNode || registryToolOwnsPlacement) && useRegistryTool && RegistryToolComponent && (
           <Suspense fallback={null}>
             <RegistryToolComponent />
           </Suspense>
@@ -405,6 +422,6 @@ export const ToolManager: React.FC = () => {
         {/* "Magnetic" beacon at the active wall-draft snap point. */}
         <WallSnapBeaconLayer />
       </group>
-    </>
+    </RegistryToolProvider>
   )
 }