@pascal-app/editor 1.0.7 → 1.1.1

package/src/lib/editor-level-display.ts

@@ -1,7 +1,7 @@
 import { useViewer } from '@pascal-app/viewer'
+import { useBelowGrade, useGroundWindowBox } from '@pascal-app/viewer/ui'
 import { useEffect } from 'react'
 import useEditor, { type CaptureMode } from '../store/use-editor'
-import { useBelowGrade, useGroundWindowBox } from './below-grade'
 
 /**
  * Whether the editor shows every level. Preview and the walkthrough show the

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,
@@ -18,6 +19,8 @@ import {
   useScene,
   ZoneNode,
 } from '@pascal-app/core'
+import type { RoomSelectionRecord } from '@pascal-app/viewer/ui'
+import { resolveRoomAssemblyHeights } from '@pascal-app/viewer/ui'
 import { moveTogetherLabel } from '../components/ui/panels/floor-foundation-panel'
 import {
   applyFloorFoundation,
@@ -29,13 +32,11 @@ import {
   footprintsToMoveTogether,
   foundationHeight,
   isFootprintConstructionHit,
-  levelFootprints,
   presetPatch,
   roomFloorOwner,
   roomFootprint,
   roomOwnedPlateDrillTarget,
 } from './floor-footprints'
-import { resolveRoomAssemblyHeights } from './room-assembly-overlay'
 import { roomConstructionState } from './room-construction'
 import {
   addRoomConstruction,
@@ -43,7 +44,6 @@ import {
   roomRelativeFloorHeight,
   setRoomRelativeFloorHeight,
 } from './room-construction-commands'
-import type { RoomSelectionRecord } from './room-selection'
 import { applyRoomPlan } from './room-structure-commands'
 
 const LEVEL = 'level_footprints'

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,11 +7,13 @@ import {
   generateId,
   type LevelNode,
   type MultiPolygon,
+  roomFloorElevation,
   type StructurePlan,
   structureChangeBatch,
   useScene,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { resolveRoomAssemblyHeights } from '@pascal-app/viewer/ui'
 import { create } from 'zustand'
 import { getRoomSelectionIndex } from '../hooks/use-selected-room'
 import useEditor from '../store/use-editor'
@@ -30,8 +32,6 @@ import {
 } from './floor-region-session'
 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/annotation-visibility.test.ts

@@ -1,11 +1,11 @@
 import { describe, expect, test } from 'bun:test'
 import type { FloorplanGeometry } from '@pascal-app/core'
+import { floorplanGeometryMetadata, withFloorplanGeometryMetadata } from '@pascal-app/core'
 import {
   DEFAULT_FLOORPLAN_ANNOTATION_VISIBILITY,
   filterFloorplanAnnotationGeometry,
   normalizeFloorplanAnnotationVisibility,
 } from './annotation-visibility'
-import { floorplanGeometryMetadata, withFloorplanGeometryMetadata } from './floorplan-extension'
 
 describe('floor-plan annotation visibility', () => {
   test('fills missing persisted categories with visible defaults', () => {

package/src/lib/floorplan/annotation-visibility.ts

@@ -1,5 +1,5 @@
 import type { FloorplanGeometry } from '@pascal-app/core'
-import { type FloorplanAnnotationRole, readFloorplanGeometryMetadata } from './floorplan-extension'
+import { type FloorplanAnnotationRole, readFloorplanGeometryMetadata } from '@pascal-app/core'
 
 export type FloorplanAnnotationCategory =
   | 'automaticDimensions'

package/src/lib/floorplan/floorplan-export.test.ts

@@ -4,6 +4,7 @@ import {
   type AnyNodeDefinition,
   BuildingNode,
   type FloorplanGeometry,
+  floorplanGeometryMetadata,
   type GeometryContext,
   LevelNode,
   loadPlugin,
@@ -36,7 +37,6 @@ import {
   resolveFloorplanScreenUnitsPerPixel,
   rotateFloorplanExportBounds,
 } from './floorplan-export'
-import { floorplanGeometryMetadata } from './floorplan-extension'
 import { FloorplanPdfDocument, loadFloorplanPdfFonts } from './floorplan-pdfkit-document'
 import { renderFloorplanGeometryToPdfKit } from './floorplan-pdfkit-renderer'
 

package/src/lib/floorplan/floorplan-export.tsx

@@ -4,23 +4,28 @@ import {
   type AnyNode,
   type AnyNodeId,
   type ConstructionDrawingType,
+  FLOORPLAN_VIEW_ROTATION_DEG,
   type FloorplanGeometry,
+  type FloorplanMetricNotation,
   type FloorplanPalette,
   type FloorplanPoint,
+  type FloorplanSchedule,
+  type FloorplanWallDimensionFaces,
   getLevelDisplayName,
   isNodeKindEnabled,
   type LiveNodeOverrides,
   type NodeCategory,
   nodeRegistry,
+  readFloorplanGeometryMetadata,
   resolveBuildingForLevel,
   useScene,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { FloorplanGeometryRenderer, navigationSyncPoseStore } from '@pascal-app/viewer/ui'
 import { createElement } from 'react'
 import { flushSync } from 'react-dom'
 import { createRoot } from 'react-dom/client'
 import { resolveSvgAnnotationCollisions } from '../../components/editor-2d/renderers/floorplan-annotation-layout'
-import { FloorplanGeometryRenderer } from '../../components/editor-2d/renderers/floorplan-geometry-renderer'
 import {
   buildContext,
   collectDirectFloorplanScopeNodes,
@@ -33,7 +38,6 @@ import {
   splitFloorplanOverlay,
 } from '../../components/editor-2d/renderers/floorplan-registry-layer'
 import useDrawingView, { DRAWING_TYPE_OPTIONS } from '../../store/use-drawing-view'
-import useEditor from '../../store/use-editor'
 import useFloorplanAnnotationVisibility from '../../store/use-floorplan-annotation-visibility'
 import useFloorplanMode from '../../store/use-floorplan-mode'
 import {
@@ -41,17 +45,10 @@ import {
   filterFloorplanAnnotationGeometry,
 } from './annotation-visibility'
 import { resolveNodeForDrawingType } from './drawing-coordination'
-import {
-  type FloorplanMetricNotation,
-  type FloorplanSchedule,
-  type FloorplanWallDimensionFaces,
-  getFloorplanNodeExtension,
-  readFloorplanGeometryMetadata,
-} from './floorplan-extension'
+import { getFloorplanNodeExtension } from './floorplan-extension'
 import { type FloorplanMode, resolveFloorplanAnnotationVisibility } from './floorplan-mode'
 import { createFloorplanPdfDocument, type FloorplanPdfDocument } from './floorplan-pdfkit-document'
 import { renderFloorplanGeometryToPdfKit } from './floorplan-pdfkit-renderer'
-import { FLOORPLAN_VIEW_ROTATION_DEG } from './geometry'
 
 /**
  * Floorplan PDF export.
@@ -193,7 +190,7 @@ export async function exportFloorplanPdf(scope: FloorplanExportScope): Promise<v
     expertAnnotationState.visibility,
     expertAnnotationState.showDimensions,
   )
-  const navigationAzimuth = useEditor.getState().navigationSyncPose?.azimuth
+  const navigationAzimuth = navigationSyncPoseStore.getState().pose?.azimuth
   const drawingType = useDrawingView.getState().drawingType
   const annotationLayoutOverrides = useDrawingView.getState().annotationLayoutOverrides
   const drawingLabel =

package/src/lib/floorplan/floorplan-extension.ts

@@ -2,7 +2,11 @@ import type {
   AnyNode,
   AnyNodeId,
   ConstructionDrawingType,
+  FloorplanAnnotationRole,
   FloorplanGeometry,
+  FloorplanMetricNotation,
+  FloorplanSchedule,
+  FloorplanWallDimensionFaces,
   GeometryContext,
   NodeDefinition,
   SceneApi,
@@ -11,57 +15,8 @@ import type { ComponentType } from 'react'
 import type { WallSelectionDimension } from '../room-push-dimensions'
 
 export const FLOORPLAN_NODE_EXTENSION_KEY = 'pascal:editor/floorplan'
-export const FLOORPLAN_GEOMETRY_METADATA_KEY = 'pascal:editor/floorplan'
-export const FLOORPLAN_CONTEXT_EXTENSION_KEY = 'pascal:editor/floorplan'
 
-export type FloorplanRenderPurpose = 'edit' | 'document'
-export type FloorplanMetricNotation = 'meters' | 'millimeters'
 export type FloorplanToolMode = 'default' | 'expert'
-/**
- * Display → Measure walls: which finished faces wall dimensions measure to —
- * the interior faces (ID, the room sizes), the exterior faces (OD, the
- * outside size) or both. Read by a selected wall's temporary dimensions in 2D
- * and 3D and by the Expert plan's automatic dimension strings.
- */
-export type FloorplanWallDimensionFaces = 'interior' | 'exterior' | 'both'
-export const DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES: FloorplanWallDimensionFaces = 'both'
-
-export function normalizeFloorplanWallDimensionFaces(value: unknown): FloorplanWallDimensionFaces {
-  return value === 'interior' || value === 'exterior'
-    ? value
-    : DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES
-}
-export type FloorplanAnnotationRole =
-  | 'automatic-dimension'
-  | 'contextual-dimension'
-  | 'manual-dimension'
-  | 'measurement'
-  | 'opening-mark'
-  | 'structural-grid'
-  | 'column-center'
-  | 'room-label'
-  /** A room's finish / ceiling-height lines — detail under the name, off in the clean plan. */
-  | 'room-detail'
-  /** The roof plan proper: outline, ridges, hips, slope arrows. Off over a floor plan unless asked. */
-  | 'roof-plan'
-  | 'roof-pitch'
-  | 'stair-annotation'
-
-export type FloorplanSchedule = {
-  id: string
-  title: string
-  columns: ReadonlyArray<{
-    key: string
-    label: string
-    weight?: number
-  }>
-  rows: ReadonlyArray<{
-    id: string
-    cells: Readonly<Record<string, string>>
-  }>
-  issues?: readonly string[]
-}
-
 export type FloorplanToolContext = {
   sceneApi: SceneApi
   activeLevelId: AnyNodeId | null
@@ -124,7 +79,6 @@ export type FloorplanNodeExtension<N extends AnyNode = AnyNode> = {
     /** A drafted sheet's schedule: marks match the sheet's tags. */
     drafting?: boolean
   }) => FloorplanSchedule | null
-  linkedLevelIds?: (node: N) => readonly AnyNodeId[]
   resolveForDrawing?: (args: {
     node: N
     nodes: Record<string, AnyNode>
@@ -132,38 +86,6 @@ export type FloorplanNodeExtension<N extends AnyNode = AnyNode> = {
   }) => AnyNode | null
 }
 
-type FloorplanGeometryMetadata = {
-  annotationRole?: FloorplanAnnotationRole
-  annotationObstacle?: 'bounds' | 'outline'
-  renderPass?: 'overlay'
-  /**
-   * Annotation text only: the size to print at, in paper points, instead of
-   * the size its role implies. Lets a sheet set a room tag's name larger than
-   * its number without inventing a role per size.
-   */
-  textSizePt?: number
-}
-
-type FloorplanContextExtension = {
-  automaticDimensions: boolean
-  purpose: FloorplanRenderPurpose
-  /**
-   * Sheet drafting (the Sheets plan viewports): kinds draw the permit-set
-   * convention — fixtures as labelled linework, furniture as light outlines,
-   * no raster sprites. Only `collectSheetGeometry` sets it; the editor and the
-   * read-only viewer never do, so their plans keep today's look.
-   */
-  drafting: boolean
-  /**
-   * The editor canvas draws room labels as screen pills over the plan
-   * (`RoomLabels2D`), so zones skip their drawn tags and wash there. Exports,
-   * sheets and the read-only viewer keep the drawn tags.
-   */
-  roomLabelOverlay: boolean
-  metricNotation: FloorplanMetricNotation
-  wallDimensionFaces: FloorplanWallDimensionFaces
-}
-
 export function getFloorplanNodeExtension(
   definition: NodeDefinition<any> | undefined,
 ): FloorplanNodeExtension | undefined {
@@ -171,78 +93,3 @@ export function getFloorplanNodeExtension(
     | FloorplanNodeExtension
     | undefined
 }
-
-export function floorplanGeometryMetadata(
-  values: FloorplanGeometryMetadata,
-): Readonly<Record<string, unknown>> {
-  return { [FLOORPLAN_GEOMETRY_METADATA_KEY]: values }
-}
-
-export function withFloorplanGeometryMetadata<T extends FloorplanGeometry | null>(
-  geometry: T,
-  values: FloorplanGeometryMetadata,
-): T {
-  if (!geometry) return geometry
-  const existing = readFloorplanGeometryMetadata(geometry)
-  return {
-    ...geometry,
-    metadata: floorplanGeometryMetadata({ ...existing, ...values }),
-  } as T
-}
-
-export function readFloorplanGeometryMetadata(geometry: unknown): FloorplanGeometryMetadata {
-  const metadata = (geometry as { metadata?: Readonly<Record<string, unknown>> } | null)?.metadata
-  const value = metadata?.[FLOORPLAN_GEOMETRY_METADATA_KEY]
-  return value && typeof value === 'object' && !Array.isArray(value)
-    ? (value as FloorplanGeometryMetadata)
-    : {}
-}
-
-export function createFloorplanContextExtensions(
-  values: Partial<FloorplanContextExtension>,
-): Readonly<Record<string, unknown>> {
-  return {
-    [FLOORPLAN_CONTEXT_EXTENSION_KEY]: {
-      automaticDimensions: values.automaticDimensions !== false,
-      purpose: values.purpose === 'document' ? 'document' : 'edit',
-      drafting: values.drafting === true,
-      roomLabelOverlay: values.roomLabelOverlay === true,
-      metricNotation: values.metricNotation === 'millimeters' ? 'millimeters' : 'meters',
-      wallDimensionFaces: normalizeFloorplanWallDimensionFaces(values.wallDimensionFaces),
-    } satisfies FloorplanContextExtension,
-  }
-}
-
-export function readFloorplanContext(ctx: GeometryContext): FloorplanContextExtension {
-  const value = ctx.extensions?.[FLOORPLAN_CONTEXT_EXTENSION_KEY]
-  if (value && typeof value === 'object' && !Array.isArray(value)) {
-    const extension = value as Partial<FloorplanContextExtension>
-    return {
-      automaticDimensions: extension.automaticDimensions !== false,
-      purpose: extension.purpose === 'document' ? 'document' : 'edit',
-      drafting: extension.drafting === true,
-      roomLabelOverlay: extension.roomLabelOverlay === true,
-      metricNotation: extension.metricNotation === 'millimeters' ? 'millimeters' : 'meters',
-      wallDimensionFaces: normalizeFloorplanWallDimensionFaces(extension.wallDimensionFaces),
-    }
-  }
-  return {
-    automaticDimensions: true,
-    purpose: 'edit',
-    drafting: false,
-    roomLabelOverlay: false,
-    metricNotation: 'meters',
-    wallDimensionFaces: DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES,
-  }
-}
-
-export function readFloorplanMetricNotationOverride(
-  ctx: GeometryContext,
-): FloorplanMetricNotation | undefined {
-  const value = ctx.extensions?.[FLOORPLAN_CONTEXT_EXTENSION_KEY]
-  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined
-  const metricNotation = (value as { metricNotation?: unknown }).metricNotation
-  return metricNotation === 'meters' || metricNotation === 'millimeters'
-    ? metricNotation
-    : undefined
-}

package/src/lib/floorplan/floorplan-mode.ts

@@ -1,8 +1,9 @@
+import type { FloorplanAnnotationRole } from '@pascal-app/core'
 import {
   type FloorplanAnnotationVisibility,
   revealFloorplanAnnotationRole,
 } from './annotation-visibility'
-import type { FloorplanAnnotationRole, FloorplanToolMode } from './floorplan-extension'
+import type { FloorplanToolMode } from './floorplan-extension'
 
 export const FLOORPLAN_MODES = ['default', 'expert'] as const
 

package/src/lib/floorplan/floorplan-pdfkit-renderer.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'bun:test'
 import type { FloorplanGeometry } from '@pascal-app/core'
+import { floorplanGeometryMetadata } from '@pascal-app/core'
 import PDFDocument from 'pdfkit'
-import { floorplanGeometryMetadata } from './floorplan-extension'
 import { FloorplanPdfDocument, loadFloorplanPdfFonts } from './floorplan-pdfkit-document'
 import { renderFloorplanGeometryToPdfKit } from './floorplan-pdfkit-renderer'
 

package/src/lib/floorplan/floorplan-pdfkit-renderer.ts

@@ -1,16 +1,18 @@
-import { type FloorplanGeometry, type FloorplanPoint, loadAssetUrl } from '@pascal-app/core'
+import {
+  type FloorplanGeometry,
+  type FloorplanPoint,
+  loadAssetUrl,
+  readFloorplanGeometryMetadata,
+} from '@pascal-app/core'
 import {
   type ArchitecturalDimensionLayout,
   computeArchitecturalDimensionLayout,
-} from '../../components/editor-2d/renderers/floorplan-dimension-renderer'
-import {
   documentCircleGeometryAttrs,
   documentRectGeometryAttrs,
   resolveDocumentAnnotationGroupChildren,
-} from '../../components/editor-2d/renderers/floorplan-geometry-renderer'
-import { resolveFloorplanLabelAngle } from '../../components/editor-2d/renderers/floorplan-label-angle'
+  resolveFloorplanLabelAngle,
+} from '@pascal-app/viewer/ui'
 import type { FloorplanExportBounds } from './floorplan-export'
-import { readFloorplanGeometryMetadata } from './floorplan-extension'
 import type { FloorplanPdfBaseline, FloorplanPdfDocument } from './floorplan-pdfkit-document'
 
 const DIMENSION_LINE_WIDTH_PT = 0.5

package/src/lib/floorplan/floorplan-plugin-install.test.tsx

@@ -6,12 +6,11 @@ import {
   loadPlugin,
   nodeRegistry,
 } from '@pascal-app/core'
+import { FloorplanPreview } from '@pascal-app/viewer/ui'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { z } from 'zod'
-import { FloorplanPreview } from '../../components/viewer/floorplan-preview'
 import { DEFAULT_FLOORPLAN_ANNOTATION_VISIBILITY } from './annotation-visibility'
 import { collectFloorplanGeometry, floorplanExportInstalledPlugins } from './floorplan-export'
-import { FLOORPLAN_NODE_EXTENSION_KEY } from './floorplan-extension'
 
 // Plugin API v1, no-install case: a plugin kind's floor-plan output appears in
 // the read-only preview and the PDF export only while the project has the
@@ -31,7 +30,7 @@ const bed = {
   visible: true,
   metadata: {},
 } as unknown as AnyNode
-// Lives on the upper level but draws on this one through `linkedLevelIds`.
+// Lives on the upper level but draws on this one through `floorplanLinkedLevelIds`.
 const upper = LevelNode.parse({ id: 'level_plugin_upper', level: 1, children: ['fxshaft_plan'] })
 const shaft = {
   object: 'node',
@@ -70,7 +69,7 @@ beforeEach(async () => {
         category: 'structure',
         defaults: () => ({}),
         capabilities: {},
-        extensions: { [FLOORPLAN_NODE_EXTENSION_KEY]: { linkedLevelIds: () => [level.id] } },
+        floorplanLinkedLevelIds: () => [level.id],
         floorplan: () => ({ kind: 'rect', x: 3, y: 0, width: 1, height: 1 }),
       } as unknown as AnyNodeDefinition,
     ],