Merge pull request #209 from nzzdev/release-3.5.1

Release 3.5.1
nzzdev · Feb 18, 2021 · e460276 · e460276
2 parents 86a87f4 + be20c8d
commit e460276
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/chartTypes/area/vega-spec.json b/chartTypes/area/vega-spec.json
@@ -1,7 +1,8 @@
 {
   "$schema": "https://vega.github.io/schema/vega/v5.json",
   "autosize": {
-    "type": "fit"
+    "type": "fit",
+    "contains": "padding"
   },
   "height": 220,
   "data": [

diff --git a/chartTypes/line/vega-spec.json b/chartTypes/line/vega-spec.json
@@ -1,7 +1,8 @@
 {
   "$schema": "https://vega.github.io/schema/vega/v5.json",
   "autosize": {
-    "type": "fit"
+    "type": "fit",
+    "contains": "padding"
   },
   "height": 220,
   "scales": [

diff --git a/config/vega-default.json b/config/vega-default.json
@@ -14,5 +14,6 @@
     "labelPadding": 8,
     "labelLimit": false,
     "tickRound": true
-  }
+  },
+  "padding": { "left": 4, "right": 4 }
 }
diff --git a/helpers/textMeasure.js b/helpers/textMeasure.js
@@ -3,26 +3,18 @@ const canvas = createCanvas(200, 200);
 const context = canvas.getContext("2d");
 
 function getLabelTextWidth(text, toolRuntimeConfig) {
-  context.font =
-    toolRuntimeConfig.text.fontWeight +
-    " " +
-    toolRuntimeConfig.text.fontSize +
-    " " +
-    toolRuntimeConfig.text.font;
+  // CanvasRenderingContext2D.font expects the font string to be same form as CSS font specifier - https://developer.mozilla.org/en-US/docs/Web/CSS/font
+  context.font = `${toolRuntimeConfig.text.fontWeight} ${toolRuntimeConfig.text.fontSize}px ${toolRuntimeConfig.text.font}`;
   return context.measureText(text).width;
 }
 
 function getAxisLabelTextWidth(text, toolRuntimeConfig) {
-  context.font =
-    toolRuntimeConfig.axis.labelFontWeight +
-    " " +
-    toolRuntimeConfig.axis.labelFontSize +
-    " " +
-    toolRuntimeConfig.axis.labelFont;
+  // CanvasRenderingContext2D.font expects the font string to be same form as CSS font specifier - https://developer.mozilla.org/en-US/docs/Web/CSS/font
+  context.font = `${toolRuntimeConfig.axis.labelFontWeight} ${toolRuntimeConfig.axis.labelFontSize}px ${toolRuntimeConfig.axis.labelFont}`;
   return context.measureText(text).width;
 }
 
 module.exports = {
   getLabelTextWidth,
-  getAxisLabelTextWidth
+  getAxisLabelTextWidth,
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "q-chart",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "",
   "main": "index.js",
   "scripts": {