From 188da82206f5cba480b43f70ee3e37a1910e066b Mon Sep 17 00:00:00 2001
From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Fri, 28 May 2021 07:36:59 +0300
Subject: [PATCH] Fix clearStacks with custom scaleId (#9170)

---
 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 dbf08e77f..81d865810 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 000000000..200ce4d30
--- /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
zc-rk+3se(V8oo10B!HGEN~{V=YYSSe*!rM|n5Zb$3PCY~hz(j>SgOPa7<p!}YpGgG
zUutQ2S*yW70AGNLB=xbjT7e2tBoG2B2mu0w5E7Ei-a)aghqJq<XU}f8o18NzCwJ!i
z@ArNGKmXi2C;I{e{KnW#vI78&d2_k%Y5-6`9Mn<pt8aIW5dbE5(|6ID-EVg`e6M~_
z&%NF=xYE`2;>>T4A6Vhpe8YcJ=i-Uosdp9!Ee*Rm<Gbn3HOJ3T_kX_J`y<5tZ<3D#
zCixzn85S~mb?8@ngX|7opqXsOuW`NlZZ$2!CEaxuy)J{)_)VpM<xO2r)=z3LeNSd1
zf0pPLPGhn$fS~uu0rxFeEiy8d7?8PwDF}kX9}}lB!Kma%mLG;rutDk2D05aI8;mwp
znLo27F2}$&($M+v91KhxI664haVRRH8ud6F8$o7uFVXwC4$Xzi#thAxl7gb)s?@Hu
zmBc8Sj7@&bg+w9CWDX6CbYhfB1)f8r<WY81EQN7__4*J68i*bmrH&p?10+_AaPtr`
zCa4GhUg9)U6+;@UzFu72=H`e~`DKQdn>>8rI_`B!5kSQJ!Jdk#BDx18>p9Vi{+MP)
zQ&;hZ1VeN4u1zJGMD$PTH1K^T8<2Y>&;Z#s7;^zYXje<VhE%Um$n0)FX44v@2r<N^
zBpO(hm<I{Y3WFdAE6@tG0<AzR&<eByt-wD&Fl7fw?7btIEZUkdN2N0c&zxC6?(ZsJ
z4LSn03@uAdEEHw#o`f<#;?IS@KO|OQ2o+<N%ZZiWOeWZ41CN2Va5WcRiUFz%Jet@0
z!zE`E0R&c{6=((iUjb!&vw>%BUZU@^?0{RegQ+f-%R4!ydQXkU(jzscIb=wa^nT;;
zDR^94m(+A$#ENlyyun-P1bY<+Pt+N|Q0$7I-<!5=;Rf%9#Fl<@L)xWntv4RNC2DoV
zr?hsO_6BDeRY%5M?0gA!vCYKRv5z7vwuQ_>{V`c2F)%=ZWU{j5zqCLoBN@^h?txH;
zVV(ce?g>S-M$CQMKCNIY*b26S|1nsVL<fwdCV6(9OKtL;p7TBf-2zL;Hyl&9I&YUf
zK#JNAFGz)JvJENv4Ir`OS}?0*t3q@^ST$G6Pi$V#Ng6mex3X>?oNsNz=dCm*JI9>~
zLN}o~*SHfG@>@O1dTVT?YbMTJOuT`!hh*%7z}Zr}D`*b3`LA%un@Yu;#2|9}gbyif
z<VPxO(7R|f@ah_*s`-`C_89v4SlCxPm@sJWP*5j8d1)$a+_j6?;A|j;eIRev3}Cl>
z8I{H?`TzrwN9{1D;Ef?*{HGriFY9a&q-ya5@M^*3A~22l{0p$#K8K<?dtU*eVS6_s
zf$Y~IvlM4CB*y*c#HQKE8W#xe3mD}B%~WsG?8Hhxr8l2%>6k6;zbE+6R05om(AMg6
z)wd#|8-;c6c+{WYVYuC9Sjvg^Sq8(8CY~|rY%fp|T-aD!Tz%~3ykJI*@@-Z_V*h@S
zyJtcxnLYN#L^xMD3wovAsdFdP)N=k~3jeUy|Cxx{Of)=@toIC1^hc@~4|RoMVPUo%
z4M`90mqh!V->Rs-=wW0z)i)Hs@4*YJ59lb?z5(g!)=`I5JU8n_a7Rc*!!Mn5>xVRN
zzBNoU1{;eMS(ea%+TZ7t8|3l!Fpuv@A5$?MV-E=7x9{_T4)l&2cECB@7v$qKvMfG`
z(_u@+4j&no*aoJe;pS8(xbsc?CJxk4M*c;^SfFN+ks@V{V*;f2@a19m=F2_;A@~b$
zwi8*kj?f;DVS8>P%g8dL!y=IHsk@p56BB1^mGnO-$<G$^!yoWiy)uUd1N(Hs%K~9@
zoANlntT)}y($?VS-|+$zC4NTK<yENa6um3#d}3Rl$;fKD$ohE@?^>1+0JRhhX-PtU
z<(i@lS8K#tU!>~ix*<Is_P=rt3g+svrj2ABw6##I_Z`VQ41@@|m)z_|G7oCbYxh|-
zl6%lu9#^w(B>UhK(jt!Mj33EANGDjH@a;%7!3OzKvC@$;Qc+l?{gI^Yjs>Ql?w0qb
zq`K@@>Fx85q-AhK{PLLXJ=Y#OER>Nbk8c$Rpb=^Uo{G*RsYFtX&d()Tl~U-m)`Q{2
zR~+G8C>=2M+AvfpPi|KmOfMCPtls}_X`gB3YR}@%zDEg`v>lI^Q8&C3SpCg;*^1)M
zAdP`_T|h5L!r@N(hx#6T%LE|dgm=<qhIXA>NoQY-nz2#dZHVcN(WWc(41KM=pdhR~
zCO%ny%)4?daF*2PLvIqovh_j-xp6jy-4JDvB2<8ns+uoV6%pq$vO(>VbC#7zU<vdt
zudc`g`#LCo1yte_T{S38jWVaBInmIBwdXeSz+6$^mjtRl=V`<h;B0=>m2waj&^8^~
z)?d0vgS&`z5q8*xLm+aU95%(8jN3s_f5-L@l(^3tb>(;v>yA{N7LSQ_3!DZ3^$77_
zfI&3Z>$nK!tM>k=OL#)=o$TqLeJz^vE_ZT2C2;2ojx99)`j~iJA1Gl3ff@;XAc^O}
zp4#$d);L%kX_Nabnxmn@6CiiJEq0i@wU*AlHQncBm}M8wN9M-=nn<g#-v}!++N(S)
zsx)Eu2mCFScZ&-%jr|XA3URG8PM4;PYxm<NcAinRDIcC&Z^yYP&^O{;vl&M9<;`)v
zP*(4$IdHBq`R$SS&2+%6(NtXO*~j<MHQf!x-5cK-c=F~dUak$T^vW*Cj9$2N(1KSy
z*~m=q70wA3A{i`mLfRGwr8(;6CV6+<U~gN?nQUR}c2>_d?-Guv`bwS)FR3C<VQD%f
zN`4far#<8a?|HM(bVuS=vh_e2E-2}&yGf@j@f$tC5z17J6yzqCqB$>fot*&pq%i|#
zO6PjlVh^pE2iq#@UY)7ufi=E(!h4-`EE^1<k(s>hrCLg0;)519kc<XiI#iJX9!1LE
z^Cp6&m-{?!J3QFrT9&uk=NKblcElyO)3p}C*{Cx_xSEx)mz-P(3niMH*^!8RnH{Gy
z9^C5f6Pn4JCm3!fm4meh3X`K1#hh0YlGTge$0@QxU?LaACSPl+81w-9bNL4)X0+QK
z@PI_?{+ys3>`&`+$DEZyL}e~47iOL(E}MTE%{k6}zTXksznXsn5>GnKL-KJtu~8Rm
zco79!sP>b55cwA_Y_UsEdR80I+=c64#@Zz@EoHc~q;5+q%-G!O5|PP{=-;qJ*ioOv
zlml^^6F_s~-7~#3LchFuia4CYzO@FN&1i>p*}hi(V+EaUNVkkr^-4((f<ZEz8=t?E
za3E&0*^Xf41ST9;t|VOA%tE>ypPe#@g+zMEQ(+}b#9w53V7;@=WElsDuiySkYw;}F
ze~gGVepTZnt>9VHSx5+Ok@nRe<i$Vm<|}axQr3!V`3^n<snTwRw6{c0ALOUZXx2BP
zA!LJ;p-nR3)T=lHNJ;fg2k*f<RIDbcO!w5BEuw0EhmJFNDLcWUtIoDmc#>s{laL~s
zHWRK!odZj@YI&qEjd7s~&3$pe76ZA;6%iF2;2nDIUWF74Okm&Y>zpn{hnJaOPlZa_
zk5QgnIN12J_|`6%v%uMKV<<AhMsR@}dm1Jx`Gk~QYS9401Pq_DO-I@CQ!Ko!3ez0{
z>qCyi2ivBoF|jZU4*iaRg*+Qf=ZGB+N`f7yK|KGS0iDLG=D_O7iJx&0W{Z^fMjer@
zu{z0XLYrrj3QGmnkQ7!H)^1<>mAVW^a}akB`kOgN$UIaD^YuGal8P+BSTaQw4CM5p
q*X|O*NOuaKnb0cID)L_xiBk@{mL0kd47C7$-dq~sTd+8M&))&3hX+sq

literal 0
Hc-jL100001

-- 
2.47.3