@weasel-js/editing 1.19.1 → 2.0.0
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 +23 -11
- package/dist/actionGroups.js +27 -0
- package/dist/actionGroups.js.map +1 -0
- package/dist/actions/align/action.js +12 -9
- package/dist/actions/align/action.js.map +1 -1
- package/dist/actions/align/align.js +5 -4
- package/dist/actions/align/align.js.map +1 -1
- package/dist/actions/clipboard/action.js +10 -7
- package/dist/actions/clipboard/action.js.map +1 -1
- package/dist/actions/clone/action.js +217 -0
- package/dist/actions/clone/action.js.map +1 -0
- package/dist/actions/clone/behaviors.js +65 -0
- package/dist/actions/clone/behaviors.js.map +1 -0
- package/dist/actions/delete/delete.js +123 -0
- package/dist/actions/delete/delete.js.map +1 -0
- package/dist/actions/derivedBox.js +16 -0
- package/dist/actions/derivedBox.js.map +1 -0
- package/dist/actions/distribute/action.js +6 -3
- package/dist/actions/distribute/action.js.map +1 -1
- package/dist/actions/distribute/distribute.js +3 -2
- package/dist/actions/distribute/distribute.js.map +1 -1
- package/dist/actions/distribute/plan.js.map +1 -1
- package/dist/actions/edit/createPaintAction.js +42 -13
- package/dist/actions/edit/createPaintAction.js.map +1 -1
- package/dist/actions/edit/{escape.js → deselect.js} +8 -8
- package/dist/actions/edit/deselect.js.map +1 -0
- package/dist/actions/edit/duplicate.js +9 -7
- package/dist/actions/edit/duplicate.js.map +1 -1
- package/dist/actions/edit/group.js +24 -20
- package/dist/actions/edit/group.js.map +1 -1
- package/dist/actions/edit/ingest.js +4 -2
- package/dist/actions/edit/ingest.js.map +1 -1
- package/dist/actions/edit/nudge.js +14 -10
- package/dist/actions/edit/nudge.js.map +1 -1
- package/dist/actions/edit/selectAll.js +1 -1
- package/dist/actions/edit/setFill.js +1 -1
- package/dist/actions/edit/setFill.js.map +1 -1
- package/dist/actions/edit/setFillOpacity.js +5 -5
- package/dist/actions/edit/setFillOpacity.js.map +1 -1
- package/dist/actions/edit/setStroke.js +1 -1
- package/dist/actions/edit/setStroke.js.map +1 -1
- package/dist/actions/edit/setStrokeOpacity.js +6 -6
- package/dist/actions/edit/setStrokeOpacity.js.map +1 -1
- package/dist/actions/edit/setStrokeWidth.js +13 -8
- package/dist/actions/edit/setStrokeWidth.js.map +1 -1
- package/dist/actions/edit/setVertexColor.js +13 -6
- package/dist/actions/edit/setVertexColor.js.map +1 -1
- package/dist/actions/flip/action.js +19 -14
- package/dist/actions/flip/action.js.map +1 -1
- package/dist/actions/flip/helpers.js.map +1 -1
- package/dist/actions/group/enterGroup.js +81 -0
- package/dist/actions/group/enterGroup.js.map +1 -0
- package/dist/actions/insert/action.js +152 -0
- package/dist/actions/insert/action.js.map +1 -0
- package/dist/actions/insert/commit.js +52 -0
- package/dist/actions/insert/commit.js.map +1 -0
- package/dist/actions/insert/extras.js +88 -0
- package/dist/actions/insert/extras.js.map +1 -0
- package/dist/actions/insert/frame.js +96 -0
- package/dist/actions/insert/frame.js.map +1 -0
- package/dist/actions/insert/geometry.js +35 -0
- package/dist/actions/insert/geometry.js.map +1 -0
- package/dist/actions/insert/lands.js +41 -0
- package/dist/actions/insert/lands.js.map +1 -0
- package/dist/actions/insert/params.js +42 -0
- package/dist/actions/insert/params.js.map +1 -0
- package/dist/actions/insert/placeAction.js +137 -0
- package/dist/actions/insert/placeAction.js.map +1 -0
- package/dist/actions/insert/repositionAction.js +47 -0
- package/dist/actions/insert/repositionAction.js.map +1 -0
- package/dist/actions/insert/rotateAction.js +34 -0
- package/dist/actions/insert/rotateAction.js.map +1 -0
- package/dist/actions/insert/session.js +99 -0
- package/dist/actions/insert/session.js.map +1 -0
- package/dist/actions/insert/shape.js +117 -0
- package/dist/actions/insert/shape.js.map +1 -0
- package/dist/actions/insert/style.js +23 -0
- package/dist/actions/insert/style.js.map +1 -0
- package/dist/actions/lassoSelect/action.js +201 -0
- package/dist/actions/lassoSelect/action.js.map +1 -0
- package/dist/actions/lassoSelect/behaviors/selectFromLasso.js +61 -0
- package/dist/actions/lassoSelect/behaviors/selectFromLasso.js.map +1 -0
- package/dist/actions/lockedWrites.js +20 -0
- package/dist/actions/lockedWrites.js.map +1 -0
- package/dist/actions/move/action.js +138 -0
- package/dist/actions/move/action.js.map +1 -0
- package/dist/actions/move/behaviors/clampMove.js +42 -0
- package/dist/actions/move/behaviors/clampMove.js.map +1 -0
- package/dist/actions/move/behaviors/layoutDrop.js +84 -0
- package/dist/actions/move/behaviors/layoutDrop.js.map +1 -0
- package/dist/actions/move/behaviors/pageDrop.js +30 -0
- package/dist/actions/move/behaviors/pageDrop.js.map +1 -0
- package/dist/actions/move/behaviors/reparentOnDrop.js +44 -0
- package/dist/actions/move/behaviors/reparentOnDrop.js.map +1 -0
- package/dist/actions/move/behaviors/snapBackOrDelete.js +52 -0
- package/dist/actions/move/behaviors/snapBackOrDelete.js.map +1 -0
- package/dist/actions/move/behaviors/snapToContainer.js +214 -0
- package/dist/actions/move/behaviors/snapToContainer.js.map +1 -0
- package/dist/actions/move/behaviors/swapOnDrop.js +180 -0
- package/dist/actions/move/behaviors/swapOnDrop.js.map +1 -0
- package/dist/actions/move/capture.js +116 -0
- package/dist/actions/move/capture.js.map +1 -0
- package/dist/actions/move/commit/index.js +47 -0
- package/dist/actions/move/commit/index.js.map +1 -0
- package/dist/actions/move/commit/layoutDrop.js +68 -0
- package/dist/actions/move/commit/layoutDrop.js.map +1 -0
- package/dist/actions/move/commit/layoutRelease.js +146 -0
- package/dist/actions/move/commit/layoutRelease.js.map +1 -0
- package/dist/actions/move/commit/pageDrop.js +162 -0
- package/dist/actions/move/commit/pageDrop.js.map +1 -0
- package/dist/actions/move/commit/rebase.js +24 -0
- package/dist/actions/move/commit/rebase.js.map +1 -0
- package/dist/actions/move/commit/reparent.js +157 -0
- package/dist/actions/move/commit/reparent.js.map +1 -0
- package/dist/actions/move/delta.js +127 -0
- package/dist/actions/move/delta.js.map +1 -0
- package/dist/actions/move/dragSnap.js +55 -0
- package/dist/actions/move/dragSnap.js.map +1 -0
- package/dist/actions/move/frame.js +67 -0
- package/dist/actions/move/frame.js.map +1 -0
- package/dist/actions/move/gestureAdapter.js +36 -0
- package/dist/actions/move/gestureAdapter.js.map +1 -0
- package/dist/actions/move/landedDescendants.js +50 -0
- package/dist/actions/move/landedDescendants.js.map +1 -0
- package/dist/actions/move/layout/container.js +119 -0
- package/dist/actions/move/layout/container.js.map +1 -0
- package/dist/actions/move/layout/dragged.js +75 -0
- package/dist/actions/move/layout/dragged.js.map +1 -0
- package/dist/actions/move/layout/dropPass.js +205 -0
- package/dist/actions/move/layout/dropPass.js.map +1 -0
- package/dist/actions/move/layout/exits.js +62 -0
- package/dist/actions/move/layout/exits.js.map +1 -0
- package/dist/actions/move/layout/glide.js +70 -0
- package/dist/actions/move/layout/glide.js.map +1 -0
- package/dist/actions/move/layout/view.js +60 -0
- package/dist/actions/move/layout/view.js.map +1 -0
- package/dist/actions/move/refusal.js +49 -0
- package/dist/actions/move/refusal.js.map +1 -0
- package/dist/actions/move/session.js +105 -0
- package/dist/actions/move/session.js.map +1 -0
- package/dist/actions/move/sessionOf.js +27 -0
- package/dist/actions/move/sessionOf.js.map +1 -0
- package/dist/actions/move/translate.js +49 -0
- package/dist/actions/move/translate.js.map +1 -0
- package/dist/actions/pathfinder/action.js +8 -6
- package/dist/actions/pathfinder/action.js.map +1 -1
- package/dist/actions/pathfinder/booleanGroupAction.js +16 -10
- package/dist/actions/pathfinder/booleanGroupAction.js.map +1 -1
- package/dist/actions/pathfinder/keymap.js +2 -2
- package/dist/actions/pathfinder/keymap.js.map +1 -1
- package/dist/actions/reorder/reorder.js +13 -11
- package/dist/actions/reorder/reorder.js.map +1 -1
- package/dist/actions/resize/action.js +105 -0
- package/dist/actions/resize/action.js.map +1 -0
- package/dist/actions/resize/aspect.js +42 -0
- package/dist/actions/resize/aspect.js.map +1 -0
- package/dist/actions/resize/behaviors/clampMinSize.js +100 -0
- package/dist/actions/resize/behaviors/clampMinSize.js.map +1 -0
- package/dist/actions/resize/boxFrame.js +19 -0
- package/dist/actions/resize/boxFrame.js.map +1 -0
- package/dist/actions/resize/capture.js +121 -0
- package/dist/actions/resize/capture.js.map +1 -0
- package/dist/actions/resize/commit.js +104 -0
- package/dist/actions/resize/commit.js.map +1 -0
- package/dist/actions/resize/frame.js +171 -0
- package/dist/actions/resize/frame.js.map +1 -0
- package/dist/actions/resize/held.js +44 -0
- package/dist/actions/resize/held.js.map +1 -0
- package/dist/actions/resize/minimum.js +34 -0
- package/dist/actions/resize/minimum.js.map +1 -0
- package/dist/actions/resize/replay.js +58 -0
- package/dist/actions/resize/replay.js.map +1 -0
- package/dist/actions/resize/ruleBounds.js +11 -0
- package/dist/actions/resize/ruleBounds.js.map +1 -0
- package/dist/actions/resize/session.js +118 -0
- package/dist/actions/resize/session.js.map +1 -0
- package/dist/actions/rotate/action.js +99 -0
- package/dist/actions/rotate/action.js.map +1 -0
- package/dist/actions/rotate/commit.js +48 -0
- package/dist/actions/rotate/commit.js.map +1 -0
- package/dist/actions/rotate/frame.js +96 -0
- package/dist/actions/rotate/frame.js.map +1 -0
- package/dist/actions/rotate/replay.js +25 -0
- package/dist/actions/rotate/replay.js.map +1 -0
- package/dist/actions/rotate/session.js +135 -0
- package/dist/actions/rotate/session.js.map +1 -0
- package/dist/actions/select/areaSelect.js +83 -0
- package/dist/actions/select/areaSelect.js.map +1 -0
- package/dist/actions/select/clearSelection.js +33 -0
- package/dist/actions/select/clearSelection.js.map +1 -0
- package/dist/actions/swap/action.js +63 -0
- package/dist/actions/swap/action.js.map +1 -0
- package/dist/actions/swap/swapOps.js +160 -0
- package/dist/actions/swap/swapOps.js.map +1 -0
- package/dist/actions/transformAgain/action.js +16 -14
- package/dist/actions/transformAgain/action.js.map +1 -1
- package/dist/actions/transformAgain/transformSelection.js +19 -5
- package/dist/actions/transformAgain/transformSelection.js.map +1 -1
- package/dist/booleans/booleans.js +130 -0
- package/dist/booleans/booleans.js.map +1 -0
- package/dist/booleans/commit.js +45 -0
- package/dist/booleans/commit.js.map +1 -0
- package/dist/booleans/custom.js +48 -0
- package/dist/booleans/custom.js.map +1 -0
- package/dist/booleans/operands.js +50 -0
- package/dist/booleans/operands.js.map +1 -0
- package/dist/booleans/pieces.js +43 -0
- package/dist/booleans/pieces.js.map +1 -0
- package/dist/booleans/placement.js +37 -0
- package/dist/booleans/placement.js.map +1 -0
- package/dist/booleans/useBooleans.js +34 -0
- package/dist/booleans/useBooleans.js.map +1 -0
- package/dist/booleans/useBooleansAdapter.js +11 -0
- package/dist/booleans/useBooleansAdapter.js.map +1 -0
- package/dist/chrome/affordances/cornerResize.js +123 -0
- package/dist/chrome/affordances/cornerResize.js.map +1 -0
- package/dist/chrome/affordances/rotateCursor.js +17 -0
- package/dist/chrome/affordances/rotateCursor.js.map +1 -0
- package/dist/chrome/affordances/rotationHandle.js +117 -0
- package/dist/chrome/affordances/rotationHandle.js.map +1 -0
- package/dist/chrome/handleCommands.js +110 -0
- package/dist/chrome/handleCommands.js.map +1 -0
- package/dist/chrome/overlay.js +271 -0
- package/dist/chrome/overlay.js.map +1 -0
- package/dist/chrome/rotationBadge.js +132 -0
- package/dist/chrome/rotationBadge.js.map +1 -0
- package/dist/chrome/rotationHandleGeometry.js +49 -0
- package/dist/chrome/rotationHandleGeometry.js.map +1 -0
- package/dist/chrome/selectionChrome.js +25 -0
- package/dist/chrome/selectionChrome.js.map +1 -0
- package/dist/chrome/selectionPose.js +112 -0
- package/dist/chrome/selectionPose.js.map +1 -0
- package/dist/chrome/shapeOutline.js +137 -0
- package/dist/chrome/shapeOutline.js.map +1 -0
- package/dist/clipboard/clipboardOps.js +48 -0
- package/dist/clipboard/clipboardOps.js.map +1 -0
- package/dist/clipboard/materializePaste.js +34 -0
- package/dist/clipboard/materializePaste.js.map +1 -0
- package/dist/clipboard/osClipboard.js +67 -0
- package/dist/clipboard/osClipboard.js.map +1 -0
- package/dist/clipboard/useClipboard.js +64 -0
- package/dist/clipboard/useClipboard.js.map +1 -0
- package/dist/clipboard/wireFormat.js +108 -0
- package/dist/clipboard/wireFormat.js.map +1 -0
- package/dist/deps/areaSelect.js +42 -0
- package/dist/deps/areaSelect.js.map +1 -0
- package/dist/deps/booleans.js +99 -0
- package/dist/deps/booleans.js.map +1 -0
- package/dist/deps/insert.js +260 -0
- package/dist/deps/insert.js.map +1 -0
- package/dist/deps/lassoSelect.js +37 -0
- package/dist/deps/lassoSelect.js.map +1 -0
- package/dist/deps/presetDeps.js +40 -0
- package/dist/deps/presetDeps.js.map +1 -0
- package/dist/deps/resizePolicy.js +41 -0
- package/dist/deps/resizePolicy.js.map +1 -0
- package/dist/engine-BV9RDHOL.d.ts +339 -0
- package/dist/engine.d.ts +6 -0
- package/dist/engine.js +10 -0
- package/dist/engineStandardActions.js +16 -7
- package/dist/engineStandardActions.js.map +1 -1
- package/dist/groups.d.ts +27 -0
- package/dist/groups.js +4 -0
- package/dist/icons.gen.js +8 -0
- package/dist/icons.gen.js.map +1 -0
- package/dist/icons.table.d.ts +6 -0
- package/dist/icons.table.js +8 -0
- package/dist/icons.table.js.map +1 -0
- package/dist/icons.table.json +156 -0
- package/dist/icons2.table.js +163 -0
- package/dist/icons2.table.js.map +1 -0
- package/dist/index.d.ts +1293 -105
- package/dist/index.js +61 -12
- package/dist/ingest/ghost.js +58 -0
- package/dist/ingest/ghost.js.map +1 -0
- package/dist/ingest/imageHandler.js +80 -0
- package/dist/ingest/imageHandler.js.map +1 -0
- package/dist/ingest/kitHandlers.js +15 -0
- package/dist/ingest/kitHandlers.js.map +1 -0
- package/dist/ingest/svgHandler.js +97 -0
- package/dist/ingest/svgHandler.js.map +1 -0
- package/dist/ingest/weaselJsonHandler.js +68 -0
- package/dist/ingest/weaselJsonHandler.js.map +1 -0
- package/dist/namedPresets.js +23 -11
- package/dist/namedPresets.js.map +1 -1
- package/dist/presets/arrange.js +21 -7
- package/dist/presets/arrange.js.map +1 -1
- package/dist/presets/booleans.js +13 -0
- package/dist/presets/booleans.js.map +1 -0
- package/dist/presets/composites.js +8 -5
- package/dist/presets/composites.js.map +1 -1
- package/dist/presets/edit.js +25 -13
- package/dist/presets/edit.js.map +1 -1
- package/dist/presets/ingest.js +7 -3
- package/dist/presets/ingest.js.map +1 -1
- package/dist/presets/insert.js +28 -0
- package/dist/presets/insert.js.map +1 -0
- package/dist/presets/pathfinder.js +5 -2
- package/dist/presets/pathfinder.js.map +1 -1
- package/dist/presets/select.js +16 -3
- package/dist/presets/select.js.map +1 -1
- package/dist/presets/selection.js +13 -0
- package/dist/presets/selection.js.map +1 -0
- package/dist/presets/selectionChrome.js +15 -0
- package/dist/presets/selectionChrome.js.map +1 -0
- package/dist/presets/tools.js +78 -9
- package/dist/presets/tools.js.map +1 -1
- package/dist/presets/transform.js +20 -7
- package/dist/presets/transform.js.map +1 -1
- package/dist/presets.d.ts +104 -0
- package/dist/presets.js +15 -0
- package/dist/selection/useSelection.js +127 -0
- package/dist/selection/useSelection.js.map +1 -0
- package/dist/test-seams.d.ts +50 -0
- package/dist/test-seams.js +4 -0
- package/dist/tools/ellipse/useEllipseTool.js +72 -0
- package/dist/tools/ellipse/useEllipseTool.js.map +1 -0
- package/dist/tools/eyedropper/useEyedropperTool.js +100 -0
- package/dist/tools/eyedropper/useEyedropperTool.js.map +1 -0
- package/dist/tools/image/useImageTool.js +57 -0
- package/dist/tools/image/useImageTool.js.map +1 -0
- package/dist/tools/lasso/useLassoTool.js +96 -0
- package/dist/tools/lasso/useLassoTool.js.map +1 -0
- package/dist/tools/line/useLineTool.js +67 -0
- package/dist/tools/line/useLineTool.js.map +1 -0
- package/dist/tools/polygon/usePolygonTool.js +149 -0
- package/dist/tools/polygon/usePolygonTool.js.map +1 -0
- package/dist/tools/rect/useRectTool.js +74 -0
- package/dist/tools/rect/useRectTool.js.map +1 -0
- package/dist/tools/select/adapterPointQuery.js +56 -0
- package/dist/tools/select/adapterPointQuery.js.map +1 -0
- package/dist/tools/select/collapseDeferred.js +35 -0
- package/dist/tools/select/collapseDeferred.js.map +1 -0
- package/dist/tools/select/extendPressLocked.js +17 -0
- package/dist/tools/select/extendPressLocked.js.map +1 -0
- package/dist/tools/select/groupEntry.js +73 -0
- package/dist/tools/select/groupEntry.js.map +1 -0
- package/dist/tools/select/pressDecision.js +39 -0
- package/dist/tools/select/pressDecision.js.map +1 -0
- package/dist/tools/select/selectDeep.js +39 -0
- package/dist/tools/select/selectDeep.js.map +1 -0
- package/dist/tools/select/selectPick.js +60 -0
- package/dist/tools/select/selectPick.js.map +1 -0
- package/dist/tools/select/selectionContributions.js +191 -0
- package/dist/tools/select/selectionContributions.js.map +1 -0
- package/dist/tools/select/usePickerSelectTool.js +145 -0
- package/dist/tools/select/usePickerSelectTool.js.map +1 -0
- package/dist/tools/select/useSelectTool.js +54 -0
- package/dist/tools/select/useSelectTool.js.map +1 -0
- package/dist/tools/shared/countOption.js +24 -0
- package/dist/tools/shared/countOption.js.map +1 -0
- package/dist/tools/shared/insertToolOptions.js +8 -0
- package/dist/tools/shared/insertToolOptions.js.map +1 -0
- package/dist/tools/shared/pointerFollower.js +23 -0
- package/dist/tools/shared/pointerFollower.js.map +1 -0
- package/dist/tools/shared/styleOptions.js +76 -0
- package/dist/tools/shared/styleOptions.js.map +1 -0
- package/dist/tools/star/useStarTool.js +149 -0
- package/dist/tools/star/useStarTool.js.map +1 -0
- package/dist/tools/toolSets.js +26 -0
- package/dist/tools/toolSets.js.map +1 -0
- package/package.json +39 -11
- package/dist/actions/edit/escape.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reparent.js","names":["rebaseLocalPose"],"sources":["../../../../src/actions/move/commit/reparent.ts"],"sourcesContent":["import { followerOpsFor, carryPose, planeOf, translateNodeOps } from '@weasel-js/core';\nimport { isPageStructure, pageIdOf, planeToPlane, rebaseLocalPose, sceneViewPoseAdapter, refusalOf } from '@weasel-js/core/engine';\nimport type { Op, NodeId, ReparentOnDrop } from '@weasel-js/core';\nimport { draggedWorldPose, grabbedPoseAdapter } from '../delta';\nimport type { MoveSession } from '../session';\nimport { translateOps } from '../translate';\nimport { worldBoundsOf, type MoveRefusal } from '../refusal';\nimport * as coreOps from '@weasel-js/core/ops';\n\n/** Resolved drop target — the new parent + layer + (for `'above'` mode)\n * the hit sibling whose z-order position the moved node should land\n * immediately above. `newParent === null` means \"land at the layer\n * root\" (top-level node of `newLayer`). */\nexport interface DropTarget {\n newParent: NodeId | null;\n newLayer: string;\n hitSibling: NodeId | null;\n}\n\n/** Walk the hit chain to find the appropriate drop target. Returns\n * `null` when no reparent should happen (drop on empty canvas, the\n * only hits are the moved subtree itself, or a page or the run refuses\n * it, since the climb never passes page structure), and a refusal when the first\n * node of the chain to answer refuses with a reason. */\nexport function resolveDrop(\n session: MoveSession,\n at: { x: number; y: number },\n): DropTarget | { refused: MoveRefusal } | null {\n const dep = session.nodeAtPoint;\n if (!dep) return null;\n\n // Exclude moved roots + their descendants. Otherwise we'd happily\n // reparent a node into itself (or under one of its own children).\n const exclude = new Set<NodeId>([...session.ids, ...session.cascadeIds]);\n const hit = dep(at, exclude);\n if (!hit) return null;\n\n const hitNode = session.scene.get(hit);\n if (!hitNode) return null;\n\n // A node that admits the drop is a drop-INTO target; one that refuses it\n // silently is a sibling to land beside, inside the nearest ancestor that\n // admits it. When there is none, `newParent === null` and the moved subtree\n // lands at the layer root.\n let newParent: NodeId | null = hit;\n let hitSibling: NodeId | null = null;\n while (newParent !== null) {\n const verdict = session.verdict(newParent);\n if (verdict === true) break;\n const reason = refusalOf(verdict);\n if (reason !== null) return { refused: { id: newParent, bounds: worldBoundsOf(session, newParent), reason } };\n if (isPageStructure(session.scene.get(newParent))) return null;\n hitSibling = newParent;\n newParent = session.scene.get(newParent)?.parent ?? null;\n }\n return { newParent, newLayer: hitNode.layer, hitSibling };\n}\n\n/** Move `id` within `siblings`, a destination's children as the next op will find them, to just above\n * `above` when it is among them, else to the end. Returns the index to reparent `id` to, or `undefined` to\n * append. */\nexport function landAbove(siblings: NodeId[], id: NodeId, above: NodeId | null): number | undefined {\n const was = siblings.indexOf(id);\n if (was >= 0) siblings.splice(was, 1);\n const hit = above === null ? -1 : siblings.indexOf(above);\n const toIndex = hit >= 0 ? hit + 1 : undefined;\n if (toIndex === undefined) siblings.push(id);\n else siblings.splice(toIndex, 0, id);\n return toIndex;\n}\n\n/** Root `id`'s pose stored under `newParent` on `newLayer`, keeping the world pose the drag `delta` shows.\n * `null` when `newParent`'s frame is singular and no stored pose keeps it. */\nexport function landedLocalPose(\n session: MoveSession,\n id: NodeId,\n newParent: NodeId | null,\n newLayer: string,\n delta: { dx: number; dy: number },\n): object | null {\n const { scene, pc, view } = session;\n const adapter = sceneViewPoseAdapter(scene);\n const layer = scene.get(id)!.layer;\n const world = carryPose(\n session.descriptorOf(id),\n draggedWorldPose(session, grabbedPoseAdapter(session, adapter), id, delta),\n layer !== newLayer ? planeToPlane(planeOf(view, layer), planeOf(view, newLayer)) : null,\n );\n return rebaseLocalPose(adapter, world, newParent as string | null, pc.compose, pc.decompose) as object | null;\n}\n\n/** The ops for `ids`, descendants of a root moved into `newParent`: each one stored in the frame it is\n * moved into, on `newLayer` when given, at the world place the drag `delta` gives. One a moving frame\n * carries keeps only what it caught mid-glide, as in a translate. `null` when one cannot keep its place. */\nexport function landedCascadeOps(\n session: MoveSession,\n ids: readonly NodeId[],\n newParent: NodeId | null,\n delta: { dx: number; dy: number },\n newLayer?: string,\n): Op[] | null {\n const own = new Map<NodeId, { dx: number; dy: number }>();\n for (const id of ids) {\n const start = session.startPoses.get(id);\n if (start === undefined || session.carried.has(id) || !session.scene.get(id)) continue;\n const d = session.descriptorOf(id);\n const landed = landedLocalPose(session, id, newParent, newLayer ?? session.scene.get(id)!.layer, delta);\n if (landed === null) return null;\n const from = d.getBounds(start);\n const to = d.getBounds(landed);\n const c = session.caught.get(id) ?? { dx: 0, dy: 0 };\n own.set(id, { dx: to.x - from.x + c.dx, dy: to.y - from.y + c.dy });\n }\n return [\n ...translateOps(session, ids.filter((id) => session.carried.has(id)), delta),\n ...translateNodeOps(\n session.scene, own.keys(), (id) => own.get(id) ?? null, session.descriptorOf, session.geometryProjection,\n session.lifecycle.label,\n ),\n ];\n}\n\n/** The ops that move root `id` into `to` at `toIndex`, onto `layer` first when it is on another. */\nexport function landOps(\n session: MoveSession,\n id: NodeId,\n to: NodeId | null,\n toIndex: number | undefined,\n layer: string,\n): Op[] {\n const node = session.scene.get(id)!;\n const label = session.lifecycle.label;\n const ops: Op[] = [];\n let from = node.parent as string | null;\n if (node.layer !== layer) {\n // The scene refuses a layer change on a node whose parent is on another layer.\n if (from !== null) {\n ops.push(coreOps.reparent({\n id: id as string, fromParentId: from, toParentId: null, label, coalesceKey: `reparent:${id}:orphan`,\n }));\n from = null;\n }\n ops.push(coreOps.setLayer({ id: id as string, from: node.layer, to: layer, label }));\n }\n ops.push(coreOps.reparent({ id: id as string, fromParentId: from, toParentId: to as string | null, toIndex, label }));\n return ops;\n}\n\n/** Reparent and reposition each moved root as ops, keeping the world pose the\n * drag showed, then the ops that bring uncarried descendants along, and the\n * followers whose page that changes (`followerMoves`). `null` when any of\n * them would land in a singular frame, so the drop refuses whole. */\nexport function reparentOps(\n session: MoveSession,\n target: DropTarget,\n mode: ReparentOnDrop,\n delta: { dx: number; dy: number },\n): Op[] | null {\n const { scene } = session;\n const label = session.lifecycle.label;\n const ops: Op[] = [];\n // The destination's children as each op will find them: an earlier root's\n // landing shifts where a later one goes.\n const siblings = [...(target.newParent === null ? scene.roots : scene.childrenOf(target.newParent))];\n const roots = new Set(session.outer);\n for (const id of roots) {\n const node = scene.get(id);\n // A node removed mid-drag is skipped, as the translate commit skips it.\n if (!session.startPoses.has(id) || node === undefined) continue;\n const to = landedLocalPose(session, id, target.newParent, target.newLayer, delta);\n if (to === null) return null;\n const toIndex = landAbove(siblings, id, mode === 'above' ? target.hitSibling : null);\n ops.push(...landOps(session, id, target.newParent, toIndex, target.newLayer));\n ops.push(coreOps.setPose<unknown>({ id: id as string, from: node.pose, to, label }));\n }\n const riders = [...new Set([...session.ids.filter((id) => !roots.has(id)), ...session.cascadeIds])];\n const page = target.newParent === null ? null : pageIdOf(scene, target.newParent);\n const landed = new Map([...roots].filter((id) => session.startPoses.has(id) && scene.get(id) !== undefined)\n .map((id) => [id as string, page]));\n const cascade = landedCascadeOps(session, riders, target.newParent, delta, target.newLayer);\n const followers = followerOpsFor(scene, landed, label);\n return cascade === null || followers === null ? null : [...ops, ...cascade, ...followers];\n}\n"],"mappings":"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"}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { snapLanding } from "./dragSnap.js";
|
|
2
|
+
import { leadUnder, planeOf, translatePoseViaDescriptor } from "@weasel-js/core";
|
|
3
|
+
import { composeWorldPose as composeWorldPose$1, toPlane } from "@weasel-js/core/engine";
|
|
4
|
+
|
|
5
|
+
// src/actions/move/delta.ts
|
|
6
|
+
/**
|
|
7
|
+
* The world drag `(dx, dy)` as a translation of `id`'s stored pose. A pose is
|
|
8
|
+
* stored in its frame, so under a turned frame the two point different ways.
|
|
9
|
+
* `null` in a singular frame: no stored move follows the drag there, so the
|
|
10
|
+
* node stays where it is.
|
|
11
|
+
*/
|
|
12
|
+
function localDelta(session, id, dx0, dy0) {
|
|
13
|
+
const { dx, dy } = planeDelta(session, id, dx0, dy0);
|
|
14
|
+
const f = session.frames.get(id);
|
|
15
|
+
if (f === void 0) return {
|
|
16
|
+
dx,
|
|
17
|
+
dy
|
|
18
|
+
};
|
|
19
|
+
const { pc } = session;
|
|
20
|
+
const d = session.descriptorOf(id);
|
|
21
|
+
const fromPose = pc.decompose(f.frameWorld, f.world);
|
|
22
|
+
const toPose = pc.decompose(f.frameWorld, translatePoseViaDescriptor(f.world, dx, dy, d, leadFor(session, id, dx0, dy0)));
|
|
23
|
+
if (fromPose === null || toPose === null) return null;
|
|
24
|
+
const from = d.getBounds(fromPose);
|
|
25
|
+
const to = d.getBounds(toPose);
|
|
26
|
+
return {
|
|
27
|
+
dx: to.x - from.x,
|
|
28
|
+
dy: to.y - from.y
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
var leads = /* @__PURE__ */ new WeakMap();
|
|
32
|
+
/** The move's first root, at press and dragged by `(dx0, dy0)`, in world
|
|
33
|
+
* space. Kept for the last drag asked about, since every id asks per frame. */
|
|
34
|
+
function moveLead(session, dx0, dy0) {
|
|
35
|
+
const last = leads.get(session);
|
|
36
|
+
const snapped = snapLanding(session, dx0, dy0);
|
|
37
|
+
if (last && last.dx0 === dx0 && last.dy0 === dy0 && last.landing === snapped) return last;
|
|
38
|
+
const id = session.ids.find((r) => session.startPoses.has(r) && !session.carried.has(r) && !session.caught.has(r));
|
|
39
|
+
let next = {
|
|
40
|
+
dx0,
|
|
41
|
+
dy0,
|
|
42
|
+
dx: dx0,
|
|
43
|
+
dy: dy0,
|
|
44
|
+
lead: null,
|
|
45
|
+
landing: snapped
|
|
46
|
+
};
|
|
47
|
+
if (id !== void 0) {
|
|
48
|
+
const from = session.frames.get(id)?.world ?? session.startPoses.get(id);
|
|
49
|
+
const { dx, dy } = planeDelta(session, id, dx0, dy0);
|
|
50
|
+
const landing = dx === dx0 && dy === dy0 ? snapped : void 0;
|
|
51
|
+
next = {
|
|
52
|
+
dx0,
|
|
53
|
+
dy0,
|
|
54
|
+
dx,
|
|
55
|
+
dy,
|
|
56
|
+
lead: {
|
|
57
|
+
from,
|
|
58
|
+
to: translatePoseViaDescriptor(from, dx, dy, session.descriptorOf(id), void 0, landing)
|
|
59
|
+
},
|
|
60
|
+
landing: snapped
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
leads.set(session, next);
|
|
64
|
+
return next;
|
|
65
|
+
}
|
|
66
|
+
/** The lead to translate `id`'s world pose with under the drag `(dx0, dy0)`:
|
|
67
|
+
* the move's first root, when `id` measures the drag as the same delta. */
|
|
68
|
+
function leadFor(session, id, dx0, dy0) {
|
|
69
|
+
if (session.caught.has(id)) return void 0;
|
|
70
|
+
const m = moveLead(session, dx0, dy0);
|
|
71
|
+
if (!m.lead) return void 0;
|
|
72
|
+
const own = planeDelta(session, id, dx0, dy0);
|
|
73
|
+
return own.dx === m.dx && own.dy === m.dy ? m.lead : void 0;
|
|
74
|
+
}
|
|
75
|
+
/** The lead for translating `id`'s stored pose: the world lead, carried into
|
|
76
|
+
* the frame `id` is stored in. */
|
|
77
|
+
function storedLeadFor(session, id, dx0, dy0) {
|
|
78
|
+
const lead = leadFor(session, id, dx0, dy0);
|
|
79
|
+
return lead && leadUnder(session.pc, session.frames.get(id)?.frameWorld ?? null, lead);
|
|
80
|
+
}
|
|
81
|
+
/** The pose `id` stores once dragged by `(dx, dy)` from `start`, its stored
|
|
82
|
+
* pose at press. Unmoved when its frame is what moves. */
|
|
83
|
+
function draggedStoredPose(session, id, start, dx, dy) {
|
|
84
|
+
if (session.carried.has(id)) return start;
|
|
85
|
+
const l = localDelta(session, id, dx, dy);
|
|
86
|
+
if (l === null) return start;
|
|
87
|
+
return translatePoseViaDescriptor(start, l.dx, l.dy, session.descriptorOf(id), storedLeadFor(session, id, dx, dy));
|
|
88
|
+
}
|
|
89
|
+
/** The drag `(dx, dy)`, measured in the edited plane, as the drag of `id` in
|
|
90
|
+
* the world its own layer stores it in. */
|
|
91
|
+
function planeDelta(session, id, dx, dy) {
|
|
92
|
+
const layer = session.scene.get(id)?.layer;
|
|
93
|
+
const ref = layer === void 0 ? void 0 : session.planeRefs.get(layer);
|
|
94
|
+
if (!ref) return {
|
|
95
|
+
dx,
|
|
96
|
+
dy
|
|
97
|
+
};
|
|
98
|
+
const out = planeOf(session.view, layer);
|
|
99
|
+
const at = {
|
|
100
|
+
x: ref.edited.x + dx,
|
|
101
|
+
y: ref.edited.y + dy
|
|
102
|
+
};
|
|
103
|
+
const p = out ? toPlane(out, at) : at;
|
|
104
|
+
return {
|
|
105
|
+
dx: p.x - ref.own.x,
|
|
106
|
+
dy: p.y - ref.own.y
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
/** `adapter`, except that an id caught mid-glide answers with the pose it was
|
|
110
|
+
* grabbed at — where the drag measures it from. */
|
|
111
|
+
function grabbedPoseAdapter(session, adapter) {
|
|
112
|
+
if (session.caught.size === 0) return adapter;
|
|
113
|
+
return {
|
|
114
|
+
...adapter,
|
|
115
|
+
getPose: (id) => session.caught.has(id) ? session.startPoses.get(id) : adapter.getPose(id)
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
/** The world pose `id` was dragged to: its pose at press composed up through
|
|
119
|
+
* `adapter`, moved by the drag as its own layer's plane measures it. */
|
|
120
|
+
function draggedWorldPose(session, adapter, id, delta) {
|
|
121
|
+
const start = composeWorldPose$1(adapter, id, session.pc.compose);
|
|
122
|
+
const own = planeDelta(session, id, delta.dx, delta.dy);
|
|
123
|
+
return translatePoseViaDescriptor(start, own.dx, own.dy, session.descriptorOf(id), leadFor(session, id, delta.dx, delta.dy));
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
export { draggedStoredPose, draggedWorldPose, grabbedPoseAdapter, localDelta, planeDelta, storedLeadFor };
|
|
127
|
+
//# sourceMappingURL=delta.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delta.js","names":["composeWorldPose"],"sources":["../../../src/actions/move/delta.ts"],"sourcesContent":["import type { NodeId } from '@weasel-js/core';\nimport { leadUnder, translatePoseViaDescriptor, type TranslateLead, planeOf } from '@weasel-js/core';\nimport { toPlane, composeWorldPose, type PoseAdapter } from '@weasel-js/core/engine';\nimport type { MoveSession } from './session';\nimport { snapLanding } from './dragSnap';\n\n/**\n * The world drag `(dx, dy)` as a translation of `id`'s stored pose. A pose is\n * stored in its frame, so under a turned frame the two point different ways.\n * `null` in a singular frame: no stored move follows the drag there, so the\n * node stays where it is.\n */\nexport function localDelta(\n session: MoveSession,\n id: NodeId,\n dx0: number,\n dy0: number,\n): { dx: number; dy: number } | null {\n const { dx, dy } = planeDelta(session, id, dx0, dy0);\n const f = session.frames.get(id);\n if (f === undefined) return { dx, dy };\n const { pc } = session;\n const d = session.descriptorOf(id);\n const fromPose = pc.decompose(f.frameWorld, f.world);\n const toPose = pc.decompose(f.frameWorld, translatePoseViaDescriptor(f.world, dx, dy, d, leadFor(session, id, dx0, dy0)));\n if (fromPose === null || toPose === null) return null;\n const from = d.getBounds(fromPose);\n const to = d.getBounds(toPose);\n return { dx: to.x - from.x, dy: to.y - from.y };\n}\n\ninterface MoveLead {\n readonly dx0: number;\n readonly dy0: number;\n /** The lead's own delta, as its layer's plane measures the drag. */\n readonly dx: number;\n readonly dy: number;\n readonly lead: TranslateLead<unknown> | null;\n /** The snap's landing for `(dx0, dy0)` the lead was made with, which can change with the delta held still. */\n readonly landing: unknown;\n}\n\nconst leads = new WeakMap<MoveSession, MoveLead>();\n\n/** The move's first root, at press and dragged by `(dx0, dy0)`, in world\n * space. Kept for the last drag asked about, since every id asks per frame. */\nfunction moveLead(session: MoveSession, dx0: number, dy0: number): MoveLead {\n const last = leads.get(session);\n const snapped = snapLanding(session, dx0, dy0);\n if (last && last.dx0 === dx0 && last.dy0 === dy0 && last.landing === snapped) return last;\n const id = session.ids.find((r) =>\n session.startPoses.has(r) && !session.carried.has(r) && !session.caught.has(r));\n let next: MoveLead = { dx0, dy0, dx: dx0, dy: dy0, lead: null, landing: snapped };\n if (id !== undefined) {\n const from = session.frames.get(id)?.world ?? session.startPoses.get(id);\n const { dx, dy } = planeDelta(session, id, dx0, dy0);\n // A landing is the snap's answer for the drag as the edited plane measured it.\n const landing = dx === dx0 && dy === dy0 ? snapped : undefined;\n const to = translatePoseViaDescriptor(from, dx, dy, session.descriptorOf(id), undefined, landing);\n next = { dx0, dy0, dx, dy, lead: { from, to }, landing: snapped };\n }\n leads.set(session, next);\n return next;\n}\n\n/** The lead to translate `id`'s world pose with under the drag `(dx0, dy0)`:\n * the move's first root, when `id` measures the drag as the same delta. */\nfunction leadFor(session: MoveSession, id: NodeId, dx0: number, dy0: number): TranslateLead<unknown> | undefined {\n if (session.caught.has(id)) return undefined;\n const m = moveLead(session, dx0, dy0);\n if (!m.lead) return undefined;\n const own = planeDelta(session, id, dx0, dy0);\n return own.dx === m.dx && own.dy === m.dy ? m.lead : undefined;\n}\n\n/** The lead for translating `id`'s stored pose: the world lead, carried into\n * the frame `id` is stored in. */\nexport function storedLeadFor(session: MoveSession, id: NodeId, dx0: number, dy0: number): TranslateLead<unknown> | undefined {\n const lead = leadFor(session, id, dx0, dy0);\n return lead && leadUnder(session.pc, session.frames.get(id)?.frameWorld ?? null, lead);\n}\n\n/** The pose `id` stores once dragged by `(dx, dy)` from `start`, its stored\n * pose at press. Unmoved when its frame is what moves. */\nexport function draggedStoredPose(session: MoveSession, id: NodeId, start: unknown, dx: number, dy: number): unknown {\n if (session.carried.has(id)) return start;\n const l = localDelta(session, id, dx, dy);\n if (l === null) return start;\n return translatePoseViaDescriptor(start, l.dx, l.dy, session.descriptorOf(id), storedLeadFor(session, id, dx, dy));\n}\n\n/** The drag `(dx, dy)`, measured in the edited plane, as the drag of `id` in\n * the world its own layer stores it in. */\nexport function planeDelta(\n session: MoveSession,\n id: NodeId,\n dx: number,\n dy: number,\n): { dx: number; dy: number } {\n const layer = session.scene.get(id)?.layer;\n const ref = layer === undefined ? undefined : session.planeRefs.get(layer);\n if (!ref) return { dx, dy };\n const out = planeOf(session.view, layer!);\n const at = { x: ref.edited.x + dx, y: ref.edited.y + dy };\n const p = out ? toPlane(out, at) : at;\n return { dx: p.x - ref.own.x, dy: p.y - ref.own.y };\n}\n\n/** `adapter`, except that an id caught mid-glide answers with the pose it was\n * grabbed at — where the drag measures it from. */\nexport function grabbedPoseAdapter(\n session: MoveSession,\n adapter: PoseAdapter<unknown>,\n): PoseAdapter<unknown> {\n if (session.caught.size === 0) return adapter;\n return {\n ...adapter,\n getPose: (id) => (session.caught.has(id as NodeId)\n ? session.startPoses.get(id as NodeId)\n : adapter.getPose(id)),\n };\n}\n\n/** The world pose `id` was dragged to: its pose at press composed up through\n * `adapter`, moved by the drag as its own layer's plane measures it. */\nexport function draggedWorldPose(\n session: MoveSession,\n adapter: PoseAdapter<unknown>,\n id: NodeId,\n delta: { dx: number; dy: number },\n): unknown {\n const start = composeWorldPose(adapter, id as string, session.pc.compose);\n const own = planeDelta(session, id, delta.dx, delta.dy);\n return translatePoseViaDescriptor(\n start, own.dx, own.dy, session.descriptorOf(id), leadFor(session, id, delta.dx, delta.dy),\n );\n}\n"],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { createLazySnapSession } from "@weasel-js/core";
|
|
2
|
+
import { snapMods } from "@weasel-js/core/engine";
|
|
3
|
+
|
|
4
|
+
// src/actions/move/dragSnap.ts
|
|
5
|
+
/** The snapping of a drag that translates `ids`, which offer no targets unless `exclude` names others. */
|
|
6
|
+
function beginDragSnap(ctx, ids, exclude) {
|
|
7
|
+
const press = ctx.drag?.start ?? ctx.world;
|
|
8
|
+
return {
|
|
9
|
+
snap: createLazySnapSession(ctx.deps.snap, {
|
|
10
|
+
gesture: "move",
|
|
11
|
+
ids,
|
|
12
|
+
press,
|
|
13
|
+
constrain: "axis",
|
|
14
|
+
...exclude ? { exclude } : {}
|
|
15
|
+
}),
|
|
16
|
+
press
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
/** Each session's latest landing, with the delta it was reported for. */
|
|
20
|
+
var landings = /* @__PURE__ */ new WeakMap();
|
|
21
|
+
/** The pointer's delta, moved so the subject lands on what the snap session
|
|
22
|
+
* holds it to. */
|
|
23
|
+
function snappedDelta(drag, moveCtx) {
|
|
24
|
+
const d = moveCtx.drag.delta;
|
|
25
|
+
if (!drag.snap) return {
|
|
26
|
+
dx: d.x,
|
|
27
|
+
dy: d.y
|
|
28
|
+
};
|
|
29
|
+
const { press } = drag;
|
|
30
|
+
const out = drag.snap.at({
|
|
31
|
+
x: press.x + d.x,
|
|
32
|
+
y: press.y + d.y
|
|
33
|
+
}, snapMods(moveCtx));
|
|
34
|
+
const dx = out.point.x - press.x;
|
|
35
|
+
const dy = out.point.y - press.y;
|
|
36
|
+
if (out.landing === void 0) landings.delete(drag.snap);
|
|
37
|
+
else landings.set(drag.snap, {
|
|
38
|
+
dx,
|
|
39
|
+
dy,
|
|
40
|
+
landing: out.landing
|
|
41
|
+
});
|
|
42
|
+
return {
|
|
43
|
+
dx,
|
|
44
|
+
dy
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
/** The host's landing (`SnapOutcome.landing`) for the drag `(dx, dy)`, when
|
|
48
|
+
* that is the delta the session last snapped to; otherwise undefined. */
|
|
49
|
+
function snapLanding(drag, dx, dy) {
|
|
50
|
+
const last = drag.snap ? landings.get(drag.snap) : void 0;
|
|
51
|
+
return last && last.dx === dx && last.dy === dy ? last.landing : void 0;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export { beginDragSnap, snapLanding, snappedDelta };
|
|
55
|
+
//# sourceMappingURL=dragSnap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dragSnap.js","names":[],"sources":["../../../src/actions/move/dragSnap.ts"],"sourcesContent":["import type { InvocationCtx, WorldPoint } from '@weasel-js/routing';\nimport type { SnapSession } from '@weasel-js/core/engine';\nimport { createLazySnapSession } from '@weasel-js/core';\nimport { snapMods } from '@weasel-js/core/engine';\n\n/** A translate drag's snapping: a move's, or a clone's. */\nexport interface DragSnap {\n /** Begun once the drag passes its threshold; null with no `snap` dep. */\n readonly snap: SnapSession | null;\n /** The press, in the coordinates the drag's delta is measured in. */\n readonly press: WorldPoint;\n}\n\n/** The snapping of a drag that translates `ids`, which offer no targets unless `exclude` names others. */\nexport function beginDragSnap(ctx: InvocationCtx, ids: readonly string[], exclude?: readonly string[]): DragSnap {\n const press = ctx.drag?.start ?? ctx.world;\n return {\n snap: createLazySnapSession(ctx.deps.snap, { gesture: 'move', ids, press, constrain: 'axis', ...(exclude ? { exclude } : {}) }),\n press,\n };\n}\n\ninterface Landed {\n readonly dx: number;\n readonly dy: number;\n readonly landing: unknown;\n}\n\n/** Each session's latest landing, with the delta it was reported for. */\nconst landings = new WeakMap<SnapSession, Landed>();\n\n/** The pointer's delta, moved so the subject lands on what the snap session\n * holds it to. */\nexport function snappedDelta(drag: DragSnap, moveCtx: InvocationCtx): { dx: number; dy: number } {\n const d = moveCtx.drag!.delta;\n if (!drag.snap) return { dx: d.x, dy: d.y };\n const { press } = drag;\n const out = drag.snap.at({ x: press.x + d.x, y: press.y + d.y }, snapMods(moveCtx));\n const dx = out.point.x - press.x;\n const dy = out.point.y - press.y;\n if (out.landing === undefined) landings.delete(drag.snap);\n else landings.set(drag.snap, { dx, dy, landing: out.landing });\n return { dx, dy };\n}\n\n/** The host's landing (`SnapOutcome.landing`) for the drag `(dx, dy)`, when\n * that is the delta the session last snapped to; otherwise undefined. */\nexport function snapLanding(drag: DragSnap, dx: number, dy: number): unknown {\n const last = drag.snap ? landings.get(drag.snap) : undefined;\n return last && last.dx === dx && last.dy === dy ? last.landing : undefined;\n}\n"],"mappings":";;;;;AAcA,SAAgB,cAAc,KAAoB,KAAwB,SAAuC;CAC/G,MAAM,QAAQ,IAAI,MAAM,SAAS,IAAI;CACrC,OAAO;EACL,MAAM,sBAAsB,IAAI,KAAK,MAAM;GAAE,SAAS;GAAQ;GAAK;GAAO,WAAW;GAAQ,GAAI,UAAU,EAAE,QAAQ,IAAI,CAAC;EAAG,CAAC;EAC9H;CACF;AACF;;AASA,IAAM,2BAAW,IAAI,QAA6B;;;AAIlD,SAAgB,aAAa,MAAgB,SAAoD;CAC/F,MAAM,IAAI,QAAQ,KAAM;CACxB,IAAI,CAAC,KAAK,MAAM,OAAO;EAAE,IAAI,EAAE;EAAG,IAAI,EAAE;CAAE;CAC1C,MAAM,EAAE,UAAU;CAClB,MAAM,MAAM,KAAK,KAAK,GAAG;EAAE,GAAG,MAAM,IAAI,EAAE;EAAG,GAAG,MAAM,IAAI,EAAE;CAAE,GAAG,SAAS,OAAO,CAAC;CAClF,MAAM,KAAK,IAAI,MAAM,IAAI,MAAM;CAC/B,MAAM,KAAK,IAAI,MAAM,IAAI,MAAM;CAC/B,IAAI,IAAI,YAAY,QAAW,SAAS,OAAO,KAAK,IAAI;MACnD,SAAS,IAAI,KAAK,MAAM;EAAE;EAAI;EAAI,SAAS,IAAI;CAAQ,CAAC;CAC7D,OAAO;EAAE;EAAI;CAAG;AAClB;;;AAIA,SAAgB,YAAY,MAAgB,IAAY,IAAqB;CAC3E,MAAM,OAAO,KAAK,OAAO,SAAS,IAAI,KAAK,IAAI,IAAI;CACnD,OAAO,QAAQ,KAAK,OAAO,MAAM,KAAK,OAAO,KAAK,KAAK,UAAU;AACnE"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { draggedStoredPose } from "./delta.js";
|
|
2
|
+
import { snappedDelta } from "./dragSnap.js";
|
|
3
|
+
import { pointerStateOf, quantizedPreview } from "@weasel-js/core";
|
|
4
|
+
|
|
5
|
+
// src/actions/move/frame.ts
|
|
6
|
+
function foldBehaviors(session, readers, moveCtx, dx, dy) {
|
|
7
|
+
const posed = /* @__PURE__ */ new Map();
|
|
8
|
+
const opaque = /* @__PURE__ */ new Set();
|
|
9
|
+
const overlays = [];
|
|
10
|
+
const gctx = session.gestureCtx;
|
|
11
|
+
gctx.modifiers = { ...moveCtx.modifiers };
|
|
12
|
+
gctx.pointer = pointerStateOf(moveCtx.drag.current, moveCtx);
|
|
13
|
+
gctx.view = readers.view();
|
|
14
|
+
gctx.plane = readers.plane();
|
|
15
|
+
for (const [id, ori] of session.startPoses) gctx.current.set(id, draggedStoredPose(session, id, ori, dx, dy));
|
|
16
|
+
let transform = {
|
|
17
|
+
kind: "translate",
|
|
18
|
+
dx,
|
|
19
|
+
dy
|
|
20
|
+
};
|
|
21
|
+
let cursor;
|
|
22
|
+
for (const b of session.behaviors) {
|
|
23
|
+
const r = b.onMove?.(gctx, transform);
|
|
24
|
+
if (!r) continue;
|
|
25
|
+
if (r.poses) for (const [id, pose] of r.poses) posed.set(id, pose);
|
|
26
|
+
if (r.opaque) for (const id of r.opaque) opaque.add(id);
|
|
27
|
+
if (r.overlays) overlays.push(...r.overlays);
|
|
28
|
+
if (r.cursor !== void 0) cursor = r.cursor;
|
|
29
|
+
if (r.transform) transform = r.transform;
|
|
30
|
+
if (r.snap !== void 0) gctx.snap = r.snap;
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
dx: transform.dx,
|
|
34
|
+
dy: transform.dy,
|
|
35
|
+
posed,
|
|
36
|
+
opaque,
|
|
37
|
+
overlays,
|
|
38
|
+
...cursor !== void 0 ? { cursor } : {}
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
/** One move's delta and previews: the pointer's delta as the behaviors shaped
|
|
42
|
+
* it, every displaced id's stored pose under it, and whatever else the
|
|
43
|
+
* behaviors posed. */
|
|
44
|
+
function nextFrame(session, readers, moveCtx) {
|
|
45
|
+
const snapped = snappedDelta(session, moveCtx);
|
|
46
|
+
const { dx, dy, posed, opaque, overlays, cursor } = foldBehaviors(session, readers, moveCtx, snapped.dx, snapped.dy);
|
|
47
|
+
const delta = {
|
|
48
|
+
dx,
|
|
49
|
+
dy
|
|
50
|
+
};
|
|
51
|
+
const previews = /* @__PURE__ */ new Map();
|
|
52
|
+
for (const [id, ori] of session.startPoses) {
|
|
53
|
+
const dragged = draggedStoredPose(session, id, ori, dx, dy);
|
|
54
|
+
previews.set(id, quantizedPreview(session.scene, id, session.carried.has(id) ? dragged : posed.get(id) ?? dragged));
|
|
55
|
+
}
|
|
56
|
+
for (const [id, pose] of posed) if (!session.startPoses.has(id)) previews.set(id, quantizedPreview(session.scene, id, pose));
|
|
57
|
+
return {
|
|
58
|
+
delta,
|
|
59
|
+
previews,
|
|
60
|
+
opaque,
|
|
61
|
+
overlays,
|
|
62
|
+
...cursor !== void 0 ? { cursor } : {}
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export { nextFrame };
|
|
67
|
+
//# sourceMappingURL=frame.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frame.js","names":[],"sources":["../../../src/actions/move/frame.ts"],"sourcesContent":["import type { InvocationCtx, OngoingOverlay } from '@weasel-js/routing';\nimport { pointerStateOf, quantizedPreview } from '@weasel-js/core';\nimport type { NodeId, GestureReaders } from '@weasel-js/core';\nimport type { BehaviorResult, GroupTransform } from '@weasel-js/core/engine';\nimport type { CursorSpec } from '@weasel-js/cursor';\nimport { draggedStoredPose } from './delta';\nimport { snappedDelta } from './dragSnap';\nimport type { MoveFrame, MoveSession } from './session';\n\nfunction foldBehaviors(\n session: MoveSession,\n readers: GestureReaders,\n moveCtx: InvocationCtx,\n dx: number,\n dy: number,\n): { dx: number; dy: number; posed: Map<NodeId, unknown>; opaque: Set<NodeId>; overlays: OngoingOverlay[]; cursor?: CursorSpec } {\n const posed = new Map<NodeId, unknown>();\n const opaque = new Set<NodeId>();\n const overlays: OngoingOverlay[] = [];\n const gctx = session.gestureCtx;\n gctx.modifiers = { ...moveCtx.modifiers };\n gctx.pointer = pointerStateOf(moveCtx.drag!.current, moveCtx);\n gctx.view = readers.view();\n gctx.plane = readers.plane();\n // `current` is pre-populated from the raw cursor delta BEFORE\n // any behavior shapes `transform`. Unlike `onEnd`, it is NOT\n // refreshed after each behavior runs — so onMove behaviors\n // should derive position from `origin` + the `proposed`\n // GroupTransform arg, NOT from `ctx.current` (which reflects\n // the unmodified delta at this frame's start).\n for (const [id, ori] of session.startPoses) {\n gctx.current.set(id as string, draggedStoredPose(session, id, ori, dx, dy));\n }\n let transform: GroupTransform = { kind: 'translate', dx, dy };\n let cursor: CursorSpec | undefined;\n for (const b of session.behaviors) {\n const r: BehaviorResult<unknown> | void = b.onMove?.(gctx, transform);\n if (!r) continue;\n if (r.poses) for (const [id, pose] of r.poses) posed.set(id as NodeId, pose);\n if (r.opaque) for (const id of r.opaque) opaque.add(id as NodeId);\n if (r.overlays) overlays.push(...r.overlays);\n if (r.cursor !== undefined) cursor = r.cursor;\n if (r.transform) transform = r.transform;\n if (r.snap !== undefined) gctx.snap = r.snap;\n }\n return { dx: transform.dx, dy: transform.dy, posed, opaque, overlays, ...(cursor !== undefined ? { cursor } : {}) };\n}\n\n/** One move's delta and previews: the pointer's delta as the behaviors shaped\n * it, every displaced id's stored pose under it, and whatever else the\n * behaviors posed. */\nexport function nextFrame(session: MoveSession, readers: GestureReaders, moveCtx: InvocationCtx): MoveFrame {\n const snapped = snappedDelta(session, moveCtx);\n const { dx, dy, posed, opaque, overlays, cursor } = foldBehaviors(session, readers, moveCtx, snapped.dx, snapped.dy);\n\n // The delta stays in the frame — no scene writes, no history entries.\n const delta = { dx, dy };\n // Every displaced id's pose (roots + cascade), published to the scene's\n // overrides by the action.\n const previews = new Map<NodeId, unknown>();\n for (const [id, ori] of session.startPoses) {\n const dragged = draggedStoredPose(session, id, ori, dx, dy);\n previews.set(id, quantizedPreview(session.scene, id, session.carried.has(id) ? dragged : posed.get(id) ?? dragged));\n }\n for (const [id, pose] of posed) if (!session.startPoses.has(id)) previews.set(id, quantizedPreview(session.scene, id, pose));\n return { delta, previews, opaque, overlays, ...(cursor !== undefined ? { cursor } : {}) };\n}\n"],"mappings":";;;;;AASA,SAAS,cACP,SACA,SACA,SACA,IACA,IAC+H;CAC/H,MAAM,wBAAQ,IAAI,IAAqB;CACvC,MAAM,yBAAS,IAAI,IAAY;CAC/B,MAAM,WAA6B,CAAC;CACpC,MAAM,OAAO,QAAQ;CACrB,KAAK,YAAY,EAAE,GAAG,QAAQ,UAAU;CACxC,KAAK,UAAU,eAAe,QAAQ,KAAM,SAAS,OAAO;CAC5D,KAAK,OAAO,QAAQ,KAAK;CACzB,KAAK,QAAQ,QAAQ,MAAM;CAO3B,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAC9B,KAAK,QAAQ,IAAI,IAAc,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE,CAAC;CAE5E,IAAI,YAA4B;EAAE,MAAM;EAAa;EAAI;CAAG;CAC5D,IAAI;CACJ,KAAK,MAAM,KAAK,QAAQ,WAAW;EACjC,MAAM,IAAoC,EAAE,SAAS,MAAM,SAAS;EACpE,IAAI,CAAC,GAAG;EACR,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,OAAO,MAAM,IAAI,IAAc,IAAI;EAC3E,IAAI,EAAE,QAAQ,KAAK,MAAM,MAAM,EAAE,QAAQ,OAAO,IAAI,EAAY;EAChE,IAAI,EAAE,UAAU,SAAS,KAAK,GAAG,EAAE,QAAQ;EAC3C,IAAI,EAAE,WAAW,QAAW,SAAS,EAAE;EACvC,IAAI,EAAE,WAAW,YAAY,EAAE;EAC/B,IAAI,EAAE,SAAS,QAAW,KAAK,OAAO,EAAE;CAC1C;CACA,OAAO;EAAE,IAAI,UAAU;EAAI,IAAI,UAAU;EAAI;EAAO;EAAQ;EAAU,GAAI,WAAW,SAAY,EAAE,OAAO,IAAI,CAAC;CAAG;AACpH;;;;AAKA,SAAgB,UAAU,SAAsB,SAAyB,SAAmC;CAC1G,MAAM,UAAU,aAAa,SAAS,OAAO;CAC7C,MAAM,EAAE,IAAI,IAAI,OAAO,QAAQ,UAAU,WAAW,cAAc,SAAS,SAAS,SAAS,QAAQ,IAAI,QAAQ,EAAE;CAGnH,MAAM,QAAQ;EAAE;EAAI;CAAG;CAGvB,MAAM,2BAAW,IAAI,IAAqB;CAC1C,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAAY;EAC1C,MAAM,UAAU,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE;EAC1D,SAAS,IAAI,IAAI,iBAAiB,QAAQ,OAAO,IAAI,QAAQ,QAAQ,IAAI,EAAE,IAAI,UAAU,MAAM,IAAI,EAAE,KAAK,OAAO,CAAC;CACpH;CACA,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO,IAAI,CAAC,QAAQ,WAAW,IAAI,EAAE,GAAG,SAAS,IAAI,IAAI,iBAAiB,QAAQ,OAAO,IAAI,IAAI,CAAC;CAC3H,OAAO;EAAE;EAAO;EAAU;EAAQ;EAAU,GAAI,WAAW,SAAY,EAAE,OAAO,IAAI,CAAC;CAAG;AAC1F"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { scenePoseTarget } from "@weasel-js/core";
|
|
2
|
+
import { asNodeId as asNodeId$1, defaultCommitAdapter as defaultCommitAdapter$1 } from "@weasel-js/core/engine";
|
|
3
|
+
|
|
4
|
+
// src/actions/move/gestureAdapter.ts
|
|
5
|
+
/** `commit` is how a behavior's own `applyOps` batch lands; the returned
|
|
6
|
+
* adapter is passed back so the ops apply through it. Left out, the adapter
|
|
7
|
+
* has no `applyOps`. `selection` is as `defaultCommitAdapter` takes it. */
|
|
8
|
+
function moveGestureAdapter(scene, commit, selection) {
|
|
9
|
+
const previews = /* @__PURE__ */ new Map();
|
|
10
|
+
const adapter = {
|
|
11
|
+
...defaultCommitAdapter$1(scene, selection),
|
|
12
|
+
...commit ? { applyOps: (ops, label) => commit(ops, label, adapter) } : {},
|
|
13
|
+
previewPoses: (poses) => {
|
|
14
|
+
const { overrides } = scene;
|
|
15
|
+
for (const [id, pose] of poses) {
|
|
16
|
+
const nodeId = asNodeId$1(id);
|
|
17
|
+
const mine = previews.get(id);
|
|
18
|
+
if (pose === null) {
|
|
19
|
+
previews.delete(id);
|
|
20
|
+
if (mine !== void 0) overrides.clear(nodeId, mine);
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
const entry = mine ?? { pose };
|
|
24
|
+
entry.pose = pose;
|
|
25
|
+
previews.set(id, entry);
|
|
26
|
+
if (!overrides.has(nodeId, entry)) overrides.set(nodeId, entry);
|
|
27
|
+
}
|
|
28
|
+
overrides.commit();
|
|
29
|
+
},
|
|
30
|
+
poseTarget: (id, descriptor) => scenePoseTarget(scene, id, descriptor)
|
|
31
|
+
};
|
|
32
|
+
return adapter;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export { moveGestureAdapter };
|
|
36
|
+
//# sourceMappingURL=gestureAdapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gestureAdapter.js","names":["defaultCommitAdapter","asNodeId"],"sources":["../../../src/actions/move/gestureAdapter.ts"],"sourcesContent":["/**\n * The scene-backed adapter the move behavior pipeline reads and commits\n * through: the default actions' commit adapter, plus what a behavior needs\n * while the gesture runs and after it ends (`previewPoses`, `poseTarget`, and\n * an `applyOps` of its own).\n */\nimport type { Op } from '@weasel-js/core';\nimport type { CommitSelectionMethods, SceneNode as Node, PoseOverride, Scene, MoveAdapter } from '@weasel-js/core/engine';\nimport { asNodeId, defaultCommitAdapter } from '@weasel-js/core/engine';\nimport { scenePoseTarget } from '@weasel-js/core';\n\nexport type MoveGestureAdapter<TPose> = MoveAdapter<Node<unknown, string, TPose>, TPose>\n & ReturnType<typeof defaultCommitAdapter<TPose>>\n & { previewPoses(poses: ReadonlyMap<string, TPose | null>): void };\n\n/** `commit` is how a behavior's own `applyOps` batch lands; the returned\n * adapter is passed back so the ops apply through it. Left out, the adapter\n * has no `applyOps`. `selection` is as `defaultCommitAdapter` takes it. */\nexport function moveGestureAdapter<TPose>(\n scene: Scene<unknown, string, TPose>,\n commit?: (ops: Op[], label: string, adapter: MoveGestureAdapter<TPose>) => void,\n selection?: CommitSelectionMethods,\n): MoveGestureAdapter<TPose> {\n const previews = new Map<string, PoseOverride<TPose>>();\n const adapter: MoveGestureAdapter<TPose> = {\n ...defaultCommitAdapter(scene, selection),\n ...(commit ? { applyOps: (ops: Op[], label: string) => commit(ops, label, adapter) } : {}),\n previewPoses: (poses) => {\n const { overrides } = scene;\n for (const [id, pose] of poses) {\n const nodeId = asNodeId(id);\n const mine = previews.get(id);\n if (pose === null) {\n previews.delete(id);\n if (mine !== undefined) overrides.clear(nodeId, mine);\n continue;\n }\n const entry = mine ?? { pose };\n entry.pose = pose;\n previews.set(id, entry);\n // Back where it stood if the table dropped it: the node went and came back.\n if (!overrides.has(nodeId, entry)) overrides.set(nodeId, entry);\n }\n overrides.commit();\n },\n poseTarget: (id, descriptor) => scenePoseTarget(scene, id, descriptor),\n };\n return adapter;\n}\n"],"mappings":";;;;;;;AAkBA,SAAgB,mBACd,OACA,QACA,WAC2B;CAC3B,MAAM,2BAAW,IAAI,IAAiC;CACtD,MAAM,UAAqC;EACzC,GAAGA,uBAAqB,OAAO,SAAS;EACxC,GAAI,SAAS,EAAE,WAAW,KAAW,UAAkB,OAAO,KAAK,OAAO,OAAO,EAAE,IAAI,CAAC;EACxF,eAAe,UAAU;GACvB,MAAM,EAAE,cAAc;GACtB,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO;IAC9B,MAAM,SAASC,WAAS,EAAE;IAC1B,MAAM,OAAO,SAAS,IAAI,EAAE;IAC5B,IAAI,SAAS,MAAM;KACjB,SAAS,OAAO,EAAE;KAClB,IAAI,SAAS,QAAW,UAAU,MAAM,QAAQ,IAAI;KACpD;IACF;IACA,MAAM,QAAQ,QAAQ,EAAE,KAAK;IAC7B,MAAM,OAAO;IACb,SAAS,IAAI,IAAI,KAAK;IAEtB,IAAI,CAAC,UAAU,IAAI,QAAQ,KAAK,GAAG,UAAU,IAAI,QAAQ,KAAK;GAChE;GACA,UAAU,OAAO;EACnB;EACA,aAAa,IAAI,eAAe,gBAAgB,OAAO,IAAI,UAAU;CACvE;CACA,OAAO;AACT"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { carriedDescendants, sceneCarrySource, translatePoseViaDescriptor } from "@weasel-js/core/engine";
|
|
2
|
+
import * as coreOps from "@weasel-js/core/ops";
|
|
3
|
+
|
|
4
|
+
// src/actions/move/landedDescendants.ts
|
|
5
|
+
/**
|
|
6
|
+
* Ops that bring along the descendants of every node `ops` transforms. A
|
|
7
|
+
* layout drop or a behavior places a dragged root somewhere the drag delta
|
|
8
|
+
* does not describe, and a layout shifts siblings to make room, so each
|
|
9
|
+
* descendant moves by its nearest transformed ancestor's landed pose less
|
|
10
|
+
* that ancestor's start pose. A descendant `ops` already writes, or that a
|
|
11
|
+
* moving frame carries, is left alone.
|
|
12
|
+
*/
|
|
13
|
+
function landedDescendantOps(input, ops) {
|
|
14
|
+
const { scene, descriptorOf, startPoses, label } = input;
|
|
15
|
+
const landed = /* @__PURE__ */ new Map();
|
|
16
|
+
for (const op of ops) {
|
|
17
|
+
if (op.name !== "transform") continue;
|
|
18
|
+
const a = op.args;
|
|
19
|
+
const id = a.id;
|
|
20
|
+
landed.set(id, {
|
|
21
|
+
from: landed.get(id)?.from ?? startPoses.get(id) ?? a.from,
|
|
22
|
+
to: a.to
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
const source = sceneCarrySource(scene);
|
|
26
|
+
const out = [];
|
|
27
|
+
for (const [root, { from, to }] of landed) {
|
|
28
|
+
if (from === void 0 || to === void 0) continue;
|
|
29
|
+
const d = descriptorOf(root);
|
|
30
|
+
const a = d.getBounds(from);
|
|
31
|
+
const b = d.getBounds(to);
|
|
32
|
+
const dx = b.x - a.x;
|
|
33
|
+
const dy = b.y - a.y;
|
|
34
|
+
if (dx === 0 && dy === 0) continue;
|
|
35
|
+
const carried = carriedDescendants(source, root, (pose, id) => translatePoseViaDescriptor(pose, dx, dy, descriptorOf(id)), (id) => landed.has(id));
|
|
36
|
+
for (const [id, pose] of carried) {
|
|
37
|
+
const node = scene.get(id);
|
|
38
|
+
if (node) out.push(coreOps.setPose({
|
|
39
|
+
id,
|
|
40
|
+
from: node.pose,
|
|
41
|
+
to: pose,
|
|
42
|
+
label
|
|
43
|
+
}));
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return out;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export { landedDescendantOps };
|
|
50
|
+
//# sourceMappingURL=landedDescendants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"landedDescendants.js","names":[],"sources":["../../../src/actions/move/landedDescendants.ts"],"sourcesContent":["import type { NodeId, Scene, Op } from '@weasel-js/core';\nimport { translatePoseViaDescriptor, type PoseDescriptor, carriedDescendants, sceneCarrySource } from '@weasel-js/core/engine';\nimport * as coreOps from '@weasel-js/core/ops';\n\n/** What a move gesture captured at its start, as this pass reads it. */\nexport interface LandedDescendantsInput {\n scene: Scene<unknown, string, unknown>;\n /** Each node's own descriptor, the one its pose is measured and moved by. */\n descriptorOf: (id: NodeId) => PoseDescriptor<unknown>;\n /** Start pose of every root and descendant. */\n startPoses: ReadonlyMap<NodeId, unknown>;\n label: string;\n}\n\n/**\n * Ops that bring along the descendants of every node `ops` transforms. A\n * layout drop or a behavior places a dragged root somewhere the drag delta\n * does not describe, and a layout shifts siblings to make room, so each\n * descendant moves by its nearest transformed ancestor's landed pose less\n * that ancestor's start pose. A descendant `ops` already writes, or that a\n * moving frame carries, is left alone.\n */\nexport function landedDescendantOps(input: LandedDescendantsInput, ops: readonly Op[]): Op[] {\n const { scene, descriptorOf, startPoses, label } = input;\n const landed = new Map<NodeId, { from: unknown; to: unknown }>();\n for (const op of ops) {\n if (op.name !== 'transform') continue;\n const a = op.args as { id: string; from: unknown; to: unknown };\n const id = a.id as NodeId;\n landed.set(id, { from: landed.get(id)?.from ?? startPoses.get(id) ?? a.from, to: a.to });\n }\n const source = sceneCarrySource(scene);\n const out: Op[] = [];\n for (const [root, { from, to }] of landed) {\n if (from === undefined || to === undefined) continue;\n const d = descriptorOf(root);\n const a = d.getBounds(from);\n const b = d.getBounds(to);\n const dx = b.x - a.x;\n const dy = b.y - a.y;\n if (dx === 0 && dy === 0) continue;\n const carried = carriedDescendants(\n source,\n root,\n (pose, id) => translatePoseViaDescriptor(pose, dx, dy, descriptorOf(id)),\n (id) => landed.has(id),\n );\n for (const [id, pose] of carried) {\n const node = scene.get(id);\n if (node) out.push(coreOps.setPose<unknown>({ id, from: node.pose, to: pose, label }));\n }\n }\n return out;\n}\n"],"mappings":";;;;;;;;;;;;AAsBA,SAAgB,oBAAoB,OAA+B,KAA0B;CAC3F,MAAM,EAAE,OAAO,cAAc,YAAY,UAAU;CACnD,MAAM,yBAAS,IAAI,IAA4C;CAC/D,KAAK,MAAM,MAAM,KAAK;EACpB,IAAI,GAAG,SAAS,aAAa;EAC7B,MAAM,IAAI,GAAG;EACb,MAAM,KAAK,EAAE;EACb,OAAO,IAAI,IAAI;GAAE,MAAM,OAAO,IAAI,EAAE,CAAC,EAAE,QAAQ,WAAW,IAAI,EAAE,KAAK,EAAE;GAAM,IAAI,EAAE;EAAG,CAAC;CACzF;CACA,MAAM,SAAS,iBAAiB,KAAK;CACrC,MAAM,MAAY,CAAC;CACnB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,SAAS,QAAQ;EACzC,IAAI,SAAS,UAAa,OAAO,QAAW;EAC5C,MAAM,IAAI,aAAa,IAAI;EAC3B,MAAM,IAAI,EAAE,UAAU,IAAI;EAC1B,MAAM,IAAI,EAAE,UAAU,EAAE;EACxB,MAAM,KAAK,EAAE,IAAI,EAAE;EACnB,MAAM,KAAK,EAAE,IAAI,EAAE;EACnB,IAAI,OAAO,KAAK,OAAO,GAAG;EAC1B,MAAM,UAAU,mBACd,QACA,OACC,MAAM,OAAO,2BAA2B,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC,IACtE,OAAO,OAAO,IAAI,EAAE,CACvB;EACA,KAAK,MAAM,CAAC,IAAI,SAAS,SAAS;GAChC,MAAM,OAAO,MAAM,IAAI,EAAE;GACzB,IAAI,MAAM,IAAI,KAAK,QAAQ,QAAiB;IAAE;IAAI,MAAM,KAAK;IAAM,IAAI;IAAM;GAAM,CAAC,CAAC;EACvF;CACF;CACA,OAAO;AACT"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { carryDragged } from "./dragged.js";
|
|
2
|
+
import { containerView, contentBoxOf, draggedInView } from "./view.js";
|
|
3
|
+
import { planeOf } from "@weasel-js/core";
|
|
4
|
+
import { composeWorldPose as composeWorldPose$1, isPageStructure, poseDescriptorForNode, refusalOf, sceneViewPoseAdapter, toPlane } from "@weasel-js/core/engine";
|
|
5
|
+
import { pathContainsPoint, rectContainsPointHalfOpen } from "@weasel-js/geom";
|
|
6
|
+
|
|
7
|
+
// src/actions/move/layout/container.ts
|
|
8
|
+
/** Whether a world point falls in a drop region, which is authored relative to
|
|
9
|
+
* the top-left of the container's world bounds. */
|
|
10
|
+
function regionContains(region, bounds, point) {
|
|
11
|
+
const local = {
|
|
12
|
+
x: point.x - bounds.x,
|
|
13
|
+
y: point.y - bounds.y
|
|
14
|
+
};
|
|
15
|
+
return typeof region === "function" ? region(local) : pathContainsPoint(region, local.x, local.y);
|
|
16
|
+
}
|
|
17
|
+
function chooseContainer(scene, mode, candidates) {
|
|
18
|
+
let dest = null;
|
|
19
|
+
if (mode === "topmost") {
|
|
20
|
+
const byId = new Map(candidates.map((c) => [c.id, c]));
|
|
21
|
+
for (const id of scene.renderOrder()) dest = byId.get(id) ?? dest;
|
|
22
|
+
} else for (const c of candidates) {
|
|
23
|
+
if (dest === null) {
|
|
24
|
+
dest = c;
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
if (c.depth > dest.depth) {
|
|
28
|
+
dest = c;
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
if (c.depth < dest.depth) continue;
|
|
32
|
+
let cAfter = false;
|
|
33
|
+
for (let i = 0; i < c.zPath.length; i++) {
|
|
34
|
+
if (c.zPath[i] > dest.zPath[i]) {
|
|
35
|
+
cAfter = true;
|
|
36
|
+
break;
|
|
37
|
+
}
|
|
38
|
+
if (c.zPath[i] < dest.zPath[i]) {
|
|
39
|
+
cAfter = false;
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (cAfter) dest = c;
|
|
44
|
+
}
|
|
45
|
+
return dest;
|
|
46
|
+
}
|
|
47
|
+
/** The layout container that takes the drop at `center`, or null. */
|
|
48
|
+
function pickContainer(session, dragged, center) {
|
|
49
|
+
const layoutDep = session.layout;
|
|
50
|
+
if (!layoutDep) return null;
|
|
51
|
+
const scene = session.scene;
|
|
52
|
+
const pc = session.pc;
|
|
53
|
+
const poseAdapter = sceneViewPoseAdapter(scene);
|
|
54
|
+
const d = session.projection;
|
|
55
|
+
const draggedIds = new Set(dragged.map((c) => c.id));
|
|
56
|
+
const candidates = [];
|
|
57
|
+
const mode = session.layoutDropTarget();
|
|
58
|
+
const testInside = (id, cPose, aabb, layout, at) => {
|
|
59
|
+
const region = layout.dropRegion?.({
|
|
60
|
+
id,
|
|
61
|
+
bounds: aabb,
|
|
62
|
+
node: scene.get(id)
|
|
63
|
+
}) ?? null;
|
|
64
|
+
if (region) return regionContains(region, aabb, at);
|
|
65
|
+
if (mode === "region") return false;
|
|
66
|
+
if (layout.contains) return layout.contains(cPose, at);
|
|
67
|
+
return rectContainsPointHalfOpen(aabb, at.x, at.y);
|
|
68
|
+
};
|
|
69
|
+
const consider = (id, zPath) => {
|
|
70
|
+
const layout = layoutDep.getLayout(id);
|
|
71
|
+
if (!layout) return;
|
|
72
|
+
const node = scene.get(id);
|
|
73
|
+
if (!node || isPageStructure(node)) return;
|
|
74
|
+
const worldPose = composeWorldPose$1(poseAdapter, id, pc.compose);
|
|
75
|
+
const g = poseDescriptorForNode(d, node);
|
|
76
|
+
const worldAabb = g.getBounds(worldPose);
|
|
77
|
+
const plane = planeOf(session.view, node.layer);
|
|
78
|
+
const at = plane ? toPlane(plane, center) : center;
|
|
79
|
+
if (!testInside(id, worldPose, worldAabb, layout, at)) return;
|
|
80
|
+
const verdict = session.verdict(id);
|
|
81
|
+
if (verdict === false) return;
|
|
82
|
+
const refused = refusalOf(verdict);
|
|
83
|
+
const view = containerView(pc, g, worldPose);
|
|
84
|
+
const content = contentBoxOf(g, view, poseAdapter, id, worldPose);
|
|
85
|
+
if (refused === null && layout.acceptsDrop) {
|
|
86
|
+
const arg = {
|
|
87
|
+
id,
|
|
88
|
+
bounds: content,
|
|
89
|
+
node
|
|
90
|
+
};
|
|
91
|
+
for (const c of dragged) if (!layout.acceptsDrop(arg, draggedInView(view, carryDragged(session, c, plane).arg))) return;
|
|
92
|
+
}
|
|
93
|
+
candidates.push({
|
|
94
|
+
id,
|
|
95
|
+
bounds: worldAabb,
|
|
96
|
+
content,
|
|
97
|
+
view,
|
|
98
|
+
layout,
|
|
99
|
+
zPath,
|
|
100
|
+
depth: zPath.length,
|
|
101
|
+
plane,
|
|
102
|
+
...refused !== null ? { refused } : {}
|
|
103
|
+
});
|
|
104
|
+
};
|
|
105
|
+
const walk = (parentId, parentPath) => {
|
|
106
|
+
const childIds = parentId === null ? scene.roots : scene.childrenOf(parentId);
|
|
107
|
+
for (let i = 0; i < childIds.length; i++) {
|
|
108
|
+
if (draggedIds.has(childIds[i])) continue;
|
|
109
|
+
const childPath = [...parentPath, i];
|
|
110
|
+
consider(childIds[i], childPath);
|
|
111
|
+
walk(childIds[i], childPath);
|
|
112
|
+
}
|
|
113
|
+
};
|
|
114
|
+
walk(null, []);
|
|
115
|
+
return chooseContainer(scene, mode, candidates);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
export { pickContainer };
|
|
119
|
+
//# sourceMappingURL=container.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"container.js","names":["composeWorldPose"],"sources":["../../../../src/actions/move/layout/container.ts"],"sourcesContent":["import { pathContainsPoint, rectContainsPointHalfOpen, type Rect } from '@weasel-js/geom';\nimport type { NodeId, Scene, StrategyView } from '@weasel-js/core';\nimport { poseDescriptorForNode, toPlane, type PlaneMap, composeWorldPose, sceneViewPoseAdapter, refusalOf, isPageStructure } from '@weasel-js/core/engine';\nimport type { DropRegion, LayoutContainer, LayoutDropTargetMode, LayoutStrategy } from '@weasel-js/core/engine';\nimport { planeOf } from '@weasel-js/core';\nimport type { MoveSession } from '../session';\nimport { carryDragged, type DraggedChild } from './dragged';\nimport { containerView, contentBoxOf, draggedInView } from './view';\n\ntype Layout = LayoutStrategy<unknown>;\nexport interface Candidate {\n id: NodeId;\n /** The container's body in world: what the pointer is tested against. */\n bounds: Rect;\n /** Its content's frame, `bounds` moved by its scroll offset, in `view`'s\n * space: the `LayoutContainer.bounds` its strategy is handed, so the slots\n * it places agree with its children as they are shown. */\n content: Rect;\n /** The container as its strategy sees it: upright, in its own frame. */\n view: StrategyView<unknown>;\n layout: LayoutStrategy<unknown>;\n zPath: number[];\n depth: number;\n /** The edited plane into this container's. */\n plane: PlaneMap | null;\n /** The reason it refuses the drop, when it does: it still blocks the containers around it. */\n refused?: string;\n}\n\n/** Whether a world point falls in a drop region, which is authored relative to\n * the top-left of the container's world bounds. */\nfunction regionContains(\n region: DropRegion,\n bounds: { x: number; y: number },\n point: { x: number; y: number },\n): boolean {\n const local = { x: point.x - bounds.x, y: point.y - bounds.y };\n return typeof region === 'function'\n ? region(local)\n : pathContainsPoint(region, local.x, local.y);\n}\n\nfunction chooseContainer(\n scene: Scene<unknown, string, unknown>,\n mode: LayoutDropTargetMode,\n candidates: readonly Candidate[],\n): Candidate | null {\n let dest: Candidate | null = null;\n if (mode === 'topmost') {\n // Painted last wins, in the scene's own render order — which crosses\n // subtrees and layers, where a sibling-index path cannot.\n const byId = new Map<NodeId, Candidate>(candidates.map((c) => [c.id, c]));\n for (const id of scene.renderOrder()) dest = byId.get(id) ?? dest;\n } else {\n // Deepest wins; sibling-index path breaks ties (higher z = later index).\n for (const c of candidates) {\n if (dest === null) { dest = c; continue; }\n if (c.depth > dest.depth) { dest = c; continue; }\n if (c.depth < dest.depth) continue;\n let cAfter = false;\n for (let i = 0; i < c.zPath.length; i++) {\n if (c.zPath[i] > dest.zPath[i]) { cAfter = true; break; }\n if (c.zPath[i] < dest.zPath[i]) { cAfter = false; break; }\n }\n if (cAfter) dest = c;\n }\n }\n return dest;\n}\n\n/** The layout container that takes the drop at `center`, or null. */\nexport function pickContainer(\n session: MoveSession,\n dragged: readonly DraggedChild[],\n center: { x: number; y: number },\n): Candidate | null {\n const layoutDep = session.layout;\n if (!layoutDep) return null;\n const scene = session.scene;\n const pc = session.pc;\n const poseAdapter = sceneViewPoseAdapter(scene);\n const d = session.projection;\n const draggedIds = new Set<NodeId>(dragged.map((c) => c.id));\n const candidates: Candidate[] = [];\n const mode = session.layoutDropTarget();\n const testInside = (\n id: NodeId, cPose: unknown, aabb: Rect, layout: Layout, at: { x: number; y: number },\n ): boolean => {\n const region = layout.dropRegion?.({ id: id as string, bounds: aabb, node: scene.get(id) }) ?? null;\n if (region) return regionContains(region, aabb, at);\n if (mode === 'region') return false;\n if (layout.contains) return layout.contains(cPose, at);\n return rectContainsPointHalfOpen(aabb, at.x, at.y);\n };\n const consider = (id: NodeId, zPath: number[]): void => {\n const layout = layoutDep.getLayout(id as string);\n if (!layout) return;\n const node = scene.get(id);\n // Which page takes a drop is the pages' own rule, not a layout drop.\n if (!node || isPageStructure(node)) return;\n const worldPose = composeWorldPose(poseAdapter, id as string, pc.compose);\n const g = poseDescriptorForNode(d, node);\n const worldAabb = g.getBounds(worldPose);\n const plane = planeOf(session.view, node.layer);\n const at = plane ? toPlane(plane, center) : center;\n if (!testInside(id, worldPose, worldAabb, layout, at)) return;\n const verdict = session.verdict(id);\n if (verdict === false) return;\n const refused = refusalOf(verdict);\n const view = containerView(pc, g, worldPose);\n const content = contentBoxOf(g, view, poseAdapter, id as string, worldPose);\n if (refused === null && layout.acceptsDrop) {\n const arg: LayoutContainer = { id: id as string, bounds: content, node };\n for (const c of dragged) {\n if (!layout.acceptsDrop(arg, draggedInView(view, carryDragged(session, c, plane).arg))) return;\n }\n }\n candidates.push({\n id,\n bounds: worldAabb,\n content,\n view,\n layout,\n zPath,\n depth: zPath.length,\n plane,\n ...(refused !== null ? { refused } : {}),\n });\n };\n const walk = (parentId: NodeId | null, parentPath: number[]): void => {\n const childIds = parentId === null ? scene.roots : scene.childrenOf(parentId);\n for (let i = 0; i < childIds.length; i++) {\n // A dragged root's subtree goes with it: dropping into one of its own\n // descendants would reparent it under itself.\n if (draggedIds.has(childIds[i])) continue;\n const childPath = [...parentPath, i];\n consider(childIds[i], childPath);\n walk(childIds[i], childPath);\n }\n };\n walk(null, []);\n\n return chooseContainer(scene, mode, candidates);\n}\n"],"mappings":"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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { grabbedPoseAdapter, planeDelta } from "../delta.js";
|
|
2
|
+
import { carryPose, invertPlane, planeOf } from "@weasel-js/core";
|
|
3
|
+
import { composeWorldPose as composeWorldPose$1, poseDescriptorForNode, sceneViewPoseAdapter, toPlane, translatePoseViaDescriptor as translatePoseViaDescriptor$1 } from "@weasel-js/core/engine";
|
|
4
|
+
|
|
5
|
+
// src/actions/move/layout/dragged.ts
|
|
6
|
+
/** Each dragged root no other one holds, in world, in the edited plane. */
|
|
7
|
+
function gatherDragged(session, delta) {
|
|
8
|
+
const scene = session.scene;
|
|
9
|
+
const pc = session.pc;
|
|
10
|
+
const poseAdapter = sceneViewPoseAdapter(scene);
|
|
11
|
+
const { dx, dy } = delta;
|
|
12
|
+
const d = session.projection;
|
|
13
|
+
const grabAdapter = grabbedPoseAdapter(session, poseAdapter);
|
|
14
|
+
const dragged = [];
|
|
15
|
+
for (const id of session.outer) {
|
|
16
|
+
const node = scene.get(id);
|
|
17
|
+
if (!node) continue;
|
|
18
|
+
const startWorld = composeWorldPose$1(grabAdapter, id, pc.compose);
|
|
19
|
+
const g = poseDescriptorForNode(d, node);
|
|
20
|
+
const own = planeDelta(session, id, dx, dy);
|
|
21
|
+
const toEdited = invertPlane(planeOf(session.view, node.layer));
|
|
22
|
+
const world = carryPose(g, translatePoseViaDescriptor$1(startWorld, own.dx, own.dy, g), toEdited);
|
|
23
|
+
const b = g.getBounds(world);
|
|
24
|
+
dragged.push({
|
|
25
|
+
id,
|
|
26
|
+
arg: {
|
|
27
|
+
id,
|
|
28
|
+
originPose: carryPose(g, startWorld, toEdited),
|
|
29
|
+
pose: world,
|
|
30
|
+
sourceContainerId: node.parent ?? null
|
|
31
|
+
},
|
|
32
|
+
center: {
|
|
33
|
+
x: b.x + b.width / 2,
|
|
34
|
+
y: b.y + b.height / 2
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
return dragged;
|
|
39
|
+
}
|
|
40
|
+
/** `c` carried into the plane `m` maps to; `c` itself when `m` is null. */
|
|
41
|
+
function carryDragged(session, c, m) {
|
|
42
|
+
const { scene, projection: d } = session;
|
|
43
|
+
if (m === null) return c;
|
|
44
|
+
const g = poseDescriptorForNode(d, scene.get(c.id));
|
|
45
|
+
return {
|
|
46
|
+
id: c.id,
|
|
47
|
+
arg: {
|
|
48
|
+
...c.arg,
|
|
49
|
+
originPose: carryPose(g, c.arg.originPose, m),
|
|
50
|
+
pose: carryPose(g, c.arg.pose, m)
|
|
51
|
+
},
|
|
52
|
+
center: toPlane(m, c.center)
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
/** Center of the bounds of everything dragged. */
|
|
56
|
+
function selectionCenter(session, dragged) {
|
|
57
|
+
let minX = Infinity;
|
|
58
|
+
let minY = Infinity;
|
|
59
|
+
let maxX = -Infinity;
|
|
60
|
+
let maxY = -Infinity;
|
|
61
|
+
for (const c of dragged) {
|
|
62
|
+
const b = session.descriptorOf(c.id).getBounds(c.arg.pose);
|
|
63
|
+
minX = Math.min(minX, b.x);
|
|
64
|
+
minY = Math.min(minY, b.y);
|
|
65
|
+
maxX = Math.max(maxX, b.x + b.width);
|
|
66
|
+
maxY = Math.max(maxY, b.y + b.height);
|
|
67
|
+
}
|
|
68
|
+
return {
|
|
69
|
+
x: (minX + maxX) / 2,
|
|
70
|
+
y: (minY + maxY) / 2
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
export { carryDragged, gatherDragged, selectionCenter };
|
|
75
|
+
//# sourceMappingURL=dragged.js.map
|