From 4b95241da679d16f09fb515a5bca422b4f280934 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <andrew.johnson@arjohnsonau.com>
Date: Wed, 11 Dec 2024 10:04:57 +0800
Subject: [PATCH] Fix padding adjustment

---
 pbiviz.json   |  2 +-
 src/visual.ts | 33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pbiviz.json b/pbiviz.json
index 7cc6167..9288a58 100644
--- a/pbiviz.json
+++ b/pbiviz.json
@@ -4,7 +4,7 @@
     "displayName":"SPC Charts",
     "guid":"PBISPC",
     "visualClassName":"Visual",
-    "version":"1.4.4.18",
+    "version":"1.4.4.19",
     "description":"A PowerBI custom visual for SPC charts",
     "supportUrl":"https://github.com/AUS-DOH-Safety-and-Quality/PowerBI-SPC",
     "gitHubUrl":"https://github.com/AUS-DOH-Safety-and-Quality/PowerBI-SPC"
diff --git a/src/visual.ts b/src/visual.ts
index 6363b44..9337546 100644
--- a/src/visual.ts
+++ b/src/visual.ts
@@ -82,7 +82,6 @@ export class Visual implements powerbi.extensibility.IVisual {
         this.resizeCanvas(options.viewport.width, options.viewport.height);
         this.drawVisual();
         this.adjustPaddingForOverflow();
-        this.drawVisual();
       }
 
       this.updateHighlighting();
@@ -115,19 +114,29 @@ export class Visual implements powerbi.extensibility.IVisual {
     let yTopOverflow: number = 0;
     const svgWidth: number = this.viewModel.svgWidth;
     const svgHeight: number = this.viewModel.svgHeight;
-    this.svg.selectAll("*").each(function() {
-      const bbox = (this as SVGGraphicsElement).getBoundingClientRect();
-      xLeftOverflow = Math.min(xLeftOverflow, bbox.left);
-      xRightOverflow = Math.max(xRightOverflow, bbox.right - svgWidth);
-      yBottomOverflow = Math.max(yBottomOverflow, bbox.bottom - svgHeight);
-      yTopOverflow = Math.min(yTopOverflow, bbox.top);
+    this.svg.selectChildren().each(function() {
+      const boundRect = (this as SVGGraphicsElement).getBoundingClientRect();
+      const bbox = (this as SVGGraphicsElement).getBBox();
+      xLeftOverflow = Math.min(xLeftOverflow, bbox.x);
+      xRightOverflow = Math.max(xRightOverflow, boundRect.right - svgWidth);
+      yBottomOverflow = Math.max(yBottomOverflow, boundRect.bottom - svgHeight);
+      yTopOverflow = Math.min(yTopOverflow, boundRect.top);
     });
 
-    this.viewModel.plotProperties.xAxis.start_padding += Math.abs(xLeftOverflow - this.viewModel.plotProperties.xAxis.start_padding);
-    this.viewModel.plotProperties.xAxis.end_padding += Math.abs(xRightOverflow + this.viewModel.plotProperties.xAxis.end_padding);
-    this.viewModel.plotProperties.yAxis.start_padding += Math.abs(yBottomOverflow + this.viewModel.plotProperties.yAxis.start_padding);
-    this.viewModel.plotProperties.yAxis.end_padding += Math.abs(yTopOverflow - this.viewModel.plotProperties.yAxis.end_padding);
-    this.viewModel.plotProperties.initialiseScale(svgWidth, svgHeight);
+    xLeftOverflow = Math.abs(xLeftOverflow);
+    xRightOverflow = Math.abs(xRightOverflow);
+    yBottomOverflow = Math.abs(yBottomOverflow);
+    yTopOverflow = Math.abs(yTopOverflow);
+
+    // Only redraw plot if overflow occurred
+    if ((xLeftOverflow + xRightOverflow + yBottomOverflow + yTopOverflow) > 0) {
+      this.viewModel.plotProperties.xAxis.start_padding += xLeftOverflow + this.viewModel.plotProperties.xAxis.start_padding;
+      this.viewModel.plotProperties.xAxis.end_padding += xRightOverflow + this.viewModel.plotProperties.xAxis.end_padding;
+      this.viewModel.plotProperties.yAxis.start_padding += yBottomOverflow + this.viewModel.plotProperties.yAxis.start_padding;
+      this.viewModel.plotProperties.yAxis.end_padding += yTopOverflow + this.viewModel.plotProperties.yAxis.end_padding;
+      this.viewModel.plotProperties.initialiseScale(svgWidth, svgHeight);
+      this.drawVisual();
+    }
   }
 
   resizeCanvas(width: number, height: number): void {