* sync: port 2D editing features from monorepo (v0.3.0) ## New Features ### Floorplan Panel (7.5K LOC) - Full 2D editing interface with wall drawing, measurement, and unit display - Interactive floorplan view with pan/zoom, grid snapping - Wall thickness visualization, door/window placement - Zone and slab polygon editing - Guide image overlay support - Metric/imperial unit toggle ### Command Palette Overhaul - Complete rewrite with new command registry system - Keyboard shortcuts UI with ShortcutToken component - Editor-specific commands (floorplan, measurements, camera focus) - Improved search and action organization ### Wall Measurements - Real-time wall length labels in 3D view - Metric/imperial conversion - Wall measurement UI component ### Enhanced Tools - Wall drafting utilities (grid snapping, validation) - Node action menu for quick operations - Improved polygon editing for zones/slabs/sites - Roof segment panel for granular roof control ## Package Changes ### @pascal-app/core@0.3.0 - New wall-footprint.ts: 2D wall footprint calculation - Wall mitering exports for floorplan view - camera-controls:focus event - Space detection undo pause/resume - Mark sibling nodes dirty on deletion (miter recalc) ### @pascal-app/viewer@0.3.0 - ErrorBoundary component for robust item rendering - Broken item fallback UI - Wall renderer: mark dirty on mount - Ground occluder: only lowest level punches through - Unit state (metric/imperial) in viewer store ### @pascal-app/editor@0.1.0 - 48 file changes (16 new, 32 modified) - New stores: useCommandRegistry, usePaletteViewRegistry - Tree node drag-and-drop system - Level selection utilities - Enhanced scene graph operations ## Apps/Editor - GeistPixelSquare font for pixel-perfect UI - Blueprint icon asset - Updated layout and globals for font support ## Security - Zero AI imports or internal package refs - All monorepo-specific code excluded - Clean audit: no API keys or secrets ## Testing - Security audit passed ✅ - All AI/internal code excluded ✅ - Version bumps applied ✅ 79 files modified, 16 files added ~2600 insertions, ~1400 deletions * fix: lint cleanup — suppress intentional dep warnings, fix missing dep, remove stale ignores - Add biome-ignore for 3 intentional useEffect reset patterns (levelId, selectedGuide, selectedId) - Fix actual missing dependency: currentBuildingId in handleSiteEditShortcutSelect callback - Remove 3 stale biome-ignore comments in r3f.d.ts (rule not active) Build and lint pass clean. * fix: type errors — polygon area guards, selection cast, readonly keywords, door guard - ceiling-panel, slab-panel, ceiling-tree-node, slab-tree-node, zone-tree-node: guard polygon[i]/polygon[j] array access before arithmetic (TS2532) - scene.ts: introduce toViewerSelection() helper to cast persisted string IDs to branded template literal types expected by useViewer.setSelection (TS2345) - door-panel: guard early return when node is undefined in setSegmentHeightRatio (TS18048) - editor-commands: remove 'as const' from inline command object, keywords is mutable string[] (TS2322) All type checks pass. Build and lint clean. --------- Co-authored-by: Anton Pascal <anton-pascal@users.noreply.github.com>
222 lines
7.6 KiB
TypeScript
222 lines
7.6 KiB
TypeScript
'use client'
|
|
|
|
import { type AnyNode, type SlabNode, useScene } from '@pascal-app/core'
|
|
import { useViewer } from '@pascal-app/viewer'
|
|
import { Edit, Plus, Trash2 } from 'lucide-react'
|
|
import { useCallback, useEffect } from 'react'
|
|
import useEditor from '../../../store/use-editor'
|
|
import { ActionButton, ActionGroup } from '../controls/action-button'
|
|
import { PanelSection } from '../controls/panel-section'
|
|
import { SliderControl } from '../controls/slider-control'
|
|
import { PanelWrapper } from './panel-wrapper'
|
|
|
|
export function SlabPanel() {
|
|
const selectedIds = useViewer((s) => s.selection.selectedIds)
|
|
const setSelection = useViewer((s) => s.setSelection)
|
|
const nodes = useScene((s) => s.nodes)
|
|
const updateNode = useScene((s) => s.updateNode)
|
|
const editingHole = useEditor((s) => s.editingHole)
|
|
const setEditingHole = useEditor((s) => s.setEditingHole)
|
|
|
|
const selectedId = selectedIds[0]
|
|
const node = selectedId ? (nodes[selectedId as AnyNode['id']] as SlabNode | undefined) : undefined
|
|
|
|
const handleUpdate = useCallback(
|
|
(updates: Partial<SlabNode>) => {
|
|
if (!selectedId) return
|
|
updateNode(selectedId as AnyNode['id'], updates)
|
|
},
|
|
[selectedId, updateNode],
|
|
)
|
|
|
|
const handleClose = useCallback(() => {
|
|
setSelection({ selectedIds: [] })
|
|
setEditingHole(null)
|
|
}, [setSelection, setEditingHole])
|
|
|
|
useEffect(() => {
|
|
if (!node) {
|
|
setEditingHole(null)
|
|
}
|
|
}, [node, setEditingHole])
|
|
|
|
useEffect(() => {
|
|
return () => {
|
|
setEditingHole(null)
|
|
}
|
|
}, [setEditingHole])
|
|
|
|
const handleAddHole = useCallback(() => {
|
|
if (!(node && selectedId)) return
|
|
|
|
const polygon = node.polygon
|
|
let cx = 0
|
|
let cz = 0
|
|
for (const [x, z] of polygon) {
|
|
cx += x
|
|
cz += z
|
|
}
|
|
cx /= polygon.length
|
|
cz /= polygon.length
|
|
|
|
const holeSize = 0.5
|
|
const newHole: Array<[number, number]> = [
|
|
[cx - holeSize, cz - holeSize],
|
|
[cx + holeSize, cz - holeSize],
|
|
[cx + holeSize, cz + holeSize],
|
|
[cx - holeSize, cz + holeSize],
|
|
]
|
|
const currentHoles = node?.holes || []
|
|
handleUpdate({ holes: [...currentHoles, newHole] })
|
|
setEditingHole({ nodeId: selectedId, holeIndex: currentHoles.length })
|
|
}, [node, selectedId, handleUpdate, setEditingHole])
|
|
|
|
const handleEditHole = useCallback(
|
|
(index: number) => {
|
|
if (!selectedId) return
|
|
setEditingHole({ nodeId: selectedId, holeIndex: index })
|
|
},
|
|
[selectedId, setEditingHole],
|
|
)
|
|
|
|
const handleDeleteHole = useCallback(
|
|
(index: number) => {
|
|
if (!selectedId) return
|
|
const currentHoles = node?.holes || []
|
|
const newHoles = currentHoles.filter((_, i) => i !== index)
|
|
handleUpdate({ holes: newHoles })
|
|
if (editingHole?.nodeId === selectedId && editingHole?.holeIndex === index) {
|
|
setEditingHole(null)
|
|
}
|
|
},
|
|
[selectedId, node?.holes, handleUpdate, editingHole, setEditingHole],
|
|
)
|
|
|
|
if (!node || node.type !== 'slab' || selectedIds.length !== 1) return null
|
|
|
|
const calculateArea = (polygon: Array<[number, number]>): number => {
|
|
if (polygon.length < 3) return 0
|
|
let area = 0
|
|
const n = polygon.length
|
|
for (let i = 0; i < n; i++) {
|
|
const j = (i + 1) % n
|
|
const pi = polygon[i]
|
|
const pj = polygon[j]
|
|
if (pi && pj) {
|
|
area += pi[0] * pj[1]
|
|
area -= pj[0] * pi[1]
|
|
}
|
|
}
|
|
return Math.abs(area) / 2
|
|
}
|
|
|
|
const area = calculateArea(node.polygon)
|
|
|
|
return (
|
|
<PanelWrapper
|
|
icon="/icons/floor.png"
|
|
onClose={handleClose}
|
|
title={node.name || 'Slab'}
|
|
width={320}
|
|
>
|
|
<PanelSection title="Elevation">
|
|
<SliderControl
|
|
label="Height"
|
|
max={1}
|
|
min={-1}
|
|
onChange={(v) => handleUpdate({ elevation: v })}
|
|
precision={3}
|
|
step={0.01}
|
|
unit="m"
|
|
value={Math.round(node.elevation * 1000) / 1000}
|
|
/>
|
|
|
|
<div className="mt-2 grid grid-cols-2 gap-1.5 px-1 pb-1">
|
|
<ActionButton label="Sunken (-15cm)" onClick={() => handleUpdate({ elevation: -0.15 })} />
|
|
<ActionButton label="Ground (0m)" onClick={() => handleUpdate({ elevation: 0 })} />
|
|
<ActionButton label="Raised (+5cm)" onClick={() => handleUpdate({ elevation: 0.05 })} />
|
|
<ActionButton label="Step (+15cm)" onClick={() => handleUpdate({ elevation: 0.15 })} />
|
|
</div>
|
|
</PanelSection>
|
|
|
|
<PanelSection title="Info">
|
|
<div className="flex items-center justify-between px-2 py-1 text-muted-foreground text-sm">
|
|
<span>Area</span>
|
|
<span className="font-mono text-white">{area.toFixed(2)} m²</span>
|
|
</div>
|
|
</PanelSection>
|
|
|
|
<PanelSection title="Holes">
|
|
{node.holes && node.holes.length > 0 ? (
|
|
<div className="flex flex-col gap-1 pb-2">
|
|
{node.holes.map((hole, index) => {
|
|
const holeArea = calculateArea(hole)
|
|
const isEditing =
|
|
editingHole?.nodeId === selectedId && editingHole?.holeIndex === index
|
|
return (
|
|
<div
|
|
className={`flex items-center justify-between rounded-lg border p-2 transition-colors ${
|
|
isEditing
|
|
? 'border-primary/50 bg-primary/10'
|
|
: 'border-transparent hover:bg-accent/30'
|
|
}`}
|
|
key={index}
|
|
>
|
|
<div className="min-w-0 flex-1">
|
|
<p
|
|
className={`font-medium text-xs ${isEditing ? 'text-primary' : 'text-white'}`}
|
|
>
|
|
Hole {index + 1} {isEditing && '(Editing)'}
|
|
</p>
|
|
<p className="text-[10px] text-muted-foreground">
|
|
{holeArea.toFixed(2)} m² · {hole.length} pts
|
|
</p>
|
|
</div>
|
|
<div className="flex items-center gap-1">
|
|
{isEditing ? (
|
|
<ActionButton
|
|
className="h-7 bg-primary text-primary-foreground hover:bg-primary/90"
|
|
label="Done"
|
|
onClick={() => setEditingHole(null)}
|
|
/>
|
|
) : (
|
|
<>
|
|
<button
|
|
className="flex h-7 w-7 items-center justify-center rounded-md bg-[#2C2C2E] text-muted-foreground hover:bg-[#3e3e3e] hover:text-foreground"
|
|
onClick={() => handleEditHole(index)}
|
|
type="button"
|
|
>
|
|
<Edit className="h-3.5 w-3.5" />
|
|
</button>
|
|
<button
|
|
className="flex h-7 w-7 items-center justify-center rounded-md bg-red-500/10 text-red-400 hover:bg-red-500/20 hover:text-red-300"
|
|
onClick={() => handleDeleteHole(index)}
|
|
type="button"
|
|
>
|
|
<Trash2 className="h-3.5 w-3.5" />
|
|
</button>
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)
|
|
})}
|
|
</div>
|
|
) : (
|
|
<div className="px-2 py-3 text-center text-muted-foreground text-xs">No holes</div>
|
|
)}
|
|
|
|
<div className="px-1 pt-1 pb-1">
|
|
<ActionButton
|
|
className="w-full"
|
|
disabled={editingHole?.nodeId === selectedId}
|
|
icon={<Plus className="h-3.5 w-3.5" />}
|
|
label="Add Hole"
|
|
onClick={handleAddHole}
|
|
/>
|
|
</div>
|
|
</PanelSection>
|
|
</PanelWrapper>
|
|
)
|
|
}
|