@pascal-app/nodes 1.0.3 → 1.0.4

package/dist/door/move-tool.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { DoorNode, emitter, holdHiddenWallPointerEvents, isCurvedWall, sceneRegistry, spatialGridManager, useLiveTransforms, useScene, } from '@pascal-app/core';
+import { beginSceneHistoryDraft, collectionIdsOf, DoorNode, emitter, getOpeningWallPlacement, holdHiddenWallPointerEvents, isCurvedWall, runSceneHistoryDraftWrite, sceneRegistry, spatialGridManager, useLiveTransforms, useScene, } from '@pascal-app/core';
 import { calculateItemRotation, clearPlacementSurface, consumePlacementDragRelease, EDITOR_LAYER, getSideFromNormal, isGridSnapActive, isMagneticSnapActive, isValidWallSideFace, publishPlacementSurface, stripPlacementMetadataFlags, triggerSFX, useAlignmentGuides, useEditor, useFacingPose, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -9,6 +9,7 @@ import { commitOpeningMove } from '../shared/commit-opening-move';
 import { clearOpeningGuides3D, publishOpeningGuidesForWallEvent, } from '../shared/opening-guides-runtime';
 import { beginOpeningMoveHistorySession } from '../shared/opening-move-history';
 import { isWallMeshHidden, shouldIgnoreWallEventForOpeningMove, } from '../shared/opening-move-wall-gate';
+import { openingPlaneOffsetOnWall } from '../shared/opening-plane-offset';
 import { getRoofWallOpeningCursorPose, resolveRoofWallOpeningTarget, } from '../shared/roof-wall-opening-placement';
 import { resolveOpeningPlacement } from '../shared/wall-attach-target';
 import { collectWallOpeningAlignmentCandidates, resolveWallSlideAlignment, } from '../shared/wall-opening-alignment';
@@ -63,6 +64,8 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             ? movingDoorNode.metadata
             : {};
         const isNew = !!meta.isNew;
+        const endDraft = isNew ? null : beginSceneHistoryDraft(movingDoorNode.id, movingDoorNode);
+        const updateDraft = (data) => runSceneHistoryDraftWrite(() => useScene.getState().updateNode(movingDoorNode.id, data));
         const original = {
             position: [...movingDoorNode.position],
             rotation: [...movingDoorNode.rotation],
@@ -81,10 +84,12 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             visible: movingDoorNode.visible,
         };
         if (!isNew) {
-            useScene.getState().updateNode(movingDoorNode.id, {
+            updateDraft({
                 metadata: { ...meta, isTransient: true },
             });
         }
+        // Same-wall moves keep the wall-local plane offset; another host resets it.
+        const planeOffsetOn = (wallId) => openingPlaneOffsetOnWall(movingDoorNode, wallId);
         let currentHostId = movingDoorNode.parentId;
         let dragAnchor = null;
         // The wall the door was grabbed from. Nulled the first time the anchor
@@ -170,7 +175,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             const id = getLevelId();
             return id ? (sceneRegistry.nodes.get(id)?.position.y ?? 0) : 0;
         };
-        const getSlabElevation = (wallEvent) => spatialGridManager.getSlabElevationForWall(wallEvent.node.parentId ?? '', wallEvent.node.start, wallEvent.node.end, wallEvent.node.curveOffset ?? 0, wallEvent.node.thickness, wallEvent.node.supportSlabId);
+        const getSlabElevation = (wallEvent) => spatialGridManager.getSlabElevationForWall(wallEvent.node.parentId ?? '', wallEvent.node.start, wallEvent.node.end, wallEvent.node.curveOffset ?? 0, wallEvent.node.thickness, wallEvent.node.supportSlabId, wallEvent.node.justification);
         const hideCursor = () => {
             if (cursorGroupRef.current)
                 cursorGroupRef.current.visible = false;
@@ -196,7 +201,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
         const getPlacementOrientation = (event) => {
             const faceSide = getSideFromNormal(event.normal);
             const side = sideOverride ?? faceSide;
-            const rotationOffset = side !== faceSide ? Math.PI : 0;
+            const rotationOffset = side === faceSide ? 0 : Math.PI;
             return {
                 side,
                 itemRotation: calculateItemRotation(event.normal) + rotationOffset,
@@ -273,9 +278,24 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             // the free-follow uses, so validity reads at a glance. The node position is
             // still written (so the wall cuts the hole at the right spot) but
             // `visible:false` keeps the pale solid mesh from competing with the ghost.
-            if (currentHostId !== target.wallId) {
-                useScene.getState().updateNode(movingDoorNode.id, {
-                    position: [target.clampedX, target.clampedY, 0],
+            if (currentHostId === target.wallId) {
+                const doorMesh = sceneRegistry.nodes.get(movingDoorNode.id);
+                if (doorMesh) {
+                    // Where the opening system will put it: the body centre plane of a
+                    // justified wall plus the opening's own plane offset, on the arc.
+                    const placement = getOpeningWallPlacement(target.wallNode, {
+                        ...movingDoorNode,
+                        position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
+                        rotation: [0, target.itemRotation, 0],
+                    }, useScene.getState().nodes);
+                    doorMesh.position.set(...placement.position);
+                    doorMesh.rotation.set(...placement.rotation);
+                    doorMesh.updateMatrixWorld(true);
+                }
+            }
+            else {
+                updateDraft({
+                    position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                     rotation: [0, target.itemRotation, 0],
                     side: target.side,
                     parentId: target.wallId,
@@ -287,16 +307,8 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 markHostDirty(currentHostId);
                 currentHostId = target.wallId;
             }
-            else {
-                const doorMesh = sceneRegistry.nodes.get(movingDoorNode.id);
-                if (doorMesh) {
-                    doorMesh.position.set(target.clampedX, target.clampedY, 0);
-                    doorMesh.rotation.set(0, target.itemRotation, 0);
-                    doorMesh.updateMatrixWorld(true);
-                }
-            }
             useLiveTransforms.getState().set(movingDoorNode.id, {
-                position: [target.clampedX, target.clampedY, 0],
+                position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                 rotation: target.itemRotation,
             });
             markHostDirtyThrottled(target.wallId);
@@ -317,7 +329,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             // `-wallAngle + itemRotation` to face the same way as commit.
             // `cursorRotation` (the old symmetric-wireframe yaw) is π off here.
             const wallAngle = Math.atan2(target.wallNode.end[1] - target.wallNode.start[1], target.wallNode.end[0] - target.wallNode.start[0]);
-            const ghostWorldPos = wallLocalToWorld(target.wallNode, target.clampedX, target.clampedY, getLevelYOffset(), getSlabElevation(target.event));
+            const ghostWorldPos = wallLocalToWorld(target.wallNode, target.clampedX, target.clampedY, getLevelYOffset(), getSlabElevation(target.event), planeOffsetOn(target.wallId));
             const ghostYaw = target.itemRotation - wallAngle;
             setGhostPose({
                 position: ghostWorldPos,
@@ -414,13 +426,15 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 // Duplicate mode: delete the transient draft while history is still
                 // paused, then create the real node as the gesture's ONE tracked
                 // write — undo removes the new door entirely.
+                // Read before the delete: the copy joins the collections its draft is in.
+                const collectionIds = collectionIdsOf(useScene.getState().collections, movingDoorNode.id);
                 useScene.getState().deleteNode(movingDoorNode.id);
                 const cloned = structuredClone(movingDoorNode);
                 delete cloned.id;
                 cloned.metadata = stripPlacementMetadataFlags(cloned.metadata);
                 const node = DoorNode.parse({
                     ...cloned,
-                    position: [target.clampedX, target.clampedY, 0],
+                    position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                     rotation: [0, target.itemRotation, 0],
                     side: target.side,
                     wallId: target.wallId,
@@ -432,7 +446,9 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                     visible: true,
                 });
                 history.commitStep(() => {
-                    useScene.getState().createNode(node, target.wallId);
+                    useScene
+                        .getState()
+                        .createNodes([{ node, parentId: target.wallId, collectionIds }]);
                 });
                 placedId = node.id;
             }
@@ -440,7 +456,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 // Move mode: restore the exact pre-drag state while history is still
                 // paused (the clean undo baseline), then apply the drop as the
                 // gesture's ONE tracked write — undo reverts to the original state.
-                useScene.getState().updateNode(movingDoorNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -453,7 +469,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 });
                 history.commitStep(() => {
                     commitOpeningMove(movingDoorNode.id, {
-                        position: [target.clampedX, target.clampedY, 0],
+                        position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                         rotation: [0, target.itemRotation, 0],
                         side: target.side,
                         parentId: target.wallId,
@@ -472,6 +488,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             triggerSFX('sfx:structure-build');
             hideCursor();
             useViewer.getState().setSelection({ selectedIds: [placedId] });
+            endDraft?.();
             exitMoveMode();
         };
         const onWallClick = (event) => {
@@ -520,7 +537,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             clearPlacementSurface();
             const live = useScene.getState().nodes[movingDoorNode.id];
             if (live && live.visible === false) {
-                useScene.getState().updateNode(movingDoorNode.id, { visible: true });
+                updateDraft({ visible: true });
             }
         };
         // Free-follow: over open floor there's no wall to host the door, so instead
@@ -547,28 +564,28 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             // (back = rotated π) instead of forcing 0, so an R press isn't undone on
             // the next mousemove.
             const yaw = sideOverride === 'back' ? Math.PI : 0;
-            if (currentHostId !== levelId) {
-                if (currentHostId && currentHostId !== levelId)
-                    markHostDirty(currentHostId);
-                useScene.getState().updateNode(movingDoorNode.id, {
+            if (currentHostId === levelId) {
+                updateDraft({
                     position: [localX, y, localZ],
                     rotation: [0, yaw, 0],
                     side: sideOverride,
-                    parentId: levelId ?? undefined,
-                    wallId: undefined,
-                    roofSegmentId: undefined,
-                    roofFace: undefined,
                     visible: false,
                 });
-                currentHostId = levelId;
             }
             else {
-                useScene.getState().updateNode(movingDoorNode.id, {
+                if (currentHostId && currentHostId !== levelId)
+                    markHostDirty(currentHostId);
+                updateDraft({
                     position: [localX, y, localZ],
                     rotation: [0, yaw, 0],
                     side: sideOverride,
+                    parentId: levelId ?? undefined,
+                    wallId: undefined,
+                    roofSegmentId: undefined,
+                    roofFace: undefined,
                     visible: false,
                 });
+                currentHostId = levelId;
             }
             // Float the red (invalid — no wall) ghost at the cursor, level-Y lifted so
             // it stands on the floor, matching the door's chosen facing (sideOverride
@@ -638,8 +655,15 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             // On a roof face the real mesh is the preview — drop the free-follow ghost
             // and reveal the node.
             revealRealNode();
-            if (currentHostId !== target.segment.id) {
-                useScene.getState().updateNode(movingDoorNode.id, {
+            if (currentHostId === target.segment.id) {
+                updateDraft({
+                    position: target.position,
+                    rotation: [0, 0, 0],
+                    roofFace: target.face.id,
+                });
+            }
+            else {
+                updateDraft({
                     position: target.position,
                     rotation: [0, 0, 0],
                     side: 'front',
@@ -652,13 +676,6 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 markHostDirty(currentHostId);
                 currentHostId = target.segment.id;
             }
-            else {
-                useScene.getState().updateNode(movingDoorNode.id, {
-                    position: target.position,
-                    rotation: [0, 0, 0],
-                    roofFace: target.face.id,
-                });
-            }
             updateRoofCursor(target, event.node);
             event.stopPropagation();
         };
@@ -677,6 +694,8 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             if (isNew) {
                 // See commitToWall — delete the draft paused, create as the ONE
                 // tracked write.
+                // Read before the delete: the copy joins the collections its draft is in.
+                const collectionIds = collectionIdsOf(useScene.getState().collections, movingDoorNode.id);
                 useScene.getState().deleteNode(movingDoorNode.id);
                 const cloned = structuredClone(movingDoorNode);
                 delete cloned.id;
@@ -693,14 +712,16 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                     visible: true,
                 });
                 history.commitStep(() => {
-                    useScene.getState().createNode(node, segmentId);
+                    useScene
+                        .getState()
+                        .createNodes([{ node, parentId: segmentId, collectionIds }]);
                 });
                 placedId = node.id;
             }
             else {
                 // See commitToWall — restore the pre-drag baseline paused, drop as
                 // the ONE tracked write.
-                useScene.getState().updateNode(movingDoorNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -733,6 +754,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             triggerSFX('sfx:structure-build');
             hideCursor();
             useViewer.getState().setSelection({ selectedIds: [placedId] });
+            endDraft?.();
             exitMoveMode();
             event.stopPropagation();
         };
@@ -753,7 +775,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                     markHostDirty(currentHostId);
             }
             else {
-                useScene.getState().updateNode(movingDoorNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -772,6 +794,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             // entirely. `end` is idempotent — the effect cleanup's end() is a no-op.
             history.end();
             hideCursor();
+            endDraft?.();
             exitMoveMode();
         };
         const onPlacementDragPointerUp = (event) => {
@@ -829,7 +852,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 // No preview yet (R pressed before the first pointermove at initial
                 // placement): flip the hidden node so the FIRST preview/commit already
                 // reflects the chosen side.
-                useScene.getState().updateNode(movingDoorNode.id, {
+                updateDraft({
                     side: sideOverride,
                     rotation: [0, sideOverride === 'back' ? Math.PI : 0, 0],
                 });
@@ -873,7 +896,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             if (hostWall?.type === 'wall') {
                 const wallAngle = Math.atan2(hostWall.end[1] - hostWall.start[1], hostWall.end[0] - hostWall.start[0]);
                 const ghostYaw = movingDoorNode.rotation[1] - wallAngle;
-                const seedPos = wallLocalToWorld(hostWall, movingDoorNode.position[0], movingDoorNode.position[1], getLevelYOffset(), spatialGridManager.getSlabElevationForWall(hostWall.parentId ?? '', hostWall.start, hostWall.end, hostWall.curveOffset ?? 0, hostWall.thickness, hostWall.supportSlabId));
+                const seedPos = wallLocalToWorld(hostWall, movingDoorNode.position[0], movingDoorNode.position[1], getLevelYOffset(), spatialGridManager.getSlabElevationForWall(hostWall.parentId ?? '', hostWall.start, hostWall.end, hostWall.curveOffset ?? 0, hostWall.thickness, hostWall.supportSlabId, hostWall.justification), planeOffsetOn(hostWall.id));
                 publishPlacementSurface(new Vector3(...seedPos), new Vector3(Math.sin(ghostYaw), 0, Math.cos(ghostYaw)));
                 // Claim the pointer for the wall so the floor free-follow stands down for
                 // the first frames after grab. Otherwise the first `grid:move` (the door
@@ -893,7 +916,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                         markHostDirty(currentHostId);
                 }
                 else {
-                    useScene.getState().updateNode(movingDoorNode.id, {
+                    updateDraft({
                         position: original.position,
                         rotation: original.rotation,
                         side: original.side,
@@ -914,7 +937,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
                 // hidden — reveal it so it never becomes an invisible orphan. (The
                 // `place-preset` movingNode subscription deletes a truly-cancelled
                 // clone separately.)
-                useScene.getState().updateNode(movingDoorNode.id, { visible: true });
+                updateDraft({ visible: true });
             }
             useLiveTransforms.getState().clear(movingDoorNode.id);
             useAlignmentGuides.getState().clear();
@@ -923,6 +946,7 @@ const MoveDoorTool = ({ node: movingDoorNode }) => {
             clearPlacementSurface();
             releaseHiddenWallHold();
             history.end();
+            endDraft?.();
             emitter.off('wall:enter', onWallEnter);
             emitter.off('wall:move', onWallMove);
             emitter.off('wall:click', onWallClick);

package/dist/door/paint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paint.d.ts","sourceRoot":"","sources":["../../src/door/paint.ts"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,eAAO,MAAM,SAAS,4CAGpB,CAAA"}
+{"version":3,"file":"paint.d.ts","sourceRoot":"","sources":["../../src/door/paint.ts"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,eAAO,MAAM,SAAS,4CAOpB,CAAA"}

package/dist/door/paint.js

@@ -8,4 +8,7 @@ import { createSlotPaintCapability, previewSlotByUserData, resolveSlotByReRaycas
 export const doorPaint = createSlotPaintCapability({
     resolveRole: resolveSlotByReRaycast,
     applyPreview: previewSlotByUserData,
+    legacyEffective: (node, role) => node.type === 'door' && !node.source && node.material && (role === 'panel' || role === 'frame')
+        ? { material: node.material, materialPreset: undefined }
+        : null,
 });

package/dist/door/panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/door/panel.tsx"],"names":[],"mappings":"AAyIA,MAAM,CAAC,OAAO,UAAU,SAAS,uCA+nChC"}
+{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/door/panel.tsx"],"names":[],"mappings":"AAiEA,MAAM,CAAC,OAAO,UAAU,SAAS,uCAkgChC"}