@pascal-app/editor 1.0.0 → 1.0.3

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@pascal-app/editor",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Pascal building editor component",
   "license": "MIT",
   "type": "module",
   "exports": {
     ".": "./src/index.tsx",
-    "./catalog": "./src/components/ui/item-catalog/catalog-items.tsx"
+    "./catalog": "./src/components/ui/item-catalog/catalog-items.tsx",
+    "./procedural-items": "./src/components/procedural-items/inspector.tsx"
   },
   "scripts": {
     "check-types": "tsgo --noEmit",
     "test": "bun test src"
   },
   "peerDependencies": {
-    "@pascal-app/core": "^1.0.0",
-    "@pascal-app/viewer": "^1.0.0",
+    "@pascal-app/core": "^1.0.3",
+    "@pascal-app/viewer": "^1.0.3",
     "@react-three/drei": "^10",
     "@react-three/fiber": "^9",
     "next": ">=15",
@@ -61,8 +62,8 @@
     "zustand": "^5.0.11"
   },
   "devDependencies": {
-    "@pascal-app/core": "^1.0.0",
-    "@pascal-app/viewer": "^1.0.0",
+    "@pascal-app/core": "^1.0.3",
+    "@pascal-app/viewer": "^1.0.3",
     "@pascal/typescript-config": "*",
     "@react-three/test-renderer": "^9.1.0",
     "@types/blob-stream": "^0.1.33",
@@ -74,5 +75,10 @@
     "@types/three": "^0.184.0",
     "fast-xml-parser": "^5.4.2",
     "typescript": "6.0.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pascalorg/editor.git",
+    "directory": "packages/editor"
   }
 }

package/src/components/editor/bake-exporter.tsx

@@ -32,6 +32,10 @@ export function BakeExporter({
         const buffer = await exportSceneToGlb(sceneGroup, useScene.getState().nodes, {
           textures: 'reference',
           purpose: 'viewer',
+          // The bake worker owns the deadline (BAKE_CAPTURE_TIMEOUT_MS); under
+          // SwiftShader a moderate scene can legitimately outlast the
+          // interactive default.
+          timeoutMs: Number.POSITIVE_INFINITY,
         })
         onComplete(buffer)
       } catch (err) {

package/src/components/editor/bake-thumbnail.tsx

@@ -6,6 +6,7 @@ import {
   GRID_LAYER,
   heroCameraPose,
   temporarilyHideNodeTypes,
+  useSceneAtmosphere,
   useViewer,
 } from '@pascal-app/viewer'
 import { useThree } from '@react-three/fiber'
@@ -25,6 +26,7 @@ export function BakeThumbnail({
 }) {
   const renderer = useThree((state) => state.gl)
   const scene = useThree((state) => state.scene)
+  const atmosphere = useSceneAtmosphere()
   const doneRef = useRef(false)
 
   useEffect(() => {
@@ -61,6 +63,7 @@ export function BakeThumbnail({
           renderer: renderer as unknown as WebGPURenderer,
           scene,
           camera,
+          atmosphere,
         })
         if (!pipeline) {
           onError('thumbnail pipeline failed to build')
@@ -89,7 +92,7 @@ export function BakeThumbnail({
     }
 
     void run()
-  }, [active, onComplete, onError, renderer, scene])
+  }, [active, atmosphere, onComplete, onError, renderer, scene])
 
   return null
 }

package/src/components/editor/custom-camera-controls.tsx

@@ -31,6 +31,17 @@ import {
   withCameraPoseDistance,
 } from '../../lib/camera-pose'
 import { EDITOR_LAYER } from '../../lib/constants'
+import {
+  acceptsKeyboardPan,
+  clearKeyboardPanKeys,
+  hasKeyboardPanInput,
+  isEditableKeyboardTarget,
+  isKeyboardPanKey,
+  type KeyboardPanState,
+  keyboardPanDirection,
+  keyboardPanSpeed,
+  setKeyboardPanKey,
+} from '../../lib/keyboard-pan'
 import { editorOwnsOneFingerDrag } from '../../lib/touch-gesture-priority'
 import { publishCameraPose } from '../../store/camera-pose-store'
 import useEditor from '../../store/use-editor'
@@ -51,11 +62,11 @@ const tempTarget = new Vector3()
 const transitionFreezePosition = new Vector3()
 const transitionFreezeTarget = new Vector3()
 const keyboardPanSpherical = new Spherical()
+// In 2D-only view the canvas is paused, so the floor plan drives WASD, orbit and
+// top view itself (`floorplan-panel.tsx`) and the camera stands down.
+const planOwnsNavigation = () => useEditor.getState().viewMode === '2d'
 const DEFAULT_MAX_POLAR_ANGLE = Math.PI / 2 - 0.1
 const DEBUG_MAX_POLAR_ANGLE = Math.PI - 0.05
-const KEYBOARD_PAN_VIEW_WIDTH_PER_SECOND = 0.65
-const KEYBOARD_PAN_MIN_SPEED = 2
-const KEYBOARD_PAN_MAX_SPEED = 55
 type CameraMode = ReturnType<typeof useViewer.getState>['cameraMode']
 type CameraPoseSnapshot = {
   mode: CameraMode
@@ -114,54 +125,6 @@ function freezeCameraControlTransition(control: CameraControlsImpl) {
   )
 }
 
-function isEditableKeyboardTarget(target: EventTarget | null) {
-  return (
-    target instanceof HTMLInputElement ||
-    target instanceof HTMLTextAreaElement ||
-    target instanceof HTMLSelectElement ||
-    (target instanceof HTMLElement && target.isContentEditable)
-  )
-}
-
-type KeyboardPanState = {
-  forward: boolean
-  backward: boolean
-  left: boolean
-  right: boolean
-}
-
-function setKeyboardPanKey(state: KeyboardPanState, code: string, pressed: boolean): boolean {
-  if (code === 'KeyW') {
-    const changed = state.forward !== pressed
-    state.forward = pressed
-    return changed
-  }
-  if (code === 'KeyS') {
-    const changed = state.backward !== pressed
-    state.backward = pressed
-    return changed
-  }
-  if (code === 'KeyA') {
-    const changed = state.left !== pressed
-    state.left = pressed
-    return changed
-  }
-  if (code === 'KeyD') {
-    const changed = state.right !== pressed
-    state.right = pressed
-    return changed
-  }
-  return false
-}
-
-function isKeyboardPanKey(code: string): boolean {
-  return code === 'KeyW' || code === 'KeyA' || code === 'KeyS' || code === 'KeyD'
-}
-
-function hasKeyboardPanInput(state: KeyboardPanState): boolean {
-  return state.forward || state.backward || state.left || state.right
-}
-
 type CameraViewportSize = {
   width: number
   height: number
@@ -667,19 +630,14 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
       }
     }
 
-    const panKeys = keyboardPanKeys.current
-    const horizontal = (panKeys.right ? 1 : 0) - (panKeys.left ? 1 : 0)
-    const vertical = (panKeys.forward ? 1 : 0) - (panKeys.backward ? 1 : 0)
+    const { horizontal, vertical } = keyboardPanDirection(keyboardPanKeys.current)
     if (horizontal === 0 && vertical === 0) return
 
     const control = controls.current
 
     control.getSpherical(keyboardPanSpherical, false)
     const viewWidth = getCameraViewWidth(camera, keyboardPanSpherical.radius, viewportSize)
-    const speed = Math.min(
-      Math.max(viewWidth * KEYBOARD_PAN_VIEW_WIDTH_PER_SECOND, KEYBOARD_PAN_MIN_SPEED),
-      KEYBOARD_PAN_MAX_SPEED,
-    )
+    const speed = keyboardPanSpeed(viewWidth)
     const step = (speed * Math.min(delta, 0.05)) / Math.hypot(horizontal, vertical)
 
     if (horizontal !== 0) control.truck(horizontal * step, 0, true)
@@ -766,13 +724,6 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     let panPointerId: number | null = null
     let panPointerButton: number | null = null
 
-    const clearKeyboardPanKeys = () => {
-      keyboardPanKeys.current.forward = false
-      keyboardPanKeys.current.backward = false
-      keyboardPanKeys.current.left = false
-      keyboardPanKeys.current.right = false
-    }
-
     const setNavigationCursor = (cursor: 'grab' | 'grabbing') => {
       document.body.style.cursor = cursor
       gl.domElement.style.cursor = cursor
@@ -835,10 +786,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
 
     const onKeyDown = (event: KeyboardEvent) => {
       if (isKeyboardPanKey(event.code)) {
-        if (
-          !(event.metaKey || event.ctrlKey || event.altKey) &&
-          !isEditableKeyboardTarget(event.target)
-        ) {
+        if (acceptsKeyboardPan(event) && !planOwnsNavigation()) {
           const changed = setKeyboardPanKey(keyboardPanKeys.current, event.code, true)
           if (changed) beginLocalCameraInteraction()
           event.preventDefault()
@@ -930,7 +878,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
 
     const onBlur = () => {
       keyState.space = false
-      clearKeyboardPanKeys()
+      clearKeyboardPanKeys(keyboardPanKeys.current)
       panPointerId = null
       panPointerButton = null
       clearNavigationCursor()
@@ -955,7 +903,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
       window.removeEventListener('pointercancel', onPointerUp, true)
       window.removeEventListener('blur', onBlur)
       gl.domElement.removeEventListener('wheel', onWheel, true)
-      clearKeyboardPanKeys()
+      clearKeyboardPanKeys(keyboardPanKeys.current)
       clearNavigationCursor()
       cameraDraggingLifecycle.end()
     }
@@ -1196,7 +1144,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     }
 
     const handleTopView = () => {
-      if (isFirstPersonMode || !controls.current) return
+      if (isFirstPersonMode || !controls.current || planOwnsNavigation()) return
 
       const currentPolarAngle = controls.current.polarAngle
 
@@ -1208,7 +1156,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     }
 
     const handleOrbitCW = () => {
-      if (isFirstPersonMode || !controls.current) return
+      if (isFirstPersonMode || !controls.current || planOwnsNavigation()) return
 
       const currentAzimuth = controls.current.azimuthAngle
       const currentPolar = controls.current.polarAngle
@@ -1220,7 +1168,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     }
 
     const handleOrbitCCW = () => {
-      if (isFirstPersonMode || !controls.current) return
+      if (isFirstPersonMode || !controls.current || planOwnsNavigation()) return
 
       const currentAzimuth = controls.current.azimuthAngle
       const currentPolar = controls.current.polarAngle

package/src/components/editor/editor-layout-mobile.tsx

@@ -236,6 +236,7 @@ export function EditorLayoutMobile({
             <div className="relative h-full w-full overflow-hidden">{viewerContent}</div>
             {overlays && (
               <div
+                data-viewer-bounds
                 className="pointer-events-none absolute inset-0 z-30"
                 style={{ transform: 'translateZ(0)' }}
               >

package/src/components/editor/floating-action-menu.tsx

@@ -51,6 +51,7 @@ import {
 } from '../../lib/fresh-planar-placement'
 import { resolveFloatingActionMenuVisibility } from '../../lib/interaction/overlay-policy'
 import { curveReshapeScope, holeEditScope } from '../../lib/interaction/scope'
+import { duplicateWithoutMove, registryMoveDisabled } from '../../lib/node-action-movement'
 import { playBlockedQuickActionFeedback } from '../../lib/quick-action-feedback'
 import { collectQuickActionNodeScope } from '../../lib/quick-action-nodes'
 import { duplicateRoofSubtree } from '../../lib/roof-duplication'
@@ -501,6 +502,16 @@ export function FloatingActionMenu() {
       if (!node?.parentId) return
       sfxEmitter.emit('sfx:item-pick')
 
+      if (registryMoveDisabled(node)) {
+        try {
+          const id = duplicateWithoutMove(node)
+          if (id) setSelection({ selectedIds: [id] })
+        } catch (error) {
+          console.error('Failed to duplicate node', error)
+        }
+        return
+      }
+
       if (node.type === 'roof') {
         try {
           duplicateRoofSubtree(node.id as AnyNodeId, { mode: 'move' })
@@ -805,7 +816,9 @@ export function FloatingActionMenu() {
                   // `capabilities.movable`, a `floorplanMoveTarget`, or a
                   // 3D `affordanceTools.move` mover gets the Move button.
                   // Adding a new movable kind never touches this file.
-                  node && isRegistryMovable(node.type) ? handleMove : undefined
+                  node && isRegistryMovable(node.type) && !registryMoveDisabled(node)
+                    ? handleMove
+                    : undefined
                 }
                 onDelete={handleDelete}
                 onDuplicate={