@weasel-js/diagram 1.12.0 → 1.13.0

package/README.md

@@ -415,7 +415,7 @@ the `insert` dep it displaced, so core's rect, ellipse and text tools keep worki
 ### Containers and pools
 
 A container is a titled box that holds other shapes; a pool is a header and a
-stack of lanes, each holding shapes. Both are core `ContainerNode`s carrying a
+stack of lanes, each holding shapes. Both are core `GroupNode`s carrying a
 `container` trait (`diagramContainerOf`): a role of `container`, `pool`, or
 `lane`, and a header. A region's title is a text child named
 `<id>/title`, so double-clicking a header renames it.

package/dist/{chunk-DYDX6EJC.js → chunk-ESFIS7BB.js}

@@ -1,6 +1,6 @@
-import { createAvoidRouter, placeLabels, edgeHops, DEFAULT_HOP_SIZE, HOPS_DOC_KEY, simplifyStops } from './chunk-GA4BX7SH.js';
-import { edgeRouter, registerMarkShape, withDiagramRegistry, diagramLabelOf, editEdgeLabelBinding, editEdgeLabelAction, diagramGroupOf, diagramContainerOf, headerBox, labelFollowsLayout, buildGraph, LABEL_DRAG_AFFORDANCE_KIND, EDIT_EDGE_LABEL_ACTION_ID, labelDragLayer, laneOutlineOf, routerOf, labelScratchOf, ROUTERS, avoid, LABEL_PLACEMENT, editableLabels, titleIdOf, orthogonal, diagramAnchorOf, MIN_LANE_SIZE, endAims, resolveEnd, EDGE_DERIVE_PATH, titlePose, regionSpecs, DIAGRAM_THEME_KEY, diagramThemeOf, boxCenter, themeLabelFamily, roleEdgeStyle, roleStyle, themeLabelFont, firstLanes, DEFAULT_LANE_SIZE, bodyBox } from './chunk-2SYY4W3B.js';
-import { diagramEdgeOf, isPromise, dataKeyReader, diagramNodeOf, portsOf, portSitesOf, outlinePath, samePoints, layoutWritesRoute, plannerPlan, planOf, layered, forceRelaxation, center, layoutOwnsPort, chain, force, tree, portOf, labelCenter, labelSpotAt, isPinned, layoutOwnsRoute } from './chunk-R2XB6D32.js';
+import { createAvoidRouter, placeLabels, edgeHops, DEFAULT_HOP_SIZE, HOPS_DOC_KEY, simplifyStops } from './chunk-Y72FK3Y7.js';
+import { edgeRouter, registerMarkShape, withDiagramRegistry, diagramLabelOf, editEdgeLabelBinding, editEdgeLabelAction, diagramGroupOf, diagramContainerOf, headerBox, labelFollowsLayout, buildGraph, LABEL_DRAG_AFFORDANCE_KIND, EDIT_EDGE_LABEL_ACTION_ID, labelDragLayer, laneOutlineOf, routerOf, labelScratchOf, ROUTERS, avoid, LABEL_PLACEMENT, editableLabels, titleIdOf, orthogonal, diagramAnchorOf, MIN_LANE_SIZE, endAims, resolveEnd, EDGE_DERIVE_PATH, titlePose, regionSpecs, DIAGRAM_THEME_KEY, diagramThemeOf, boxCenter, themeLabelFamily, roleEdgeStyle, roleStyle, themeLabelFont, firstLanes, DEFAULT_LANE_SIZE, bodyBox } from './chunk-QU4QZUC6.js';
+import { diagramEdgeOf, isPromise, dataKeyReader, diagramNodeOf, portsOf, portSitesOf, outlinePath, samePoints, layoutWritesRoute, plannerPlan, planOf, layered, forceRelaxation, center, layoutOwnsPort, chain, force, tree, portOf, labelCenter, labelSpotAt, isPinned, layoutOwnsRoute } from './chunk-L4H444QI.js';
 import { bodyPredicate, dragPanContribution, WeaselProvider, useScene, useSelection, useLatest, SceneCanvas, useDepSource, registerNodeShape, reconcileSpecs, nodeGates, effectivePose, pagesBounds, pagesLayer, AUTO_POSE_DESCRIPTOR, usePoseRun, drawnBoundsScene, pointAlongPath, drawnAABBOf, RECT_POSE_DESCRIPTOR, resolveFill, resolveStroke, commandFill, commandStroke, fitViewToBounds, translatePoseViaDescriptor, composeAffordanceLayer, createResizeAction, createDeleteAction, polylineFromPoints, SNAP_ROLES, ActionDisabledReason, paintsLayer, viewToTransform, ellipsePath, snapMods, documentDepOf, carriedDescendants, sceneCarrySource, derivedDepOf, PathBuilder, createInsertOp, createSetDataOp, documentPose } from '@weasel-js/core';
 import { AUTO_POSE_DESCRIPTOR as AUTO_POSE_DESCRIPTOR$1, rotatePoint } from '@weasel-js/core/math';
 import { clampRectWithin, placeRect, pathContainsPoint } from '@weasel-js/geom';
@@ -212,7 +212,7 @@ function commitEdgeToScene(edge, ctx, opts = {}) {
   };
   const source = scene.get(edge.from.nodeId);
   scene.add({
-    kind: "leaf",
+    kind: "mark",
     layer: source?.layer ?? scene.layers[0].id,
     pose: { x: 0, y: 0, width: 0, height: 0 },
     data: { diagram: trait, stroke: opts.stroke ?? DEFAULT_EDGE_STROKE },
@@ -315,7 +315,7 @@ function diagramDropParentAt(scene, point, role) {
   const walk = (ids) => {
     for (const id of ids) {
       const node = scene.get(id);
-      if (node === void 0 || node.kind !== "container") continue;
+      if (node === void 0) continue;
       const trait = diagramContainerOf(node);
       const b = bodyBox(node.pose, trait?.header);
       const inside2 = point.x >= b.x && point.x < b.x + b.width && point.y >= b.y && point.y < b.y + b.height;
@@ -799,7 +799,7 @@ function editContainerTitleAction(commit) {
     label: "Edit container title",
     group: "diagram",
     requires: ["scene", "nodeAtPoint"],
-    eligible: { mode: { in: ["normal", "isolation"] } },
+    eligible: { mode: "normal" },
     invoker: {
       timing: "immediate",
       run(deps, params) {
@@ -891,7 +891,7 @@ function createLabelDragAction(opts = {}) {
     label: "Move label",
     group: "diagram",
     requires: ["scene"],
-    eligible: { mode: { in: ["normal", "isolation"] } },
+    eligible: { mode: "normal" },
     invoker: {
       timing: "ongoing",
       start(ctx) {
@@ -2790,14 +2790,14 @@ function pathHold(scene) {
   const held = /* @__PURE__ */ new Map();
   const release = (id, entry) => {
     held.delete(id);
-    if (scene.overrides.get(id) === entry) scene.overrides.clear(id);
+    scene.overrides.clear(id, entry);
   };
   return {
     show(paths) {
       for (const [id, entry] of held) if (!paths.has(id)) release(id, entry);
       for (const [id, path] of paths) {
         const entry = held.get(id);
-        if (entry !== void 0 && scene.overrides.get(id) === entry) {
+        if (entry !== void 0 && scene.overrides.has(id, entry)) {
           entry.path = path;
           continue;
         }
@@ -3003,6 +3003,10 @@ function dividerPath(box, header) {
 function registerDiagramShape(opts = {}) {
   return registerNodeShape(diagramShape(opts), { priority: "high" });
 }
+
+// src/bodyNode.ts
+var isDiagramBody = (node) => diagramContainerOf(node) === null && diagramGroupOf(node) === null && dataKeyReader(node) !== null;
+var isBodyOrRegion = (node) => diagramContainerOf(node) !== null || isDiagramBody(node);
 function useMirroredSelection(selection, selected, onSelect) {
   const want = selected ?? null;
   const pushed = useRef(void 0);
@@ -3083,10 +3087,11 @@ function readScene(scene) {
   const nodes = /* @__PURE__ */ new Map();
   const routes = /* @__PURE__ */ new Map();
   for (const n of scene.renderOrderNodes()) {
-    if (n.kind === "container") {
-      if (diagramContainerOf(n) === null) nodes.set(n.id, { x: n.pose.x, y: n.pose.y, parent: n.parent });
+    if (isDiagramBody(n)) {
+      nodes.set(n.id, { x: n.pose.x, y: n.pose.y, parent: n.parent });
       continue;
     }
+    if (diagramContainerOf(n) !== null) continue;
     const edge = diagramEdgeOf(n);
     if (edge !== null) routes.set(n.id, routeOf2(edge));
   }
@@ -3099,7 +3104,7 @@ function diagramLayoutOf(specs) {
   for (const s of specs) {
     const id = s.id;
     if (id === void 0) continue;
-    if (s.kind === "container") {
+    if (isBodyOrRegion(s)) {
       const region = diagramContainerOf(s);
       const pinned = isPinned({ id, kind: s.kind, data: s.data });
       if (region !== null) {
@@ -3107,7 +3112,7 @@ function diagramLayoutOf(specs) {
           const { x, y, width, height } = s.pose;
           containers.push({ kind: "box", id, box: { x, y, width, height } });
         }
-      } else if (diagramGroupOf(s) === null && !pinned) moves.push({ id, x: s.pose.x, y: s.pose.y });
+      } else if (!pinned) moves.push({ id, x: s.pose.x, y: s.pose.y });
       continue;
     }
     const edge = diagramEdgeOf(s);
@@ -3179,7 +3184,7 @@ function laneResizeReports(scene, resize) {
     const { x, y, width, height } = pose;
     if (region !== null) {
       if (region.role === "container" && region.fitted !== true) boxes.push({ kind: "box", id, box: { x, y, width, height } });
-    } else if (node.kind === "container" && dataKeyReader(node) !== null) moves.push({ id, x, y });
+    } else if (isDiagramBody(node)) moves.push({ id, x, y });
   }
   return { lanes: { kind: "lanes", pool: pool.id, lanes }, moves, boxes };
 }
@@ -3362,7 +3367,7 @@ function usePagesView(pages) {
   }, [placed, fill]);
 }
 function diagramBounds(specs, extra) {
-  const boxes = specs.filter((s) => s.kind === "container" || diagramGroupOf(s) !== null).map((s) => s.pose);
+  const boxes = specs.filter((s) => isBodyOrRegion(s) || diagramGroupOf(s) !== null).map((s) => s.pose);
   if (extra !== void 0) boxes.push(extra);
   if (boxes.length === 0) return null;
   const x = Math.min(...boxes.map((b) => b.x));
@@ -3648,6 +3653,6 @@ function useDiagramApi(apiRef, canvasRef, scene, live, setRun, fitNow) {
   }), [canvasRef, live, scene, setRun, fitNow]);
 }
 
-export { ADD_LANE_ACTION_ID, ANYWHERE, CONNECT_ACTION_ID, CONTAINER_STENCILS, DEFAULT_EDGE_STROKE, DiagramView, EASED_LAYOUTS, EDGE_END_AFFORDANCE_KIND, EDGE_END_LAYER_ID, EDIT_CONTAINER_TITLE_ACTION_ID, GRAB_EDGE_END_ACTION_ID, GRAB_LABEL_ACTION_ID, GRAB_PORT_ACTION_ID, GRAB_WAYPOINT_ACTION_ID, LANE_AFFORDANCE_KIND, LANE_LAYER_ID, LANE_RESIZE_ACTION_ID, LAYOUTS, LAYOUT_ACTION_ID, MOVE_LABEL_ACTION_ID, PORT_AFFORDANCE_KIND, PORT_LAYER_ID, RECONNECT_ACTION_ID, RELEASE_MEMBERS_ACTION_ID, REMOVE_WAYPOINT_ACTION_ID, REORDER_ACTION_ID, RESET_LABEL_ACTION_ID, RESET_ROUTE_ACTION_ID, ROUTER_LABELS, ROUTE_EDIT_ACTION_ID, SELECT_LABEL_EDGE_ACTION_ID, SET_HOPS_ACTION_ID, SET_ROUTER_ACTION_IDS, STEP_REORDER_ACTION_ID, WAYPOINT_AFFORDANCE_KIND, WAYPOINT_HIT_PX, WAYPOINT_LAYER_ID, addLane, applyLayout, avoidSceneInput, bodyAt, commitEdgeToScene, commitLabelToScene, commitLaneResizeToScene, commitReconnectToScene, commitRouteToScene, commitRouterToScene, connectBinding, containerBuild, createAddLaneAction, createConnectAction, createDiagramContribution, createEdgeEndAffordance, createLabelDragAction, createLaneAffordance, createLaneResizeAction, createLayoutAction, createPortAffordance, createReconnectAction, createReleaseMembersAction, createRemoveWaypointAction, createReorderAction, createResetLabelAction, createResetRouteAction, createRouteEditAction, createSetHopsAction, createSetRouterAction, createSpecHops, createSpecLabelPlacer, createSpecRouter, createStepReorderAction, createWaypointAffordance, defaultCanConnect, diagramCanDropInto, diagramContainers, diagramDropParentAt, diagramEdgeEnds, diagramLabelDrag, diagramLayoutOf, diagramPorts, diagramResizable, diagramShape, diagramWaypoints, dragSegment, dragVertex, easedProducer, edgeEndLayer, edgeEndScratchOf, edgePolylines, editContainerTitleAction, editContainerTitleBinding, forceProducer, grabPortAction, grabPortBindings, groupReorderContribution, groupReorderSlots, headerIdOf, hopDataOps, inOrUnder, insertWaypoint, isBodyEnd, laneLayer, laneResizeFrame, laneScratchOf, lanesOf, layoutPoses, movedLabelData, pinSegment, poolAxisOf, poolsOf, portLayer, portScratchOf, reconnectBinding, regionHeaderAt, registerDiagramShape, releaseMembers, removeSegment, removeWaypoint, reorderBinding, reorderContribution, routeHandles, routeStateOf, routeWrites, routedData, routerActions, routesOf, sceneEdges, sceneParticipants, segmentAxis, sequenceSlots, themeWrites, unpinSegment, useLiveLayout, useMirroredSelection, waypointLayer, waypointScratchOf, withHopsData, withRouter };
-//# sourceMappingURL=chunk-DYDX6EJC.js.map
-//# sourceMappingURL=chunk-DYDX6EJC.js.map
+export { ADD_LANE_ACTION_ID, ANYWHERE, CONNECT_ACTION_ID, CONTAINER_STENCILS, DEFAULT_EDGE_STROKE, DiagramView, EASED_LAYOUTS, EDGE_END_AFFORDANCE_KIND, EDGE_END_LAYER_ID, EDIT_CONTAINER_TITLE_ACTION_ID, GRAB_EDGE_END_ACTION_ID, GRAB_LABEL_ACTION_ID, GRAB_PORT_ACTION_ID, GRAB_WAYPOINT_ACTION_ID, LANE_AFFORDANCE_KIND, LANE_LAYER_ID, LANE_RESIZE_ACTION_ID, LAYOUTS, LAYOUT_ACTION_ID, MOVE_LABEL_ACTION_ID, PORT_AFFORDANCE_KIND, PORT_LAYER_ID, RECONNECT_ACTION_ID, RELEASE_MEMBERS_ACTION_ID, REMOVE_WAYPOINT_ACTION_ID, REORDER_ACTION_ID, RESET_LABEL_ACTION_ID, RESET_ROUTE_ACTION_ID, ROUTER_LABELS, ROUTE_EDIT_ACTION_ID, SELECT_LABEL_EDGE_ACTION_ID, SET_HOPS_ACTION_ID, SET_ROUTER_ACTION_IDS, STEP_REORDER_ACTION_ID, WAYPOINT_AFFORDANCE_KIND, WAYPOINT_HIT_PX, WAYPOINT_LAYER_ID, addLane, applyLayout, avoidSceneInput, bodyAt, commitEdgeToScene, commitLabelToScene, commitLaneResizeToScene, commitReconnectToScene, commitRouteToScene, commitRouterToScene, connectBinding, containerBuild, createAddLaneAction, createConnectAction, createDiagramContribution, createEdgeEndAffordance, createLabelDragAction, createLaneAffordance, createLaneResizeAction, createLayoutAction, createPortAffordance, createReconnectAction, createReleaseMembersAction, createRemoveWaypointAction, createReorderAction, createResetLabelAction, createResetRouteAction, createRouteEditAction, createSetHopsAction, createSetRouterAction, createSpecHops, createSpecLabelPlacer, createSpecRouter, createStepReorderAction, createWaypointAffordance, defaultCanConnect, diagramCanDropInto, diagramContainers, diagramDropParentAt, diagramEdgeEnds, diagramLabelDrag, diagramLayoutOf, diagramPorts, diagramResizable, diagramShape, diagramWaypoints, dragSegment, dragVertex, easedProducer, edgeEndLayer, edgeEndScratchOf, edgePolylines, editContainerTitleAction, editContainerTitleBinding, forceProducer, grabPortAction, grabPortBindings, groupReorderContribution, groupReorderSlots, headerIdOf, hopDataOps, inOrUnder, insertWaypoint, isBodyEnd, isBodyOrRegion, isDiagramBody, laneLayer, laneResizeFrame, laneScratchOf, lanesOf, layoutPoses, movedLabelData, pinSegment, poolAxisOf, poolsOf, portLayer, portScratchOf, reconnectBinding, regionHeaderAt, registerDiagramShape, releaseMembers, removeSegment, removeWaypoint, reorderBinding, reorderContribution, routeHandles, routeStateOf, routeWrites, routedData, routerActions, routesOf, sceneEdges, sceneParticipants, segmentAxis, sequenceSlots, themeWrites, unpinSegment, useLiveLayout, useMirroredSelection, waypointLayer, waypointScratchOf, withHopsData, withRouter };
+//# sourceMappingURL=chunk-ESFIS7BB.js.map
+//# sourceMappingURL=chunk-ESFIS7BB.js.map