@hpcc-js/layout 3.7.0 → 3.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/layout",
-    "version": "3.7.0",
+    "version": "3.8.1",
     "description": "hpcc-js - Viz Layout",
     "type": "module",
     "main": "./dist/index.umd.cjs",
@@ -39,20 +39,20 @@
         "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/api": "^3.6.0",
-        "@hpcc-js/chart": "^3.9.0",
-        "@hpcc-js/common": "^3.10.0",
-        "@hpcc-js/dgrid2": "^3.8.0",
-        "@hpcc-js/util": "^3.7.0"
+        "@hpcc-js/api": "^3.7.1",
+        "@hpcc-js/chart": "^3.10.1",
+        "@hpcc-js/common": "^3.11.1",
+        "@hpcc-js/dgrid2": "^3.9.1",
+        "@hpcc-js/util": "^3.7.2"
     },
     "devDependencies": {
-        "@hpcc-js/vite-plugins": "^1.3.0",
-        "@types/d3-transition": "1.3.6",
-        "d3-drag": "^1",
-        "d3-selection": "^1",
-        "d3-shape": "^1",
+        "@hpcc-js/vite-plugins": "^1.4.1",
+        "@types/d3-transition": "3.0.9",
+        "d3-drag": "3.0.0",
+        "d3-selection": "3.0.0",
+        "d3-shape": "3.2.0",
         "d3-svg-legend": "2.25.6",
-        "d3-transition": "^1",
+        "d3-transition": "3.0.1",
         "grid-list": "0.4.1"
     },
     "repository": {
@@ -66,5 +66,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "8b665b61598fb09f322859d80e30d8dda8f89e16"
+    "gitHead": "f2f54184e334591caa8d02ae9384a50e0c206b15"
 }

package/src/Border.ts

@@ -1,4 +1,4 @@
-import { d3Event, HTMLWidget, Platform, select as d3Select, selectAll as d3SelectAll, Utility } from "@hpcc-js/common";
+import { HTMLWidget, Platform, select as d3Select, selectAll as d3SelectAll, Utility } from "@hpcc-js/common";
 import { drag as d3Drag } from "d3-drag";
 import { Cell } from "./Cell.ts";
 
@@ -265,8 +265,7 @@ export class Border extends HTMLWidget {
         this._offsetY = this._element.node().getBoundingClientRect().top + (this.gutter() / 2);
     }
 
-    dragStart(handle) {
-        const event = d3Event();
+    dragStart(event, handle) {
         event.sourceEvent.stopPropagation();
         const context = this;
 
@@ -285,10 +284,9 @@ export class Border extends HTMLWidget {
         this._dragPrevX = event.sourceEvent.clientX;
         this._dragPrevY = event.sourceEvent.clientY;
     }
-    dragTick(handle) {
+    dragTick(event, handle) {
         const context = this;
 
-        const event = d3Event();
         const xDelta = this._dragPrevX - event.sourceEvent.clientX;
         const yDelta = this._dragPrevY - event.sourceEvent.clientY;
 
@@ -350,9 +348,8 @@ export class Border extends HTMLWidget {
             });
         }
     }
-    dragEnd(handle) {
+    dragEnd(event, handle) {
         if (handle) {
-            const event = d3Event();
             const xDelta = this._dragPrevX - event.sourceEvent.clientX;
             const yDelta = this._dragPrevY - event.sourceEvent.clientY;
 
@@ -450,9 +447,9 @@ export class Border extends HTMLWidget {
             });
 
         const drag = d3Drag()
-            .on("start", function (d, i) { context.dragStart.call(context, d, i); })
-            .on("drag", function (d, i) { context.dragTick.call(context, d, i); })
-            .on("end", function (d, i) { context.dragEnd.call(context, d, i); })
+            .on("start", function (event, d) { context.dragStart.call(context, event, d); })
+            .on("drag", function (event, d) { context.dragTick.call(context, event, d); })
+            .on("end", function (event, d) { context.dragEnd.call(context, event, d); })
             ;
         if (this.designMode()) {
             element.selectAll("#" + this.id() + " > div.borderHandle").call(drag);

package/src/Grid.ts

@@ -1,4 +1,4 @@
-import { d3Event, drag as d3Drag, HTMLWidget, Platform, select as d3Select, Utility } from "@hpcc-js/common";
+import { drag as d3Drag, HTMLWidget, Platform, select as d3Select, Utility } from "@hpcc-js/common";
 import * as _GridList from "grid-list";
 import { Cell } from "./Cell.ts";
 
@@ -195,9 +195,9 @@ export class Grid extends HTMLWidget {
                 const d = context.cellToGridItem(_d);
                 return { x: d.x * context.cellWidth, y: d.y * context.cellHeight };
             })
-            .on("start", function (_d: any) {
+            .on("start", function (event, _d: any) {
                 if (!context.designMode()) return;
-                d3Event().sourceEvent.stopPropagation();
+                event.sourceEvent.stopPropagation();
                 context.initGridList();
                 const d = context.itemsMap[_d.id()];
                 context.dragItem = element.append("div")
@@ -206,11 +206,10 @@ export class Grid extends HTMLWidget {
                     .style("width", function () { return d.w * context.cellWidth - context.gutter() + "px"; })
                     .style("height", function () { return d.h * context.cellHeight - context.gutter() + "px"; })
                     ;
-                context.selectionBagClick(_d);
+                context.selectionBagClick(event, _d);
             })
-            .on("drag", function (_d: any) {
+            .on("drag", function (event, _d: any) {
                 if (!context.designMode()) return;
-                const event = d3Event();
                 event.sourceEvent.stopPropagation();
                 const d = context.itemsMap[_d.id()];
                 if (event.x < 0) {
@@ -245,9 +244,9 @@ export class Grid extends HTMLWidget {
                     .style("height", function () { return d.h * context.cellHeight + "px"; })
                     ;
             })
-            .on("end", function () {
+            .on("end", function (event) {
                 if (!context.designMode()) return;
-                d3Event().sourceEvent.stopPropagation();
+                event.sourceEvent.stopPropagation();
                 context.dragItem.remove();
                 context.dragItem = null;
                 context.killGridList();
@@ -259,9 +258,9 @@ export class Grid extends HTMLWidget {
                 const d = context.cellToGridItem(_d);
                 return { x: (d.x + d.w - 1) * context.cellWidth, y: (d.y + d.h - 1) * context.cellHeight };
             })
-            .on("start", function (_d: any) {
+            .on("start", function (event, _d: any) {
                 if (!context.designMode()) return;
-                d3Event().sourceEvent.stopPropagation();
+                event.sourceEvent.stopPropagation();
                 context.initGridList();
                 const d = context.itemsMap[_d.id()];
                 context.dragItem = element.append("div")
@@ -272,9 +271,8 @@ export class Grid extends HTMLWidget {
                     ;
                 context.dragItemPos = { x: d.x, y: d.y };
             })
-            .on("drag", function (_d: any) {
+            .on("drag", function (event, _d: any) {
                 if (!context.designMode()) return;
-                const event = d3Event();
                 event.sourceEvent.stopPropagation();
                 const d = context.itemsMap[_d.id()];
                 const pos = [Math.max(0, Math.round(event.x / context.cellWidth)), Math.max(0, Math.round(event.y / context.cellHeight))];
@@ -300,9 +298,9 @@ export class Grid extends HTMLWidget {
                     .style("height", function () { return (-d.y + 1) * context.cellHeight + event.y - context.gutter() + "px"; })
                     ;
             })
-            .on("end", function () {
+            .on("end", function (event) {
                 if (!context.designMode()) return;
-                d3Event().sourceEvent.stopPropagation();
+                event.sourceEvent.stopPropagation();
                 context.dragItem.remove();
                 context.dragItem = null;
                 context.killGridList();
@@ -478,10 +476,10 @@ export class Grid extends HTMLWidget {
         }
     }
 
-    selectionBagClick(d) {
+    selectionBagClick(event, d) {
         if (d !== null) {
             const selectionObj = this._createSelectionObject(d);
-            if (d3Event().sourceEvent.ctrlKey) {
+            if (event.sourceEvent.ctrlKey) {
                 if (this._selectionBag.isSelected(selectionObj)) {
                     this._selectionBag.remove(selectionObj);
                     this.postSelectionChange();

package/src/Surface.ts

@@ -72,14 +72,14 @@ export class Surface extends HTMLWidget {
                     el
                         .style("background", "transparent")
                         .style("border", "none")
-                        .on("click", function (d) { context.click(d); })
+                        .on("click", function (_event, d) { context.click(d); })
                         .append("i")
                         .attr("class", "fa")
                         .text(function () { return button.label; });
                 } else {
                     el
                         .text(function () { return button.label; })
-                        .on("click", function (d) { context.click(d); });
+                        .on("click", function (_event, d) { context.click(d); });
                 }
             })
             ;

package/types/Border.d.ts

@@ -33,9 +33,9 @@ export declare class Border extends HTMLWidget {
     getCell(id: any): any;
     getContent(id: any): any;
     setLayoutOffsets(): void;
-    dragStart(handle: any): void;
-    dragTick(handle: any): void;
-    dragEnd(handle: any): void;
+    dragStart(event: any, handle: any): void;
+    dragTick(event: any, handle: any): void;
+    dragEnd(event: any, handle: any): void;
     size(_?: any): any;
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;

package/types/Grid.d.ts

@@ -50,7 +50,7 @@ export declare class Grid extends HTMLWidget {
     };
     selection(_: any): any;
     selectionBagClear(): void;
-    selectionBagClick(d: any): void;
+    selectionBagClick(event: any, d: any): void;
     postSelectionChange(): void;
     applyLayout(layoutArr: ICellPosition[]): void;
     vizActivation(elem: any): void;