stair: 2D move-revert fix, parent ground menu, curved/spiral in-world…

… arrows - Route stair 2D moves through `floorplanMoveTarget` and honor `movingNodeOrigin === '2d'` in `MoveRoofTool` cleanup so the 3D tool's restore-from-snapshot no longer stomps the 2D commit. - Parent stair selection shows an in-world ground action menu (move / duplicate / delete) anchored beside the stair; the screen-space floating menu is suppressed for `type === 'stair'` to match door / window / segment. - Curved & spiral stairs gain in-world resize arrows: rise (centered on the pillar for spirals), width, inner radius, and two sweep handles (one per arc end) clustered beside the width arrow. - Camera controls pause during curved-stair drags. Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>
pascalorg · wass08 · May 27, 2026 · May 18, 2026 · May 20, 2026 · May 20, 2026
commit 44344bffbfde43ea68eee7ffd9c536cd720ea912
diff --git a/packages/editor/src/components/editor/custom-camera-controls.tsx b/packages/editor/src/components/editor/custom-camera-controls.tsx
@@ -144,6 +144,10 @@ export const CustomCameraControls = () => {
   const resizingStairSegmentWidth = useEditor((s) => s.resizingStairSegmentWidth)
   const resizingStairSegmentLength = useEditor((s) => s.resizingStairSegmentLength)
   const resizingStairSegmentHeight = useEditor((s) => s.resizingStairSegmentHeight)
+  const resizingCurvedStairRise = useEditor((s) => s.resizingCurvedStairRise)
+  const resizingCurvedStairWidth = useEditor((s) => s.resizingCurvedStairWidth)
+  const resizingCurvedStairInnerRadius = useEditor((s) => s.resizingCurvedStairInnerRadius)
+  const resizingCurvedStairSweep = useEditor((s) => s.resizingCurvedStairSweep)
   const isBoxSelectActive = mode === 'select' && selectionTool === 'marquee'
   const isInteracting = Boolean(
     tool ||
@@ -156,6 +160,10 @@ export const CustomCameraControls = () => {
       resizingStairSegmentWidth ||
       resizingStairSegmentLength ||
       resizingStairSegmentHeight ||
+      resizingCurvedStairRise ||
+      resizingCurvedStairWidth ||
+      resizingCurvedStairInnerRadius ||
+      resizingCurvedStairSweep ||
       isBoxSelectActive,
   )
   const touches = useMemo(() => {

diff --git a/packages/editor/src/components/editor/floating-action-menu.tsx b/packages/editor/src/components/editor/floating-action-menu.tsx
@@ -459,6 +459,8 @@ export function FloatingActionMenu() {
   if (node?.type === 'window') return null
   // Stair segments use the in-world `StairSegmentGroundActionMenu`.
   if (node?.type === 'stair-segment') return null
+  // Parent stairs use the in-world `StairGroundActionMenu`.
+  if (node?.type === 'stair') return null
 
   return (
     <group>

diff --git a/packages/editor/src/components/editor/index.tsx b/packages/editor/src/components/editor/index.tsx
@@ -66,7 +66,7 @@ import { PresetThumbnailGenerator } from './preset-thumbnail-generator'
 import { SelectionManager } from './selection-manager'
 import { SiteEdgeLabels } from './site-edge-labels'
 import { SnapshotCaptureOverlay } from './snapshot-capture-overlay'
-import { StairSegmentHandles } from './stair-segment-handles'
+import { StairHandles, StairSegmentHandles } from './stair-segment-handles'
 import { type SnapshotCameraData, ThumbnailGenerator } from './thumbnail-generator'
 import { WallMeasurementLabel } from './wall-measurement-label'
 import { WallMoveSideHandles } from './wall-move-side-handles'
@@ -594,6 +594,7 @@ const ViewerSceneContent = memo(function ViewerSceneContent({
       {!(isVersionPreviewMode || isFirstPersonMode) && <DoorSideHandles />}
       {!(isVersionPreviewMode || isFirstPersonMode) && <WindowSideHandles />}
       {!(isVersionPreviewMode || isFirstPersonMode) && <StairSegmentHandles />}
+      {!(isVersionPreviewMode || isFirstPersonMode) && <StairHandles />}
       {!(isVersionPreviewMode || isFirstPersonMode) && <FloatingActionMenu />}
       {!(isVersionPreviewMode || isFirstPersonMode) && <FloatingBuildingActionMenu />}
       {!isFirstPersonMode && <WallMeasurementLabel />}

diff --git a/packages/editor/src/components/editor/stair-segment-handles.tsx b/packages/editor/src/components/editor/stair-segment-handles.tsx
diff --git a/packages/editor/src/components/tools/roof/move-roof-tool.tsx b/packages/editor/src/components/tools/roof/move-roof-tool.tsx
@@ -341,7 +341,16 @@ export const MoveRoofTool: React.FC<{
       // Clear ephemeral live transform
       useLiveTransforms.getState().clear(movingNode.id)
 
-      if (!(wasCommitted || wasCancelled || isNew)) {
+      // Skip restore when the 2D floor-plan overlay claimed teardown
+      // ownership — same contract `FloorplanRegistryMoveOverlay` uses to
+      // decide whether to revert its own apply() writes. Without this,
+      // a stair / roof move committed in the floor plan unmounts this
+      // tool with `wasCommitted === false` (this tool's own grid-click
+      // never fired), and the restore below stomps the just-committed
+      // position back to the snapshot.
+      const finalisedBy2D = useEditor.getState().movingNodeOrigin === '2d'
+
+      if (!(wasCommitted || wasCancelled || isNew || finalisedBy2D)) {
         useScene.getState().updateNode(movingNode.id, {
           position: original.position,
           rotation: original.rotation,

diff --git a/packages/editor/src/store/use-editor.tsx b/packages/editor/src/store/use-editor.tsx
@@ -227,6 +227,14 @@ type EditorState = {
   setResizingStairSegmentLength: (segment: StairSegmentNode | null) => void
   resizingStairSegmentHeight: StairSegmentNode | null
   setResizingStairSegmentHeight: (segment: StairSegmentNode | null) => void
+  resizingCurvedStairRise: StairNode | null
+  setResizingCurvedStairRise: (stair: StairNode | null) => void
+  resizingCurvedStairWidth: StairNode | null
+  setResizingCurvedStairWidth: (stair: StairNode | null) => void
+  resizingCurvedStairInnerRadius: StairNode | null
+  setResizingCurvedStairInnerRadius: (stair: StairNode | null) => void
+  resizingCurvedStairSweep: StairNode | null
+  setResizingCurvedStairSweep: (stair: StairNode | null) => void
   curvingWall: WallNode | null
   setCurvingWall: (wall: WallNode | null) => void
   curvingFence: FenceNode | null
@@ -664,6 +672,14 @@ const useEditor = create<EditorState>()(
       setResizingStairSegmentLength: (segment) => set({ resizingStairSegmentLength: segment }),
       resizingStairSegmentHeight: null,
       setResizingStairSegmentHeight: (segment) => set({ resizingStairSegmentHeight: segment }),
+      resizingCurvedStairRise: null,
+      setResizingCurvedStairRise: (stair) => set({ resizingCurvedStairRise: stair }),
+      resizingCurvedStairWidth: null,
+      setResizingCurvedStairWidth: (stair) => set({ resizingCurvedStairWidth: stair }),
+      resizingCurvedStairInnerRadius: null,
+      setResizingCurvedStairInnerRadius: (stair) => set({ resizingCurvedStairInnerRadius: stair }),
+      resizingCurvedStairSweep: null,
+      setResizingCurvedStairSweep: (stair) => set({ resizingCurvedStairSweep: stair }),
       curvingWall: null,
       setCurvingWall: (wall) => set({ curvingWall: wall }),
       curvingFence: null,

diff --git a/packages/nodes/src/stair/definition.ts b/packages/nodes/src/stair/definition.ts
@@ -1,5 +1,6 @@
 import { type NodeDefinition, StairNode as StairNodeSchema } from '@pascal-app/core'
 import { buildStairFloorplan } from './floorplan'
+import { stairFloorplanMoveTarget } from './floorplan-move'
 import { stairParametrics } from './parametrics'
 import { StairNode } from './schema'
 
@@ -43,6 +44,7 @@ export const stairDefinition: NodeDefinition<typeof StairNode> = {
   // compute their own polygon in isolation. See
   // `nodes/src/stair/floorplan.ts` for the emitter.
   floorplan: buildStairFloorplan,
+  floorplanMoveTarget: stairFloorplanMoveTarget,
 
   presentation: {
     label: 'Stair',

diff --git a/packages/nodes/src/stair/floorplan-move.ts b/packages/nodes/src/stair/floorplan-move.ts
@@ -0,0 +1,72 @@
+import {
+  type AnyNodeId,
+  type FloorplanMoveTarget,
+  type FloorplanMoveTargetSession,
+  type StairNode,
+  snapPointToGrid,
+  useScene,
+} from '@pascal-app/core'
+
+/**
+ * 2D floor-plan move handler for stair — kicks in when the user clicks
+ * "Move" on the stair action menu and the floor-plan view is active.
+ * Stairs are free-floating on the slab (no wall anchor), so the apply
+ * logic is just: pointer in plan space → snap to 0.5 m grid (Shift
+ * bypasses) → write `position` via `useScene.updateNodes`.
+ *
+ * Routing through `floorplanMoveTarget` (instead of the overlay's
+ * generic Path 2 translate) fixes two latent bugs the generic path
+ * has for stair:
+ *
+ *   1. Path 2's `onPointerUp` bails when `event.target.closest(
+ *      '[data-floorplan-scene]')` fails — which happens when the
+ *      pointer-up lands on empty grid background (the SVG `<g>` only
+ *      covers painted entries, so `target` resolves to the parent
+ *      `<svg>` with no `[data-floorplan-scene]` ancestor). Path 1
+ *      uses the overlay's bounding-rect check, which accepts any
+ *      pointer inside the SVG viewport.
+ *   2. Path 2 commits via a single `updateNode` call that has no
+ *      "self-owned commit" hook, so the overlay's diff path can
+ *      silently revert when the final state matches the snapshot.
+ *      The `commit()` below mirrors door's pattern: take ownership
+ *      of the atomic write so the deterministic
+ *      revert → resume → `session.commit()` path runs.
+ */
+export const stairFloorplanMoveTarget: FloorplanMoveTarget<StairNode> = ({ node }) => {
+  // Y stays put — stair's elevation is set by its parent level, not by
+  // the 2D plan drag. Snapshot at start so apply() doesn't need to read
+  // it from a possibly-mutated scene each tick.
+  const startY = node.position[1]
+
+  // Track the last successful placement so `commit()` can write it
+  // atomically — see the comment on `commit` below.
+  let lastValid: { position: [number, number, number] } | null = null
+
+  const session: FloorplanMoveTargetSession = {
+    affectedIds: [node.id as AnyNodeId],
+    apply({ planPoint, modifiers }) {
+      const [sx, sz] = modifiers.shiftKey ? planPoint : snapPointToGrid(planPoint, 0.5)
+      lastValid = { position: [sx, startY, sz] }
+      useScene.getState().updateNodes([{ id: node.id as AnyNodeId, data: lastValid }])
+    },
+    canCommit() {
+      // No overlap / placement rules for stairs in 2D — any pointer-up
+      // position commits. Mirrors the 3D move tool which also lets
+      // stairs land anywhere on the slab.
+      return true
+    },
+    commit() {
+      // Own the atomic write so the overlay takes the deterministic
+      // commit-path (revert → resume → session.commit()). The dispatcher's
+      // diff path would otherwise re-derive the final state by comparing
+      // the post-apply scene to the snapshot — which produces an empty
+      // diff (and silent revert) when the committed move happens to have
+      // identical key/value pairs to the snapshot. Owning commit removes
+      // that foot-gun. Same pattern door / window use.
+      if (!lastValid) return
+      useScene.getState().updateNodes([{ id: node.id as AnyNodeId, data: lastValid }])
+    },
+  }
+
+  return session
+}