@hpcc-js/common 2.71.1 → 2.71.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/common",
-    "version": "2.71.1",
+    "version": "2.71.3",
     "description": "hpcc-js - Viz Common",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -40,7 +40,7 @@
         "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/util": "^2.49.0",
+        "@hpcc-js/util": "^2.49.1",
         "@types/d3-array": "1.2.9",
         "@types/d3-brush": "1.1.5",
         "@types/d3-collection": "1.0.10",
@@ -58,7 +58,7 @@
         "@types/d3-zoom": "1.8.3"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.11.2",
+        "@hpcc-js/bundle": "^2.11.3",
         "colorbrewer": "1.5.2",
         "d3-array": "^1",
         "d3-brush": "^1",
@@ -90,5 +90,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "e2724f0154c334e8d4cb5a29533b70131ab58938"
+    "gitHead": "0b196092f8781f2f56a7f688496d1ae9bc229ace"
 }

package/src/SVGZoomWidget.ts

@@ -165,41 +165,51 @@ export class SVGZoomWidget extends SVGWidget {
         }
     }
 
-    zoomToBBox(bbox, transitionDuration?, widthOnly: boolean = false, scale?: number) {
+    getRenderElementBBox() {
+        return this._renderElement.node().getBBox();
+    }
+
+    calcZoomToBBox(bbox, widthOnly: boolean = false, scale?: number) {
+        const width = this.width();
+        const height = this.height();
         if (bbox.width && bbox.height) {
             const x = bbox.x + bbox.width / 2;
             const y = bbox.y + bbox.height / 2;
             const dx = bbox.width;
             const dy = bbox.height;
-            const width = this.width();
-            const height = this.height();
 
             let newScale = scale || 1 / (widthOnly ? dx / width : Math.max(dx / width, dy / height));
             if (this.zoomToFitLimit_exists() && newScale > this.zoomToFitLimit()) {
                 newScale = this.zoomToFitLimit();
             }
             const translate = [width / 2 - newScale * x, height / 2 - newScale * y];
-            this.zoomTo(translate, newScale, transitionDuration);
+            return { translate, newScale };
         }
+        return { translate: [width / 2, height / 2], newScale: scale };
+    }
+
+    zoomToBBox(bbox, transitionDuration?, widthOnly: boolean = false, scale?: number) {
+        const { translate, newScale } = this.calcZoomToBBox(bbox, widthOnly, scale);
+        this.zoomTo(translate, newScale, transitionDuration);
     }
 
     zoomToScale(scale, transitionDuration?) {
         if (this._renderElement) {
-            const bbox = this._renderElement.node().getBBox();
+            const bbox = this.getRenderElementBBox();
             this.zoomToBBox(bbox, transitionDuration, undefined, scale);
         }
     }
 
     zoomToWidth(transitionDuration?) {
         if (this._renderElement) {
-            const bbox = this._renderElement.node().getBBox();
+            const bbox = this.getRenderElementBBox();
             this.zoomToBBox(bbox, transitionDuration, true);
         }
     }
 
     zoomToFit(transitionDuration?) {
         if (this._renderElement) {
-            const bbox = this._renderElement.node().getBBox();
+            const bbox = this.getRenderElementBBox();
             this.zoomToBBox(bbox, transitionDuration);
         }
     }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/common";
-export const PKG_VERSION = "2.71.1";
-export const BUILD_VERSION = "2.104.2";
+export const PKG_VERSION = "2.71.3";
+export const BUILD_VERSION = "2.104.7";

package/types/SVGZoomWidget.d.ts

@@ -31,6 +31,11 @@ export declare class SVGZoomWidget extends SVGWidget {
     zoomPlus(): void;
     zoomMinus(): void;
     centerOnBBox(bbox: any, transitionDuration?: any): void;
+    getRenderElementBBox(): any;
+    calcZoomToBBox(bbox: any, widthOnly?: boolean, scale?: number): {
+        translate: number[];
+        newScale: number;
+    };
     zoomToBBox(bbox: any, transitionDuration?: any, widthOnly?: boolean, scale?: number): void;
     zoomToScale(scale: any, transitionDuration?: any): void;
     zoomToWidth(transitionDuration?: any): void;

package/types/SVGZoomWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SVGZoomWidget.d.ts","sourceRoot":"","sources":["../src/SVGZoomWidget.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAU,OAAO,EAAU,YAAY,EAAE,MAAM,YAAY,CAAC;AAEnE,OAAO,0BAA0B,CAAC;AAElC,oBAAY,SAAS,GAAG,MAAM,GAAG,kBAAkB,CAAC;AAEpD,qBAAa,aAAc,SAAQ,SAAS;IAExC,SAAS,CAAC,cAAc,MAAC;IAEzB,OAAO,CAAC,SAAS,CAAC;IAClB,SAAS,CAAC,UAAU,SAAK;IACzB,SAAS,CAAC,cAAc,WAAU;IAClC,SAAS,CAAC,SAAS,MAAC;IACpB,SAAS,CAAC,SAAS,MAAC;IACpB,SAAS,CAAC,MAAM,MAAC;IACjB,OAAO,CAAC,aAAa,CAAC;IAEtB,SAAS,CAAC,qBAAqB,MAAC;IAChC,SAAS,CAAC,iBAAiB,MAAC;IAE5B,SAAS,CAAC,kBAAkB,UAAS;IAErC,SAAS,CAAC,uBAAuB,eAO5B;IAEL,SAAS,CAAC,WAAW,eAOhB;IAEL,QAAQ,UAmBH;;IAaL,aAAa,CAAC,MAAM,EAAE,GAAG;;;;;;IA2CzB,SAAS,IAAI,MAAM;IAInB,aAAa,IAAI,MAAM,EAAE;IAIzB,UAAU,CAAC,KAAK,KAAA,GAAG,IAAI;IAIvB,MAAM,CAAC,SAAS,CAAC,KAAA,EAAE,KAAK,CAAC,KAAA,EAAE,kBAAkB,SAAM;IAUnD,QAAQ;IAMR,SAAS;IAMT,YAAY,CAAC,IAAI,KAAA,EAAE,kBAAkB,CAAC,KAAA;IAatC,UAAU,CAAC,IAAI,KAAA,EAAE,kBAAkB,CAAC,KAAA,EAAE,SAAS,GAAE,OAAe,EAAE,KAAK,CAAC,EAAE,MAAM;IAkBhF,WAAW,CAAC,KAAK,KAAA,EAAE,kBAAkB,CAAC,KAAA;IAOtC,WAAW,CAAC,kBAAkB,CAAC,KAAA;IAO/B,SAAS,CAAC,kBAAkB,CAAC,KAAA;IAO7B,QAAQ;IAMR,MAAM,CAAC,SAAS,KAAA;IAMhB,aAAa;IAKb,yBAAyB;IAczB,yBAAyB;IA4CzB,uBAAuB;IAavB,KAAK,CAAC,OAAO,KAAA,EAAE,QAAQ,KAAA;IAmDvB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAsBvB,IAAI,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAMrB,qBAAqB;IAGrB,sBAAsB,CAAC,IAAI,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAGpF,mBAAmB;CAEtB;AAGD,MAAM,WAAW,aAAa;IAC1B,WAAW,IAAI,OAAO,CAAC;IACvB,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9B,QAAQ,IAAI,OAAO,CAAC;IACpB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,YAAY,IAAI,MAAM,CAAC;IACvB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,IAAI,MAAM,CAAC;IACzB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,qBAAqB,IAAI,OAAO,CAAC;IACjC,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B,SAAS,IAAI,SAAS,CAAC;CAC1B"}
+{"version":3,"file":"SVGZoomWidget.d.ts","sourceRoot":"","sources":["../src/SVGZoomWidget.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAU,OAAO,EAAU,YAAY,EAAE,MAAM,YAAY,CAAC;AAEnE,OAAO,0BAA0B,CAAC;AAElC,oBAAY,SAAS,GAAG,MAAM,GAAG,kBAAkB,CAAC;AAEpD,qBAAa,aAAc,SAAQ,SAAS;IAExC,SAAS,CAAC,cAAc,MAAC;IAEzB,OAAO,CAAC,SAAS,CAAC;IAClB,SAAS,CAAC,UAAU,SAAK;IACzB,SAAS,CAAC,cAAc,WAAU;IAClC,SAAS,CAAC,SAAS,MAAC;IACpB,SAAS,CAAC,SAAS,MAAC;IACpB,SAAS,CAAC,MAAM,MAAC;IACjB,OAAO,CAAC,aAAa,CAAC;IAEtB,SAAS,CAAC,qBAAqB,MAAC;IAChC,SAAS,CAAC,iBAAiB,MAAC;IAE5B,SAAS,CAAC,kBAAkB,UAAS;IAErC,SAAS,CAAC,uBAAuB,eAO5B;IAEL,SAAS,CAAC,WAAW,eAOhB;IAEL,QAAQ,UAmBH;;IAaL,aAAa,CAAC,MAAM,EAAE,GAAG;;;;;;IA2CzB,SAAS,IAAI,MAAM;IAInB,aAAa,IAAI,MAAM,EAAE;IAIzB,UAAU,CAAC,KAAK,KAAA,GAAG,IAAI;IAIvB,MAAM,CAAC,SAAS,CAAC,KAAA,EAAE,KAAK,CAAC,KAAA,EAAE,kBAAkB,SAAM;IAUnD,QAAQ;IAMR,SAAS;IAMT,YAAY,CAAC,IAAI,KAAA,EAAE,kBAAkB,CAAC,KAAA;IAatC,oBAAoB;IAIpB,cAAc,CAAC,IAAI,KAAA,EAAE,SAAS,GAAE,OAAe,EAAE,KAAK,CAAC,EAAE,MAAM;;;;IAmB/D,UAAU,CAAC,IAAI,KAAA,EAAE,kBAAkB,CAAC,KAAA,EAAE,SAAS,GAAE,OAAe,EAAE,KAAK,CAAC,EAAE,MAAM;IAKhF,WAAW,CAAC,KAAK,KAAA,EAAE,kBAAkB,CAAC,KAAA;IAOtC,WAAW,CAAC,kBAAkB,CAAC,KAAA;IAO/B,SAAS,CAAC,kBAAkB,CAAC,KAAA;IAO7B,QAAQ;IAMR,MAAM,CAAC,SAAS,KAAA;IAMhB,aAAa;IAKb,yBAAyB;IAczB,yBAAyB;IA4CzB,uBAAuB;IAavB,KAAK,CAAC,OAAO,KAAA,EAAE,QAAQ,KAAA;IAmDvB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAsBvB,IAAI,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAMrB,qBAAqB;IAGrB,sBAAsB,CAAC,IAAI,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAGpF,mBAAmB;CAEtB;AAGD,MAAM,WAAW,aAAa;IAC1B,WAAW,IAAI,OAAO,CAAC;IACvB,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9B,QAAQ,IAAI,OAAO,CAAC;IACpB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,YAAY,IAAI,MAAM,CAAC;IACvB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,IAAI,MAAM,CAAC;IACzB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,qBAAqB,IAAI,OAAO,CAAC;IACjC,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B,SAAS,IAAI,SAAS,CAAC;CAC1B"}

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/common";
-export declare const PKG_VERSION = "2.71.1";
-export declare const BUILD_VERSION = "2.104.2";
+export declare const PKG_VERSION = "2.71.3";
+export declare const BUILD_VERSION = "2.104.7";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/SVGZoomWidget.d.ts

@@ -31,6 +31,11 @@ export declare class SVGZoomWidget extends SVGWidget {
     zoomPlus(): void;
     zoomMinus(): void;
     centerOnBBox(bbox: any, transitionDuration?: any): void;
+    getRenderElementBBox(): any;
+    calcZoomToBBox(bbox: any, widthOnly?: boolean, scale?: number): {
+        translate: number[];
+        newScale: number;
+    };
     zoomToBBox(bbox: any, transitionDuration?: any, widthOnly?: boolean, scale?: number): void;
     zoomToScale(scale: any, transitionDuration?: any): void;
     zoomToWidth(transitionDuration?: any): void;

package/types-3.4/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/common";
-export declare const PKG_VERSION = "2.71.1";
-export declare const BUILD_VERSION = "2.104.2";
+export declare const PKG_VERSION = "2.71.3";
+export declare const BUILD_VERSION = "2.104.7";
 //# sourceMappingURL=__package__.d.ts.map