From db9a57bcf7fd3c3496fb0f88aac22bf52575738b Mon Sep 17 00:00:00 2001
From: rlazarini <remi.lazarini@cea.fr>
Date: Wed, 11 Sep 2024 15:45:34 +0200
Subject: [PATCH] [ivette] Graph : replace cycle option by a function
---
ivette/src/dome/renderer/graph/graph.tsx | 32 ++++++++++++++++--------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/ivette/src/dome/renderer/graph/graph.tsx b/ivette/src/dome/renderer/graph/graph.tsx
index 751e815ca44..f38e0c35d7e 100644
--- a/ivette/src/dome/renderer/graph/graph.tsx
+++ b/ivette/src/dome/renderer/graph/graph.tsx
@@ -120,7 +120,7 @@ export interface ILinksOptions {
/** Number of directional particles */
directionalParticle?: number;
/** Width of directional particles */
- particleWidth?: number;
+ particleWidth?: number | ((node: GLink) => number);
/** Color of directional particles */
particleColor?: string | ((node: GLink) => string)
}
@@ -138,8 +138,11 @@ export interface IGraphOptions {
displayMode?: 'td';
/** Spacing between depths level */
depthSpacing?: number;
- /** A string[][] ref to save the cycles */
- cycles?: React.MutableRefObject<string[][]>
+ /**
+ * Callback called when a cycle is detected
+ * @param val array of cycle node ids
+ * */
+ onDagError?: (val: string[]) => void;
/** Nodes options */
nodesOptions?: INodesOptions;
/** Links options */
@@ -168,12 +171,6 @@ function getOnEngineStop(
};
}
-function getOnDagError(
- cycles: React.MutableRefObject<string[][]>
-):(val: (string | number)[]) => void {
- return (val: (string | number)[]) => cycles.current.push(val as string[]);
-}
-
/** Tranform JSX.Element to HtmlObject */
const jsxToHtmlObject = (jsxElement: JSX.Element): HTMLDivElement => {
const container = document.createElement('div');
@@ -315,7 +312,8 @@ function getForceGraphOptions(
if(options) {
const {
- backgroundColor, displayMode, depthSpacing, cycles, htmlNode, autoCenter
+ backgroundColor, displayMode, depthSpacing,
+ onDagError, htmlNode, autoCenter
} = options;
if (displayMode) ret.dagMode = displayMode;
@@ -323,7 +321,19 @@ function getForceGraphOptions(
if (backgroundColor) ret.backgroundColor = backgroundColor;
ret.onEngineStop = getOnEngineStop(fgRef, { autoCenter });
- if(cycles) ret.onDagError = getOnDagError(cycles);
+ ret.onDagError = (val) => {
+ if(typeof val[0] === 'number') {
+ // eslint-disable-next-line no-console
+ console.error('onDagError : ID must be a string');
+ }
+ if(onDagError) {
+ const newCycle: string[] = [];
+ val.forEach((elt) => {
+ newCycle.push(typeof elt === 'string' ? elt : elt.toString());
+ });
+ onDagError(newCycle);
+ }
+ };
if(htmlNode) {
ret.extraRenderers = [new CSS2DRenderer()];
--
GitLab