@dxos/react-ui-graph 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

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 (82) hide show
  1. package/README.md +5 -7
  2. package/dist/lib/browser/{chunk-LKC455GK.mjs → chunk-EASNZZ7B.mjs} +1 -1
  3. package/dist/lib/browser/{chunk-LKC455GK.mjs.map → chunk-EASNZZ7B.mjs.map} +2 -2
  4. package/dist/lib/browser/index.mjs +49 -110
  5. package/dist/lib/browser/index.mjs.map +3 -3
  6. package/dist/lib/browser/meta.json +1 -1
  7. package/dist/lib/browser/testing/index.mjs +14 -14
  8. package/dist/lib/browser/testing/index.mjs.map +3 -3
  9. package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs → chunk-JSE2X4ML.mjs} +1 -1
  10. package/dist/lib/node-esm/{chunk-JE4KZCUF.mjs.map → chunk-JSE2X4ML.mjs.map} +2 -2
  11. package/dist/lib/node-esm/index.mjs +49 -110
  12. package/dist/lib/node-esm/index.mjs.map +3 -3
  13. package/dist/lib/node-esm/meta.json +1 -1
  14. package/dist/lib/node-esm/testing/index.mjs +14 -14
  15. package/dist/lib/node-esm/testing/index.mjs.map +3 -3
  16. package/dist/types/src/components/Graph/Graph.d.ts +2 -2
  17. package/dist/types/src/components/Graph/Graph.d.ts.map +1 -1
  18. package/dist/types/src/components/Graph/Graph.stories.d.ts +5 -5
  19. package/dist/types/src/components/Graph/Graph.stories.d.ts.map +1 -1
  20. package/dist/types/src/components/Mesh/Mesh.d.ts.map +1 -1
  21. package/dist/types/src/components/Mesh/Mesh.stories.d.ts.map +1 -1
  22. package/dist/types/src/components/SVG/Grid.d.ts.map +1 -1
  23. package/dist/types/src/components/SVG/Markers.d.ts.map +1 -1
  24. package/dist/types/src/components/SVG/Root.d.ts +3 -3
  25. package/dist/types/src/components/SVG/Root.d.ts.map +1 -1
  26. package/dist/types/src/components/SVG/SVG.d.ts.map +1 -1
  27. package/dist/types/src/components/SVG/Svg.stories.d.ts +1 -1
  28. package/dist/types/src/components/SVG/Svg.stories.d.ts.map +1 -1
  29. package/dist/types/src/fx/fx.stories.d.ts +3 -3
  30. package/dist/types/src/fx/fx.stories.d.ts.map +1 -1
  31. package/dist/types/src/fx/pulsar.d.ts.map +1 -1
  32. package/dist/types/src/graph/markers.d.ts.map +1 -1
  33. package/dist/types/src/graph/projector/graph-drag.d.ts.map +1 -1
  34. package/dist/types/src/graph/projector/graph-force-projector.d.ts.map +1 -1
  35. package/dist/types/src/graph/projector/graph-forces.d.ts.map +1 -1
  36. package/dist/types/src/graph/projector/graph-hierarchical-projector.d.ts.map +1 -1
  37. package/dist/types/src/graph/projector/graph-projector.d.ts.map +1 -1
  38. package/dist/types/src/graph/projector/graph-radial-projector.d.ts.map +1 -1
  39. package/dist/types/src/graph/projector/graph-relational-projector.d.ts.map +1 -1
  40. package/dist/types/src/graph/projector/projector.d.ts.map +1 -1
  41. package/dist/types/src/graph/renderer/bullets.d.ts.map +1 -1
  42. package/dist/types/src/graph/renderer/graph-renderer.d.ts.map +1 -1
  43. package/dist/types/src/graph/renderer/renderer.d.ts.map +1 -1
  44. package/dist/types/src/hooks/useGrid.d.ts.map +1 -1
  45. package/dist/types/src/hooks/useStateRef.d.ts.map +1 -1
  46. package/dist/types/src/hooks/useSvgContext.d.ts.map +1 -1
  47. package/dist/types/src/hooks/useZoom.d.ts.map +1 -1
  48. package/dist/types/src/stories/hooks.stories.d.ts +1 -1
  49. package/dist/types/src/stories/hooks.stories.d.ts.map +1 -1
  50. package/dist/types/src/testing/data.d.ts +1 -1
  51. package/dist/types/src/testing/data.d.ts.map +1 -1
  52. package/dist/types/src/testing/hooks.d.ts.map +1 -1
  53. package/dist/types/src/testing/model.d.ts.map +1 -1
  54. package/dist/types/src/util/events.d.ts.map +1 -1
  55. package/dist/types/src/util/fraction.d.ts +1 -1
  56. package/dist/types/src/util/fraction.d.ts.map +1 -1
  57. package/dist/types/src/util/points.d.ts.map +1 -1
  58. package/dist/types/src/util/scale.d.ts.map +1 -1
  59. package/dist/types/src/util/screen.d.ts.map +1 -1
  60. package/dist/types/src/util/vector.d.ts.map +1 -1
  61. package/dist/types/tsconfig.tsbuildinfo +1 -1
  62. package/package.json +18 -25
  63. package/src/components/Graph/Graph.stories.tsx +25 -23
  64. package/src/components/Graph/Graph.tsx +15 -17
  65. package/src/components/Mesh/Mesh.stories.tsx +2 -3
  66. package/src/components/SVG/Root.tsx +14 -7
  67. package/src/components/SVG/SVG.tsx +0 -1
  68. package/src/components/SVG/Svg.stories.tsx +4 -5
  69. package/src/fx/fx.stories.tsx +7 -8
  70. package/src/graph/projector/graph-drag.ts +0 -1
  71. package/src/graph/projector/graph-force-projector.ts +0 -1
  72. package/src/graph/projector/graph-hierarchical-projector.ts +0 -1
  73. package/src/graph/projector/graph-projector.ts +0 -1
  74. package/src/graph/projector/graph-radial-projector.ts +0 -1
  75. package/src/graph/projector/graph-relational-projector.ts +0 -1
  76. package/src/graph/renderer/graph-renderer.ts +4 -5
  77. package/src/stories/hooks.stories.tsx +4 -4
  78. package/src/testing/data.ts +9 -9
  79. package/src/testing/hooks.ts +2 -3
  80. package/src/testing/model.ts +3 -3
  81. package/src/util/fraction.ts +1 -1
  82. package/styles/graph.css +292 -43
@@ -3,7 +3,7 @@ import {
3
3
  useDynamicRef,
4
4
  useStateRef,
5
5
  useTimestamp
6
- } from "./chunk-JE4KZCUF.mjs";
6
+ } from "./chunk-JSE2X4ML.mjs";
7
7
 
8
8
  // src/components/Graph/Graph.tsx
9
9
  import React, { forwardRef, useEffect as useEffect3, useImperativeHandle, useMemo as useMemo3, useRef as useRef3 } from "react";
@@ -146,15 +146,7 @@ var createGraphDrag = (context, projector, options = defaultDragOptions) => {
146
146
  import { invariant } from "@dxos/invariant";
147
147
  var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-graph/src/graph/types.ts";
148
148
  var defaultIdAccessor = (node) => {
149
- invariant(node.id, void 0, {
150
- F: __dxlog_file,
151
- L: 18,
152
- S: void 0,
153
- A: [
154
- "node.id",
155
- ""
156
- ]
157
- });
149
+ invariant(node.id, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 10, S: void 0, A: ["node.id", ""] });
158
150
  return node.id;
159
151
  };
160
152
  var emptyGraph = {
@@ -201,7 +193,7 @@ var FractionUtil = class _FractionUtil {
201
193
  };
202
194
  /**
203
195
  * @param {Fraction}
204
- * Convert to rounded number.
196
+ * Convert to rounded-sm number.
205
197
  */
206
198
  static toNumber = ([n, d]) => {
207
199
  _FractionUtil.validate([
@@ -293,15 +285,7 @@ var FractionUtil = class _FractionUtil {
293
285
  * @param n
294
286
  */
295
287
  static factors = (n) => {
296
- invariant2(Number.isFinite(n), `Invalid number: ${n}`, {
297
- F: __dxlog_file2,
298
- L: 113,
299
- S: this,
300
- A: [
301
- "Number.isFinite(n)",
302
- "`Invalid number: ${n}`"
303
- ]
304
- });
288
+ invariant2(Number.isFinite(n), `Invalid number: ${n}`, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 113, S: this, A: ["Number.isFinite(n)", "`Invalid number: ${n}`"] });
305
289
  const factors = [
306
290
  1
307
291
  ];
@@ -942,12 +926,7 @@ var GraphForceProjector = class extends GraphProjector {
942
926
  nodes: graph?.nodes.length,
943
927
  edges: graph?.edges.length
944
928
  }
945
- }, {
946
- F: __dxlog_file3,
947
- L: 227,
948
- S: this,
949
- C: (f, a) => f(...a)
950
- });
929
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 89, S: this });
951
930
  this._simulation.stop();
952
931
  this.mergeData(graph);
953
932
  this.updateLayout();
@@ -997,12 +976,7 @@ var GraphForceProjector = class extends GraphProjector {
997
976
  updateForces(forces) {
998
977
  log("updateForces", {
999
978
  forces
1000
- }, {
1001
- F: __dxlog_file3,
1002
- L: 288,
1003
- S: this,
1004
- C: (f, a) => f(...a)
1005
- });
979
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 148, S: this });
1006
980
  this._simulation.nodes(this.layout.graph.nodes).force("link", maybeForce(forces?.link, (config) => {
1007
981
  const force = forceLink().id((d) => d.id).links(this.layout.graph.edges.filter((edge) => edge.linkForce));
1008
982
  if (config.distance != null) {
@@ -1083,12 +1057,7 @@ var GraphRadialProjector = class extends GraphProjector {
1083
1057
  nodes: graph?.nodes.length,
1084
1058
  edges: graph?.edges.length
1085
1059
  }
1086
- }, {
1087
- F: __dxlog_file4,
1088
- L: 32,
1089
- S: this,
1090
- C: (f, a) => f(...a)
1091
- });
1060
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 13, S: this });
1092
1061
  this.mergeData(graph);
1093
1062
  this.doRadialLayout();
1094
1063
  }
@@ -1193,12 +1162,7 @@ var GraphHierarchicalProjector = class extends GraphRadialProjector {
1193
1162
  edges: graph?.edges.length
1194
1163
  },
1195
1164
  selection: this.selection?.getSelectedIds()
1196
- }, {
1197
- F: __dxlog_file5,
1198
- L: 24,
1199
- S: this,
1200
- C: (f, a) => f(...a)
1201
- });
1165
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 8, S: this });
1202
1166
  this.mergeData(graph);
1203
1167
  const selected = this.selection?.getSelectedIds()[0];
1204
1168
  if (selected) {
@@ -1256,12 +1220,7 @@ var GraphRelationalProjector = class extends GraphRadialProjector {
1256
1220
  edges: graph?.edges.length
1257
1221
  },
1258
1222
  selection: this.selection?.getSelectedIds()
1259
- }, {
1260
- F: __dxlog_file6,
1261
- L: 24,
1262
- S: this,
1263
- C: (f, a) => f(...a)
1264
- });
1223
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 8, S: this });
1265
1224
  this.mergeData(graph);
1266
1225
  const selected = this.selection?.getSelectedIds()[0];
1267
1226
  if (selected) {
@@ -1387,15 +1346,7 @@ var Renderer = class {
1387
1346
  return this._context;
1388
1347
  }
1389
1348
  get root() {
1390
- invariant3(this._root.current, "SVG root is not initialized", {
1391
- F: __dxlog_file7,
1392
- L: 40,
1393
- S: this,
1394
- A: [
1395
- "this._root.current",
1396
- "'SVG root is not initialized'"
1397
- ]
1398
- });
1349
+ invariant3(this._root.current, "SVG root is not initialized", { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 23, S: this, A: ["this._root.current", "'SVG root is not initialized'"] });
1399
1350
  return this._root.current;
1400
1351
  }
1401
1352
  get options() {
@@ -1408,12 +1359,7 @@ var __dxlog_file8 = "/__w/dxos/dxos/packages/ui/react-ui-graph/src/graph/rendere
1408
1359
  var createLine2 = line2();
1409
1360
  var GraphRenderer = class extends Renderer {
1410
1361
  render(layout) {
1411
- log5("render", layout, {
1412
- F: __dxlog_file8,
1413
- L: 63,
1414
- S: this,
1415
- C: (f, a) => f(...a)
1416
- });
1362
+ log5("render", layout, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 19, S: this });
1417
1363
  const root = select4(this.root);
1418
1364
  if (layout.guides) {
1419
1365
  root.selectAll("g.dx-guides").data([
@@ -1520,14 +1466,14 @@ var createNode = (group, options) => {
1520
1466
  circle.on("pointerenter", function() {
1521
1467
  select4(this.closest("g.dx-node")).raise();
1522
1468
  if (options.labels) {
1523
- select4(this.parentElement).classed("dx-active", true).classed("dx-highlight", true);
1469
+ select4(this.parentElement).classed("dx-node-active", true).classed("dx-highlight", true);
1524
1470
  }
1525
1471
  });
1526
1472
  group.on("pointerleave", function() {
1527
1473
  if (options.labels) {
1528
- select4(this).classed("dx-active", false);
1474
+ select4(this).classed("dx-node-active", false);
1529
1475
  setTimeout(() => {
1530
- if (!select4(this).classed("dx-active")) {
1476
+ if (!select4(this).classed("dx-node-active")) {
1531
1477
  select4(this).classed("dx-highlight", false);
1532
1478
  }
1533
1479
  }, 300);
@@ -1556,12 +1502,7 @@ var updateNode2 = (group, options) => {
1556
1502
  } catch (error) {
1557
1503
  log5.error("updateNode", {
1558
1504
  error: error?.message
1559
- }, {
1560
- F: __dxlog_file8,
1561
- L: 305,
1562
- S: void 0,
1563
- C: (f, a) => f(...a)
1564
- });
1505
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 194, S: void 0 });
1565
1506
  }
1566
1507
  }
1567
1508
  const groupOrTransition = options.transition ? group.transition(options.transition()) : group;
@@ -1612,12 +1553,7 @@ var updateEdge = (group, options, nodeGroup) => {
1612
1553
  } catch (error) {
1613
1554
  log5.error("updateEdge", {
1614
1555
  error: error?.message
1615
- }, {
1616
- F: __dxlog_file8,
1617
- L: 417,
1618
- S: void 0,
1619
- C: (f, a) => f(...a)
1620
- });
1556
+ }, { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 260, S: void 0 });
1621
1557
  }
1622
1558
  const groupOrTransition = options.transition ? group.transition(options.transition()) : group;
1623
1559
  groupOrTransition.selectAll("path").attr("d", function() {
@@ -2015,15 +1951,15 @@ var useZoom = (options = defaultZoomOptions) => {
2015
1951
 
2016
1952
  // src/components/Graph/Graph.tsx
2017
1953
  var __dxlog_file9 = "/__w/dxos/dxos/packages/ui/react-ui-graph/src/components/Graph/Graph.tsx";
2018
- var GraphInner = ({ classNames, model, projector: _projector, renderer: _renderer, drag: drag2, arrows, onSelect, onInspect, ...props }, forwardedRef) => {
1954
+ var GraphInner = ({ classNames, model, projector: projectorProp, renderer: rendererProp, drag: drag2, arrows, onSelect, onInspect, ...props }, forwardedRef) => {
2019
1955
  const context = useSvgContext();
2020
1956
  const graphRef = useRef3(null);
2021
1957
  const { projector, renderer } = useMemo3(() => {
2022
- let projector2 = _projector;
1958
+ let projector2 = projectorProp;
2023
1959
  if (!projector2) {
2024
1960
  projector2 = new GraphForceProjector(context);
2025
1961
  }
2026
- let renderer2 = _renderer;
1962
+ let renderer2 = rendererProp;
2027
1963
  if (!renderer2) {
2028
1964
  renderer2 = new GraphRenderer(context, graphRef, {
2029
1965
  ...props,
@@ -2032,8 +1968,8 @@ var GraphInner = ({ classNames, model, projector: _projector, renderer: _rendere
2032
1968
  arrows: {
2033
1969
  end: arrows
2034
1970
  },
2035
- onNodeClick: onSelect ? (node, event) => onSelect(node, event) : void 0,
2036
- onNodePointerEnter: onInspect ? (node, event) => onInspect(node, event) : void 0
1971
+ onNodeClick: onSelect,
1972
+ onNodePointerEnter: onInspect
2037
1973
  });
2038
1974
  }
2039
1975
  return {
@@ -2042,8 +1978,8 @@ var GraphInner = ({ classNames, model, projector: _projector, renderer: _rendere
2042
1978
  };
2043
1979
  }, [
2044
1980
  context,
2045
- _projector,
2046
- _renderer,
1981
+ projectorProp,
1982
+ rendererProp,
2047
1983
  drag2
2048
1984
  ]);
2049
1985
  useImperativeHandle(forwardedRef, () => ({
@@ -2063,22 +1999,20 @@ var GraphInner = ({ classNames, model, projector: _projector, renderer: _rendere
2063
1999
  ]);
2064
2000
  useEffect3(() => {
2065
2001
  projector.updateData(model?.graph);
2066
- const unsubscribeModel = model && "subscribe" in model ? model.subscribe(() => {
2067
- projector.updateData(model?.graph);
2068
- }) : void 0;
2069
- return combine(unsubscribeModel, projector.updated.on(({ layout }) => {
2070
- try {
2071
- renderer.render(layout);
2072
- } catch (error) {
2073
- void projector.stop();
2074
- log6.catch(error, void 0, {
2075
- F: __dxlog_file9,
2076
- L: 115,
2077
- S: void 0,
2078
- C: (f, a) => f(...a)
2079
- });
2080
- }
2081
- }));
2002
+ return combine(
2003
+ // Subscribe to model changes if reactive model.
2004
+ model ? model.subscribe(() => {
2005
+ projector.updateData(model?.graph);
2006
+ }) : void 0,
2007
+ projector.updated.on(({ layout }) => {
2008
+ try {
2009
+ renderer.render(layout);
2010
+ } catch (error) {
2011
+ log6.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 67, S: void 0 });
2012
+ void projector.stop();
2013
+ }
2014
+ })
2015
+ );
2082
2016
  }, [
2083
2017
  model,
2084
2018
  projector,
@@ -2264,16 +2198,19 @@ var Markers = ({ arrowSize, className }) => {
2264
2198
  import { select as select9 } from "d3";
2265
2199
  import React4, { forwardRef as forwardRef2, useEffect as useEffect6, useImperativeHandle as useImperativeHandle2, useMemo as useMemo4 } from "react";
2266
2200
  import { useResizeDetector } from "react-resize-detector";
2267
- import { mx as mx3 } from "@dxos/ui-theme";
2268
- var Root = /* @__PURE__ */ forwardRef2(({ classNames, children, ...props }, ref) => {
2201
+ import { composableProps, mx as mx3 } from "@dxos/ui-theme";
2202
+ var Root = /* @__PURE__ */ forwardRef2(({ children, scale, centered, ...props }, ref) => {
2269
2203
  const { ref: containerRef, width = 0, height = 0 } = useResizeDetector({
2270
2204
  refreshRate: 200
2271
2205
  });
2272
2206
  const context = useMemo4(() => {
2273
- return new SVGContext(props);
2207
+ return new SVGContext({
2208
+ scale,
2209
+ centered
2210
+ });
2274
2211
  }, [
2275
- props.scale,
2276
- props.centered
2212
+ scale,
2213
+ centered
2277
2214
  ]);
2278
2215
  useImperativeHandle2(ref, () => context, [
2279
2216
  context
@@ -2295,8 +2232,10 @@ var Root = /* @__PURE__ */ forwardRef2(({ classNames, children, ...props }, ref)
2295
2232
  return /* @__PURE__ */ React4.createElement(SVGContextProvider, {
2296
2233
  value: context
2297
2234
  }, /* @__PURE__ */ React4.createElement("div", {
2298
- ref: containerRef,
2299
- className: mx3("grid grow overflow-hidden", classNames)
2235
+ ...composableProps(props, {
2236
+ classNames: "dx-expander"
2237
+ }),
2238
+ ref: containerRef
2300
2239
  }, /* @__PURE__ */ React4.createElement("svg", {
2301
2240
  xmlns: "http://www.w3.org/2000/svg",
2302
2241
  ref: context.ref,