@hpcc-js/graph 2.80.3 → 2.82.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.80.3",
+    "version": "2.82.1",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -49,18 +49,18 @@
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "ddd": "downlevel-dts . ts3.4",
-        "update": "npx npm-check-updates -u -t minor"
+        "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/api": "^2.11.1",
-        "@hpcc-js/common": "^2.70.0",
-        "@hpcc-js/html": "^2.41.7",
-        "@hpcc-js/react": "^2.49.7",
-        "@hpcc-js/util": "^2.48.0"
+        "@hpcc-js/api": "^2.12.1",
+        "@hpcc-js/common": "^2.71.1",
+        "@hpcc-js/html": "^2.42.2",
+        "@hpcc-js/react": "^2.51.1",
+        "@hpcc-js/util": "^2.49.0"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.11.1",
-        "@hpcc-js/wasm": "1.14.1",
+        "@hpcc-js/bundle": "^2.11.2",
+        "@hpcc-js/wasm": "1.15.0",
         "@types/d3-transition": "1.3.2",
         "@types/dagre": "0.7.47",
         "d3-array": "^1",
@@ -75,7 +75,7 @@
         "d3-transition": "^1",
         "dagre": "0.8.5",
         "es6-promise": "4.2.8",
-        "tslib": "2.3.1"
+        "tslib": "2.4.0"
     },
     "repository": {
         "type": "git",
@@ -88,5 +88,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "c89642c69c9fd13e236a79a6868022a89a44513d"
+    "gitHead": "e2724f0154c334e8d4cb5a29533b70131ab58938"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.80.3";
-export const BUILD_VERSION = "2.103.5";
+export const PKG_VERSION = "2.82.1";
+export const BUILD_VERSION = "2.104.2";

package/src/graph2/graph.ts

@@ -1,5 +1,5 @@
 import { d3Event, drag as d3Drag, Palette, select as d3Select, Selection, Spacer, SVGGlowFilter, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
-import { IconEx, Icons, React, render, Subgraph, Vertex, IVertex3 } from "@hpcc-js/react";
+import { IconEx, Icons, React, render, Subgraph, Vertex, IVertex3, IVertex4Annotation } from "@hpcc-js/react";
 import { getScriptSrc, Graph2 as GraphCollection, hashSum } from "@hpcc-js/util";
 import { HTMLTooltip } from "@hpcc-js/html";
 import "d3-transition";
@@ -186,10 +186,11 @@ export class Graph2 extends SVGZoomWidget {
                     }, d3Event().sourceEvent);
                     context.selectionChanged();
                     const selected = d.element.classed("selected");
-                    context.vertex_click(d.props.origData || d.props, "", selected);
+                    const annoData = context.resolveAnnoEventNode();
+                    context.vertex_click(d.props.origData || d.props, "", selected, annoData);
                     const doClickTime = Date.now();
                     if (doClickTime - context._prevDoClickTime < context.doubleClickMaxDelay()) {
-                        context.vertex_dblclick(d.props.origData || d.props, "", selected);
+                        context.vertex_dblclick(d.props.origData || d.props, "", selected, annoData);
                     }
                     context._prevDoClickTime = doClickTime;
                 }
@@ -199,6 +200,21 @@ export class Graph2 extends SVGZoomWidget {
         this.zoomToFitLimit(1);
     }
 
+    resolveAnnoEventNode(): undefined | IVertex4Annotation {
+        const d3evt = d3Event();
+        const eventPath = d3evt?.sourceEvent?.path ?? d3evt?.path;
+        const anno = eventPath.find(n => n?.hasAttribute("data-anno"));
+        let annoData;
+        if (anno) {
+            try{
+                annoData = JSON.parse(anno.getAttribute("data-anno"));
+            } catch(e) {
+                console.warn("Unexpected annotation data:", anno);
+            }
+        }
+        return annoData;
+    }
+
     iconBarButtons(): Widget[] {
         return this._iconBar.buttons();
     }
@@ -749,7 +765,8 @@ export class Graph2 extends SVGZoomWidget {
                         Utility.safeRaise(this);
                         context.highlightVertex(d3Select(this), d);
                         const selected = d.element.classed("selected");
-                        context.vertex_mousein(d.props.origData || d.props, "", selected);
+                        const annoData = context.resolveAnnoEventNode();
+                        context.vertex_mousein(d.props.origData || d.props, "", selected, annoData);
                     })
                     .on("mouseover", function (d) {
                         Utility.safeRaise(this);
@@ -769,12 +786,14 @@ export class Graph2 extends SVGZoomWidget {
                                 .render()
                                 ;
                         }
-                        context.vertex_mouseover(d.props.origData || d.props, "", selected);
+                        const annoData = context.resolveAnnoEventNode();
+                        context.vertex_mouseover(d.props.origData || d.props, "", selected, annoData);
                     })
                     .on("mouseout", function (d) {
                         context.highlightVertex(null, null);
                         const selected = d.element.classed("selected");
-                        context.vertex_mouseout(d.props.origData || d.props, "", selected);
+                        const annoData = context.resolveAnnoEventNode();
+                        context.vertex_mouseout(d.props.origData || d.props, "", selected, annoData);
                         if (d.props.tooltip) {
                             context._tooltip.mouseout();
                         }
@@ -1125,19 +1144,19 @@ export class Graph2 extends SVGZoomWidget {
     subgraph_click(row, _col, sel) {
     }
 
-    vertex_click(row, _col, sel) {
+    vertex_click(row, _col, sel, data) {
     }
 
-    vertex_dblclick(row, _col, sel) {
+    vertex_dblclick(row, _col, sel, data) {
     }
 
-    vertex_mousein(row, _col, sel) {
+    vertex_mousein(row, _col, sel, data) {
     }
 
-    vertex_mouseover(row, _col, sel) {
+    vertex_mouseover(row, _col, sel, data) {
     }
 
-    vertex_mouseout(row, _col, sel) {
+    vertex_mouseout(row, _col, sel, data) {
     }
 
     edge_click(row, _col, sel) {