@pascal-app/editor 1.0.7 → 1.1.0

package/src/index.tsx

@@ -15,8 +15,12 @@ export {
   acquireSceneReadOnlyLease,
   applyScenePatch,
   applySceneSnapshot,
+  buildMeasurementAngleArcPoints,
   type CompiledTranslationMessages,
+  closeDoorOpenState,
+  closeWindowOpenState,
   createI18n,
+  cubicMetersToVolumeUnit,
   DEFAULT_CURVED_STAIR_INNER_RADIUS,
   DEFAULT_CURVED_STAIR_SWEEP_ANGLE,
   DEFAULT_SPIRAL_SHOW_CENTER_COLUMN,
@@ -33,15 +37,36 @@ export {
   DEFAULT_STAIR_TYPE,
   DEFAULT_STAIR_WIDTH,
   defaultI18n,
+  formatAngleRadians,
+  formatAreaLabel,
   formatLength,
+  formatLinearMeasurement,
   formatNumber,
+  formatVolumeLabel,
+  getAreaUnitLabel,
+  getDisplayedDoorValue,
+  getDisplayedWindowShutterValue,
+  getDisplayedWindowValue,
+  getLinearUnitLabel,
   getLocale,
+  getVolumeUnitLabel,
+  isOperableWindowType,
+  type LinearUnit,
+  linearControlValueToMeters,
+  linearUnitToMeters,
+  metersToLinearUnit,
   normalizeDecimalInput,
+  openDoorOpenState,
+  openWindowOpenState,
   type PascalI18n,
   PascalI18nProvider,
+  parseLinearMeasurementInput,
   parseLocalizedNumber,
   registerCompiledMessages,
   registerMessages,
+  resolveElevatorNodeSupportY,
+  resolveElevatorSupportLevelId,
+  resolveElevatorSupportY,
   type SceneCommit,
   type SceneCommitListener,
   type SceneCommitOrigin,
@@ -49,7 +74,10 @@ export {
   type SceneNodePatch,
   type ScenePatch,
   type SceneSnapshot,
+  separatorFloorElevation,
   setLocale,
+  setWindowShuttersOpenState,
+  squareMetersToAreaUnit,
   subscribe,
   subscribeSceneCommits,
   type TranslationMessage,
@@ -59,8 +87,18 @@ export {
   useLocale,
   usePascalI18n,
   useScene,
+  type WindowOpenAnimationOptions,
+  type WindowShutterField,
 } from '@pascal-app/core'
-export { useViewer } from '@pascal-app/viewer'
+export {
+  MEASUREMENT_ACTIVE_COLOR,
+  MEASUREMENT_DANGLING_COLOR,
+  MEASUREMENT_PERSISTENT_COLOR,
+  measurementPolygonLabelAnchor,
+  measurementPresentationColor,
+  triangulateMeasurementPolygon,
+  useViewer,
+} from '@pascal-app/viewer'
 export type { EditorProps } from './components/editor'
 export { default as Editor } from './components/editor'
 export { ActionMenuButton } from './components/editor/action-menu-button'
@@ -188,6 +226,7 @@ export {
 } from './components/tools/item/use-placement-coordinator'
 export { MoveRegistryNodeTool } from './components/tools/registry/move-registry-node-tool'
 export {
+  type RegistryToolContextValue,
   RegistryToolProvider,
   useRegistryToolContext,
 } from './components/tools/registry-tool-context'
@@ -207,6 +246,7 @@ export {
   resolveLevelConstructionPlane,
 } from './components/tools/shared/horizontal-construction-plane'
 export { PlacementBox } from './components/tools/shared/placement-box'
+export { PlacementCoordinateInput } from './components/tools/shared/placement-coordinate-input'
 export { PlacementDimensionGuides } from './components/tools/shared/placement-dimension-guides'
 // Pointer-decided support surface (deck top vs floor underneath) — the
 // draw tools (wall / fence) ride their grid plane and commit cap on it.
@@ -222,7 +262,6 @@ export {
   type PolygonEditorProps,
 } from './components/tools/shared/polygon-editor'
 export {
-  formatAngleRadians,
   getAngleArcToSegmentReference,
   getAngleToSegmentReference,
   getSegmentAngleReferenceAtPoint,
@@ -264,6 +303,11 @@ export {
   type WallPullSnapRadii,
   type WallPullSnapResult,
 } from './components/tools/wall/wall-pull-snap'
+export {
+  formatWallDraftHeading,
+  resolveTypedWallEnd,
+  wallDraftHeadingDegrees,
+} from './components/tools/wall/wall-typed-entry'
 // `ToolbarLeft` / `ToolbarRight` alias `ViewerToolbarLeft` / `ViewerToolbarRight`
 // (same components) under the names headless hosts compose their toolbars with.
 export {
@@ -476,7 +520,12 @@ export {
   resolveCeilingPlanPointSnap,
 } from './lib/ceiling-plan-snap'
 export { EDITOR_LAYER } from './lib/constants'
-export type { ContextualShortcutHint } from './lib/contextual-help'
+export {
+  AXIS_MOVE_DRAG_LABEL,
+  type ContextualShortcutHint,
+  PATH_POINT_DRAG_LABEL,
+  ROTATE_HANDLE_DRAG_LABEL,
+} from './lib/contextual-help'
 export {
   CONTEXTUAL_HELP_NODE_EXTENSION_KEY,
   type ContextualHelpNodeExtension,
@@ -491,11 +540,6 @@ export {
   nextContinuation,
 } from './lib/continuation'
 export { canDirectMoveNode } from './lib/direct-manipulation'
-export {
-  closeDoorOpenState,
-  getDisplayedDoorValue,
-  openDoorOpenState,
-} from './lib/door-interaction'
 export { downloadProjectFile } from './lib/download-project-file'
 export { createEditorApi } from './lib/editor-api'
 export {
@@ -517,12 +561,7 @@ export {
   resolveElevationSnapMatch,
   resolveStructuralElevationSnap,
 } from './lib/elevation-guides'
-export {
-  resolveCurrentBuildingId,
-  resolveElevatorNodeSupportY,
-  resolveElevatorSupportLevelId,
-  resolveElevatorSupportY,
-} from './lib/elevator-support'
+export { resolveCurrentBuildingId } from './lib/elevator-support'
 export type { ExportTextureUtils } from './lib/export-texture-utils'
 export { getFloatingMenuScale } from './lib/floating-menu-scale'
 export { startOpeningDraft } from './lib/floor-opening-draft'
@@ -665,6 +704,11 @@ export {
   editorFinishScriptHost,
   finishScriptCode,
 } from './lib/geometry-script/finish-scripts'
+export {
+  beginGesture,
+  type GestureCancelReason,
+  type GestureHandle,
+} from './lib/gesture-lifecycle'
 export { exportSceneToGlb, type GlbExportOptions } from './lib/glb-export'
 export {
   type EditorGridEvent,
@@ -750,10 +794,6 @@ export {
   isCreatableMeasurementKind,
   normalizeCreatableMeasurementKind,
 } from './lib/measurement-kind'
-export {
-  measurementPolygonLabelAnchor,
-  triangulateMeasurementPolygon,
-} from './lib/measurement-label'
 export {
   type LingoUnitSpec,
   lingoUnitSpec,
@@ -763,26 +803,8 @@ export {
   parseMeasurement,
 } from './lib/measurement-parser'
 export {
-  buildMeasurementAngleArcPoints,
-  cubicMetersToVolumeUnit,
-  formatAreaLabel,
-  formatLinearMeasurement,
-  formatVolumeLabel,
-  getAreaUnitLabel,
-  getLinearUnitLabel,
-  getVolumeUnitLabel,
-  type LinearUnit,
-  linearControlValueToMeters,
-  linearUnitToMeters,
-  MEASUREMENT_ACTIVE_COLOR,
-  MEASUREMENT_DANGLING_COLOR,
   MEASUREMENT_FLOORPLAN_COLOR,
-  MEASUREMENT_PERSISTENT_COLOR,
   measurementFloorplanPresentationColor,
-  measurementPresentationColor,
-  metersToLinearUnit,
-  parseLinearMeasurementInput,
-  squareMetersToAreaUnit,
 } from './lib/measurements'
 export type {
   ModelExport,
@@ -863,7 +885,6 @@ export { clearRoofDuplicateMetadata, duplicateRoofSubtree } from './lib/roof-dup
 export { hasRoofFaceChildOverlap, type RoofWallHit, resolveRoofWallHit } from './lib/roof-wall-hit'
 export {
   selectedWallDimensions,
-  separatorFloorElevation,
   separatorPushHandles,
   WALL_PUSH_AFFORDANCE,
   type WallPushArrowPayload,
@@ -1029,16 +1050,6 @@ export {
   wallTypePlacementOf,
 } from './lib/wall-type'
 export { writeWindowChanges } from './lib/window-changes'
-export {
-  closeWindowOpenState,
-  getDisplayedWindowShutterValue,
-  getDisplayedWindowValue,
-  isOperableWindowType,
-  openWindowOpenState,
-  setWindowShuttersOpenState,
-  type WindowOpenAnimationOptions,
-  type WindowShutterField,
-} from './lib/window-interaction'
 export {
   getActiveBuildingPose,
   projectAlignmentGuidesWorldToActiveBuildingLocal,
@@ -1161,6 +1172,22 @@ export {
   default as usePlacementPreview,
   type PlacementPreviewDimension,
 } from './store/use-placement-preview'
+export {
+  isPlacementTypingKey,
+  isPlacementTypingStartKey,
+  PLACEMENT_TYPING_DISTANCE_OFFSET,
+  PLACEMENT_TYPING_LENGTH_ANGLE,
+  type PlacementTypingField,
+  type PlacementTypingKeyOptions,
+  type PlacementTypingKeyOutcome,
+  type PlacementTypingProjection,
+  type PlacementTypingSession,
+  type PlacementTypingState,
+  type PlacementTypingValues,
+  placementTypingLengthOptions,
+  routePlacementTypingKey,
+  usePlacementTyping,
+} from './store/use-placement-typing'
 export { usePointAsk } from './store/use-point-ask'
 export {
   activateQuickMeasurementHudSource,

package/src/lib/contextual-help.ts

@@ -31,6 +31,12 @@ export const RESIZE_HANDLE_DRAG_LABEL = 'resize-handle'
 export const GROUP_MOVE_DRAG_LABEL = 'group-move-handle'
 export const GROUP_ROTATE_DRAG_LABEL = 'group-rotate-handle'
 
+// `activeHandleDrag.label`s for the MEP handles, in 3D and on the plan: one
+// point of a run, where Alt detaches the joint, and a fitting, a run or one
+// run segment slid along an axis. Their snap context is the kind's own.
+export const PATH_POINT_DRAG_LABEL = 'path-point'
+export const AXIS_MOVE_DRAG_LABEL = 'axis-move'
+
 export function resolveRotateHandleHelpHints(altPressed: boolean): ContextualShortcutHint[] {
   return [
     {

package/src/lib/elevation-guides.ts

@@ -154,12 +154,27 @@ export function collectElevationSnapTargets(
         anchor: center,
         label: 'Wall base',
       })
-      targets.push({
-        id: `${node.id}:top`,
-        elevation: base + getWallEffectiveHeightForNodes(node, nodes),
-        anchor: center,
-        label: 'Wall top',
-      })
+      if (node.endHeightOffset) {
+        targets.push({
+          id: `${node.id}:top-start`,
+          elevation: base + getWallEffectiveHeightForNodes(node, nodes, 0),
+          anchor: node.start,
+          label: 'Wall top start',
+        })
+        targets.push({
+          id: `${node.id}:top-end`,
+          elevation: base + getWallEffectiveHeightForNodes(node, nodes, 1),
+          anchor: node.end,
+          label: 'Wall top end',
+        })
+      } else {
+        targets.push({
+          id: `${node.id}:top`,
+          elevation: base + getWallEffectiveHeightForNodes(node, nodes, 0.5),
+          anchor: center,
+          label: 'Wall top',
+        })
+      }
       continue
     }
 

package/src/lib/elevator-support.ts

@@ -1,26 +1,4 @@
-import {
-  type AnyNode,
-  type AnyNodeId,
-  type BuildingNode,
-  type ElevatorNode,
-  type LevelNode,
-  spatialGridManager,
-  useScene,
-} from '@pascal-app/core'
-
-function getBuildingLevels(
-  buildingId: string | null | undefined,
-  nodes: Record<string, AnyNode>,
-): LevelNode[] {
-  if (!buildingId) return []
-  const building = nodes[buildingId as AnyNodeId]
-  if (building?.type !== 'building') return []
-
-  return building.children
-    .map((childId) => nodes[childId as AnyNodeId])
-    .filter((entry): entry is LevelNode => entry?.type === 'level')
-    .sort((left, right) => left.level - right.level)
-}
+import type { AnyNode, AnyNodeId, BuildingNode, LevelNode } from '@pascal-app/core'
 
 export function resolveCurrentBuildingId({
   buildingId,
@@ -45,52 +23,3 @@ export function resolveCurrentBuildingId({
 
   return null
 }
-
-export function resolveElevatorSupportLevelId({
-  buildingId,
-  preferredLevelId,
-}: {
-  buildingId: string | null | undefined
-  preferredLevelId?: string | null
-}): LevelNode['id'] | null {
-  const nodes = useScene.getState().nodes
-  const preferred = preferredLevelId ? nodes[preferredLevelId as AnyNodeId] : undefined
-  const levels = getBuildingLevels(buildingId, nodes)
-  const preferredInBuilding = preferredLevelId
-    ? levels.find((level) => level.id === preferredLevelId)
-    : undefined
-
-  if (preferredInBuilding) return preferredInBuilding.id
-  if (levels.length === 0) return preferred?.type === 'level' ? preferred.id : null
-
-  return levels[0]?.id ?? null
-}
-
-export function resolveElevatorSupportY({
-  buildingId,
-  preferredLevelId,
-  x,
-  z,
-}: {
-  buildingId: string | null | undefined
-  preferredLevelId?: string | null
-  x: number
-  z: number
-}): number {
-  const levelId = resolveElevatorSupportLevelId({ buildingId, preferredLevelId })
-  if (!levelId) return 0
-
-  return Math.max(0, spatialGridManager.getSlabElevationAt(levelId, x, z))
-}
-
-export function resolveElevatorNodeSupportY(
-  node: ElevatorNode,
-  position: [number, number, number] = node.position,
-): number {
-  return resolveElevatorSupportY({
-    buildingId: node.parentId,
-    preferredLevelId: node.fromLevelId ?? node.defaultLevelId,
-    x: position[0],
-    z: position[2],
-  })
-}

package/src/lib/floor-footprints.test.ts

@@ -11,6 +11,7 @@ import {
   ItemNode,
   initSpaceDetectionSync,
   LevelNode,
+  levelFootprints,
   type SceneCommit,
   type SlabNode,
   SlabNode as SlabSchema,
@@ -29,7 +30,6 @@ import {
   footprintsToMoveTogether,
   foundationHeight,
   isFootprintConstructionHit,
-  levelFootprints,
   presetPatch,
   roomFloorOwner,
   roomFootprint,

package/src/lib/floor-footprints.ts

@@ -10,6 +10,7 @@ import {
   getRoomBaseElevation,
   groundFloorConstruction,
   intersection,
+  levelFootprints,
   roomDrawnFloor,
   type SlabNode,
   setFloorFoundation,
@@ -39,15 +40,6 @@ const ON_GROUND = 0.0005
 const isBase = (node: AnyNode | undefined): node is SlabNode =>
   node?.type === 'slab' && node.plateRole === 'base'
 
-const footprintArea = (plate: SlabNode) => area([{ outer: plate.polygon, holes: plate.holes }])
-
-/** The level's footprints, largest first (ties by id, so the order is stable). */
-export function levelFootprints(nodes: Record<string, AnyNode>, levelId: string): SlabNode[] {
-  return Object.values(nodes)
-    .filter((node): node is SlabNode => isBase(node) && node.parentId === levelId)
-    .sort((a, b) => footprintArea(b) - footprintArea(a) || a.id.localeCompare(b.id))
-}
-
 /**
  * The drawn slab a room's floor is: the one it visibly stands on (a legacy
  * floor can show a hand-drawn slab over the one it was taken from), else the

package/src/lib/floor-foundation-support.test.ts

@@ -11,6 +11,7 @@ import {
   getLevelElevations,
   initSpaceDetectionSync,
   LevelNode,
+  levelFootprints,
   type SlabNode,
   upperFloorHeightControl,
   useScene,
@@ -30,7 +31,6 @@ import {
   footprintHeightMinimum,
   footprintHeightPatch,
   footprintHeightValue,
-  levelFootprints,
   presetPatch,
   setFootprintHeight,
   thickFloorAdvice,
@@ -169,7 +169,6 @@ describe('Upper-floor height drag release (round-final item 6)', () => {
     test(`a drag of ${delta} m lands on release`, () => {
       const bedroom = plateOf(UPPER, 'Bedroom')
       const start = footprintHeightValue(nodes(), bedroom)
-      const past = useScene.temporal.getState().pastStates.length
       const preview = beginFootprintHeightPreview(bedroom.id)
       expect(preview.preview(start + delta / 2)).toBeNull()
       expect(preview.preview(start + delta)).toBeNull()
@@ -177,7 +176,13 @@ describe('Upper-floor height drag release (round-final item 6)', () => {
       const after = nodes()[bedroom.id] as SlabNode
       expect(after.thickness).toBeCloseTo(bedroom.thickness + delta, 6)
       expect(footprintHeightValue(nodes(), after)).toBeCloseTo(start + delta, 6)
-      expect(useScene.temporal.getState().pastStates.length).toBe(past + 1)
+      useScene.temporal.getState().undo()
+      expect(footprintHeightValue(nodes(), nodes()[bedroom.id] as SlabNode)).toBeCloseTo(start, 6)
+      useScene.temporal.getState().redo()
+      expect(footprintHeightValue(nodes(), nodes()[bedroom.id] as SlabNode)).toBeCloseTo(
+        start + delta,
+        6,
+      )
     })
   }
 })

package/src/lib/floor-opening-draft.ts

@@ -7,6 +7,7 @@ import {
   generateId,
   type LevelNode,
   type MultiPolygon,
+  roomFloorElevation,
   type StructurePlan,
   structureChangeBatch,
   useScene,
@@ -31,7 +32,6 @@ import {
 import { type FloorRegionPoint, floorRegionSnapTargets } from './floor-region-snap'
 import { beginGesture, type GestureHandle } from './gesture-lifecycle'
 import { resolveRoomAssemblyHeights } from './room-assembly-overlay'
-import { roomFloorElevation } from './room-handle-drag'
 import { sfxEmitter } from './sfx-bus'
 
 // "Cut opening": draws an opening on a room's floor (or its ceiling) with the

package/src/lib/floor-region-session.ts

@@ -7,6 +7,7 @@ import {
   ceilingRegionsOwner,
   type MultiPolygon,
   resolveCeilingHeight,
+  roomFloorElevation,
   union,
   useScene,
 } from '@pascal-app/core'
@@ -32,7 +33,6 @@ import { beginGesture, type GestureHandle } from './gesture-lifecycle'
 import { hasActivePaintMaterial } from './material-paint'
 import { isPaintErasing, usePaintRegionMode } from './paint-region-mode'
 import { addCeilingRegion, addFloorRegion } from './paint-regions'
-import { roomFloorElevation } from './room-handle-drag'
 
 // An outline drawn on one room's floor: a rectangle (press, drag, release; a
 // persistent tool also takes two clicks) or a polygon (click points, close on

package/src/lib/floorplan/open-wall-ends.ts

@@ -1,11 +1,12 @@
 import {
+  formatLinearMeasurement,
+  type LinearUnit,
   type OpenWallEnd,
   planJoinOpenWallEnd,
   runAsSingleSceneHistoryStep,
   useScene,
   type WallJoinResult,
 } from '@pascal-app/core'
-import { formatLinearMeasurement, type LinearUnit } from '../measurements'
 
 const JOIN_REFUSALS: Record<Extract<WallJoinResult, { ok: false }>['reason'], string> = {
   'covered-existing-wall': 'An existing wall already covers this span',

package/src/lib/gesture-lifecycle.ts

@@ -33,7 +33,9 @@ export type GestureSpec = {
   kind: string
   /**
    * Drops the gesture's own in-flight state (draft, preview, listeners,
-   * pending frames). Never writes the scene. Runs once, on cancel only.
+   * pending frames). Runs once, on cancel only. Undo and redo cancel before
+   * they jump, so this must record no history: a gesture that previews
+   * through scene writes under paused history reverts them here, then resumes.
    */
   onCancel: (reason: GestureCancelReason) => void
   /** A scope the owner begins for the gesture and releases only while it is still this one. */

package/src/lib/interaction/scope.ts

@@ -28,6 +28,7 @@ export type ReshapeKind =
   | 'tangent'
   // A kind's own reshape (wall 'split'): mounted from `def.affordanceTools[reshape]`.
   | 'split'
+  | 'trim'
 
 export type InteractionScope =
   | { kind: 'idle' }

package/src/lib/layer-thickness.ts

@@ -1,4 +1,4 @@
-import type { LinearUnit } from './measurements'
+import type { LinearUnit } from '@pascal-app/core'
 
 const METRES_PER_INCH = 0.0254
 

package/src/lib/level-selection.test.ts

@@ -3,6 +3,7 @@ import {
   type AnyNode,
   type AnyNodeId,
   BuildingNode,
+  ElevatorNode,
   LevelNode,
   RoofNode,
   useScene,
@@ -27,10 +28,14 @@ beforeEach(() => {
     metadata: { role: 'roof' },
   })
   const roof = RoofNode.parse({ id: 'roof_main', parentId: roofLevel.id })
-  const building = BuildingNode.parse({ id: BUILDING, children: [GROUND, roofLevel.id] })
+  const elevator = ElevatorNode.parse({ id: 'elevator_lift', parentId: BUILDING })
+  const building = BuildingNode.parse({
+    id: BUILDING,
+    children: [GROUND, roofLevel.id, elevator.id],
+  })
   useScene.setState({
     nodes: Object.fromEntries(
-      [building, ground, wall, roofLevel, roof].map((node) => [node.id, node as AnyNode]),
+      [building, ground, wall, roofLevel, roof, elevator].map((node) => [node.id, node as AnyNode]),
     ),
     rootNodeIds: [BUILDING],
   } as never)
@@ -54,4 +59,15 @@ describe('selectPlacedNode', () => {
       selectedIds: ['wall_a'],
     })
   })
+
+  test('a building-parented node keeps the floor in view and adopts its building', () => {
+    useViewer.getState().resetSelection()
+    useViewer.getState().setSelection({ levelId: GROUND })
+    selectPlacedNode('elevator_lift' as AnyNodeId)
+    expect(useViewer.getState().selection).toMatchObject({
+      buildingId: BUILDING,
+      levelId: GROUND,
+      selectedIds: ['elevator_lift'],
+    })
+  })
 })

package/src/lib/level-selection.ts

@@ -1,4 +1,4 @@
-import type { AnyNodeId, BuildingNode, LevelNode } from '@pascal-app/core'
+import type { AnyNode, AnyNodeId, BuildingNode, LevelNode } from '@pascal-app/core'
 import { findLevelAncestorId, useScene } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
 
@@ -30,17 +30,40 @@ export function deleteLevelWithFallbackSelection(levelId: AnyNodeId) {
   }
 }
 
+function findBuildingAncestorId(
+  nodeId: AnyNodeId,
+  nodes: Record<string, AnyNode>,
+): BuildingNode['id'] | null {
+  let current: AnyNode | undefined = nodes[nodeId]
+  for (let guard = 0; current && guard < 16; guard++) {
+    if (current.type === 'building') return current.id
+    current = current.parentId ? nodes[current.parentId as AnyNodeId] : undefined
+  }
+  return null
+}
+
 /**
  * Selects a node a tool just made, on its own level when that is not the one in view: a roof drawn
  * over a storey's walls lands on the level above, which the editor hides while the storey is
- * selected, so selecting it there alone would leave it out of sight.
+ * selected, so selecting it there alone would leave it out of sight. A node parented to the
+ * building itself (an elevator) has no level, so the floor in view stays active when it belongs
+ * to that building.
  */
 export function selectPlacedNode(nodeId: AnyNodeId) {
-  const levelId = findLevelAncestorId(nodeId, useScene.getState().nodes)
+  const { nodes } = useScene.getState()
+  const levelId = findLevelAncestorId(nodeId, nodes) as LevelNode['id'] | null
+  const buildingId = findBuildingAncestorId(nodeId, nodes)
   const { selection, setSelection } = useViewer.getState()
-  setSelection(
-    levelId && levelId !== selection.levelId
-      ? { levelId: levelId as LevelNode['id'], selectedIds: [nodeId] }
-      : { selectedIds: [nodeId] },
-  )
+  const updates: Partial<typeof selection> = { selectedIds: [nodeId] }
+  if (buildingId && buildingId !== selection.buildingId) {
+    updates.buildingId = buildingId
+    updates.levelId =
+      levelId ??
+      (selection.levelId && findBuildingAncestorId(selection.levelId, nodes) === buildingId
+        ? selection.levelId
+        : null)
+  } else if (levelId && levelId !== selection.levelId) {
+    updates.levelId = levelId
+  }
+  setSelection(updates)
 }

package/src/lib/linear-display.ts

@@ -4,7 +4,7 @@ import {
   linearUnitToMeters,
   type MetricNotation,
   metersToLinearUnit,
-} from './measurements'
+} from '@pascal-app/core'
 
 export function getLinearDisplay(
   unit: string,

package/src/lib/live-gesture-round-trip.test.ts

@@ -6,6 +6,7 @@ import {
   createZoneDivisionContext,
   generateId,
   nodeRegistry,
+  roomFloorElevation,
   type SlabNode,
   useLiveNodeOverrides,
   useScene,
@@ -29,7 +30,6 @@ import { roomRelativeFloorHeight, stepRoomFloorElevation } from './room-construc
 import {
   commitRoomElevation,
   mezzanineEdgeHandles,
-  roomFloorElevation,
   roomPushHandles,
   runFloorplanMezzanineEdge,
   runFloorplanRoomPush,

package/src/lib/measurement-label.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test'
 import { measurementCentroid, pointInPolygon2D } from '@pascal-app/core'
-import { measurementPolygonLabelAnchor, triangulateMeasurementPolygon } from './measurement-label'
+import { measurementPolygonLabelAnchor, triangulateMeasurementPolygon } from '@pascal-app/viewer'
 
 describe('measurementPolygonLabelAnchor', () => {
   test('keeps a concave polygon label inside its visible fill', () => {