@dxos/react-ui-graph 0.11.0 → 0.12.0-next-2be9f24c465d98f4bd186aa03ece788902e6c17a

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.
Files changed (68) hide show
  1. package/dist/lib/index.mjs +22 -17
  2. package/dist/lib/index.mjs.map +1 -1
  3. package/dist/lib/testing.mjs +4 -4
  4. package/dist/lib/testing.mjs.map +1 -1
  5. package/dist/types/src/components/Graph/Graph.d.ts +6 -4
  6. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  7. package/dist/types/src/components/Graph/Graph.stories.d.ts +5 -3
  8. package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
  9. package/dist/types/src/components/Mesh/Mesh.stories.d.ts +2 -1
  10. package/dist/types/src/components/Mesh/Mesh.stories.d.ts.map +1 -1
  11. package/dist/types/src/components/SVG/Svg.stories.d.ts +2 -1
  12. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  13. package/dist/types/src/fx/fx.stories.d.ts +2 -1
  14. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  15. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  16. package/dist/types/src/graph/projector/graph-bundle-projector.d.ts +2 -2
  17. package/dist/types/src/graph/projector/graph-bundle-projector.d.ts.map +1 -1
  18. package/dist/types/src/graph/projector/graph-cluster-projector.d.ts +2 -2
  19. package/dist/types/src/graph/projector/graph-cluster-projector.d.ts.map +1 -1
  20. package/dist/types/src/graph/projector/graph-force-projector.d.ts +2 -2
  21. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  22. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts +2 -2
  23. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  24. package/dist/types/src/graph/projector/graph-lattice-projector.d.ts +2 -2
  25. package/dist/types/src/graph/projector/graph-lattice-projector.d.ts.map +1 -1
  26. package/dist/types/src/graph/projector/graph-plexus-projector.d.ts +2 -2
  27. package/dist/types/src/graph/projector/graph-plexus-projector.d.ts.map +1 -1
  28. package/dist/types/src/graph/projector/graph-projector.d.ts +4 -3
  29. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  30. package/dist/types/src/graph/projector/graph-radial-projector.d.ts +2 -2
  31. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  32. package/dist/types/src/graph/projector/graph-relational-projector.d.ts +2 -2
  33. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  34. package/dist/types/src/graph/projector/graph-swarm-projector.d.ts +2 -2
  35. package/dist/types/src/graph/projector/graph-swarm-projector.d.ts.map +1 -1
  36. package/dist/types/src/graph/projector/graph-tree-projector.d.ts +2 -2
  37. package/dist/types/src/graph/projector/graph-tree-projector.d.ts.map +1 -1
  38. package/dist/types/src/graph/types.d.ts +2 -2
  39. package/dist/types/src/graph/types.d.ts.map +1 -1
  40. package/dist/types/src/stories/hooks.stories.d.ts +5 -3
  41. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  42. package/dist/types/src/testing/data.d.ts +5 -4
  43. package/dist/types/src/testing/data.d.ts.map +1 -1
  44. package/dist/types/src/testing/hooks.d.ts +3 -3
  45. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  46. package/dist/types/src/testing/model.d.ts +4 -3
  47. package/dist/types/src/testing/model.d.ts.map +1 -1
  48. package/dist/types/tsconfig.tsbuildinfo +1 -1
  49. package/package.json +19 -23
  50. package/src/components/Graph/Graph.stories.tsx +8 -7
  51. package/src/components/Graph/Graph.tsx +7 -5
  52. package/src/graph/projector/graph-bundle-projector.ts +2 -2
  53. package/src/graph/projector/graph-cluster-projector.ts +2 -2
  54. package/src/graph/projector/graph-force-projector.ts +2 -2
  55. package/src/graph/projector/graph-hierarchical-projector.ts +2 -2
  56. package/src/graph/projector/graph-lattice-projector.ts +2 -2
  57. package/src/graph/projector/graph-plexus-projector.test.ts +2 -2
  58. package/src/graph/projector/graph-plexus-projector.ts +2 -2
  59. package/src/graph/projector/graph-projector.ts +4 -3
  60. package/src/graph/projector/graph-radial-projector.ts +2 -2
  61. package/src/graph/projector/graph-relational-projector.ts +2 -2
  62. package/src/graph/projector/graph-swarm-projector.ts +2 -2
  63. package/src/graph/projector/graph-tree-projector.ts +2 -2
  64. package/src/graph/types.ts +2 -2
  65. package/src/stories/hooks.stories.tsx +5 -4
  66. package/src/testing/data.ts +6 -5
  67. package/src/testing/hooks.ts +2 -2
  68. package/src/testing/model.ts +6 -5
@@ -1123,7 +1123,8 @@ var createGraphDrag = (context, projector, options = defaultDragOptions) => {
1123
1123
  if (options?.onDrop && keyMod(event.sourceEvent, "linkMod")) mode = 1;
1124
1124
  else if (keyMod(event.sourceEvent, "dragMod")) mode = 0;
1125
1125
  }).on("drag", function(event, d) {
1126
- select(this.closest("g.node")).classed("dragging", true).raise();
1126
+ const parent = this.closest("g.node");
1127
+ select(parent).classed("dragging", true).raise();
1127
1128
  const [dx, dy] = pointer(event, this.parentElement);
1128
1129
  const point = [d.x + dx - offset[0], d.y + dy - offset[1]];
1129
1130
  switch (mode) {
@@ -1149,9 +1150,7 @@ var createGraphDrag = (context, projector, options = defaultDragOptions) => {
1149
1150
  select(context.svg).attr("cursor", void 0);
1150
1151
  select(this.parentElement).classed("dragging", false);
1151
1152
  switch (mode) {
1152
- case 1:
1153
- options?.onDrop?.(source, target);
1154
- break;
1153
+ case 1: options?.onDrop?.(source, target);
1155
1154
  }
1156
1155
  if (!keyMod(event.sourceEvent, "freezeMod")) {
1157
1156
  event.subject.fx = null;
@@ -1251,8 +1250,10 @@ var GraphForceProjector = class extends GraphProjector {
1251
1250
  this._simulation.stop();
1252
1251
  }
1253
1252
  onRefresh(dragging = false) {
1254
- if (this.forces.center) if (dragging) this._simulation.force("center", null);
1255
- else this.updateForces(this.forces);
1253
+ if (this.forces.center) {
1254
+ if (dragging) this._simulation.force("center", null);
1255
+ else this.updateForces(this.forces);
1256
+ }
1256
1257
  this.restart();
1257
1258
  }
1258
1259
  onUpdate(graph) {
@@ -2164,7 +2165,8 @@ var createBullets = (group, nodeId, options = {}) => {
2164
2165
  const path = select(edges[i]);
2165
2166
  const p = path.node().getPointAtLength(0);
2166
2167
  select(group).append("circle").attr("class", "dx-bullet").attr("cx", p.x).attr("cy", p.y).attr("r", radius).transition().delay(delay).duration(minDuration + Math.random() * maxDuration).ease(easeLinear).tween("pathTween", function() {
2167
- const r = interpolate(0, path.node().getTotalLength());
2168
+ const length = path.node().getTotalLength();
2169
+ const r = interpolate(0, length);
2168
2170
  return (t) => {
2169
2171
  const point = path.node().getPointAtLength(r(t));
2170
2172
  select(this).attr("cx", point.x).attr("cy", point.y);
@@ -2244,7 +2246,7 @@ var GraphRenderer = class extends Renderer {
2244
2246
  const root = select(this.root);
2245
2247
  if (layout.guides) root.selectAll("g.dx-guides").data([{ id: "guides" }]).join("g").classed("dx-guides", true).selectAll("circle").data(layout.guides ?? []).join((enter) => enter.append("circle").attr("r", 0), (update) => update, (exit) => exit.transition().duration(500).attr("r", 0).remove()).attr("cx", (d) => d.cx).attr("cy", (d) => d.cy).attr("r", (d) => d.r);
2246
2248
  const scale = 100;
2247
- const offsetDistance = 24 * scale;
2249
+ const offsetDistance = 2400;
2248
2250
  if (this._options.subgraphs) {
2249
2251
  const components = this._options.subgraphs ? findConnectedComponents({
2250
2252
  nodes: layout.graph?.nodes ?? [],
@@ -2258,7 +2260,8 @@ var GraphRenderer = class extends Renderer {
2258
2260
  })) : [];
2259
2261
  root.selectAll("g.dx-subgraphs").data([{ id: "subgraphs" }]).join("g").classed("dx-subgraphs", true).selectAll("path").data(components).join((enter) => enter.append("path").classed("dx-subgraph", true), (update) => {
2260
2262
  return update.attr("d", ({ component }) => {
2261
- const hullPoints = polygonHull(layout.graph?.nodes.filter((node) => component.includes(node.id)).map((node) => [node.x, node.y]) ?? []);
2263
+ const points = layout.graph?.nodes.filter((node) => component.includes(node.id)).map((node) => [node.x, node.y]) ?? [];
2264
+ const hullPoints = polygonHull(points);
2262
2265
  const co = new Clipper.ClipperOffset();
2263
2266
  const solution = [];
2264
2267
  const clipperPath = hullPoints.map(([x, y]) => ({
@@ -2401,7 +2404,6 @@ var updateNode$1 = (group, options) => {
2401
2404
  const groupOrTransition = options.transition ? group.transition(options.transition()) : group;
2402
2405
  if (!options.renderNode) groupOrTransition.select("circle").attr("r", (d) => d.r ?? 16);
2403
2406
  if (options.labels) {
2404
- const py = 2;
2405
2407
  const offset = 16;
2406
2408
  const dx = (d, offset = 0) => (offset + (d.r ?? 0)) * (d.x > 0 ? 1 : -1);
2407
2409
  groupOrTransition.select("text").text((d) => options.labels.text(d)).style("text-anchor", (d) => d.x > 0 ? "start" : "end").attr("dx", (d) => dx(d, offset)).attr("dy", 1).text((d) => options.labels.text(d)).each(function(d) {
@@ -2411,9 +2413,9 @@ var updateNode$1 = (group, options) => {
2411
2413
  d.bbox = bbox;
2412
2414
  }
2413
2415
  const width = bbox.width + 10;
2414
- const height = bbox.height + py * 2;
2415
- select(this.parentElement).select("rect").attr("x", dx(d, offset - 5) + (d.x > 0 ? 0 : -1) * width).attr("y", -height / 2).attr("width", width).attr("height", height).attr("rx", 4);
2416
- select(this.parentElement).select("line").attr("x1", dx(d, 1)).attr("y1", 0).attr("x2", dx(d, offset - 5)).attr("y2", 0);
2416
+ const height = bbox.height + 4;
2417
+ select(this.parentElement).select("rect").attr("x", dx(d, 11) + (d.x > 0 ? 0 : -1) * width).attr("y", -height / 2).attr("width", width).attr("height", height).attr("rx", 4);
2418
+ select(this.parentElement).select("line").attr("x1", dx(d, 1)).attr("y1", 0).attr("x2", dx(d, 11)).attr("y2", 0);
2417
2419
  });
2418
2420
  }
2419
2421
  };
@@ -2897,7 +2899,7 @@ var GraphInner = ({ classNames, model, projector: projectorProp, renderer: rende
2897
2899
  log.catch(error, void 0, {
2898
2900
  "~LogMeta": "~LogMeta",
2899
2901
  F: __dxlog_file,
2900
- L: 165,
2902
+ L: 167,
2901
2903
  S: void 0
2902
2904
  });
2903
2905
  projector.stop();
@@ -3085,12 +3087,14 @@ var FPS = ({ classNames, corner = "top-right", margin = PADDING }) => {
3085
3087
  const halfH = size.height / 2;
3086
3088
  const left = corner === "top-left" || corner === "bottom-left";
3087
3089
  const top = corner === "top-left" || corner === "top-right";
3090
+ const x = left ? -halfW + margin : halfW - margin;
3091
+ const y = top ? -halfH + margin : halfH - margin;
3088
3092
  return /* @__PURE__ */ jsx("g", {
3089
3093
  className: "dx-fps",
3090
3094
  style: { pointerEvents: "none" },
3091
3095
  children: /* @__PURE__ */ jsx("text", {
3092
- x: left ? -halfW + margin : halfW - margin,
3093
- y: top ? -halfH + margin : halfH - margin,
3096
+ x,
3097
+ y,
3094
3098
  textAnchor: left ? "start" : "end",
3095
3099
  dominantBaseline: top ? "hanging" : "alphabetic",
3096
3100
  className: mx("font-mono text-xs fill-neutral-500 tabular-nums", classNames),
@@ -3193,8 +3197,9 @@ var SVG = {
3193
3197
  Markers,
3194
3198
  Mesh,
3195
3199
  Zoom: memo(({ extent, className, children }) => {
3200
+ const zoom = useZoom(useMemo(() => ({ extent }), [JSON.stringify(extent)]));
3196
3201
  return /* @__PURE__ */ jsx("g", {
3197
- ref: useZoom(useMemo(() => ({ extent }), [JSON.stringify(extent)])).ref,
3202
+ ref: zoom.ref,
3198
3203
  className,
3199
3204
  children
3200
3205
  });