@pascal-app/editor 1.0.0-beta.5 → 1.0.1

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

@@ -7,7 +7,9 @@ import {
   type FloorplanGeometry,
   type FloorplanPalette,
   type FloorplanPoint,
+  isNodeKindEnabled,
   type LiveNodeOverrides,
+  type NodeCategory,
   nodeRegistry,
   resolveBuildingForLevel,
   useScene,
@@ -20,10 +22,13 @@ import { resolveSvgAnnotationCollisions } from '../../components/editor-2d/rende
 import { FloorplanGeometryRenderer } from '../../components/editor-2d/renderers/floorplan-geometry-renderer'
 import {
   buildContext,
+  collectDirectFloorplanScopeNodes,
   collectFloorplanLinkedLevelNodes,
   floorplanLayerRank,
   getFloorplanLevelData,
+  isFloorplanHierarchyVisible,
   isFloorplanNodeVisible,
+  siteToFloorplanTransform,
   splitFloorplanOverlay,
 } from '../../components/editor-2d/renderers/floorplan-registry-layer'
 import useDrawingView, { DRAWING_TYPE_OPTIONS } from '../../store/use-drawing-view'
@@ -69,6 +74,20 @@ import { FLOORPLAN_VIEW_ROTATION_DEG } from './geometry'
  */
 export type FloorplanExportScope = 'full' | 'structure'
 
+/**
+ * Whether a node belongs in the given export scope. `'full'` short-circuits
+ * and admits every node; `'structure'` admits only `structure`-category
+ * nodes. An `undefined` definition (unregistered node type) behaves like a
+ * node with no category.
+ */
+export function isFloorplanNodeInExportScope(
+  definition: { category?: NodeCategory } | undefined,
+  scope: FloorplanExportScope,
+): boolean {
+  if (scope === 'full') return true
+  return definition?.category === 'structure'
+}
+
 const SVG_NS = 'http://www.w3.org/2000/svg'
 /** Minimum and proportional margin around the structural drawing bounds. */
 const MIN_PLAN_PADDING_M = 1
@@ -131,12 +150,27 @@ type ExportGeometry = {
   annotations: FloorplanGeometry | null
 }
 
+type ExportGeometryContext = {
+  children: AnyNode[]
+  siblings: AnyNode[]
+  parent: AnyNode
+  outputTransform: { translate: FloorplanPoint; rotate: number }
+}
+
+type ExportGeometryEntry = {
+  id: AnyNodeId
+  node: AnyNode
+  parentOverride?: AnyNode
+  context?: ExportGeometryContext
+  scopeRank?: number
+}
+
 export type FloorplanPageLayout = {
   planBox: { x: number; y: number; width: number; height: number }
 }
 
 export async function exportFloorplanPdf(scope: FloorplanExportScope): Promise<void> {
-  const nodes = useScene.getState().nodes
+  const { nodes, installedPlugins } = useScene.getState()
   const viewer = useViewer.getState()
   const unit = viewer.unit
   const metricNotation = viewer.metricNotation
@@ -183,8 +217,9 @@ export async function exportFloorplanPdf(scope: FloorplanExportScope): Promise<v
         annotationVisibility,
         drawingType,
         wallDimensionReference,
+        installedPlugins,
       )
-      const schedules = collectFloorplanSchedules(nodes, level.id, unit)
+      const schedules = collectFloorplanSchedules(nodes, level.id, unit, scope)
       if (geometries.length === 0 && schedules.length === 0) continue
       const layout = resolveFloorplanPageLayout(A4_LANDSCAPE_WIDTH_PT, A4_LANDSCAPE_HEIGHT_PT)
 
@@ -270,6 +305,7 @@ export function collectFloorplanSchedules(
   nodes: Record<string, AnyNode>,
   levelId: AnyNodeId,
   unit: 'metric' | 'imperial',
+  scope: FloorplanExportScope = 'full',
 ): FloorplanSchedule[] {
   const siblingsByType = new Map<string, AnyNode[]>()
   const visit = (id: AnyNodeId) => {
@@ -289,6 +325,9 @@ export function collectFloorplanSchedules(
   for (const [kind, definition] of nodeRegistry.entries()) {
     const scheduleContribution = getFloorplanNodeExtension(definition)?.schedule
     if (!scheduleContribution) continue
+    // Same scope gate as geometry: a structure-only PDF must not list rooms
+    // or other site-category contributors whose plan geometry was excluded.
+    if (!isFloorplanNodeInExportScope(definition, scope)) continue
     const siblings = siblingsByType.get(kind) ?? []
     const schedule = scheduleContribution({ siblings, nodes, levelId, unit })
     if (schedule && schedule.rows.length > 0) schedules.push(schedule)
@@ -721,7 +760,7 @@ function applyFloorplanViewport(
   mounted.svg.insertBefore(background, mounted.svg.firstChild)
 }
 
-function collectFloorplanGeometry(
+export function collectFloorplanGeometry(
   nodes: Record<string, AnyNode>,
   levelId: AnyNodeId,
   scope: FloorplanExportScope,
@@ -730,10 +769,11 @@ function collectFloorplanGeometry(
   annotationVisibility: FloorplanAnnotationVisibility,
   drawingType: ConstructionDrawingType,
   wallDimensionReference: FloorplanWallDimensionReference,
+  installedPlugins: readonly string[],
 ): ExportGeometry[] {
   const noLiveOverrides = new Map<string, LiveNodeOverrides>()
   const levelNodeIdsByType = new Map<string, AnyNodeId[]>()
-  const entries: { id: AnyNodeId; node: AnyNode; parentOverride?: AnyNode }[] = []
+  const entries: ExportGeometryEntry[] = []
 
   const visit = (id: AnyNodeId) => {
     const node = nodes[id]
@@ -747,7 +787,7 @@ function collectFloorplanGeometry(
     if (
       def?.floorplan &&
       isFloorplanNodeVisible(node) &&
-      (scope === 'full' || def.category === 'structure')
+      isFloorplanNodeInExportScope(def, scope)
     ) {
       const drawingNode = resolveNodeForDrawingType(node, nodes, drawingType)
       if (drawingNode) entries.push({ id, node: drawingNode })
@@ -758,31 +798,74 @@ function collectFloorplanGeometry(
   visit(levelId)
 
   const activeLevelNode = nodes[levelId]
+  const collectedIds = new Set(entries.map((entry) => entry.id))
   if (activeLevelNode) {
-    const collectedIds = new Set(entries.map((entry) => entry.id))
     for (const linked of collectFloorplanLinkedLevelNodes(nodes, levelId, collectedIds)) {
       const definition = nodeRegistry.get(linked.node.type)
-      if (
-        isFloorplanNodeVisible(linked.node) &&
-        (scope === 'full' || definition?.category === 'structure')
-      ) {
+      if (isFloorplanNodeVisible(linked.node) && isFloorplanNodeInExportScope(definition, scope)) {
         const drawingNode = resolveNodeForDrawingType(linked.node, nodes, drawingType)
         if (drawingNode) {
           entries.push({ id: linked.id, node: drawingNode, parentOverride: activeLevelNode })
+          collectedIds.add(linked.id)
         }
       }
     }
   }
 
-  // Document order is paint order — sort the same way the live layer does so
-  // zones sit under walls/slabs/furniture rather than on top of them.
-  entries.sort((a, b) => floorplanLayerRank(a.node.type) - floorplanLayerRank(b.node.type))
+  const buildingId = resolveBuildingForLevel(levelId, nodes as Record<AnyNodeId, AnyNode>)
+  const buildingNode = buildingId ? nodes[buildingId] : undefined
+  const siteNode =
+    buildingNode?.type === 'building' && buildingNode.parentId
+      ? nodes[buildingNode.parentId as AnyNodeId]
+      : undefined
+  if (siteNode?.type === 'site' && buildingNode?.type === 'building') {
+    const siteScopedNodes = collectDirectFloorplanScopeNodes(nodes, siteNode, 'site')
+    const outputTransform = siteToFloorplanTransform(
+      buildingNode.position,
+      buildingNode.rotation[1],
+    )
+    for (const node of siteScopedNodes) {
+      if (collectedIds.has(node.id) || !isNodeKindEnabled(node.type, installedPlugins)) continue
+      const drawingNode = resolveNodeForDrawingType(node, nodes, drawingType)
+      if (!drawingNode) continue
+      const definition = nodeRegistry.get(drawingNode.type)
+      if (
+        !definition?.floorplan ||
+        !isFloorplanNodeInExportScope(definition, scope) ||
+        !isFloorplanHierarchyVisible(drawingNode, nodes, noLiveOverrides, siteNode.id)
+      ) {
+        continue
+      }
+      const childIds = 'children' in node ? node.children : undefined
+      const children = Array.isArray(childIds)
+        ? childIds.map((childId) => nodes[childId]).filter((child): child is AnyNode => !!child)
+        : []
+      const siblings = siteScopedNodes.filter(
+        (candidate) => candidate.id !== node.id && candidate.type === node.type,
+      )
+      entries.push({
+        id: node.id,
+        node: drawingNode,
+        context: { children, siblings, parent: siteNode, outputTransform },
+        scopeRank: -1,
+      })
+      collectedIds.add(node.id)
+    }
+  }
+
+  // Document order is paint order. Site context sits below level
+  // architecture, then each scope retains the live layer's z-order.
+  entries.sort(
+    (a, b) =>
+      (a.scopeRank ?? 0) - (b.scopeRank ?? 0) ||
+      floorplanLayerRank(a.node.type) - floorplanLayerRank(b.node.type),
+  )
 
   // One-shot per-type cache for `computeFloorplanLevelData`; value type is
   // module-private to the registry layer, so let it infer.
   const levelDataCache = new Map()
   const out: ExportGeometry[] = []
-  for (const { id, node, parentOverride } of entries) {
+  for (const { id, node, parentOverride, context } of entries) {
     const builder = nodeRegistry.get(node.type)?.floorplan
     if (!builder) continue
     const levelData = getFloorplanLevelData(
@@ -803,9 +886,25 @@ function collectFloorplanGeometry(
       ),
       levelData,
     )
-    const ctx = parentOverride ? { ...baseContext, parent: parentOverride } : baseContext
-    const geometry = builder(node, ctx)
-    if (!geometry) continue
+    const ctx = context
+      ? {
+          ...baseContext,
+          children: context.children,
+          siblings: context.siblings,
+          parent: context.parent,
+        }
+      : parentOverride
+        ? { ...baseContext, parent: parentOverride }
+        : baseContext
+    const builtGeometry = builder(node, ctx)
+    if (!builtGeometry) continue
+    const geometry = context
+      ? {
+          kind: 'group' as const,
+          children: [builtGeometry],
+          transform: context.outputTransform,
+        }
+      : builtGeometry
     const visibleGeometry = filterFloorplanAnnotationGeometry(geometry, annotationVisibility)
     if (!visibleGeometry) continue
     const { base, overlay } = splitFloorplanOverlay(visibleGeometry)
@@ -926,9 +1025,10 @@ function combineGeometryList(
  * Levels to export, ordered bottom-to-top. The active building (the building
  * owning the selected level, or the first one found) contributes all of its
  * level children; if there is no building wrapper we fall back to the single
- * resolved level.
+ * resolved level. Roof support levels are excluded: they are not occupied
+ * stories, so they do not get a floor-plan page.
  */
-function resolveExportLevels(nodes: Record<string, AnyNode>): ExportLevel[] {
+export function resolveExportLevels(nodes: Record<string, AnyNode>): ExportLevel[] {
   const selected = useViewer.getState().selection.levelId as AnyNodeId | null | undefined
   const activeLevelId = selected && nodes[selected] ? selected : firstLevelId(nodes)
   if (!activeLevelId) return []
@@ -943,6 +1043,7 @@ function resolveExportLevels(nodes: Record<string, AnyNode>): ExportLevel[] {
     levelNodes = node ? [node] : []
   }
 
+  levelNodes = levelNodes.filter((n) => n.metadata.role !== 'roof')
   levelNodes.sort((a, b) => levelIndexOf(a) - levelIndexOf(b))
   return levelNodes.map((n) => ({ id: n.id as AnyNodeId, label: levelLabelOf(n) }))
 }

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

@@ -85,6 +85,32 @@ describe('renderFloorplanGeometryToPdfKit', () => {
     expect([...new Set(baseFonts)]).toEqual(['Courier'])
     expect([...new Set(fontSizes)]).toEqual(['1.6'])
   })
+  test('uses even-odd fill for compound plugin paths', async () => {
+    const geometry = {
+      kind: 'path',
+      d: 'M0,0H4V4H0ZM1,1H3V3H1Z',
+      fill: '#3f6b2f',
+      fillRule: 'evenodd',
+    } satisfies FloorplanGeometry
+
+    const pdf = await renderTestPdf(geometry)
+
+    expect(pdf).toMatch(/f\*/)
+  })
+
+  test('writes a data-url PNG image without resolving it as an asset', async () => {
+    const geometry = {
+      kind: 'image',
+      url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=',
+      center: [2, 2],
+      width: 1,
+      height: 1,
+    } satisfies FloorplanGeometry
+
+    const pdf = await renderTestPdf(geometry)
+
+    expect(pdf).toContain('/Subtype /Image')
+  })
 })
 
 async function renderTestPdf(geometry: FloorplanGeometry, rotationDeg = 0): Promise<string> {

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

@@ -191,6 +191,7 @@ function paintStyledGeometry(
   const opacity = geometry.opacity ?? 1
   const fillOpacity = (geometry.fillOpacity ?? 1) * opacity
   const strokeOpacity = (geometry.strokeOpacity ?? 1) * opacity
+  const fillRule = geometry.fillRule === 'evenodd' ? 'even-odd' : 'non-zero'
 
   if (fill) raw.fillColor(fill).fillOpacity(fillOpacity)
   if (stroke) {
@@ -206,8 +207,8 @@ function paintStyledGeometry(
     )
   }
 
-  if (fill && stroke) raw.fillAndStroke(fill, stroke)
-  else if (fill) raw.fill(fill)
+  if (fill && stroke) raw.fillAndStroke(fill, stroke, fillRule)
+  else if (fill) raw.fill(fill, fillRule)
   else if (stroke) raw.stroke(stroke)
 }
 
@@ -620,29 +621,36 @@ async function drawImage(
   doc: FloorplanPdfDocument,
   geometry: Extract<FloorplanGeometry, { kind: 'image' }>,
 ): Promise<void> {
-  try {
-    const url = await loadAssetUrl(geometry.url)
-    if (!url) return
-    const response = await fetch(url)
-    if (!response.ok) return
-    const dataUrl = await blobToDataUrl(await response.blob())
-    const raw = doc.raw
-    raw.save().translate(geometry.center[0], geometry.center[1])
-    if (geometry.rotation) raw.rotate((geometry.rotation * 180) / Math.PI)
-    raw.opacity(geometry.opacity ?? 1)
-    const options =
-      geometry.preserveAspectRatio === 'none'
-        ? { width: geometry.width, height: geometry.height }
-        : {
-            fit: [geometry.width, geometry.height] as [number, number],
-            align: 'center' as const,
-            valign: 'center' as const,
-          }
-    raw.image(dataUrl, -geometry.width / 2, -geometry.height / 2, options)
-    raw.restore()
-  } catch {
-    return
+  const source = geometry.url.startsWith('data:') ? geometry.url : await loadAssetUrl(geometry.url)
+  if (!source) {
+    throw new Error('[floorplan-export] Could not resolve a floorplan image')
+  }
+
+  let dataUrl = source
+  if (!source.startsWith('data:')) {
+    const response = await fetch(source)
+    if (!response.ok) {
+      throw new Error(
+        `[floorplan-export] Could not load a floorplan image (HTTP ${response.status})`,
+      )
+    }
+    dataUrl = await blobToDataUrl(await response.blob())
   }
+
+  const raw = doc.raw
+  raw.save().translate(geometry.center[0], geometry.center[1])
+  if (geometry.rotation) raw.rotate((geometry.rotation * 180) / Math.PI)
+  raw.opacity(geometry.opacity ?? 1)
+  const options =
+    geometry.preserveAspectRatio === 'none'
+      ? { width: geometry.width, height: geometry.height }
+      : {
+          fit: [geometry.width, geometry.height] as [number, number],
+          align: 'center' as const,
+          valign: 'center' as const,
+        }
+  raw.image(dataUrl, -geometry.width / 2, -geometry.height / 2, options)
+  raw.restore()
 }
 
 function blobToDataUrl(blob: Blob): Promise<string> {

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

@@ -14,6 +14,8 @@ export type FloorplanViewState = {
   highlighted: boolean
   hovered: boolean
   moving: boolean
+  focusedUnitId?: string
+  focusedUnitMemberIds?: readonly string[]
   palette: FloorplanPalette | undefined
 }
 
@@ -52,6 +54,7 @@ export function buildFloorplanContext(
     siblings,
     parent,
     levelData,
+    sceneNodes: nodes,
     extensions: createFloorplanContextExtensions({
       automaticDimensions: viewState.automaticDimensions,
       metricNotation: viewState.metricNotation ?? 'meters',
@@ -65,6 +68,8 @@ export function buildFloorplanContext(
           highlighted: viewState.highlighted,
           hovered: viewState.hovered,
           moving: viewState.moving,
+          focusedUnitId: viewState.focusedUnitId,
+          focusedUnitMemberIds: viewState.focusedUnitMemberIds,
           palette: viewState.palette,
         }
       : undefined,

package/src/lib/floorplan-grid-event-point.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, test } from 'bun:test'
+import { resolveGenericFloorplanGridEventPoint } from './floorplan-grid-event-point'
+
+const snapHalf = ([x, z]: [number, number]): [number, number] => [
+  Math.round(x / 0.5) * 0.5,
+  Math.round(z / 0.5) * 0.5,
+]
+
+describe('resolveGenericFloorplanGridEventPoint', () => {
+  test('passes the raw pointer to registry tools so attachment can win before grid', () => {
+    expect(
+      resolveGenericFloorplanGridEventPoint({
+        point: [0.73, 0.32],
+        registryToolOwnsSnapping: true,
+        snap: snapHalf,
+      }),
+    ).toEqual([0.73, 0.32])
+  })
+
+  test('keeps the floorplan snap for interactions without a registry-owned resolver', () => {
+    expect(
+      resolveGenericFloorplanGridEventPoint({
+        point: [0.73, 0.32],
+        registryToolOwnsSnapping: false,
+        snap: snapHalf,
+      }),
+    ).toEqual([0.5, 0.5])
+  })
+})

package/src/lib/floorplan-grid-event-point.ts

@@ -0,0 +1,13 @@
+export type FloorplanGridEventPoint = [number, number]
+
+export function resolveGenericFloorplanGridEventPoint({
+  point,
+  registryToolOwnsSnapping,
+  snap,
+}: {
+  point: FloorplanGridEventPoint
+  registryToolOwnsSnapping: boolean
+  snap: (point: FloorplanGridEventPoint) => FloorplanGridEventPoint
+}): FloorplanGridEventPoint {
+  return registryToolOwnsSnapping ? point : snap(point)
+}

package/src/lib/fresh-planar-placement.ts

@@ -8,6 +8,11 @@ import {
   useScene,
 } from '@pascal-app/core'
 import { getPlacementMetadataRecord, stripPlacementMetadataFlags } from './placement-metadata'
+import {
+  surfaceAttachmentId,
+  surfaceAttachmentUpdates,
+  updateSurfaceNode,
+} from './surface-attachment'
 
 function cleanPlacementMetadata<N extends AnyNode>(node: N): N {
   return {
@@ -131,16 +136,19 @@ export function commitFreshPlacementSubtree(
     parentId,
   })
 
+  const surfaceId = surfaceAttachmentId(subtree.root)
   const temporal = useScene.temporal.getState()
   const wasTracking = (temporal as { isTracking?: boolean }).isTracking !== false
   if (wasTracking) temporal.pause()
+  updateSurfaceNode(rootId, {}, null)
   useScene.getState().deleteNode(rootId)
   temporal.resume()
-  useScene
-    .getState()
-    .createNodes(
-      cloned.nodes.map((node, index) => (index === 0 && parentId ? { node, parentId } : { node })),
-    )
+  useScene.getState().applyNodeChanges({
+    create: cloned.nodes.map((node, index) =>
+      index === 0 && parentId ? { node, parentId } : { node },
+    ),
+    update: surfaceAttachmentUpdates(cloned.rootId, parentId, surfaceId),
+  })
   if (!wasTracking) temporal.pause()
 
   return cloned.rootId