@hpcc-js/graph 2.84.2 → 2.84.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.84.2",
+    "version": "2.84.3",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -22,7 +22,6 @@
     ],
     "scripts": {
         "clean": "rimraf lib* types dist *.tsbuildinfo  workers/lib-* workers/dist workers/types workers/*.tsbuildinfo",
-        "copy-resources": "cpx \"../../node_modules/@hpcc-js/wasm/dist/graphvizlib.wasm\" \"./dist\"",
         "compile-es6": "tsc --module es6 --outDir ./lib-es6",
         "compile-es6-watch": "npm run compile-es6 -- -w",
         "compile-umd": "tsc --module umd --outDir ./lib-umd",
@@ -43,7 +42,7 @@
         "build-workers": "run-s compile-workers bundle-workers minimize-workers wrap-workers",
         "build-package": "npm run compile-es6 && npm run bundle",
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
-        "build": "run-s build-workers copy-resources build-package",
+        "build": "run-s build-workers build-package",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
         "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
@@ -52,15 +51,15 @@
         "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/api": "^2.12.5",
-        "@hpcc-js/common": "^2.71.5",
-        "@hpcc-js/html": "^2.42.6",
-        "@hpcc-js/react": "^2.53.1",
+        "@hpcc-js/api": "^2.12.6",
+        "@hpcc-js/common": "^2.71.6",
+        "@hpcc-js/html": "^2.42.7",
+        "@hpcc-js/react": "^2.53.2",
         "@hpcc-js/util": "^2.50.1"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.3",
-        "@hpcc-js/wasm": "1.16.5",
+        "@hpcc-js/wasm": "2.0.1",
         "@types/d3-transition": "1.3.2",
         "@types/dagre": "0.7.48",
         "d3-array": "^1",
@@ -89,5 +88,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "f44f2fba05bc3ac886f1169e43c884773e97d8fc"
+    "gitHead": "b5b4cf9ee4257885b41a3f90c11cbe6609704d0d"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.84.2";
-export const BUILD_VERSION = "2.104.11";
+export const PKG_VERSION = "2.84.3";
+export const BUILD_VERSION = "2.104.13";

package/src/__tests__/test5.ts

@@ -42,7 +42,7 @@ const VERTEX_ARR_UPDATED = [{
     text: "Vertex Three",
 }];
 
-const EDGE_ARR_UPDATE = [{
+export const EDGE_ARR_UPDATE = [{
     id: 0,
     source: VERTEX_ARR_UPDATED[1],
     target: VERTEX_ARR_UPDATED[2]
@@ -73,9 +73,13 @@ export class Test5 extends Graph2 {
             .edgeArcDepth(0)
             .layout("ForceDirected")
             .on("vertex_click", (vertex, col, sel, anno) => {
-                this
-                    .data({ vertices: VERTEX_ARR_UPDATED, edges: EDGE_ARR_UPDATE })
-                    .lazyRender();
+                console.info("vertex_click", vertex);
+            })
+            .on("vertex_dblclick", (vertex, col, sel, anno) => {
+                console.info("vertex_dblclick", vertex);
+            })
+            .on("vertex_contextmenu", (vertex, col, sel, anno) => {
+                console.info("vertex_contextmenu", vertex);
             })
             ;
     }

package/src/graph2/graphT.ts

@@ -192,14 +192,19 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
                     d3Select(this).classed("grabbed", false);
                 }
                 if (doClick) {
+                    const event = d3Event();
                     context._selection.click({
                         _id: String(d.id),
                         element: () => d.element
-                    }, d3Event().sourceEvent);
+                    }, event.sourceEvent);
                     context.selectionChanged();
                     const selected = d.element.classed("selected");
                     const eventOrigin = context.resolveEventOrigin();
-                    context.vertex_click(d.props.origData || d.props, "", selected, eventOrigin);
+                    if (event?.sourceEvent?.button === 2) {
+                        context.vertex_contextmenu(d.props.origData || d.props, "", selected, eventOrigin);
+                    } else {
+                        context.vertex_click(d.props.origData || d.props, "", selected, eventOrigin);
+                    }
                     const doClickTime = Date.now();
                     if (doClickTime - context._prevDoClickTime < context.doubleClickMaxDelay()) {
                         context.vertex_dblclick(d.props.origData || d.props, "", selected, eventOrigin);
@@ -763,6 +768,9 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
                     .on("dblclick", function (this: SVGElement, d) {
                         d3Event().stopPropagation();
                     })
+                    .on("contextmenu", function (this: SVGElement, d) {
+                        d3Event().preventDefault();
+                    })
                     .on("mousein", function (d) {
                         Utility.safeRaise(this);
                         context.highlightVertex(d3Select(this), d);
@@ -1132,6 +1140,9 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
     vertex_dblclick(row, _col, sel, data) {
     }
 
+    vertex_contextmenu(row, _col, sel, data) {
+    }
+
     vertex_mousein(row, _col, sel, data) {
     }
 
@@ -1314,7 +1325,6 @@ export function graphviz(dot: string, engine: Engine = "dot", _scriptDir: string
         links: [],
         raw: dot
     }, {
-        engine: engine,
-        wasmFolder: new URL(scriptDir, document.baseURI).href
+        engine: engine
     });
 }

package/src/graph2/layouts/graphviz.ts

@@ -59,8 +59,7 @@ export class Graphviz extends Layout {
             })),
             raw: ""
         }, {
-            engine: this._engine,
-            wasmFolder: this._wasmFolder
+            engine: this._engine
         }).response.then((response: any) => {
             if (this.running()) {
                 response.clusters.forEach(n => {