@pascal-app/editor 1.0.7 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pascal-app/editor",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "description": "Pascal building editor component",
   "license": "MIT",
   "type": "module",
@@ -13,18 +13,17 @@
     "./distribution": "./src/components/tools/distribution/distribution-public.ts"
   },
   "scripts": {
-    "bench:room-labels": "bun run src/components/editor/__bench__/room-label-placement.bench.ts",
     "check-types": "tsgo --noEmit",
     "test": "bun test src"
   },
   "peerDependencies": {
-    "@pascal-app/core": "^1.0.7",
-    "@pascal-app/viewer": "^1.0.7",
+    "@pascal-app/core": "^1.1.1",
+    "@pascal-app/viewer": "^1.1.1",
     "@react-three/drei": "^10",
     "@react-three/fiber": "^9",
     "next": ">=15",
-    "react": "^18 || ^19",
-    "react-dom": "^18 || ^19",
+    "react": "^19",
+    "react-dom": "^19",
     "three": "^0.187"
   },
   "dependencies": {
@@ -34,19 +33,16 @@
     "@iconify/react": "^6.0.4",
     "@lingui/core": "6.12.0",
     "@number-flow/react": "^0.6.2",
-    "@pascal-app/geometry-script": "^1.0.7",
-    "@pascal-app/ifc-converter": "^1.0.7",
+    "@pascal-app/geometry-script": "^1.1.1",
+    "@pascal-app/ifc-converter": "^1.1.1",
     "@pascal-app/lingo": "^0.5.0",
     "@radix-ui/react-alert-dialog": "^1.2.1",
     "@radix-ui/react-context-menu": "^2.4.1",
     "@radix-ui/react-dialog": "^1.3.1",
-    "@radix-ui/react-dropdown-menu": "^2.2.1",
-    "@radix-ui/react-popover": "^1.3.1",
     "@radix-ui/react-select": "^2.4.1",
     "@radix-ui/react-separator": "^1.2.0",
     "@radix-ui/react-slider": "^1.6.1",
     "@radix-ui/react-slot": "^1.5.0",
-    "@radix-ui/react-switch": "^1.4.1",
     "@radix-ui/react-tabs": "^1.2.1",
     "@radix-ui/react-tooltip": "^1.4.1",
     "@visual-json/react": "^0.4.0",
@@ -55,7 +51,6 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "fflate": "^0.8.3",
-    "howler": "^2.2.4",
     "lucide-react": "^1.69.0",
     "manifold-3d": "3.5.4",
     "mitt": "^3.0.1",
@@ -69,13 +64,12 @@
     "zustand": "^5.0.16"
   },
   "devDependencies": {
-    "@pascal-app/core": "^1.0.7",
-    "@pascal-app/viewer": "^1.0.7",
+    "@pascal-app/core": "^1.1.1",
+    "@pascal-app/viewer": "^1.1.1",
     "@pascal/typescript-config": "*",
     "@react-three/test-renderer": "^9.1.1",
     "@types/blob-stream": "^0.1.33",
     "@types/bun": "^1.4.4",
-    "@types/howler": "^2.2.13",
     "@types/pdfkit": "^0.17.7",
     "@types/react": "19.3.0",
     "@types/react-dom": "19.3.0",

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

@@ -1,11 +1,11 @@
 'use client'
 
 import { usePascalI18n } from '@pascal-app/core'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@pascal-app/viewer/ui'
 import type { MouseEventHandler, ReactNode } from 'react'
 import { toolHintKey } from '../../i18n/node-messages'
 import { cn } from '../../lib/utils'
 import { shortcutDisplayValue } from '../ui/primitives/shortcut-token'
-import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/primitives/tooltip'
 
 const BUTTON =
   'rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground'

package/src/components/editor/alignment-3d-guide-layer.tsx

@@ -2,6 +2,7 @@
 
 import { type AlignmentGuide, sceneRegistry } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { useFrame } from '@react-three/fiber'
 import { memo, useMemo, useRef } from 'react'
 import { BoxGeometry, CircleGeometry, type Group, RingGeometry, Vector3 } from 'three'
@@ -11,7 +12,6 @@ import useAlignmentGuides, {
   type DraftGuideLine,
   type DraftGuides,
 } from '../../store/use-alignment-guides'
-import { Html } from './localized-html'
 import { formatMeasurement } from './measurement-pill'
 
 /**

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

@@ -21,6 +21,17 @@ import {
   useViewer,
   ZONE_LAYER,
 } from '@pascal-app/viewer'
+import {
+  type CameraPoseApplicationPlan,
+  frameViewerCamera,
+  normalizeCameraPose,
+  planCameraPoseApplication,
+  publishCameraPose,
+  publishInitialCameraPose,
+  releaseCameraPoseEventSuppression,
+  stepCameraPoseInterpolation,
+  withCameraPoseDistance,
+} from '@pascal-app/viewer/ui'
 import { CameraControls, CameraControlsImpl } from '@react-three/drei'
 import { useFrame, useThree } from '@react-three/fiber'
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from 'react'
@@ -29,18 +40,10 @@ import {
   type Camera,
   type OrthographicCamera,
   type PerspectiveCamera,
+  Sphere,
   Spherical,
   Vector3,
 } from 'three'
-import {
-  type CameraPoseApplicationPlan,
-  normalizeCameraPose,
-  planCameraPoseApplication,
-  publishInitialCameraPose,
-  releaseCameraPoseEventSuppression,
-  stepCameraPoseInterpolation,
-  withCameraPoseDistance,
-} from '../../lib/camera-pose'
 import { EDITOR_LAYER } from '../../lib/constants'
 import {
   acceptsKeyboardPan,
@@ -64,8 +67,6 @@ import {
 } from '../../lib/orbit-floor-clearance'
 import { orbitNearPlane } from '../../lib/orbit-near-plane'
 import { editorOwnsOneFingerDrag } from '../../lib/touch-gesture-priority'
-import { frameViewerCamera } from '../../lib/viewer-selection'
-import { publishCameraPose } from '../../store/camera-pose-store'
 import useEditor, { takePreviewCameraRestore } from '../../store/use-editor'
 import {
   useActiveHandleDrag,
@@ -74,6 +75,13 @@ import {
 } from '../../store/use-interaction-scope'
 import { visibleScene } from '../../store/view-layout'
 import { createCameraDraggingLifecycle } from './camera-dragging-lifecycle'
+import {
+  type FitSceneLookAt,
+  type PendingFitScene,
+  planFitSceneOnEvent,
+  planFitSceneOnOrbitResume,
+  planLevelFollow,
+} from './fit-scene-framing'
 import { FloorAwareCameraControls } from './floor-aware-camera-controls'
 import { FloorSurface } from './floor-surface'
 
@@ -84,6 +92,7 @@ const tempDelta = new Vector3()
 const tempPosition = new Vector3()
 const tempSize = new Vector3()
 const tempTarget = new Vector3()
+const fitSceneSphere = new Sphere()
 const transitionFreezePosition = new Vector3()
 const transitionFreezeTarget = new Vector3()
 const keyboardPanSpherical = new Spherical()
@@ -120,6 +129,23 @@ function keepEyeOverGround(x: number, eyeY: number, z: number, previousEyeY = ey
   return overviewEyeY(eyeY, previousEyeY, groundY, useViewer.getState().eyeUnderGround)
 }
 
+function applyFitLookAt(control: CameraControlsImpl, lookAt: FitSceneLookAt) {
+  control.setLookAt(
+    lookAt.eyeX,
+    keepEyeOverGround(lookAt.eyeX, lookAt.eyeY, lookAt.eyeZ, lookAt.eyeHeight),
+    lookAt.eyeZ,
+    lookAt.targetX,
+    lookAt.targetY,
+    lookAt.targetZ,
+    true,
+  )
+  if (isOrthographicCamera(control.camera)) {
+    fitSceneSphere.center.set(...lookAt.fitSphere.center)
+    fitSceneSphere.radius = lookAt.fitSphere.radius
+    control.fitToSphere(fitSceneSphere, true)
+  }
+}
+
 function levelOf(nodeId: string): string | null {
   const nodes = useScene.getState().nodes
   let node: AnyNode | undefined = nodes[nodeId as AnyNodeId]
@@ -407,6 +433,9 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
   if (selection.levelId) lastLevelId.current = selection.levelId
   const currentLevelId = lastLevelId.current
   const firstLoad = useRef(true)
+  // Survives first-person (orbit unmounted) so scene-ready fit still applies
+  // once CameraControls remount.
+  const pendingFitSceneRef = useRef<PendingFitScene | null>(null)
   const floorY = useScene((state) =>
     currentLevelId ? getLevelPresentationY(currentLevelId, state.nodes, levelMode) : 0,
   )
@@ -615,19 +644,32 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     }
   }, [scene, gl, camera])
 
+  const previousLevelIdRef = useRef<string | null>(null)
+  const previousLevelModeRef = useRef(levelMode)
+  const previousCameraRef = useRef(camera)
   // `camera` too: drei builds a fresh controls instance (pivot at the origin)
   // when the default camera mounts or changes; it is rested on the floor too.
-  // biome-ignore lint/correctness/useExhaustiveDependencies: camera re-runs this on a new instance
   useEffect(() => {
     if (isPreviewMode || isFirstPersonMode || isRestoringFirstPersonPose()) return
     // Analytic destination, not `sceneRegistry` mesh position: a level created
     // this frame still sits at y=0 (LevelSystem lerps it later), and a mode
-    // switch leaves every level mid-lerp — the camera must pan to where the
+    // switch leaves every level mid-lerp - the camera must pan to where the
     // level will settle, in the CURRENT presentation mode.
     const targetY = orbitGroundY(currentLevelId, levelMode)
     if (!controls.current) return
-    if (firstLoad.current) {
-      firstLoad.current = false
+    const plan = planLevelFollow({
+      firstLoad: firstLoad.current,
+      sceneEmpty: Object.keys(useScene.getState().nodes).length === 0,
+      levelChanged: previousLevelIdRef.current !== currentLevelId,
+      modeChanged: previousLevelModeRef.current !== levelMode,
+      cameraChanged: previousCameraRef.current !== camera,
+    })
+    firstLoad.current = false
+    previousLevelIdRef.current = currentLevelId
+    previousLevelModeRef.current = levelMode
+    previousCameraRef.current = camera
+    if (plan === 'none') return
+    if (plan === 'default-pose') {
       controls.current.setLookAt(
         20,
         keepEyeOverGround(20, 20 + targetY, 20, 20),
@@ -637,6 +679,7 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
         0,
         true,
       )
+      return
     }
     controls.current.getOrbitTarget(currentTarget)
     // Idempotence guard: skip when already there — also swallows the thumbnail
@@ -692,6 +735,19 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     controls.current.floorSurface = diveFloor === null ? floorSurface : null
   }, [camera, currentLevelId, diveFloor, floorMinY, floorSurface, isFirstPersonMode])
 
+  const flushPendingFitScene = useCallback(() => {
+    const plan = planFitSceneOnOrbitResume({
+      isPreviewMode,
+      isFirstPersonMode: useEditor.getState().isFirstPersonMode,
+      hasControls: !!controls.current,
+      pending: pendingFitSceneRef.current,
+      groundY: orbitGroundY(lastLevelId.current),
+    })
+    if (plan.action !== 'apply' || !controls.current) return
+    pendingFitSceneRef.current = null
+    applyFitLookAt(controls.current, plan.lookAt)
+  }, [isPreviewMode])
+
   const focusNode = useCallback(
     (nodeId: string) => {
       if (isPreviewMode || isFirstPersonMode || !controls.current) return
@@ -1388,37 +1444,22 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
     }
 
     const handleFitScene = ({ bounds }: CameraControlFitSceneEvent) => {
-      if (isFirstPersonMode || !controls.current || isPreviewMode) return
-      const groundY = orbitGroundY(lastLevelId.current)
-      if (!bounds) {
-        // Restore default framing pose when no bounds were computed.
-        controls.current.setLookAt(
-          20,
-          keepEyeOverGround(20, 20 + groundY, 20, 20),
-          20,
-          0,
-          groundY,
-          0,
-          true,
-        )
+      const plan = planFitSceneOnEvent({
+        isPreviewMode,
+        isFirstPersonMode,
+        hasControls: !!controls.current,
+        bounds: bounds ?? null,
+        groundY: orbitGroundY(lastLevelId.current),
+      })
+      if (plan.action === 'ignore') return
+      if (plan.action === 'queue') {
+        pendingFitSceneRef.current = plan.pending
+        // Orbit path with a not-yet-attached ref: retry next frame.
+        if (!isFirstPersonMode) requestAnimationFrame(flushPendingFitScene)
         return
       }
-      const [cx, cz] = bounds.center
-      const [w, d] = bounds.size
-      // Use the longer horizontal extent to size the orbit radius so the whole
-      // footprint sits in view regardless of aspect ratio.
-      const maxExtent = Math.max(w, d)
-      const distance = Math.max(maxExtent * 1.4, 15)
-      const height = Math.max(maxExtent * 0.8, 10)
-      controls.current.setLookAt(
-        cx + distance * 0.7,
-        keepEyeOverGround(cx + distance * 0.7, height + groundY, cz + distance * 0.7, height),
-        cz + distance * 0.7,
-        cx,
-        groundY,
-        cz,
-        true,
-      )
+      pendingFitSceneRef.current = null
+      if (controls.current) applyFitLookAt(controls.current, plan.lookAt)
     }
 
     emitter.on('camera-controls:capture', handleNodeCapture)
@@ -1440,7 +1481,22 @@ export const CustomCameraControls = ({ paused = false }: { paused?: boolean }) =
       emitter.off('camera-controls:orbit-ccw', handleOrbitCCW)
       emitter.off('camera-controls:fit-scene', handleFitScene)
     }
-  }, [camera, cancelPoseApplication, focusNode, isPreviewMode, isFirstPersonMode])
+  }, [
+    camera,
+    cancelPoseApplication,
+    flushPendingFitScene,
+    focusNode,
+    isPreviewMode,
+    isFirstPersonMode,
+  ])
+
+  // Apply a fit that arrived while first-person (orbit unmounted). Wait one
+  // frame so CameraControls can remount and attach its ref.
+  useEffect(() => {
+    if (isFirstPersonMode || isPreviewMode || !pendingFitSceneRef.current) return
+    const frame = requestAnimationFrame(flushPendingFitScene)
+    return () => cancelAnimationFrame(frame)
+  }, [flushPendingFitScene, isFirstPersonMode, isPreviewMode])
 
   const onTransitionStart = useCallback(() => {
     cameraDraggingLifecycle.begin()

package/src/components/editor/duplicate-node.ts

@@ -9,6 +9,7 @@ import {
   FenceNode,
   generateId,
   ItemNode,
+  isNodeDuplicable,
   nodeRegistry,
   RoofSegmentNode,
   runSceneHistoryDraftWrite,
@@ -48,7 +49,7 @@ export function copyCollectionIds(copy: AnyNode): CollectionId[] {
  * every inspector's Duplicate. The copy is in the collections its source is in.
  */
 export function duplicateNodeAndPickUp(node: AnyNode) {
-  if (!node.parentId) return
+  if (!(node.parentId && isNodeDuplicable(node))) return
   if (startZoneRoomTransform(node, 'duplicate')) return
   sfxEmitter.emit('sfx:item-pick')
   const { setMovingNode } = useEditor.getState()

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

@@ -1,7 +1,7 @@
 'use client'
 
+import { useIsMobile } from '@pascal-app/viewer/ui'
 import { type ReactNode, useCallback, useEffect, useRef } from 'react'
-import { useIsMobile } from '../../hooks/use-mobile'
 import {
   openSidebarPanel,
   SIDEBAR_MIN_WIDTH,

package/src/components/editor/elevation-3d-guide-layer.tsx

@@ -2,13 +2,13 @@
 
 import { sceneRegistry } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { useFrame } from '@react-three/fiber'
 import { memo, useMemo, useRef } from 'react'
 import { BoxGeometry, CircleGeometry, type Group } from 'three'
 import { MeshBasicNodeMaterial } from 'three/webgpu'
 import { EDITOR_LAYER } from '../../lib/constants'
 import useElevationGuides from '../../store/use-elevation-guides'
-import { Html } from './localized-html'
 import { formatMeasurement } from './measurement-pill'
 
 const LINE_COLOR = 0x81_8c_f8