From 28482d56e6811249ea173e357d6214bdb63c4299 Mon Sep 17 00:00:00 2001
From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Thu, 27 May 2021 17:25:02 +0300
Subject: [PATCH] Fix clearStacks with custom scaleId

---
 src/core/core.datasetController.js            |   9 +++-
 .../controller.bar/stacking/issue-9105.js     |  49 ++++++++++++++++++
 .../controller.bar/stacking/issue-9105.png    | Bin 0 -> 10460 bytes
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/controller.bar/stacking/issue-9105.js
 create mode 100644 test/fixtures/controller.bar/stacking/issue-9105.png

diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index dbf08e77f2b..81d865810e4 100644
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -192,13 +192,18 @@ function createDataContext(parent, index, element) {
 }
 
 function clearStacks(meta, items) {
+  const axis = meta.vScale && meta.vScale.axis;
+  if (!axis) {
+    return;
+  }
+
   items = items || meta._parsed;
   for (const parsed of items) {
     const stacks = parsed._stacks;
-    if (!stacks || stacks[meta.vScale.id] === undefined || stacks[meta.vScale.id][meta.index] === undefined) {
+    if (!stacks || stacks[axis] === undefined || stacks[axis][meta.index] === undefined) {
       return;
     }
-    delete stacks[meta.vScale.id][meta.index];
+    delete stacks[axis][meta.index];
   }
 }
 
diff --git a/test/fixtures/controller.bar/stacking/issue-9105.js b/test/fixtures/controller.bar/stacking/issue-9105.js
new file mode 100644
index 00000000000..200ce4d30a8
--- /dev/null
+++ b/test/fixtures/controller.bar/stacking/issue-9105.js
@@ -0,0 +1,49 @@
+module.exports = {
+  description: 'https://github.com/chartjs/Chart.js/issues/9105',
+  config: {
+    type: 'bar',
+    data: {
+      labels: ['January', 'February', 'March', 'April', 'May', 'June'],
+      datasets: [
+        {
+          backgroundColor: 'rgba(255,99,132,0.8)',
+          label: 'Dataset 1',
+          data: [12, 19, 3, 5, 2, 3],
+          stack: '0',
+          yAxisID: 'y-axis-1'
+        },
+        {
+          backgroundColor: 'rgba(54,162,235,0.8)',
+          label: 'Dataset 2',
+          data: [13, 19, 3, 5, 8, 3],
+          stack: '0',
+          yAxisID: 'y-axis-1'
+        },
+        {
+          backgroundColor: 'rgba(75,192,192,0.8)',
+          label: 'Dataset 3',
+          data: [13, 19, 3, 5, 8, 3],
+          stack: '0',
+          yAxisID: 'y-axis-1'
+        }
+      ]
+    },
+    options: {
+      plugins: false,
+      scales: {
+        xaxis: {
+          display: false,
+        },
+        'y-axis-1': {
+          display: false
+        }
+      }
+    }
+  },
+  options: {
+    run(chart) {
+      chart.data.datasets[1].stack = '1';
+      chart.update();
+    }
+  }
+};
diff --git a/test/fixtures/controller.bar/stacking/issue-9105.png b/test/fixtures/controller.bar/stacking/issue-9105.png
new file mode 100644
index 0000000000000000000000000000000000000000..14a21682680917e9039119b9822f75789e6f959d
GIT binary patch
literal 10460
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

literal 0
HcmV?d00001