@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
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { afterEach, describe, expect, test } from 'bun:test'
|
|
2
2
|
import useEditor, { isBrushMode, type Mode, normalizePersistedEditorUiState } from './use-editor'
|
|
3
3
|
import useInteractionScope from './use-interaction-scope'
|
|
4
|
+
import { isViewVisible, sceneLayout, VIEW_2D, visibleScene } from './view-layout'
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* The mode-lifecycle contract for terrain sculpting.
|
|
@@ -17,9 +18,9 @@ function reset() {
|
|
|
17
18
|
useEditor.getState().setPreviewMode(false)
|
|
18
19
|
useEditor.getState().setFirstPersonMode(false)
|
|
19
20
|
useEditor.getState().setWorkspaceMode('edit')
|
|
20
|
-
// Before the mode:
|
|
21
|
+
// Before the mode: hiding 3D disarms sculpt, and leaving a stale layout
|
|
21
22
|
// behind would silently change what the next test's `setMode` does.
|
|
22
|
-
useEditor.getState().
|
|
23
|
+
useEditor.getState().setViewLayout(sceneLayout('3d'))
|
|
23
24
|
useEditor.getState().setMode('select')
|
|
24
25
|
useEditor.getState().setTerrainVerb('flatten')
|
|
25
26
|
useEditor.getState().setTerrainSampling(false)
|
|
@@ -41,8 +42,8 @@ describe('terrain-sculpt mode lifecycle', () => {
|
|
|
41
42
|
expect(useInteractionScope.getState().scope.kind).toBe('idle')
|
|
42
43
|
})
|
|
43
44
|
|
|
44
|
-
test('arming sculpt from
|
|
45
|
-
useEditor.getState().setPhase('
|
|
45
|
+
test('arming sculpt from the building moves to site', () => {
|
|
46
|
+
useEditor.getState().setPhase('building')
|
|
46
47
|
useEditor.getState().setMode('terrain-sculpt')
|
|
47
48
|
// Otherwise `normalizeModeForPhase` rejects the mode on the next rehydrate
|
|
48
49
|
// and the UI shows a mode the store does not hold.
|
|
@@ -53,7 +54,7 @@ describe('terrain-sculpt mode lifecycle', () => {
|
|
|
53
54
|
test('a phase switch out of site drops the scope', () => {
|
|
54
55
|
useEditor.getState().setMode('terrain-sculpt')
|
|
55
56
|
// The phase setter delegates its mode rewrite to the ToolMode transition.
|
|
56
|
-
useEditor.getState().setPhase('
|
|
57
|
+
useEditor.getState().setPhase('building')
|
|
57
58
|
expect(useInteractionScope.getState().scope.kind).toBe('idle')
|
|
58
59
|
})
|
|
59
60
|
})
|
|
@@ -71,7 +72,7 @@ describe('the eyedropper arm is not allowed to outlive sculpt mode', () => {
|
|
|
71
72
|
test('leaving via a phase switch disarms it too', () => {
|
|
72
73
|
useEditor.getState().setMode('terrain-sculpt')
|
|
73
74
|
useEditor.getState().setTerrainSampling(true)
|
|
74
|
-
useEditor.getState().setPhase('
|
|
75
|
+
useEditor.getState().setPhase('building')
|
|
75
76
|
expect(useEditor.getState().terrainSampling).toBe(false)
|
|
76
77
|
})
|
|
77
78
|
|
|
@@ -106,17 +107,17 @@ describe('the brush and the 3D canvas travel together', () => {
|
|
|
106
107
|
// moves), while choosing the floorplan asks for the floorplan (so the mode
|
|
107
108
|
// yields).
|
|
108
109
|
test('arming from the 2D floorplan opens a 3D pane beside it', () => {
|
|
109
|
-
useEditor.getState().
|
|
110
|
+
useEditor.getState().setViewLayout(sceneLayout('2d'))
|
|
110
111
|
useEditor.getState().setMode('terrain-sculpt')
|
|
111
112
|
// `split`, not `3d`: the floorplan was a deliberate choice, so keep it.
|
|
112
|
-
expect(useEditor.getState()
|
|
113
|
-
expect(useEditor.getState()
|
|
113
|
+
expect(visibleScene(useEditor.getState())).toBe('split')
|
|
114
|
+
expect(isViewVisible(useEditor.getState(), VIEW_2D)).toBe(true)
|
|
114
115
|
expect(useEditor.getState().mode).toBe('terrain-sculpt')
|
|
115
116
|
})
|
|
116
117
|
|
|
117
118
|
test('switching to the 2D floorplan disarms the brush', () => {
|
|
118
119
|
useEditor.getState().setMode('terrain-sculpt')
|
|
119
|
-
useEditor.getState().
|
|
120
|
+
useEditor.getState().setViewLayout(sceneLayout('2d'))
|
|
120
121
|
expect(useEditor.getState().mode).toBe('select')
|
|
121
122
|
// And the scope goes with it — otherwise selection stays suppressed in the
|
|
122
123
|
// floorplan the user just asked for, with no visible way out.
|
|
@@ -125,10 +126,16 @@ describe('the brush and the 3D canvas travel together', () => {
|
|
|
125
126
|
|
|
126
127
|
test('split keeps it armed — the canvas is right there', () => {
|
|
127
128
|
useEditor.getState().setMode('terrain-sculpt')
|
|
128
|
-
useEditor.getState().
|
|
129
|
+
useEditor.getState().setViewLayout(sceneLayout('split'))
|
|
129
130
|
expect(useEditor.getState().mode).toBe('terrain-sculpt')
|
|
130
131
|
})
|
|
131
132
|
|
|
133
|
+
test('another view in the 3D pane disarms it, as the plan does', () => {
|
|
134
|
+
useEditor.getState().setMode('terrain-sculpt')
|
|
135
|
+
useEditor.getState().showView('gallery')
|
|
136
|
+
expect(useEditor.getState().mode).toBe('select')
|
|
137
|
+
})
|
|
138
|
+
|
|
132
139
|
test('rehydrating the pair resolves it to select', () => {
|
|
133
140
|
// Mode and view persist independently and rehydrate runs neither setter, so
|
|
134
141
|
// this is the one reconciliation the setters cannot cover.
|
|
@@ -172,20 +179,11 @@ describe('the modes that hide the editing canvas release the brush', () => {
|
|
|
172
179
|
useEditor.getState().setWorkspaceMode('studio')
|
|
173
180
|
expect(useInteractionScope.getState().scope.kind).toBe('idle')
|
|
174
181
|
})
|
|
175
|
-
|
|
176
|
-
test('a structure-layer switch releases it', () => {
|
|
177
|
-
useEditor.getState().setMode('terrain-sculpt')
|
|
178
|
-
// Reachable from the layer toggle while sculpt is armed, and it takes the
|
|
179
|
-
// same raw-`set` path — the mode resets, so the scope has to follow.
|
|
180
|
-
useEditor.getState().setStructureLayer('zones')
|
|
181
|
-
expect(useEditor.getState().mode).toBe('select')
|
|
182
|
-
expect(useInteractionScope.getState().scope.kind).toBe('idle')
|
|
183
|
-
})
|
|
184
182
|
})
|
|
185
183
|
|
|
186
184
|
describe('entering sculpt mode stands other affordances down', () => {
|
|
187
185
|
test('the armed build tool is cleared', () => {
|
|
188
|
-
useEditor.getState().setPhase('
|
|
186
|
+
useEditor.getState().setPhase('building')
|
|
189
187
|
useEditor.getState().setMode('build')
|
|
190
188
|
useEditor.getState().setTool('wall')
|
|
191
189
|
useEditor.getState().setMode('terrain-sculpt')
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
|
|
2
|
+
import { type AnyNode, useScene } from '@pascal-app/core'
|
|
3
|
+
import { useViewer } from '@pascal-app/viewer'
|
|
4
|
+
import { beginGesture } from '../lib/gesture-lifecycle'
|
|
2
5
|
import useEditor, { normalizePersistedEditorUiState } from './use-editor'
|
|
6
|
+
import useInteractionScope from './use-interaction-scope'
|
|
3
7
|
|
|
4
8
|
function resetToolMode() {
|
|
5
|
-
useEditor.getState().
|
|
6
|
-
|
|
9
|
+
useEditor.getState().clearRoom()
|
|
10
|
+
useViewer.getState().setSelection({ selectedIds: [], zoneId: null })
|
|
11
|
+
useEditor.getState().setPhase('building')
|
|
7
12
|
useEditor.getState().armToolMode({ mode: 'select' })
|
|
8
13
|
useEditor.getState().setActivePaintMaterial(null)
|
|
9
14
|
}
|
|
@@ -12,6 +17,18 @@ beforeEach(resetToolMode)
|
|
|
12
17
|
afterEach(resetToolMode)
|
|
13
18
|
|
|
14
19
|
describe('ToolMode transition', () => {
|
|
20
|
+
test('arming building tools preserves the current phase', () => {
|
|
21
|
+
for (const phase of ['site', 'building'] as const) {
|
|
22
|
+
useEditor.getState().setPhase(phase)
|
|
23
|
+
useEditor.getState().armToolMode({ mode: 'select' })
|
|
24
|
+
for (const tool of ['item', 'wall', 'measurement', 'zone'] as const) {
|
|
25
|
+
useEditor.getState().armToolMode({ mode: 'build', tool })
|
|
26
|
+
expect(useEditor.getState().phase).toBe(phase)
|
|
27
|
+
expect(useEditor.getState().tool).toBe(tool)
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
})
|
|
31
|
+
|
|
15
32
|
test('choosing a paint swatch while selected arms material paint', () => {
|
|
16
33
|
useEditor.getState().armToolMode({ mode: 'select' })
|
|
17
34
|
useEditor.getState().armMaterialPaint({
|
|
@@ -56,14 +73,129 @@ describe('ToolMode transition', () => {
|
|
|
56
73
|
})
|
|
57
74
|
})
|
|
58
75
|
|
|
76
|
+
describe('leaving Select ends the selection', () => {
|
|
77
|
+
const ROOM = { levelId: 'level_1', zoneId: 'zone_1' }
|
|
78
|
+
|
|
79
|
+
function selectRoomAndNode() {
|
|
80
|
+
useEditor.getState().armToolMode({ mode: 'select' })
|
|
81
|
+
useViewer
|
|
82
|
+
.getState()
|
|
83
|
+
.setSelection({ selectedIds: ['wall_1' as never], zoneId: 'zone_1' as never })
|
|
84
|
+
useEditor.getState().selectRoom(ROOM)
|
|
85
|
+
useEditor.getState().setSelectedReferenceId(null)
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function expectNothingSelected() {
|
|
89
|
+
expect(useViewer.getState().selection.selectedIds).toEqual([])
|
|
90
|
+
expect(useViewer.getState().selection.zoneId).toBeNull()
|
|
91
|
+
expect(useEditor.getState().room).toBeNull()
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
test('picking a catalog item (the item tool) clears the room and node selection', () => {
|
|
95
|
+
selectRoomAndNode()
|
|
96
|
+
useEditor.getState().setSelectedItem({ id: 'chair' } as never)
|
|
97
|
+
useEditor.getState().setTool('item')
|
|
98
|
+
expectNothingSelected()
|
|
99
|
+
})
|
|
100
|
+
|
|
101
|
+
test('the door and window tools clear it', () => {
|
|
102
|
+
for (const tool of ['door', 'window'] as const) {
|
|
103
|
+
selectRoomAndNode()
|
|
104
|
+
useEditor.getState().armToolMode({ mode: 'build', tool })
|
|
105
|
+
expectNothingSelected()
|
|
106
|
+
}
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
test('draw tools clear it, and so does switching from one tool to another', () => {
|
|
110
|
+
selectRoomAndNode()
|
|
111
|
+
useEditor.getState().setMode('build')
|
|
112
|
+
expect(useEditor.getState().tool).toBe('wall')
|
|
113
|
+
expectNothingSelected()
|
|
114
|
+
|
|
115
|
+
// A tool that selects what it just drew (the roof, to draw into it next)
|
|
116
|
+
// loses that selection when another tool is picked.
|
|
117
|
+
useViewer.getState().setSelection({ selectedIds: ['roof_1' as never] })
|
|
118
|
+
useEditor.getState().armToolMode({ mode: 'build', tool: 'slab' })
|
|
119
|
+
expectNothingSelected()
|
|
120
|
+
})
|
|
121
|
+
|
|
122
|
+
test('re-arming the tool already in hand is not a transition', () => {
|
|
123
|
+
useEditor.getState().armToolMode({ mode: 'build', tool: 'roof' })
|
|
124
|
+
useViewer.getState().setSelection({ selectedIds: ['roof_1' as never] })
|
|
125
|
+
useEditor.getState().setTool('roof')
|
|
126
|
+
expect(useViewer.getState().selection.selectedIds).toEqual(['roof_1'])
|
|
127
|
+
})
|
|
128
|
+
|
|
129
|
+
test('paint clears it, after taking its target from the selection', () => {
|
|
130
|
+
const previousNodes = useScene.getState().nodes
|
|
131
|
+
useScene.setState({
|
|
132
|
+
nodes: { roof_1: { id: 'roof_1', type: 'roof' } as unknown as AnyNode } as never,
|
|
133
|
+
})
|
|
134
|
+
try {
|
|
135
|
+
useEditor.getState().setActivePaintTarget('wall')
|
|
136
|
+
selectRoomAndNode()
|
|
137
|
+
useViewer.getState().setSelection({ selectedIds: ['roof_1' as never] })
|
|
138
|
+
useEditor.getState().armMaterialPaint()
|
|
139
|
+
expect(useEditor.getState().mode).toBe('material-paint')
|
|
140
|
+
expect(useEditor.getState().activePaintTarget).toBe('roof')
|
|
141
|
+
expectNothingSelected()
|
|
142
|
+
} finally {
|
|
143
|
+
useScene.setState({ nodes: previousNodes })
|
|
144
|
+
}
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
test('terrain sculpt and delete clear it', () => {
|
|
148
|
+
for (const mode of ['terrain-sculpt', 'delete'] as const) {
|
|
149
|
+
selectRoomAndNode()
|
|
150
|
+
useEditor.getState().armToolMode({ mode })
|
|
151
|
+
expectNothingSelected()
|
|
152
|
+
}
|
|
153
|
+
})
|
|
154
|
+
|
|
155
|
+
test('the level and building context survive', () => {
|
|
156
|
+
useViewer
|
|
157
|
+
.getState()
|
|
158
|
+
.setSelection({ buildingId: 'building_1' as never, levelId: 'level_1' as never })
|
|
159
|
+
selectRoomAndNode()
|
|
160
|
+
useEditor.getState().armToolMode({ mode: 'build', tool: 'door' })
|
|
161
|
+
expect(useViewer.getState().selection.levelId).toBe('level_1')
|
|
162
|
+
expect(useViewer.getState().selection.buildingId).toBe('building_1')
|
|
163
|
+
})
|
|
164
|
+
|
|
165
|
+
test('Select, and a move or handle drag inside it, keep the selection', () => {
|
|
166
|
+
selectRoomAndNode()
|
|
167
|
+
useEditor.getState().armToolMode({ mode: 'select' })
|
|
168
|
+
expect(useViewer.getState().selection.selectedIds).toEqual(['wall_1'])
|
|
169
|
+
expect(useEditor.getState().room).toEqual(ROOM)
|
|
170
|
+
|
|
171
|
+
let cancelled = false
|
|
172
|
+
const handle = beginGesture({
|
|
173
|
+
kind: 'test-handle',
|
|
174
|
+
onCancel: () => {
|
|
175
|
+
cancelled = true
|
|
176
|
+
},
|
|
177
|
+
})
|
|
178
|
+
useEditor.getState().armToolMode({ mode: 'select' })
|
|
179
|
+
expect(handle.active).toBe(true)
|
|
180
|
+
handle.end()
|
|
181
|
+
expect(cancelled).toBe(false)
|
|
182
|
+
|
|
183
|
+
useEditor.getState().setMovingNode({ id: 'wall_1', type: 'wall' } as unknown as AnyNode)
|
|
184
|
+
expect(useInteractionScope.getState().scope.kind).toBe('moving')
|
|
185
|
+
expect(useEditor.getState().mode).toBe('select')
|
|
186
|
+
expect(useViewer.getState().selection.selectedIds).toEqual(['wall_1'])
|
|
187
|
+
useEditor.getState().setMovingNode(null)
|
|
188
|
+
expect(useViewer.getState().selection.selectedIds).toEqual(['wall_1'])
|
|
189
|
+
})
|
|
190
|
+
})
|
|
191
|
+
|
|
59
192
|
describe('persisted ToolMode normalization', () => {
|
|
60
193
|
test('elects a default for build with a null tool', () => {
|
|
61
194
|
const state = normalizePersistedEditorUiState({
|
|
62
|
-
phase: '
|
|
195
|
+
phase: 'building',
|
|
63
196
|
toolMode: { mode: 'build', tool: null as never },
|
|
64
197
|
mode: 'select',
|
|
65
198
|
tool: 'slab',
|
|
66
|
-
structureLayer: 'elements',
|
|
67
199
|
})
|
|
68
200
|
|
|
69
201
|
expect(state.toolMode).toEqual({ mode: 'build', tool: 'wall' })
|
|
@@ -73,11 +205,10 @@ describe('persisted ToolMode normalization', () => {
|
|
|
73
205
|
|
|
74
206
|
test('clears a persisted tool from a non-build mode', () => {
|
|
75
207
|
const state = normalizePersistedEditorUiState({
|
|
76
|
-
phase: '
|
|
208
|
+
phase: 'building',
|
|
77
209
|
toolMode: { mode: 'select' },
|
|
78
210
|
mode: 'build',
|
|
79
211
|
tool: 'wall',
|
|
80
|
-
structureLayer: 'elements',
|
|
81
212
|
})
|
|
82
213
|
|
|
83
214
|
expect(state.toolMode).toEqual({ mode: 'select' })
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { afterAll, beforeEach, describe, expect, test } from 'bun:test'
|
|
2
|
+
import useAudio, { AUDIO_MUTED_STORAGE_KEY, AUDIO_SETTINGS_STORAGE_KEY } from './use-audio'
|
|
3
|
+
|
|
4
|
+
function memoryStorage() {
|
|
5
|
+
const items = new Map<string, string>()
|
|
6
|
+
return {
|
|
7
|
+
items,
|
|
8
|
+
getItem: (key: string) => items.get(key) ?? null,
|
|
9
|
+
setItem: (key: string, value: string) => void items.set(key, value),
|
|
10
|
+
removeItem: (key: string) => void items.delete(key),
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
const originals = {
|
|
15
|
+
localStorage: Object.getOwnPropertyDescriptor(globalThis, 'localStorage'),
|
|
16
|
+
sessionStorage: Object.getOwnPropertyDescriptor(globalThis, 'sessionStorage'),
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function use(name: 'localStorage' | 'sessionStorage', storage: ReturnType<typeof memoryStorage>) {
|
|
20
|
+
Object.defineProperty(globalThis, name, { configurable: true, value: storage })
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** One browser profile: its tabs share `localStorage`, each has its own `sessionStorage`. */
|
|
24
|
+
let browser = memoryStorage()
|
|
25
|
+
|
|
26
|
+
/** Another tab of the profile saves the settings: the browser stores them and tells this tab. */
|
|
27
|
+
function savedInAnotherTab(state: Record<string, unknown>) {
|
|
28
|
+
const value = JSON.stringify({ state, version: 0 })
|
|
29
|
+
browser.setItem(AUDIO_SETTINGS_STORAGE_KEY, value)
|
|
30
|
+
globalThis.dispatchEvent(
|
|
31
|
+
Object.assign(new Event('storage'), { key: AUDIO_SETTINGS_STORAGE_KEY, newValue: value }),
|
|
32
|
+
)
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** The editor loading in a tab: a new one, or the same one reloaded (its session kept). */
|
|
36
|
+
async function loadIn(tab: ReturnType<typeof memoryStorage>) {
|
|
37
|
+
use('sessionStorage', tab)
|
|
38
|
+
await useAudio.persist.rehydrate()
|
|
39
|
+
return useAudio.getState()
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
beforeEach(() => {
|
|
43
|
+
browser = memoryStorage()
|
|
44
|
+
use('localStorage', browser)
|
|
45
|
+
})
|
|
46
|
+
|
|
47
|
+
afterAll(() => {
|
|
48
|
+
for (const [name, descriptor] of Object.entries(originals)) {
|
|
49
|
+
if (descriptor) Object.defineProperty(globalThis, name, descriptor)
|
|
50
|
+
else Reflect.deleteProperty(globalThis, name)
|
|
51
|
+
}
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
describe('muting a tab', () => {
|
|
55
|
+
test('a tab keeps its own mute across reloads, and a new tab starts from the last choice', async () => {
|
|
56
|
+
const first = memoryStorage()
|
|
57
|
+
const second = memoryStorage()
|
|
58
|
+
|
|
59
|
+
expect((await loadIn(first)).muted).toBe(false)
|
|
60
|
+
useAudio.getState().toggleMute()
|
|
61
|
+
|
|
62
|
+
expect((await loadIn(second)).muted).toBe(true)
|
|
63
|
+
useAudio.getState().setMuted(false)
|
|
64
|
+
|
|
65
|
+
expect((await loadIn(first)).muted).toBe(true)
|
|
66
|
+
expect((await loadIn(memoryStorage())).muted).toBe(false)
|
|
67
|
+
})
|
|
68
|
+
|
|
69
|
+
test("another tab's choice does not change a tab that never chose", async () => {
|
|
70
|
+
const quiet = memoryStorage()
|
|
71
|
+
expect((await loadIn(quiet)).muted).toBe(false)
|
|
72
|
+
|
|
73
|
+
await loadIn(memoryStorage())
|
|
74
|
+
useAudio.getState().setMuted(true)
|
|
75
|
+
|
|
76
|
+
expect((await loadIn(quiet)).muted).toBe(false)
|
|
77
|
+
})
|
|
78
|
+
|
|
79
|
+
test("volumes are every tab's and never carry a mute", async () => {
|
|
80
|
+
const muting = memoryStorage()
|
|
81
|
+
await loadIn(muting)
|
|
82
|
+
useAudio.getState().setMuted(true)
|
|
83
|
+
|
|
84
|
+
await loadIn(memoryStorage())
|
|
85
|
+
useAudio.getState().setMuted(false)
|
|
86
|
+
await loadIn(muting)
|
|
87
|
+
useAudio.getState().setSfxVolume(20)
|
|
88
|
+
|
|
89
|
+
expect(JSON.parse(browser.getItem(AUDIO_SETTINGS_STORAGE_KEY)!).state).not.toHaveProperty(
|
|
90
|
+
'muted',
|
|
91
|
+
)
|
|
92
|
+
expect(browser.getItem(AUDIO_MUTED_STORAGE_KEY)).toBe('false')
|
|
93
|
+
const next = await loadIn(memoryStorage())
|
|
94
|
+
expect(next.sfxVolume).toBe(20)
|
|
95
|
+
expect(next.muted).toBe(false)
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
test("a volume another tab sets reaches this one at once, and this tab's saves carry it", async () => {
|
|
99
|
+
await loadIn(memoryStorage())
|
|
100
|
+
useAudio.getState().setSfxVolume(30)
|
|
101
|
+
useAudio.getState().setRadioPlaying(true)
|
|
102
|
+
const stored = JSON.parse(browser.getItem(AUDIO_SETTINGS_STORAGE_KEY)!)
|
|
103
|
+
|
|
104
|
+
savedInAnotherTab({ ...stored.state, isRadioPlaying: false, muted: true, sfxVolume: 80 })
|
|
105
|
+
|
|
106
|
+
expect(useAudio.getState()).toMatchObject({ isRadioPlaying: true, muted: false, sfxVolume: 80 })
|
|
107
|
+
const setElsewhere = browser.getItem(AUDIO_SETTINGS_STORAGE_KEY)
|
|
108
|
+
useAudio.getState().setMuted(true)
|
|
109
|
+
expect(browser.getItem(AUDIO_SETTINGS_STORAGE_KEY)).toBe(setElsewhere)
|
|
110
|
+
// The radio pausing as the tab is hidden saves every setting: the other tab's volume stays.
|
|
111
|
+
useAudio.getState().setRadioPlaying(false)
|
|
112
|
+
useAudio.getState().setMasterVolume(60)
|
|
113
|
+
expect(JSON.parse(browser.getItem(AUDIO_SETTINGS_STORAGE_KEY)!).state).toMatchObject({
|
|
114
|
+
masterVolume: 60,
|
|
115
|
+
sfxVolume: 80,
|
|
116
|
+
})
|
|
117
|
+
})
|
|
118
|
+
|
|
119
|
+
test("a mute saved when it was every tab's still holds, in settings the old build still reads", async () => {
|
|
120
|
+
browser.setItem(
|
|
121
|
+
AUDIO_SETTINGS_STORAGE_KEY,
|
|
122
|
+
JSON.stringify({ state: { masterVolume: 40, muted: true, sfxVolume: 50 }, version: 0 }),
|
|
123
|
+
)
|
|
124
|
+
|
|
125
|
+
const state = await loadIn(memoryStorage())
|
|
126
|
+
|
|
127
|
+
expect(state.muted).toBe(true)
|
|
128
|
+
expect(state.masterVolume).toBe(40)
|
|
129
|
+
expect((await loadIn(memoryStorage())).muted).toBe(true)
|
|
130
|
+
useAudio.getState().setSfxVolume(45)
|
|
131
|
+
const saved = JSON.parse(browser.getItem(AUDIO_SETTINGS_STORAGE_KEY)!)
|
|
132
|
+
expect(saved).toMatchObject({ state: { masterVolume: 40, sfxVolume: 45 }, version: 0 })
|
|
133
|
+
expect(saved.state).not.toHaveProperty('muted')
|
|
134
|
+
})
|
|
135
|
+
|
|
136
|
+
test('a tab still on the old settings does not undo a choice made since', async () => {
|
|
137
|
+
await loadIn(memoryStorage())
|
|
138
|
+
useAudio.getState().setMuted(false)
|
|
139
|
+
browser.setItem(
|
|
140
|
+
AUDIO_SETTINGS_STORAGE_KEY,
|
|
141
|
+
JSON.stringify({ state: { muted: true, sfxVolume: 50 }, version: 0 }),
|
|
142
|
+
)
|
|
143
|
+
|
|
144
|
+
expect((await loadIn(memoryStorage())).muted).toBe(false)
|
|
145
|
+
})
|
|
146
|
+
})
|
package/src/store/use-audio.tsx
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
'use client'
|
|
2
2
|
|
|
3
3
|
import { create } from 'zustand'
|
|
4
|
-
import { persist } from 'zustand/middleware'
|
|
4
|
+
import { createJSONStorage, persist } from 'zustand/middleware'
|
|
5
|
+
|
|
6
|
+
export const AUDIO_SETTINGS_STORAGE_KEY = 'pascal-audio-settings'
|
|
7
|
+
/**
|
|
8
|
+
* Mute is each tab's own, so someone working in two projects can silence one and hear the other.
|
|
9
|
+
* Under this key `sessionStorage` holds this tab's mute (kept across its reloads) and
|
|
10
|
+
* `localStorage` the last choice made in any tab, which a new tab starts from.
|
|
11
|
+
*/
|
|
12
|
+
export const AUDIO_MUTED_STORAGE_KEY = 'pascal-audio-muted'
|
|
5
13
|
|
|
6
14
|
interface AudioState {
|
|
7
15
|
masterVolume: number
|
|
8
16
|
sfxVolume: number
|
|
9
17
|
radioVolume: number
|
|
10
18
|
isRadioPlaying: boolean
|
|
19
|
+
/** This tab's mute; the volumes are every tab's. */
|
|
11
20
|
muted: boolean
|
|
12
21
|
autoplay: boolean
|
|
13
22
|
setMasterVolume: (v: number) => void
|
|
@@ -15,10 +24,73 @@ interface AudioState {
|
|
|
15
24
|
setRadioVolume: (v: number) => void
|
|
16
25
|
setRadioPlaying: (v: boolean) => void
|
|
17
26
|
toggleRadioPlaying: () => void
|
|
27
|
+
setMuted: (muted: boolean) => void
|
|
18
28
|
toggleMute: () => void
|
|
19
29
|
setAutoplay: (v: boolean) => void
|
|
20
30
|
}
|
|
21
31
|
|
|
32
|
+
type StoredSettings = Pick<
|
|
33
|
+
AudioState,
|
|
34
|
+
'masterVolume' | 'sfxVolume' | 'radioVolume' | 'isRadioPlaying' | 'autoplay'
|
|
35
|
+
>
|
|
36
|
+
|
|
37
|
+
type BrowserStorage = 'localStorage' | 'sessionStorage'
|
|
38
|
+
|
|
39
|
+
// Storage can be missing (a test, a server render) or refuse access (site data blocked): the page
|
|
40
|
+
// then keeps its choices in memory only.
|
|
41
|
+
function readStored(storage: BrowserStorage, key: string) {
|
|
42
|
+
try {
|
|
43
|
+
return globalThis[storage]?.getItem(key) ?? null
|
|
44
|
+
} catch {
|
|
45
|
+
return null
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
function writeStored(storage: BrowserStorage, key: string, value: string) {
|
|
50
|
+
try {
|
|
51
|
+
globalThis[storage]?.setItem(key, value)
|
|
52
|
+
} catch {}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** This tab's mute. A tab without one takes the last choice made in any tab, and keeps it. */
|
|
56
|
+
function tabMuted(): boolean {
|
|
57
|
+
const own = readStored('sessionStorage', AUDIO_MUTED_STORAGE_KEY)
|
|
58
|
+
if (own !== null) return own === 'true'
|
|
59
|
+
const muted = readStored('localStorage', AUDIO_MUTED_STORAGE_KEY) === 'true'
|
|
60
|
+
writeStored('sessionStorage', AUDIO_MUTED_STORAGE_KEY, String(muted))
|
|
61
|
+
return muted
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** A mute chosen in this tab: this tab's, and where the next new tab starts. Open tabs keep theirs. */
|
|
65
|
+
function chooseMuted(muted: boolean) {
|
|
66
|
+
writeStored('sessionStorage', AUDIO_MUTED_STORAGE_KEY, String(muted))
|
|
67
|
+
writeStored('localStorage', AUDIO_MUTED_STORAGE_KEY, String(muted))
|
|
68
|
+
return { muted }
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// The settings as this tab last read, wrote or took from another tab. A save carries every
|
|
72
|
+
// setting, so a save that changes none (a mute, which is this tab's own) is skipped.
|
|
73
|
+
let heldSettings: string | null = null
|
|
74
|
+
// Set while this tab takes another tab's volumes: that is no choice of its own to save back.
|
|
75
|
+
let adopting = false
|
|
76
|
+
|
|
77
|
+
const settingsStorage = createJSONStorage<StoredSettings>(() => ({
|
|
78
|
+
getItem: (key) => {
|
|
79
|
+
heldSettings = readStored('localStorage', key)
|
|
80
|
+
return heldSettings
|
|
81
|
+
},
|
|
82
|
+
setItem: (key, value) => {
|
|
83
|
+
if (value === heldSettings) return
|
|
84
|
+
heldSettings = value
|
|
85
|
+
if (!adopting) writeStored('localStorage', key, value)
|
|
86
|
+
},
|
|
87
|
+
removeItem: (key) => {
|
|
88
|
+
try {
|
|
89
|
+
globalThis.localStorage?.removeItem(key)
|
|
90
|
+
} catch {}
|
|
91
|
+
},
|
|
92
|
+
}))
|
|
93
|
+
|
|
22
94
|
const useAudio = create<AudioState>()(
|
|
23
95
|
persist(
|
|
24
96
|
(set) => ({
|
|
@@ -33,13 +105,65 @@ const useAudio = create<AudioState>()(
|
|
|
33
105
|
setRadioVolume: (v) => set({ radioVolume: v }),
|
|
34
106
|
setRadioPlaying: (v) => set({ isRadioPlaying: v }),
|
|
35
107
|
toggleRadioPlaying: () => set((state) => ({ isRadioPlaying: !state.isRadioPlaying })),
|
|
36
|
-
|
|
108
|
+
setMuted: (muted) => set(chooseMuted(muted)),
|
|
109
|
+
toggleMute: () => set((state) => chooseMuted(!state.muted)),
|
|
37
110
|
setAutoplay: (v) => set({ autoplay: v }),
|
|
38
111
|
}),
|
|
39
112
|
{
|
|
40
|
-
name:
|
|
113
|
+
name: AUDIO_SETTINGS_STORAGE_KEY,
|
|
114
|
+
storage: settingsStorage,
|
|
115
|
+
partialize: ({ masterVolume, sfxVolume, radioVolume, isRadioPlaying, autoplay }) => ({
|
|
116
|
+
masterVolume,
|
|
117
|
+
sfxVolume,
|
|
118
|
+
radioVolume,
|
|
119
|
+
isRadioPlaying,
|
|
120
|
+
autoplay,
|
|
121
|
+
}),
|
|
122
|
+
// The settings once held one mute for every tab: whoever had muted stays muted, unless a tab
|
|
123
|
+
// has chosen since (a tab still on that build can write it again). The format is unchanged,
|
|
124
|
+
// so that build reads these settings back with only the mute gone.
|
|
125
|
+
merge: (persisted, current) => {
|
|
126
|
+
const { muted, ...settings } = (persisted ?? {}) as Partial<StoredSettings> & {
|
|
127
|
+
muted?: unknown
|
|
128
|
+
}
|
|
129
|
+
if (
|
|
130
|
+
typeof muted === 'boolean' &&
|
|
131
|
+
readStored('localStorage', AUDIO_MUTED_STORAGE_KEY) === null
|
|
132
|
+
) {
|
|
133
|
+
writeStored('localStorage', AUDIO_MUTED_STORAGE_KEY, String(muted))
|
|
134
|
+
}
|
|
135
|
+
return { ...current, ...settings, muted: tabMuted() }
|
|
136
|
+
},
|
|
41
137
|
},
|
|
42
138
|
),
|
|
43
139
|
)
|
|
44
140
|
|
|
141
|
+
/**
|
|
142
|
+
* Another tab saved the settings: the volumes are every tab's, so this tab takes them at once, and
|
|
143
|
+
* a later save of its own carries them. Its mute and whether its radio plays stay its own.
|
|
144
|
+
*/
|
|
145
|
+
function adoptOtherTabSettings(event: StorageEvent) {
|
|
146
|
+
if (event.key !== AUDIO_SETTINGS_STORAGE_KEY || event.newValue === null) return
|
|
147
|
+
let stored: Partial<Record<keyof StoredSettings, unknown>> | undefined
|
|
148
|
+
try {
|
|
149
|
+
stored = JSON.parse(event.newValue)?.state
|
|
150
|
+
} catch {
|
|
151
|
+
return
|
|
152
|
+
}
|
|
153
|
+
const shared: Partial<StoredSettings> = {}
|
|
154
|
+
for (const key of ['masterVolume', 'sfxVolume', 'radioVolume'] as const) {
|
|
155
|
+
const value = stored?.[key]
|
|
156
|
+
if (typeof value === 'number') shared[key] = value
|
|
157
|
+
}
|
|
158
|
+
if (typeof stored?.autoplay === 'boolean') shared.autoplay = stored.autoplay
|
|
159
|
+
adopting = true
|
|
160
|
+
try {
|
|
161
|
+
useAudio.setState(shared)
|
|
162
|
+
} finally {
|
|
163
|
+
adopting = false
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
globalThis.addEventListener?.('storage', adoptOtherTabSettings)
|
|
168
|
+
|
|
45
169
|
export default useAudio
|