From 0de6e29866f60ae0b81f27624f14f31a00986d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Mon, 10 Sep 2018 10:00:00 -0400 Subject: [PATCH 1/3] bump glslify --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 686bada9a20..4aacd14d327 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5172,9 +5172,9 @@ } }, "glslify": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/glslify/-/glslify-6.3.0.tgz", - "integrity": "sha512-9VWypdkvL907Jn37QcCZXIHpLbmqs+fjnmjNszSFc+5ztmsGFzcknjCgeF887+xxfx32oGrgN7xfkSwa1D0khA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/glslify/-/glslify-6.3.1.tgz", + "integrity": "sha512-3Hy85N8NmpDprwAxZaOC9k+DBXEwblVZ+yHIyt1QYg5dIrYaiGorz2WWBRxdUzapjDsxdhQ1ad9GSlIebxeBmA==", "requires": { "bl": "^1.0.0", "concat-stream": "^1.5.2", diff --git a/package.json b/package.json index 7b1a6d52425..57e263f7894 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "gl-streamtube3d": "^1.0.0", "gl-surface3d": "^1.3.5", "gl-text": "^1.1.6", - "glslify": "^6.2.1", + "glslify": "^6.3.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", "mapbox-gl": "0.45.0", From ee17d2eda2ba4af8b1558336370020d85bf2e279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Mon, 10 Sep 2018 10:39:46 -0400 Subject: [PATCH 2/3] fix #2765 - bump regl-line2d to 3.0.11 - which now doesn't skip over line traces after non-line traces - update two gl2d_text_chart baseline that suffer from this bug --- package-lock.json | 8 ++++---- package.json | 2 +- .../image/baselines/gl2d_text_chart_basic.png | Bin 20211 -> 20168 bytes .../gl2d_text_chart_single-string.png | Bin 20448 -> 20406 bytes 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4aacd14d327..a17da6327a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8861,9 +8861,9 @@ } }, "regl-line2d": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.0.9.tgz", - "integrity": "sha512-D3ASXgofHVcdxi6qfQRJ7YsAVHkK0i7rkKx9qwDLYoZ96eRyyFMDb1zA3ulrmarPnb/U2G7EfsYQDU3V96EP4Q==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.0.11.tgz", + "integrity": "sha512-nf0Ftpf6boR0oJ24Gs77J8pQE0wet59T1TkrK1f0TWKJgWgRXByxRHDD92m/KZ2dpl+XTvCORk2NRqitSJGwWw==", "requires": { "array-bounds": "^1.0.0", "array-normalize": "^1.1.3", @@ -8872,7 +8872,7 @@ "earcut": "^2.1.1", "es6-weak-map": "^2.0.2", "flatten-vertex-data": "^1.0.0", - "glslify": "^6.1.0", + "glslify": "^6.3.1", "object-assign": "^4.1.1", "parse-rect": "^1.2.0", "pick-by-alias": "^1.1.0", diff --git a/package.json b/package.json index 57e263f7894..2a6a8902994 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "polybooljs": "^1.2.0", "regl": "^1.3.7", "regl-error2d": "^2.0.5", - "regl-line2d": "^3.0.9", + "regl-line2d": "^3.0.11", "regl-scatter2d": "^3.0.6", "regl-splom": "^1.0.4", "right-now": "^1.0.0", diff --git a/test/image/baselines/gl2d_text_chart_basic.png b/test/image/baselines/gl2d_text_chart_basic.png index 93488811117ffca684f39444675a92c0adeff320..afece63c14c5ea96522119125699e1a304f3bb24 100644 GIT binary patch delta 10296 zcmb7~c{r5q|MzWW-xA8$N~H~T7en?`D&#IjnUEA&##F*ExTrxlp(sLVL&Z>rnV4ZR zlO?-k9Y$BSvdv@}%UGUs?)&~ezwdKA$MeV2aZJo{US`hgygujW^LoEO=WLc>eU{)u z6X5&ua`HuN^50b^6lEs>}K&Qp!G^4T7W4p zHBtFWV0$2P?zdbaz(cbTBg*C?h!<#RI8j3>`bu~%U61Lp}-HOM|0WW`d%5z6e-g# z!zhUB-ezv{xzIt;YxLPaOBI!P z>UltZ3pZYG?PYS!!elQ*OrFiVeGX5K+ROx`45dI&lNlbrZJXtW}@lmk2 zV4WX}Yf>wIZKE2M7>_)5n8Xe8vgfCm$U0WdBwb6o=4Rp0S?ucTvw84 z{o_&0k-T%Z_9kEdl&X7|c$agcp0+a6*j3=9$Go2AQqmBs9tzbLm5-`WMp99Q4*BER zdn~X871tZg_2?+Gp}nn<9LH0%l>ja3$f2TfDKX52;dmoGIs#rSa9eFCs#+eOTpG}I zspwJ1O}cy3KKM|{?JIaHa$9`^+$?_P3KH+6`FfZ0F>Gd}_WOPGeRAhol;l~@zWbCQ z=*$+&{cctLwNRp3W|qE*0@a-nGsz2QOx%^!eSc5pNPTDfD4lZc%O)nYzKT@KFB9JH zO6{4h;`vJ|OdLpO1+}pm?sl89wmgAu&d?9~Bq(|f>4+`dUjOTD zes+f1==-x4q$A_IaldPnnbcr;Rvcv25)z6>YJUvsBc$UNG6z@k)Ix?IabwL_UNqyB zVRZfhgo!krsri0;BZ~6dvGAh1g7%rxMqNtN^8ADs(X+WkP_kam$?=|$K!P>6|_>8hvds`!*RMWh+SJp`e zY!^Ivt=rO9Z98?o1xy8La`jG&(HK7g{5{i9S79+sba`peQ1rUaNz6kgCv^O6zF+m- z4MD$h(>#BKcGw}WYdmLq=VwipcASZqz$_a4^(XE3hrezg>v)x()J-Aql z+`Hq`TNH?xu63y5#wbgA!ENz+mlpMqXH)&S0Yq@E>?^7m-r!63|!4!=VI19X{%Eh^vv)VMQGFaZ(_xx`fW{>h=?Vr)^;2|O_uP> zMMDfzdB_(`ja?OEEiKOq^?JbRI*@~2&07KqqW5R}EAsea6>pjts}a%T8b04SNr|#I zU!AkXS|_TeoBnwJyHyQSH3YUvTKG$2+Zcvj#qVfN7w7Kc^PRh>^UaVPW$no?@^+j8mA?hF*0g><34$InW<`8wyE@k z45t^-0koNhef-aZAXNSdtnZf7@u?Z*!3>Ha%*ch)x=7Q1hl3!!Anoj-h3UX<7q7I- zw@-14d{GO!bX4nv5KK6bh7Nb0`%63fJ;&#}o?oZ>j#UWy% z^@A<$v1&n2`E`LefpG_$a6*b#78YH6u6$`Ua|+5gUwvD-%4PN*WE{e4=Y*Anj~>c- z`%oa?KS6+wTAz5y4@J?BOn*vm8f|6d-#GnuV*ZPAAx}9GBm3OE`MY-_#6^=j-?Xz& z5%SiFJ4q6NpCq(&8baR9(WglFtyQkQiZ^I+bB^EsE>Mt;n!u6RsXNT_Bv(I zkV?F%S}vRtsb2^cy|TwLqHz-ha^LF0AZDVwn9SdEm%OsBuP)Cs_qOkG$m{uXvV%HL1Bj2y@^0Lz!kFv00p|*%o8& zkj8os$b6oaq4Omu|MHqt9h4_OS|!Gx9`u0xxRbs7nwA%(94LS%?@pdKmZ76)wsDhU zuuih)Y9a_My_Aw}Uyt*>m$}GG@^jlk5LhU?wd-x>k<4rhE9HW00 z9pZ>5%j|jFAxuZfbXTY;R^#wuY;kluTP=c zr5wI<-dHVK>fiisfiMm#oM#W3o6iezk6|SvFLr=*sxO`QoFvD(Ytc1#Kn!DdZ_jfb zJXzqrqPh^QPwaMs2Iv75hrC++=C`ss3!G4`*``FVaAh6mYw^l@ti$3F?8=3`f3cqh zw0t-avi8&3-1*Crk#~rQfgjX!1+Exxe`Ot_4c9-Bzex6X;rgFV({kozZ?(wiQDO3LO^Uk@4(y4FElFDr(np&! zy~26iGEK$>YKt-3gh!$Aj1fof+)&IPd$x0v7@ZO{)z`3gR_B&Cq}ta+f4rM2$2zPR z%W3o>`wz&mM24j4h>dP8lpw;jKzQ~9bw=T58=d0QxtD3UXLYg8d^*oCZ1E=Q{gtTs z=>cY?eS0*(fWz&}s!7%=<0;3tW^qnhZ9P8`V5{!^#$M@oFkpz|3h2S1z>BbSO7DT4 z(leo-<*ofJ!LmQxz7YK(d6Fboi-&H^qZMzJ|*M$+7>I+<|+V=c|BGuel{&KT6Ve7G77 z>gm8;ky!HE7^$sS`DG+4m{lIKY^N#+qlH|d=HTO4U-dszrnXV-gbJ6Y#W2mnJ}*u2 zWO1y1PZ>i3Bi)1S6rwXXS2?pmmOPT3muZE~JaKVCSd&_onE!TEj+Mu`P<4oo3K3aS zvB1vWa_EtSFPz*1C5d4of+TR;sSRV;b;RP&DU+{1+unYDs&!iZ#~d>9u${*WRBm6SSyjkCo|KV13nENtr1UVyZ%B zH&T=j?-49Wu{>-iNFpX3mfDbVK*3N-H*ec(0Rc^cQ^zdN6In8VtW6DSsal@ZptZY95Klf&eWLzM{O{dw zL`PUIg4pXxf>t~L&OeFG;XxG}LU%$vLwWo}G;F<3={rsrZa%?+*JY={C< zs3$|;x6rFKyXTC$va5JSvtl)m(dM{rf=ua)1-IVu zTeQ8SBC5I2Z6Ql+Hv#3fGUOPtIog2#oo6`HNH?816V*azA$PH_Wxh^$a^DsSQ(SR@ zY{{7dSLXQBsc^PGZIv5cRPaho3J%;+1rmnw*s}n?;rd71-$`UFitzz@v2*YjaUQO^ znbo`Iws-EZYT*$fkUZ3Q=UT%U`OU5oVT}&ZWW@bm?|2(i9Z`%M7;USfGDrOE*D*w6 z`@!Y&gG&ySXW1#6tpwnNo0ls?%fOBfF#rk4_{V*%xEHLZvvf>)fM{mr`kGtf%!iI9 zGbA}(s|3>wf(lwQf|srI->1RjJMkT;xXPfVku(%Y(xf-fjDw4$)lEKrzR_oP*v-aq z>+)Co2b|Qzk6#t=UM7rquhM-9FG^FisJSl)E1$x2E{(_^?iApslkuPv*a8nXZn`|H zMBE7%h9^6(UC&YDD+4I7&YC~=8H{b;?RZlPPZs()b>}pmoMqv3M+Hyb&Y8O7{P(+? z;GNLV4cVJu9XU^&x&(~2@0-Hu;>qD5J%Mc;L5;M_v-bWrYlCjytG)`DT>boi@v&L<42k zPMg#okWy&B3^O$}SB4N(=gK+fJ9aR2N12w!8hMtQVN`-F0e-d z`N8PnHJx|Ci4N)@6Pl2Ys~NE?ndh(`3m7>T$8=42qtxzqfr%X=U{oC2JY7M^oc>*> zL7ph4vAPN`c>p`Zf-C%cyr8%x4=S~EWla2^5{y)*j=RPjYf2{`N9jZd57iP|&6t0q z=+baXrprd2vMo@RTW*|+ZN#l_gtLwWzEi_Ze&F^8w2o9jHqM)3bt1t62z*YKeYC)m zrW;>x*laxgacGinVfYr6=QZ<`VI8CTjj~A`$Uv;Hex}R6LUEsC&*#4srb-%hi6Ha$ z0_G|il(9F2MG#2;XD(Pcnmb8s^%M$QTN?8^8rHBUzh`A>)`cI&*v%dzEtM*E!tJ7qOE+;`Lf&vc}drHNPFC9K%lJ;8?f?@EAUbYJ{~xy5+;k zcJY1_YoIg)>Hsx6+TLfUyhhfnwDf080EJqzK~kwFH_g=tzVsr~zv2ts{0+Rs>{JnDy3c3(*HTcN$*th299{BE&L z(38iLYvHgqXP^g4y`c^g_Sm*v)J$^*!t9lTSplO!1w^8LKaofZ>TtnLm2p1_%U(;; z#ydUCQ48*GFQU#gOw#TRM*zd%OZKX?`QnTO=Hb8r?;i|3MOOi)p*|mJohNp)SB-D9 zJ)b<7n*cdK6)!%)V(H4e>b)HwpJ7pW)0E<@TeVxeC{QqF7qzn{jn^cG@xRl|{zw@7 zV=#0=2VojI=cxS=WbXa8o^E_y#_)uvk~OKoRccbd#RZn@(K3fSEbKUlG`FVN_RheyT=#tvJco0 zc`zb#*>_?M=(cknev5$U8TE0@7iF2c)YXF_GsBZ8Wp1Bu@uZbErfMlKaH>x~Q^Ms| zjUtz?&@l0r|5a#x0PsuDRPsZ1rnnfCe#mQ20@eG=Hj{<6gqKVYMjnLGv~Iw`SYHbBrEJGB@+R^7+1e5b#fW zU!O`Tk^O`h$6zyePLh{=XW6g|pS`i4;aCmG-)(i=3Dm2+j~8ye_5|Ko^CrKX)mat| zMyb&Cig45AUfd}C)>T9mEnsM0SW?hps;KKcC=XqS(wZp^ICc!i`>81|$l!s*fJiG%c9zKPg9+F7 z|IU+R8ESP(;GOi1+y=#plTv&X=>-{=sTe%6`R zP`juvm$s#t8!4w~T8R)}BNqgT2NXC$5VVccHcz3s~N8}WAyPJ2ftrm zbGzO;$<^gxQL3D7>d-twlH*-nzHydSCZ}3S8T3h9f<-2~$7Q+b2`G$(&$$8bAzbVmC za`hSN8)1U?feoe693_Ddbf6JEl@$IX{?I@=lWw$cM^UjKnsdy}e z!y)Ud3&q1L&q_^%02$Xul!J=m^soM-1fheb{Rb*8bO~$gCPANSbCeP0vu9c9hPQDF zVlr|OqYJ>EskG0^Dh9U5lV`{$Dch+sFnTNZzPy$niyG2J#<-!%d@k(lrhj|upfh*y z&d;{fEv=^-wdC+f+f9pg1e4ke>P9PVQpHmwW>JHIVel!DyK;fxfjTCAdQ$pLCb)-# z3HS(ERb8N73|*LZsqs!R(xwB|6DzCXFR8Tu{a!sYb?=j->is_3Oujz!C%In-KZ2_G zzk~mtXX((HaU5N@DihqDZ6*c(qwHWZ1vnkesrxS_rySh63qta*Gh3bOFz{-5<`+k~ zS|gEZ7GAMIT&A^Odg~vbYZDM&z}^a&oy#-?3QUBW!H(l}nLOXc1PV;#;_QGtD?{|# zF`O7if#U-_VAMUinbJtk=!?7$vh;#S4j{L(sKbZ3R#^Sp4IMk_nX%5{Tubak%5keK zO{%m#oV@o0Hus0m$4hv!`?Yh%n$&Z*^uO(=Gv$iX}7|J*G{pBQ?5F`BbCZ|%CpKZ5U`Q2s?d`?A1(=l2VMsBz{Q2>0pfbq_q&pl&+o~^8FZh+rtQCU6;RcB-cV^!Bq-*! zEbNdpk4vVhnVN0rln08$W3Ved{v(F*8zsT_qkrY+_!raGD$wMCpsrjSWyBxX?uV~V zxRG6gdULZM{%iob%2fpV8@rI)fQ1@mw^ER_dE5!N^**pkFqG+v0$_W60gC;+{mH+A zYw+YBk?fB{GLpz2i@%2uw)auMPs}%n;PI`~86aZj89ul5NTaku}h^ zwAgdE>3#sevlC^EEMC_vS zb(u$!sX-{)Uzh5x4_wqzm*9awem^LcY?#=;8Q|cau&I&&Rt~uHeB1P^fKD&Zv9b<& z#DqhO3=IhNqqh&=FqeeU3LGFg0+ z3OpDV<=yq$EG0l2ae9BHB3&2RoO_4vqp_y*-yBF+s)Z=P!X>WDv`P)!>9FI^w5QiA z2MtWsYjd@d>jL)KCcXT^UT9!qwRug?7Q%;gCIM&#=oIuVgA>Xg01uQ&pYvK62u@;w z^>Qk@oNgMod3p%U#1QxSg;TNXeC#(%V*r#IVPHjJR+a(U*#I9W&IVSjHw6$N*$Ds6 zJa_KMG3>sU(vgH<&|&KXg7~3nhMcQqL{R^&Ivp0>WU92oz_bohRu8#9fCbMhEn2oP zS|bBi%pP0)p-ihs=_q>92pw9$81y8PoE2Qzl?b!vj2!gK0;=?>KtARaAn$ek4+QbzF_yH3r+BNNjJkDTLY^A>?eLv<@F8D95G)3^Hlq;cN26>dcPyfBq)%*aW80~EuLSrkC;*5 z8&YV{kqvD-auJ^WH274{LQ+6=3rDjbqZ*kmT6 zunVHX6Sedzgd1EdRiawe>^|FV4=p=L4)%Wvo^cElEWI5H+8vFruUj*hQ#XP+n1!iC zc=Nj(psR$GVApzK?{Q+rA{dlI!lE*T{~ZI;Ns7_M^HPjAq=;$%9dfL{q;smpX~Qw> zb{Td_%QK^tvCw@L&@r%)J|S_=YhRs-A`=vII%?1_?&kwqsiR2Evbr!#z!)?K)w((R zrd}!IX;C|8TEm0zNMuDH8+2OCUgoKQ_9)$nmnF~YvwlpmObRHT0R?2H$1(gGo;)tnU+<+br?*jGwg!Tt5 z`aXGw>0R=y{+~WHEjo&Kzt2w&4jfjla^4ZverK^{k@Ljjf+V|4w(`ng<=7r(0h=2% z)V-EAKlmZmL-Fw&;L7put<^dkVpN4N9eNXqG;E|=mHl9?EM2_}d=0R6`yE4TpPpV1m1fPKTZuSo?9?hlWzEWeSob=YcPJ-L3w_uHFrTpXjjB68=W>vcT;jh6Cn7BzMAq2kBtQNi$v~%`IDr(75uP09 zoMc2|1}GQm#?;s4v$cIR>nhS_PFf8pG;|MYd#-8l7$^v0T^(Eh{UV#od2B!O&kZCU z{`N;|UWP;@v`teB!`c$>k0m`oy;<0A@QW8ID^ zuKVl+(Zs@i7J`r+66Lt@pVKJ(gDF=$#q`ny|MvlvNQb)Mie(S%Et%&J$|IZPY zzprrpfMtko_iWC%-fA-YVE$J}UCWV){Y;>WK08`cqJXPla)poBWxm~g+GfASjc1z< z5kN-+^$F^I?|v_wOUx+)XCnNT2lJo%mxx%;GM*cJ3>Q@YaaN)BCegOf!gLfnMg z%6rh#dG3nBEIZQgD$SGtxkcX8Shr7gK5NH9r;XYWdD@`O0Y8ORGt5V zEVOtp3pD5X4f8%-%H-8;-PQL*nE*M+0-(yUdw}AeT%IUq_k7xPaTT~;{$n{%6(95Y ztcrIs>;S7UpdLPVmJeoj*(M=C(s?#*$>huEXWw%no9{^4QbIID|KbbqAxJ*~Bx?;XqEo&e?9b7f5W(*c0eNlX5i}NZh3*F#z-Rh9} znn%|XI8AV65ZueuyMm&=t2^~*DwNJ#c*cIKFszU_+c`x9#XpRI_2MVyg zC%Z6Od>Q~Qc@N)o;Twbg85{|{^e&{pH-?(KyF$Lk#|4)?~>y}!Q#x5H<&%eng? zEWO~*Z+N;n{@d^*fj&*X@N?m!YhRLgDn(4k)U|{2MiiNo7QtV{ivJAaJF3Od>I9d6 zr6Sf>YdShp)%Gw91)=Bl?{##ogaPA$n{e?P%MI}QLt&gH*!J&wu z1h5W~VC#0DW*&sm9Si7rmc^iG7lF!4J2ijL- zp~YC+WV)6NtkK3vMe3;u6<2bdxxc0#dOh8Yw^jxAnI3N@jrJ^j%XaGO*6alwx7Q1u zpB2=QEi9EICadAfyqHgPJ~9BXKeJ`N?VK)_@#l|*eZ{4~vAmv?5$)z9Dy{N3TzUXV zIA8+aG>d$fwq9##wHU$|*}qcUPi@`RJh+n3v-bv44$G+)C9;FU0HT+$1EmJv_JjTn zZuwU}nvWXKPbnU0rll!oIE%=+5~zLSq+Cu6?{L_g!z)6F>;Y*v#MX$YDR2UU8+eB= v;LIW$Y~n4jPE%v%>q|;R_9?cAqK5kGjBeXIL52e0->Ktgjujofa`%4$hZ1iH delta 10300 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 diff --git a/test/image/baselines/gl2d_text_chart_single-string.png b/test/image/baselines/gl2d_text_chart_single-string.png index 733e3584811b9b6d46731c80238d8f87f79f1c35..bebed9f57f388f319bc5fc330ee0e2c01094c914 100644 GIT binary patch literal 20406 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 From 045a162ee55b059ad37e89e339e0213dd3897d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 11 Sep 2018 09:43:08 -0400 Subject: [PATCH 3/3] fix fill ordering - regl-line2d "skips" over "undefined"s, not "null"s --- src/traces/scattergl/index.js | 2 +- test/image/baselines/gl2d_fill-ordering.png | Bin 0 -> 28212 bytes test/image/mocks/gl2d_fill-ordering.json | 40 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/image/baselines/gl2d_fill-ordering.png create mode 100644 test/image/mocks/gl2d_fill-ordering.json diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js index 8b2b8b047dd..b7431d48648 100644 --- a/src/traces/scattergl/index.js +++ b/src/traces/scattergl/index.js @@ -431,7 +431,7 @@ function plot(gd, subplot, cdata) { if(scene.fill2d) { scene.fillOptions = scene.fillOptions.map(function(fillOptions, i) { var cdscatter = cdata[i]; - if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return null; + if(!fillOptions || !cdscatter || !cdscatter[0] || !cdscatter[0].trace) return; var cd = cdscatter[0]; var trace = cd.trace; var stash = cd.t; diff --git a/test/image/baselines/gl2d_fill-ordering.png b/test/image/baselines/gl2d_fill-ordering.png new file mode 100644 index 0000000000000000000000000000000000000000..7b71d7d2dcb0e4a61a0313f7c959bbe20e2efb34 GIT binary patch literal 28212 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
^IWs%aPTt9JI=6e`Zx zgal9}LPM&VOrt|{Z_#lJ;}xjy?IP!g+uzO>ta3e*YBG_VhJKux%wBad6}7gZ__Et# zXO7-JXifCY$w-NGj_Qa#-Xn5lgr3-3f~ivwjCn9dJ5bZn`H;UO3SLsYnlL4$Y22scs7)hd^$rTRQ(sq-2eex)lz1wVuh|p5BWE_PFv(8?0$DO<&IducNkD4B~ z3hBC`gyX~ksa~Ad^7pf?DeWzAR4MIRQ#EqlD3q^GwB|^|=aQZ=${q8J6}Ow5P~6`C zHCiPri_20fjgOoAmX!%@;0Y!{zC%=u*1L?#Nn3t6Uwm7 zHjHCEQoG0!m%nyAY!t$dd!jGM!AOu{y>OrhU4^HC?giR&4^p*RB);Q;*Nx(KeB8^9sNiW66%O=xxEGbDAUY*ek7XaPU`o~YcLHLPNi1&R?;1j zo&s z5rf=cSfZ{|5@v!=$;CehACVTbc6QVGR^Hm;aJ$(Aji1dc^O9Kb6lf+&_>OJsp6a%S zBim$lU>f+*pmwK)uuD*reUG&T3au3GS%Wx7z z8~fIn!H|w)HC8ds?n=z!^`nURPU>3TV!KOq5%Xc|k8aB;`K#ksVS{sxIGIJ$V3~dkCY` z2#wkdJp=6*>eTgi3(_jO9860Z&AX9ZCQb8DUpqE6ldA(m6#BtQVfN4j_+L3DVfOMp zS0MC=Su9rM^SRn#dL8GQ65G5x>3GW7@uJRROiFJ1?OwR#=n*R0ouCf-C~(3VqQuSX zoe0>QW!I^NV{G_5G$jW5zAR>X-zHm$1z~tXrw&@%jhP3{Rhs=*0T8@@LR?-9@K~3b z!*%zM3PMZXty}tS<9pLW44QMz`?}0;D&VFHSkGgtpL@7$`8$ajbr5{-uXf+t{X-rh zaDzoi(5-V@zjx}gPz9$r$U2hxL%S<52*)y$2=_wSG9g131v(%Gw{ghuw_^$yTeZ<_$lb9tIAC9lY~H->%n( zmH?N#gV(C>r%y;)0%(@1jsM*3g0j*l&?D!~Nm%(0x!mUCfVH;j!S6pj&sET|>~n## t>*4QByvDwT8gKXh@I3$P!zD#-eC!!+?abqYZg5MEA9XlVdib|n{{ZPS=z0JE literal 0 HcmV?d00001 diff --git a/test/image/mocks/gl2d_fill-ordering.json b/test/image/mocks/gl2d_fill-ordering.json new file mode 100644 index 00000000000..49d491f95f8 --- /dev/null +++ b/test/image/mocks/gl2d_fill-ordering.json @@ -0,0 +1,40 @@ +{ + "data": [ + { + "x": [1, 2, 3, 4, 5, 6], + "y": [100, 100, 0, 0, 0, 0], + "fill": "tozeroy", + "type": "scattergl" + }, + { + "x": [1, 2, 3, 4, 5, 6], + "y": [0, 0, 0, 100, 100, 0], + "fill": "tozeroy", + "type": "scattergl", + "mode": "none" + }, + { + "x": [1, 2, 3, 4, 5, 6], + "y": [99, 99, 99, 100, 100, 100], + "type": "scattergl", + "mode": "lines+markers" + }, + { + "x": [1, 2, 3, 4, 5, 6], + "y": [0, 0, 0, null, 50, 50], + "fill": "tozeroy", + "type": "scattergl", + "mode": "none" + }, + { + "x": [1, 2, 3, 4, 5, 6], + "y": [100, 0, 0, 0, 0, 100], + "type": "scattergl", + "mode": "lines+markers" + } + ], + "layout": { + "margin": {"l": 40, "r": 50, "b": 80, "t": 40}, + "legend": {"orientation": "h", "x": "0.5", "xanchor": "center"} + } +}