fix: label rendering

trutoo · Jun 11, 2021 · 11b4486 · 11b4486
1 parent c34e640
commit 11b4486
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/lib/graph.ts b/src/lib/graph.ts
@@ -154,7 +154,7 @@ export class FunnelGraph {
           const data = this.data as FunnelDataLayered;
           const subLabelDisplayValue =
             this.subLabelValue === 'percent'
-              ? `${twoDimPercentages[index][j]}%`
+              ? `${twoDimPercentages[index][j] || 0}%`
               : formatNumber(data.values[index][j] || 0);
           percentageList += `
             <li class="fg-label__segment-item">${subLabel}:
@@ -315,7 +315,7 @@ export class FunnelGraph {
     }
 
     const max = Math.max(...values);
-    return values.map((value) => (value === 0 ? 0 : roundPoint((value * 100) / max)));
+    return values.map((value) => (value ? roundPoint((value * 100) / max) : 0));
   }
 
   getSVG() {
@@ -522,20 +522,20 @@ export class FunnelGraph {
       redraw = true;
     }
 
-    if (data.labels) {
-      const labels = this.container.querySelector('.fg-labels');
-      if (labels) labels.remove();
-      this.data.labels = data.labels;
-      this.addLabels();
-    }
-
     if (isLayered(data) && data.subLabels) {
       const subLabels = this.container.querySelector('.fg-sub-labels');
       if (subLabels) subLabels.remove();
       (this.data as FunnelDataLayered).subLabels = data.subLabels;
       this.addSubLabels();
     }
 
+    if (data.labels) {
+      const labels = this.container.querySelector('.fg-labels');
+      if (labels) labels.remove();
+      this.data.labels = data.labels;
+      this.addLabels();
+    }
+
     if (redraw) {
       this.makeSVG();
       this.drawPaths();