Re-enable oversized boxes (#8662)

diff --git a/src/core/core.layouts.js b/src/core/core.layouts.js
index 006521251e5242f99c2a5db38e4049203b438ce7..5b8ef42e5d0a219a0b04cf093468473685bd3aca 100644 (file)
--- a/src/core/core.layouts.js
+++ b/src/core/core.layouts.js
@@ -101,7 +101,7 @@ function updateDims(chartArea, params, layout) {
     // this layout was already counted for, lets first reduce old size
     chartArea[layout.pos] -= layout.size;
   }
-  layout.size = layout.horizontal ? Math.min(layout.height, box.height) : Math.min(layout.width, box.width);
+  layout.size = layout.horizontal ? box.height : box.width;
   chartArea[layout.pos] += layout.size;
 
   if (box.getPadding) {
@@ -110,13 +110,10 @@ function updateDims(chartArea, params, layout) {
 
   const newWidth = Math.max(0, params.outerWidth - getCombinedMax(maxPadding, chartArea, 'left', 'right'));
   const newHeight = Math.max(0, params.outerHeight - getCombinedMax(maxPadding, chartArea, 'top', 'bottom'));
-
   const widthChanged = newWidth !== chartArea.w;
   const heightChanged = newHeight !== chartArea.h;
-  if (widthChanged || heightChanged) {
-    chartArea.w = newWidth;
-    chartArea.h = newHeight;
-  }
+  chartArea.w = newWidth;
+  chartArea.h = newHeight;
 
   // return booleans on the changes per direction
   return layout.horizontal
@@ -158,7 +155,7 @@ function fitBoxes(boxes, chartArea, params) {
   const refitBoxes = [];
   let i, ilen, layout, box, refit, changed;
 
-  for (i = 0, ilen = boxes.length; i < ilen; ++i) {
+  for (i = 0, ilen = boxes.length, refit = 0; i < ilen; ++i) {
     layout = boxes[i];
     box = layout.box;
 
@@ -168,21 +165,20 @@ function fitBoxes(boxes, chartArea, params) {
       getMargins(layout.horizontal, chartArea)
     );
     const {same, other} = updateDims(chartArea, params, layout);
-    if (same && refitBoxes.length) {
-      // Dimensions changed and there were non full width boxes before this
-      // -> we have to refit those
-      refit = true;
-    }
-    if (other) {
-      // Chart area changed in the opposite direction
-      changed = true;
-    }
+
+    // Dimensions changed and there were non full width boxes before this
+    // -> we have to refit those
+    refit |= same && refitBoxes.length;
+
+    // Chart area changed in the opposite direction
+    changed = changed || other;
+
     if (!box.fullSize) { // fullSize boxes don't need to be re-fitted in any case
       refitBoxes.push(layout);
     }
   }
 
-  return refit ? fitBoxes(refitBoxes, chartArea, params) || changed : changed;
+  return refit && fitBoxes(refitBoxes, chartArea, params) || changed;
 }
 
 function placeBoxes(boxes, chartArea, params) {

diff --git a/test/fixtures/plugin.legend/maxWidth/infinity.js b/test/fixtures/plugin.legend/maxWidth/infinity.js
new file mode 100644 (file)
index 0000000..315b5a6
--- /dev/null
+++ b/test/fixtures/plugin.legend/maxWidth/infinity.js
@@ -0,0 +1,42 @@
+module.exports = {
+  config: {
+    type: 'line',
+    data: {
+      labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+      datasets: [
+        {
+          label: '# of Votes',
+          data: [12, 19, 3, 5, 2, 3],
+          borderWidth: 1
+        },
+        {
+          label: '# of Points',
+          data: [7, 11, 5, 8, 3, 7],
+          borderWidth: 1
+        }
+      ]
+    },
+    options: {
+      scales: {
+        x: {display: false},
+        y: {display: false}
+      },
+      plugins: {
+        title: false,
+        tooltip: false,
+        filler: false,
+        legend: {
+          position: 'left',
+          maxWidth: Infinity
+        }
+      }
+    }
+  },
+  options: {
+    spriteText: true,
+    canvas: {
+      width: 150,
+      height: 75
+    }
+  }
+};

diff --git a/test/fixtures/plugin.legend/maxWidth/infinity.png b/test/fixtures/plugin.legend/maxWidth/infinity.png
new file mode 100644 (file)
index 0000000..9a0a9a2
Binary files /dev/null and b/test/fixtures/plugin.legend/maxWidth/infinity.png differ

diff --git a/test/fixtures/plugin.legend/maxWidth/undefined.js b/test/fixtures/plugin.legend/maxWidth/undefined.js
new file mode 100644 (file)
index 0000000..bd488b1
--- /dev/null
+++ b/test/fixtures/plugin.legend/maxWidth/undefined.js
@@ -0,0 +1,41 @@
+module.exports = {
+  config: {
+    type: 'line',
+    data: {
+      labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+      datasets: [
+        {
+          label: '# of Votes',
+          data: [12, 19, 3, 5, 2, 3],
+          borderWidth: 1
+        },
+        {
+          label: '# of Points',
+          data: [7, 11, 5, 8, 3, 7],
+          borderWidth: 1
+        }
+      ]
+    },
+    options: {
+      scales: {
+        x: {display: false},
+        y: {display: false}
+      },
+      plugins: {
+        title: false,
+        tooltip: false,
+        filler: false,
+        legend: {
+          position: 'left',
+        }
+      }
+    }
+  },
+  options: {
+    spriteText: true,
+    canvas: {
+      width: 150,
+      height: 75
+    }
+  }
+};

diff --git a/test/fixtures/plugin.legend/maxWidth/undefined.png b/test/fixtures/plugin.legend/maxWidth/undefined.png
new file mode 100644 (file)
index 0000000..858ff0e
Binary files /dev/null and b/test/fixtures/plugin.legend/maxWidth/undefined.png differ

diff --git a/test/fixtures/plugin.legend/maxWidth/value.js b/test/fixtures/plugin.legend/maxWidth/value.js
new file mode 100644 (file)
index 0000000..f5d02b0
--- /dev/null
+++ b/test/fixtures/plugin.legend/maxWidth/value.js
@@ -0,0 +1,42 @@
+module.exports = {
+  config: {
+    type: 'line',
+    data: {
+      labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+      datasets: [
+        {
+          label: '# of Votes',
+          data: [12, 19, 3, 5, 2, 3],
+          borderWidth: 1
+        },
+        {
+          label: '# of Points',
+          data: [7, 11, 5, 8, 3, 7],
+          borderWidth: 1
+        }
+      ]
+    },
+    options: {
+      scales: {
+        x: {display: false},
+        y: {display: false}
+      },
+      plugins: {
+        title: false,
+        tooltip: false,
+        filler: false,
+        legend: {
+          position: 'left',
+          maxWidth: 100
+        }
+      }
+    }
+  },
+  options: {
+    spriteText: true,
+    canvas: {
+      width: 150,
+      height: 75
+    }
+  }
+};

diff --git a/test/fixtures/plugin.legend/maxWidth/value.png b/test/fixtures/plugin.legend/maxWidth/value.png
new file mode 100644 (file)
index 0000000..64f40cd
Binary files /dev/null and b/test/fixtures/plugin.legend/maxWidth/value.png differ