@xyo-network/react-node-renderer 2.47.40 → 2.47.42

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.
@@ -3,66 +3,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useCytoscapeElements = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const react_shared_1 = require("@xylabs/react-shared");
6
- const node_1 = require("@xyo-network/node");
7
- const react_node_1 = require("@xyo-network/react-node");
8
6
  const react_1 = require("react");
9
7
  const Cytoscape_1 = require("../../Cytoscape");
10
8
  /**
11
9
  * Note: Relies on describe but could eventually be converted to a discover call
12
10
  * Logic would be similar to what the bridge does
13
11
  */
14
- const useCytoscapeElements = (nodeAddressOrName, onModuleError) => {
15
- const [node] = (0, react_node_1.useProvidedWrappedNode)();
16
- const [module, moduleError] = (0, react_node_1.useModule)(nodeAddressOrName);
12
+ const useCytoscapeElements = (targetNode) => {
17
13
  const [elements, setElements] = (0, react_1.useState)([]);
18
- const [refresh, setRefresh] = (0, react_1.useState)(1);
19
- (0, react_1.useEffect)(() => {
20
- if (moduleError)
21
- onModuleError === null || onModuleError === void 0 ? void 0 : onModuleError(moduleError);
22
- }, [moduleError, onModuleError]);
23
14
  (0, react_shared_1.useAsyncEffect)(
24
15
  // eslint-disable-next-line react-hooks/exhaustive-deps
25
- (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
16
+ () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
26
17
  var _a;
27
- if ((node || module) && refresh) {
28
- const wrappedNode = nodeAddressOrName ? node_1.NodeWrapper.wrap(module) : node;
29
- if (!wrappedNode) {
30
- return;
31
- }
18
+ if (targetNode) {
32
19
  try {
33
- const [description, newRootNode] = yield Cytoscape_1.CytoscapeElements.buildRootNode(wrappedNode);
34
- if (mounted())
35
- setElements(() => [newRootNode]);
20
+ const [description, newRootNode] = yield Cytoscape_1.CytoscapeElements.buildRootNode(targetNode);
21
+ const newElements = [newRootNode];
36
22
  const children = description.children;
37
23
  yield Promise.allSettled((_a = (children !== null && children !== void 0 ? children : [])) === null || _a === void 0 ? void 0 : _a.map((address) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
38
24
  try {
39
- const newNode = yield Cytoscape_1.CytoscapeElements.buildChild(wrappedNode, address);
40
- if (mounted())
41
- setElements((previous) => [...previous, newNode]);
25
+ const newNode = yield Cytoscape_1.CytoscapeElements.buildChild(targetNode, address);
26
+ newElements.push(newNode);
42
27
  const newEdge = Cytoscape_1.CytoscapeElements.buildEdge(newRootNode, newNode);
43
- if (mounted())
44
- setElements((previous) => [...previous, newEdge]);
28
+ newElements.push(newEdge);
45
29
  }
46
30
  catch (e) {
47
31
  console.error('Error parsing children', e);
48
32
  }
49
33
  })));
34
+ setElements(newElements);
50
35
  }
51
36
  catch (e) {
52
37
  console.error('Error Getting initial description', e);
53
38
  }
54
39
  }
55
- }), [module, node, nodeAddressOrName, refresh]);
56
- (0, react_1.useEffect)(() => {
57
- let listener;
58
- if (node) {
59
- listener = node.onAny((eventName) => {
60
- if (eventName === 'moduleAttached')
61
- setRefresh((previous) => previous + 1);
62
- });
63
- }
64
- return () => listener === null || listener === void 0 ? void 0 : listener();
65
- }, [node]);
40
+ return () => console.log('unmounted');
41
+ }), [targetNode]);
66
42
  return elements;
67
43
  };
68
44
  exports.useCytoscapeElements = useCytoscapeElements;
@@ -1 +1 @@
1
- {"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,iCAAgC;AAEhC,+CAAmD;AAEnD;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAC,UAAwB,EAAE,EAAE;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAsB,EAAE,CAAC,CAAA;IAEjE,IAAA,6BAAc;IACZ,uDAAuD;IACvD,GAAS,EAAE;;QACT,IAAI,UAAU,EAAE;YACd,IAAI;gBACF,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,6BAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;gBACpF,MAAM,WAAW,GAAG,CAAC,WAAW,CAAC,CAAA;gBAEjC,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;gBACrC,MAAM,OAAO,CAAC,UAAU,CACtB,MAAA,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,0CAAE,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;oBACtC,IAAI;wBACF,MAAM,OAAO,GAAG,MAAM,6BAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;wBACvE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBAEzB,MAAM,OAAO,GAAG,6BAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;wBACjE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;qBAC1B;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAA;qBAC3C;gBACH,CAAC,CAAA,CAAC,CACH,CAAA;gBACD,WAAW,CAAC,WAAW,CAAC,CAAA;aACzB;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;aACtD;SACF;QACD,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IACvC,CAAC,CAAA,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AApCY,QAAA,oBAAoB,wBAoChC"}
package/dist/docs.json CHANGED
@@ -47,7 +47,7 @@
47
47
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
48
48
  "line": 8,
49
49
  "character": 9,
50
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L8"
50
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L8"
51
51
  }
52
52
  ],
53
53
  "type": {
@@ -69,7 +69,7 @@
69
69
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
70
70
  "line": 10,
71
71
  "character": 9,
72
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L10"
72
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L10"
73
73
  }
74
74
  ],
75
75
  "signatures": [
@@ -327,7 +327,7 @@
327
327
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
328
328
  "line": 16,
329
329
  "character": 9,
330
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L16"
330
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L16"
331
331
  }
332
332
  ],
333
333
  "signatures": [
@@ -385,7 +385,7 @@
385
385
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
386
386
  "line": 18,
387
387
  "character": 6,
388
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L18"
388
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L18"
389
389
  }
390
390
  ],
391
391
  "type": {
@@ -408,7 +408,7 @@
408
408
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
409
409
  "line": 19,
410
410
  "character": 8,
411
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L19"
411
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L19"
412
412
  }
413
413
  ],
414
414
  "type": {
@@ -428,7 +428,7 @@
428
428
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
429
429
  "line": 20,
430
430
  "character": 8,
431
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L20"
431
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L20"
432
432
  }
433
433
  ],
434
434
  "type": {
@@ -457,7 +457,7 @@
457
457
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
458
458
  "line": 21,
459
459
  "character": 8,
460
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L21"
460
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L21"
461
461
  }
462
462
  ],
463
463
  "type": {
@@ -491,7 +491,7 @@
491
491
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
492
492
  "line": 18,
493
493
  "character": 12,
494
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L18"
494
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L18"
495
495
  }
496
496
  ]
497
497
  }
@@ -512,7 +512,7 @@
512
512
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
513
513
  "line": 17,
514
514
  "character": 11,
515
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L17"
515
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L17"
516
516
  }
517
517
  ]
518
518
  }
@@ -533,7 +533,7 @@
533
533
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
534
534
  "line": 26,
535
535
  "character": 9,
536
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L26"
536
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L26"
537
537
  }
538
538
  ],
539
539
  "signatures": [
@@ -580,7 +580,7 @@
580
580
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
581
581
  "line": 36,
582
582
  "character": 9,
583
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L36"
583
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L36"
584
584
  }
585
585
  ],
586
586
  "signatures": [
@@ -838,7 +838,7 @@
838
838
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
839
839
  "line": 41,
840
840
  "character": 9,
841
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L41"
841
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L41"
842
842
  }
843
843
  ],
844
844
  "signatures": [
@@ -909,7 +909,7 @@
909
909
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts",
910
910
  "line": 7,
911
911
  "character": 13,
912
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L7"
912
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeElements.ts#L7"
913
913
  }
914
914
  ]
915
915
  },
@@ -13882,7 +13882,7 @@
13882
13882
  "fileName": "packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx",
13883
13883
  "line": 8,
13884
13884
  "character": 2,
13885
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L8"
13885
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L8"
13886
13886
  }
13887
13887
  ],
13888
13888
  "type": {
@@ -19305,13 +19305,13 @@
19305
19305
  "fileName": "packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx",
19306
19306
  "line": 7,
19307
19307
  "character": 17,
19308
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L7"
19308
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L7"
19309
19309
  },
19310
19310
  {
19311
19311
  "fileName": "packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx",
19312
19312
  "line": 11,
19313
19313
  "character": 13,
19314
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L11"
19314
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L11"
19315
19315
  }
19316
19316
  ],
19317
19317
  "extendedTypes": [
@@ -19334,7 +19334,7 @@
19334
19334
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx",
19335
19335
  "line": 9,
19336
19336
  "character": 12,
19337
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx#L9"
19337
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx#L9"
19338
19338
  }
19339
19339
  ],
19340
19340
  "type": {
@@ -19376,7 +19376,7 @@
19376
19376
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx",
19377
19377
  "line": 12,
19378
19378
  "character": 13,
19379
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx#L12"
19379
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx#L12"
19380
19380
  }
19381
19381
  ],
19382
19382
  "type": {
@@ -19406,7 +19406,7 @@
19406
19406
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx",
19407
19407
  "line": 12,
19408
19408
  "character": 80,
19409
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx#L12"
19409
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeIcons.tsx#L12"
19410
19410
  }
19411
19411
  ]
19412
19412
  }
@@ -19443,7 +19443,7 @@
19443
19443
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19444
19444
  "line": 28,
19445
19445
  "character": 13,
19446
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L28"
19446
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L28"
19447
19447
  }
19448
19448
  ],
19449
19449
  "signatures": [
@@ -19501,7 +19501,7 @@
19501
19501
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19502
19502
  "line": 29,
19503
19503
  "character": 2,
19504
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L29"
19504
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L29"
19505
19505
  }
19506
19506
  ],
19507
19507
  "type": {
@@ -19521,7 +19521,7 @@
19521
19521
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19522
19522
  "line": 30,
19523
19523
  "character": 2,
19524
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L30"
19524
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L30"
19525
19525
  }
19526
19526
  ],
19527
19527
  "type": {
@@ -19544,7 +19544,7 @@
19544
19544
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19545
19545
  "line": 31,
19546
19546
  "character": 4,
19547
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L31"
19547
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L31"
19548
19548
  }
19549
19549
  ],
19550
19550
  "type": {
@@ -19564,7 +19564,7 @@
19564
19564
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19565
19565
  "line": 32,
19566
19566
  "character": 4,
19567
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L32"
19567
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L32"
19568
19568
  }
19569
19569
  ],
19570
19570
  "type": {
@@ -19593,7 +19593,7 @@
19593
19593
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19594
19594
  "line": 33,
19595
19595
  "character": 4,
19596
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L33"
19596
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L33"
19597
19597
  }
19598
19598
  ],
19599
19599
  "type": {
@@ -19613,7 +19613,7 @@
19613
19613
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19614
19614
  "line": 34,
19615
19615
  "character": 4,
19616
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L34"
19616
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L34"
19617
19617
  }
19618
19618
  ],
19619
19619
  "type": {
@@ -19642,7 +19642,7 @@
19642
19642
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19643
19643
  "line": 35,
19644
19644
  "character": 4,
19645
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L35"
19645
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L35"
19646
19646
  }
19647
19647
  ],
19648
19648
  "type": {
@@ -19662,7 +19662,7 @@
19662
19662
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19663
19663
  "line": 36,
19664
19664
  "character": 4,
19665
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L36"
19665
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L36"
19666
19666
  }
19667
19667
  ],
19668
19668
  "type": {
@@ -19690,7 +19690,7 @@
19690
19690
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19691
19691
  "line": 30,
19692
19692
  "character": 9,
19693
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L30"
19693
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L30"
19694
19694
  }
19695
19695
  ]
19696
19696
  }
@@ -19712,7 +19712,7 @@
19712
19712
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19713
19713
  "line": 28,
19714
19714
  "character": 78,
19715
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L28"
19715
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L28"
19716
19716
  }
19717
19717
  ]
19718
19718
  }
@@ -19731,7 +19731,7 @@
19731
19731
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19732
19732
  "line": 5,
19733
19733
  "character": 13,
19734
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L5"
19734
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L5"
19735
19735
  }
19736
19736
  ],
19737
19737
  "signatures": [
@@ -19776,13 +19776,13 @@
19776
19776
  "fileName": "packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx",
19777
19777
  "line": 7,
19778
19778
  "character": 17,
19779
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L7"
19779
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L7"
19780
19780
  },
19781
19781
  {
19782
19782
  "fileName": "packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx",
19783
19783
  "line": 11,
19784
19784
  "character": 13,
19785
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L11"
19785
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/components/RelationalGraph.tsx#L11"
19786
19786
  }
19787
19787
  ],
19788
19788
  "signatures": [
@@ -19889,7 +19889,7 @@
19889
19889
  "fileName": "packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts",
19890
19890
  "line": 15,
19891
19891
  "character": 13,
19892
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L15"
19892
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/Cytoscape/CytoscapeStyles.ts#L15"
19893
19893
  }
19894
19894
  ],
19895
19895
  "signatures": [
@@ -19958,7 +19958,7 @@
19958
19958
  "fileName": "packages/sdk/packages/node-renderer/src/lib/utils.ts",
19959
19959
  "line": 7,
19960
19960
  "character": 13,
19961
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/lib/utils.ts#L7"
19961
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/lib/utils.ts#L7"
19962
19962
  }
19963
19963
  ],
19964
19964
  "signatures": [
@@ -20041,7 +20041,7 @@
20041
20041
  "fileName": "packages/sdk/packages/node-renderer/src/lib/utils.ts",
20042
20042
  "line": 21,
20043
20043
  "character": 13,
20044
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/lib/utils.ts#L21"
20044
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/lib/utils.ts#L21"
20045
20045
  }
20046
20046
  ],
20047
20047
  "signatures": [
@@ -20094,9 +20094,9 @@
20094
20094
  "sources": [
20095
20095
  {
20096
20096
  "fileName": "packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeElements.ts",
20097
- "line": 14,
20097
+ "line": 12,
20098
20098
  "character": 13,
20099
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeElements.ts#L14"
20099
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeElements.ts#L12"
20100
20100
  }
20101
20101
  ],
20102
20102
  "signatures": [
@@ -20117,70 +20117,209 @@
20117
20117
  "parameters": [
20118
20118
  {
20119
20119
  "id": 441,
20120
- "name": "nodeAddressOrName",
20120
+ "name": "targetNode",
20121
20121
  "kind": 32768,
20122
20122
  "kindString": "Parameter",
20123
20123
  "flags": {
20124
20124
  "isOptional": true
20125
20125
  },
20126
20126
  "type": {
20127
- "type": "intrinsic",
20128
- "name": "string"
20129
- }
20130
- },
20131
- {
20132
- "id": 442,
20133
- "name": "onModuleError",
20134
- "kind": 32768,
20135
- "kindString": "Parameter",
20136
- "flags": {
20137
- "isOptional": true
20138
- },
20139
- "type": {
20140
- "type": "reflection",
20141
- "declaration": {
20142
- "id": 443,
20143
- "name": "__type",
20144
- "kind": 65536,
20145
- "kindString": "Type literal",
20146
- "flags": {},
20147
- "sources": [
20148
- {
20149
- "fileName": "packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeElements.ts",
20150
- "line": 14,
20151
- "character": 81,
20152
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeElements.ts#L14"
20153
- }
20154
- ],
20155
- "signatures": [
20156
- {
20157
- "id": 444,
20158
- "name": "__type",
20159
- "kind": 4096,
20160
- "kindString": "Call signature",
20161
- "flags": {},
20162
- "parameters": [
20163
- {
20164
- "id": 445,
20165
- "name": "error",
20166
- "kind": 32768,
20167
- "kindString": "Parameter",
20168
- "flags": {},
20169
- "type": {
20170
- "type": "reference",
20171
- "name": "Error",
20172
- "qualifiedName": "Error",
20173
- "package": "typescript"
20127
+ "type": "reference",
20128
+ "typeArguments": [
20129
+ {
20130
+ "type": "reference",
20131
+ "typeArguments": [
20132
+ {
20133
+ "type": "reference",
20134
+ "typeArguments": [
20135
+ {
20136
+ "type": "intersection",
20137
+ "types": [
20138
+ {
20139
+ "type": "reference",
20140
+ "name": "SchemaFields",
20141
+ "qualifiedName": "SchemaFields",
20142
+ "package": "@xyo-network/payload-model"
20143
+ },
20144
+ {
20145
+ "type": "reference",
20146
+ "name": "PayloadFields",
20147
+ "qualifiedName": "PayloadFields",
20148
+ "package": "@xyo-network/payload-model"
20149
+ },
20150
+ {
20151
+ "type": "reflection",
20152
+ "declaration": {
20153
+ "id": 442,
20154
+ "name": "__type",
20155
+ "kind": 65536,
20156
+ "kindString": "Type literal",
20157
+ "flags": {},
20158
+ "sources": [
20159
+ {
20160
+ "fileName": "node_modules/@xyo-network/module-model/dist/types/Config.d.ts",
20161
+ "line": 8,
20162
+ "character": 103
20163
+ }
20164
+ ]
20165
+ }
20166
+ },
20167
+ {
20168
+ "type": "reference",
20169
+ "typeArguments": [
20170
+ {
20171
+ "type": "intersection",
20172
+ "types": [
20173
+ {
20174
+ "type": "reference",
20175
+ "typeArguments": [
20176
+ {
20177
+ "type": "intersection",
20178
+ "types": [
20179
+ {
20180
+ "type": "reference",
20181
+ "name": "SchemaFields",
20182
+ "qualifiedName": "SchemaFields",
20183
+ "package": "@xyo-network/payload-model"
20184
+ },
20185
+ {
20186
+ "type": "reference",
20187
+ "name": "PayloadFields",
20188
+ "qualifiedName": "PayloadFields",
20189
+ "package": "@xyo-network/payload-model"
20190
+ },
20191
+ {
20192
+ "type": "reflection",
20193
+ "declaration": {
20194
+ "id": 443,
20195
+ "name": "__type",
20196
+ "kind": 65536,
20197
+ "kindString": "Type literal",
20198
+ "flags": {},
20199
+ "sources": [
20200
+ {
20201
+ "fileName": "node_modules/@xyo-network/module-model/dist/types/Config.d.ts",
20202
+ "line": 8,
20203
+ "character": 103
20204
+ }
20205
+ ]
20206
+ }
20207
+ },
20208
+ {
20209
+ "type": "reference",
20210
+ "typeArguments": [
20211
+ {
20212
+ "type": "intersection",
20213
+ "types": [
20214
+ {
20215
+ "type": "reflection",
20216
+ "declaration": {
20217
+ "id": 444,
20218
+ "name": "__type",
20219
+ "kind": 65536,
20220
+ "kindString": "Type literal",
20221
+ "flags": {},
20222
+ "sources": [
20223
+ {
20224
+ "fileName": "node_modules/@xyo-network/node-model/dist/types/Config.d.ts",
20225
+ "line": 5,
20226
+ "character": 87
20227
+ }
20228
+ ]
20229
+ }
20230
+ },
20231
+ {
20232
+ "type": "reference",
20233
+ "typeArguments": [
20234
+ {
20235
+ "type": "intrinsic",
20236
+ "name": "undefined"
20237
+ },
20238
+ {
20239
+ "type": "literal",
20240
+ "value": "schema"
20241
+ }
20242
+ ],
20243
+ "name": "Omit",
20244
+ "qualifiedName": "Omit",
20245
+ "package": "typescript"
20246
+ }
20247
+ ]
20248
+ },
20249
+ {
20250
+ "type": "literal",
20251
+ "value": "schema"
20252
+ }
20253
+ ],
20254
+ "name": "Omit",
20255
+ "qualifiedName": "Omit",
20256
+ "package": "typescript"
20257
+ }
20258
+ ]
20259
+ },
20260
+ {
20261
+ "type": "literal",
20262
+ "value": "schema"
20263
+ }
20264
+ ],
20265
+ "name": "Omit",
20266
+ "qualifiedName": "Omit",
20267
+ "package": "typescript"
20268
+ },
20269
+ {
20270
+ "type": "reflection",
20271
+ "declaration": {
20272
+ "id": 445,
20273
+ "name": "__type",
20274
+ "kind": 65536,
20275
+ "kindString": "Type literal",
20276
+ "flags": {},
20277
+ "sources": [
20278
+ {
20279
+ "fileName": "node_modules/@xyo-network/module-model/dist/types/ModuleParams.d.ts",
20280
+ "line": 18,
20281
+ "character": 58
20282
+ }
20283
+ ]
20284
+ }
20285
+ }
20286
+ ]
20287
+ },
20288
+ {
20289
+ "type": "literal",
20290
+ "value": "schema"
20291
+ }
20292
+ ],
20293
+ "name": "Omit",
20294
+ "qualifiedName": "Omit",
20295
+ "package": "typescript"
20296
+ }
20297
+ ]
20298
+ },
20299
+ {
20300
+ "type": "intrinsic",
20301
+ "name": "undefined"
20174
20302
  }
20175
- }
20176
- ],
20177
- "type": {
20178
- "type": "intrinsic",
20179
- "name": "void"
20303
+ ],
20304
+ "name": "NodeModuleParams",
20305
+ "qualifiedName": "NodeModuleParams",
20306
+ "package": "@xyo-network/node-model"
20307
+ },
20308
+ {
20309
+ "type": "reference",
20310
+ "name": "NodeModuleEventData",
20311
+ "qualifiedName": "NodeModuleEventData",
20312
+ "package": "@xyo-network/node-model"
20180
20313
  }
20181
- }
20182
- ]
20183
- }
20314
+ ],
20315
+ "name": "NodeModule",
20316
+ "qualifiedName": "NodeModule",
20317
+ "package": "@xyo-network/node-model"
20318
+ }
20319
+ ],
20320
+ "name": "NodeWrapper",
20321
+ "qualifiedName": "NodeWrapper",
20322
+ "package": "@xyo-network/node-wrapper"
20184
20323
  }
20185
20324
  }
20186
20325
  ],
@@ -20207,7 +20346,7 @@
20207
20346
  "fileName": "packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeOptions.ts",
20208
20347
  "line": 7,
20209
20348
  "character": 13,
20210
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeOptions.ts#L7"
20349
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/hooks/cytoscape/useCytoscapeOptions.ts#L7"
20211
20350
  }
20212
20351
  ],
20213
20352
  "signatures": [
@@ -20390,7 +20529,7 @@
20390
20529
  "fileName": "packages/sdk/packages/node-renderer/src/index.ts",
20391
20530
  "line": 1,
20392
20531
  "character": 0,
20393
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/5aaabc039/packages/sdk/packages/node-renderer/src/index.ts#L1"
20532
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/0a068e995/packages/sdk/packages/node-renderer/src/index.ts#L1"
20394
20533
  }
20395
20534
  ]
20396
20535
  }
@@ -1,63 +1,39 @@
1
1
  import { useAsyncEffect } from '@xylabs/react-shared';
2
- import { NodeWrapper } from '@xyo-network/node';
3
- import { useModule, useProvidedWrappedNode } from '@xyo-network/react-node';
4
- import { useEffect, useState } from 'react';
2
+ import { useState } from 'react';
5
3
  import { CytoscapeElements } from '../../Cytoscape';
6
4
  /**
7
5
  * Note: Relies on describe but could eventually be converted to a discover call
8
6
  * Logic would be similar to what the bridge does
9
7
  */
10
- export const useCytoscapeElements = (nodeAddressOrName, onModuleError) => {
11
- const [node] = useProvidedWrappedNode();
12
- const [module, moduleError] = useModule(nodeAddressOrName);
8
+ export const useCytoscapeElements = (targetNode) => {
13
9
  const [elements, setElements] = useState([]);
14
- const [refresh, setRefresh] = useState(1);
15
- useEffect(() => {
16
- if (moduleError)
17
- onModuleError?.(moduleError);
18
- }, [moduleError, onModuleError]);
19
10
  useAsyncEffect(
20
11
  // eslint-disable-next-line react-hooks/exhaustive-deps
21
- async (mounted) => {
22
- if ((node || module) && refresh) {
23
- const wrappedNode = nodeAddressOrName ? NodeWrapper.wrap(module) : node;
24
- if (!wrappedNode) {
25
- return;
26
- }
12
+ async () => {
13
+ if (targetNode) {
27
14
  try {
28
- const [description, newRootNode] = await CytoscapeElements.buildRootNode(wrappedNode);
29
- if (mounted())
30
- setElements(() => [newRootNode]);
15
+ const [description, newRootNode] = await CytoscapeElements.buildRootNode(targetNode);
16
+ const newElements = [newRootNode];
31
17
  const children = description.children;
32
18
  await Promise.allSettled((children ?? [])?.map(async (address) => {
33
19
  try {
34
- const newNode = await CytoscapeElements.buildChild(wrappedNode, address);
35
- if (mounted())
36
- setElements((previous) => [...previous, newNode]);
20
+ const newNode = await CytoscapeElements.buildChild(targetNode, address);
21
+ newElements.push(newNode);
37
22
  const newEdge = CytoscapeElements.buildEdge(newRootNode, newNode);
38
- if (mounted())
39
- setElements((previous) => [...previous, newEdge]);
23
+ newElements.push(newEdge);
40
24
  }
41
25
  catch (e) {
42
26
  console.error('Error parsing children', e);
43
27
  }
44
28
  }));
29
+ setElements(newElements);
45
30
  }
46
31
  catch (e) {
47
32
  console.error('Error Getting initial description', e);
48
33
  }
49
34
  }
50
- }, [module, node, nodeAddressOrName, refresh]);
51
- useEffect(() => {
52
- let listener;
53
- if (node) {
54
- listener = node.onAny((eventName) => {
55
- if (eventName === 'moduleAttached')
56
- setRefresh((previous) => previous + 1);
57
- });
58
- }
59
- return () => listener?.();
60
- }, [node]);
35
+ return () => console.log('unmounted');
36
+ }, [targetNode]);
61
37
  return elements;
62
38
  };
63
39
  //# sourceMappingURL=useCytoscapeElements.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAAwB,EAAE,EAAE;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAsB,EAAE,CAAC,CAAA;IAEjE,cAAc;IACZ,uDAAuD;IACvD,KAAK,IAAI,EAAE;QACT,IAAI,UAAU,EAAE;YACd,IAAI;gBACF,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;gBACpF,MAAM,WAAW,GAAG,CAAC,WAAW,CAAC,CAAA;gBAEjC,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;gBACrC,MAAM,OAAO,CAAC,UAAU,CACtB,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACtC,IAAI;wBACF,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;wBACvE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBAEzB,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;wBACjE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;qBAC1B;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAA;qBAC3C;gBACH,CAAC,CAAC,CACH,CAAA;gBACD,WAAW,CAAC,WAAW,CAAC,CAAA;aACzB;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;aACtD;SACF;QACD,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IACvC,CAAC,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
@@ -1,7 +1,8 @@
1
+ import { NodeWrapper } from '@xyo-network/node';
1
2
  import { ElementDefinition } from 'cytoscape';
2
3
  /**
3
4
  * Note: Relies on describe but could eventually be converted to a discover call
4
5
  * Logic would be similar to what the bridge does
5
6
  */
6
- export declare const useCytoscapeElements: (nodeAddressOrName?: string, onModuleError?: ((error: Error) => void) | undefined) => ElementDefinition[];
7
+ export declare const useCytoscapeElements: (targetNode?: NodeWrapper) => ElementDefinition[];
7
8
  //# sourceMappingURL=useCytoscapeElements.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useCytoscapeElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAK7C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,uBAAwB,MAAM,2BAA0B,KAAK,KAAK,IAAI,qCAuDtG,CAAA"}
1
+ {"version":3,"file":"useCytoscapeElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAK7C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,wBAoC5D,CAAA"}
package/package.json CHANGED
@@ -14,8 +14,7 @@
14
14
  "@xylabs/react-shared": "^2.16.14",
15
15
  "@xyo-network/module": "^2.53.36",
16
16
  "@xyo-network/node": "^2.53.36",
17
- "@xyo-network/react-node": "^2.47.40",
18
- "@xyo-network/react-shared": "^2.47.40",
17
+ "@xyo-network/react-shared": "^2.47.42",
19
18
  "cytoscape": "^3.23.0"
20
19
  },
21
20
  "peerDependencies": {
@@ -39,9 +38,9 @@
39
38
  "@xyo-network/id-plugin": "^2.53.34",
40
39
  "@xyo-network/module": "^2.53.34",
41
40
  "@xyo-network/node": "^2.53.34",
42
- "@xyo-network/react-node": "^2.47.40",
43
- "@xyo-network/react-storybook": "^2.47.40",
44
- "@xyo-network/react-wallet": "^2.47.40",
41
+ "@xyo-network/react-node": "^2.47.42",
42
+ "@xyo-network/react-storybook": "^2.47.42",
43
+ "@xyo-network/react-wallet": "^2.47.42",
45
44
  "require-from-string": "^2.0.2",
46
45
  "typescript": "^4.9.5"
47
46
  },
@@ -88,5 +87,5 @@
88
87
  },
89
88
  "sideEffects": false,
90
89
  "types": "dist/types/index.d.ts",
91
- "version": "2.47.40"
90
+ "version": "2.47.42"
92
91
  }
@@ -4,11 +4,11 @@ import { HDWallet } from '@xyo-network/account'
4
4
  import { ArchivistConfigSchema, MemoryArchivist } from '@xyo-network/archivist'
5
5
  import { HttpBridge, HttpBridgeConfigSchema } from '@xyo-network/bridge'
6
6
  import { IdWitness, IdWitnessConfigSchema } from '@xyo-network/id-plugin'
7
- import { MemoryNode, NodeConfigSchema } from '@xyo-network/node'
8
- import { NodeProvider } from '@xyo-network/react-node'
7
+ import { MemoryNode, NodeConfigSchema, NodeWrapper } from '@xyo-network/node'
8
+ import { NodeProvider, useModule, useProvidedWrappedNode } from '@xyo-network/react-node'
9
9
  import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
10
10
  import { WalletProvider } from '@xyo-network/react-wallet'
11
- import { useState } from 'react'
11
+ import { useMemo, useState } from 'react'
12
12
 
13
13
  import { useCytoscapeElements, useCytoscapeOptions } from '../hooks'
14
14
  import { NodeRelationalGraph } from './RelationalGraph'
@@ -69,13 +69,16 @@ export default {
69
69
  const Template: ComponentStory<typeof NodeRelationalGraph> = (props) => <NodeRelationalGraph {...props} />
70
70
 
71
71
  const TemplateDescribe: ComponentStory<typeof NodeRelationalGraph> = (props) => {
72
- const elements = useCytoscapeElements()
72
+ const [node] = useProvidedWrappedNode()
73
+ const elements = useCytoscapeElements(node)
73
74
  const options = useCytoscapeOptions(elements)
74
75
  return <NodeRelationalGraph options={options} {...props} />
75
76
  }
76
77
 
77
78
  const TemplateCustomAddress: ComponentStory<typeof NodeRelationalGraph> = (props) => {
78
- const elements = useCytoscapeElements('ChildNode')
79
+ const [node] = useModule('ChildNode')
80
+ const wrappedNode = useMemo(() => (node ? NodeWrapper.wrap(node) : undefined), [node])
81
+ const elements = useCytoscapeElements(wrappedNode)
79
82
  const options = useCytoscapeOptions(elements)
80
83
  return <NodeRelationalGraph options={options} {...props} />
81
84
  }
@@ -1,9 +1,7 @@
1
1
  import { useAsyncEffect } from '@xylabs/react-shared'
2
- import { EventUnsubscribeFunction } from '@xyo-network/module'
3
2
  import { NodeWrapper } from '@xyo-network/node'
4
- import { useModule, useProvidedWrappedNode } from '@xyo-network/react-node'
5
3
  import { ElementDefinition } from 'cytoscape'
6
- import { useEffect, useState } from 'react'
4
+ import { useState } from 'react'
7
5
 
8
6
  import { CytoscapeElements } from '../../Cytoscape'
9
7
 
@@ -11,59 +9,40 @@ import { CytoscapeElements } from '../../Cytoscape'
11
9
  * Note: Relies on describe but could eventually be converted to a discover call
12
10
  * Logic would be similar to what the bridge does
13
11
  */
14
- export const useCytoscapeElements = (nodeAddressOrName?: string, onModuleError?: (error: Error) => void) => {
15
- const [node] = useProvidedWrappedNode()
16
- const [module, moduleError] = useModule(nodeAddressOrName)
12
+ export const useCytoscapeElements = (targetNode?: NodeWrapper) => {
17
13
  const [elements, setElements] = useState<ElementDefinition[]>([])
18
- const [refresh, setRefresh] = useState(1)
19
-
20
- useEffect(() => {
21
- if (moduleError) onModuleError?.(moduleError)
22
- }, [moduleError, onModuleError])
23
14
 
24
15
  useAsyncEffect(
25
16
  // eslint-disable-next-line react-hooks/exhaustive-deps
26
- async (mounted) => {
27
- if ((node || module) && refresh) {
28
- const wrappedNode = nodeAddressOrName ? NodeWrapper.wrap(module) : node
29
- if (!wrappedNode) {
30
- return
31
- }
17
+ async () => {
18
+ if (targetNode) {
32
19
  try {
33
- const [description, newRootNode] = await CytoscapeElements.buildRootNode(wrappedNode)
34
- if (mounted()) setElements(() => [newRootNode])
20
+ const [description, newRootNode] = await CytoscapeElements.buildRootNode(targetNode)
21
+ const newElements = [newRootNode]
35
22
 
36
23
  const children = description.children
37
24
  await Promise.allSettled(
38
25
  (children ?? [])?.map(async (address) => {
39
26
  try {
40
- const newNode = await CytoscapeElements.buildChild(wrappedNode, address)
41
- if (mounted()) setElements((previous) => [...previous, newNode])
27
+ const newNode = await CytoscapeElements.buildChild(targetNode, address)
28
+ newElements.push(newNode)
42
29
 
43
30
  const newEdge = CytoscapeElements.buildEdge(newRootNode, newNode)
44
- if (mounted()) setElements((previous) => [...previous, newEdge])
31
+ newElements.push(newEdge)
45
32
  } catch (e) {
46
33
  console.error('Error parsing children', e)
47
34
  }
48
35
  }),
49
36
  )
37
+ setElements(newElements)
50
38
  } catch (e) {
51
39
  console.error('Error Getting initial description', e)
52
40
  }
53
41
  }
42
+ return () => console.log('unmounted')
54
43
  },
55
- [module, node, nodeAddressOrName, refresh],
44
+ [targetNode],
56
45
  )
57
46
 
58
- useEffect(() => {
59
- let listener: EventUnsubscribeFunction
60
- if (node) {
61
- listener = node.onAny((eventName) => {
62
- if (eventName === 'moduleAttached') setRefresh((previous) => previous + 1)
63
- })
64
- }
65
- return () => listener?.()
66
- }, [node])
67
-
68
47
  return elements
69
48
  }