From ba5ebceca802c98dbdfea7ed4967cea24b294e04 Mon Sep 17 00:00:00 2001
From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Sun, 20 Jun 2021 01:28:05 +0300
Subject: [PATCH] Bar: ignore not-grouped bars from group bar count (#9291)

---
 src/controllers/controller.bar.js             |   4 ++
 .../controller.bar/not-grouped/mixed.js       |  35 ++++++++++++++++++
 .../controller.bar/not-grouped/mixed.png      | Bin 0 -> 11940 bytes
 3 files changed, 39 insertions(+)
 create mode 100644 test/fixtures/controller.bar/not-grouped/mixed.js
 create mode 100644 test/fixtures/controller.bar/not-grouped/mixed.png

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index cf08851f361..9a568cdeb99 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -324,6 +324,10 @@ export default class BarController extends DatasetController {
     for (i = 0; i < ilen; ++i) {
       item = metasets[i];
 
+      if (!item.controller.options.grouped) {
+        continue;
+      }
+
       if (typeof dataIndex !== 'undefined') {
         const val = item.controller.getParsed(dataIndex)[
           item.controller._cachedMeta.vScale.axis
diff --git a/test/fixtures/controller.bar/not-grouped/mixed.js b/test/fixtures/controller.bar/not-grouped/mixed.js
new file mode 100644
index 00000000000..750595312fd
--- /dev/null
+++ b/test/fixtures/controller.bar/not-grouped/mixed.js
@@ -0,0 +1,35 @@
+module.exports = {
+  description: 'https://github.com/chartjs/Chart.js/issues/9281',
+  config: {
+    type: 'bar',
+    data: {
+      labels: [0, 1, 2],
+      datasets: [
+        {
+          label: 'data 1',
+          data: [1, 2, 2],
+          backgroundColor: 'rgb(255,0,0,0.7)',
+          grouped: true
+        },
+        {
+          label: 'data 2',
+          data: [4, 4, 1],
+          backgroundColor: 'rgb(0,255,0,0.7)',
+          grouped: true
+        },
+        {
+          label: 'data 3',
+          data: [2, 1, 3],
+          backgroundColor: 'rgb(0,0,255,0.7)',
+          grouped: false
+        }
+      ]
+    },
+    options: {
+      scales: {
+        x: {display: false},
+        y: {display: false}
+      }
+    }
+  },
+};
diff --git a/test/fixtures/controller.bar/not-grouped/mixed.png b/test/fixtures/controller.bar/not-grouped/mixed.png
new file mode 100644
index 0000000000000000000000000000000000000000..af2c9fda2fc3e52315e1c28509ba5a91f5c60dc3
GIT binary patch
literal 11940
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
L(V=ivz>oh1)Wj8d

literal 0
HcmV?d00001