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 cf08851f3..9a568cdeb 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 000000000..750595312
--- /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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
O6+D-&a_1}#`RU)(#1(h|

literal 0
Hc-jL100001

-- 
2.47.2