@eccenca/gui-elements 22.0.0-rc.6 → 22.1.0-rc.0

package/src/extensions/react-flow/edges/_edges.scss

@@ -104,42 +104,17 @@ path.react-flow__edge-path-glow {
     }
 }
 
-.react-flow__edge-implicitEdge {
-    stroke: #00acc1;
-    color: #00acc1;
-}
-
-.react-flow__edge-importEdge {
-    stroke: #8e24aa;
-    color: #8e24aa;
-}
-
-.react-flow__edge-subclassEdge {
-    stroke: darken($button-background-color, 60%);
-    color: darken($button-background-color, 60%);
-}
-
-.react-flow__edge-subpropertyEdge {
-    stroke: darken(complement($button-background-color), 40%);
-    color: darken(complement($button-background-color), 40%);
-}
-
-.react-flow__edge-rdftypeEdge {
-    stroke: darken($button-background-color, 50%);
-    color: darken($button-background-color, 50%);
-}
-
-.react-flow__edge-successStep {
+.react-flow__edge-success {
     stroke: $eccgui-color-success-text;
     color: $eccgui-color-success-text;
 }
 
-.react-flow__edge-warningStep {
+.react-flow__edge-warning {
     stroke: $eccgui-color-warning-text;
     color: $eccgui-color-warning-text;
 }
 
-.react-flow__edge-dangerStep {
+.react-flow__edge-danger {
     stroke: $eccgui-color-danger-text;
     color: $eccgui-color-danger-text;
 }

package/src/extensions/react-flow/edges/utils.ts

@@ -1,14 +1,131 @@
 import { EdgeDefaultProps } from "./EdgeDefault";
 import { EdgeStepProps } from "./EdgeStep";
-import { getSmoothStepPath } from "react-flow-renderer";
+import { getSmoothStepPath, Position } from "react-flow-renderer";
+
+interface EdgePositionCorrectionProps extends Omit<EdgeDefaultProps, "id" | "source" | "target" | "drawSvgPath" | "data"> {
+    correctionLength?: number;
+    correctionRadius?: number;
+}
+
+const posCorrectionEdge = ({
+    sourceX,
+    sourceY,
+    sourcePosition,
+    targetX,
+    targetY,
+    targetPosition,
+    correctionLength = 7,
+    correctionRadius = 7
+}: EdgePositionCorrectionProps) => {
+    let newSourceX = sourceX;
+    let newSourceY = sourceY;
+    let newTargetX = targetX;
+    let newTargetY = targetY;
+    let startCommandCorrection = `M ${sourceX},${sourceY} `;
+    let endCommandCorrection = ``;
+
+    if (sourcePosition === Position.Left && sourceX < targetX) {
+        newSourceX = newSourceX - correctionLength;
+        if (sourceY < targetY) {
+            newSourceY = sourceY + 2 * correctionRadius;
+            startCommandCorrection = startCommandCorrection + ` L ${newSourceX},${sourceY} A ${correctionRadius} ${correctionRadius} ${180} ${1} ${0} `;
+        } else {
+            newSourceY = sourceY - 2 * correctionRadius;
+            startCommandCorrection = startCommandCorrection + ` L ${newSourceX},${sourceY} A ${correctionRadius} ${correctionRadius} ${180} ${1} ${1} `;
+        }
+    }
+
+    if (sourcePosition === Position.Right && sourceX > targetX) {
+        newSourceX = targetPosition === Position.Right ? newSourceX + correctionLength + correctionRadius : newSourceX + correctionLength;
+        if (sourceY < targetY) {
+            newSourceY = targetPosition === Position.Right ? sourceY + 1 * correctionRadius : sourceY + 2 * correctionRadius;
+            startCommandCorrection = targetPosition === Position.Right ? (
+                startCommandCorrection + ` L ${newSourceX - correctionRadius},${sourceY} A ${correctionRadius} ${correctionRadius} ${90} ${0} ${1} `
+            ) : (
+                startCommandCorrection + ` L ${newSourceX},${sourceY} A ${correctionRadius} ${correctionRadius} ${180} ${1} ${1} `
+            );
+        } else {
+            newSourceY = targetPosition === Position.Right ? sourceY - 1 * correctionRadius : sourceY - 2 * correctionRadius;
+            startCommandCorrection = targetPosition === Position.Right ? (
+                startCommandCorrection + ` L ${newSourceX - correctionRadius},${sourceY} A ${correctionRadius} ${correctionRadius} ${90} ${0} ${0} `
+            ) : (
+                startCommandCorrection + ` L ${newSourceX},${sourceY} A ${correctionRadius} ${correctionRadius} ${180} ${1} ${0} `
+            );
+        }
+    }
+
+    if (targetPosition === Position.Left && sourceX > targetX) {
+        newTargetX = newTargetX - correctionLength;
+        if (sourceY < targetY) {
+            newTargetY = targetY - 2 * correctionRadius;
+            endCommandCorrection = ` A ${correctionRadius} ${correctionRadius} ${180} ${1} ${0} ${newTargetX},${targetY} L ${targetX},${targetY}`;
+        } else {
+            newTargetY = targetY + 2 * correctionRadius;
+            endCommandCorrection = ` A ${correctionRadius} ${correctionRadius} ${180} ${1} ${1} ${newTargetX},${targetY} L ${targetX},${targetY}`;
+        }
+    }
+
+    if (targetPosition === Position.Right && sourceX < targetX) {
+        newTargetX = newTargetX + correctionLength;
+        if (sourceY < targetY) {
+            newTargetY = targetY - 2 * correctionRadius;
+            endCommandCorrection = ` A ${correctionRadius} ${correctionRadius} ${180} ${1} ${1} ${newTargetX},${targetY} L ${targetX},${targetY}`;
+        } else {
+            newTargetY = targetY + 2 * correctionRadius;
+            endCommandCorrection = ` A ${correctionRadius} ${correctionRadius} ${180} ${1} ${0} ${newTargetX},${targetY} L ${targetX},${targetY}`;
+        }
+    }
+
+
+    return {
+        newSourceX,
+        newSourceY,
+        newTargetX,
+        newTargetY,
+        startCommandCorrection,
+        endCommandCorrection,
+    }
+}
+
+interface PathCommandCorrectionProps {
+    pathCommand: string;
+    startCorrection: string;
+    endCorrection: string;
+}
+
+const pathCommandCorrection = ({
+    pathCommand,
+    startCorrection,
+    endCorrection,
+}: PathCommandCorrectionProps) => {
+    return startCorrection + pathCommand.substring(1) + endCorrection;
+}
 
 export const drawEdgeStraight = ({
     sourceX,
     sourceY,
+    sourcePosition,
     targetX,
     targetY,
+    targetPosition,
 }: EdgeDefaultProps) => {
-    return `M ${sourceX},${sourceY}L ${targetX},${targetY}`;
+    const corrections = posCorrectionEdge({
+        sourceX,
+        sourceY,
+        sourcePosition,
+        targetX,
+        targetY,
+        targetPosition,
+        correctionRadius: 0
+    });
+
+    const pathCommand = `M ${corrections.newSourceX},${corrections.newSourceY}L ${corrections.newTargetX},${corrections.newTargetY}`;
+
+    return pathCommandCorrection({
+        pathCommand,
+        startCorrection: corrections.startCommandCorrection,
+        endCorrection: corrections.endCommandCorrection,
+    });
 }
 
 export const drawEdgeStep = ({
@@ -20,13 +137,31 @@ export const drawEdgeStep = ({
     targetPosition,
     data = {},
 }: EdgeStepProps) => {
-    return getSmoothStepPath({
+
+    const corrections = posCorrectionEdge({
         sourceX,
         sourceY,
         sourcePosition,
         targetX,
         targetY,
         targetPosition,
-        borderRadius: data.stepCornerRadius || 10
+        correctionLength: data.stepCornerRadius || 7,
+        correctionRadius: data.stepCornerRadius || 7,
+    });
+
+    const pathCommand = getSmoothStepPath({
+        sourceX: corrections.newSourceX,
+        sourceY: corrections.newSourceY,
+        sourcePosition,
+        targetX: corrections.newTargetX,
+        targetY: corrections.newTargetY,
+        targetPosition,
+        borderRadius: data.stepCornerRadius || 7
+    });
+
+    return pathCommandCorrection({
+        pathCommand,
+        startCorrection: corrections.startCommandCorrection,
+        endCorrection: corrections.endCommandCorrection,
     });
 }

package/src/extensions/react-flow/handles/_handles.scss

@@ -22,14 +22,14 @@ div.react-flow__handle {
         right: $eccgui-size-block-whitespace/-2;
         opacity: 0.61;
         display: none;
-        background-color: transparent;
+        background-color: currentColor;
         border: solid 1px currentColor;
         border-radius: 100%;
     }
 
     &:hover {
         &:before {
-            background-color: currentColor;
+            box-shadow: 0 0 $eccgui-size-block-whitespace/2 $eccgui-size-block-whitespace/4 currentColor;
         }
     }
 
@@ -47,14 +47,14 @@ div.react-flow__handle {
         }
     }
 
-    &.react-flow__handle-connecting:hover {
+    &.react-flow__handle-connecting:hover, &.invalid-handle {
         color: $eccgui-color-danger-text;
         &:before {
             display: block;
         }
     }
 
-    &.react-flow__handle-valid:hover {
+    &.react-flow__handle-valid:hover, &.valid-handle {
         color: $eccgui-color-success-text;
     }
 }
@@ -152,57 +152,3 @@ div.react-flow__handle-bottom {
         }
     }
 }
-
-.react-flow__node-graphNode {
-    .react-flow__handle {
-        color: #8e24aa;
-    }
-}
-
-.react-flow__node-classNode {
-    .react-flow__handle {
-        color: darken($button-background-color, 60%);
-    }
-}
-
-.react-flow__node-instanceNode {
-    .react-flow__handle {
-        color: darken($button-background-color, 50%);
-    }
-}
-
-.react-flow__node-propertyNode {
-    .react-flow__handle {
-        color: darken(complement($button-background-color), 40%);
-    }
-}
-
-.react-flow__node-datasetNode {
-    .react-flow__handle {
-        color: #039be5;
-    }
-}
-
-.react-flow__node-linkingNode {
-    .react-flow__handle {
-        color: #00acc1;
-    }
-}
-
-.react-flow__node-transformNode {
-    .react-flow__handle {
-        color: #00897b;
-    }
-}
-
-.react-flow__node-taskNode {
-    .react-flow__handle {
-        color: #546e7a;
-    }
-}
-
-.react-flow__node-workflowNode {
-    .react-flow__handle {
-        color: #4527a0;
-    }
-}

package/src/extensions/react-flow/index.ts

@@ -1,4 +1,6 @@
 export { NodeDefault } from "./nodes/NodeDefault";
+export { NodeContent } from "./nodes/NodeContent";
+export { NodeContentExtension } from "./nodes/NodeContentExtension";
 export { NodeTools } from "./nodes/NodeTools";
 export { nodeTypes } from "./nodes/nodeTypes";
 export { EdgeDefault } from "./edges/EdgeDefault";
@@ -9,6 +11,8 @@ export { MiniMap } from "./minimap/MiniMap";
 export { minimapNodeClassName, minimapNodeColor } from "./minimap/utils";
 
 export type { NodeProps } from "./nodes/NodeDefault";
+export type { NodeContentProps } from "./nodes/NodeContent";
+export type { NodeContentExtensionProps } from "./nodes/NodeContentExtension";
 export type { NodeToolsProps } from "./nodes/NodeTools";
 export type { EdgeDefaultProps } from "./edges/EdgeDefault";
 export type { EdgeStepProps } from "./edges/EdgeStep";

package/src/extensions/react-flow/minimap/_minimap.scss

@@ -3,51 +3,6 @@
     fill: $reactflow-node-background-color;
 }
 
-.#{$eccgui}-graphviz__minimap__node--graphNode {
-    fill: #8e24aa;
-    stroke: #8e24aa;
-}
-
-.#{$eccgui}-graphviz__minimap__node--classNode {
-    fill: darken($button-background-color, 60%);
-    stroke: darken($button-background-color, 60%);
-}
-
-.#{$eccgui}-graphviz__minimap__node--instanceNode {
-    fill: darken($button-background-color, 50%);
-    stroke: darken($button-background-color, 50%);
-}
-
-.#{$eccgui}-graphviz__minimap__node--propertyNode {
-    fill: darken(complement($button-background-color), 40%);
-    stroke: darken(complement($button-background-color), 40%);
-}
-
-.#{$eccgui}-graphviz__minimap__node--datasetNode {
-    fill: #039be5;
-    stroke: #039be5;
-}
-
-.#{$eccgui}-graphviz__minimap__node--linkingNode {
-    fill: #00acc1;
-    stroke: #00acc1;
-}
-
-.#{$eccgui}-graphviz__minimap__node--transformNode {
-    fill: #00897b;
-    stroke: #00897b;
-}
-
-.#{$eccgui}-graphviz__minimap__node--taskNode {
-    fill: #546e7a;
-    stroke: #546e7a;
-}
-
-.#{$eccgui}-graphviz__minimap__node--workflowNode {
-    fill: #4527a0;
-    stroke: #4527a0;
-}
-
 .#{$eccgui}-graphviz__minimap__node--highlight-match {
     stroke: $eccgui-color-accent;
     stroke-width: 5;

package/src/extensions/react-flow/minimap/utils.ts

@@ -1,5 +1,5 @@
 import { CLASSPREFIX as eccgui } from "./../../../configuration/constants";
-import { gethighlightedStateClasses } from "./../nodes/NodeDefault";
+import { gethighlightedStateClasses } from "./../nodes/NodeContent";
 
 export const minimapNodeClassName = (node: any) => {
     const typeClass = `${eccgui}-graphviz__minimap__node--` + node.type;