@hpcc-js/common 2.71.12 → 2.71.14

package/dist/index.js

@@ -5,8 +5,8 @@
 })(this, (function (exports, util) { 'use strict';
 
   var PKG_NAME = "@hpcc-js/common";
-  var PKG_VERSION = "2.71.12";
-  var BUILD_VERSION = "2.104.30";
+  var PKG_VERSION = "2.71.14";
+  var BUILD_VERSION = "2.104.35";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -7621,11 +7621,17 @@
       var hash = "".concat(bold, "::").concat(fontSize, "::").concat(fontName, "::").concat(text.join("::"));
       var retVal = g_fontSizeContextCache[hash];
       if (!retVal) {
+          retVal = { width: 0, height: 0 };
           g_fontSizeContext.font = "".concat(bold ? "bold " : "").concat(fontSize, "px ").concat(fontName);
-          g_fontSizeContextCache[hash] = retVal = {
-              width: Math.max.apply(Math, text.map(function (t) { return g_fontSizeContext.measureText("" + t).width; })),
-              height: fontSize * text.length
-          };
+          text.forEach(function (line) {
+              var textMeasurement = g_fontSizeContext.measureText("" + line);
+              var width = textMeasurement.width;
+              var 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;
   }
@@ -10575,7 +10581,7 @@
           var width = Math.max.apply(Math, widths);
           var retVal = {
               x: -width / 2,
-              y: -height / 2 - lineHeight / (this.fontFamily() === "FontAwesome" ? 4 : 6),
+              y: -height / 2 - lineHeight / (this.fontFamily() === "FontAwesome" ? 4 : 6), // baseLine offset
               width: width,
               height: height
           };