@hpcc-js/common 2.71.11 → 2.71.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/common",
-    "version": "2.71.11",
+    "version": "2.71.13",
     "description": "hpcc-js - Viz Common",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -40,26 +40,26 @@
         "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/util": "^2.50.5",
-        "@types/d3-array": "1.2.9",
-        "@types/d3-brush": "1.1.5",
-        "@types/d3-collection": "1.0.10",
-        "@types/d3-color": "1.4.2",
-        "@types/d3-dispatch": "1.0.9",
-        "@types/d3-drag": "1.2.5",
-        "@types/d3-dsv": "1.2.2",
+        "@hpcc-js/util": "^2.50.6",
+        "@types/d3-array": "1.2.10",
+        "@types/d3-brush": "1.1.6",
+        "@types/d3-collection": "1.0.11",
+        "@types/d3-color": "1.4.3",
+        "@types/d3-dispatch": "1.0.10",
+        "@types/d3-drag": "1.2.6",
+        "@types/d3-dsv": "1.2.5",
         "@types/d3-ease": "1.0.11",
-        "@types/d3-format": "1.4.2",
-        "@types/d3-interpolate": "1.4.2",
-        "@types/d3-scale": "1.0.18",
-        "@types/d3-selection": "1.4.3",
-        "@types/d3-time-format": "2.3.1",
-        "@types/d3-transition": "1.3.2",
-        "@types/d3-zoom": "1.8.4"
+        "@types/d3-format": "1.4.3",
+        "@types/d3-interpolate": "1.4.3",
+        "@types/d3-scale": "1.0.19",
+        "@types/d3-selection": "1.4.4",
+        "@types/d3-time-format": "2.3.2",
+        "@types/d3-transition": "1.3.3",
+        "@types/d3-zoom": "1.8.5"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.5",
-        "colorbrewer": "1.5.3",
+        "colorbrewer": "1.5.6",
         "d3-array": "^1",
         "d3-brush": "^1",
         "d3-collection": "^1",
@@ -77,7 +77,7 @@
         "d3-transition": "^1",
         "d3-zoom": "^1",
         "font-awesome": "4.7.0",
-        "tslib": "2.4.1"
+        "tslib": "2.6.2"
     },
     "repository": {
         "type": "git",
@@ -90,5 +90,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "69e26ec0934dcedd4a35f4639b248851d53d4bb5"
+    "gitHead": "3b949c1e18901191ffd0138e84f1713f30621f43"
 }

package/src/Utility.ts

@@ -736,11 +736,17 @@ export function textSize(_text: string | string[], fontName: string = "Verdana",
     const hash = `${bold}::${fontSize}::${fontName}::${text.join("::")}`;
     let retVal = g_fontSizeContextCache[hash];
     if (!retVal) {
+        retVal = { width: 0, height: 0 };
         g_fontSizeContext.font = `${bold ? "bold " : ""}${fontSize}px ${fontName}`;
-        g_fontSizeContextCache[hash] = retVal = {
-            width: Math.max(...text.map(t => g_fontSizeContext.measureText("" + t).width)),
-            height: fontSize * text.length
-        };
+        text.forEach(line => {
+            const textMeasurement = g_fontSizeContext.measureText("" + line);
+            const width = textMeasurement.width;
+            const height = (textMeasurement.fontBoundingBoxDescent + textMeasurement.fontBoundingBoxAscent) * text.length;
+            g_fontSizeContextCache[hash] = retVal = {
+                width: width > retVal.width ? width : retVal.width,
+                height: height > retVal.height ? height : retVal.height
+            };
+        });
     }
     return retVal;
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/common";
-export const PKG_VERSION = "2.71.11";
-export const BUILD_VERSION = "2.104.28";
+export const PKG_VERSION = "2.71.13";
+export const BUILD_VERSION = "2.104.32";