[apperance] fix edge color when using node's color

Fix #190

Author: sim51

packages/gephi-lite/src/core/appearance/utils.ts

@@ -140,7 +140,7 @@ export function makeGetColor<
   T extends { itemType: "nodes"; displayData: NodeDisplayData } | { itemType: "edges"; displayData: EdgeDisplayData },
 >(
   itemType: T["itemType"],
-  { nodeData, edgeData, nodeRenderingData, fullGraph }: GraphDataset,
+  { nodeData, edgeData, fullGraph }: GraphDataset,
   { dynamicNodeData, dynamicEdgeData }: DynamicItemData,
   { nodesColor, edgesColor, nodesShadingColor, edgesShadingColor }: AppearanceState,
   getters?: VisualGetters,
@@ -194,20 +194,15 @@ export function makeGetColor<
         ? (id?: string) => id && fullGraph.source(id)
         : (id?: string) => id && fullGraph.target(id);
 
-    if (getNodeColor && nodesColor.type !== "data")
+    if (getNodeColor) {
+      const nodesValues = mergeStaticDynamicData(nodeData, dynamicNodeData);
       getColor = (_, edgeId?: string) => {
         const node = nodeForColor(edgeId);
-        return node ? getNodeColor(itemsValues[node]) : DEFAULT_NODE_COLOR;
+        return node ? getNodeColor(nodesValues[node]) : DEFAULT_NODE_COLOR;
       };
-    else if (nodesColor.type === "data")
-      // special case when node are colored by data have to reach nodeRenderingData instead of normal getNodeColor
-      getColor = (_, edgeId?: string) => {
-        const node = nodeForColor(edgeId);
-        return node && nodeRenderingData[node] && nodeRenderingData[node].color
-          ? nodeRenderingData[node].color || DEFAULT_NODE_COLOR
-          : DEFAULT_NODE_COLOR;
-      };
-    else getColor = () => DEFAULT_EDGE_COLOR;
+    } else {
+      getColor = () => DEFAULT_EDGE_COLOR;
+    }
   }
 
   if (getColor && shadingDef) {