From 50d1fa595b94ca16b485e748b64a4aaa6c44eb8a Mon Sep 17 00:00:00 2001 From: MiniPear Date: Wed, 12 Jul 2023 15:14:50 +0800 Subject: [PATCH] fix(slider): index scale by scaleKey (#5291) * fix(slider): index scale by scaleKey * fix: cr * fix: cr --- .../step0.png | Bin 33367 -> 38885 bytes .../step1.png | Bin 32112 -> 36823 bytes .../countries-annotation-slider-filter.ts | 13 ++++++++ src/runtime/plot.ts | 18 +++++------ src/runtime/scale.ts | 29 +++++++++++++++++- 5 files changed, 49 insertions(+), 11 deletions(-) diff --git a/__tests__/integration/snapshots/interaction/countries-annotation-slider-filter/step0.png b/__tests__/integration/snapshots/interaction/countries-annotation-slider-filter/step0.png index 810449f35e7c43e7f0a0baab7daccca49a38473f..bd8bf3f0b43c250b423209a9e92f6ea3a57ae7ba 100644 GIT binary patch delta 22500 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�s^Jov*2M41ai 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 OdZ=TdU3S;@`TqbFRsj+K delta 16938 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 diff --git a/__tests__/integration/snapshots/interaction/countries-annotation-slider-filter/step1.png b/__tests__/integration/snapshots/interaction/countries-annotation-slider-filter/step1.png index 9c4a66325ad4c20e8e123bf8e6f8eb0a29536bc1..19f76783611937ef0a016b91e04864093bc61e6f 100644 GIT binary patch delta 20498 zcmXtfb9mfsu=d7ioHVx4*hXX9R%2VgqzxK3PGhIBxpC6ib{gCEm-n3ST-WaYw-4qS z+%t2}#S_FrHe|J<2$0?W9FtJXLjrmmZF7G06-Y#>woWXe>dzWOd{lS-m$yX z-m>;>KhxV13yr>BpdUhP7x6rcI4R5*;oZ9g(`Ynam^$557C31{zvHIhs$@E)LUM(H zfZ^}dyO!RdK6%NiPw2$XCt?m|(JY3}+cV)stWl~V76~;;4fs+iVohuPWyx%gA|S55 zY(R>Ie2y!>qnqR9bA&P*#h0b8kgQ+7%WMl!A?785V35_m7W}MBUzL^#qi*VUW=imc zq%!iZcpxhaE(NYHUsAgnibP-_+zzA%09c8YtzU{#yoNtDC90ZHy51~0wht>}Fhqz! z5qiWckGrmg?QQ)(U*9=FInM6@-p6qqa8nZ?WlkO4vDxQUu2N)oMK-Kw?h&A!4KrQ6 zIL1|Sjddu0(umNB!K1;LgUAT`vGMW;PO+cjG`7;8fTKs2uX3t#Z(gapneeFLqILCa zEXU8ArGww&f}jNl%_KH<`Louo(m_{|ILvR4CB<1j>0_1*L&Kkm1#m#1txK=otKE@v zqc*Qgqadmvq?xJ%>V}YQw~k8d0d(0&);;y$DNCK54f^Wbs%xSR<=syS=q9+Tzsi7Yk_U(3Op-bA=25JK&u^Ims=?i#>%5PCaK+|Xsn9THaiP|>1cL+hz*Bg^l_k9du)G_xcb&T9n{94L6SYl7=&rJ%Q9!bkW2r;g2bv0#|LA%Mo zJ%z8Suz>88NV0@7-&#$!Z8|6dB`m*phZ%p&j!rtPcWSCp6(sG5KoM%i_*@0MY-P8MglX+tFl@|oAin{qe?q0Ej3i>)3v4QruF=SEONM| zyw*d!a>nQ#PjjPf0lR$FZ_AeqwtZi~U;CO_5S;(b*KhdCL`M9v8~QV(bE1p(G%QBeyF=nVfH?Sk<{o8CIzy`_sx$1hdso85_N^ zigSrFVTDBgFsA3w1!!*u+>Gx#e( z@VW7we7Uwaefk6aAWCFiJ5p)YM3dZF`O0oJWZGuF|&^s5{$ zRi47?%IQX8^afOf4wG9$Z01S@8L6olmBmtIwPWEL)Whw z&7XO`{5tTLzG>EQzhgZBz1IHWQ#q^tU=>Y-qgqUp4OxB&LVgcBrjN%gLj4^K|8siO z#`QNf42X^!owWo_43eznTqHLT9%PCqn4m$uDXIO~KIAtrm8_?my+|NPr1lTOT{Sue zGBl8jK%w!CZffnZ+>i6t){Ft-0fINC(H`=TME(@471PqRtW+J~!~Qv1@)#m#V+_$W zHCOWAgJe%6b{8%Lnf00_hecQ*n(0XJEkstYLYs_BhbpF2i9~V>^}!GG1Ux=@dhDg( zv{B2LI|w+VLfw#MbB!Ae=csKXBCe;kDH0cqJ6o8oc?TNfr3d_@g$5NUca?@l6>cV@ zj+X$?L*dBouni;7<;0`^zL)N}jta8I;jqA^<~EO$MCUB~tW~0bGT%SVD|w5ADIxQ~ zvrxkdN-Y)={mb@UUW-8?TLcXb-dcclDaD1_7HL!lgn!e7K*~rBCaE-7aWg8k(Np^%`79eVyC-EcdQ;OodJv zvv-yf1Zq9OO8A?98d2OsE%#y%<-d6y)KA}4OCG`xPCm+=EnKY?rIvQXU9?FUi-kx7 z%DN6<(evrkY*NiBW0gg)O%gPE>;_R1&_zKoSSBKg*jvA3iC)HuQG-~*gIUGa6tNGh zv>^vsptQdrP{lPrp>amDkrB(9Mv*P6ij9a8QG!7|m>>|)k4Yy672K{j|Z!=v^ zn%bP9p|B~%GJy!B=0!U9IlW4#6@l~zZW2>p5x;mz$+HVH%ekoC>x>z5O$d_H@kkI0 zo7Fj?gFwKlfWFG$T1FZRG?mRkTW~yAF$Mnq`j;_qb@%N zQz0Yv`D3z75lDNHlv_pnq{WPEtXGGYj+^F0|a4t_@v^<VbC^)b zgvyM@pD^?gf=yum7=OzLq zm6?y{)-~>C{zM$BZWND1a?>8@oDZq;%e7J8tg;6BmkBJbX{zgvvVAd7cUsUTv^HDM z>yL+-;2+}gQX&yJP~5k}1`gWE${MIJeQr)w{u24HfbyxS&VnDpts1NR(5aS~OFcm; zG+*U2%F&@ad#)9!6sIon%ug_L<-iVn-W+SY=_F2c>>&kOth9T__5q#8r&JSIda;T@ z4*vGP-+#)`7B+Sug%3po7;x`mYEiR_Kjk_rQlhNd?Ly^qtjDx>5S)6kI=aeSzZ-;R z`;=R$9c^R%3UsTu)^jgXgwMqebkLeS!VCVpoa2!zx@iafXH-1L7}1Z^0iQ6BVHLY= zmVOhWWp-XUL}VFju0MvU&M)y?*#%y7nzo5|=e$!Mnd1wDc`8H%u-%f`dXhS+gA6&d zwF7~=%1u+$AjWTq9-bg4vg^P!|8N+cM|^)xS#(j~%bLXnHAI|Q_u0BFbN>RYNbm|a z=sWFaFtOpnZ-kVIdgLcGvl>=h8g`v)p_L(uNl-x_d$En8(9g8%Cl}zY_6ausu3YXC z_S^Xlx-9%n-Adve81n(iEBn3mHah=|tV=xps`W{^)XHpmpvZ#c6p?br86(l`;I zi+M_^^L^-xDWpDn&(8~Ze4cJAC+(1Bw{eYwuJ_7?Oett;V)lN`PQh`iUiwWcLuV~* zETxb+2b{`W4)7s~7(5KtwbHY=;5=m<6AdAiH&ANdP!^q#zctZ|_%uxA3a-N&F-}q* z>v0-w%f?{S{P~E9MfP*K{Vq6S9(%D6{1F^o-R-kd=_d};@e{&ul2(N96ETPJQ%&F z0P;b|{%cy!ERUjeg(&EEfrIDPuhLJLEUb|E1=1ZtXgd=TF{uIc5FCUM2xL*h9xKho zEf-k!kYx9>26*ae)D)lWC86KWLd=WMnG<>Yn!h7LM z+Zy6eKgyGWmTLDpLwuVmYb}rckY+YGsSb2ZJ_~Bm;LdRKHKa8#71~tDE!}3St>{tM z%=F;Pc~rmNIaW>^3-;!z%GpwpD(k4Jx+^?}-WzTJ*CZW+W83!| zY@iIh%N}`AcQ7Qqh-}`BA@@g0hBeirKVZ@@tTflJ#55W1KRHXdo|3vR-sO0`_%Qb0 z-fSH(ZQi$^{>CXcH=laQ%2&lj#Vocxh4jnRF*}SZdLhlc_a&sUm$-JWIxOHP=nqiw zfYQFPIy4bPV^SPYO8_{+CdY?t@}Kb0X)pLhB%5GiBA|&yX|+_4@e?29BMtT%yuw1Z zkeA3zgI$C~N6GS*#lKgUN4#F-AdJ(%zC33muq_jTC+V){!B<3bT;>@d`prKBv!-VJ zK1j~A#5Z$9NTBn3KDHvIL-90Kl3Ar9YTiW96(}$U-Toi+8}PL(YNIytC)Mqs4$WSe=9hH4*0wAWKT- z^$UOLSZl4YR6`D(A0n#ibEDJ8;g+!FVSAcnCs25<7fZQt4H|%Y($jY&gO)(#;y3uw z#25mF4A5fjvQdZPNkf;G&;4r7Cm%{Vufsppq_G}xAYCfEL`gwrK8$>T#wbIo*vEbh+-!Q;ixF_AvmvZ@J4(JohBgoJSaFvkbp&1%g8yRT2Cb z>it53$GbM$=!iDuni$#%1@g$GC`;ehH0wm2XYJrgNi#d}oOF9= z7h7xNB4MN+Df)A8pC{!IQF%^7R9HbpSkoPIe_6f;4MaFFv+`7u4}rnU6S-!`56$X! zyHf^sw6ag)#5A&kTaJk3ZdnH|jPVBJM%dtHOgVwAuX$aCuP|H$ERenQh)pNqS=;c| zfEu4(d+o+DM#s9@_v>^qFv}m!ybn;>d>XmH(B%I*Z@nZylR%LB=MIxjKg_Pf!1^Wh>oz6ulnEc_R*00g z2%+D{fZu`uvA~?L@fp&F3UzeQO5C+P??wFglym z4jlgzvX0Opc`ZF$KSpI}t?B5*`B^EK@o$lccjBmCn;D(wpt*7jl|Si5dv{Ud_%92>$0@$_Lvh|r~%1q!w>(dWb~1kM-+6ljex>a0KP zwbRY|FUwlfYX5Ef(@LAIAMmz0+GE72-P|hFPLx^M9{yNKv`NBCSPQr{D1_E0e<8GD zQv}fv`)Fcr)GrGY#ACFS=qAPG-c)I z6RQ;1wZlue=`D1^M3V`1zl`5HaPnDHR#2_fB=-mg@%Aw{DNQXH^eEb zT}2M6A}~u));Z|jSWIp%pOh1s=qC&Edmy9#*2sX+wCVa`@Ee^8pK1q#&ak}`=XvBp zhk}c&4HXu`ZjT5-pd2wud|{V~^(R}Q7dM5uSsAnJ=JWB8a|6MleM!o~d~$ zTNdp97(S zg|Lqv@j-$WIaEewTe}xc5(<)%bkU+|OQ{^Ablfuv2}nTDn31Y_^|)@wF{nHE1WPP0|rpg`b>J{xFSctaRiyO)I}<>z^D8KWU-WizS_6PYC0THD_pFr)hAPA5hM#16WzGQvVLw*SR6I_k{-vJi+33)=JN2!##`O~zrH0z(2UbUoY zfOPT`RBk?p0?Cv|wlqh;EMw%`P5uCh?v1)bo`uf{4(C3#d+Q<%{*-QHOYy0;IS7$d zqzyv;S2$j&a!(c3Sw~s5A#&PU+6|H@{HoIkL%(nCH=`!`gjM1r73Wgu zY%cK#^aZI^5&HjZgmDM;D=uY@i3YQ3%m5=Ed%3c zDyF;6PDYT6ok)_=m&iwL>^7LiqnJ*qt%Z*6RS(fe$=p;_C+Ce(c!dH$#BYkeK(;ab zNz1KjzNw&JI?**RZE{8DOJ7WNv;BW)^dsarZb&*mFF1}t1;P}SG)O7 z=}o{a>0j|u46EMVJ-m=r+D@)jt(S}0)*^4f?O^X1i!e6GD;%{?f{+b5F$b3lL|eqS z80WBDZRtaq$x}`^{{y#s0bWmtq59Gmc1E|OJ;@oe+4WTl4nhoAKCq?6{^N3A)mdW?9UvUye~U%K=m0LaOpRH4ypM?U*i0u=PQJ$}uP zK9B8LO`SjRa_ovA7T#cyZk+}bYLesjNnH4Li@>b&!DYK9$k?mY;edFJ)FJ8@^@aYV zWn7t5G_4Wmdm_aG(U~(`9o}Xc3L6?E@(DQ)KMYSk z)a2`p#RRx7MMR)#1vu+-#M3I-*wBH{B55D(xJoW_hA_2^e0N*YYwzWs4L{yZj3@a6 zP6&dOkwIt<%V)4Ci-O${iUmh}RSRoHQ4@hWRp}JNDI~f+&=zAx1chp zoWHn;$0-7CmX^~KBG^ju2RM=Gx5IbHqTl}gw(VHT_=Br?)zibk>=W=LYL>V5xBfq2 zl6b$gSd^?V896<*d>R+Bm}n%@XavCTH&w^S>5%)N!V008t#C@{@92wqGhVwZB!0T? zHyK}v+cuZwnu0Npl#sqp)Vnk|7gw){3Gb_(B4V|-m0(Hqy; zaeqHQ7(jh9@T_U{It0!Y^zX*MRahzym|lKjZvS_ad6<=7@duWIuJ8_82^FBsE2_+Q zOsR0I0z8vwh=0007qw%M(Gqi$3ms>)1eiSSScM?E%15zENtd0~3}pM=M%io3al3nD zNdgz;R7&kWnj;g6#rAWoQsYnFM?&9>Jg(I)gI$zICYVxQx3#ifddCh07W5lwK!H-( zevhanH42$LPwQc49gm!#K;UBqzQ^{@Wezg_Z4$VqAfdoaux%BvpFhEsdG&+hoa9fq zF@dOZ8wf-Sk`WhG??*5eRawFY#?D+d8Q;~&#KhvQhKAbyK6*2KH^U9Zvw=5e_?uJz zDssk0{_ER`)=HKf0Kc_p^#o~t)kQKzIEl#Q zwl;c+!V%9>Lv9Bc)yfW8sAI;&<+v?#ibVa6QQu2{&OR5qO^DKkgxdSsjhw$1+pkWs zi(%sEizPy9tr`LI;IVJMY)DYA4>u+_M_xsb>tP2>(rVaOzSgpIA zw8un4BkKs6FoPWi0`}t#cm!uz_a%q>0G9s>qaaXXbee&YKI?7oN!Snz61x|bdR;YB z&U#Cg%yU7b%wy*h_3O1y=bas?4e?ZpbKCXQ{@)^*Q=nu8I?MLJ4gg4L^&6Zn1(Ai` zy(fplI3=5BYHV7qu{$rvBY>BuH!4^5X!nV%*4lkT;JC&uzEl1EeyTXRlhIoeLnUX; z%aWL8h-bg9`!MUTP~_a!I7g8_yMk`{>HBO9T+a(|uFF=eg4qxF9sY0?Az7ewRX0j`# zf$h~T;Nah9DhXXnj%lQ1ws5X#YX#Jt zc@~KZJTu#1`64DO5po~>I8^ID*|Qj0thLbco?B15^ewfWkfmRKm^Irlv~YhtwMeN2 zE_$58B%p5O5e14hDjeo;Vu`YN zw#RMnB9iCj?h)dpKMhCTe7_?1-bkK+Rfm(N|hl zv$@)L=HCE6F3Y`5ibC8lBlmi}7ISYr&m5(NmZ_3hU4<#4^lt-BD|S$pisJoEf&X!T zPT;8zhVdMr+_Kgs?G40ecT%=x+&JJK`l}f4eE!aA(a&~}HW%YW50GM^K zOEAH;+C8dr3`v|o1A>2fEXxe6FLR;WmK8KB`|fn;owCUXTq8)RL*LM$)Tn`EDPEHAnoc`NWjk_HN8w+Wius>*csg8fAzLNm*tHax1IrtRFR4UBM0Wt#mTqGztpdKdg050Fu5oLfOxAfMDyxLS{uk z@3nyciBcqSo$jt?*&k(DJLZm?@nHF?6s7+fCb-l}KTQZN5KfM3!^C1{2YRq#rxa{3 zd9coHHkjw_c)Xrt+Iw4<;XtG%r7k@9%pcngz(K~D)h8}hmY`&^KAPw_WUC8YH0`6P zY51!jHJShxAN4IRRfHCUW%WvWy}Ft#ae?dAo`fjSL4IZxTB*60|oI;NLK`yD&hTpW%j z;K@!SMkWHd60RqN%ys`X4}!}pI}Y=bKgtfVUXRiDlKM`2GIMK0v7o{4pY{aj)&f3) z27nd@7U5({!$JPy{ntH*%Sg4?YqzQPc9sI;^!VsjO+d_X5y>sCz4~7lPFO^V8Q2cz zbeyayi%`ru;2icY?89xd`0mwr;xuPiGkUPxFD{jJuFO7xrO5Faj?C`^!q*@_Ji`!9 z-zmF!`r;f@B2IO9HKo(!H#xgxY;PkS;Ax+q_~3xGmqnS9*iqwR!@9{oP9|;#Ta7x# zhP&e;vVj0qW?x$;x#@&te?c%f4XZ9t*xKV++;NS1XnKn5RU@ZqF#8C^WEYhY&k5(0e+t~#H4aAp@J$R@{eJGxEa9? zVdIZ(Ig5N2ynqk)VMV=iFn@(7_I-@YC42{lSH?Bsr##v-A-nn6l`Neru&|p4!AYUk zd(|{YIJ>)^xAoLFqSKYkYbAbnsQO2=+sE%j*l+e_U2~5oJ08Do%L4fl_|3l;Vev?p z5oalY`ylRe6)~j z&AdhsSO`Q@JjTWr%ejIi!Qd6zaan3o$l^E~DP!Wd{gI!J+I_py)I{)F!s8VZU#iQn0DT$5xp z89eLc`oS~23v(%%?*E03`5m@(FLn2ZHIG>n_Pd)KKf-==D4^rLYu=rrVx6vO1YPzX z-vb>kfzZeL>%SuQ)$uT0s=+v~0R&P}E~H7Ofdg*Y%!BZL_zeywX@@7LSMH-__l>P0 zL3fw>ZswwKw6pV8Tcx+uN2oDn$8AzNzCPHo03sdX-@bfMZP%??W ze{El#HxCL}4(oXeDOf^ClY=J^p|3g9VLY|Tsg1B0m+qjF6bX&urYM8eaa|F+?lE%_ z9s`KBD!ue8qYQDXzWR*f5OMyfQ%nO@A9vjqgf3Ic0q`D@IL!*J5IzYY)wE~IlUP(C zvBtB-Bz4ZU^lp>H0sTQz%TDdXg0ed->C|t(EpPgNtfD>%PID_Hss^LwmFjfaqr9Fp zE1MosqQ+NY!<>mg9a;PK5SnxJk^c%@%A?gy7&^b6sL7X8jG`Y#U`+~T#aOS4cyWE@ z#Un&S0CGNoWIniDAdgrAO!!) z8d@xAgtzw>LUFaGN(hmtw4z?<#{F&BwB4$_dPNUPY_!Ail7#@t4^woy{ISs_rLa^ZwoE<2MpQ4uN)>cmoDb-cw4kKms5q3=Y7;3kS5Q+mF=C zlKHQB-mHqY(3FLE-=`Jw`;;Xli21_$_Jk^aC<<=%x=-End>M?ViXoy{{!fc*)yM%Y zJ*n5`^MFqF7mvIq_+0CS*kfsV1-@2bqwE{@`dim25fy+-Hs{b3uhdpiNwHA zlF4Nuc3KlgGFysc^Y~0OQ6mDM8ye`5ZxUa(Q?$m)I$vNa`;&~HMlR1-3#+hq+b6&7 z&Rlim(r{#<<|FVAXR$0l`nmZVPw|2_XtV|Gl@8%QDq;~O@Al2^Equ$DevE+R?lxbV zoF1uz24Y`@Y~i(V-0d5<(kjZU$m`RIr&9qimrfXkU_3%T2@7&-a*Ia+5kUN-0MSAP z5dfT>USW>%o7m(k#aTl3LoPWAEpu zGUO}@OC=>=H2)FXx_q0aF@R%Kv&?z$JDSxqp?t5^ea6wz3$cXCOzHXj(Q?{+siq!V z+>7p({rwO$zJ#bc2x-zC6nNL<#O`g6d1(%=vH$%NK&w1E)ghPtcs|=-)TL9wMQ$Ed zPV0S@CdcgMy}UE*(V5-2pIh(0qJs5VD*l0<9Zz_!?zK+W?hhP>4M6s&JQMxXe4D;(pt|oc-ln1jn5Yt-h9O#(j)TzkRFgwy#WBI-HeO-W^@=pM@aC zGCkk_1y&gF)W?V{5dTuS?~Hvmp~N z?ZY1Pjm4}=VSmwfrbXz(ajYN{4(z_%vwpjax-|-z@o6Yqn{%Hr*Lf0HbFFXVN^jI? zcoxYJvhR6n1SW#EA3Y{YT8lQ(bduK{!R-ta?GN)_V$x--rXdn%V?^zixXNVI(whb*j{ zkuJJzBZUZ^v8c;`7lJ(O>rYuT8)$<6o|@RNstmrp0_PA=Fu@(~yroLNyvyeXYcoNh zg8zA72^JYkXC5wx^6kg8*<;Uw`~e9p_I|!>c*jr7ZF8nInJe+tdn?8#5b`M~AZ$=G zY??39K15e;S3igisn_kO9uu_+ho^E5kYps|#BP{P-(GElptk^wMvyAzUhw_pm7C#bk8%a|>W-lyOFXX&hA zA|*EwbOsZsVc+-)lXeU-3Ik#Wts;-rh5VQJC}Lr^2ur`}%+wEWyqQ?9$aok$UB}~C zmXr$7{|Cx0-=|N>X59Q29Z96$)3W{UlA5~rh1uQHDP{R51W%j&iB2b+^~=D3D1rnY zj)LpUI_A6IschO`y49%yUTVUbtcF>8*HnAUEmOe~e$T2~Uv8io6=RCsPhlubKEVxt zKbzS5uD+4M@#LFwMt1slqK0B&ftyA3ARJ=-{mx>_oN+6SVF@aSx0Nmf355LGd5c{` zhy#D$qo{CJE_nyV8Vif6g-9l##;@pTmZ!35e<=CC`+mP`_eBJ?L5zj}bDb2>OEvjm z)b||HkUX=A9BZJ>`+*PpZ}mJEXLyCMBH$T1ANGng3DDWbvph%N*}~1nTBAGvRN5YR z7_9us+mg!m+0_dErFj`$`o*`Q&g=wRu51EohBPaT*#GIzS>`y?{nmXB{CzSuCc&3!+M zfZr!dO1V&P&6=iSN&l|A?oQnZ{QNbF$kQLEd9Akg?YD{TE2>YYmA-0Q>1OyQtJx7; z2=Ts>c+kvikg?{nniRkRgUDO(8w2I06*fj~F&8~g@#NII)`FHQ@FUL2V`q3it+pG+ z9%s(}m&P<7uMZGE?13{4l7+3U>@d#T&Mze*N@L{K3{^C5dR`J@OGYSB6u3h-Zpy-l zR~z$7XVQG<+>xg_h2KxNoOnF+k32;G9Rbc`v3v?>p-DJZfIawhq>Ah1YR-azo{xVo zs8dkzdd^eG51MvNS4)>xkqJ95;8*&cI0T3~xf!D*_Sv-b;U&#rY!~+gSUUN{MtIsLFTTO^lmC<5pPz~J9DVSr43@#_G z6<@pI1_*hNyO1U-G6wO18K3=_2drAy1*Fwud!TVPVtf@uQLdx|Mq@K8rUc0HKD??BVDJ1GAv( z-{?*sQk%3J5wWs#%S+)b@7tF5_V%slntX8zM52QI<>o1t5A6zs%_9V{)E8kLAK#*eqEEf&naC(e;c>6-!9aju|-x;;CQ?+ zv~dg`=SkK3!!?oIOiO?7{rZb(%|hl>1S#YIXO{0W!U7Y|bE04%Uv^X+iUbrh*A3<5 zywc@-i`sEN79YPn;DjWmLYn+fI=$g1y4dpIW}zI(`$*M!^Ff9;m=W9BOln{NGu$aI zGJOE7e}7PDW;ioEzzFAgXcjiXa{!6r%9}~OYT!#w-LPLO=q~wBnb0g>s6gTPV&03| zZ)i!tSZ-jXdIv%d^k2{-20u-+H~yz)%(M)QJ`iZKwm^=6q%0=MzN%j0+w7Agml%$ZPXvo+&GsvUoWYB*?5BrL?3Ro7A_e*?q3uL7 zfGONmkw$K>PS8E{YtPE_R`Jb|W{2#mpLn*pr;c-{3}}ThWP09tpIOmXQ|p^%TW#}# zTJdxGn5}Te?{nPRF%o!0!&v?b$egdpzV>_rzz0@G{=2X@Gtqh7c6SFSbzWxABc?KE zQluyltQ?2q^lSeyMS|WaGHwN z@`IQZsM-1O3IYxj9j(2X;XAawET7P})J6ZjoIyT^TB}h9_-u3H1T3WQTjIj%UQH|j zMU@+E+bmQiUK$z<;)HCJGB+tn*bV}oZ>tj@{Ds2&5NNjeWe53$e^0+2bHB}m-TKjd zpphP#%^wx+;|jNAwxpGaGCz#ddm-Z2YGN^7qg$jVbf$Dl(%m=gJcOQ)R$Ra4YJU*3 zRyO}+dLI-te02T_XDFFV|2!1pY~XhSA5=hDg^vL@i3l7VtOvzR&zod~d?{)^{z@7? zD?@dH~|S1Yfzmp`JDwB8ZZO z8~yF3M_W#*32$MNL3bcIP#E^zvRh0$SLS~Rna$t6RSpD~&{(C=ZuA=cuM7|x)v4>~ zU2pZ^f#6i+b#5MGGSo2c=6AuiBHp=n9LCX{kU(n<@EDpn_WJovU9XzSx!g?dz^811 zESm;_XZr5ak1Fs4o8`kH_TH$Wq~CbeIu(3vY6Vw#!h_H%Qn&hX{W%xoJN+13WU4Tn z0_x{IjcRPL3k;ZRn4B}r{gq<2P-<1c`iTevL|DT(v`QE?`KBCX zYbWgY9SU8Jv4qWP(Di}&mq8djwSMDJD@RWj+*Am@Fqqc zU=k9NSMgK5pr*szj%>jFkD=ohWi!<0dtyM|YXlQGOHA@_iFalENNbJZG3@DE?fJBd zDdF+LHLz(|;SY?sRdt1Sz*ZYzX@1%E8`_Sw{Z2ux94r?Y4=tuo)HBa4!1eO`%XEf< z{1EKNfaHgKMnT3&&D3Rmf*=s;2VFz{^NP3p55j@E0%lZwwsn+`&t#=4st9wW<{G1Ycq3W`)lf0*#~VSEfRe{^fau#k6}0UP2Xf@QnldKXY18Rab5mx>0xOZrc6 zKPvqQW{CgyHkR;{Zffu}QIW{9Rn;!ONo>zHYFqxWunE-Bd8`ob^Q_&22mBO-0VQ2M z!gL7wn)5RjPc;9#^Xqam>uy{Lrqo7yt9^erX4%!}36X-|%4k0sfSOCN91YN#!m-%0 zrn}-V$!i!?po6iF|1@MB^f24vp`v|Ijo9$`Gi6Bd{}v0LqQFF5^S`!zj4{h$W1)Hc zIyE4-^EoCQCYCdgiJDfs8P>n`-m}A?=K9l}_&A`7@kkOOaCD2|DgWM!D9Zky^hmLh z{yN-BA7>^YCO?1y**Deb+D;7m27l@Amwke~D6vDB|6gjPNy>-ty#+K1Zg0G)hc(+7 zO3>(5YGTel(oCjiSCRjNP?6ZB|7yHOsjk4O#6|x8O*}&O1Er~hcp<9qvE^s<5cB^n zWr1-DM|D+7Jh8`E6M)SQ&qtolifq{`1K4-`@s47aABXQBbi>>ZNdHzNL;7*dk9Aeh zB2IfM+XV&JdpHjgO;zR;J~4cnY3Tpu++q1E8^MMnhV!pFBU6bXdICzBQ{+rU<1T+k zWX=7axj##`R;mq=K~zImV=ACufBC9Wb$#;Crl?E~2gsgKwo?#I zMOe$B=R`j1$z%qsaDMcUKd|?NiY#5&SgPcz;MqxTV4$*2BO>juu|-%+1#TD(8g6WL z|3kU|rmnuc396KJ(qk)4A76hq`u2YZz=B&o%VArZp4p~&^7`Fdib}y!i??7L&v8jv zPQyutuFmhH@30DBveOZ+FF3o0{hv6=?0l;Xc@>WiFK@$17Fo802QB4)L^~)maNR08 z*13wa(}}ql^(UhIpJX+RdmTe(tzE=P5}Yyq;2L&tu`ZY->;U`Zjoo5<7ffGkSLk~F zd{8ueb3^hAS{W%dD?SWI|35B4)%Fp9^8a=G7X}X&4)iAT#v{&Wd}Fz1_H0#Re}c9; z<$ull_H48JZ2dvw4neR{lb$sZC1;JX=%d@xkLEbcP7`|+jg{3OGi4us2DU~Fd|@=) zBBVX@Fo2Qd1%LzPAij4@K*<2oB@e2ty zZ7DX^&pcItl|3bR`h^TokQ~0eW_$^pOk5J%DfzjA(9(R&|AsrPy)|%h6OmU(>fH7I zXbTgD{}bc66hHjiWstRyeVFw>59;43Hjo?KoCmKj1i$WPUh9DdS%5DPgHlQt+(0EaXlEhNz|8|-nZhHx zR0Jo80al~(XgDDRxE%z4fO-l1-h~T2*pSKI8E1R|^*cA9)iR}A1S68b?YI)dK$(Rg zUwm|3^E{~J0go@wQ57W&ULRTO49W6tqX`2men3uWP6KXyKn6}2Age6Xtu5J}K@OqX ztD)V<>8(g2CnyTasBTDE8*K*RT8}ZZ`g=tXWB(Nxyt`As++v6L)QaGjLXfl zwp$t`!7n!82Cu*BFM?xOvoU`}M-GFn!%9&27Ur(_tYyFjg(}A5p!@G-ZuQnk}xUKkY%f+v^nC*dU;iNt;S#Q2Gxk8 zt{`m%P2?{F1_!thG9~ zrmR$v*a0IeF%K5Ki>J)3uqZLo3l9=<6+8#7>rQH~;z&;+KQ?si^3YNPmys&i6;7ds zXLe1Nd;v#b1WTZG95}-Xf^?ayQquu4b23>aJAW2jTwHh8jB z-aDQ{fD|kI5VI)Dpg!z(7KOD{w3yEaPk!j*XyfR-`IZeh!A5-Wly%=rK&IpVmAz&> zco_&yj$Y^nVq9%?vpVkVH*~Lq5hU1J*oUw@C9H1K7ums~O$MaTW8g5~c}Zi+wbM^{ z=^lRZ0dz4LHu=SNi?TVYhQDE^YRmz2byi&po)13#DjyX(x$Fem>UaiI0^7%m{XpTR>`3I9Iuk%E2)iEugsX7jPsg{*b8#w>3xq}J-QLRGv7V>)C~ zo*m6qm@)Q8Zs)EDYv=CA`h&nGYukV46nL3WT)S1qeWhF>j zvSmK05~=!Q@UF~m@HwIe`~U!Io4kuTa1lG zO^I20%+IYk-)7hoF|x-N-8Ax0d86oFAl}75HMClVu3PiSAjK}##i2s^PPg)&0|#y2 zOfmjEuGJ#`@%i$$v*8A5-yZAR3~=Bf72{h{{O@*eYH7V!n|I$F63tY5zgnNo&s{ks zzTHF*po%Wimpy8|Ax$bok)tz3*t7)0V`wKq7OhOw5jE zD!FwDThqFwN5i6}6T^okn`$42D_`BqG>E|JSL@q%-MqZDdjcW}=l5Uv!|k*<3@btp zy|od9mA1O#Irq_aHDfH3Mi0bx#$h?zZ8xpGBAZWQ22cw(Jy?HckIIT1M!$t*NqmmuJ@}6@SDG%@-l@kV^zxmm|nF zFaKqIIF8m|qX0?hfuk*KXxV@%TjF~*6ymyVNK;%R{B8&F_$SS@aUZm~q@peP=ALXm zaeMKKp%CVLCXFk1>s5{_Np8h9{R$G3`3da|dnc4+yuevao|*UxUeTet71(v%ZgCLUD~=moYIw^K&l@WE|iE=XNoZB<4sD zsW`x*wR;TXb9+*y(DHh}_$%WsKa4p_S-;xUC^Dy_!R|%NB|~4!E%k5L`%g<5cd1}% zP&i1asSH?sI2m39K$OnrXQX4COIGVvtpf@XyOx&o7&Fi~(Tyrh^1Rw5imF1X%g#K) zsG-!w98<7eo6;D0y`6L{%a&Et9M2mGpfs3MTc92o~IS~2c&S3<7kdCtGuCcGoWyql@Ej&*0c&y1smxz#KmOHuKnj$ehP_h zTOHogKo>^IicbEvP7lDuG<0p7R$LNh`iIWYinn;FVK+#&%)1GtZU>N14yC%IOo3+{ zo=XGp6PusogsHpL3@65X_B0(al7*(=lpud;-ip`uYYw62?Q`q zZF%26z#v99Usln|{tL>#$qFTRm`+xJ-67VZ4IRQz$eHJ@4RsJ8CY#%*>o$u`?J*Iz z4s?xD$zWyS>MnN~IIq4loeeGf)E$U$=M!LO^~ulA|KT+jF1ar@v(ndlr2b-T+5O%k zM1g5>K;MLiUDHL^it_S|{yN{y?qbT$Y>mxbHBkS?>vKyB&$ge&z|tm9_1E6s&$4>7CQtT;F64iV8oHUZjvT9g2Uq|= z9_Q7vVm&J@%`_W{DJv^;dhp94XV zEgXxcs>op^r7cq*z1q`u_f&D1O-LE*vNYwnw6X0AS&mVC9KV;rlLT(BW;<|4`Q*YN zD^@2BHHEUeS37srgi<74Otg3!(!I7fEBpm;F+!p5W5K-!)xG6`D%?Ue=Z;U!5*E{P zNkk=s^mf{VJT)sA=RZ)6(6F5H&xm?wm_3|*p;Ns#j`(Aq)_PGMlhkMuJ z@q+wCHKk-XoQo}Wc0~VU`yUnC9<45pnTIIZZ`bE#Fuf?khl^ZKS>i#YuES4@7vR&Puc^#1c7 zrVFH_yG_)!@-j_tar;24Gc`Z8U6$i281sqUU*gqei&r+vG+j>=s>18_+N#zUrDu*C zTedID&By0d^D){>=|RRX#_e#mSqkU4gT-JU{&L&s(LFxZ;a{Rh9F%fQj$C9+RCxsy z6%^W)HOKoa@t$EjWU+q7!%V}_4BD6(40^tqI;&BWTTte$ud_a?&Y4_j`01S=2s=e~o|yb;y)0e`hnU!8F|pCEoSnPQd9bK89%*@|@9az-$H=Q} z*YWS~V=JuMg6THtPjbEI%gi(UrAsw0P`Ae8_Bw`teD|_%Z?K!|@N-Cn*a%0%1Q;js zc^uAv^|v@nYfm?S<2sXW?uy?NZ?ZmvBs@EkG+2^r6JB1cn3g%?Q`)BxquyPmv+BlZvx6dYPWScPbMkuI z%*+OPaX;e593T32$#qaBVt$Y+UZ1U4AQaThjkzQx&ZbhKwG98@G9i|FuMs!w?Qa);~j zGgAcsM2Jh4Fx)U&XD34@)fyqyieNnt%AmRm=P%2t$*c!ZM;`)23GfPL_r|!r0Tl==N?;x3$2)WLIfdSmDTgyA`>1xt^w=RS53T9l5__M&I z&ceuOMbF2_$9~Owpj^kmz~BY9$fd0yq$Nv!81hM@s64n}hxweC@T!lh10yL{dkyl& v4i2JA8U%i($-dH+FyR`?{m-PJP|1L=R>=wHl3Sksrn6(N-ndevZ58w{6%oW! delta 15749 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 diff --git a/__tests__/plots/interaction/countries-annotation-slider-filter.ts b/__tests__/plots/interaction/countries-annotation-slider-filter.ts index 87ce626e0e..fae6aacfc7 100644 --- a/__tests__/plots/interaction/countries-annotation-slider-filter.ts +++ b/__tests__/plots/interaction/countries-annotation-slider-filter.ts @@ -59,6 +59,19 @@ export function countriesAnnotationSliderFilter(): G2Spec { ], }, }, + { + type: 'text', + style: { + text: 'Population', + x: '100%', + y: '100%', + dx: -10, + dy: -10, + textAlign: 'end', + fontSize: 50, + textBaseline: 'bottom', + }, + }, ], }; } diff --git a/src/runtime/plot.ts b/src/runtime/plot.ts index aadc3de95c..832732c801 100644 --- a/src/runtime/plot.ts +++ b/src/runtime/plot.ts @@ -38,6 +38,7 @@ import { documentOf, useLibrary } from './library'; import { initializeMark } from './mark'; import { applyScale, + assignScale, collectScales, inferScale, syncFacetsScales, @@ -535,6 +536,7 @@ async function initializeMarks( (total, { scale }) => deepMix(total, scale), {}, ); + const { scaleKey } = channels[0]; // Use the fields of the first channel as the title. const { values: FV } = channels[0]; @@ -550,14 +552,10 @@ async function initializeMarks( // Use the name of the first channel as the scale name. const { name } = channels[0]; const values = channels.flatMap(({ values }) => values.map((d) => d.value)); - const scale = inferScale( - name, - values, - options, - coordinates, - theme, - library, - ); + const scale = { + ...inferScale(name, values, options, coordinates, theme, library), + key: scaleKey, + }; channels.forEach((channel) => (channel.scale = scale)); } @@ -622,7 +620,7 @@ function initializeState( const { name } = descriptor; const scale = useRelationScale(descriptor, library); scales.push(scale); - scaleInstance[name] = scale; + assignScale(scaleInstance, { [name]: scale }); } component.scaleInstances = scales; } @@ -651,7 +649,7 @@ function initializeState( const markScaleInstance = mapObject(scale, (options) => { return useRelationScale(options, library); }); - Object.assign(scaleInstance, markScaleInstance); + assignScale(scaleInstance, markScaleInstance); const value = applyScale(channels, markScaleInstance); // Calc points and transformation for each data, diff --git a/src/runtime/scale.ts b/src/runtime/scale.ts index bdb7150147..529d8fd179 100644 --- a/src/runtime/scale.ts +++ b/src/runtime/scale.ts @@ -1,5 +1,5 @@ import { Linear, createInterpolateValue } from '@antv/scale'; -import { extent } from 'd3-array'; +import { extent, max } from 'd3-array'; import * as d3ScaleChromatic from 'd3-scale-chromatic'; import { deepMix, omit, upperFirst } from '@antv/util'; import { firstOf, lastOf, unique } from '../utils/array'; @@ -161,6 +161,33 @@ export function useRelation( return [conditionalize, deconditionalize]; } +export function assignScale( + target: Record, + source: Record, +): Record { + const keys = Object.keys(target); + for (const scale of Object.values(source)) { + const { name, key } = scale.getOptions(); + if (typeof key === 'string') { + if (!(key in target)) target[key] = scale; + } else { + // For scale.key = Symbol('independent') + if (!(name in target)) target[name] = scale; + else { + const I = keys + .filter((d) => d.startsWith(name)) + // Reg is for extract `1` from `x1`; + .map((d) => +(d.replace(name, '') || 0)); + const index = max(I) + 1; + const newKey = `${name}${index}`; + target[newKey] = scale; + scale.getOptions().key = newKey; + } + } + } + return target; +} + export function useRelationScale( options: Record, library: G2Library,