@pascal-app/editor 1.1.0 → 1.1.2

package/src/components/editor/room-webgpu-materials.test.ts

@@ -6,7 +6,7 @@ import { readFileSync } from 'node:fs'
 // draft instead, so it only has to stay clear of drei fat lines.
 for (const [file, drawsLines] of [
   ['./room-controls.tsx', false],
-  ['./room-highlight.tsx', true],
+  ['../../../../viewer/src/ui/components/rooms/room-highlight.tsx', true],
   ['../../../../nodes/src/separator/renderer.tsx', true],
 ] as const) {
   test(`${file} uses WebGPU node materials instead of drei fat lines`, () => {

package/src/components/editor/selection-manager.tsx

@@ -35,6 +35,11 @@ import {
   tintEmissive,
   useViewer,
 } from '@pascal-app/viewer'
+import {
+  type SelectionModifierKeys,
+  sameRoom,
+  selectionModifiersFromEvent,
+} from '@pascal-app/viewer/ui'
 import { useThree } from '@react-three/fiber'
 import { useCallback, useEffect, useRef } from 'react'
 import { type BufferGeometry, Color, type Material, type Mesh, type Object3D, Vector3 } from 'three'
@@ -105,7 +110,6 @@ import {
   usePaintOutline,
 } from '../../lib/plate-paint-affected'
 import { getHoveredRoofSegmentOutlineProxy } from '../../lib/roof-hover-outline-proxy'
-import { sameRoom } from '../../lib/room-selection'
 import { selectRoom, shouldInterceptRoom } from '../../lib/room-selection-commands'
 import { roomKeyForZone } from '../../lib/room-zone-routing'
 import {
@@ -114,8 +118,6 @@ import {
   resolveCanvasBuildingId,
   resolveCanvasSelectionNode,
   resolveSelectedIdsForNodeClick,
-  type SelectionModifierKeys,
-  selectionModifiersFromEvent,
   shouldPreserveSelectedRoofHostTarget,
 } from '../../lib/selection-routing'
 import { emitDeleteSFX, sfxEmitter } from '../../lib/sfx-bus'

package/src/components/editor/site-edge-labels.tsx

@@ -8,13 +8,13 @@ import {
   useScene,
 } from '@pascal-app/core'
 import { getSceneTheme, useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { createPortal, useFrame, useThree } from '@react-three/fiber'
 import { useCallback, useMemo, useRef, useState } from 'react'
 import { type Camera, type Object3D, Vector3 } from 'three'
 import { groundHeightAt } from '../../lib/ground-surface'
 import { SITE_BOUNDARY_DRAG_LABEL } from '../../lib/site-boundary'
 import { useActiveHandleDrag } from '../../store/use-interaction-scope'
-import { Html } from './localized-html'
 
 type ViewportSize = {
   width: number

package/src/components/editor/snapshot-capture-overlay.tsx

@@ -1,7 +1,8 @@
 'use client'
 
 import { emitter, type SnapshotSavedEvent } from '@pascal-app/core'
-import { SNAPSHOT_MAX_EDGE } from '@pascal-app/viewer'
+import { isTypingTarget, SNAPSHOT_MAX_EDGE } from '@pascal-app/viewer'
+import { useFirstPersonHud, useIsMobile, WalkthroughCrosshair } from '@pascal-app/viewer/ui'
 import {
   Check,
   Crop,
@@ -16,9 +17,7 @@ import {
 } from 'lucide-react'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { flushSync } from 'react-dom'
-import { useIsMobile } from '../../hooks/use-mobile'
 import { triggerSFX } from '../../lib/sfx-bus'
-import { isTypingTarget } from '../../lib/typing-target'
 import { requestWalkthroughPointerLock } from '../../lib/walkthrough-pointer-lock'
 import useEditor, {
   CAPTURE_FOV_MAX,
@@ -27,9 +26,7 @@ import useEditor, {
   type SnapshotCropMode,
   type SnapshotStandardAspect,
 } from '../../store/use-editor'
-import { useFirstPersonHud } from '../../store/use-first-person-hud'
 import { Slider } from '../ui/slider'
-import { WalkthroughCrosshair } from '../walkthrough-hud'
 import { CaptureLevelPicker } from './capture-level-picker'
 import { isOverlaySnapshotSave } from './snapshot-capture'
 

package/src/components/editor/use-floorplan-background-placement.ts

@@ -3,6 +3,7 @@
 import {
   emitter,
   type FenceNode,
+  getPlanPointDistance,
   isCurvedWall,
   nodeRegistry,
   type WallNode,
@@ -14,7 +15,7 @@ import {
   useSyncExternalStore,
 } from 'react'
 import { resolveCeilingPlanPointSnap } from '../../lib/ceiling-plan-snap'
-import { alignFloorplanDraftPoint, getPlanPointDistance } from '../../lib/floorplan'
+import { alignFloorplanDraftPoint } from '../../lib/floorplan'
 import { resolveGenericFloorplanGridEventPoint } from '../../lib/floorplan-grid-event-point'
 import { snapRegisteredDraftPoint } from '../../lib/registered-draft-snap'
 import { resolveSlabPlanPointSnap } from '../../lib/slab-plan-snap'

package/src/components/editor/views/plugins-view.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { useScene } from '@pascal-app/core'
+import { Button } from '@pascal-app/viewer/ui'
 import {
   Check,
   ChevronRight,
@@ -31,7 +32,6 @@ import { cn } from '../../../lib/utils'
 import useEditor from '../../../store/use-editor'
 import { IconRefGlyph } from '../../ui/icon-ref'
 import { Badge } from '../../ui/primitives/badge'
-import { Button } from '../../ui/primitives/button'
 import { PLUGINS_VIEW_ID } from './use-editor-views'
 
 const PLUGIN_AUTHORING_URL = 'https://editor.pascal.app/docs/developers/plugins'

package/src/components/editor/views/view-bar.tsx

@@ -2,14 +2,6 @@
 
 import { type MessageDescriptor, type PascalI18n, usePascalI18n } from '@pascal-app/core'
 import { type GroundMode, useViewer } from '@pascal-app/viewer'
-import { ArrowLeftRight, Check, Columns2, MoreHorizontal, Pin, PinOff, X } from 'lucide-react'
-import { type ReactNode, useEffect, useRef } from 'react'
-import { useIsMobile } from '../../../hooks/use-mobile'
-import { type EditorViewDescriptor, isSceneView, isViewPinned } from '../../../lib/editor-views'
-import { cn } from '../../../lib/utils'
-import useEditor from '../../../store/use-editor'
-import { VIEW_2D, VIEW_3D, type ViewPaneIndex } from '../../../store/view-layout'
-import { IconRefGlyph } from '../../ui/icon-ref'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -17,7 +9,15 @@ import {
   DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
-} from '../../ui/primitives/dropdown-menu'
+  useIsMobile,
+} from '@pascal-app/viewer/ui'
+import { ArrowLeftRight, Check, Columns2, MoreHorizontal, Pin, PinOff, X } from 'lucide-react'
+import { type ReactNode, useEffect, useRef } from 'react'
+import { type EditorViewDescriptor, isSceneView, isViewPinned } from '../../../lib/editor-views'
+import { cn } from '../../../lib/utils'
+import useEditor from '../../../store/use-editor'
+import { VIEW_2D, VIEW_3D, type ViewPaneIndex } from '../../../store/view-layout'
+import { IconRefGlyph } from '../../ui/icon-ref'
 import { PLUGINS_VIEW_ID, useActiveViewLayout, useEditorViews } from './use-editor-views'
 
 const GROUP = cn(

package/src/components/editor/wall-measurement-label.tsx

@@ -21,10 +21,10 @@ import {
   type WallNode,
 } from '@pascal-app/core'
 import { getSceneTheme, useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { createPortal, useFrame } from '@react-three/fiber'
 import { useMemo, useState } from 'react'
 import * as THREE from 'three'
-import { Html } from './localized-html'
 
 const GUIDE_Y_OFFSET = 0.08
 const LABEL_LIFT = 0.08

package/src/components/editor/wall-move-side-handles.tsx

@@ -19,6 +19,7 @@ import {
   type WallNode,
 } 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 {
@@ -60,7 +61,6 @@ import useInteractionScope, {
 import { suppressBoxSelectForPointer } from '../tools/select/box-select-state'
 import { resolveResizeSnapValue } from './handles/resize-snap'
 import { type HandleDragControls, useHandleDrag } from './handles/use-handle-drag'
-import { Html } from './localized-html'
 import { MeasurementPill } from './measurement-pill'
 import {
   createArrowHitAreaGeometry,

package/src/components/editor/wall-pull-grip.tsx

@@ -1,13 +1,13 @@
 'use client'
 
-import { nodeRegistry, type WallNode } from '@pascal-app/core'
+import { nodeRegistry, WALL_PULL_GRIP_TITLE, type WallNode, wallPullSeed } from '@pascal-app/core'
 import { type ThreeEvent, useThree } from '@react-three/fiber'
 import { useEffect, useMemo, useState } from 'react'
 import { Color, DoubleSide, ExtrudeGeometry, OrthographicCamera, Shape } from 'three'
 import { MeshBasicNodeMaterial } from 'three/webgpu'
 import { EDITOR_LAYER } from '../../lib/constants'
 import { sfxEmitter } from '../../lib/sfx-bus'
-import { startWallPull, WALL_PULL_GRIP_TITLE, wallPullSeed } from '../../lib/wall-pull'
+import { startWallPull } from '../../lib/wall-pull'
 import { suppressBoxSelectForPointer } from '../tools/select/box-select-state'
 import {
   createEndpointHitAreaGeometry,

package/src/components/editor-2d/floorplan-group-move.tsx

@@ -17,7 +17,8 @@ import {
   useLiveTransforms,
   useScene,
 } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, useViewer } from '@pascal-app/viewer'
+import { FloorplanDimensionRenderer } from '@pascal-app/viewer/ui'
 import { memo, type PointerEvent as ReactPointerEvent, useEffect, useMemo, useState } from 'react'
 import { create } from 'zustand'
 import { GROUP_MOVE_DRAG_LABEL, GROUP_ROTATE_DRAG_LABEL } from '../../lib/contextual-help'
@@ -27,7 +28,6 @@ import { isHistoryShortcut } from '../../lib/history'
 import type { WallGroupPush } from '../../lib/room-handle-drag'
 import { useRoomHandleDrag } 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,
@@ -55,7 +55,6 @@ import {
 import { swallowNextClick } from '../editor/handles/use-handle-drag'
 import { useMeshSettleEpoch } from '../editor/use-mesh-settle-epoch'
 import { useFloorplanSceneRotation } from './floorplan-render-context'
-import { FloorplanDimensionRenderer } from './renderers/floorplan-dimension-renderer'
 
 // 2D sibling of the 3D body-drag group move (`group-move-3d.ts`): dragging
 // any selected element of a multi-selection slides the whole selection

package/src/components/editor-2d/floorplan-measurement-tool-layer.tsx

@@ -33,6 +33,7 @@ import {
   measurementPolygonLabelAnchor,
   useViewer,
 } from '@pascal-app/viewer'
+import { resolveFloorplanLabelAngle } from '@pascal-app/viewer/ui'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import {
   clearSurfacePlanSnapFeedback,
@@ -48,7 +49,6 @@ import {
 } from '../../store/use-measurement-draft'
 import { FloorplanQuickMeasureLayer } from './floorplan-quick-measure-layer'
 import { useFloorplanRender } from './floorplan-render-context'
-import { resolveFloorplanLabelAngle } from './renderers/floorplan-label-angle'
 
 const DRAFT_COLOR = MEASUREMENT_ACTIVE_COLOR
 const X_AXIS_COLOR = '#ef4444'

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

@@ -2,6 +2,7 @@
 
 import type { AnyNodeId, OpenWallEnd } from '@pascal-app/core'
 import { MEASUREMENT_DANGLING_COLOR, useViewer } from '@pascal-app/viewer'
+import { resolveFloorplanLabelAngle } from '@pascal-app/viewer/ui'
 import { memo, useEffect, useState } from 'react'
 import { createPortal } from 'react-dom'
 import {
@@ -15,7 +16,6 @@ import { isViewVisible, VIEW_2D } from '../../store/view-layout'
 import { JoinWallsPill } from '../editor/join-walls-pill'
 import { OpenWallEndsHint } from '../editor/open-wall-ends-hint'
 import { useFloorplanRender } from './floorplan-render-context'
-import { resolveFloorplanLabelAngle } from './renderers/floorplan-label-angle'
 
 function sceneScreenPoint(point: [number, number]): { left: number; top: number } | null {
   const scene = document.querySelector<SVGGElement>('[data-floorplan-scene]')

package/src/components/editor-2d/floorplan-registry-move-overlay.tsx

@@ -26,7 +26,7 @@ import {
   useScene,
 } from '@pascal-app/core'
 import { nodeLevelFrame } from '@pascal-app/core/procedural-items'
-import { useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, useViewer } from '@pascal-app/viewer'
 import { useEffect, useMemo } from 'react'
 import { commitFreshPlacementSubtree } from '../../lib/fresh-planar-placement'
 import { isHistoryShortcut } from '../../lib/history'
@@ -39,7 +39,6 @@ import {
 import { movementSfxStepKey } from '../../lib/sfx/movement-tick'
 import { sfxEmitter } from '../../lib/sfx-bus'
 import { surfaceAttachmentId } from '../../lib/surface-attachment'
-import { isTypingTarget } from '../../lib/typing-target'
 import { resolveAlignmentForFloorplanView } from '../../lib/world-grid-snap'
 import useAlignmentGuides from '../../store/use-alignment-guides'
 import useEditor, {

package/src/components/editor-2d/renderers/floorplan-annotation-layout.test.ts

@@ -1,47 +1,10 @@
 import { describe, expect, test } from 'bun:test'
-import { floorplanGeometryMetadata } from '../../../lib/floorplan/floorplan-extension'
 import {
-  floorplanAnnotationObstacleMode,
   polylineObstacleRectangles,
   resolveAnnotationLabelRectangles,
   resolveSvgAnnotationCollisions,
 } from './floorplan-annotation-layout'
 
-describe('floorplanAnnotationObstacleMode', () => {
-  test('treats fixed annotation categories as layout obstacles', () => {
-    expect(
-      floorplanAnnotationObstacleMode({
-        kind: 'text',
-        x: 0,
-        y: 0,
-        text: 'BEDROOM',
-        fontSize: 0.18,
-        metadata: floorplanGeometryMetadata({ annotationRole: 'room-label' }),
-      }),
-    ).toBe('bounds')
-    expect(
-      floorplanAnnotationObstacleMode({
-        kind: 'line',
-        x1: 0,
-        y1: 0,
-        x2: 1,
-        y2: 0,
-        metadata: floorplanGeometryMetadata({ annotationRole: 'column-center' }),
-      }),
-    ).toBe('bounds')
-    expect(
-      floorplanAnnotationObstacleMode({
-        kind: 'polyline',
-        points: [
-          [0, 0],
-          [1, 0],
-        ],
-        metadata: floorplanGeometryMetadata({ annotationRole: 'stair-annotation' }),
-      }),
-    ).toBe('outline')
-  })
-})
-
 describe('resolveAnnotationLabelRectangles', () => {
   test('keeps the higher-priority label and moves the conflicting label', () => {
     const shifts = resolveAnnotationLabelRectangles([

package/src/components/editor-2d/renderers/floorplan-annotation-layout.ts

@@ -1,6 +1,3 @@
-import type { FloorplanGeometry } from '@pascal-app/core'
-import { readFloorplanGeometryMetadata } from '../../../lib/floorplan/floorplan-extension'
-
 export type AnnotationLabelRectangle = {
   id: string
   x: number
@@ -467,33 +464,6 @@ function candidateCost(
   return preference + distance + perpendicularMovement * 4
 }
 
-export function isFloorplanAnnotationObstacleGeometry(geometry: FloorplanGeometry): boolean {
-  if (floorplanAnnotationObstacleMode(geometry)) return true
-  if (geometry.kind !== 'group') return false
-  const hasPlate = geometry.children.some(
-    (child) => child.kind === 'rect' || child.kind === 'circle',
-  )
-  const hasUprightText = geometry.children.some((child) => child.kind === 'text' && child.upright)
-  return hasPlate && hasUprightText
-}
-
-export function floorplanAnnotationObstacleMode(
-  geometry: FloorplanGeometry,
-): 'bounds' | 'outline' | '' | undefined {
-  const metadata = readFloorplanGeometryMetadata(geometry)
-  if (metadata.annotationObstacle) return metadata.annotationObstacle
-  switch (metadata.annotationRole) {
-    case 'room-label':
-      return geometry.kind === 'text' ? 'bounds' : undefined
-    case 'column-center':
-      return geometry.kind === 'line' || geometry.kind === 'text' ? 'bounds' : undefined
-    case 'stair-annotation':
-      return geometry.kind === 'polyline' || geometry.kind === 'line' ? 'outline' : 'bounds'
-    default:
-      return undefined
-  }
-}
-
 function rectanglesOverlap(
   left: Pick<AnnotationLabelRectangle, 'x' | 'y' | 'width' | 'height'>,
   right: Pick<AnnotationLabelRectangle, 'x' | 'y' | 'width' | 'height'>,

package/src/components/editor-2d/renderers/floorplan-dimension-edit-overlay.tsx

@@ -3,7 +3,8 @@
 import type { AnyNode, AnyNodeId } from '@pascal-app/core'
 import { useLocale, useScene } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { FloorplanDimensionHitsProvider } from '@pascal-app/viewer/ui'
+import { type ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import {
   parseDimensionInput,
@@ -26,8 +27,8 @@ import useEditor from '../../../store/use-editor'
  * anchor the value is written as `textOverride` on a construction-dimension
  * node instead, and the label renders an "override" badge.
  *
- * The label is found by DOM delegation on the attributes
- * `floorplan-dimension-renderer.tsx` emits, so this works identically for
+ * The label is found by DOM delegation on the attributes the viewer's
+ * dimension renderer emits under `FloorplanDimensionHitsGate`, so this works identically for
  * `dimension` and `dimension-string` geometry, for automatic wall dimensions,
  * contextual dimensions and manual construction-dimension nodes — and on
  * sheets, which mount the same renderer.
@@ -62,6 +63,15 @@ export function useDimensionEditAllowed(): boolean {
   return useEditor((state) => isDimensionEditAllowed(state, { readOnly }))
 }
 
+/** Plan dimension labels under the editor carry their typeable hit rects while typing is allowed. */
+export function FloorplanDimensionHitsGate({ children }: { children: ReactNode }) {
+  return (
+    <FloorplanDimensionHitsProvider value={useDimensionEditAllowed()}>
+      {children}
+    </FloorplanDimensionHitsProvider>
+  )
+}
+
 /**
  * The typeable dimension value under a press, with the node typing it drives:
  * the pressed element's or, when the plan's dashed group box lies over it, the

package/src/components/editor-2d/renderers/floorplan-placement-preview-layer.tsx

@@ -10,12 +10,11 @@ import {
   useScene,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { FloorplanDimensionRenderer, FloorplanGeometryRenderer } from '@pascal-app/viewer/ui'
 import { memo, useMemo } from 'react'
 import usePlacementPreview from '../../../store/use-placement-preview'
 import { usePlacementTyping } from '../../../store/use-placement-typing'
 import { useFloorplanRender, useFloorplanSceneRotation } from '../floorplan-render-context'
-import { FloorplanDimensionRenderer } from './floorplan-dimension-renderer'
-import { FloorplanGeometryRenderer } from './floorplan-geometry-renderer'
 import { FloorplanPlacementTypingHud } from './floorplan-placement-typing-hud'
 
 export interface FloorplanNodePreviewProps {

package/src/components/editor-2d/renderers/floorplan-registry-layer.test.ts

@@ -7,15 +7,17 @@ import type {
   FloorplanPalette,
   LiveNodeOverrides,
 } from '@pascal-app/core'
-import { type AnyNodeDefinition, emitter, nodeRegistry, registerNode } from '@pascal-app/core'
+import {
+  type AnyNodeDefinition,
+  emitter,
+  floorplanGeometryMetadata,
+  nodeRegistry,
+  registerNode,
+} from '@pascal-app/core'
 import { createElement } from 'react'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { z } from 'zod'
 import { AXIS_MOVE_DRAG_LABEL, PATH_POINT_DRAG_LABEL } from '../../../lib/contextual-help'
-import {
-  FLOORPLAN_NODE_EXTENSION_KEY,
-  floorplanGeometryMetadata,
-} from '../../../lib/floorplan/floorplan-extension'
 import type { SessionWrites } from '../../../lib/session-writes'
 import { snapContextOf } from '../../../lib/snapping-mode'
 import {
@@ -776,11 +778,7 @@ describe('collectFloorplanLinkedLevelNodes', () => {
       category: 'structure',
       defaults: () => ({}) as never,
       floorplan: () => null,
-      extensions: {
-        [FLOORPLAN_NODE_EXTENSION_KEY]: {
-          linkedLevelIds: () => ['level_upper' as AnyNodeId],
-        },
-      },
+      floorplanLinkedLevelIds: () => ['level_upper' as AnyNodeId],
     } as unknown as AnyNodeDefinition)
     const child = {
       id: 'linked_child',

package/src/components/editor-2d/renderers/floorplan-registry-layer.tsx

@@ -4,15 +4,22 @@ import {
   type AnyNode,
   type AnyNodeDefinition,
   type AnyNodeId,
+  buildFloorplanContext,
+  createFloorplanContextExtensions,
   createSceneApi,
   emitter,
   type FloorplanAffordanceSession,
+  type FloorplanAnnotationRole,
   type FloorplanGeometry,
   type FloorplanPalette,
   type FloorplanPoint,
   type FloorplanScope,
+  type FloorplanWallDimensionFaces,
+  floorplanAnnotationObstacleMode,
+  floorplanLayerRank,
   type GeometryContext,
   hidesDescendants,
+  isFloorplanAnnotationObstacleGeometry,
   isNodeKindEnabled,
   isRegistryMovable,
   kindsWithFloorplanScope,
@@ -20,6 +27,7 @@ import {
   type LiveTransform,
   nodeRegistry,
   pauseSceneHistory,
+  readFloorplanGeometryMetadata,
   resolveBuildingForLevel,
   resolveSelectionProxyId,
   resumeSceneHistory,
@@ -28,6 +36,10 @@ import {
   useLiveNodeOverrides,
   useLiveTransforms,
   useScene,
+  WALL_PULL_AFFORDANCE,
+  WALL_PUSH_AFFORDANCE,
+  type WallPullGripPayload,
+  withFloorplanGeometryMetadata,
 } from '@pascal-app/core'
 import {
   beginPerfAction,
@@ -37,6 +49,14 @@ import {
   useRevealWaiting,
   useViewer,
 } from '@pascal-app/viewer'
+import {
+  FloorplanDimensionRenderer,
+  FloorplanGeometryRenderer,
+  resolveFloorplanAnnotationUpdate,
+  resolveFloorplanLabelAngle,
+  selectionModifiersFromEvent,
+  updateSvgFloorplanLabelOrientations,
+} from '@pascal-app/viewer/ui'
 import {
   type ComponentProps,
   memo,
@@ -55,7 +75,6 @@ import {
   hoverRoomFromHit,
   resolvePlanRoomHit,
   roomPickingEnabled,
-  selectionModifiersFromEvent,
   useRoomRecords,
 } from '../../../hooks/use-selected-room'
 import { useCeilingEditSession } from '../../../lib/ceiling-edit-session'
@@ -79,22 +98,11 @@ import {
   filterFloorplanAnnotationGeometry,
 } from '../../../lib/floorplan/annotation-visibility'
 import { resolveNodeForDrawingType } from '../../../lib/floorplan/drawing-coordination'
-import {
-  createFloorplanContextExtensions,
-  type FloorplanAnnotationRole,
-  type FloorplanWallDimensionFaces,
-  getFloorplanNodeExtension,
-  readFloorplanGeometryMetadata,
-  withFloorplanGeometryMetadata,
-} from '../../../lib/floorplan/floorplan-extension'
+import { getFloorplanNodeExtension } from '../../../lib/floorplan/floorplan-extension'
 import {
   type FloorplanMode,
   resolveFloorplanAnnotationVisibility,
 } from '../../../lib/floorplan/floorplan-mode'
-import {
-  buildFloorplanContext,
-  floorplanLayerRank,
-} from '../../../lib/floorplan/floorplan-readonly'
 import { clientToPlan } from '../../../lib/floorplan/plan-coords'
 import {
   type ActiveInteractionScope,
@@ -106,7 +114,7 @@ import {
   isIdle,
   tangentReshapeScope,
 } from '../../../lib/interaction/scope'
-import { runFloorplanWallPush, WALL_PUSH_AFFORDANCE } from '../../../lib/room-handle-drag'
+import { runFloorplanWallPush } from '../../../lib/room-handle-drag'
 import { selectRoom, selectRoomFromHit } from '../../../lib/room-selection-commands'
 import { clickZoneArea, hoverZoneArea } from '../../../lib/room-zone-routing'
 import {
@@ -118,11 +126,7 @@ import { createSessionWrites, type SessionWrites } from '../../../lib/session-wr
 import { sfxEmitter } from '../../../lib/sfx-bus'
 import { clearSurfacePlanSnapFeedback } from '../../../lib/surface-plan-snap'
 import { paintZoneMembership } from '../../../lib/units'
-import {
-  startWallPull,
-  WALL_PULL_AFFORDANCE,
-  type WallPullGripPayload,
-} from '../../../lib/wall-pull'
+import { startWallPull } from '../../../lib/wall-pull'
 import useDirectManipulationFeedback from '../../../store/use-direct-manipulation-feedback'
 import useDrawingView from '../../../store/use-drawing-view'
 import useEditor, { isAngleSnapActive, type Mode } from '../../../store/use-editor'
@@ -157,23 +161,11 @@ import {
   useFloorplanStaticRender,
   useFloorplanStaticUnitsPerPixel,
 } from '../floorplan-render-context'
-import {
-  floorplanAnnotationObstacleMode,
-  isFloorplanAnnotationObstacleGeometry,
-  resolveSvgAnnotationCollisions,
-  svgAnnotationLabelId,
-} from './floorplan-annotation-layout'
+import { resolveSvgAnnotationCollisions, svgAnnotationLabelId } from './floorplan-annotation-layout'
 import {
   FloorplanDimensionEditOverlay,
   typeableDimensionAt,
 } from './floorplan-dimension-edit-overlay'
-import { FloorplanDimensionRenderer } from './floorplan-dimension-renderer'
-import { FloorplanGeometryRenderer } from './floorplan-geometry-renderer'
-import {
-  resolveFloorplanAnnotationUpdate,
-  resolveFloorplanLabelAngle,
-  updateSvgFloorplanLabelOrientations,
-} from './floorplan-label-angle'
 import { useFloorplanReveal } from './floorplan-reveal'
 
 /**
@@ -3645,7 +3637,7 @@ export function collectFloorplanLinkedLevelNodes(
   for (const [rawId, node] of Object.entries(nodes)) {
     if (!node) continue
     const definition = nodeRegistry.get(node.type)
-    const linkedLevelIds = getFloorplanNodeExtension(definition)?.linkedLevelIds
+    const linkedLevelIds = definition?.floorplanLinkedLevelIds
     if (!definition?.floorplan || !linkedLevelIds) continue
     const id = rawId as AnyNodeId
     if (excludedIds.has(id)) continue

package/src/components/systems/roof/roof-edit-system.tsx

@@ -22,6 +22,7 @@ import {
   csgEvaluator,
   generateRoofSegmentGeometry,
   INTERSECTION,
+  isTypingTarget,
   markPureRaycast,
   prepareBrushForCSG,
   useViewer,
@@ -34,7 +35,6 @@ import { LineBasicNodeMaterial, MeshBasicNodeMaterial } from 'three/webgpu'
 import { EDITOR_LAYER } from '../../../lib/constants'
 import { isHistoryShortcut } from '../../../lib/history'
 import { getHoveredRoofSegmentOutlineProxyName } from '../../../lib/roof-hover-outline-proxy'
-import { isTypingTarget } from '../../../lib/typing-target'
 import useInteractionScope, { useMovingNode } from '../../../store/use-interaction-scope'
 import { swallowNextClick } from '../../editor/handles/use-handle-drag'
 
@@ -1863,10 +1863,11 @@ export const RoofEditSystem = () => {
         const wasReveal = prevRevealRoofIds.current.has(roofId)
         if (isActive !== wasActive || isMoving !== wasMoving) {
           // Entering or exiting edit and move modes rebuilds the merged shell
-          // from the current segment values.
+          // from the current segment values (its faces of other kinds are no part of it).
           const { markDirty } = useScene.getState()
           for (const childId of roofNode.children) {
-            markDirty(childId as AnyNodeId)
+            if (nodes[childId as AnyNodeId]?.type === 'roof-segment')
+              markDirty(childId as AnyNodeId)
           }
         }
         // Entering reveal mode (and NOT also full-edit, which already

package/src/components/tools/distribution/distribution-run-tool.tsx

@@ -26,12 +26,12 @@ import {
   useEditor,
   useInteractionScope,
 } from '@pascal-app/editor'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { useThree } from '@react-three/fiber'
 import { type RefObject, useCallback, useEffect, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { type Group, Vector3 } from 'three'
 import { messageWithSlot } from '../../../i18n/message-slot'
-import { Html } from '../../editor/localized-html'
 import type { RunSurfaceBounds, RunSurfaceTarget } from './distribution-run-contract'
 import { clearDrawAlignment } from './draw-alignment'
 import type { RunBodyHit, ScenePort } from './ports'

package/src/components/tools/item/placement-history.test.tsx

@@ -22,12 +22,12 @@ import {
   WallNode,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import { LocalizedHtml as Html } from '@pascal-app/viewer/ui'
 import { act, create } from '@react-three/test-renderer'
 import { Children, Component, cloneElement, isValidElement, type ReactNode } from 'react'
 import { Group } from 'three'
 import useEditor from '../../../store/use-editor'
 import useInteractionScope from '../../../store/use-interaction-scope'
-import { Html } from '../../editor/localized-html'
 import { useDraftNode } from './use-draft-node'
 import { usePlacementCoordinator } from './use-placement-coordinator'