refactor(canvas_bbox dark_theme): add validation for padding

rshen91 · rshen91 · commit edb1f4b505e0 · 2019-06-04T08:49:03.000-06:00
diff --git a/src/lib/axes/axis_utils.ts b/src/lib/axes/axis_utils.ts
@@ -180,10 +180,10 @@ export const getMaxBboxDimensions = (
   const prevLabelWidth = acc.maxLabelTextWidth;
   const prevLabelHeight = acc.maxLabelTextHeight;
   return {
-      maxLabelBboxWidth: prevWidth > width ? prevWidth : width,
-      maxLabelBboxHeight: prevHeight > height ? prevHeight : height,
-      maxLabelTextWidth: prevLabelWidth > labelWidth ? prevLabelWidth : labelWidth,
-      maxLabelTextHeight: prevLabelHeight > labelHeight ? prevLabelHeight : labelHeight,
+    maxLabelBboxWidth: prevWidth > width ? prevWidth : width,
+    maxLabelBboxHeight: prevHeight > height ? prevHeight : height,
+    maxLabelTextWidth: prevLabelWidth > labelWidth ? prevLabelWidth : labelWidth,
+    maxLabelTextHeight: prevLabelHeight > labelHeight ? prevLabelHeight : labelHeight,
     };
   };
 
diff --git a/src/lib/axes/canvas_text_bbox_calculator.ts b/src/lib/axes/canvas_text_bbox_calculator.ts
@@ -22,6 +22,11 @@ export class CanvasTextBBoxCalculator implements BBoxCalculator {
       return none;
     }
 
+    // Avoid having negative padding that can obscure text
+    if (padding < 1) {
+      padding = 1;
+    }
+
     // We scale the text up to get a more accurate computation of the width of the text
     // because `measureText` can vary a lot between browsers.
     const scalingFactor = this.scaledFontSize / fontSize;
diff --git a/src/lib/themes/dark_theme.ts b/src/lib/themes/dark_theme.ts
@@ -91,7 +91,7 @@ export const DARK_THEME: Theme = {
       fontFamily: `'Open Sans', Helvetica, Arial, sans-serif`,
       fontStyle: 'normal',
       fill: 'white',
-      padding: 0,
+      padding: 1,
     },
     tickLineStyle: {
       stroke: 'white',
