From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Wed, 30 Jan 2019 10:43:42 +0000 (+0200)
Subject: Prevent infinite resize when vertical scrollbar appears (#6011)
X-Git-Tag: v2.8.0-rc.1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97da221f27b41d48e243549372ed15137e34bb3e;p=thirdparty%2FChart.js.git

Prevent infinite resize when vertical scrollbar appears (#6011)

If the container size shrank during chart resize, let's assume scrollbar appeared. So we resize again with the scrollbar visible effectively making chart smaller and the scrollbar hidden again. Because we are inside `throttled`, and currently `ticking`, scroll events are ignored during this whole 2 resize process. If we assumed wrong and something else happened, we are resizing twice in a frame (potential performance issue)
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 1d85ff1ba..a294b1600 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -277,13 +277,13 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
 			plugins.notify(me, 'resize', [newSize]);
 
 			// Notify of resize
-			if (me.options.onResize) {
-				me.options.onResize(me, newSize);
+			if (options.onResize) {
+				options.onResize(me, newSize);
 			}
 
 			me.stop();
 			me.update({
-				duration: me.options.responsiveAnimationDuration
+				duration: options.responsiveAnimationDuration
 			});
 		}
 	},
diff --git a/src/platforms/platform.dom.js b/src/platforms/platform.dom.js
index c05152534..01a46174d 100644
--- a/src/platforms/platform.dom.js
+++ b/src/platforms/platform.dom.js
@@ -273,7 +273,19 @@ function addResizeListener(node, listener, chart) {
 	// Let's keep track of this added resizer and thus avoid DOM query when removing it.
 	var resizer = expando.resizer = createResizer(throttled(function() {
 		if (expando.resizer) {
-			return listener(createEvent('resize', chart));
+			var container = chart.options.maintainAspectRatio && node.parentNode;
+			var w = container ? container.clientWidth : 0;
+			listener(createEvent('resize', chart));
+			if (container && container.clientWidth < w && chart.canvas) {
+				// If the container size shrank during chart resize, let's assume
+				// scrollbar appeared. So we resize again with the scrollbar visible -
+				// effectively making chart smaller and the scrollbar hidden again.
+				// Because we are inside `throttled`, and currently `ticking`, scroll
+				// events are ignored during this whole 2 resize process.
+				// If we assumed wrong and something else happened, we are resizing
+				// twice in a frame (potential performance issue)
+				listener(createEvent('resize', chart));
+			}
 		}
 	}));