@pascal-app/editor 1.0.7 → 1.1.1

package/src/components/editor/floorplan-wall-typing-keys.test.tsx

@@ -0,0 +1,152 @@
+import { beforeEach, expect, test } from 'bun:test'
+import { emitter } from '@pascal-app/core'
+import { cancelActiveTool, useKeyboard } from '../../hooks/use-keyboard'
+import useEditor from '../../store/use-editor'
+import {
+  PLACEMENT_TYPING_LENGTH_ANGLE,
+  placementTypingLengthOptions,
+  usePlacementTyping,
+} from '../../store/use-placement-typing'
+import { sceneLayout } from '../../store/view-layout'
+import { withSelectionHarness } from '../../test-utils/selection-harness'
+import type { WallPlanPoint } from '../tools/wall/wall-drafting'
+import {
+  endFloorplanWallTypingOnCancel,
+  type FloorplanWallTypingDraft,
+  installFloorplanWallTypingKeys,
+} from './floorplan-wall-typing-keys'
+
+function GlobalShortcuts() {
+  useKeyboard()
+  return null
+}
+
+const press = (key: string) => {
+  const event = Object.assign(new Event('keydown', { cancelable: true }), {
+    key,
+    code: '',
+    metaKey: false,
+    ctrlKey: false,
+    altKey: false,
+    shiftKey: false,
+    repeat: false,
+  })
+  window.dispatchEvent(event)
+}
+
+beforeEach(() => {
+  usePlacementTyping.getState().clear()
+})
+
+test('2D-only typed wall keys run ahead of the global shortcuts', async () => {
+  await withSelectionHarness(async ({ render }) => {
+    useEditor.getState().setViewLayout(sceneLayout('2d'))
+    useEditor.getState().setPhase('building')
+    useEditor.getState().armToolMode({ mode: 'build', tool: 'wall' })
+    // The global handler is registered first, as the app mounts it.
+    await render(<GlobalShortcuts />)
+
+    let draft: FloorplanWallTypingDraft | null = {
+      start: [0, 0],
+      pointer: [2, 0],
+      lengthOptions: placementTypingLengthOptions('metric', 'meters'),
+    }
+    const committed: WallPlanPoint[] = []
+    const dropDraft = () => {
+      draft = null
+    }
+    emitter.on('tool:cancel', dropDraft)
+    const uninstall = installFloorplanWallTypingKeys({
+      getDraft: () => draft,
+      commit: (pointer) => committed.push(pointer),
+    })
+    try {
+      press('1')
+      press('m')
+      expect(usePlacementTyping.getState().fields[0]).toBe('1m')
+      expect(useEditor.getState().phase).toBe('building')
+      expect(useEditor.getState().mode).toBe('build')
+      expect(useEditor.getState().tool).toBe('wall')
+
+      press('Escape')
+      expect(usePlacementTyping.getState().isActive).toBe(false)
+      expect(draft).not.toBeNull()
+      expect(useEditor.getState().tool).toBe('wall')
+
+      press('Escape')
+      expect(draft).toBeNull()
+      expect(committed).toEqual([])
+    } finally {
+      uninstall()
+      emitter.off('tool:cancel', dropDraft)
+      usePlacementTyping.getState().clear()
+    }
+  })
+})
+
+test('Enter commits the pointer the typed fields re-project, only in 2D-only view', async () => {
+  await withSelectionHarness(async () => {
+    const committed: WallPlanPoint[] = []
+    const uninstall = installFloorplanWallTypingKeys({
+      getDraft: () => ({
+        start: [0, 0],
+        pointer: [2, 0],
+        lengthOptions: placementTypingLengthOptions('metric', 'meters'),
+      }),
+      commit: (pointer) => committed.push(pointer),
+    })
+    try {
+      useEditor.getState().setViewLayout(sceneLayout('split'))
+      press('3')
+      expect(usePlacementTyping.getState().isActive).toBe(false)
+
+      useEditor.getState().setViewLayout(sceneLayout('2d'))
+      press('3')
+      press('Enter')
+      expect(committed).toEqual([[2, 0]])
+    } finally {
+      uninstall()
+      usePlacementTyping.getState().clear()
+    }
+  })
+})
+
+test('in 2D-only view a cancel from any source first ends the typed session, then the draft', async () => {
+  await withSelectionHarness(async () => {
+    useEditor.getState().setViewLayout(sceneLayout('2d'))
+    useEditor.getState().armToolMode({ mode: 'build', tool: 'wall' })
+    let draftKept = true
+    // The plan's own `tool:cancel` handler.
+    const onCancel = () => {
+      if (endFloorplanWallTypingOnCancel()) return
+      draftKept = false
+    }
+    emitter.on('tool:cancel', onCancel)
+    try {
+      usePlacementTyping.getState().begin({ labels: PLACEMENT_TYPING_LENGTH_ANGLE })
+      usePlacementTyping.getState().append('3')
+
+      // The path ⌘Z takes mid-draft, not a keydown the plan sees itself.
+      expect(cancelActiveTool()).toBe(true)
+      expect(usePlacementTyping.getState().isActive).toBe(false)
+      expect(draftKept).toBe(true)
+      expect(useEditor.getState().mode).toBe('build')
+      expect(useEditor.getState().tool).toBe('wall')
+
+      cancelActiveTool()
+      expect(draftKept).toBe(false)
+    } finally {
+      emitter.off('tool:cancel', onCancel)
+    }
+  })
+})
+
+test('in split view the typed session and its cancel stay with the 3D wall tool', async () => {
+  await withSelectionHarness(async () => {
+    useEditor.getState().setViewLayout(sceneLayout('split'))
+    useEditor.getState().armToolMode({ mode: 'build', tool: 'wall' })
+    usePlacementTyping.getState().begin({ labels: PLACEMENT_TYPING_LENGTH_ANGLE })
+    expect(endFloorplanWallTypingOnCancel()).toBe(true)
+    expect(usePlacementTyping.getState().isActive).toBe(true)
+  })
+})

package/src/components/editor/floorplan-wall-typing-keys.ts

@@ -0,0 +1,79 @@
+import { isTypingTarget } from '@pascal-app/viewer'
+import { markToolCancelConsumed } from '../../hooks/use-keyboard'
+import type { ParseMeasurementOptions } from '../../lib/measurement-parser'
+import useEditor from '../../store/use-editor'
+import {
+  PLACEMENT_TYPING_LENGTH_ANGLE,
+  routePlacementTypingKey,
+  usePlacementTyping,
+} from '../../store/use-placement-typing'
+import { visibleScene } from '../../store/view-layout'
+import { getSegmentGridStep, type WallPlanPoint } from '../tools/wall/wall-drafting'
+import { resolveTypedWallEnd } from '../tools/wall/wall-typed-entry'
+
+export type FloorplanWallTypingDraft = {
+  start: WallPlanPoint
+  /** The plan-snapped pointer the typed fields re-project. */
+  pointer: WallPlanPoint
+  lengthOptions: ParseMeasurementOptions
+}
+
+/**
+ * Typed entry for the plan's own wall draft (2D-only view; in split view the
+ * 3D wall tool drafts and owns these keys). A window capture listener, so it
+ * runs before the global shortcuts and a typed `1`, `m` or the session's
+ * Escape never reaches them.
+ */
+export function installFloorplanWallTypingKeys({
+  getDraft,
+  commit,
+}: {
+  getDraft: () => FloorplanWallTypingDraft | null
+  commit: (pointer: WallPlanPoint) => void
+}): () => void {
+  const onKeyDown = (event: KeyboardEvent) => {
+    if (isTypingTarget(event.target)) return
+    if (visibleScene(useEditor.getState()) !== '2d') return
+    const draft = getDraft()
+    if (!draft) return
+    const outcome = routePlacementTypingKey(event, {
+      begin: (activeField) => {
+        usePlacementTyping.getState().begin({ labels: PLACEMENT_TYPING_LENGTH_ANGLE, activeField })
+        return true
+      },
+      tabBegins: true,
+    })
+    if (!outcome) return
+    event.preventDefault()
+    event.stopPropagation()
+    if (outcome !== 'commit') return
+    const typedEnd = resolveTypedWallEnd(
+      draft.start,
+      draft.pointer,
+      usePlacementTyping.getState().fields,
+      draft.lengthOptions,
+      getSegmentGridStep(),
+    )
+    if (typedEnd) commit(draft.pointer)
+  }
+  window.addEventListener('keydown', onKeyDown, true)
+  return () => window.removeEventListener('keydown', onKeyDown, true)
+}
+
+/**
+ * The plan's `tool:cancel` first stage. A cancel from any source (Escape, ⌘Z,
+ * a toolbar button) while a typed wall session is open only ends that
+ * session: in 2D-only view the plan clears it and consumes the cancel. In
+ * split view the 3D wall tool owns the session and its cancel. Returns true
+ * when the plan's wall draft must be kept.
+ */
+export function endFloorplanWallTypingOnCancel(): boolean {
+  const editor = useEditor.getState()
+  if (!(editor.mode === 'build' && editor.tool === 'wall')) return false
+  if (!usePlacementTyping.getState().isActive) return false
+  if (visibleScene(editor) === '2d') {
+    markToolCancelConsumed()
+    usePlacementTyping.getState().clear()
+  }
+  return true
+}

package/src/components/editor/follow-pascal.test.tsx

@@ -18,12 +18,11 @@ import {
   WindowNode,
 } from '@pascal-app/core'
 import { isNodeRevealing, startConstructionReveal, useViewer } from '@pascal-app/viewer'
+import { followBelowGrade, useFollowPascal } from '@pascal-app/viewer/ui'
 import { act, create } from '@react-three/test-renderer'
 import { BoxGeometry, DoubleSide, Group, Mesh, MeshBasicMaterial, Raycaster, Vector3 } from 'three'
-import { followBelowGrade } from '../../lib/below-grade'
 import { openingExterior, wallExterior } from '../../lib/follow-pascal-exterior.test-fixture'
 import useEditor from '../../store/use-editor'
-import useFollowPascal from '../../store/use-follow-pascal'
 import { usePointAsk } from '../../store/use-point-ask'
 import { FollowPascal } from './follow-pascal'
 

package/src/components/editor/follow-pascal.tsx

@@ -18,6 +18,7 @@ import {
   subscribeRevealEvents,
   useViewer,
 } from '@pascal-app/viewer'
+import { useFollowPascal } from '@pascal-app/viewer/ui'
 import { useFrame, useThree } from '@react-three/fiber'
 import { useEffect, useMemo, useRef } from 'react'
 import { Vector3 } from 'three'
@@ -34,7 +35,6 @@ import { FollowPresentation, type PresentationPort } from '../../lib/follow-pasc
 import { FollowSight } from '../../lib/follow-pascal-sight'
 import { stayOnLevel, wantFromEvent } from '../../lib/follow-pascal-targets'
 import useEditor from '../../store/use-editor'
-import useFollowPascal from '../../store/use-follow-pascal'
 import { usePointAsk } from '../../store/use-point-ask'
 
 /**

package/src/components/editor/footprint-height-handle.tsx

@@ -2,6 +2,7 @@
 
 import {
   type AnyNodeId,
+  formatLinearMeasurement,
   getStoredLevelHeight,
   type Point,
   type SlabNode,
@@ -10,6 +11,7 @@ import {
   useScene,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { type ThreeEvent, useFrame, useThree } from '@react-three/fiber'
 import { useRef, useState } from 'react'
 import { type Group, Plane, Vector2, Vector3 } from 'three'
@@ -20,12 +22,10 @@ import {
   THICK_FLOOR_HINT,
   thickFloorAdvice,
 } from '../../lib/floor-footprints'
-import { formatLinearMeasurement } from '../../lib/measurements'
 import { runRoomHandleDrag } from '../../lib/room-handle-drag'
 import useEditor, { isGridSnapActive } from '../../store/use-editor'
 import useInteractionScope from '../../store/use-interaction-scope'
 import { suppressBoxSelectForPointer } from '../tools/select/box-select-state'
-import { Html } from './localized-html'
 import { ElevationArrows, outlineCentroid, useHandleScale } from './room-handles'
 
 export const FOOTPRINT_HEIGHT_DRAG_LABEL = 'footprint-height'

package/src/components/editor/group-actions.ts

@@ -14,7 +14,7 @@ import {
   useLiveTransforms,
   useScene,
 } from '@pascal-app/core'
-import { markPerfAction, useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, markPerfAction, useViewer } from '@pascal-app/viewer'
 import { Plane, Vector2, Vector3 } from 'three'
 import { GROUP_MOVE_DRAG_LABEL } from '../../lib/contextual-help'
 import { clientToPlan } from '../../lib/floorplan/plan-coords'
@@ -28,7 +28,6 @@ import {
   pasteSystemEditorClipboardToLevel,
 } from '../../lib/scene-clipboard'
 import { emitDeleteSFX, sfxEmitter } from '../../lib/sfx-bus'
-import { isTypingTarget } from '../../lib/typing-target'
 import useAlignmentGuides from '../../store/use-alignment-guides'
 import useDeleteConfirmation from '../../store/use-delete-confirmation'
 import useEditor, {

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

@@ -2,6 +2,7 @@
 
 import { type AnyNodeId, useScene } 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 { useCallback, useMemo, useRef } from 'react'
 import * as THREE from 'three'
@@ -20,7 +21,6 @@ import {
   computeGroupPlanBox,
   levelFrame,
 } from './group-transform-shared'
-import { Html } from './localized-html'
 import { NodeActionMenu } from './node-action-menu'
 import { useMeshSettleEpoch } from './use-mesh-settle-epoch'
 

package/src/components/editor/group-move-3d.ts

@@ -12,13 +12,12 @@ import {
   useLiveTransforms,
   useScene,
 } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, useViewer } from '@pascal-app/viewer'
 import { type Camera, Plane, type Raycaster, Vector2, Vector3 } from 'three'
 import { GROUP_MOVE_DRAG_LABEL } from '../../lib/contextual-help'
 import { isHistoryShortcut } from '../../lib/history'
 import type { WallGroupPush } from '../../lib/room-handle-drag'
 import { sfxEmitter } from '../../lib/sfx-bus'
-import { isTypingTarget } from '../../lib/typing-target'
 import useAlignmentGuides from '../../store/use-alignment-guides'
 import useEditor, {
   isAlignmentGuideActive,

package/src/components/editor/group-rotate-handle.tsx

@@ -10,7 +10,7 @@ import {
   useLiveTransforms,
   useScene,
 } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, useViewer } from '@pascal-app/viewer'
 import { createPortal, type ThreeEvent, useThree } from '@react-three/fiber'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { OrthographicCamera, Plane, type Ray, Vector2, Vector3 } from 'three'
@@ -19,7 +19,6 @@ import { isHistoryShortcut } from '../../lib/history'
 import { sfxEmitter } from '../../lib/sfx-bus'
 import { intersectSpatialDragPlane } from '../../lib/spatial-drag-plane'
 import { getSpatialPointerId, spatialPointerInput } from '../../lib/spatial-pointer-input'
-import { isTypingTarget } from '../../lib/typing-target'
 import useEditor, { isAngleSnapActive } from '../../store/use-editor'
 import useInteractionScope, {
   useActiveHandleDrag,

package/src/components/editor/group-transform-shared.ts

@@ -3,6 +3,7 @@ import {
   type AnyNodeId,
   calculateLevelMiters,
   getWallPlanFootprint,
+  isMoveLocked,
   nodeRegistry,
   resolveBuildingForLevel,
   sceneRegistry,
@@ -99,7 +100,8 @@ export function classifyParticipant(
   levelId: string | null,
   sceneNodes: Record<string, AnyNode | undefined>,
 ): ParticipantKind | null {
-  if (!node || !isInGroupTransformScope(node, levelId, sceneNodes)) return null
+  if (!node || !isInGroupTransformScope(node, levelId, sceneNodes) || isMoveLocked(node))
+    return null
   const shape = classifyPlacementShape(node)
   if (shape) return shape
   const start = (node as { start?: unknown }).start

package/src/components/editor/handles/use-handle-drag.ts

@@ -11,7 +11,7 @@ import {
   useLiveNodeOverrides,
   useScene,
 } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, useViewer } from '@pascal-app/viewer'
 import { type ThreeEvent, useThree } from '@react-three/fiber'
 import { useEffect, useRef } from 'react'
 import {
@@ -28,7 +28,6 @@ import { isHistoryShortcut } from '../../../lib/history'
 import { sfxEmitter } from '../../../lib/sfx-bus'
 import { intersectSpatialDragPlane } from '../../../lib/spatial-drag-plane'
 import { getSpatialPointerId, spatialPointerInput } from '../../../lib/spatial-pointer-input'
-import { isTypingTarget } from '../../../lib/typing-target'
 import useInteractionScope from '../../../store/use-interaction-scope'
 import { suppressBoxSelectForPointer } from '../../tools/select/box-select-state'
 import { commitHandleDragPatch } from './handle-drag-history'

package/src/components/editor/index.tsx

@@ -3,7 +3,9 @@
 import { Icon } from '@iconify/react'
 import {
   acquireSceneReadOnlyLease,
+  computeSceneBoundsXZ,
   createI18n,
+  emitter,
   getCatalogMaterialById,
   getLibraryMaterialIdFromRef,
   getMaterialSwatch,
@@ -28,6 +30,24 @@ import {
   type ViewerImmersiveSession,
   ViewerPresentations,
 } from '@pascal-app/viewer'
+import { useViewerUiSounds } from '@pascal-app/viewer/sfx'
+import {
+  type ActionMenuPlacement,
+  ParametricViewerRooms,
+  SceneLoader,
+  SceneLoadFailed,
+  SKY_DOCK_HEIGHT,
+  SkyControl,
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+  useIsMobile,
+  useViewerFloorDisplay,
+  ViewerHoverLabel,
+  ViewerSelectionManager,
+  ViewerStage,
+  type ViewerStageMode,
+} from '@pascal-app/viewer/ui'
 import {
   type CSSProperties,
   memo,
@@ -43,9 +63,9 @@ import {
 } from 'react'
 import { ViewerOverlay } from '../../components/viewer-overlay'
 import { ViewerZoneSystem } from '../../components/viewer-zone-system'
+import { useAutoFrame } from '../../hooks/use-auto-frame'
 import { type SaveStatus, useAutoSave } from '../../hooks/use-auto-save'
 import { useKeyboard } from '../../hooks/use-keyboard'
-import { useIsMobile } from '../../hooks/use-mobile'
 import { useSaveShortcut } from '../../hooks/use-save-shortcut'
 import { type HINT_KEY_NAMES, toolHintKey, toolHintKeyDescriptor } from '../../i18n/node-messages'
 import { useCeilingEditSessionOwner } from '../../lib/ceiling-edit-session'
@@ -70,12 +90,12 @@ import {
 import { disposeSFXBus, initSFXBus } from '../../lib/sfx-bus'
 import { useUnitFocusRules } from '../../lib/units'
 import { cn } from '../../lib/utils'
-import { useViewerFloorDisplay } from '../../lib/viewer-selection'
 import { type CameraHintAction, useCameraHintFocus } from '../../store/use-camera-hint-focus'
 import useEditor from '../../store/use-editor'
 import useFloorplanMode from '../../store/use-floorplan-mode'
 import useSessionGroups from '../../store/use-session-groups'
 import { paneOfView, VIEW_2D, VIEW_3D, type ViewPaneIndex } from '../../store/view-layout'
+import { FloorplanDimensionHitsGate } from '../editor-2d/renderers/floorplan-dimension-edit-overlay'
 import { PointAskLayer } from '../point-ask/point-ask-layer'
 import { CeilingSelectionAffordanceSystem } from '../systems/ceiling/ceiling-selection-affordance-system'
 import { CeilingSystem, CeilingTopsSync } from '../systems/ceiling/ceiling-system'
@@ -86,7 +106,7 @@ import { ZoneSystem } from '../systems/zone/zone-system'
 import { BoxSelectTool } from '../tools/select/box-select-tool'
 import { ToolManager } from '../tools/tool-manager'
 import { ActionMenu } from '../ui/action-menu'
-import { type ActionMenuPlacement, TOP_MENU_CLEARANCE } from '../ui/action-menu/placement'
+import { TOP_MENU_CLEARANCE } from '../ui/action-menu/placement'
 import { CommandPalette, type CommandPaletteEmptyAction } from '../ui/command-palette'
 import { EditorCommands } from '../ui/command-palette/editor-commands'
 import { FloatingLevelSelector } from '../ui/floating-level-selector'
@@ -94,22 +114,13 @@ import { HelperManager } from '../ui/helpers/helper-manager'
 import { PanelManager } from '../ui/panels/panel-manager'
 import { ErrorBoundary } from '../ui/primitives/error-boundary'
 import { useSidebarStore } from '../ui/primitives/sidebar'
-import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/primitives/tooltip'
 import { RightStack } from '../ui/right-stack'
-import { SceneLoader, SceneLoadFailed } from '../ui/scene-loader'
 import { AppSidebar } from '../ui/sidebar/app-sidebar'
 import type { ExtraPanel } from '../ui/sidebar/icon-rail'
 import { SettingsPanel, type SettingsPanelProps } from '../ui/sidebar/panels/settings-panel'
 import { SitePanel, type SitePanelProps } from '../ui/sidebar/panels/site-panel'
 import type { SidebarTab } from '../ui/sidebar/tab-bar'
 import { useHostPanels } from '../ui/sidebar/use-plugin-panels'
-import { SKY_DOCK_HEIGHT, SkyControl } from '../viewer/sky-control'
-import { useViewerUiSounds } from '../viewer/use-viewer-ui-sounds'
-import { ViewerHoverLabel } from '../viewer/viewer-hover-label'
-import { ParametricViewerRooms } from '../viewer/viewer-rooms'
-import { ViewerSelectionManager } from '../viewer/viewer-selection-manager'
-import { ViewerStage } from '../viewer/viewer-stage'
-import type { ViewerStageMode } from '../viewer/viewer-stage-modes'
 import { CaptureCameraRig } from './capture-camera-rig'
 import { CustomCameraControls } from './custom-camera-controls'
 import { DeleteConfirmationDialog } from './delete-confirmation-dialog'
@@ -1570,6 +1581,8 @@ function EditorContent({
   useKeyboard({ isVersionPreviewMode, disabled: isFirstPersonMode || isStudioMode })
   useGestureLifecycleOwner()
 
+  useAutoFrame()
+
   const { beginSceneLoad, completeSceneLoad, saveNow } = useAutoSave({
     guardAgainstSceneWipe,
     onSave,
@@ -1741,6 +1754,21 @@ function EditorContent({
     return () => window.clearTimeout(timer)
   }, [hasLoadedInitialScene, isLoading, isSceneLoading, isViewerSceneReady, sceneReadyKey])
 
+  // The useAutoFrame emit can be clobbered by the level-follow effect's
+  // first-run pivot rest on fast (client-side navigation) loads. Re-emitting
+  // here is the last word after every load-driven camera effect has run.
+  // Once per load: a remounted viewer reports ready again, but only a new
+  // load reframes; remounted controls rest their own pivot on the level.
+  const framedSceneReadyKeyRef = useRef<number | null>(null)
+  useEffect(() => {
+    if (!isViewerSceneReady || framedSceneReadyKeyRef.current === sceneReadyKey) return
+    framedSceneReadyKeyRef.current = sceneReadyKey
+    const nodes = useScene.getState().nodes
+    if (Object.keys(nodes).length === 0) return
+    const bounds = computeSceneBoundsXZ(nodes)
+    emitter.emit('camera-controls:fit-scene', bounds ? { bounds } : {})
+  }, [isViewerSceneReady, sceneReadyKey])
+
   const isSceneDataLoading = isLoading || isSceneLoading || !hasLoadedInitialScene
   const showLoader = isSceneDataLoading || !isViewerSceneReady
   const visibleLoader =
@@ -2055,7 +2083,9 @@ function EditorContent({
 function EditorFrame(props: EditorProps) {
   return (
     <Profiler id="editor" onRender={recordEditorRender}>
-      <EditorContent {...props} />
+      <FloorplanDimensionHitsGate>
+        <EditorContent {...props} />
+      </FloorplanDimensionHitsGate>
     </Profiler>
   )
 }

package/src/components/editor/inspector-extension-actions.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useIsMobile } from '../../hooks/use-mobile'
+import { useIsMobile } from '@pascal-app/viewer/ui'
 import { openExtension } from '../../lib/inspector-card-mode'
 import { useInspectorExpanded } from '../../lib/inspector-expanded'
 import { renderExtensionIcon, useInspectorExtensions } from '../ui/panels/inspector-extensions'

package/src/components/editor/measurement-pill.tsx

@@ -1,8 +1,8 @@
 'use client'
 
+import { formatLinearMeasurement, type MetricNotation } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
 import { type ForwardedRef, Fragment, forwardRef } from 'react'
-import { formatLinearMeasurement, type MetricNotation } from '../../lib/measurements'
 
 // Canonical in-world dimension formatter — metric metres or imperial
 // feet/inches. Shared by every measurement readout so they read the same.

package/src/components/editor/node-arrow-handles.tsx

@@ -9,6 +9,7 @@ import {
   createAngleAccumulator,
   createSceneApi,
   DEFAULT_ANGLE_STEP,
+  formatAngleRadians,
   type HandleDescriptor,
   type HandlePortal,
   type LatchHandle,
@@ -21,6 +22,7 @@ import {
   useScene,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { createPortal, type ThreeEvent, useFrame, useThree } from '@react-three/fiber'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import {
@@ -59,7 +61,6 @@ import useInteractionScope, {
   useMovingNode,
 } from '../../store/use-interaction-scope'
 import useOpeningGuides from '../../store/use-opening-guides'
-import { formatAngleRadians } from '../tools/shared/segment-angle'
 import {
   ARROW_COLOR,
   ARROW_HOVER_COLOR,
@@ -76,7 +77,6 @@ import {
 import { createLinearResizeDragBinding, linearResizeFactor } from './handles/linear-resize-drag'
 import { resolveResizeSnapValue } from './handles/resize-snap'
 import { type HandleDragControls, useHandleDrag } from './handles/use-handle-drag'
-import { Html } from './localized-html'
 
 // Pooled scratch for the handle rig's world-relative pose mapping.
 const _rigRelative = new Matrix4()

package/src/components/editor/open-wall-ends-3d-layer.tsx

@@ -1,7 +1,8 @@
 'use client'
 
 import { type OpenWallEnd, sceneRegistry } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { MEASUREMENT_DANGLING_COLOR, useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { useFrame } from '@react-three/fiber'
 import { memo, useEffect, useMemo, useRef } from 'react'
 import { BoxGeometry, CircleGeometry, type Group, RingGeometry } from 'three'
@@ -13,12 +14,10 @@ import {
 } from '../../hooks/use-open-wall-ends'
 import { EDITOR_LAYER } from '../../lib/constants'
 import { openWallEndKey, openWallEndLabel } from '../../lib/floorplan/open-wall-ends'
-import { MEASUREMENT_DANGLING_COLOR } from '../../lib/measurements'
 import { cn } from '../../lib/utils'
 import useEditor from '../../store/use-editor'
 import { isViewVisible, VIEW_3D, visibleScene } from '../../store/view-layout'
 import { JoinWallsPill } from './join-walls-pill'
-import { Html } from './localized-html'
 import { OpenWallEndsHint } from './open-wall-ends-hint'
 
 /**

package/src/components/editor/open-wall-ends-hint.tsx

@@ -1,10 +1,10 @@
 'use client'
 
 import { type AnyNodeId, emitter, type OpenWallEnd } from '@pascal-app/core'
+import { MEASUREMENT_DANGLING_COLOR } from '@pascal-app/viewer'
 import { useEffect, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { openWallEndsSummary } from '../../lib/floorplan/open-wall-ends'
-import { MEASUREMENT_DANGLING_COLOR } from '../../lib/measurements'
 
 // The viewer area holds the floor plan and the 3D view side by side, so its
 // top centre clears both views' corner controls in 2D, 3D and split alike.

package/src/components/editor/opening-guides-3d-layer.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { memo, useEffect, useLayoutEffect, useMemo } from 'react'
 import { BufferGeometry, Float32BufferAttribute, Line as ThreeLine } from 'three'
 import { LineBasicNodeMaterial } from 'three/webgpu'
@@ -9,7 +10,6 @@ import useOpeningGuides, {
   type OpeningGuide3D,
   type OpeningGuideVec3,
 } from '../../store/use-opening-guides'
-import { Html } from './localized-html'
 import { formatMeasurement } from './measurement-pill'
 
 const DIMENSION_COLOR = 0x81_8c_f8 // indigo — a neutral measurement

package/src/components/editor/quick-measurement-card.tsx

@@ -1,9 +1,9 @@
 'use client'
 
 import type { QuickMeasurementMetric, QuickMeasurementReport } from '@pascal-app/core'
+import { formatAreaLabel, formatLinearMeasurement, formatVolumeLabel } from '@pascal-app/core'
 import { Crosshair, MapPin } from 'lucide-react'
 import { memo } from 'react'
-import { formatAreaLabel, formatLinearMeasurement, formatVolumeLabel } from '../../lib/measurements'
 
 function formatMetric(
   metric: QuickMeasurementMetric,