@weasel-js/diagram 1.9.1 → 1.9.2

package/dist/index.js

@@ -1,9 +1,9 @@
-import { portOf, portsOf, diagramNodeOf, layered, force, tree, forceRelaxation, center, outlinePath } from './chunk-6VYT4WCM.js';
-export { COMPASS, DEFAULT_NODE_GAP, DEFAULT_PORTS, DEFAULT_RANK_GAP, DIAGRAM_TRAIT_KEY, axesFor, backEdges, bodyOutline, bodyTrait, boxForContent, buildBody, canvasMeasure, contentBox, createDiagramNodes, dataKeyReader, diagramNodeOf, force, forceRelaxation, forestOf, graphOrder, isPinned, layered, layoutBody, layoutRowPorts, measureBody, outlinePath, outlinePolyline, packAcross, pinnedSet, portOf, portsOf, portsOnOutline, ranksOf, rayHit, seededOrder, settle, sizeToBody, translated, tree } from './chunk-6VYT4WCM.js';
-import { dragPanContribution, AUTO_POSE_DESCRIPTOR, pointAlongPath, translatePoseViaDescriptor, polylineFromPoints, effectivePose, composeAffordanceLayer, useLatest, usePoseRun, RECT_POSE_DESCRIPTOR, registerNodeShape, WeaselProvider, useScene, useSelection, SceneCanvas, fitViewToBounds } from '@weasel-js/core';
+import { layered, portOf, outlinePath, diagramNodeOf, forceRelaxation, center, force, tree, portsOf, sizeToBody, measureBody, buildBody } from './chunk-UBM2J3HJ.js';
+export { COMPASS, DEFAULT_NODE_GAP, DEFAULT_PORTS, DEFAULT_RANK_GAP, DIAGRAM_TRAIT_KEY, axesFor, backEdges, bodyOutline, bodyTrait, boxForContent, buildBody, canvasMeasure, contentBox, createDiagramNodes, dataKeyReader, diagramNodeOf, force, forceRelaxation, forestOf, graphOrder, isPinned, layered, layoutBody, layoutRowPorts, measureBody, outlinePath, outlinePolyline, packAcross, pinnedSet, portOf, portsOf, portsOnOutline, ranksOf, rayHit, seededOrder, settle, sizeToBody, translated, tree } from './chunk-UBM2J3HJ.js';
+import { dragPanContribution, WeaselProvider, useScene, useSelection, useLatest, reconcileSpecs, SceneCanvas, fitViewToBounds, AUTO_POSE_DESCRIPTOR, pointAlongPath, translatePoseViaDescriptor, polylineFromPoints, registerNodeShape, effectivePose, usePoseRun, RECT_POSE_DESCRIPTOR, composeAffordanceLayer } from '@weasel-js/core';
 import { portCurvePoints } from '@weasel-js/geom';
 import { AUTO_POSE_DESCRIPTOR as AUTO_POSE_DESCRIPTOR$1 } from '@weasel-js/core/math';
-import { useRef, useCallback, useEffect, useMemo } from 'react';
+import { forwardRef, useEffect, useMemo, useRef, useState, useImperativeHandle, useCallback } from 'react';
 import { jsx } from 'react/jsx-runtime';
 
 var NAMED = { start: 0, mid: 0.5, end: 1 };
@@ -447,18 +447,12 @@ function push(index, key, edge) {
 var FONT = { fontFamily: "sans-serif", fontSize: 12 };
 var NODE = { fill: "#16222c", stroke: "#7ba7c7", text: "#dbe7f2" };
 var EDGE = { stroke: "#7ba7c7" };
-var PAD = { x: 12, y: 8 };
+var LABEL_PLACEMENT = { at: "mid", offset: 9 };
 var LINE = 1.4;
 var GLYPH = 0.6;
 var MIN_WIDTH = 64;
-var edgeIdOf = (e) => `edge:${e.from}->${e.to}${e.label ? `:${e.label}` : ""}`;
-function sizeOf(node, fontSize) {
-  const longest = Math.max(0, ...node.lines.map((l) => l.length));
-  return {
-    width: Math.max(MIN_WIDTH, Math.ceil(longest * GLYPH * fontSize + 2 * PAD.x)),
-    height: Math.ceil(Math.max(1, node.lines.length) * LINE * fontSize + 2 * PAD.y)
-  };
-}
+var LAYOUTS = { layered, tree, force };
+var edgeIdOf = (e) => `edge:${e.from}${e.fromPort ? `.${e.fromPort}` : ""}->${e.to}${e.toPort ? `.${e.toPort}` : ""}${e.label ? `:${e.label}` : ""}`;
 function graphOf(nodes, edges) {
   const byId = new Map(nodes.map((n) => [n.id, n]));
   const out = /* @__PURE__ */ new Map();
@@ -477,6 +471,15 @@ function graphOf(nodes, edges) {
 }
 function diagramScene(data, opts = {}) {
   const font = opts.font ?? FONT;
+  const styleOf = (s) => ({
+    fontFamily: s?.fontFamily ?? font.fontFamily,
+    fontSize: s?.fontSize ?? font.fontSize,
+    ...s?.bold === true ? { fontWeight: 700 } : {}
+  });
+  const measure = opts.measure ? (text, s) => opts.measure(text, { ...s, fontFamily: s.fontFamily ?? font.fontFamily, fontSize: s.fontSize ?? font.fontSize }) : (text, s) => {
+    const size = s.fontSize ?? font.fontSize;
+    return { width: text.length * GLYPH * size, height: Math.ceil(LINE * size) };
+  };
   const ids = /* @__PURE__ */ new Set();
   for (const n of data.nodes) {
     if (ids.has(n.id)) throw new Error(`diagramScene: node id "${n.id}" appears more than once`);
@@ -489,49 +492,59 @@ function diagramScene(data, opts = {}) {
     seen.add(id);
     return true;
   });
-  const seeds = data.nodes.map((n, i) => ({
-    id: n.id,
-    bounds: { x: i, y: i, ...sizeOf(n, font.fontSize) },
-    pinned: false
+  const bodies = data.nodes.map((n) => ({
+    outline: n.outline ?? opts.outline ?? "rect",
+    rows: n.rows ?? (n.lines ?? []).map((text) => ({ kind: "label", text })),
+    padding: n.padding ?? opts.padding ?? 8,
+    gap: n.gap ?? opts.gap ?? 4,
+    verticalAlign: n.verticalAlign ?? opts.verticalAlign ?? "center",
+    ...n.ports ? { ports: n.ports } : {}
   }));
+  const seeds = data.nodes.map((n, i) => {
+    const pose = sizeToBody(
+      { ...n.at ?? { x: i, y: i }, width: n.width ?? opts.minWidth ?? MIN_WIDTH, height: n.height ?? 0 },
+      measureBody(bodies[i], measure)
+    );
+    return { id: n.id, bounds: pose, pinned: n.pinned === true };
+  });
   const graph = graphOf(seeds, edges.map((e) => ({ id: edgeIdOf(e), from: e.from, to: e.to })));
-  const moved = (opts.layout ?? layered)(graph, opts.layoutOptions ?? { order: "barycenter" });
+  const layout = typeof opts.layout === "function" ? opts.layout : opts.layout === "none" ? null : LAYOUTS[opts.layout ?? "layered"];
+  const moved = layout === null ? /* @__PURE__ */ new Map() : layout(graph, { order: "barycenter", ...opts.layoutOptions });
   const specs = [];
   for (const [i, n] of data.nodes.entries()) {
     const seed = seeds[i].bounds;
     const at = moved.get(n.id) ?? seed;
-    const pose = { x: at.x, y: at.y, width: seed.width, height: seed.height };
     const style = opts.nodeStyle?.(n) ?? NODE;
-    specs.push({
-      id: n.id,
-      kind: "container",
-      layer: "main",
-      pose,
-      data: {
-        diagram: { outline: "rect" },
-        fill: { color: style.fill },
-        stroke: { paint: { color: style.stroke }, width: style.strokeWidth ?? 2 }
-      }
-    });
-    for (const [k, text] of n.lines.entries()) {
-      specs.push({
-        kind: "leaf",
+    const textData = (text, s) => ({ text, style: styleOf(s), fill: { color: style.text } });
+    const built = buildBody(
+      bodies[i],
+      { x: at.x, y: at.y, width: seed.width, height: seed.height },
+      {
+        id: n.id,
         layer: "main",
-        parent: n.id,
-        pickable: false,
-        pose: {
-          x: pose.x + PAD.x,
-          y: pose.y + PAD.y + k * LINE * font.fontSize,
-          width: pose.width - 2 * PAD.x,
-          height: LINE * font.fontSize
-        },
-        data: { text, style: font, fill: { color: style.text } }
-      });
+        measure,
+        body: (trait) => ({
+          diagram: n.pinned === true ? { ...trait, pinned: true } : trait,
+          fill: { color: style.fill },
+          stroke: {
+            paint: { color: style.stroke },
+            width: style.strokeWidth ?? 2,
+            ...style.dash ? { dash: style.dash } : {}
+          }
+        }),
+        row: (text, box) => text === "" ? null : textData(text, box.row.kind === "label" || box.row.kind === "field" ? box.row.style : void 0),
+        portLabel: (text) => textData(text, void 0)
+      }
+    );
+    for (const [k, s] of built.specs.entries()) {
+      specs.push({ ...s, ...k === 0 ? {} : { id: `${n.id}/${k}` } });
     }
   }
   for (const e of edges) {
     const id = edgeIdOf(e);
     const style = opts.edgeStyle?.(e) ?? EDGE;
+    const markerStart = style.markerStart ?? null;
+    const markerEnd = style.markerEnd === void 0 ? "arrow" : style.markerEnd;
     specs.push({
       id,
       kind: "leaf",
@@ -539,23 +552,36 @@ function diagramScene(data, opts = {}) {
       pickable: false,
       pose: { x: 0, y: 0, width: 0, height: 0 },
       data: {
-        diagram: { from: {}, to: {}, router: opts.router ?? "bezier" },
-        stroke: { paint: { color: style.stroke }, width: style.width ?? 1.5, markerEnd: "arrow" }
+        diagram: {
+          from: e.fromPort ? { port: e.fromPort } : {},
+          to: e.toPort ? { port: e.toPort } : {},
+          router: e.router ?? opts.router ?? "bezier",
+          ...e.waypoints ? { waypoints: e.waypoints } : {}
+        },
+        stroke: {
+          paint: { color: style.stroke },
+          width: style.width ?? 1.5,
+          ...style.dash ? { dash: style.dash } : {},
+          ...markerStart !== null ? { markerStart } : {},
+          ...markerEnd !== null ? { markerEnd } : {}
+        }
       },
       dependsOn: [e.from, e.to],
       derivePath: EDGE_DERIVE_PATH
     });
     if (e.label) {
+      const labelStyle = { ...font, fontSize: font.fontSize - 2 };
       specs.push({
+        id: `${id}/label`,
         kind: "leaf",
         layer: "main",
         pickable: false,
-        pose: { x: 0, y: 0, width: e.label.length * GLYPH * (font.fontSize - 2), height: font.fontSize },
+        pose: { x: 0, y: 0, width: measure(e.label, labelStyle).width, height: labelStyle.fontSize },
         data: {
-          diagram: { label: { at: "mid", offset: 9 } },
+          diagram: { label: e.labelPlacement ?? opts.labelPlacement ?? LABEL_PLACEMENT },
           text: e.label,
-          style: { ...font, fontSize: font.fontSize - 2 },
-          fill: { color: style.stroke }
+          style: labelStyle,
+          fill: { color: style.label ?? style.stroke }
         },
         dependsOn: [id],
         derivePose: LABEL_DERIVE_POSE
@@ -564,7 +590,7 @@ function diagramScene(data, opts = {}) {
   }
   return specs;
 }
-var LAYOUTS = Object.freeze({
+var LAYOUTS2 = Object.freeze({
   layered,
   tree,
   force
@@ -609,7 +635,7 @@ function subtreeOf(scene, id) {
 }
 var LAYOUT_ACTION_ID = "diagram.layout";
 function createLayoutAction(opts) {
-  const algorithm = typeof opts.algorithm === "function" ? opts.algorithm : LAYOUTS[opts.algorithm ?? "layered"] ?? layered;
+  const algorithm = typeof opts.algorithm === "function" ? opts.algorithm : LAYOUTS2[opts.algorithm ?? "layered"] ?? layered;
   const build = {
     ...opts.read ? { read: opts.read } : {},
     ...opts.geometry ? { geometry: opts.geometry } : {}
@@ -725,7 +751,7 @@ function useLiveLayout(opts) {
       });
       return;
     }
-    const fn = typeof algorithm === "function" ? algorithm : LAYOUTS[algorithm] ?? layered;
+    const fn = typeof algorithm === "function" ? algorithm : LAYOUTS2[algorithm] ?? layered;
     producer.current = easedProducer(graph, fn, {
       ...o.layout ? { layout: o.layout } : {},
       ...o.frames === void 0 ? {} : { frames: o.frames },
@@ -836,18 +862,31 @@ function useMirroredSelection(selection, selected, onSelect) {
     onSelectRef.current?.(selection.get()[0] ?? null);
   }, [selection, onSelectRef]);
 }
-var made = 0;
-var keys = /* @__PURE__ */ new WeakMap();
-var keyOf = (specs) => {
-  let k = keys.get(specs);
-  if (k === void 0) keys.set(specs, k = ++made);
-  return k;
-};
 var AMBIENT = [dragPanContribution()];
-function DiagramView(props) {
-  return /* @__PURE__ */ jsx(WeaselProvider, { children: /* @__PURE__ */ jsx(Inner, { ...props }, keyOf(props.specs)) });
-}
-function Inner({ specs, width, height, selected, onSelect, minScale, anchor, className }) {
+var DiagramView = forwardRef(function DiagramView2(props, ref) {
+  return /* @__PURE__ */ jsx(WeaselProvider, { children: /* @__PURE__ */ jsx(Inner, { ...props, apiRef: ref }) });
+});
+function Inner({
+  specs,
+  width,
+  height,
+  selected,
+  onSelect,
+  onMove,
+  onConnect,
+  canConnect,
+  portOptions,
+  live: liveOpts,
+  minScale,
+  maxScale,
+  anchor,
+  fitPadding,
+  background,
+  view,
+  onViewChange,
+  className,
+  apiRef
+}) {
   useEffect(() => registerDiagramShape(), []);
   const registry = useMemo(() => withDiagramRegistry(), []);
   const scene = useScene({
@@ -857,26 +896,95 @@ function Inner({ specs, width, height, selected, onSelect, minScale, anchor, cla
   });
   const selection = useSelection({ scene, mode: "single" });
   const onClick = useMirroredSelection(selection, selected, onSelect);
+  const onMoveRef = useLatest(onMove);
+  const syncing = useRef(false);
+  const applied = useRef(specs);
+  const known = useRef(/* @__PURE__ */ new Map());
+  useEffect(() => {
+    const read = () => {
+      const out = /* @__PURE__ */ new Map();
+      for (const n of scene.renderOrderNodes()) {
+        if (n.kind === "container") out.set(n.id, { x: n.pose.x, y: n.pose.y });
+      }
+      return out;
+    };
+    known.current = read();
+    return scene.subscribe(() => {
+      const now = read();
+      const moves = [];
+      if (!syncing.current) {
+        for (const [id, at] of now) {
+          const was = known.current.get(id);
+          if (was !== void 0 && (was.x !== at.x || was.y !== at.y)) moves.push({ id, ...at });
+        }
+      }
+      known.current = now;
+      if (moves.length > 0) onMoveRef.current?.(moves);
+    });
+  }, [scene, onMoveRef]);
+  useEffect(() => {
+    if (applied.current === specs) return;
+    syncing.current = true;
+    try {
+      reconcileSpecs(scene, applied.current, specs);
+    } finally {
+      syncing.current = false;
+    }
+    applied.current = specs;
+  }, [scene, specs]);
+  const source = useMemo(() => sceneParticipants(scene), [scene]);
+  const [run, setRun] = useState(null);
+  const live = useLiveLayout({ ...liveOpts, scene, source, algorithm: run?.algorithm ?? "force" });
+  useEffect(() => {
+    if (run !== null) live.restart();
+  }, [run, live]);
+  useImperativeHandle(apiRef, () => ({
+    layout: (algorithm = "force") => setRun({ algorithm }),
+    live
+  }), [live]);
+  const onConnectRef = useLatest(onConnect);
+  const connecting = onConnect !== void 0;
+  const ports = useMemo(() => connecting ? diagramPorts({
+    ...portOptions,
+    participants: source,
+    ...canConnect ? { canConnect } : {},
+    commit: ({ from, to }) => onConnectRef.current?.({
+      from: from.nodeId,
+      fromPort: from.id,
+      to: to.nodeId,
+      toPort: to.id
+    })
+  }) : null, [connecting, source, canConnect, portOptions, onConnectRef]);
+  const canvasRef = useRef(null);
+  useEffect(() => ports ? canvasRef.current?.registerLayer(ports.layer) : void 0, [ports]);
+  const ambient = useMemo(() => ports ? [...AMBIENT, ports.contribution] : AMBIENT, [ports]);
+  const controlled = view !== void 0;
   const defaultView = useMemo(
-    () => fitDiagram(specs, { width, height }, minScale, anchor),
-    [specs, width, height, minScale, anchor]
+    () => controlled ? void 0 : fitDiagram(specs, { width, height }, { minScale, maxScale, anchor, padding: fitPadding }),
+    // The fit is where the view opens; a later `specs` keeps the view it has.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [controlled, width, height, minScale, maxScale, anchor, fitPadding]
   );
   return /* @__PURE__ */ jsx(
     SceneCanvas,
     {
+      ref: canvasRef,
       scene,
       selection,
-      features: ["view", "pick"],
-      ambient: AMBIENT,
+      features: onMove ? ["view", "pick", "move"] : ["view", "pick"],
+      ambient,
       onClick,
       width,
       height,
       className,
-      ...defaultView ? { defaultView } : {}
+      ...defaultView ? { defaultView } : {},
+      ...view ? { view } : {},
+      ...onViewChange ? { onViewChange } : {},
+      ...background ? { backgroundFill: background } : {}
     }
   );
 }
-function fitDiagram(specs, size, minScale, anchor) {
+function fitDiagram(specs, size, fit = {}) {
   const boxes = specs.filter((s) => s.kind === "container").map((s) => s.pose);
   if (boxes.length === 0) return void 0;
   const x = Math.min(...boxes.map((b) => b.x));
@@ -888,12 +996,13 @@ function fitDiagram(specs, size, minScale, anchor) {
     height: Math.max(...boxes.map((b) => b.y + b.height)) - y
   };
   return fitViewToBounds(bounds, size, { x: 0, y: 0, scale: { x: 1, y: 1 } }, {
-    maxScale: 1,
-    ...minScale !== void 0 ? { minScale } : {},
-    ...anchor !== void 0 ? { anchor } : {}
+    maxScale: fit.maxScale ?? 1,
+    ...fit.minScale !== void 0 ? { minScale: fit.minScale } : {},
+    ...fit.anchor !== void 0 ? { anchor: fit.anchor } : {},
+    ...fit.padding !== void 0 ? { padding: fit.padding } : {}
   });
 }
 
-export { CONNECT_ACTION_ID, DEFAULT_EDGE_STROKE, DIAGRAM_EDGE, DIAGRAM_LABEL, DiagramView, EASED_LAYOUTS, EDGE_DERIVE_PATH, GRAB_PORT_ACTION_ID, LABEL_DERIVE_POSE, LAYOUTS, LAYOUT_ACTION_ID, PORT_AFFORDANCE_KIND, PORT_LAYER_ID, ROUTERS, applyLayout, bezier, buildGraph, commitEdgeToScene, connectBinding, createConnectAction, createDiagramContribution, createLayoutAction, createPortAffordance, defaultCanConnect, diagramEdgeOf, diagramLabelOf, diagramPorts, diagramScene, diagramShape, easedProducer, edgeDerivePath, edgeIdOf, forceProducer, grabPortAction, grabPortBindings, labelDerivePose, layoutPoses, orthogonal, portLayer, portScratchOf, registerDiagramShape, resolveEnd, sceneParticipants, straight, useLiveLayout, useMirroredSelection, withDiagramRegistry };
+export { CONNECT_ACTION_ID, DEFAULT_EDGE_STROKE, DIAGRAM_EDGE, DIAGRAM_LABEL, DiagramView, EASED_LAYOUTS, EDGE_DERIVE_PATH, GRAB_PORT_ACTION_ID, LABEL_DERIVE_POSE, LAYOUTS2 as LAYOUTS, LAYOUT_ACTION_ID, PORT_AFFORDANCE_KIND, PORT_LAYER_ID, ROUTERS, applyLayout, bezier, buildGraph, commitEdgeToScene, connectBinding, createConnectAction, createDiagramContribution, createLayoutAction, createPortAffordance, defaultCanConnect, diagramEdgeOf, diagramLabelOf, diagramPorts, diagramScene, diagramShape, easedProducer, edgeDerivePath, edgeIdOf, forceProducer, grabPortAction, grabPortBindings, labelDerivePose, layoutPoses, orthogonal, portLayer, portScratchOf, registerDiagramShape, resolveEnd, sceneParticipants, straight, useLiveLayout, useMirroredSelection, withDiagramRegistry };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map