From d402e5722ed00dcc64bb3ab93010abab5a1cb6bd Mon Sep 17 00:00:00 2001 From: Kate Lovett Date: Wed, 13 Dec 2023 18:03:50 -0600 Subject: [PATCH] Post 3.16 stable tech debt clean up --- .../dart_test.yaml | 3 - .../lib/src/table_view/table_delegate.dart | 4 - .../goldens/reversed.pinned.painting.png | Bin 4867 -> 0 bytes .../single-reversed.pinned.painting.png | Bin 4868 -> 0 bytes .../tableSpanDecoration.defaultMainAxis.png | Bin 9516 -> 0 bytes ...tableSpanDecoration.horizontalMainAxis.png | Bin 4499 -> 0 bytes .../test/table_view/table_test.dart | 337 +++++++++++++----- 7 files changed, 240 insertions(+), 104 deletions(-) delete mode 100644 packages/two_dimensional_scrollables/dart_test.yaml delete mode 100644 packages/two_dimensional_scrollables/test/table_view/goldens/reversed.pinned.painting.png delete mode 100644 packages/two_dimensional_scrollables/test/table_view/goldens/single-reversed.pinned.painting.png delete mode 100644 packages/two_dimensional_scrollables/test/table_view/goldens/tableSpanDecoration.defaultMainAxis.png delete mode 100644 packages/two_dimensional_scrollables/test/table_view/goldens/tableSpanDecoration.horizontalMainAxis.png diff --git a/packages/two_dimensional_scrollables/dart_test.yaml b/packages/two_dimensional_scrollables/dart_test.yaml deleted file mode 100644 index 5ea7fe8ae51c..000000000000 --- a/packages/two_dimensional_scrollables/dart_test.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# TODO(Piinks): Web cannot support temp golden files, re-enable once mock_canvas -# makes it to stable. See -test_on: vm diff --git a/packages/two_dimensional_scrollables/lib/src/table_view/table_delegate.dart b/packages/two_dimensional_scrollables/lib/src/table_view/table_delegate.dart index 5215413945b0..275bfb5bae48 100644 --- a/packages/two_dimensional_scrollables/lib/src/table_view/table_delegate.dart +++ b/packages/two_dimensional_scrollables/lib/src/table_view/table_delegate.dart @@ -150,8 +150,6 @@ class TableCellBuilderDelegate extends TwoDimensionalChildBuilderDelegate int get columnCount => maxXIndex! + 1; set columnCount(int value) { assert(pinnedColumnCount <= value); - // TODO(Piinks): remove once this assertion is added in the super class - assert(value >= -1); maxXIndex = value - 1; } @@ -180,8 +178,6 @@ class TableCellBuilderDelegate extends TwoDimensionalChildBuilderDelegate int get rowCount => maxYIndex! + 1; set rowCount(int value) { assert(pinnedRowCount <= value); - // TODO(Piinks): remove once this assertion is added in the super class - assert(value >= -1); maxYIndex = value - 1; } diff --git a/packages/two_dimensional_scrollables/test/table_view/goldens/reversed.pinned.painting.png b/packages/two_dimensional_scrollables/test/table_view/goldens/reversed.pinned.painting.png deleted file mode 100644 index f3355f07dfe1273ec94ac3d82fe9f3b3c4246ed1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4867 zcmeH~SyWTk8ppSyf+C`&S1Ln-ZW z=@$a3ODcTa@p^?kweRB3>A*8Ka{5kAz7D8AoIRN2^-Vzt?J0&YFz5*Gu`ZiK7oFZ* zcKtp|{d4v+39#EXWpKFYcib{d5sRQd7f!yDzhjTFgfYGze}jhgseOvT|0M#Ob8FN= zzQvK!CsqlJb0l(hA-aFi`k=6FsfFw0owI@7h32V2BT*bngpP;SZvf!t4kG~2x4}99 z{<%Q|fbGU;0204gw;q5tjqLy!o&5CZpCbY}TnPZpROZ4PXBLXkaUXAUOLK4APa zzD6P$^L`dZwPE&vR&Nw)Z@pHSQ?A7$!2rWb8X)JS`FZs^D ztS2+_i5teZQTf1H+OqLTAgSzPymX!}ZfE*Dsv$p9-vDA?q)9V4C0_6^G9uCgTsUXv zO7(`#O_9@1Og_Iv)2y^felIRGYO+e7lP&1wESi>4!gx6H@BYevAiXCwc7hzc8r$FR z4M|os!zt^0LwG57mfktV4Z#Y9s$XEoPtA&r>?d*^^$n@0#wv-eoG;@}-k}L~m7I}? z?q45MZQZoXy!?(ijL;7;vaFYRqrbozq4dH z+o$kh5f|>Ta$Mv5hCJnd!*3)vyR)3GggsI3+fN;9mCxivYxnEeY|E7)55I5FmX$`NB|sC$sHw+x||E(?z$SH)>Pl&xF0mSxC_i8|InMgNuT7@hIJ!IWbj z9?^|h3=6Ro$(+~P0T)x;`21o`)A9#-I9EcaUXJ+LT6Xc=pk;lcY3+sc!N;OIsO3-8 z2#TI$Y2Cc2wI9p5dj2=*FOyUi?Zf^z+7oT;vk*{fAxsF0dPmm2t>n#H;1~CjC#HQY zij+>8eEVLJMrK^_XtI=;usTlX57mcC*mF8al#0K8^*>d_O6tRJ^Omi{wE>zC>W+?qlOzGA9y)R zNh*E#)aqORU4{k~1+C1ZTk`Un>Mr_A+Vyg+imkc56LSBOBslK0c?VO_mny7q@+UP+ zgvcMNLcJTJ`!dXG#lfWA0gDZqDiEEZGF-dTv}Ih8lqh)q%DD~F-Ew1NM{Yz*YFOii znsu8E0o%xoq)aoew;(WnnX}5*59d`@JtBp;_zp>o;@R6E!shEz^;hi7{d6v#8dW4Q z^LX;-U1sp$4q>T&V{BaZqFr`+`S8r`eM|?dN?@MV z4Jq0}YGfY*=Q3+~me~YWaUepBdyVbWj=fCuI#s*_5;rSO{(OfPN9rakdN~DWE=s`v@USV zmCq%2ccsII{8Si!#=7f>&&!Uxk^AFLV%V2Jn8sYVQh);TlQ(t zLbL@E>$~omca^Hhe|c`crx^eKuJ2fy?4kb`5cJn?C^A8xi~ZpoRFQqE(Ej`ph;)Za z?rwR7zg$!_w=2JN);nhWgHA1raB2HA^2#5@_6q7JySBRxUt;|L)ErMZAFr@Kcl}>& CdbYm+ diff --git a/packages/two_dimensional_scrollables/test/table_view/goldens/single-reversed.pinned.painting.png b/packages/two_dimensional_scrollables/test/table_view/goldens/single-reversed.pinned.painting.png deleted file mode 100644 index a89a27353c148f83a667094f6a545146ef5116f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4868 zcmeH~YgAKL7RN6y11b;2f}hxXsJ+MNijeO3Q<&2tB^PEAT-6s{=x_8sW)%$$?VxMb3d`7bp=1J>@&OOvlZ{0|11de zVM~AO?x^Wr00GRSOw*-I-tDvaDF9Bu%aM;os031BS0ia;5nK=MFv~~ah zkDUcjY<_P){c|`l@l6{H03?X0L0ezCi-uX0z@15C=czkhMe;+pQkgg6leKIcQ7O@= zAlxst9WPoe1I!9ONO{~b{z$lTX-8Zy@?{Mrf#oe|4Y=Nh~(Sz*V;&t>&q9C7yneRKg3ZtsZLj0B%ip;S_B0L`vBBE(T9 zdG&9y*d(ugBl8$3X5se8UBoTa8bczH&s$$ii4hDeq?Hy^eBKQQZlEhSq3Q)o_b)#A zJoML|Lwws9Cqy7UDZVU>)pqM~&{fYwfNvr3M#cL$AymHLGt4V!p|Vp95DcN%le1G& zQidLqA64+bE0?4Z?`Er)l1>Pt9Syb_5xmtN0KcN7nDV}2C%sWltSxs52D1uh&R?)! ztT0;#l=hPNGZ~i;2sN5S^7!|Qzu4j`H=|H@7So*t7!N2k82s{;qoQUI zjH0acHBd;Y(qFal_-*6llR9egGil!-MU=+E0Jkq=c=kcSy3-n#?;Q= z+33VOB$WR|s$p}=AMkVuhXyA$kkaxpV|r1U$ExSFCs)V^-^bODPc!Rdqp=;Yza2J? z&!-LldQ7~;rxL(oO6xW}d0od$ohL5`3ZW2QLc!&$?q#?+BI4qxO3&1J+$ko_5us{$ z0D>>rW$+?OeSJ;vf@(BNG2rd`2<@C{;|A1RaW;V9nUKJA6hn!;;fg=V>Z0X+k$@dl zdyx9>tm??vZLcxwH{|_g-JOV?8r;&-r1{04ApPZ5fNm_r zS?h7;}`b2)&6|Y&7%Ku)guuxmP_yQ;GS6||n7PsMl)W!QWAz|vl=>|kSmvwnye3sjfELNDU>USyQo892{ z>Z{TDBq_bBsSfo0u(75*tgbLUNz$E2;=Zq%QN3tnDr8JXqnnE+90D!;z?eYDmcK~@yX$DM1i|C7y0`*FMTuvkEADTMML~D?Bc2!|6oYZFV z2cvsdZ2}Al$(kW4E7Ux@>@*wg&e00--gf5Lsg7z2RIhK5{{QGe*6!bqe+qI3wLEvC z#YWVIM>LUi6?6X?_I>+meYP3Dak)PB<%7Y5M=(8JfLtMeQpK*ddwM+}U3nfo`_3EU zQBJWm8iuInA3L^}<*_vF^2Zsh&2eN$h@TH0!uG@vv%R1~3*Ak;_u?V?wF#?d-pGL_ zdFLB>ej`Nc9gv=WTQjvK8p}D#)=aI2`l+uTK7KBH>0RAAPXM3?MUH~hT`cxc;_#N_OZh9Ft%L* z`=J?9_2-J^8v}_ax;2_t@;lf)8K(p@XUh%k5HsS-ocEwwa1>o_62-SK>Aw#_eHs%QxXfX?Z=3?-qa z)=E$lce%vzc$F7brjUT4YhS&EifREWV~< zjNeBF=GA)xYRnjoCUl zYkVRtqLiANzu2E^yz&oWXyltpzZ)BW2lz;;D%AAPkA3+=9V_QjoE!5QxR|O)6EVZ; z1Gmx{p+@bj(iY~8`ETK!n&E!&%F&iO5qU0KNd&bnZk5T^f?6THY*0i?2y6>|uVvzU zysNzH+o-g@)18Dxd7&J{d!oA#QInhKu*i?oOwHy`&4CreuLalzDI=ZEg4HJYXR2O* zmV;mXM0rveW35-1rkLTd*|Z^2%IIsE8X|rg)2Ss0YcyrEtcGVup&G7Ig!fuNjyE&y z8r5NOr2A@9>v7(&%W=CBjBbhlUdX%Nb5M?Nwpy7#))K7uL^Ozfjf(cxaZ%ggQ#PXh zyIMoUifh|-PHv;g4eG|GJ4bPUO;?8a^BQn&q$Y^s&$^H3cNGBl*7#{o3*=96+TJ#9 z0lj5vOr12}DnnH%Ay6EKhC+og^;{0?}usw~h@(jOMBIR{$k88)}H>8q@ z!N$(>HnxKX<%56Ubq9}Js~K(A(7l}n=jGMay?sXa)R|LN*8X0WmAFYnF8kD((^Ypa zH!pd>8+&KZ`Q;eGjCZ}Xmr9l*Nj=7UV>tG`EV%~x+{QoO4K(|!6osRm0*GDiAmZHs_JQ6y_aSBmKvLal(zg)@Jyp_}ydbUi+Nn&WW z+Fv5eZfzp0cX>c3WQ$?2i42C67X`WoWsm0w*O<81FT~*}{pgsjDpn5Y-S*9E3vY%_ zKE46d8}_KlCt#q}574x0DHi-acU6j7o$HPmcDqw1_HyEdh00#oUTxHjNNI@A;V-n2 zj`XR}J|C_rS7@1N`E~~tg9t|yufqS#tLfjITkmu!!sR$KFIts&G2uA9jO}ZQmgLr6 z{RU3Tt~?$Z!}h^O}E2uN5IJY#+^2Rn*a#c0c0B^~T%od%LiE zffE{Ks^c`;FoNH9er*JUFQ@%vevC}jA=Q;Yz*2Zu*J{Goas;Vv>Dyq9WUM39-p|x> zbwaGHsI-aDHrCQuW-@H2+&0IqPBR=8bAMB?oTFl~W3E^)->u=3cNAk8p*el>+6yDu zc7p~-qCR1lycokChVFavd;CpQXGhLj#Jd{Z>Tydsqc zRUuR)$T*SABDFNw*GAwzrqX8978mEanseXl&EU{_An zcolmD++ArjF%N4s2@D`NsYd>}t7}KJxZ=-w1H!1~4u@WV9!S!2J z-a%J9@pi;A_WFFG$p&T>%*5q6T~Kn#Svc6f6zq1+IK<7|NYn8|AgY>BS5)KR8H0cn z!APZ~Cg#Jg7I9Sx2&db+qt^pbwdCT`6g;$VTY&bUb>@(X6(HFu@yAQSZ7Y;d+ldBo zEAy?yR6>U8)crQvz0?~NxmOmPnY{JH73F-r2=!Y7^w~#w;uq`;0;C8|Lhh97szt1s zbdq1$r2P~-+0}6^@_pct6@S-W6SQr^XWC?7WFhkWbhfHTr3`BKKFkap0B5pC1lv4=$YJN zvIL3v0W&9_lPOJhF?4`$yw|2>04u7&xrRpeG2ZmWz@=mQ2Qn_6E&Ej}fnCHOw8HJ# zE2^Wnop#lky}txd$Pb#oSi2ofuX{}3ExT3GgWs#HLH-dPhhExWt>S!Gdx0jcW)!PP z`X@}s+;PlmC?q(0@~8#}QRP9J1)B?TaoyDRc_c$;diC_Lu+f{98h`&IgFn#)=W~%)bTBtkqyZf9fAcfzwkr`_+Cv{ z0I$vVQRMgGO`Xg-)}>3-I5GFRFAu=Zac-`v=l!jj!{J@qxn5Bmp3vz|AgHrON5 zsI$3-(KCdAL`j+^5x{ZZcLVy*3aJ`_!6RruegaQ4=QWQTwzL zRB%+~=cVxFN9CJM%qs<)@AB`BBHjBl0e?ZOLoXXeag$rWenPDAdlx-#eV#b$bXY_r zlD5~PcPrAmU+Z0ZmPr`tQ-PN?X=<{1`&qcuTB=y1KNnUam~(q<@aI`zKl-lD<5UCtG&ojhox1+4ka(51sU|NPD)Hh9pe-YXY`h? z*V{lW)*t%n6{@Op67sA}DxiNk9S@*f=!~$M%I*W3u8kM zac(cS7cCuy@MQFaKOUKEDAWAx|IT2h9SS6`z64yR*gpmCxeYGGK=rGWji}SgQGD8& z+$i|ui{qOs2xAiQcplSDgX1!0+crz#Xx;ZcQpI9*0bOslFhwMBIc} zy7)D|nPnmVAJ3@u6ZfJzU7-3G7JjU8>Xt?N64k&>bT^9-;9Vq9_+|U@+X6(9`_!9` zXwQo?*U8j)=g``mC|n-}yzi@s-hPqIPcF|J9L*v4f+04T}RhAJ4uOM_HZyWPL<2SOiRDR4zz z=|BCh?Z9CmR`lklU;FlFy)_a$2I2PT@U|+UQN2++4HD8`5K^Ib~@xP=P^ z_VWwe{}M7?w*Vm4(M~Cfn^kNKpEBi^y!rM6z{^B#J>a#73;>vF^6&w`CCgZDmCpT# zx#`9U5Dx&HIsI?t{}Bx(3*nhiH$Rp5=j!#_aUG=y8au7o&uq@3FRJ>QJ9eY(g!pvm z-(G&?$lZob0gv&lC{aMhG^2O;M8aJ62+Q&6&2eGF2trp`oUlH~tx(N_zJ4NvQ();B zfMAtBWvw-xG6vr1t9=WQ?MOg(k3j6dD*3B&eVck>6_Aze!^+AgcDxXc!p0BVoY@&<>b+U zSh+K%e}op(Yqu%QaXu2c3f|&Xuf5tjUPFqSqVS~{+hdi70DZC4+h^te)17;7?3o97 zl=9$R7fK&>N0M?LD{2rDE`Jg{@m|g2^S$;qJ?WL-HsGjL>`_u5eN=xht9DNcoYdL1 zMlPH}g~ZWgPoLK|*0nK&Q8p{f=$B3_J9u(xpR&}W2sadSlks$}N~V zgp)i84#d@-V^g!ihIgVTsjcFZX+k0zsF{KuaUy+|qqvatf|bj4Ic(Fsk>$X3nQ0Y| zZbLYtdXiRv>nfnvqYwA5q#Zwh#&~#JHQv@^>AUW7GW@+QcD1OA)I00Mkjr&xV)4bM+X;a|`ghCHEf)>eRhnpEm z(`Z^}f7~b-oLkHE(r~WGy!yZ<*&OFNC2Hc)EWau>^uei{VznpM z>fR#Dm+UvTY@NAdbqN_nHJqL*pM5F_<))6v5bKzP{h-)I?&N75U<*`a?OKzoB&+?>PSgVcj2#Qx=P4A5?k)v4ULkPkna1gGh+3VioR3GRa zz@3xs1G-01x?aKDy|}>LP+gb%+1t#60l@RH17iO!z5gHWEfs%Bly%vTyy3v_TNP&y zim|2&jxVdUHI-7?99YVoyw};KAqV9b@TtvF8-$(Sy8N$aL%WhJTYKY1(|s7dSiA9b ziy(BI6}fSfw0CVmuZx3_WKO+i5jVt*0Raat8Yfj@=3bnYqO{H>!&iUOj+gCb^Y)n= zoSrL=(^tk-#;KS%AE=o^c3d}ShD%e1D4nZ~)9ej*-nJgTnV$8xd_SJK4AJK%5O>;K zqzdO&fJ-4)%%f!z=%!ZTn)e#^lJ`y)w3DYeO^6(YsN+D0ntb?y;pC4P`kW4gvOLh+ zk{piKo6A!bE%#nB-%8fagH?&#usYdq=!(AElJsHNb^_xWYF}@%HTn(xoLs;9q{+7n zCJn7ezlX7wVoLJ;+H>l*E$>Ds-ib)@tK5tmb7{pywhD^$!$!py#!@9jIICyi6KtCgQ_0SJIDJ*)02%+>b-236%BUirUbVN?b-(f6LoSPzz#K;+mSG@r3Bmop_ z(@TUhP{fg%gQ0d{)@XOy{6c}{%3@rtqHJkW9PI~HI7JqZnsCB%>g?;-WK!fbWa0>p zf5v7}Fc;)<-_a_1HRY}bd(~zh;+0gp@NpKtbEBnSr(a+7^r^FcrZRKy)sg-IR^e2# zMXO0-+=;T7D1{29IH`dUxC17yWrIL7{`kJ`jhKaC2qhP92x(V#xe6}rC^M>1XRj@J zCL4mmN5Mdd>_3lWr;$^{X@XYNpX;WgBt<4PvOY{NxQgY~JXP6j=LOW6Zr>{=$w6O?^&WUI{rk+$V z&TsmLv6~G;6=W@lTeY5!Y{ev5u1M5OqO1}94S>HCW=XAy`ayt0edKg!FtHy#@+_w| z;)ZPy1Ys9sqc0R6>R=SX6lm-%W1+zYXDg=NGGkM{trkn*>}8t zsBQc?Ad1UPK21Q08oJm%f%@x5_YHX(N>&yy@SX(-WgRH zTz;?uxi(b6Ky7j|O~ieSUSD~oK|1XOZ%6brdef@cUFXD`ozgXD6vESLn#KjT;ezo) zrhx|Q(l04t(w-0wrZ&dR_7*kFNhA|c7`=pV+G6ZJLYI8VW&QOKi)b&GZix0Ci{JMK z3cfW|x7%CZm9}?*i(f4~^M6(H6Y{d%?@ztYk);8B=Fjp7-wP!YVwP6g=O&)zZ+>V# zj@N}R?Ch>0i<}-9LEXEMKvfQx+del+OYF51hQHiM80R(JR1}#AU-KTWnuc`U2dYxcc;+V(cG?ibv}0fP#mWuG6(h~OhSf{&sTj?%4v zXCK1*E?n}^%j~Hy3QI0O|3SD|xf*41z!Na{BfIHB?3Ue2COa)64GX>TE}DRQv@C;^I2Pr2R;N38YT1CJh5XQai^9 z2QMw(2+^)sJ*B>azd=5s6d(%plpPf*ZwfI=L3FwU_;(a+RQrwXr?8`qys^V}@o_&Y znWC50nJ?;bAS+X?0c0Qh;{zz;MnB=Sgx> zAV~i}q__Hz-;{>kr`@MKUo|jMa$Rb0Bo2b~mHuV2 z|3?V*z5Ny-R1@Bw2dC$`q2cTGeq=NQp?k)IucQz^Bqdt8Bu#Oi=q1`opSXtI55ygo zvGH3=w4f}k#VE@u5uZyn++T2N708N>a)Kphheym8wAfOsL#Ac9>}L8u(Qg$$wXc{5 z5aPPI82z~hWX0ftI4lnaNtfciy zv2M{{4;T1ktDKj~v5_>C2<_ib^cRLFavdB$`WLqW|%r=4X1u zpr1af%PNNZGZ4viN&JEAntIVBbd(?L>QBnGWuPyJ@6xPL5<008_o88%(w|mbB}J?K zZ`4!};>vS5#|@$7u!{n*a`Q)upZvxqa5R0e-%$d!t@XUUV_Zuuu{nCFBl$SE#)z^{ z@4cD%TdQaJUW9~KIwu88cE;&xX#*1ZeyZogqJyU9+qsOG23%e@ee&RHqT~_q+OAle zygL1oHv%R_rQ74<+`ycKTK^V;#m}ejADp|mx@|V+^|?ejhva^I?^(ML>yZ&Uxg;}h z6@M5|$g=+Y$2k=48NDZj8B=AOZ223?S{J|x=>YK$h>) zpF*u2P_5o1le&2)uVO5xeaolxzIFUWLS7DQ{%_Kv zB_gXXp#ysRpz1ZQI5RM~*>w0k|N@{<9Ba_`ezJ z*UofWj)ipNbiKMXBF2xoq6{Tin^pedvA-u|b@X~xO(62^X6|H~F=J!Lt0mrnLKt%M z+Fpe0E9C_|tYftw7O*7d2(~eD^>S8uOJ$@N;Ie7a?c{)8MGN$NQK>f(5Q?g9gn1H<Jw-4yRP=ZLTKvuLSmg zCcfOB2G$JTy-p9aJC;=jd9pSRqF@QnpJ)=`ctGG4oN z7dxr@-xVeb|4}!&6_khixeBH-l%K1*wqoSEF|)smqA~y=U#i{TU-yx#=yrK5ySZ-h z0kJ7|UAqP`%LVY+Lam#`cyLdB@$v}(P|bhq$7n4rb>X!Te(1RMBdh36#Z5)-Zf@Gm z)p6G|HMgJUJvUX}C1GJ=zwfKyt*q=SGJCqruOP3+)H+?oVQyBdRPA>IYefrlZ%oj1 zX>a;z3-m)r>S%HIoe$#?u)fd6>`-oLdAn9LN# z&B;U|`I$1YTi~@Qad8N5#=zU4t-60Uc%eE90du~R+Ao5Lf#?V_MNmZMV50PErauRQ0GqY+7uhzL%SsXcsgM{6Hf%``KKHp${vB zSSdn6ePilUFbShPHX$FzkL8}{gm4FYhP@({QcxfzEY3}N79*Tvy@SVk!z+6uKgDVE zt+R>8ING%89qz)CF_69h@m%}S@$7fkP{X-Q)GuEcDx6i-=4Ow6=u0!f?X}T|nYr9Z zY8R}G&FqM`cjNx?3i|~EOQxH!pl*dfr&7ZXX%~g`aMI}npJuzQL;hE$#zr^AQ}j@U z+#IUvnO7q#(u@3^!9j)~JXOa|DmWJy#cU8d$Ju%(ZfS*IW+v3IHvPRlP6>IGsTMUx z-;Eq}sxZO{N0;hNOx&L#bozspd`|#9tInV!F6Y5hQH!r}!cGR8UJxO?%6O5<`4v4) zV=WI-*0E+N5fw)XLp&^ccOH{p9^z8X;9#hoX6(NLESqA+AEKXErW+2Z^S(=$(lV8m zt)K<1SzD_!TNiU8Jse-@HPTjX@d;39mS_!&ncLBwUHQi?zMhZrmbrDGur%93@6*rS zKTV8`8nC{0>{Xnf7*ykZHzuXW^^|wyG_PL|i||D&rF6&gDK@>4cId~>`^n>8z0qI) z^u_Q?*H&TK%9sx}(kt)~uaR$BGKdPT-{5#yUQDL!WUk>h%0!R+$SS~P;gQ#=%iLE3 zx_-Y4@PPR6q7B(yTtq~@<2zgl;rA`@UENz*u;5iR~O!4 ztS4}wnD?Cnmhw6c&&XbCP>U&rjgSn*g@V!@;@j`0?Ypa!chn3jm)C%V{mMIuvfq82 zmROzVccIe%YLBI3&J8@p)XzBTXJ%KbUQ^^XC%lO~+MczCK_mY(THClN2T0Bp8em?9 zdmHkL_wH6M`To>z2w6&=5I;m*?)i>ft;#W~aGr+xGW}@_6kDZcQ4tZ(AMBW*q_g|f zA1|IO(5_xx59)wLdBMpqm^#hHlo35k^I}ETPdz;!aiYQ09^em=4_9>!BKzSV_g50c diff --git a/packages/two_dimensional_scrollables/test/table_view/goldens/tableSpanDecoration.horizontalMainAxis.png b/packages/two_dimensional_scrollables/test/table_view/goldens/tableSpanDecoration.horizontalMainAxis.png deleted file mode 100644 index 6a04b91e480abaaf9913680bb49e30c53750d904..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4499 zcmeHK{WqIg9=|~`9Yx2sWn03uhn<7*($Taup|+LU4%(`hmbBVhrU+UgnTRB%)7E;) zbe*Y=w@kM!72>s$DuSYEhfq{Q2yL`p5(E(;sbrtb+5H#x?CEiTdG39_pZobf_jAwl zeaSrOkKVTR&szZi+kB57Jq>`aH2^xHhWgN(f|T?`=mASQjrImry?bV%gOvWs90<4+U+1 z|H@j|o7DEa(*PKmz+6G6fy4JC(3ZH}+R_YOc$k#9d?(j7V*%rUVqBqMH=6EJ?q@Xussxt;z#@3lp6^#K(5N_RhfR!&r$Un^VN zhXdv~orjmFxm=2na6+iKpDO7b$o#Qdwb-G^H1XjTt%b7X!`L8Reg*TD>;hgnVhYh` z^g4zfLClW_)0NNdVnrV>2f2BoN(eHhybQkn;L8`>gg9lk!JtKqR$68$B{j(MkSrug zG?~lIoj8S+z1}kUKyX13;SL;(b@t80-T2mTKT-3LQ%Tov}rN>BgwDn)qhnkE;6z#$Dl;(8GkH&@(8saTju z3}7DoajJbKMp8gga+U1q+&5Au3L5ErHHmBHjW21uEV9S8P946-(b&_FKPIa16XUTe zI2?FqDl^OrIfWChA0bHDjeLWzPiZU!3GcLUDn4 zHB0e(eKGyqp&$x}iz#r*6 z>eZ@r1H<3n<~1@D=BC=n+32wJ*U6Y3lfPHnYyaoXod05z2n@ts)&nkp@a{I4cHXghu(wOJAA3Q&Z(_C zqtZaz;&Lp(Be9k@l++X*qk$FL`{Zj8yf2R5YYw@>LI` zeX=0LgCkTUY7!!(BKSb^;5O8(MQl@a6!0>JEV(wyw1bD^@SB5{Ty2u zh-nA$oULRAH!<~(JCWK`LX}Uk(^8x* zaD9-ct^lghZ<+k?AinxTUow[ + const Offset(200.0, 0.0), + const Offset(200.0, 200.0), + const Offset(200.0, 400.0), + ], + color: const Color(0xffff9800), + ) + // foreground column border (2) + ..path( + includes: [ + const Offset(400.0, 0.0), + const Offset(400.0, 200.0), + const Offset(400.0, 400.0), + ], + color: const Color(0xffff9800), + ) + // foreground row border + ..path( + includes: [ + Offset.zero, + const Offset(200.0, 0.0), + const Offset(400.0, 0.0), + ], + color: const Color(0xff4caf50), + ) + // foreground row border(2) + ..path( + includes: [ + const Offset(0.0, 200.0), + const Offset(200.0, 200.0), + const Offset(400.0, 200.0), + ], + color: const Color(0xff4caf50), + ), ); }); - testWidgets('paint rects are correct when reversed and pinned', + testWidgets('child paint rects are correct when reversed and pinned', (WidgetTester tester) async { - // TODO(Piinks): Rewrite this to remove golden files from this repo when - // mock_canvas is public - https://github.com/flutter/flutter/pull/131631 - // * foreground, background, and precedence per mainAxis // Both reversed - Regression test for https://github.com/flutter/flutter/issues/135386 TableView tableView = TableView.builder( verticalDetails: const ScrollableDetails.vertical(reverse: true), @@ -1380,48 +1534,43 @@ void main() { pinnedRowCount: 1, columnCount: 2, pinnedColumnCount: 1, - columnBuilder: (int index) => TableSpan( - extent: const FixedTableSpanExtent(200.0), - foregroundDecoration: const TableSpanDecoration( - border: TableSpanBorder( - trailing: BorderSide( - color: Colors.orange, - width: 3, - ), - ), - ), - backgroundDecoration: TableSpanDecoration( - color: index.isEven ? Colors.red : null, - ), + columnBuilder: (int index) => const TableSpan( + extent: FixedTableSpanExtent(200.0), ), - rowBuilder: (int index) => TableSpan( - extent: const FixedTableSpanExtent(200.0), - foregroundDecoration: const TableSpanDecoration( - border: TableSpanBorder( - leading: BorderSide( - color: Colors.green, - width: 3, - ), - ), - ), - backgroundDecoration: TableSpanDecoration( - color: index.isOdd ? Colors.blue : null, - ), + rowBuilder: (int index) => const TableSpan( + extent: FixedTableSpanExtent(200.0), ), cellBuilder: (_, TableVicinity vicinity) { - return const SizedBox.square( - dimension: 200, - child: Center(child: FlutterLogo()), + return Container( + height: 200, + width: 200, + color: Colors.grey.withOpacity(0.5), ); }, ); await tester.pumpWidget(MaterialApp(home: tableView)); await tester.pumpAndSettle(); - await expectLater( - find.byType(TableView), - matchesGoldenFile('goldens/reversed.pinned.painting.png'), - skip: !runGoldens, + // All children are painted in the right place + expect( + find.byType(TableViewport), + paints + ..rect( + rect: const Rect.fromLTRB(400.0, 200.0, 600.0, 400.0), + color: const Color(0x809e9e9e), + ) + ..rect( + rect: const Rect.fromLTRB(600.0, 200.0, 800.0, 400.0), + color: const Color(0x809e9e9e), + ) + ..rect( + rect: const Rect.fromLTRB(400.0, 400.0, 600.0, 600.0), + color: const Color(0x809e9e9e), + ) + ..rect( + rect: const Rect.fromLTRB(600.0, 400.0, 800.0, 600.0), + color: const Color(0x809e9e9e), + ), ); // Only one axis reversed - Regression test for https://github.com/flutter/flutter/issues/136897 @@ -1431,48 +1580,42 @@ void main() { pinnedRowCount: 1, columnCount: 2, pinnedColumnCount: 1, - columnBuilder: (int index) => TableSpan( - extent: const FixedTableSpanExtent(200.0), - foregroundDecoration: const TableSpanDecoration( - border: TableSpanBorder( - trailing: BorderSide( - color: Colors.orange, - width: 3, - ), - ), - ), - backgroundDecoration: TableSpanDecoration( - color: index.isEven ? Colors.red : null, - ), + columnBuilder: (int index) => const TableSpan( + extent: FixedTableSpanExtent(200.0), ), - rowBuilder: (int index) => TableSpan( - extent: const FixedTableSpanExtent(200.0), - foregroundDecoration: const TableSpanDecoration( - border: TableSpanBorder( - leading: BorderSide( - color: Colors.green, - width: 3, - ), - ), - ), - backgroundDecoration: TableSpanDecoration( - color: index.isOdd ? Colors.blue : null, - ), + rowBuilder: (int index) => const TableSpan( + extent: FixedTableSpanExtent(200.0), ), cellBuilder: (_, TableVicinity vicinity) { - return const SizedBox.square( - dimension: 200, - child: Center(child: FlutterLogo()), + return Container( + height: 200, + width: 200, + color: Colors.grey.withOpacity(0.5), ); }, ); await tester.pumpWidget(MaterialApp(home: tableView)); await tester.pumpAndSettle(); - await expectLater( - find.byType(TableView), - matchesGoldenFile('goldens/single-reversed.pinned.painting.png'), - skip: !runGoldens, + expect( + find.byType(TableViewport), + paints + ..rect( + rect: const Rect.fromLTRB(400.0, 200.0, 600.0, 400.0), + color: const Color(0x809e9e9e), + ) + ..rect( + rect: const Rect.fromLTRB(600.0, 200.0, 800.0, 400.0), + color: const Color(0x809e9e9e), + ) + ..rect( + rect: const Rect.fromLTRB(400.0, 0.0, 600.0, 200.0), + color: const Color(0x809e9e9e), + ) + ..rect( + rect: const Rect.fromLTRB(600.0, 0.0, 800.0, 200.0), + color: const Color(0x809e9e9e), + ), ); });