Merge pull request #1411 from meeseeksmachine/auto-backport-of-pr-140…

…5-on-0.12.x Backport PR #1405 on branch 0.12.x (Speedup: Do not relayout if not needed)
bqplot · Oct 1, 2021 · 27ee7ed · 27ee7ed
2 parents fe112ff + 9c930c3
commit 27ee7ed
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/js/src/Figure.ts b/js/src/Figure.ts
@@ -739,13 +739,7 @@ export class Figure extends widgets.DOMWidgetView {
       case 'after-show':
       case 'after-attach':
         if (this.pWidget.isVisible) {
-          const figureSize = this.getFigureSize();
-          if (
-            this.width !== figureSize.width ||
-            this.height !== figureSize.height
-          ) {
-            this.debouncedRelayout();
-          }
+          this.debouncedRelayout();
         }
         break;
     }
@@ -755,6 +749,12 @@ export class Figure extends widgets.DOMWidgetView {
     const relayoutImpl = () => {
       this.relayoutRequested = false; // reset relayout request
       const figureSize = this.getFigureSize();
+
+      if (this.width == figureSize.width && this.height == figureSize.height) {
+        // Bypass relayout
+        return;
+      }
+
       this.width = figureSize.width;
       this.height = figureSize.height;
       // update ranges