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

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

@@ -10,6 +10,7 @@ import {
   type FloorplanGeometry,
   type FloorplanPalette,
   type FloorplanPoint,
+  type FloorplanScope,
   type GeometryContext,
   isNodeKindEnabled,
   isRegistryMovable,
@@ -26,7 +27,7 @@ import {
   useLiveTransforms,
   useScene,
 } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { beginPerfAction, cancelPerfAction, commitPerfAction, useViewer } from '@pascal-app/viewer'
 import {
   type ComponentProps,
   memo,
@@ -39,6 +40,7 @@ import {
   useRef,
   useState,
 } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 import { markToolCancelConsumed } from '../../../hooks/use-keyboard'
 import { ROTATE_HANDLE_DRAG_LABEL } from '../../../lib/contextual-help'
 import {
@@ -46,6 +48,7 @@ import {
   resolveDirectManipulationNode,
   resolveDirectRotationDragDelta,
   resolveDirectRotationPatch,
+  shouldStartDirectMoveDrag,
   snapDirectRotationDelta,
 } from '../../../lib/direct-manipulation'
 import { createEditorApi } from '../../../lib/editor-api'
@@ -85,6 +88,7 @@ import {
 import { emitCanvasNodeSelection } from '../../../lib/selection-routing'
 import { sfxEmitter } from '../../../lib/sfx-bus'
 import { clearSurfacePlanSnapFeedback } from '../../../lib/surface-plan-snap'
+import { paintZoneMembership } from '../../../lib/units'
 import useDirectManipulationFeedback from '../../../store/use-direct-manipulation-feedback'
 import useDrawingView from '../../../store/use-drawing-view'
 import useEditor, { isAngleSnapActive } from '../../../store/use-editor'
@@ -246,6 +250,7 @@ export function cancelFloorplanAffordanceDrag(
   for (const id of drag.session.affectedIds) effects.clearPreview(id)
   effects.endReshapeScope(drag)
   effects.clearDragFeedback?.()
+  cancelPerfAction()
   return true
 }
 
@@ -310,6 +315,14 @@ export function floorplanAffordanceReshapeScope(
   return null
 }
 
+function floorplanAffordancePerfAction(node: AnyNode, affordance: string): string {
+  if (affordance.includes('endpoint')) return `drag:${node.type}-endpoint`
+  if (affordance.includes('resize')) return 'drag:resize'
+  if (affordance.includes('rotate')) return 'drag:rotate'
+  if (affordance.includes('move')) return 'drag:move'
+  return 'drag:reshape'
+}
+
 /**
  * Transient live-rotation readout state. Rebuilt each pointer-move while a
  * rotate-arrow is dragged and cleared on release. World-plan coords.
@@ -328,6 +341,15 @@ type FloorplanEntryDescriptor = {
   node: AnyNode
   dependsOnSiblingInputs: boolean
   ctxOverrides?: FloorplanContextOverrides
+  scopeRank?: number
+  visibilityRootId?: AnyNodeId
+}
+
+/** The focused unit and its members; one stable object per focus change so
+ * cached zone geometry invalidates exactly when the focus does. */
+export type FloorplanUnitFocus = {
+  focusedUnitId: string
+  focusedUnitMemberIds: readonly string[]
 }
 
 type NodeDeps = {
@@ -343,10 +365,12 @@ type NodeDeps = {
   moving: boolean
   liveOverride: LiveNodeOverrides | undefined
   palette: FloorplanPalette | undefined
+  unitFocus: FloorplanUnitFocus | undefined
   siblingEpoch: number
   committedNodes: Record<string, AnyNode> | null
   dependencyNodes: AnyNode[]
   interactiveElevators: unknown
+  ctxOverrides: FloorplanContextOverrides | undefined
 }
 
 type CacheEntry = {
@@ -367,6 +391,40 @@ type FloorplanContextOverrides = {
   children: AnyNode[]
   siblings: AnyNode[]
   parent: AnyNode | null
+  outputTransform?: { translate?: FloorplanPoint; rotate?: number }
+  trackAllNodes?: boolean
+}
+
+export function collectDirectFloorplanScopeNodes(
+  nodes: Record<string, AnyNode>,
+  parent: AnyNode,
+  scope: FloorplanScope,
+): AnyNode[] {
+  const scopedKinds = new Set(kindsWithFloorplanScope(scope))
+  const declaredChildren = new Set(
+    Array.isArray((parent as { children?: AnyNodeId[] }).children)
+      ? (parent as { children: AnyNodeId[] }).children
+      : [],
+  )
+  return Object.values(nodes).filter(
+    (node) =>
+      scopedKinds.has(node.type) && (node.parentId === parent.id || declaredChildren.has(node.id)),
+  )
+}
+
+export function siteToFloorplanTransform(
+  buildingPosition: readonly [number, number, number],
+  buildingRotationY: number,
+): { translate: FloorplanPoint; rotate: number } {
+  const cos = Math.cos(buildingRotationY)
+  const sin = Math.sin(buildingRotationY)
+  return {
+    translate: [
+      -buildingPosition[0] * cos + buildingPosition[2] * sin,
+      -buildingPosition[0] * sin - buildingPosition[2] * cos,
+    ],
+    rotate: buildingRotationY,
+  }
 }
 
 type FloorplanLevelDataHook = (args: {
@@ -428,6 +486,7 @@ function snapshotsToUpdates(snapshots: NodeSnapshot[]) {
 // Stable empty sentinel used by per-entry builders while the floor plan is
 // hidden; committed scene edits still flow through `useScene`.
 const EMPTY_LIVE_OVERRIDES: Map<string, LiveNodeOverrides> = new Map()
+const NO_MEMBER_IDS: readonly string[] = []
 
 export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
   const selectedLevelId = useViewer((s) => s.selection.levelId)
@@ -436,6 +495,17 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
   const metricNotation = useViewer((s) => s.metricNotation)
   const setSelection = useViewer((s) => s.setSelection)
   const nodes = useScene((s) => s.nodes)
+  const focusedUnitId = useViewer((s) => s.focusedUnitId)
+  const focusedUnitMemberIds = useScene(
+    useShallow((s) => {
+      const focusedUnit = focusedUnitId ? s.nodes[focusedUnitId] : undefined
+      return focusedUnit?.type === 'unit' ? focusedUnit.members : NO_MEMBER_IDS
+    }),
+  )
+  const unitFocus = useMemo<FloorplanUnitFocus | undefined>(
+    () => (focusedUnitId ? { focusedUnitId, focusedUnitMemberIds } : undefined),
+    [focusedUnitId, focusedUnitMemberIds],
+  )
   const installedPlugins = useScene((s) => s.installedPlugins)
   const movingNode = useMovingNode()
   // When a building is being moved, its explicit selection may be
@@ -477,6 +547,13 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
 
   const levelId = selectedLevelId ?? ambientLevelId
   const isAmbient = !selectedLevelId && !!ambientLevelId
+  const activeBuildingId = useMemo(
+    () => (levelId ? resolveBuildingForLevel(levelId as AnyNodeId, nodes) : null),
+    [levelId, nodes],
+  )
+  const activeBuildingLiveTransform = useLiveTransforms((state) =>
+    activeBuildingId ? state.transforms.get(activeBuildingId) : undefined,
+  )
   const renderCtx = useFloorplanStaticRender()
   const sceneRotationDeg = renderCtx?.getSceneRotationDeg() ?? 0
   const setMovingNode = useEditor((s) => s.setMovingNode)
@@ -595,6 +672,13 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
 
   const applyEntrySelection = useCallback(
     (id: AnyNodeId, options: { shouldToggle: boolean; isolateMember: boolean }) => {
+      const focusedUnitId = useViewer.getState().focusedUnitId
+      const clickedNode = useScene.getState().nodes[id]
+      if (focusedUnitId && clickedNode?.type === 'zone') {
+        paintZoneMembership(focusedUnitId, clickedNode.id)
+        swallowNextClick(200)
+        return
+      }
       const currentSelectedIds = useViewer.getState().selection.selectedIds
       let nextSelectedIds: string[]
       if (options.shouldToggle) {
@@ -644,16 +728,24 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
 
   const startDirectMoveDrag = useCallback(
     (id: AnyNodeId, event: ReactPointerEvent<SVGGElement>): boolean => {
-      if (event.button !== 0 || !(event.metaKey || event.ctrlKey)) return false
+      if (event.button !== 0) return false
 
       const node = useScene.getState().nodes[id]
       if (!node || !isRegistryMovable(node.type)) return false
-      // Sole selection only: per-node direct manipulation stands down for a
-      // multi-selection (the group session owns plain drags there, and Cmd is
-      // the selection-toggle key — a wobbly Cmd+click must not yank one
-      // member out of the group).
       const currentSelectedIds = useViewer.getState().selection.selectedIds
-      if (currentSelectedIds.length !== 1 || currentSelectedIds[0] !== id) return false
+      const allowPlainDrag = nodeRegistry.get(node.type)?.capabilities?.movable?.directDrag === true
+      const commandModifier = event.metaKey || event.ctrlKey
+      if (
+        !shouldStartDirectMoveDrag({
+          allowPlainDrag,
+          commandModifier,
+          handleOwnsPointer: false,
+          nodeId: id,
+          selectedIds: currentSelectedIds,
+        })
+      ) {
+        return false
+      }
 
       event.preventDefault()
       event.stopPropagation()
@@ -705,9 +797,8 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
         if (endEvent.pointerId !== pointerId) return
         cleanup()
         if (!engaged) {
-          // Cmd/Ctrl+click without drag: toggle member (options object, not bare boolean).
           applyEntrySelection(id, {
-            shouldToggle: true,
+            shouldToggle: commandModifier,
             isolateMember: false,
           })
         }
@@ -929,7 +1020,12 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
 
     collectLevelDataKind(levelId as AnyNodeId)
 
-    const pushEntry = (id: AnyNodeId, node: AnyNode, ctxOverrides?: FloorplanContextOverrides) => {
+    const pushEntry = (
+      id: AnyNodeId,
+      node: AnyNode,
+      ctxOverrides?: FloorplanContextOverrides,
+      options?: { scopeRank?: number; visibilityRootId?: AnyNodeId },
+    ) => {
       if (!isNodeKindEnabled(node.type, installedPlugins)) return
       const drawingNode = resolveNodeForDrawingType(node, nodes, drawingType)
       if (!drawingNode) return
@@ -942,6 +1038,8 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
       )
       const descriptor: FloorplanEntryDescriptor = { id, node: drawingNode, dependsOnSiblingInputs }
       if (ctxOverrides) descriptor.ctxOverrides = ctxOverrides
+      if (options?.scopeRank !== undefined) descriptor.scopeRank = options.scopeRank
+      if (options?.visibilityRootId) descriptor.visibilityRootId = options.visibilityRootId
       out.push(descriptor)
     }
 
@@ -977,13 +1075,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
     // as siblings of the level, not under it — the `visit(levelId)` DFS
     // above doesn't reach them. Walk every node of those kinds whose
     // parent matches the active level's building, and synthesise a
-    // `GeometryContext` whose `parent` is the active level (so kind
-    // builders that gate on the current floor — e.g. elevator service
-    // range — keep working). Pure registry-driven dispatch: no kind
-    // name appears in this file.
-    const activeBuildingId = activeLevelNode
-      ? resolveBuildingForLevel(levelId as AnyNodeId, nodes)
-      : null
+    // `GeometryContext` whose `parent` is the active level.
     if (activeLevelNode && activeBuildingId) {
       const buildingScopedKinds = kindsWithFloorplanScope('building')
       const buildingScopedKindSet = new Set(buildingScopedKinds)
@@ -1000,6 +1092,45 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
       }
     }
 
+    // Site-scoped kinds are semantic children of the Site and therefore
+    // outside both the active-level DFS and the building sibling scan.
+    // Their builders stay site-local; wrap their output in the inverse active
+    // building transform so it aligns with this building-local plan.
+    const activeBuildingNode = activeBuildingId ? nodes[activeBuildingId] : undefined
+    const activeSiteNode =
+      activeBuildingNode?.type === 'building' && activeBuildingNode.parentId
+        ? nodes[activeBuildingNode.parentId as AnyNodeId]
+        : undefined
+    if (activeSiteNode?.type === 'site' && activeBuildingNode?.type === 'building') {
+      const siteScopedNodes = collectDirectFloorplanScopeNodes(nodes, activeSiteNode, 'site')
+      const siteProjection = siteToFloorplanTransform(
+        activeBuildingLiveTransform?.position ?? activeBuildingNode.position,
+        activeBuildingLiveTransform?.rotation ?? activeBuildingNode.rotation[1],
+      )
+      for (const node of siteScopedNodes) {
+        const children = Array.isArray((node as { children?: AnyNodeId[] }).children)
+          ? (node as { children: AnyNodeId[] }).children
+              .map((id) => nodes[id])
+              .filter((child): child is AnyNode => child !== undefined)
+          : []
+        const siblings = siteScopedNodes.filter(
+          (candidate) => candidate.id !== node.id && candidate.type === node.type,
+        )
+        pushEntry(
+          node.id,
+          node,
+          {
+            children,
+            siblings,
+            parent: activeSiteNode,
+            outputTransform: siteProjection,
+            trackAllNodes: true,
+          },
+          { scopeRank: -1, visibilityRootId: activeSiteNode.id },
+        )
+      }
+    }
+
     // Stable z-order sort. SVG renders in document order — later siblings
     // paint on top of earlier ones — so anything that should sit *under*
     // other floor-plan geometry has to come first in the entries array.
@@ -1007,7 +1138,11 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
     // all belong on top of them. Within a layer bucket we preserve the
     // DFS visit order (stable sort) so siblings keep their relative
     // priority.
-    out.sort((a, b) => floorplanLayerRank(a.node.type) - floorplanLayerRank(b.node.type))
+    out.sort(
+      (a, b) =>
+        (a.scopeRank ?? 0) - (b.scopeRank ?? 0) ||
+        floorplanLayerRank(a.node.type) - floorplanLayerRank(b.node.type),
+    )
     const entryIds = new Set(out.map((entry) => entry.id))
     for (const id of geometryCacheRef.current.keys()) {
       if (!entryIds.has(id as AnyNodeId)) geometryCacheRef.current.delete(id)
@@ -1016,7 +1151,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
       if (!levelNodeIdsByType.has(type)) levelDataCacheRef.current.delete(type)
     }
     return { entries: out, levelNodeIdsByType }
-  }, [drawingType, installedPlugins, levelId, nodes])
+  }, [activeBuildingId, activeBuildingLiveTransform, drawingType, installedPlugins, levelId, nodes])
 
   // ── Generic 2D affordance dispatch ─────────────────────────────────
   //
@@ -1048,6 +1183,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
         nodes: sceneNodes,
         initialPlanPoint,
         gridSnapStep: useEditor.getState().gridSnapStep,
+        sceneApi: createSceneApi(useScene),
       })
       if (!(session.commit && session.canCommit())) return
       session.commit()
@@ -1085,12 +1221,14 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
       event.stopPropagation()
       suppressBoxSelectForPointer(event)
 
+      beginPerfAction(floorplanAffordancePerfAction(node, affordance), `${node.type}:${node.id}`)
       const session = handler.start({
         node,
         payload,
         nodes: sceneNodes,
         initialPlanPoint,
         gridSnapStep: useEditor.getState().gridSnapStep,
+        sceneApi: createSceneApi(useScene),
       })
 
       const snapshots: NodeSnapshot[] = []
@@ -1246,6 +1384,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
           drag.historyPaused = false
         }
         drag.session.commit()
+        commitPerfAction()
         sfxEmitter.emit('sfx:structure-build')
         clearSurfacePlanSnapFeedback()
         endReshapeScope(drag)
@@ -1287,6 +1426,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
           drag.historyPaused = false
         }
         useScene.getState().updateNodes(finalUpdates)
+        commitPerfAction()
         sfxEmitter.emit('sfx:structure-build')
       } else {
         // Either no net change or canCommit() rejected — revert and
@@ -1300,6 +1440,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
         }
         const overrides = useLiveNodeOverrides.getState()
         for (const id of drag.session.affectedIds) overrides.clear(id)
+        cancelPerfAction()
       }
 
       clearSurfacePlanSnapFeedback()
@@ -1417,6 +1558,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
             onHandleDoubleClick={commitAffordanceAction}
             onHandlePointerDown={startAffordanceDrag}
             palette={palette}
+            unitFocus={unitFocus}
             pass="base"
             sceneRotationDeg={sceneRotationDeg}
             setMovingNode={setMovingNode}
@@ -1425,7 +1567,9 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
             unit={unit}
             metricNotation={metricNotation}
             wallDimensionReference={effectiveWallDimensionReference}
-            visibilityRootId={entry.ctxOverrides ? undefined : (levelId as AnyNodeId)}
+            visibilityRootId={
+              entry.visibilityRootId ?? (entry.ctxOverrides ? undefined : (levelId as AnyNodeId))
+            }
             ctxOverrides={entry.ctxOverrides}
           />
         ))}
@@ -1463,6 +1607,7 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
             onHandleDoubleClick={commitAffordanceAction}
             onHandlePointerDown={startAffordanceDrag}
             palette={palette}
+            unitFocus={unitFocus}
             pass="overlay"
             sceneRotationDeg={sceneRotationDeg}
             setMovingNode={setMovingNode}
@@ -1471,7 +1616,9 @@ export const FloorplanRegistryLayer = memo(function FloorplanRegistryLayer() {
             unit={unit}
             metricNotation={metricNotation}
             wallDimensionReference={effectiveWallDimensionReference}
-            visibilityRootId={entry.ctxOverrides ? undefined : (levelId as AnyNodeId)}
+            visibilityRootId={
+              entry.visibilityRootId ?? (entry.ctxOverrides ? undefined : (levelId as AnyNodeId))
+            }
             ctxOverrides={entry.ctxOverrides}
           />
         ))}
@@ -1792,6 +1939,7 @@ type FloorplanRegistryEntryProps = {
     rotationPivot?: FloorplanPoint,
   ) => void
   palette: FloorplanPalette | undefined
+  unitFocus: FloorplanUnitFocus | undefined
   pass: FloorplanRenderPass
   sceneRotationDeg: number
   setMovingNode: ReturnType<typeof useEditor.getState>['setMovingNode']
@@ -1827,6 +1975,7 @@ const FloorplanRegistryEntry = memo(function FloorplanRegistryEntry({
   onHandleDoubleClick,
   onHandlePointerDown,
   palette,
+  unitFocus,
   pass,
   sceneRotationDeg,
   setMovingNode,
@@ -1851,7 +2000,7 @@ const FloorplanRegistryEntry = memo(function FloorplanRegistryEntry({
   const hovered = useViewer((state) => state.hoveredId === selectionProxyId)
   const setHoveredId = useViewer((state) => state.setHoveredId)
   const referencedAnnotationRole = useViewer((state) =>
-    floorplanEntryReferencedAnnotationRole(node, new Set(state.selection.selectedIds)),
+    floorplanEntryReferencedAnnotationRole(node, nodes, new Set(state.selection.selectedIds)),
   )
   const activeRotateNodeId = useDirectManipulationFeedback((state) =>
     state.activeRotateNodeId === nodeId ? nodeId : null,
@@ -1943,12 +2092,12 @@ const FloorplanRegistryEntry = memo(function FloorplanRegistryEntry({
       // the body-drag gesture — the whole selection slides, not one member.
       if (onGroupMovePointerDown(nodeId, event)) return
       sfxEmitter.emit('sfx:item-pick')
-      setMovingNode(currentNode as never)
+      createEditorApi().engageMove(currentNode)
       // Claim 2D ownership of this move at the source. `setMovingNode`
       // resets the origin to null, so this must follow it.
       setMovingNodeOrigin('2d')
     },
-    [nodeId, onGroupMovePointerDown, setMovingNode, setMovingNodeOrigin],
+    [nodeId, onGroupMovePointerDown, setMovingNodeOrigin],
   )
 
   const cacheEntry = buildFloorplanEntryGeometry({
@@ -1968,6 +2117,7 @@ const FloorplanRegistryEntry = memo(function FloorplanRegistryEntry({
     nodeId,
     nodes,
     palette,
+    unitFocus,
     selected,
     siblingEpoch,
     unit,
@@ -2037,6 +2187,7 @@ type BuildFloorplanEntryGeometryArgs = {
   nodeId: AnyNodeId
   nodes: Record<string, AnyNode>
   palette: FloorplanPalette | undefined
+  unitFocus?: FloorplanUnitFocus
   selected: boolean
   siblingEpoch: number
   unit: 'metric' | 'imperial'
@@ -2051,7 +2202,7 @@ export function collectFloorplanDependencyNodes(
   nodes: Record<string, AnyNode>,
   liveOverrides?: Map<string, LiveNodeOverrides>,
 ): AnyNode[] {
-  return (def.floorplanDependencies?.(node) ?? []).flatMap((id) => {
+  return (def.floorplanDependencies?.(node, nodes) ?? []).flatMap((id) => {
     const dependency = nodes[id]
     if (!dependency) return []
     const dependencyOverride = liveOverrides?.get(dependency.id)
@@ -2068,17 +2219,18 @@ export function collectFloorplanDependencyNodes(
 
 function floorplanEntryReferencedAnnotationRole(
   node: AnyNode,
+  nodes: Record<string, AnyNode>,
   selectedIds: ReadonlySet<string>,
 ): FloorplanAnnotationRole | undefined {
   if (selectedIds.size === 0) return undefined
   const definition = nodeRegistry.get(node.type)
   const role = getFloorplanNodeExtension(definition)?.referencedSelectionAnnotationRole
   if (!role) return undefined
-  const dependencyIds = definition?.floorplanDependencies?.(node) ?? []
+  const dependencyIds = definition?.floorplanDependencies?.(node, nodes) ?? []
   return dependencyIds.some((id) => selectedIds.has(id)) ? role : undefined
 }
 
-function buildFloorplanEntryGeometry({
+export function buildFloorplanEntryGeometry({
   automaticDimensions,
   ctxOverrides,
   geometryCache,
@@ -2095,6 +2247,7 @@ function buildFloorplanEntryGeometry({
   nodeId,
   nodes,
   palette,
+  unitFocus,
   selected,
   siblingEpoch,
   unit,
@@ -2123,6 +2276,7 @@ function buildFloorplanEntryGeometry({
   const deps: NodeDeps = {
     automaticDimensions,
     node,
+    ctxOverrides,
     live,
     unit,
     metricNotation,
@@ -2133,10 +2287,11 @@ function buildFloorplanEntryGeometry({
     moving,
     liveOverride,
     palette,
+    unitFocus,
     siblingEpoch: dependsOnSiblingInputs ? siblingEpoch : 0,
     // Sibling-dependent kinds (wall miters, opening cuts) read other nodes'
     // committed state via `ctx`, so committed sibling edits still invalidate.
-    committedNodes: dependsOnSiblingInputs ? nodes : null,
+    committedNodes: dependsOnSiblingInputs || ctxOverrides?.trackAllNodes ? nodes : null,
     dependencyNodes,
     interactiveElevators,
   }
@@ -2161,7 +2316,12 @@ function buildFloorplanEntryGeometry({
           : r,
       } as AnyNode
     }
-    if ((def.capabilities?.floorPlaced || def.floorplanScope === 'building') && hasPosition) {
+    if (
+      (def.capabilities?.floorPlaced ||
+        def.floorplanScope === 'building' ||
+        def.floorplanScope === 'site') &&
+      hasPosition
+    ) {
       return applyPositionLiveTransform(sourceNode, live)
     }
     if (sourceNode.type === 'slab' || sourceNode.type === 'ceiling' || sourceNode.type === 'zone') {
@@ -2210,6 +2370,8 @@ function buildFloorplanEntryGeometry({
     highlighted,
     hovered,
     moving,
+    focusedUnitId: unitFocus?.focusedUnitId,
+    focusedUnitMemberIds: unitFocus?.focusedUnitMemberIds,
     palette,
   }
   const resolveContextNode = <N = AnyNode>(rid: AnyNodeId): N | undefined => {
@@ -2238,6 +2400,8 @@ function buildFloorplanEntryGeometry({
               highlighted,
               hovered,
               moving,
+              focusedUnitId: unitFocus?.focusedUnitId,
+              focusedUnitMemberIds: unitFocus?.focusedUnitMemberIds,
               palette,
             }
           : undefined,
@@ -2256,10 +2420,18 @@ function buildFloorplanEntryGeometry({
   const taggedContextualGeometry = withFloorplanGeometryMetadata(contextualGeometry, {
     annotationRole: 'contextual-dimension',
   })
-  const geometry =
+  const unprojectedGeometry =
     modelGeometry && taggedContextualGeometry
       ? { kind: 'group' as const, children: [modelGeometry, taggedContextualGeometry] }
       : (modelGeometry ?? taggedContextualGeometry)
+  const geometry =
+    unprojectedGeometry && ctxOverrides?.outputTransform
+      ? {
+          kind: 'group' as const,
+          children: [unprojectedGeometry],
+          transform: ctxOverrides.outputTransform,
+        }
+      : unprojectedGeometry
   const { base, overlay } = geometry
     ? splitFloorplanOverlay(geometry)
     : { base: null, overlay: null }
@@ -2822,6 +2994,7 @@ export const InteractiveGeometry = memo(function InteractiveGeometry({
       case 'midpoint-handle': {
         if (!palette) return <></>
         const handleId = makeHandleId(nodeId, g.payload)
+        const isAction = g.activation === 'action'
         const isHovered = hoveredHandleId === handleId
         const isActive = activeDragId === handleId
         const stroke = palette.endpointHandleStroke
@@ -2834,7 +3007,12 @@ export const InteractiveGeometry = memo(function InteractiveGeometry({
         return (
           <g
             key={keyHint}
-            onClick={(e) => e.stopPropagation()}
+            onClick={(event) => {
+              event.stopPropagation()
+              if (!isAction) return
+              event.preventDefault()
+              onHandleDoubleClick(g.affordance, g.payload, event)
+            }}
             onPointerEnter={() => onHandleHoverChange(handleId)}
             onPointerLeave={() => onHandleHoverChange(null)}
           >
@@ -2891,9 +3069,17 @@ export const InteractiveGeometry = memo(function InteractiveGeometry({
               cx={g.point[0]}
               cy={g.point[1]}
               fill="transparent"
-              onPointerDown={(e) =>
-                onHandlePointerDown(g.affordance, g.payload, e as ReactPointerEvent<SVGGElement>)
-              }
+              onPointerDown={(event) => {
+                if (isAction) {
+                  event.stopPropagation()
+                  return
+                }
+                onHandlePointerDown(
+                  g.affordance,
+                  g.payload,
+                  event as ReactPointerEvent<SVGGElement>,
+                )
+              }}
               pointerEvents="all"
               r={radius + unitsPerPixel * 2}
               stroke="transparent"
@@ -3142,12 +3328,15 @@ export function isFloorplanNodeVisible(node: AnyNode, liveOverride?: LiveNodeOve
   return (node as { visible?: boolean }).visible !== false
 }
 
-function isFloorplanHierarchyVisible(
+export function isFloorplanHierarchyVisible(
   node: AnyNode,
   nodes: Record<string, AnyNode>,
   liveOverrides: Map<string, LiveNodeOverrides>,
   rootId: AnyNodeId,
 ): boolean {
+  const root = nodes[rootId]
+  if (root && !isFloorplanNodeVisible(root, liveOverrides.get(root.id))) return false
+
   let current: AnyNode | undefined = node
   const seen = new Set<AnyNodeId>()
   while (current) {
@@ -3426,7 +3615,9 @@ function nodeDepsEqual(a: NodeDeps, b: NodeDeps): boolean {
     'moving',
     'liveOverride',
     'palette',
+    'unitFocus',
     'siblingEpoch',
+    'ctxOverrides',
     'committedNodes',
     'dependencyNodes',
     'interactiveElevators',