@pascal-app/nodes 1.0.1 → 1.0.4

package/dist/window/move-tool.js

@@ -1,13 +1,15 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { dormerWallFacePointToDormer, emitter, holdHiddenWallPointerEvents, isCurvedWall, sceneRegistry, spatialGridManager, useLiveNodeOverrides, useLiveTransforms, useScene, WindowNode, } from '@pascal-app/core';
+import { beginSceneHistoryDraft, collectionIdsOf, dormerWallFacePointToDormer, emitter, getOpeningWallPlacement, holdHiddenWallPointerEvents, isCurvedWall, runSceneHistoryDraftWrite, sceneRegistry, spatialGridManager, useLiveNodeOverrides, useLiveTransforms, useScene, WindowNode, } from '@pascal-app/core';
 import { calculateItemRotation, clearPlacementSurface, consumePlacementDragRelease, EDITOR_LAYER, getSideFromNormal, isGridSnapActive, isMagneticSnapActive, isValidWallSideFace, publishPlacementSurface, snapToHalf, stripPlacementMetadataFlags, triggerSFX, useAlignmentGuides, useEditor, useFacingPose, useRegistryToolContext, } from '@pascal-app/editor';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { BoxGeometry, EdgesGeometry, Vector3 } from 'three';
 import { LineBasicNodeMaterial } from 'three/webgpu';
+import { commitOpeningMove } from '../shared/commit-opening-move';
 import { dormerEventFromHostedWindow, getDormerWindowWorldNormal, getDormerWindowWorldYaw, resolveDormerWindowTarget, } from '../shared/dormer-wall-opening-placement';
 import { clearOpeningGuides3D, publishOpeningGuidesForWallEvent, resolveSillSnap, } 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';
@@ -76,6 +78,8 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             ? movingWindowNode.metadata
             : {};
         const isNew = !!meta.isNew;
+        const endDraft = isNew ? null : beginSceneHistoryDraft(movingWindowNode.id, movingWindowNode);
+        const updateDraft = (data) => runSceneHistoryDraftWrite(() => useScene.getState().updateNode(movingWindowNode.id, data));
         // Save original state (only used in move mode)
         const original = {
             position: [...movingWindowNode.position],
@@ -101,10 +105,12 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
         // preview on the wall and can't be placed consecutively without leaving/re-entering. This
         // mirrors MoveDoorTool.
         if (!isNew) {
-            useScene.getState().updateNode(movingWindowNode.id, {
+            updateDraft({
                 metadata: { ...meta, isTransient: true },
             });
         }
+        // Same-wall moves keep the wall-local plane offset; another host resets it.
+        const planeOffsetOn = (wallId) => openingPlaneOffsetOnWall(movingWindowNode, wallId);
         let currentHostId = movingWindowNode.parentId;
         let committed = false;
         // Off-wall free-follow: over empty floor the window is parented to the
@@ -195,7 +201,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             const y = movingWindowNode.position[1];
             return y > 0.1 ? y : DEFAULT_WINDOW_SILL_M + movingWindowNode.height / 2;
         };
-        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;
@@ -244,7 +250,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                 return;
             const faceSide = getSideFromNormal(event.normal);
             const side = sideOverride ?? faceSide;
-            const rotationOffset = side !== faceSide ? Math.PI : 0;
+            const rotationOffset = side === faceSide ? 0 : Math.PI;
             const itemRotation = calculateItemRotation(event.normal) + rotationOffset;
             const rawLocalX = event.localPosition[0];
             const rawLocalY = event.localPosition[1];
@@ -320,9 +326,24 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             // its stale parent (no on-wall preview at all). A stale override from a
             // free-follow / dormer hop would shadow those scene fields, so drop it.
             useLiveNodeOverrides.getState().clear(movingWindowNode.id);
-            if (currentHostId !== target.wallId) {
-                useScene.getState().updateNode(movingWindowNode.id, {
-                    position: [target.clampedX, target.clampedY, 0],
+            if (currentHostId === target.wallId) {
+                const windowMesh = sceneRegistry.nodes.get(movingWindowNode.id);
+                if (windowMesh) {
+                    // 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, {
+                        ...movingWindowNode,
+                        position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
+                        rotation: [0, target.itemRotation, 0],
+                    }, useScene.getState().nodes);
+                    windowMesh.position.set(...placement.position);
+                    windowMesh.rotation.set(...placement.rotation);
+                    windowMesh.updateMatrixWorld(true);
+                }
+            }
+            else {
+                updateDraft({
+                    position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                     rotation: [0, target.itemRotation, 0],
                     side: target.side,
                     parentId: target.wallId,
@@ -336,16 +357,8 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                 markHostDirty(currentHostId);
                 currentHostId = target.wallId;
             }
-            else {
-                const windowMesh = sceneRegistry.nodes.get(movingWindowNode.id);
-                if (windowMesh) {
-                    windowMesh.position.set(target.clampedX, target.clampedY, 0);
-                    windowMesh.rotation.set(0, target.itemRotation, 0);
-                    windowMesh.updateMatrixWorld(true);
-                }
-            }
             useLiveTransforms.getState().set(movingWindowNode.id, {
-                position: [target.clampedX, target.clampedY, 0],
+                position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                 rotation: target.itemRotation,
             });
             markHostDirtyThrottled(target.wallId);
@@ -356,7 +369,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             // (-wallAngle + itemRotation); `cursorRotation` is π off here. See
             // `MoveDoorTool.applyPreview`.
             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,
@@ -454,13 +467,15 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                 // 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 window entirely.
+                // Read before the delete: the copy joins the collections its draft is in.
+                const collectionIds = collectionIdsOf(useScene.getState().collections, movingWindowNode.id);
                 useScene.getState().deleteNode(movingWindowNode.id);
                 const cloned = structuredClone(movingWindowNode);
                 delete cloned.id;
                 cloned.metadata = stripPlacementMetadataFlags(cloned.metadata);
                 const node = WindowNode.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,
@@ -471,7 +486,9 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     visible: true,
                 });
                 history.commitStep(() => {
-                    useScene.getState().createNode(node, target.wallId);
+                    useScene
+                        .getState()
+                        .createNodes([{ node, parentId: target.wallId, collectionIds }]);
                 });
                 placedId = node.id;
             }
@@ -479,7 +496,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                 // 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(movingWindowNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -493,14 +510,13 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     visible: original.visible,
                 });
                 history.commitStep(() => {
-                    useScene.getState().updateNode(movingWindowNode.id, {
-                        position: [target.clampedX, target.clampedY, 0],
+                    commitOpeningMove(movingWindowNode.id, {
+                        position: [target.clampedX, target.clampedY, planeOffsetOn(target.wallId)],
                         rotation: [0, target.itemRotation, 0],
                         side: target.side,
                         parentId: target.wallId,
                         wallId: target.wallId,
                         roofSegmentId: undefined,
-                        metadata: {},
                         visible: true,
                     });
                 });
@@ -514,6 +530,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             triggerSFX('sfx:structure-build');
             hideCursor();
             selectNode(placedId);
+            endDraft?.();
             exitMoveMode();
         };
         const onWallClick = (event) => {
@@ -586,10 +603,18 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             // Scene writes, not overrides: leaving the wall must actually remove the
             // window from the wall's `children` or the CSG cut trails the ghost
             // around the old wall (see the wall-branch note in `applyPreview`).
-            if (currentHostId !== levelId) {
+            if (currentHostId === levelId) {
+                updateDraft({
+                    position: [localX, sillCenterY, localZ],
+                    rotation: [0, yaw, 0],
+                    side: sideOverride,
+                    visible: false,
+                });
+            }
+            else {
                 if (currentHostId && currentHostId !== levelId)
                     markHostDirty(currentHostId);
-                useScene.getState().updateNode(movingWindowNode.id, {
+                updateDraft({
                     position: [localX, sillCenterY, localZ],
                     rotation: [0, yaw, 0],
                     side: sideOverride,
@@ -603,14 +628,6 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                 });
                 currentHostId = levelId;
             }
-            else {
-                useScene.getState().updateNode(movingWindowNode.id, {
-                    position: [localX, sillCenterY, localZ],
-                    rotation: [0, yaw, 0],
-                    side: sideOverride,
-                    visible: false,
-                });
-            }
             // Float the red (invalid — no wall) ghost at the cursor, level-Y lifted to
             // the sill center (sideOverride carries the R-flip so the ghost matches).
             setGhostPose({
@@ -699,6 +716,8 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             const rotation = [0, side === 'back' ? Math.PI : 0, 0];
             let placedId;
             if (isNew) {
+                // Read before the delete: the copy joins the collections its draft is in.
+                const collectionIds = collectionIdsOf(useScene.getState().collections, movingWindowNode.id);
                 useScene.getState().deleteNode(movingWindowNode.id);
                 const cloned = structuredClone(movingWindowNode);
                 delete cloned.id;
@@ -717,12 +736,16 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     visible: true,
                 });
                 history.commitStep(() => {
-                    useScene.getState().createNode(committedNode, target.dormer.id);
+                    useScene
+                        .getState()
+                        .createNodes([
+                        { node: committedNode, parentId: target.dormer.id, collectionIds },
+                    ]);
                 });
                 placedId = committedNode.id;
             }
             else {
-                useScene.getState().updateNode(movingWindowNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -736,7 +759,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     visible: original.visible,
                 });
                 history.commitStep(() => {
-                    useScene.getState().updateNode(movingWindowNode.id, {
+                    commitOpeningMove(movingWindowNode.id, {
                         position: target.position,
                         rotation,
                         side,
@@ -746,7 +769,6 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                         wallId: undefined,
                         roofSegmentId: undefined,
                         roofFace: undefined,
-                        metadata: {},
                         visible: true,
                     });
                 });
@@ -760,6 +782,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             triggerSFX('sfx:structure-build');
             hideCursor();
             selectNode(placedId);
+            endDraft?.();
             exitMoveMode();
             event.stopPropagation();
         };
@@ -861,25 +884,25 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             clearOpeningGuides3D();
             // On a roof face the real mesh is the preview — drop the ghost + reveal.
             revealRealNode();
-            if (currentHostId !== target.segment.id) {
-                markHostDirty(currentHostId);
-                currentHostId = target.segment.id;
+            if (currentHostId === target.segment.id) {
                 useLiveNodeOverrides.getState().set(movingWindowNode.id, {
                     position: target.position,
                     rotation: [0, 0, 0],
-                    side: 'front',
-                    parentId: target.segment.id,
-                    wallId: undefined,
-                    roofSegmentId: target.segment.id,
                     roofFace: target.face.id,
-                    visible: true,
                 });
             }
             else {
+                markHostDirty(currentHostId);
+                currentHostId = target.segment.id;
                 useLiveNodeOverrides.getState().set(movingWindowNode.id, {
                     position: target.position,
                     rotation: [0, 0, 0],
+                    side: 'front',
+                    parentId: target.segment.id,
+                    wallId: undefined,
+                    roofSegmentId: target.segment.id,
                     roofFace: target.face.id,
+                    visible: true,
                 });
             }
             updateRoofCursor(target, event.node);
@@ -900,6 +923,8 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             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, movingWindowNode.id);
                 useScene.getState().deleteNode(movingWindowNode.id);
                 const cloned = structuredClone(movingWindowNode);
                 delete cloned.id;
@@ -916,14 +941,16 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     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(movingWindowNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -937,7 +964,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     visible: original.visible,
                 });
                 history.commitStep(() => {
-                    useScene.getState().updateNode(movingWindowNode.id, {
+                    commitOpeningMove(movingWindowNode.id, {
                         position: target.position,
                         rotation: [0, 0, 0],
                         side: 'front',
@@ -945,7 +972,6 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                         wallId: undefined,
                         roofSegmentId: segmentId,
                         roofFace: target.face.id,
-                        metadata: {},
                         visible: true,
                     });
                 });
@@ -959,6 +985,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             triggerSFX('sfx:structure-build');
             hideCursor();
             selectNode(placedId);
+            endDraft?.();
             exitMoveMode();
             event.stopPropagation();
         };
@@ -981,7 +1008,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                     markHostDirty(currentHostId);
             }
             else {
-                useScene.getState().updateNode(movingWindowNode.id, {
+                updateDraft({
                     position: original.position,
                     rotation: original.rotation,
                     side: original.side,
@@ -1002,6 +1029,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             // entirely. `end` is idempotent — the effect cleanup's end() is a no-op.
             history.end();
             hideCursor();
+            endDraft?.();
             exitMoveMode();
         };
         const onPlacementDragPointerUp = (event) => {
@@ -1062,7 +1090,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             else {
                 // No preview yet (R before the first pointermove): flip the hidden node
                 // so the first preview/commit already reflects the chosen side.
-                useScene.getState().updateNode(movingWindowNode.id, {
+                updateDraft({
                     side: sideOverride,
                     rotation: [0, sideOverride === 'back' ? Math.PI : 0, 0],
                 });
@@ -1112,7 +1140,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             if (hostWall?.type === 'wall') {
                 const wallAngle = Math.atan2(hostWall.end[1] - hostWall.start[1], hostWall.end[0] - hostWall.start[0]);
                 const ghostYaw = movingWindowNode.rotation[1] - wallAngle;
-                const seedPos = wallLocalToWorld(hostWall, movingWindowNode.position[0], movingWindowNode.position[1], getLevelYOffset(), spatialGridManager.getSlabElevationForWall(hostWall.parentId ?? '', hostWall.start, hostWall.end, hostWall.curveOffset ?? 0, hostWall.thickness, hostWall.supportSlabId));
+                const seedPos = wallLocalToWorld(hostWall, movingWindowNode.position[0], movingWindowNode.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 window
@@ -1133,7 +1161,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                         markHostDirty(currentHostId);
                 }
                 else {
-                    useScene.getState().updateNode(movingWindowNode.id, {
+                    updateDraft({
                         position: original.position,
                         rotation: original.rotation,
                         side: original.side,
@@ -1154,7 +1182,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
                 // Safety net: a fresh (isNew) clone isn't marked `isTransient`; if we
                 // unmount mid-free-follow it would be left hidden. Reveal it so it never
                 // becomes an invisible orphan (place-preset deletes a true cancel).
-                useScene.getState().updateNode(movingWindowNode.id, { visible: true });
+                updateDraft({ visible: true });
             }
             useLiveNodeOverrides.getState().clear(movingWindowNode.id);
             useLiveTransforms.getState().clear(movingWindowNode.id);
@@ -1164,6 +1192,7 @@ const MoveWindowTool = ({ node: movingWindowNode }) => {
             clearPlacementSurface();
             releaseHiddenWallHold();
             history.end();
+            endDraft?.();
             emitter.off('wall:enter', onWallEnter);
             emitter.off('wall:move', onWallMove);
             emitter.off('wall:click', onWallClick);

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

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

package/dist/window/paint.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/window/panel.tsx"],"names":[],"mappings":"AA6FA,MAAM,CAAC,OAAO,UAAU,WAAW,uCA21BlC"}
+{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/window/panel.tsx"],"names":[],"mappings":"AAgFA,MAAM,CAAC,OAAO,UAAU,WAAW,uCAm0BlC"}