@pascal-app/editor 1.0.3 → 1.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +106 -0
- package/package.json +42 -38
- package/src/components/editor/__bench__/room-label-placement.bench.ts +108 -0
- package/src/components/editor/action-menu-button.tsx +83 -0
- package/src/components/editor/bake-thumbnail.tsx +307 -5
- package/src/components/editor/capture-level-picker.tsx +72 -0
- package/src/components/editor/construction-reveal-audio.test.tsx +150 -0
- package/src/components/editor/construction-reveal-audio.tsx +40 -0
- package/src/components/editor/custom-camera-controls.tsx +275 -57
- package/src/components/editor/delete-confirmation-dialog.tsx +297 -7
- package/src/components/editor/duplicate-node.ts +244 -0
- package/src/components/editor/editor-layout-mobile.tsx +37 -26
- package/src/components/editor/editor-layout-v2.tsx +132 -59
- package/src/components/editor/export-manager.tsx +47 -26
- package/src/components/editor/first-person/build-collider-world.test.ts +320 -0
- package/src/components/editor/first-person/build-collider-world.ts +28 -7
- package/src/components/editor/first-person/ground-holes.test.ts +128 -0
- package/src/components/editor/first-person/ground-holes.ts +130 -0
- package/src/components/editor/first-person/mechanism-targets.test.ts +162 -0
- package/src/components/editor/first-person/mechanism-targets.ts +88 -0
- package/src/components/editor/first-person-controls.tsx +220 -9
- package/src/components/editor/floating-action-menu.tsx +63 -207
- package/src/components/editor/floor-aware-camera-controls.test.ts +466 -0
- package/src/components/editor/floor-aware-camera-controls.ts +324 -0
- package/src/components/editor/floor-openings-overlay.tsx +243 -0
- package/src/components/editor/floor-region-controls.tsx +846 -0
- package/src/components/editor/floor-region-webgpu-materials.test.ts +12 -0
- package/src/components/editor/floor-surface.test.ts +165 -0
- package/src/components/editor/floor-surface.ts +182 -0
- package/src/components/editor/floorplan-background-selection.test.ts +11 -2
- package/src/components/editor/floorplan-background-selection.ts +1 -3
- package/src/components/editor/floorplan-mode-coordinator.tsx +2 -2
- package/src/components/editor/floorplan-panel.tsx +414 -363
- package/src/components/editor/follow-pascal.test.tsx +912 -0
- package/src/components/editor/follow-pascal.tsx +354 -0
- package/src/components/editor/footprint-height-handle.tsx +204 -0
- package/src/components/editor/group-actions.ts +56 -2
- package/src/components/editor/group-move-3d.ts +2 -0
- package/src/components/editor/group-rotate-handle.tsx +2 -0
- package/src/components/editor/group-transform-shared.test.ts +460 -0
- package/src/components/editor/handles/handle-hit-priority.test.tsx +63 -0
- package/src/components/editor/handles/handle-hit-priority.tsx +37 -0
- package/src/components/editor/handles/swallow-next-click.test.ts +28 -0
- package/src/components/editor/handles/use-handle-drag.ts +269 -197
- package/src/components/editor/index.tsx +409 -197
- package/src/components/editor/join-walls-pill.tsx +44 -0
- package/src/components/editor/node-action-menu.tsx +68 -70
- package/src/components/editor/node-arrow-handles.tsx +25 -6
- package/src/components/editor/open-wall-ends-3d-layer.tsx +273 -0
- package/src/components/editor/open-wall-ends-hint.tsx +89 -0
- package/src/components/editor/quick-measurement-hud.tsx +3 -2
- package/src/components/editor/registry-action-contributions.test.tsx +63 -0
- package/src/components/editor/registry-action-contributions.tsx +80 -1
- package/src/components/editor/riser-diagram-panel.tsx +14 -7
- package/src/components/editor/room-controls.tsx +847 -0
- package/src/components/editor/room-floor-highlight.tsx +128 -0
- package/src/components/editor/room-handles-2d.tsx +354 -0
- package/src/components/editor/room-handles.tsx +675 -0
- package/src/components/editor/room-highlight.tsx +233 -0
- package/src/components/editor/room-labels.test.ts +850 -0
- package/src/components/editor/room-labels.tsx +1890 -0
- package/src/components/editor/room-transform-ghost.tsx +256 -0
- package/src/components/editor/room-webgpu-materials.test.ts +27 -0
- package/src/components/editor/selection-manager.tsx +474 -419
- package/src/components/editor/slab-hole-highlights.tsx +5 -2
- package/src/components/editor/snapshot-capture-overlay.tsx +7 -2
- package/src/components/editor/snapshot-capture.test.ts +119 -60
- package/src/components/editor/snapshot-capture.ts +36 -5
- package/src/components/editor/thumbnail-generator.test.ts +654 -0
- package/src/components/editor/thumbnail-generator.tsx +1103 -223
- package/src/components/editor/use-floorplan-background-placement.ts +34 -12
- package/src/components/editor/vector-edge-extractor.tsx +121 -0
- package/src/components/editor/views/host-view.tsx +61 -0
- package/src/components/editor/views/plugins-view.tsx +663 -0
- package/src/components/editor/views/scene-region.tsx +59 -0
- package/src/components/editor/views/use-editor-views.ts +57 -0
- package/src/components/editor/views/view-bar.test.tsx +54 -0
- package/src/components/editor/views/view-bar.tsx +343 -0
- package/src/components/editor/wall-justification.test.ts +140 -0
- package/src/components/editor/wall-move-side-handles.tsx +43 -142
- package/src/components/editor/wall-push-arrow.tsx +92 -0
- package/src/components/editor/wall-region-handles.tsx +509 -0
- package/src/components/editor/wall-snap-beacon-layer.tsx +8 -4
- package/src/components/editor-2d/floorplan-cursor-indicator-overlay.tsx +8 -4
- package/src/components/editor-2d/floorplan-group-move.tsx +3 -0
- package/src/components/editor-2d/floorplan-open-wall-ends-layer.test.tsx +86 -0
- package/src/components/editor-2d/floorplan-open-wall-ends-layer.tsx +290 -0
- package/src/components/editor-2d/floorplan-registered-tool-layer.tsx +2 -2
- package/src/components/editor-2d/floorplan-registry-action-menu.tsx +11 -1
- package/src/components/editor-2d/floorplan-registry-move-overlay.tsx +116 -106
- package/src/components/editor-2d/renderers/floorplan-dimension-edit-overlay.test.ts +156 -0
- package/src/components/editor-2d/renderers/floorplan-dimension-edit-overlay.tsx +278 -0
- package/src/components/editor-2d/renderers/floorplan-dimension-renderer.tsx +77 -0
- package/src/components/editor-2d/renderers/{floorplan-draft-wall-measurement.tsx → floorplan-draft-measurement.tsx} +8 -8
- package/src/components/editor-2d/renderers/floorplan-geometry-renderer.tsx +4 -1
- package/src/components/editor-2d/renderers/floorplan-registry-layer.test.ts +38 -8
- package/src/components/editor-2d/renderers/floorplan-registry-layer.tsx +319 -233
- package/src/components/editor-2d/renderers/floorplan-reveal.test.tsx +254 -0
- package/src/components/editor-2d/renderers/floorplan-reveal.ts +141 -0
- package/src/components/editor-2d/svg-paths.ts +12 -15
- package/src/components/point-ask/bubble.tsx +538 -0
- package/src/components/point-ask/hover-chip.tsx +91 -0
- package/src/components/point-ask/mode-pill.tsx +92 -0
- package/src/components/point-ask/optional-motion.ts +22 -0
- package/src/components/point-ask/outline-corners.tsx +93 -0
- package/src/components/point-ask/pins.tsx +711 -0
- package/src/components/point-ask/point-ask-layer.tsx +83 -0
- package/src/components/point-ask/point-ask-styles.ts +105 -0
- package/src/components/point-ask/region-marquee-styles.ts +15 -0
- package/src/components/point-ask/region-marquee.tsx +64 -0
- package/src/components/procedural-items/inspector.tsx +40 -15
- package/src/components/systems/ceiling/ceiling-bracket-batch.test.ts +12 -2
- package/src/components/systems/ceiling/ceiling-selection-affordance-system.test.ts +97 -14
- package/src/components/systems/ceiling/ceiling-selection-affordance-system.tsx +18 -18
- package/src/components/systems/roof/roof-edit-system.tsx +1 -0
- package/src/components/systems/zone/zone-system.test.ts +47 -0
- package/src/components/systems/zone/zone-system.tsx +29 -68
- package/src/components/tools/distribution/connection-compatibility.test.ts +34 -0
- package/src/components/tools/distribution/connection-compatibility.ts +43 -0
- package/src/components/tools/distribution/distribution-public.ts +9 -0
- package/src/components/tools/distribution/distribution-run-contract.test.ts +26 -0
- package/src/components/tools/distribution/distribution-run-contract.ts +94 -0
- package/src/components/tools/distribution/distribution-run-tool.test.ts +241 -0
- package/src/components/tools/distribution/distribution-run-tool.test.tsx +125 -0
- package/src/components/tools/distribution/distribution-run-tool.tsx +1323 -0
- package/src/components/tools/distribution/draw-alignment.ts +35 -0
- package/src/components/tools/distribution/ports.test.ts +56 -0
- package/src/components/tools/distribution/ports.ts +378 -0
- package/src/components/tools/distribution/run-cursor.test.ts +135 -0
- package/src/components/tools/distribution/run-cursor.ts +36 -0
- package/src/components/tools/distribution/run-direction-feedback.test.ts +60 -0
- package/src/components/tools/distribution/run-direction-feedback.tsx +251 -0
- package/src/components/tools/distribution/run-port-snap.test.ts +79 -0
- package/src/components/tools/distribution/run-port-snap.ts +25 -0
- package/src/components/tools/distribution/run-screen-direction.test.ts +23 -0
- package/src/components/tools/distribution/run-screen-direction.ts +30 -0
- package/src/components/tools/elevator/elevator-tool.tsx +3 -6
- package/src/components/tools/elevator/move-elevator-tool.tsx +2 -3
- package/src/components/tools/item/item-surface-strategy-resolver.test.ts +67 -68
- package/src/components/tools/item/placement-history.test.tsx +512 -0
- package/src/components/tools/item/placement-strategies.test.ts +46 -1
- package/src/components/tools/item/placement-strategies.ts +11 -10
- package/src/components/tools/item/shelf-surface-strategy-resolver.test.ts +56 -56
- package/src/components/tools/item/use-draft-node.test.tsx +432 -1
- package/src/components/tools/item/use-draft-node.ts +166 -95
- package/src/components/tools/item/use-placement-coordinator.tsx +148 -95
- package/src/components/tools/paint-region/use-paint-tint.ts +37 -0
- package/src/components/tools/paint-region/wall-paint-region-tool.tsx +466 -0
- package/src/components/tools/registry/item-surface-move.test.ts +62 -63
- package/src/components/tools/registry/item-surface-move.ts +2 -0
- package/src/components/tools/registry/item-surface-resolver.test.ts +26 -26
- package/src/components/tools/registry/move-registry-node-tool.test.ts +268 -1
- package/src/components/tools/registry/move-registry-node-tool.tsx +66 -30
- package/src/components/tools/select/box-select-tool.tsx +2 -12
- package/src/components/tools/select/plane-box-select-tool.test.tsx +79 -0
- package/src/components/tools/select/plane-box-select-tool.tsx +35 -22
- package/src/components/tools/select/select-candidates.test.ts +37 -4
- package/src/components/tools/select/select-candidates.ts +15 -11
- package/src/components/tools/shared/cursor-sphere.tsx +36 -12
- package/src/components/tools/site/site-boundary-editor.tsx +1 -2
- package/src/components/tools/tool-manager.tsx +59 -24
- package/src/components/tools/wall/wall-drafting.test.ts +175 -47
- package/src/components/tools/zone/zone-tool.tsx +4 -12
- package/src/components/ui/action-menu/action-button.tsx +9 -1
- package/src/components/ui/action-menu/camera-actions.tsx +9 -4
- package/src/components/ui/action-menu/control-modes.tsx +15 -42
- package/src/components/ui/action-menu/follow-pascal-pill.tsx +32 -0
- package/src/components/ui/action-menu/follow-pascal-toggle.tsx +36 -0
- package/src/components/ui/action-menu/index.tsx +56 -33
- package/src/components/ui/action-menu/measurement-control.tsx +14 -19
- package/src/components/ui/action-menu/placement.ts +20 -0
- package/src/components/ui/action-menu/point-ask-button.tsx +52 -0
- package/src/components/ui/action-menu/view-toggles.tsx +47 -42
- package/src/components/ui/build-panel/build-panel.tsx +242 -0
- package/src/components/ui/command-palette/editor-commands.tsx +7 -42
- package/src/components/ui/command-palette/index.tsx +50 -39
- package/src/components/ui/command-palette/ranked-groups.test.ts +31 -0
- package/src/components/ui/controls/action-button.tsx +5 -2
- package/src/components/ui/controls/finish-swatch.tsx +110 -0
- package/src/components/ui/controls/material-paint-panel.tsx +97 -26
- package/src/components/ui/controls/material-picker.tsx +4 -1
- package/src/components/ui/controls/metric-control.tsx +1 -1
- package/src/components/ui/controls/scene-material-list.tsx +4 -32
- package/src/components/ui/controls/segmented-control.tsx +21 -8
- package/src/components/ui/controls/select-control.tsx +65 -0
- package/src/components/ui/controls/slider-control.tsx +1 -1
- package/src/components/ui/controls/toggle-control.tsx +3 -3
- package/src/components/ui/controls/tool-options-panel.tsx +1 -1
- package/src/components/ui/floating-level-selector.tsx +159 -59
- package/src/components/ui/helpers/building-helper.tsx +4 -1
- package/src/components/ui/helpers/contextual-helper-panel.tsx +181 -72
- package/src/components/ui/helpers/helper-manager.test.tsx +121 -0
- package/src/components/ui/helpers/helper-manager.tsx +331 -14
- package/src/components/ui/helpers/item-helper.tsx +17 -1
- package/src/components/ui/helpers/registered-tool-helper.tsx +8 -1
- package/src/components/ui/icon-ref.tsx +45 -1
- package/src/components/ui/level-duplicate-dialog.tsx +1 -1
- package/src/components/ui/node-icon-image.tsx +16 -0
- package/src/components/ui/panels/collections/collections-popover.tsx +28 -22
- package/src/components/ui/panels/floor-foundation-panel.tsx +551 -0
- package/src/components/ui/panels/floor-opening-panel.tsx +143 -0
- package/src/components/ui/panels/mobile-panel-sheet.tsx +4 -4
- package/src/components/ui/panels/mobile-selection-bar.tsx +8 -5
- package/src/components/ui/panels/multi-field-value.test.ts +26 -3
- package/src/components/ui/panels/multi-field-value.ts +6 -3
- package/src/components/ui/panels/multi-parametric-inspector.tsx +52 -2
- package/src/components/ui/panels/multi-selection-panel.tsx +161 -5
- package/src/components/ui/panels/node-display.ts +8 -3
- package/src/components/ui/panels/panel-manager.tsx +103 -68
- package/src/components/ui/panels/panel-wrapper.tsx +130 -62
- package/src/components/ui/panels/parametric-field-control.tsx +3 -3
- package/src/components/ui/panels/parametric-inspector.tsx +7 -7
- package/src/components/ui/panels/reference-panel.tsx +2 -3
- package/src/components/ui/panels/room-construction-rows.tsx +774 -0
- package/src/components/ui/panels/room-name-options.test.ts +55 -0
- package/src/components/ui/panels/room-name-options.ts +47 -0
- package/src/components/ui/panels/room-openings-field.tsx +110 -0
- package/src/components/ui/panels/room-panel.tsx +790 -0
- package/src/components/ui/panels/shape-choice.tsx +58 -0
- package/src/components/ui/panels/wall-region-list.tsx +109 -0
- package/src/components/ui/primitives/badge.tsx +8 -0
- package/src/components/ui/primitives/color-dot.tsx +36 -24
- package/src/components/ui/primitives/sidebar.tsx +3 -1
- package/src/components/ui/right-stack.test.ts +29 -0
- package/src/components/ui/right-stack.tsx +164 -0
- package/src/components/ui/sidebar/app-sidebar.tsx +1 -1
- package/src/components/ui/sidebar/icon-rail.tsx +8 -3
- package/src/components/ui/sidebar/panels/items-panel/function-tree-panel.tsx +1 -1
- package/src/components/ui/sidebar/panels/items-panel/index.tsx +6 -6
- package/src/components/ui/sidebar/panels/settings-panel/animation-speed-setting.tsx +40 -0
- package/src/components/ui/sidebar/panels/settings-panel/audio-settings-dialog.tsx +7 -8
- package/src/components/ui/sidebar/panels/settings-panel/construction-animation-setting.test.tsx +170 -0
- package/src/components/ui/sidebar/panels/settings-panel/construction-animation-setting.tsx +92 -0
- package/src/components/ui/sidebar/panels/settings-panel/index.tsx +138 -27
- package/src/components/ui/sidebar/panels/settings-panel/interface-theme.test.tsx +20 -0
- package/src/components/ui/sidebar/panels/settings-panel/keyboard-shortcuts-dialog.tsx +5 -5
- package/src/components/ui/sidebar/panels/settings-panel/print-export-button.tsx +4 -10
- package/src/components/ui/sidebar/panels/site-panel/building-tree-node.tsx +3 -11
- package/src/components/ui/sidebar/panels/site-panel/ceiling-tree-node.tsx +4 -4
- package/src/components/ui/sidebar/panels/site-panel/chimney-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/collection-tree-node.tsx +197 -0
- package/src/components/ui/sidebar/panels/site-panel/column-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/door-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/dormer-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/elevator-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/fence-tree-node.tsx +24 -11
- package/src/components/ui/sidebar/panels/site-panel/gutter-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/index.tsx +181 -223
- package/src/components/ui/sidebar/panels/site-panel/inline-rename-input.tsx +30 -8
- package/src/components/ui/sidebar/panels/site-panel/item-tree-node.tsx +1 -3
- package/src/components/ui/sidebar/panels/site-panel/level-tree-node.tsx +4 -1
- package/src/components/ui/sidebar/panels/site-panel/registry-tree-node.tsx +1 -3
- package/src/components/ui/sidebar/panels/site-panel/roof-tree-node.tsx +1 -4
- package/src/components/ui/sidebar/panels/site-panel/shelf-tree-node.tsx +1 -3
- package/src/components/ui/sidebar/panels/site-panel/slab-tree-node.tsx +21 -13
- package/src/components/ui/sidebar/panels/site-panel/solar-panel-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/spawn-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/stair-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/tree-node.tsx +13 -37
- package/src/components/ui/sidebar/panels/site-panel/unit-tree-node.tsx +2 -3
- package/src/components/ui/sidebar/panels/site-panel/wall-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/window-tree-node.tsx +1 -5
- package/src/components/ui/sidebar/panels/site-panel/zone-tree-node.tsx +9 -4
- package/src/components/ui/sidebar/panels/zone-panel/index.tsx +2 -4
- package/src/components/ui/sidebar/tab-bar.tsx +14 -4
- package/src/components/ui/sidebar/use-plugin-panels.tsx +15 -5
- package/src/components/viewer/floorplan-compass-button.tsx +9 -1
- package/src/components/viewer/floorplan-preview.tsx +5 -6
- package/src/components/viewer/viewer-controls-bar.tsx +18 -6
- package/src/components/viewer/viewer-hover-label.tsx +34 -0
- package/src/components/viewer/viewer-rooms.tsx +191 -0
- package/src/components/viewer/viewer-scene-header.tsx +181 -145
- package/src/components/viewer/viewer-selection-manager.tsx +124 -0
- package/src/components/viewer/viewer-stage.tsx +2 -2
- package/src/components/viewer-zone-system.tsx +3 -8
- package/src/hooks/use-auto-save.integration.test.tsx +215 -43
- package/src/hooks/use-auto-save.ts +60 -9
- package/src/hooks/use-ceiling-events.test.ts +123 -118
- package/src/hooks/use-grid-events.test.ts +105 -105
- package/src/hooks/use-keyboard.test.ts +243 -19
- package/src/hooks/use-keyboard.ts +118 -83
- package/src/hooks/use-open-wall-ends.test.ts +99 -0
- package/src/hooks/use-open-wall-ends.ts +238 -0
- package/src/hooks/use-placement-notice.test.ts +71 -0
- package/src/hooks/use-placement-notice.ts +73 -0
- package/src/hooks/use-selected-room.ts +143 -0
- package/src/index.tsx +312 -58
- package/src/lib/__fixtures__/owner-victor-seattle-parking.json +1 -0
- package/src/lib/__fixtures__/owner-villa-aurelia-basement.json +1 -0
- package/src/lib/add-storey.test.ts +177 -0
- package/src/lib/add-storey.ts +59 -0
- package/src/lib/below-grade.test.tsx +171 -0
- package/src/lib/below-grade.ts +133 -0
- package/src/lib/camera-facing.test.ts +24 -0
- package/src/lib/camera-facing.ts +24 -0
- package/src/lib/ceiling-edit-session.test.ts +321 -0
- package/src/lib/ceiling-edit-session.ts +206 -0
- package/src/lib/ceiling-region-session.test.ts +179 -0
- package/src/lib/continuation.test.ts +19 -1
- package/src/lib/continuation.ts +25 -4
- package/src/lib/direct-manipulation.ts +2 -0
- package/src/lib/door-interaction.ts +14 -0
- package/src/lib/download-project-file.ts +17 -0
- package/src/lib/editor-level-display.test.ts +96 -0
- package/src/lib/editor-level-display.ts +55 -0
- package/src/lib/editor-views.ts +178 -0
- package/src/lib/export-geometry-wait.test.ts +90 -0
- package/src/lib/export-texture-utils.ts +2 -4
- package/src/lib/floor-edit-session.ts +153 -0
- package/src/lib/floor-footprints.test.ts +563 -0
- package/src/lib/floor-footprints.ts +395 -0
- package/src/lib/floor-foundation-support.test.ts +284 -0
- package/src/lib/floor-opening-draft.ts +218 -0
- package/src/lib/floor-openings.test.ts +216 -0
- package/src/lib/floor-region-geometry.ts +191 -0
- package/src/lib/floor-region-session.test.ts +485 -0
- package/src/lib/floor-region-session.ts +589 -0
- package/src/lib/floor-region-snap.ts +101 -0
- package/src/lib/floor-step-hover.test.ts +32 -0
- package/src/lib/floorplan/annotation-visibility.ts +17 -0
- package/src/lib/floorplan/dimension-drive.test.ts +360 -0
- package/src/lib/floorplan/dimension-drive.ts +479 -0
- package/src/lib/floorplan/floorplan-export.test.ts +12 -8
- package/src/lib/floorplan/floorplan-export.tsx +32 -8
- package/src/lib/floorplan/floorplan-extension.ts +32 -0
- package/src/lib/floorplan/floorplan-mode.test.ts +4 -0
- package/src/lib/floorplan/floorplan-mode.ts +2 -0
- package/src/lib/floorplan/floorplan-pdfkit-document.ts +363 -27
- package/src/lib/floorplan/floorplan-pdfkit-renderer.test.ts +177 -8
- package/src/lib/floorplan/floorplan-pdfkit-renderer.ts +60 -25
- package/src/lib/floorplan/floorplan-plugin-install.test.tsx +138 -0
- package/src/lib/floorplan/floorplan-readonly.ts +6 -0
- package/src/lib/floorplan/geometry.ts +13 -6
- package/src/lib/floorplan/index.ts +0 -9
- package/src/lib/floorplan/items.ts +5 -2
- package/src/lib/floorplan/marks.test.ts +213 -0
- package/src/lib/floorplan/marks.ts +238 -0
- package/src/lib/floorplan/open-wall-ends.test.ts +268 -0
- package/src/lib/floorplan/open-wall-ends.ts +162 -0
- package/src/lib/floorplan/pdf-fonts/GeistMono-Bold.ttf +0 -0
- package/src/lib/floorplan/pdf-fonts/GeistMono-Regular.ttf +0 -0
- package/src/lib/floorplan/pdf-fonts/LICENSE-GeistMono.txt +92 -0
- package/src/lib/floorplan/pdf-fonts/LICENSE-LiberationSans.txt +102 -0
- package/src/lib/floorplan/pdf-fonts/LiberationSans-Bold.ttf +0 -0
- package/src/lib/floorplan/pdf-fonts/LiberationSans-Regular.ttf +0 -0
- package/src/lib/floorplan/pdfkit-standard-fonts.d.ts +5 -0
- package/src/lib/floorplan/schedules.test.ts +189 -0
- package/src/lib/floorplan/schedules.ts +339 -0
- package/src/lib/floorplan/sheet-export.test.ts +124 -0
- package/src/lib/floorplan/sheet-export.ts +318 -0
- package/src/lib/floorplan/site-plan/build-site-plan-drawing.ts +768 -0
- package/src/lib/floorplan/site-plan/contours.test.ts +43 -0
- package/src/lib/floorplan/site-plan/contributors.ts +97 -0
- package/src/lib/floorplan/site-plan/coverage.ts +230 -0
- package/src/lib/floorplan/site-plan/drawing-type-switch.test.ts +15 -0
- package/src/lib/floorplan/site-plan/drawing-type-switch.tsx +86 -0
- package/src/lib/floorplan/site-plan/front-edge.test.ts +103 -0
- package/src/lib/floorplan/site-plan/front-edge.ts +157 -0
- package/src/lib/floorplan/site-plan/geometry.test.ts +269 -0
- package/src/lib/floorplan/site-plan/geometry.ts +142 -0
- package/src/lib/floorplan/site-plan/index.ts +55 -0
- package/src/lib/floorplan/site-plan/site-annotations.test.ts +483 -0
- package/src/lib/floorplan/site-plan/site-annotations.ts +1084 -0
- package/src/lib/floorplan/site-plan/site-parts.ts +287 -0
- package/src/lib/floorplan/site-plan/site-plan-layer.tsx +138 -0
- package/src/lib/floorplan/site-plan/street-name.test.ts +69 -0
- package/src/lib/floorplan/site-plan/street-name.ts +302 -0
- package/src/lib/floorplan/site-plan/yards.test.ts +70 -0
- package/src/lib/floorplan/types.ts +1 -27
- package/src/lib/follow-pascal-exterior.test-fixture.ts +17 -0
- package/src/lib/follow-pascal-exterior.test.ts +171 -0
- package/src/lib/follow-pascal-exterior.ts +39 -0
- package/src/lib/follow-pascal-presentation.test.ts +203 -0
- package/src/lib/follow-pascal-presentation.ts +129 -0
- package/src/lib/follow-pascal-sight.ts +84 -0
- package/src/lib/follow-pascal-targets.test.ts +406 -0
- package/src/lib/follow-pascal-targets.ts +198 -0
- package/src/lib/follow-pascal.test.ts +350 -0
- package/src/lib/follow-pascal.ts +284 -0
- package/src/lib/fresh-planar-placement.test.ts +148 -0
- package/src/lib/fresh-planar-placement.ts +114 -37
- package/src/lib/geometry-script/author.ts +157 -0
- package/src/lib/geometry-script/client.ts +159 -0
- package/src/lib/geometry-script/finish-scripts.ts +127 -0
- package/src/lib/geometry-script/protocol.ts +13 -0
- package/src/lib/gesture-lifecycle.test.ts +595 -0
- package/src/lib/gesture-lifecycle.ts +290 -0
- package/src/lib/glb-export-zone-holes.test.ts +41 -0
- package/src/lib/glb-export.test.ts +636 -126
- package/src/lib/glb-export.ts +241 -120
- package/src/lib/history.test.ts +18 -7
- package/src/lib/history.ts +7 -0
- package/src/lib/hud-title.ts +109 -0
- package/src/lib/hydration-gated-storage.ts +49 -0
- package/src/lib/ifc-export.test.ts +174 -0
- package/src/lib/ifc-export.ts +201 -0
- package/src/lib/ifc-parts.ts +15 -0
- package/src/lib/inspector-expanded.test.ts +44 -0
- package/src/lib/inspector-expanded.ts +36 -0
- package/src/lib/interaction/scope.ts +22 -0
- package/src/lib/keyboard-pan.test.ts +129 -7
- package/src/lib/keyboard-pan.ts +161 -12
- package/src/lib/level-selection.test.ts +57 -0
- package/src/lib/level-selection.ts +16 -1
- package/src/lib/live-gesture-round-trip.test.ts +360 -0
- package/src/lib/lot/__fixtures__/map-dossier-miami-shores.json +1 -0
- package/src/lib/lot/__fixtures__/map-dossier-stpete.json +1 -0
- package/src/lib/lot/clean-ring.test.ts +187 -0
- package/src/lib/lot/clean-ring.ts +217 -0
- package/src/lib/lot/dossier.test.ts +202 -0
- package/src/lib/lot/dossier.ts +498 -0
- package/src/lib/lot/drop-in.test.ts +326 -0
- package/src/lib/lot/drop-in.ts +392 -0
- package/src/lib/lot/index.ts +43 -0
- package/src/lib/lot/lot-patch.test.ts +340 -0
- package/src/lib/lot/lot-patch.ts +394 -0
- package/src/lib/lot/parcel-provider.ts +43 -0
- package/src/lib/lot/terrain.test.ts +161 -0
- package/src/lib/lot/terrain.ts +266 -0
- package/src/lib/material-catalog-model.ts +3 -1
- package/src/lib/material-paint-panel-model.ts +9 -5
- package/src/lib/material-paint.ts +4 -0
- package/src/lib/measurement-kind.test.ts +6 -8
- package/src/lib/measurements.test.ts +23 -0
- package/src/lib/mezzanine-actions.test.ts +342 -0
- package/src/lib/mezzanine-draft.test.ts +501 -0
- package/src/lib/mezzanine-draft.ts +278 -0
- package/src/lib/mezzanine-messages.ts +26 -0
- package/src/lib/mezzanine-selection.test.ts +207 -0
- package/src/lib/mezzanine-stairs.ts +46 -0
- package/src/lib/model-export.ts +3 -1
- package/src/lib/node-action-movement.ts +17 -6
- package/src/lib/node-display-label.ts +37 -0
- package/src/lib/orbit-floor-clearance.test.ts +201 -0
- package/src/lib/orbit-floor-clearance.ts +154 -0
- package/src/lib/paint-commit-route.test.ts +37 -0
- package/src/lib/paint-commit-route.ts +17 -0
- package/src/lib/paint-eyedropper.test.tsx +165 -0
- package/src/lib/paint-eyedropper.ts +99 -0
- package/src/lib/paint-pass-through.test.ts +122 -0
- package/src/lib/paint-pass-through.ts +78 -0
- package/src/lib/paint-region-hover.ts +25 -0
- package/src/lib/paint-region-mode.ts +154 -0
- package/src/lib/paint-regions.test.ts +166 -0
- package/src/lib/paint-regions.ts +192 -0
- package/src/lib/paint-scope.test.ts +317 -35
- package/src/lib/paint-scope.ts +267 -25
- package/src/lib/panel-rows.ts +21 -0
- package/src/lib/parametric-node-update.ts +16 -7
- package/src/lib/plate-paint-affected.test.ts +300 -0
- package/src/lib/plate-paint-affected.ts +177 -0
- package/src/lib/plugin-chat.ts +65 -0
- package/src/lib/plugin-panels.test.ts +25 -0
- package/src/lib/plugin-panels.ts +94 -0
- package/src/lib/point-ask/__fixtures__/consumer-browser.tsx +76 -0
- package/src/lib/point-ask/__fixtures__/house.ts +81 -0
- package/src/lib/point-ask/ask-created.test.ts +195 -0
- package/src/lib/point-ask/ask-flow.test.ts +380 -0
- package/src/lib/point-ask/build-context.test.ts +173 -0
- package/src/lib/point-ask/build-context.ts +94 -0
- package/src/lib/point-ask/capture-crop.ts +129 -0
- package/src/lib/point-ask/choreography.ts +69 -0
- package/src/lib/point-ask/compare.test.ts +145 -0
- package/src/lib/point-ask/compare.ts +73 -0
- package/src/lib/point-ask/describe-target.test.ts +165 -0
- package/src/lib/point-ask/describe-target.ts +234 -0
- package/src/lib/point-ask/dictation.ts +79 -0
- package/src/lib/point-ask/edge-marker.test.ts +61 -0
- package/src/lib/point-ask/edge-marker.ts +27 -0
- package/src/lib/point-ask/frame-loop.ts +25 -0
- package/src/lib/point-ask/history-marks.test.ts +94 -0
- package/src/lib/point-ask/history-marks.ts +39 -0
- package/src/lib/point-ask/host-api.ts +32 -0
- package/src/lib/point-ask/outline-box.test.ts +30 -0
- package/src/lib/point-ask/outline-box.ts +11 -0
- package/src/lib/point-ask/overlay-metrics.ts +6 -0
- package/src/lib/point-ask/pick.test.ts +220 -0
- package/src/lib/point-ask/pick.ts +121 -0
- package/src/lib/point-ask/pin-machine.test.ts +494 -0
- package/src/lib/point-ask/pin-machine.ts +217 -0
- package/src/lib/point-ask/placement.test.ts +203 -0
- package/src/lib/point-ask/placement.ts +141 -0
- package/src/lib/point-ask/pointer-tracker.ts +34 -0
- package/src/lib/point-ask/projector.ts +83 -0
- package/src/lib/point-ask/region.test.ts +157 -0
- package/src/lib/point-ask/region.ts +136 -0
- package/src/lib/point-ask/retry.test.ts +217 -0
- package/src/lib/point-ask/retry.ts +37 -0
- package/src/lib/point-ask/scene-commit.test.ts +312 -0
- package/src/lib/point-ask/scene-commit.ts +32 -0
- package/src/lib/point-ask/session.ts +1391 -0
- package/src/lib/point-ask/spring-keyframes.test.ts +45 -0
- package/src/lib/point-ask/spring-keyframes.ts +38 -0
- package/src/lib/point-ask/spring.test.ts +63 -0
- package/src/lib/point-ask/spring.ts +107 -0
- package/src/lib/point-ask/suggestions.test.ts +80 -0
- package/src/lib/point-ask/suggestions.ts +125 -0
- package/src/lib/point-ask/target-scope.test.ts +622 -0
- package/src/lib/point-ask/target-scope.ts +338 -0
- package/src/lib/point-ask/types.ts +48 -0
- package/src/lib/portable-export.test.ts +34 -1
- package/src/lib/portable-export.ts +119 -53
- package/src/lib/print-feature-thickness.ts +10 -1
- package/src/lib/print-roof-solids.test.ts +39 -1
- package/src/lib/print-roof-solids.ts +43 -10
- package/src/lib/print-shell-compiler-manifold-core.ts +1 -1
- package/src/lib/print-shell-compiler.ts +1 -0
- package/src/lib/registered-draft-snap.ts +12 -0
- package/src/lib/roof-duplication.ts +10 -2
- package/src/lib/room-assembly-overlay.test.ts +275 -0
- package/src/lib/room-assembly-overlay.ts +265 -0
- package/src/lib/room-built-on.test.ts +379 -0
- package/src/lib/room-built-on.ts +138 -0
- package/src/lib/room-construction-commands.ts +712 -0
- package/src/lib/room-construction.test.ts +746 -0
- package/src/lib/room-construction.ts +385 -0
- package/src/lib/room-controls-phase6.test.ts +630 -0
- package/src/lib/room-divide-session.ts +523 -0
- package/src/lib/room-handle-drag.ts +1068 -0
- package/src/lib/room-name-catalog.test.ts +90 -0
- package/src/lib/room-name-catalog.ts +168 -0
- package/src/lib/room-push-dimensions.test.ts +311 -0
- package/src/lib/room-push-dimensions.ts +251 -0
- package/src/lib/room-selection-commands.ts +62 -0
- package/src/lib/room-selection.test.ts +1017 -0
- package/src/lib/room-selection.ts +417 -0
- package/src/lib/room-structure-commands.ts +94 -0
- package/src/lib/room-structure.test.ts +921 -0
- package/src/lib/room-transform-session.ts +570 -0
- package/src/lib/room-zone-routing.test.ts +294 -0
- package/src/lib/room-zone-routing.ts +197 -0
- package/src/lib/scene-clipboard.test.ts +610 -1
- package/src/lib/scene-clipboard.ts +269 -58
- package/src/lib/scene-material-refs.test.ts +79 -0
- package/src/lib/scene-material-refs.ts +79 -0
- package/src/lib/scene.test.ts +24 -36
- package/src/lib/scene.ts +33 -57
- package/src/lib/selection-routing.test.ts +129 -45
- package/src/lib/selection-routing.ts +54 -75
- package/src/lib/session-writes.test.ts +120 -0
- package/src/lib/session-writes.ts +205 -0
- package/src/lib/sfx-bus.ts +13 -0
- package/src/lib/sfx-player.test.ts +70 -9
- package/src/lib/sfx-player.ts +6 -0
- package/src/lib/sidebar-panel.ts +62 -0
- package/src/lib/site-boundary.test.ts +4 -6
- package/src/lib/site-boundary.ts +1 -1
- package/src/lib/snapping-mode.test.ts +4 -0
- package/src/lib/snapping-mode.ts +8 -1
- package/src/lib/stair-levels.test.ts +25 -0
- package/src/lib/stair-levels.ts +22 -3
- package/src/lib/terrace-draft.test.ts +145 -0
- package/src/lib/terrace-draft.ts +214 -0
- package/src/lib/tool-cursor-icon.test.ts +16 -0
- package/src/lib/tool-cursor-icon.ts +11 -0
- package/src/lib/typing-target.ts +9 -0
- package/src/lib/units.ts +77 -39
- package/src/lib/vector-edges.test.ts +58 -0
- package/src/lib/vector-edges.ts +400 -0
- package/src/lib/viewer-selection.test.ts +577 -0
- package/src/lib/viewer-selection.ts +580 -0
- package/src/lib/wall-draw-variant.test.ts +71 -0
- package/src/lib/wall-draw-variant.ts +91 -0
- package/src/lib/wall-paint-region-session.ts +246 -0
- package/src/lib/wall-paint-region.test.ts +373 -0
- package/src/lib/wall-placement-pointer.test.ts +42 -0
- package/src/lib/wall-placement-pointer.ts +57 -0
- package/src/lib/wall-polygon-draft.test.ts +262 -0
- package/src/lib/wall-polygon-draft.ts +286 -0
- package/src/lib/wall-push.test.ts +453 -0
- package/src/lib/wall-region-face.ts +352 -0
- package/src/lib/wall-region-handles.test.ts +304 -0
- package/src/lib/wall-region-handles.ts +368 -0
- package/src/lib/wall-region-list.test.ts +119 -0
- package/src/lib/wall-region-list.ts +136 -0
- package/src/lib/wall-region-snap.ts +110 -0
- package/src/lib/window-changes.ts +35 -0
- package/src/lib/window-interaction.ts +14 -0
- package/src/lib/zone-content.ts +4 -1
- package/src/lib/zone-name.test.ts +17 -0
- package/src/lib/zone-name.ts +17 -0
- package/src/store/opens-in-select-mode.test.ts +223 -0
- package/src/store/paint-mode.test.ts +188 -0
- package/src/store/terrain-sculpt-mode.test.ts +19 -21
- package/src/store/tool-mode.test.ts +137 -6
- package/src/store/use-audio.test.ts +146 -0
- package/src/store/use-audio.tsx +127 -3
- package/src/store/use-construction-reveal.test.ts +173 -0
- package/src/store/use-construction-reveal.ts +145 -0
- package/src/store/use-corner-snap-hint.test.ts +24 -0
- package/src/store/use-corner-snap-hint.ts +47 -0
- package/src/store/use-delete-confirmation.ts +28 -1
- package/src/store/use-drawing-view.test.ts +24 -3
- package/src/store/use-drawing-view.ts +29 -1
- package/src/store/use-editor.tsx +432 -321
- package/src/store/use-floorplan-draft-preview.ts +13 -0
- package/src/store/use-floorplan-marquee.ts +12 -2
- package/src/store/use-follow-pascal.test.ts +62 -0
- package/src/store/use-follow-pascal.ts +53 -0
- package/src/store/use-point-ask.ts +247 -0
- package/src/store/use-quick-measurement-hud.ts +3 -3
- package/src/store/use-stair-build-preview.ts +33 -5
- package/src/store/use-wall-move-ghosts.ts +4 -2
- package/src/store/use-wall-region-handles-selection.test.ts +222 -0
- package/src/store/use-wall-region-handles-selection.ts +139 -0
- package/src/store/view-layout.test.ts +201 -0
- package/src/store/view-layout.ts +199 -0
- package/src/test-utils/immediate-animation-frames.ts +16 -0
- package/src/test-utils/live-gesture-round-trip.ts +224 -0
- package/src/test-utils/render-current-markup.tsx +16 -0
- package/src/test-utils/selection-harness.ts +82 -0
- package/src/components/editor-2d/renderers/floorplan-stair-layer.tsx +0 -499
- package/src/components/systems/zone/zone-label-editor-system.tsx +0 -333
- package/src/components/tools/fence/fence-drafting.test.ts +0 -100
- package/src/components/tools/fence/fence-drafting.ts +0 -266
- package/src/components/tools/stair/stair-click-guard.test.ts +0 -58
- package/src/components/tools/stair/stair-click-guard.ts +0 -72
- package/src/components/tools/stair/stair-defaults.ts +0 -18
- package/src/components/tools/stair/stair-tool.tsx +0 -634
- package/src/components/ui/sidebar/panels/plugins-panel.tsx +0 -218
- package/src/components/viewer/viewer-units-panel.tsx +0 -116
- package/src/lib/floorplan/stairs.ts +0 -489
- package/src/lib/level-duplication.test.ts +0 -144
- package/src/lib/level-duplication.ts +0 -195
|
@@ -19,6 +19,7 @@ import { isHistoryShortcut } from '../../lib/history'
|
|
|
19
19
|
import { sfxEmitter } from '../../lib/sfx-bus'
|
|
20
20
|
import { intersectSpatialDragPlane } from '../../lib/spatial-drag-plane'
|
|
21
21
|
import { getSpatialPointerId, spatialPointerInput } from '../../lib/spatial-pointer-input'
|
|
22
|
+
import { isTypingTarget } from '../../lib/typing-target'
|
|
22
23
|
import useEditor, { isAngleSnapActive } from '../../store/use-editor'
|
|
23
24
|
import useInteractionScope, {
|
|
24
25
|
useActiveHandleDrag,
|
|
@@ -377,6 +378,7 @@ function GroupRotateHandleInner({ ids, meshEpoch }: { ids: string[]; meshEpoch:
|
|
|
377
378
|
// Escape / ⌘Z abort the rotate — capture phase so they win over the global
|
|
378
379
|
// use-keyboard arms (⌘Z must never history-jump under a live pointer).
|
|
379
380
|
const onKeyDown = (e: KeyboardEvent) => {
|
|
381
|
+
if (isTypingTarget(e.target)) return
|
|
380
382
|
if (e.key === 'Alt') {
|
|
381
383
|
altKey = true
|
|
382
384
|
return
|
|
@@ -4,16 +4,26 @@ import {
|
|
|
4
4
|
type AnyNodeDefinition,
|
|
5
5
|
type AnyNodeId,
|
|
6
6
|
CeilingNode,
|
|
7
|
+
clearSceneHistory,
|
|
8
|
+
getSceneHistoryPauseDepth,
|
|
7
9
|
LevelNode,
|
|
8
10
|
nodeRegistry,
|
|
9
11
|
registerNode,
|
|
10
12
|
SlabNode,
|
|
11
13
|
sceneRegistry,
|
|
14
|
+
useLiveNodeOverrides,
|
|
15
|
+
useLiveTransforms,
|
|
12
16
|
useScene,
|
|
13
17
|
WallNode,
|
|
14
18
|
} from '@pascal-app/core'
|
|
19
|
+
import { useViewer } from '@pascal-app/viewer'
|
|
15
20
|
import { BoxGeometry, Group, Mesh } from 'three'
|
|
16
21
|
import { z } from 'zod'
|
|
22
|
+
import { getEditorClipboardSnapshot } from '../../lib/scene-clipboard'
|
|
23
|
+
import useEditor from '../../store/use-editor'
|
|
24
|
+
import useInteractionScope from '../../store/use-interaction-scope'
|
|
25
|
+
import { startFloorplanGroupRotate, useFloorplanGroupDrag } from '../editor-2d/floorplan-group-move'
|
|
26
|
+
import { startGroupPickUp } from './group-actions'
|
|
17
27
|
import {
|
|
18
28
|
classifyParticipant,
|
|
19
29
|
collectParticipants,
|
|
@@ -597,3 +607,453 @@ describe('group plan bounds', () => {
|
|
|
597
607
|
})
|
|
598
608
|
})
|
|
599
609
|
})
|
|
610
|
+
|
|
611
|
+
// Ownership comes from the editable-focus contract, not the rotation helper.
|
|
612
|
+
// Exercise the actual carry's registered listener and real scene/preview stores.
|
|
613
|
+
// These CPU targets model ownership only, not native focus, propagation or undo.
|
|
614
|
+
describe('group keyboard editable ownership', () => {
|
|
615
|
+
function withCarry(
|
|
616
|
+
run: (fixture: {
|
|
617
|
+
press: (
|
|
618
|
+
key: string,
|
|
619
|
+
target?: object,
|
|
620
|
+
modifiers?: { ctrlKey?: boolean; metaKey?: boolean },
|
|
621
|
+
) => Event
|
|
622
|
+
snapshot: () => unknown
|
|
623
|
+
cancellations: () => number
|
|
624
|
+
}) => void,
|
|
625
|
+
) {
|
|
626
|
+
const windowDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'window')
|
|
627
|
+
const documentDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'document')
|
|
628
|
+
const rafDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'requestAnimationFrame')
|
|
629
|
+
const cancelRafDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'cancelAnimationFrame')
|
|
630
|
+
const frames = new Map<number, FrameRequestCallback>()
|
|
631
|
+
let frameId = 0
|
|
632
|
+
const savedScene = useScene.getState()
|
|
633
|
+
const savedViewer = useViewer.getState()
|
|
634
|
+
const savedEditor = useEditor.getState()
|
|
635
|
+
const savedScope = useInteractionScope.getState()
|
|
636
|
+
const savedOverrides = useLiveNodeOverrides.getState()
|
|
637
|
+
const savedTransforms = useLiveTransforms.getState()
|
|
638
|
+
const history = useScene.temporal.getState()
|
|
639
|
+
const savedHistory = {
|
|
640
|
+
pastStates: history.pastStates,
|
|
641
|
+
futureStates: history.futureStates,
|
|
642
|
+
isTracking: history.isTracking,
|
|
643
|
+
}
|
|
644
|
+
const host = Object.assign(new EventTarget(), { location: { search: '' } })
|
|
645
|
+
Object.defineProperty(globalThis, 'window', { configurable: true, value: host })
|
|
646
|
+
Object.defineProperty(globalThis, 'document', {
|
|
647
|
+
configurable: true,
|
|
648
|
+
value: { body: { style: { cursor: '' } }, querySelector: () => null },
|
|
649
|
+
})
|
|
650
|
+
Object.defineProperty(globalThis, 'requestAnimationFrame', {
|
|
651
|
+
configurable: true,
|
|
652
|
+
value: (callback: FrameRequestCallback) => {
|
|
653
|
+
frames.set(++frameId, callback)
|
|
654
|
+
return frameId
|
|
655
|
+
},
|
|
656
|
+
})
|
|
657
|
+
Object.defineProperty(globalThis, 'cancelAnimationFrame', {
|
|
658
|
+
configurable: true,
|
|
659
|
+
value: (id: number) => frames.delete(id),
|
|
660
|
+
})
|
|
661
|
+
const canvasTarget = { isContentEditable: false, closest: () => null }
|
|
662
|
+
let cancellations = 0
|
|
663
|
+
const press = (
|
|
664
|
+
key: string,
|
|
665
|
+
target: object = canvasTarget,
|
|
666
|
+
modifiers: { ctrlKey?: boolean; metaKey?: boolean } = {},
|
|
667
|
+
) => {
|
|
668
|
+
const event = Object.assign(new Event('keydown', { bubbles: true, cancelable: true }), {
|
|
669
|
+
key,
|
|
670
|
+
ctrlKey: false,
|
|
671
|
+
metaKey: false,
|
|
672
|
+
altKey: false,
|
|
673
|
+
shiftKey: false,
|
|
674
|
+
...modifiers,
|
|
675
|
+
})
|
|
676
|
+
Object.defineProperty(event, 'target', { value: target })
|
|
677
|
+
host.dispatchEvent(event)
|
|
678
|
+
return event
|
|
679
|
+
}
|
|
680
|
+
const snapshot = () =>
|
|
681
|
+
structuredClone({
|
|
682
|
+
nodes: useScene.getState().nodes,
|
|
683
|
+
selection: useViewer.getState().selection,
|
|
684
|
+
scope: useInteractionScope.getState().scope,
|
|
685
|
+
overrides: [...useLiveNodeOverrides.getState().overrides],
|
|
686
|
+
transforms: [...useLiveTransforms.getState().transforms],
|
|
687
|
+
clipboard: getEditorClipboardSnapshot(),
|
|
688
|
+
history: {
|
|
689
|
+
past: useScene.temporal.getState().pastStates.length,
|
|
690
|
+
future: useScene.temporal.getState().futureStates.length,
|
|
691
|
+
tracking: useScene.temporal.getState().isTracking,
|
|
692
|
+
},
|
|
693
|
+
})
|
|
694
|
+
try {
|
|
695
|
+
useScene.temporal.getState().pause()
|
|
696
|
+
useScene.setState({
|
|
697
|
+
nodes: placedNodes() as Record<AnyNodeId, AnyNode>,
|
|
698
|
+
rootNodeIds: ['building_test' as AnyNodeId],
|
|
699
|
+
dirtyNodes: new Set<AnyNodeId>(),
|
|
700
|
+
readOnly: false,
|
|
701
|
+
})
|
|
702
|
+
useScene.temporal.getState().resume()
|
|
703
|
+
clearSceneHistory()
|
|
704
|
+
useScene.getState().updateNode('item_chair' as AnyNodeId, { name: 'undo sentinel' })
|
|
705
|
+
expect(useScene.temporal.getState().pastStates.length).toBeGreaterThan(0)
|
|
706
|
+
useLiveNodeOverrides.getState().clearAll()
|
|
707
|
+
useLiveTransforms.getState().clearAll()
|
|
708
|
+
useInteractionScope.getState().end()
|
|
709
|
+
useEditor.getState().armToolMode({ mode: 'select' })
|
|
710
|
+
useViewer.getState().setSelection({
|
|
711
|
+
buildingId: 'building_test',
|
|
712
|
+
levelId: 'level_test',
|
|
713
|
+
selectedIds: ['item_chair', 'column_post'],
|
|
714
|
+
})
|
|
715
|
+
expect(
|
|
716
|
+
startGroupPickUp({
|
|
717
|
+
onCancel: () => {
|
|
718
|
+
cancellations += 1
|
|
719
|
+
},
|
|
720
|
+
}),
|
|
721
|
+
).toBe(true)
|
|
722
|
+
run({ press, snapshot, cancellations: () => cancellations })
|
|
723
|
+
} finally {
|
|
724
|
+
// Use the controller's own teardown before restoring shared globals/state.
|
|
725
|
+
press('Escape')
|
|
726
|
+
useScene.temporal.getState().pause()
|
|
727
|
+
useScene.setState(savedScene)
|
|
728
|
+
useScene.temporal.setState({
|
|
729
|
+
pastStates: savedHistory.pastStates,
|
|
730
|
+
futureStates: savedHistory.futureStates,
|
|
731
|
+
})
|
|
732
|
+
if (savedHistory.isTracking) useScene.temporal.getState().resume()
|
|
733
|
+
useViewer.setState(savedViewer)
|
|
734
|
+
useEditor.setState(savedEditor)
|
|
735
|
+
useInteractionScope.setState(savedScope)
|
|
736
|
+
useLiveNodeOverrides.setState(savedOverrides)
|
|
737
|
+
useLiveTransforms.setState(savedTransforms)
|
|
738
|
+
frames.clear()
|
|
739
|
+
for (const [name, descriptor] of [
|
|
740
|
+
['window', windowDescriptor],
|
|
741
|
+
['document', documentDescriptor],
|
|
742
|
+
['requestAnimationFrame', rafDescriptor],
|
|
743
|
+
['cancelAnimationFrame', cancelRafDescriptor],
|
|
744
|
+
] as const) {
|
|
745
|
+
if (descriptor) Object.defineProperty(globalThis, name, descriptor)
|
|
746
|
+
else Reflect.deleteProperty(globalThis, name)
|
|
747
|
+
}
|
|
748
|
+
}
|
|
749
|
+
}
|
|
750
|
+
|
|
751
|
+
for (const kind of ['input', 'textarea', 'select', 'contenteditable descendant']) {
|
|
752
|
+
test(`${kind} leaves an actual carried preview and its history untouched`, () => {
|
|
753
|
+
withCarry(({ press, snapshot, cancellations }) => {
|
|
754
|
+
expect(press('r').defaultPrevented).toBe(true)
|
|
755
|
+
expect(useLiveNodeOverrides.getState().overrides.size).toBeGreaterThan(0)
|
|
756
|
+
const before = snapshot()
|
|
757
|
+
const owner = { kind }
|
|
758
|
+
const target = {
|
|
759
|
+
isContentEditable: kind === 'contenteditable descendant',
|
|
760
|
+
closest: () => owner,
|
|
761
|
+
}
|
|
762
|
+
for (const key of ['r', 't', 'Escape', 'Backspace', 'Delete']) {
|
|
763
|
+
expect(press(key, target).defaultPrevented).toBe(false)
|
|
764
|
+
expect(snapshot()).toEqual(before)
|
|
765
|
+
expect(cancellations()).toBe(0)
|
|
766
|
+
}
|
|
767
|
+
for (const modifier of [{ ctrlKey: true }, { metaKey: true }]) {
|
|
768
|
+
for (const key of ['c', 'x', 'v', 'z']) {
|
|
769
|
+
expect(press(key, target, modifier).defaultPrevented).toBe(false)
|
|
770
|
+
expect(snapshot()).toEqual(before)
|
|
771
|
+
expect(cancellations()).toBe(0)
|
|
772
|
+
}
|
|
773
|
+
}
|
|
774
|
+
})
|
|
775
|
+
})
|
|
776
|
+
}
|
|
777
|
+
|
|
778
|
+
test('outside R/T still rotate the real preview and Escape restores the carry', () => {
|
|
779
|
+
withCarry(({ press, cancellations }) => {
|
|
780
|
+
const before = structuredClone(useScene.getState().nodes)
|
|
781
|
+
const initialYaw = 0.5
|
|
782
|
+
expect(press('r').defaultPrevented).toBe(true)
|
|
783
|
+
const rotated = useLiveNodeOverrides.getState().get('item_chair')
|
|
784
|
+
expect(rotated).toBeDefined()
|
|
785
|
+
expect((rotated!.rotation as number[])[1]).not.toBeCloseTo(initialYaw)
|
|
786
|
+
expect(useScene.getState().nodes).toEqual(before)
|
|
787
|
+
expect(press('t').defaultPrevented).toBe(true)
|
|
788
|
+
const restored = useLiveNodeOverrides.getState().get('item_chair')
|
|
789
|
+
expect((restored!.rotation as number[])[1]).toBeCloseTo(initialYaw)
|
|
790
|
+
expect(press('Escape').defaultPrevented).toBe(true)
|
|
791
|
+
expect(cancellations()).toBe(1)
|
|
792
|
+
expect(useInteractionScope.getState().scope.kind).toBe('idle')
|
|
793
|
+
expect(useLiveNodeOverrides.getState().overrides.size).toBe(0)
|
|
794
|
+
expect(useLiveTransforms.getState().transforms.size).toBe(0)
|
|
795
|
+
expect(useScene.getState().nodes).toEqual(before)
|
|
796
|
+
expect(useScene.temporal.getState().isTracking).toBe(true)
|
|
797
|
+
expect(useViewer.getState().selection.selectedIds).toEqual(['item_chair', 'column_post'])
|
|
798
|
+
})
|
|
799
|
+
})
|
|
800
|
+
})
|
|
801
|
+
|
|
802
|
+
// The editable-focus contract owns these expectations: a live rotation is a
|
|
803
|
+
// preview, not a scene/history edit, until an outside release commits it.
|
|
804
|
+
// Real package stores/controller and CPU geometry; the DOM below supplies only
|
|
805
|
+
// identity screen coordinates and event dispatch, not browser focus/native undo.
|
|
806
|
+
describe('floorplan group rotation keyboard ownership', () => {
|
|
807
|
+
function snapshot() {
|
|
808
|
+
const history = useScene.temporal.getState()
|
|
809
|
+
return structuredClone({
|
|
810
|
+
nodes: useScene.getState().nodes,
|
|
811
|
+
selection: useViewer.getState().selection,
|
|
812
|
+
scope: useInteractionScope.getState().scope,
|
|
813
|
+
overrides: [...useLiveNodeOverrides.getState().overrides],
|
|
814
|
+
transforms: [...useLiveTransforms.getState().transforms],
|
|
815
|
+
rotation: useFloorplanGroupDrag.getState().rotation,
|
|
816
|
+
inputDragging: useViewer.getState().inputDragging,
|
|
817
|
+
history: {
|
|
818
|
+
past: history.pastStates,
|
|
819
|
+
future: history.futureStates,
|
|
820
|
+
tracking: history.isTracking,
|
|
821
|
+
pauseDepth: getSceneHistoryPauseDepth(),
|
|
822
|
+
},
|
|
823
|
+
})
|
|
824
|
+
}
|
|
825
|
+
|
|
826
|
+
function withRotation(
|
|
827
|
+
run: (fixture: {
|
|
828
|
+
press: (key: string, target?: object, modifiers?: object) => Event
|
|
829
|
+
pointer: (type: string) => void
|
|
830
|
+
snapshot: () => ReturnType<typeof snapshot>
|
|
831
|
+
}) => void,
|
|
832
|
+
) {
|
|
833
|
+
const names = [
|
|
834
|
+
'window',
|
|
835
|
+
'document',
|
|
836
|
+
'setTimeout',
|
|
837
|
+
'clearTimeout',
|
|
838
|
+
'queueMicrotask',
|
|
839
|
+
'requestAnimationFrame',
|
|
840
|
+
'cancelAnimationFrame',
|
|
841
|
+
] as const
|
|
842
|
+
const descriptors = names.map(
|
|
843
|
+
(name) => [name, Object.getOwnPropertyDescriptor(globalThis, name)] as const,
|
|
844
|
+
)
|
|
845
|
+
const savedStores = [
|
|
846
|
+
[useScene, useScene.getState()],
|
|
847
|
+
[useViewer, useViewer.getState()],
|
|
848
|
+
[useEditor, useEditor.getState()],
|
|
849
|
+
[useInteractionScope, useInteractionScope.getState()],
|
|
850
|
+
[useLiveNodeOverrides, useLiveNodeOverrides.getState()],
|
|
851
|
+
[useLiveTransforms, useLiveTransforms.getState()],
|
|
852
|
+
[useFloorplanGroupDrag, useFloorplanGroupDrag.getState()],
|
|
853
|
+
] as const
|
|
854
|
+
const savedHistory = useScene.temporal.getState()
|
|
855
|
+
const pauseDepth = getSceneHistoryPauseDepth()
|
|
856
|
+
const savedRegistry = new Map(sceneRegistry.nodes)
|
|
857
|
+
const host = Object.assign(new EventTarget(), { location: { search: '' } })
|
|
858
|
+
const timers = new Map<number, () => void>()
|
|
859
|
+
const microtasks: (() => void)[] = []
|
|
860
|
+
let timerId = 0
|
|
861
|
+
const sceneElement = {
|
|
862
|
+
getScreenCTM: () => ({ inverse: () => ({}) }),
|
|
863
|
+
ownerSVGElement: {
|
|
864
|
+
createSVGPoint: () => ({
|
|
865
|
+
x: 0,
|
|
866
|
+
y: 0,
|
|
867
|
+
matrixTransform() {
|
|
868
|
+
return { x: this.x, y: this.y }
|
|
869
|
+
},
|
|
870
|
+
}),
|
|
871
|
+
},
|
|
872
|
+
}
|
|
873
|
+
const globals = {
|
|
874
|
+
window: host,
|
|
875
|
+
document: {
|
|
876
|
+
body: { style: { cursor: '' } },
|
|
877
|
+
querySelector: (selector: string) =>
|
|
878
|
+
selector === 'g[data-floorplan-scene]' ? sceneElement : null,
|
|
879
|
+
},
|
|
880
|
+
setTimeout: (callback: () => void) => {
|
|
881
|
+
timers.set(++timerId, callback)
|
|
882
|
+
return timerId
|
|
883
|
+
},
|
|
884
|
+
clearTimeout: (id: number) => {
|
|
885
|
+
timers.delete(id)
|
|
886
|
+
},
|
|
887
|
+
queueMicrotask: (callback: () => void) => {
|
|
888
|
+
microtasks.push(callback)
|
|
889
|
+
},
|
|
890
|
+
requestAnimationFrame: (callback: FrameRequestCallback) => {
|
|
891
|
+
timers.set(++timerId, () => callback(0))
|
|
892
|
+
return timerId
|
|
893
|
+
},
|
|
894
|
+
cancelAnimationFrame: (id: number) => {
|
|
895
|
+
timers.delete(id)
|
|
896
|
+
},
|
|
897
|
+
}
|
|
898
|
+
const canvas = { isContentEditable: false, closest: () => null }
|
|
899
|
+
const press = (key: string, target: object = canvas, modifiers: object = {}) => {
|
|
900
|
+
const event = Object.assign(new Event('keydown', { cancelable: true }), {
|
|
901
|
+
key,
|
|
902
|
+
ctrlKey: false,
|
|
903
|
+
metaKey: false,
|
|
904
|
+
altKey: false,
|
|
905
|
+
shiftKey: false,
|
|
906
|
+
...modifiers,
|
|
907
|
+
})
|
|
908
|
+
Object.defineProperty(event, 'target', { value: target })
|
|
909
|
+
host.dispatchEvent(event)
|
|
910
|
+
return event
|
|
911
|
+
}
|
|
912
|
+
const pointer = (type: string) => {
|
|
913
|
+
host.dispatchEvent(
|
|
914
|
+
Object.assign(new Event(type), {
|
|
915
|
+
pointerId: 7,
|
|
916
|
+
clientX: 2.5,
|
|
917
|
+
clientY: 4,
|
|
918
|
+
}),
|
|
919
|
+
)
|
|
920
|
+
}
|
|
921
|
+
const meshes: Mesh[] = []
|
|
922
|
+
try {
|
|
923
|
+
// No shared gesture may already own a history pause in this isolated test.
|
|
924
|
+
expect(pauseDepth).toBe(0)
|
|
925
|
+
for (const name of names) {
|
|
926
|
+
Object.defineProperty(globalThis, name, { configurable: true, value: globals[name] })
|
|
927
|
+
}
|
|
928
|
+
useScene.temporal.getState().pause()
|
|
929
|
+
useScene.setState({
|
|
930
|
+
nodes: placedNodes() as Record<AnyNodeId, AnyNode>,
|
|
931
|
+
rootNodeIds: ['building_test' as AnyNodeId],
|
|
932
|
+
dirtyNodes: new Set<AnyNodeId>(),
|
|
933
|
+
readOnly: false,
|
|
934
|
+
})
|
|
935
|
+
useScene.temporal.getState().resume()
|
|
936
|
+
// Clear only this temporal stack, never the process-wide draft registry.
|
|
937
|
+
useScene.temporal.getState().clear()
|
|
938
|
+
useScene.getState().updateNode('item_chair' as AnyNodeId, { name: 'rotation undo sentinel' })
|
|
939
|
+
useLiveNodeOverrides.getState().clearAll()
|
|
940
|
+
useLiveTransforms.getState().clearAll()
|
|
941
|
+
useFloorplanGroupDrag.setState({ delta: null, rotation: null })
|
|
942
|
+
useInteractionScope.getState().end()
|
|
943
|
+
useEditor.getState().armToolMode({ mode: 'select' })
|
|
944
|
+
useViewer.getState().setSelection({
|
|
945
|
+
buildingId: 'building_test',
|
|
946
|
+
levelId: 'level_test',
|
|
947
|
+
selectedIds: ['item_chair', 'column_post'],
|
|
948
|
+
})
|
|
949
|
+
sceneRegistry.nodes.clear()
|
|
950
|
+
for (const id of ['item_chair', 'column_post'] as const) {
|
|
951
|
+
const mesh = new Mesh(new BoxGeometry(1, 1, 1))
|
|
952
|
+
mesh.position.fromArray(
|
|
953
|
+
(useScene.getState().nodes[id as AnyNodeId] as unknown as { position: number[] })
|
|
954
|
+
.position,
|
|
955
|
+
)
|
|
956
|
+
mesh.updateMatrixWorld(true)
|
|
957
|
+
meshes.push(mesh)
|
|
958
|
+
sceneRegistry.nodes.set(id as AnyNodeId, mesh)
|
|
959
|
+
}
|
|
960
|
+
expect(startFloorplanGroupRotate({ clientX: 5.5, clientY: 1, pointerId: 7 })).toBe(true)
|
|
961
|
+
pointer('pointermove')
|
|
962
|
+
expect(useFloorplanGroupDrag.getState().rotation?.angle).toBeCloseTo(Math.PI / 2)
|
|
963
|
+
expect(useLiveNodeOverrides.getState().overrides.size).toBe(2)
|
|
964
|
+
expect(useInteractionScope.getState().scope.kind).toBe('handle-drag')
|
|
965
|
+
expect(useScene.temporal.getState().pastStates.length).toBeGreaterThan(0)
|
|
966
|
+
expect(useScene.temporal.getState().isTracking).toBe(false)
|
|
967
|
+
run({ press, pointer, snapshot })
|
|
968
|
+
} finally {
|
|
969
|
+
// Controller teardown balances its own history pause even after an assertion
|
|
970
|
+
// fails. Drain its deferred input/click cleanup before restoring shared state.
|
|
971
|
+
pointer('pointercancel')
|
|
972
|
+
while (microtasks.length) microtasks.shift()!()
|
|
973
|
+
for (const callback of timers.values()) {
|
|
974
|
+
callback()
|
|
975
|
+
while (microtasks.length) microtasks.shift()!()
|
|
976
|
+
}
|
|
977
|
+
timers.clear()
|
|
978
|
+
useScene.temporal.getState().pause()
|
|
979
|
+
for (const [store, state] of savedStores)
|
|
980
|
+
(store.setState as (snapshot: unknown) => void)(state)
|
|
981
|
+
useScene.temporal.setState(savedHistory)
|
|
982
|
+
sceneRegistry.nodes.clear()
|
|
983
|
+
for (const [id, object] of savedRegistry) sceneRegistry.nodes.set(id, object)
|
|
984
|
+
for (const mesh of meshes) {
|
|
985
|
+
mesh.geometry.dispose()
|
|
986
|
+
if (Array.isArray(mesh.material))
|
|
987
|
+
mesh.material.forEach((material) => {
|
|
988
|
+
material.dispose()
|
|
989
|
+
})
|
|
990
|
+
else mesh.material.dispose()
|
|
991
|
+
}
|
|
992
|
+
for (const [name, descriptor] of descriptors) {
|
|
993
|
+
if (descriptor) Object.defineProperty(globalThis, name, descriptor)
|
|
994
|
+
else Reflect.deleteProperty(globalThis, name)
|
|
995
|
+
}
|
|
996
|
+
expect(getSceneHistoryPauseDepth()).toBe(pauseDepth)
|
|
997
|
+
}
|
|
998
|
+
}
|
|
999
|
+
|
|
1000
|
+
test('editable undo and cancel keys preserve the actual active rotation', () => {
|
|
1001
|
+
withRotation(({ press, snapshot }) => {
|
|
1002
|
+
const before = snapshot()
|
|
1003
|
+
const targets = [
|
|
1004
|
+
{ isContentEditable: false, closest: () => ({ tagName: 'TEXTAREA' }) },
|
|
1005
|
+
{ isContentEditable: true, closest: () => null },
|
|
1006
|
+
]
|
|
1007
|
+
for (const target of targets) {
|
|
1008
|
+
for (const modifiers of [{ ctrlKey: true }, { metaKey: true }]) {
|
|
1009
|
+
expect(press('z', target, modifiers).defaultPrevented).toBe(false)
|
|
1010
|
+
expect(snapshot()).toEqual(before)
|
|
1011
|
+
}
|
|
1012
|
+
for (const key of ['Backspace', 'Delete', 'Escape']) {
|
|
1013
|
+
expect(press(key, target).defaultPrevented).toBe(false)
|
|
1014
|
+
expect(snapshot()).toEqual(before)
|
|
1015
|
+
}
|
|
1016
|
+
}
|
|
1017
|
+
})
|
|
1018
|
+
})
|
|
1019
|
+
|
|
1020
|
+
test('outside history and Escape still cancel without consuming a scene undo', () => {
|
|
1021
|
+
for (const [key, modifiers] of [
|
|
1022
|
+
['Escape', {}],
|
|
1023
|
+
['z', { ctrlKey: true }],
|
|
1024
|
+
['z', { metaKey: true }],
|
|
1025
|
+
] as const) {
|
|
1026
|
+
withRotation(({ press, snapshot }) => {
|
|
1027
|
+
const before = snapshot()
|
|
1028
|
+
expect(press(key, undefined, modifiers).defaultPrevented).toBe(true)
|
|
1029
|
+
const after = snapshot()
|
|
1030
|
+
expect(after.nodes).toEqual(before.nodes)
|
|
1031
|
+
expect(after.history.past).toEqual(before.history.past)
|
|
1032
|
+
expect(after.history.future).toEqual(before.history.future)
|
|
1033
|
+
expect(after.history.tracking).toBe(true)
|
|
1034
|
+
expect(after.history.pauseDepth).toBe(0)
|
|
1035
|
+
expect(after.scope.kind).toBe('idle')
|
|
1036
|
+
expect(after.overrides).toEqual([])
|
|
1037
|
+
expect(after.transforms).toEqual([])
|
|
1038
|
+
expect(after.rotation).toBeNull()
|
|
1039
|
+
})
|
|
1040
|
+
}
|
|
1041
|
+
})
|
|
1042
|
+
|
|
1043
|
+
test('outside pointer release commits one undoable rotation', () => {
|
|
1044
|
+
withRotation(({ pointer, snapshot }) => {
|
|
1045
|
+
const before = snapshot()
|
|
1046
|
+
pointer('pointerup')
|
|
1047
|
+
const after = snapshot()
|
|
1048
|
+
expect(after.nodes).not.toEqual(before.nodes)
|
|
1049
|
+
expect(after.history.past).toHaveLength(before.history.past.length + 1)
|
|
1050
|
+
expect(after.history.tracking).toBe(true)
|
|
1051
|
+
expect(after.scope.kind).toBe('idle')
|
|
1052
|
+
expect(after.overrides).toEqual([])
|
|
1053
|
+
expect(after.transforms).toEqual([])
|
|
1054
|
+
expect(after.rotation).toBeNull()
|
|
1055
|
+
useScene.temporal.getState().undo()
|
|
1056
|
+
expect(useScene.getState().nodes).toEqual(before.nodes)
|
|
1057
|
+
})
|
|
1058
|
+
})
|
|
1059
|
+
})
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { expect, test } from 'bun:test'
|
|
2
|
+
import { type RootState, useThree } from '@react-three/fiber'
|
|
3
|
+
import { create } from '@react-three/test-renderer'
|
|
4
|
+
import { useLayoutEffect } from 'react'
|
|
5
|
+
import { type Intersection, Object3D } from 'three'
|
|
6
|
+
import { EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY } from '../../../lib/direct-manipulation'
|
|
7
|
+
import { EditorHandleHitPriority, prioritizeEditorHandleHits } from './handle-hit-priority'
|
|
8
|
+
|
|
9
|
+
function hit(name: string, distance: number, handle = false): Intersection {
|
|
10
|
+
const object = new Object3D()
|
|
11
|
+
object.name = name
|
|
12
|
+
if (handle) object.userData[EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY] = true
|
|
13
|
+
return { object, distance, point: undefined as never }
|
|
14
|
+
}
|
|
15
|
+
const names = (hits: Intersection[]) => hits.map((entry) => entry.object.name)
|
|
16
|
+
|
|
17
|
+
test('a handle behind a wall comes first, so the hover goes where the press goes', () => {
|
|
18
|
+
const hits = [hit('wall', 3), hit('floor', 5), hit('up', 6, true), hit('cube', 6.2, true)]
|
|
19
|
+
expect(names(prioritizeEditorHandleHits(hits))).toEqual(['up', 'cube', 'wall', 'floor'])
|
|
20
|
+
})
|
|
21
|
+
|
|
22
|
+
test('without a handle on the ray the order is untouched', () => {
|
|
23
|
+
const hits = [hit('wall', 3), hit('floor', 5)]
|
|
24
|
+
expect(prioritizeEditorHandleHits(hits)).toBe(hits)
|
|
25
|
+
})
|
|
26
|
+
|
|
27
|
+
test('mounted, it is the canvas event filter; unmounted, the previous one comes back', async () => {
|
|
28
|
+
let state: RootState | null = null
|
|
29
|
+
const Probe = () => {
|
|
30
|
+
state = useThree((root) => root)
|
|
31
|
+
return null
|
|
32
|
+
}
|
|
33
|
+
const previous = (hits: Intersection[]) => hits.filter((entry) => entry.object.name !== 'grid')
|
|
34
|
+
const Previous = () => {
|
|
35
|
+
const setEvents = useThree((root) => root.setEvents)
|
|
36
|
+
useLayoutEffect(() => setEvents({ filter: previous }), [setEvents])
|
|
37
|
+
return null
|
|
38
|
+
}
|
|
39
|
+
const before = await create(
|
|
40
|
+
<>
|
|
41
|
+
<Probe />
|
|
42
|
+
<Previous />
|
|
43
|
+
</>,
|
|
44
|
+
)
|
|
45
|
+
await before.update(
|
|
46
|
+
<>
|
|
47
|
+
<Probe />
|
|
48
|
+
<Previous />
|
|
49
|
+
<EditorHandleHitPriority />
|
|
50
|
+
</>,
|
|
51
|
+
)
|
|
52
|
+
const hits = [hit('grid', 1), hit('wall', 3), hit('cube', 6, true)]
|
|
53
|
+
const filter = (state as RootState | null)?.events.filter
|
|
54
|
+
expect(names(filter!(hits, state!))).toEqual(['cube', 'wall'])
|
|
55
|
+
await before.update(
|
|
56
|
+
<>
|
|
57
|
+
<Probe />
|
|
58
|
+
<Previous />
|
|
59
|
+
</>,
|
|
60
|
+
)
|
|
61
|
+
expect((state as RootState | null)?.events.filter).toBe(previous)
|
|
62
|
+
await before.unmount()
|
|
63
|
+
})
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
'use client'
|
|
2
|
+
|
|
3
|
+
import { useThree } from '@react-three/fiber'
|
|
4
|
+
import { useEffect } from 'react'
|
|
5
|
+
import type { Intersection, Object3D } from 'three'
|
|
6
|
+
import { EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY } from '../../../lib/direct-manipulation'
|
|
7
|
+
|
|
8
|
+
const isHandleHit = (hit: { object: Object3D }) =>
|
|
9
|
+
hit.object.userData?.[EDITOR_HANDLE_HIT_AREA_USER_DATA_KEY] === true
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Editor handles first, everything else after, each in distance order. Handles
|
|
13
|
+
* draw on top of walls and a handle anywhere along the ray already owns the
|
|
14
|
+
* press; ordering them first gives them the hover too. Distance order alone
|
|
15
|
+
* lets a wall in front win the hover for good: once its enter stops
|
|
16
|
+
* propagation, R3F keeps stopping every later move at it, so a handle behind
|
|
17
|
+
* it never hears its enter however the pointer reaches it.
|
|
18
|
+
*/
|
|
19
|
+
export function prioritizeEditorHandleHits<T extends { object: Object3D }>(hits: T[]): T[] {
|
|
20
|
+
if (!hits.some(isHandleHit)) return hits
|
|
21
|
+
return [...hits.filter(isHandleHit), ...hits.filter((hit) => !isHandleHit(hit))]
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** Installs `prioritizeEditorHandleHits` as the canvas's pointer-event filter while mounted. */
|
|
25
|
+
export function EditorHandleHitPriority() {
|
|
26
|
+
const get = useThree((state) => state.get)
|
|
27
|
+
const setEvents = useThree((state) => state.setEvents)
|
|
28
|
+
useEffect(() => {
|
|
29
|
+
const previous = get().events.filter
|
|
30
|
+
setEvents({
|
|
31
|
+
filter: (hits: Intersection[], state) =>
|
|
32
|
+
prioritizeEditorHandleHits(previous ? previous(hits, state) : hits),
|
|
33
|
+
})
|
|
34
|
+
return () => setEvents({ filter: previous })
|
|
35
|
+
}, [get, setEvents])
|
|
36
|
+
return null
|
|
37
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { expect, spyOn, test } from 'bun:test'
|
|
2
|
+
import { swallowNextClick } from './use-handle-drag'
|
|
3
|
+
|
|
4
|
+
test('deferred click cleanup removes the listener from its original window', () => {
|
|
5
|
+
const originalWindow = Object.getOwnPropertyDescriptor(globalThis, 'window')
|
|
6
|
+
const target = new EventTarget()
|
|
7
|
+
const remove = spyOn(target, 'removeEventListener')
|
|
8
|
+
let cleanup: (() => void) | undefined
|
|
9
|
+
const timer = spyOn(globalThis, 'setTimeout').mockImplementation(((
|
|
10
|
+
callback: Parameters<typeof setTimeout>[0],
|
|
11
|
+
) => {
|
|
12
|
+
cleanup = callback as () => void
|
|
13
|
+
return undefined as unknown as ReturnType<typeof setTimeout>
|
|
14
|
+
}) as typeof setTimeout)
|
|
15
|
+
try {
|
|
16
|
+
Object.defineProperty(globalThis, 'window', { configurable: true, value: target })
|
|
17
|
+
swallowNextClick()
|
|
18
|
+
Reflect.deleteProperty(globalThis, 'window')
|
|
19
|
+
expect(cleanup).toBeDefined()
|
|
20
|
+
expect(() => cleanup?.()).not.toThrow()
|
|
21
|
+
expect(remove).toHaveBeenCalledTimes(1)
|
|
22
|
+
} finally {
|
|
23
|
+
timer.mockRestore()
|
|
24
|
+
remove.mockRestore()
|
|
25
|
+
if (originalWindow) Object.defineProperty(globalThis, 'window', originalWindow)
|
|
26
|
+
else Reflect.deleteProperty(globalThis, 'window')
|
|
27
|
+
}
|
|
28
|
+
})
|