From efc42b5ae0e29c2066a217764dc9f916e9eed548 Mon Sep 17 00:00:00 2001 From: Kanit Wongsuphasawat Date: Mon, 10 Oct 2022 12:41:24 -0700 Subject: [PATCH 1/3] Revert "fix(#6708): change domain order for union with (#8451)" This reverts commit d4591fbee78f0329133c3f9ea0b941f3e1bf4307. --- examples/compiled/arc_color_mappings.png | Bin 10462 -> 0 bytes examples/compiled/arc_color_mappings.svg | 1 - examples/compiled/arc_color_mappings.vg.json | 77 ------------------- examples/specs/arc_color_mappings.vl.json | 60 --------------- src/compile/scale/domain.ts | 2 +- test/compile/scale/domain.test.ts | 2 +- 6 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 examples/compiled/arc_color_mappings.png delete mode 100644 examples/compiled/arc_color_mappings.svg delete mode 100644 examples/compiled/arc_color_mappings.vg.json delete mode 100644 examples/specs/arc_color_mappings.vl.json diff --git a/examples/compiled/arc_color_mappings.png b/examples/compiled/arc_color_mappings.png deleted file mode 100644 index 1eff06dc49cc3c35730704b04dbd069ab3a68216..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10462 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 EAItT73IG5A diff --git a/examples/compiled/arc_color_mappings.svg b/examples/compiled/arc_color_mappings.svg deleted file mode 100644 index 29d8f12605..0000000000 --- a/examples/compiled/arc_color_mappings.svg +++ /dev/null @@ -1 +0,0 @@ -561234category \ No newline at end of file diff --git a/examples/compiled/arc_color_mappings.vg.json b/examples/compiled/arc_color_mappings.vg.json deleted file mode 100644 index 5daa21b31b..0000000000 --- a/examples/compiled/arc_color_mappings.vg.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "$schema": "https://vega.github.io/schema/vega/v5.json", - "description": "A simple pie chart with embedded data.", - "background": "white", - "padding": 5, - "width": 200, - "height": 200, - "data": [ - { - "name": "source_0", - "values": [ - {"category": 1, "value": 4}, - {"category": 2, "value": 6}, - {"category": 3, "value": 10}, - {"category": 4, "value": 3}, - {"category": 5, "value": 7}, - {"category": 6, "value": 8} - ] - }, - { - "name": "data_0", - "source": "source_0", - "transform": [ - { - "type": "stack", - "groupby": [], - "field": "value", - "sort": {"field": ["category"], "order": ["ascending"]}, - "as": ["value_start", "value_end"], - "offset": "zero" - }, - { - "type": "filter", - "expr": "isValid(datum[\"value\"]) && isFinite(+datum[\"value\"])" - } - ] - } - ], - "marks": [ - { - "name": "marks", - "type": "arc", - "style": ["arc"], - "from": {"data": "data_0"}, - "encode": { - "update": { - "fill": {"scale": "color", "field": "category"}, - "description": { - "signal": "\"value: \" + (format(datum[\"value\"], \"\")) + \"; category: \" + (isValid(datum[\"category\"]) ? datum[\"category\"] : \"\"+datum[\"category\"])" - }, - "x": {"signal": "width", "mult": 0.5}, - "y": {"signal": "height", "mult": 0.5}, - "outerRadius": {"signal": "min(width,height)/2"}, - "innerRadius": {"value": 0}, - "startAngle": {"scale": "theta", "field": "value_end"}, - "endAngle": {"scale": "theta", "field": "value_start"} - } - } - } - ], - "scales": [ - { - "name": "theta", - "type": "linear", - "domain": {"data": "data_0", "fields": ["value_start", "value_end"]}, - "range": [0, 6.283185307179586], - "zero": true - }, - { - "name": "color", - "type": "ordinal", - "domain": {"fields": [[5, 6], {"data": "data_0", "field": "category"}]}, - "range": ["purple", "green", "blue", "yellow", "magenta", "brown"] - } - ], - "legends": [{"fill": "color", "symbolType": "circle", "title": "category"}] -} diff --git a/examples/specs/arc_color_mappings.vl.json b/examples/specs/arc_color_mappings.vl.json deleted file mode 100644 index 6573589373..0000000000 --- a/examples/specs/arc_color_mappings.vl.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "$schema": "https://vega.github.io/schema/vega-lite/v5.json", - "description": "A simple pie chart with embedded data.", - "data": { - "values": [ - { - "category": 1, - "value": 4 - }, - { - "category": 2, - "value": 6 - }, - { - "category": 3, - "value": 10 - }, - { - "category": 4, - "value": 3 - }, - { - "category": 5, - "value": 7 - }, - { - "category": 6, - "value": 8 - } - ] - }, - "mark": "arc", - "encoding": { - "theta": { - "field": "value", - "type": "quantitative" - }, - "color": { - "field": "category", - "type": "nominal", - "scale": { - "range": [ - "purple", - "green", - "blue", - "yellow", - "magenta", - "brown" - ], - "domain": { - "unionWith": [ - 5, - 6 - ] - } - }, - "sort": null - } - } -} diff --git a/src/compile/scale/domain.ts b/src/compile/scale/domain.ts index b97603d2d1..bf4260df9b 100644 --- a/src/compile/scale/domain.ts +++ b/src/compile/scale/domain.ts @@ -251,7 +251,7 @@ function parseSingleChannelDomain( const unionWith = convertDomainIfItIsDateTime(domain.unionWith, type, timeUnit); - return makeExplicit([...unionWith, ...defaultDomain.value]); + return makeExplicit([...defaultDomain.value, ...unionWith]); } else if (isSignalRef(domain)) { return makeExplicit([domain]); } else if (domain && domain !== 'unaggregated' && !isParameterDomain(domain)) { diff --git a/test/compile/scale/domain.test.ts b/test/compile/scale/domain.test.ts index 1827d1dd7a..498f9797d1 100644 --- a/test/compile/scale/domain.test.ts +++ b/test/compile/scale/domain.test.ts @@ -50,7 +50,7 @@ describe('compile/scale', () => { }); const xDomain = testParseDomainForChannel(model, 'x'); - expect(xDomain).toEqual([[0, 100], {data: 'main', field: 'a'}]); + expect(xDomain).toEqual([{data: 'main', field: 'a'}, [0, 100]]); }); it('correctly parse signal domain', () => { From 8d875e7332ea3eeefbc7582e83106ad120b928d4 Mon Sep 17 00:00:00 2001 From: Kanit Wongsuphasawat Date: Mon, 10 Oct 2022 12:41:41 -0700 Subject: [PATCH 2/3] fix: Revert "Revert "fix(#6708): change domain order for union with (#8451)"" This reverts commit efc42b5ae0e29c2066a217764dc9f916e9eed548. --- examples/compiled/arc_color_mappings.png | Bin 0 -> 10462 bytes examples/compiled/arc_color_mappings.svg | 1 + examples/compiled/arc_color_mappings.vg.json | 77 +++++++++++++++++++ examples/specs/arc_color_mappings.vl.json | 60 +++++++++++++++ src/compile/scale/domain.ts | 2 +- test/compile/scale/domain.test.ts | 2 +- 6 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 examples/compiled/arc_color_mappings.png create mode 100644 examples/compiled/arc_color_mappings.svg create mode 100644 examples/compiled/arc_color_mappings.vg.json create mode 100644 examples/specs/arc_color_mappings.vl.json diff --git a/examples/compiled/arc_color_mappings.png b/examples/compiled/arc_color_mappings.png new file mode 100644 index 0000000000000000000000000000000000000000..1eff06dc49cc3c35730704b04dbd069ab3a68216 GIT binary patch literal 10462 zcmZX4byQT}_x2#&Al(9z(jd|}(lH<)HKgRw(jg5>H%PWwSst@)9_c!VZX%^)ydYbF{w@P)}=8V{*E1dfjcw)cjT ztSWHmwM%YJD{}nMT{qg10^VL1@CAKvq?OvF3muXo{6SwSk4oNbM6E!0^lW{OdX zi$6S(Q*<4>EPa|U7KnEZJ{s}qb=_(=KI(2u;}qjOl3I?wl9?(cJ3nM^J8Z#Ss0;A8 zFlh^fS2i{ZoSvRCzj;H?%q)Acr^7~^_(JJ?yz%eUwAzqz<|zFe8d?X9*Lox_rn`x1 z+K!$P_p~{_j$4Ks@<}3OLeBn4q@-e$V%MONjOk{fm1?V5j@$Dc2}wz$i@jO%-+}1w z#P`N?P{+r|ukY?AYc16DzaG4`=BHrSsejGMiR-(%YKVn`2oiSLhr1pvPgNLXUSGR0 zDrXGUSX# z$o>8O)J$9|p?IZqq0d~TTD35IyY>hEbYa)cwyS01^X+j$BBCmzZjAef2SNLPNbR@N z729)F^nhw>eKGW{kGFeTWf~bikM2EDG|F09q&~NknR88!OvGUuo6bBuJfu7(Xn^~+ zj(nbkEi5e9bQ_~fG%KpjhEq~|P0h?=6B4>p?S6)|w~G@nDVcQmBV&A^bf1Tkb9vclsIYO*`vzO6=BD1y>wlQ# z2JIv9ENV%Dj+-`_35khuiHW_j3<}I_Y`NLlFMJVEagIlXj}}|?@BEv`qK37Yx{ zzpVLZuiL7Odrv!Y#TPxx+Q$`HD=e7d38{zHBbCxeRHFtuHO9}o5J?a*2#&_-Q9gCnKy_-ule}66PMR< zQ}Nm2OffGsTwL?3!=-mRir(Jdp7$rci_Wup`-@Fy^^Qx|hcYx?k~L<-vdYQ@t*vSJ z^wNtnf32>&ac{GNsI$H9Euk@IQ8;c6eO{=wSpPJtbA4dvGq~Cj zFkfpykRub7uaL;m;B^H!GwXBb_n|bwIE%^r@n&bMXVk>T#XX-iz;7D>8fk$8$#1hz z>2_k|9}tlI){0ov}z|y}f;Wd_0%;z1!wU`q$pF=`v3`nEV@g?MgcYyCaX(*wdGQ%yd-b zVeG7|36XR%-Y!Lxj=_NZ>|%fSowMt~2A`}x-CSqE!?R!TCR!dD|p3)evQRM*## z!H%7)9mi2V?~Sr&63{G9Q~uh7P5)kObKE)iW;((kSaoxgD9!!_IC^NJPQ* z&7@Jx#IgH{{`d&h%)w3_?#YV6t$GT0Sf`5BFnzZ>6qFsXE{AfrVJ!_m;Oq6xO;+t}Hj(NmGrb-m502d(3feXLiODQ0O^ZxQ1BWmD;2>JW zFHX}cI2?k7Mp6UEg>Y`2A;kv=R(g#ncw?*9o&!>H!jIns%D>cRLgAHE!t#|+CeYCfNG*qq3bG8Q zrRe5Fl>&~q0&oR%`8nPET55V~{O$}KDQ-DaN(KrE3Bdx=2aWeNIDcS0?+*S9ATRMlg~vM2G6nok zl@^mLva(t_5A7U?h<;ITOJ%jI4vefs^T91BE-URG7p%z0s$tCH;+fCPn z$?HtQ8M#>7PAm7%@6+vCB?^#hiOvTU`L_W+TZ>ZLp0dcmTxrCe!wP)!DdyF?rSow@ z-8b;j2{Aeo&!MkJUb{wpp#2xObk4+>8ShEJj`Sut8#EKmgkUL&@06ye>nqJS2M@mj zf-6t3Qc#B@{^W%Zl0g&c3Yj^|{;qAtO-d-cs;Mbkn>y1o^1{bx_!(XB;q^BVPWCSdSZI$PRUzv)24|S zhta>;JJH!3oKnZA#70Zl@!YLiC=J&Z@A-?iS9qDDmC;O@)8UTS%Q{VmD z#Dppv@gU&JDa>IgpIKNkZOQlG=o4`2yC?OYXoNXLk?(w4JvD5Cjk!G*lqHenM*STO zF5-j3!=^w^X+57%0FuM+&Q51C9=OVwmW@Wn?LN!T;nTyNjo<0{kU#ya9ZxyGk{b|4 zS1sah#YB#?{`97ad8Gh3@%VgFd9vO{rze7<*XQZZph+SA8zcDaU%P?H@X1@KE_Cc; zZ=`$c-64T*-i+~54MtMYSW|+1?XMGJ{CAWsPD6)x#9`l_Ylpj)rwkyO0M*I$pOr^O z*O2OuqOi@w^g)2Arhk^gtD>XjT@J`Y#tY9GAvJ#87zPqzBZ@t|0$S?H(b4a9bt$hF z9dV^|Vy31(dEcvKVn(TBryQ8qpG|0T7P-rTnIX3PD@j?wdLS78;Y(GnJ?sN^=dm65*6Ry znR+NR3_``V6Th6ppQ%tr*ySkm`SSDuXH%Zw zu(`|mv(aow_zsseTd`A*jJS7KBlcQ+Yv2`-PPoZ!(!|AMdm?5n^e~QDj;+eVjx9p# zdm{~mM%LNm5?TY{YC82pGje^Pdz`+BX0*(Ft!J*!c)YhL*Szg>x%>^8%s*Jq3VJMb zCTn1Rk%3fP%h6@dLd^GcH~bX3fh@Lt*ur^y*wPMel5;;?KyJ-*#&?;wp2+c2Q+@SX z(jzZd_Go&hirZ|6)X3P_xkd9BJM?^fe{fy~=t8`>hmZ8gE6o5L`)v6eF6IsM|4|${@sHP zob9pYHqLDUllPXUqG1`fSwGn9DS2Lb)ptFn$b+7n4-=Ez`)~bXFqumY6m=L-XwN2L1mV0-L;$e8kzvWptf^Z*5l1+3)4UICyI>Em43jB3X2VU_`Ntb zU&fzpBp%_>wCnHj?5;A@Qh(2UR*`Y)i{|Z~!BfgluRDj+b-CEs*z4__sP#8W($!dY zqsyYHn)U5;GNS&XLX^uHVqU06KZWr`BUT&DY2kWLv4C59Uhn5BN>E6Npqb93{_b{`+0^OKdAH+sCk zu_W9hZU`{bzZDr^Gj*7u+n&;MB|6zDDDr)0ccX%JuNJTe^<#?8kV`;`S8tyvUis>u zlA(TayI0}(_c!w8{(L7;KMHu?H=Z)Ibd$P^->zZiE3b6;B2-xEeIM9V zQELyrPjlyy9WG(T#Ka_fYe|Sn%=U_nO);a|WYb~H)BRRKNnfx?lHEV@d_Q^E;OUk^ z#Amaj#QVcSgfjccP>-XhqP8|!=XY%5-Kiohaz5Fg|JxYs&b!PB9Kwp9yk=MdsJLc}0$$=4U3qXp1J8`IWSxX!sj(2RyNs*fKuom4JP5AS zwA6PD*=OFZcy^j+dOi0)KrHB3SVFKV`1^D+6z_Ef-RA$AYS}~vEg+3H7(!2N=w+ylCSKcR#BYU4 zvFh~(6Iy11u3ltKS9~p5xg-5X)1Hq}K%$pubQ{^yqq+bpQVGXmsBj% ziRs^a9-VWRVIGq!Aww3r`8eWrKQ&qe>E7k~U`c!_KfBW+_ zX(H~iqF*nMHxdn4bt+PUUD)C~j@J5L4BXrV4SYm@2Qh63D*V-vzncAI#6=35D#U+P zXIrZA1||LQPTOiM?Tt`xQAx(N0CpCmg@qa#He|LL3pW~pdCullXUc#^85Ey@Kq3f- zid5hWoXxbqYzBVAqm~Kb?(o7SE`>uVsw|Sv2tD<+mu5dblZu0*qoCI<-_FkM{a_BT zcK2M7EK7NM;u4orv^sa8~OG_;B)M@EY8iY0w z8*YJ%r(n2wNXWNR-JJvB4VKRop*B>10ZKkSJL?}9c#&I1$8WnR3yf|yN+8m2%blCk z?2{RJQ^o=r=dx{*X!snnCXpipss75I;9D0T{-K@vHV!ksvgKwO6?Ok*pQeCJ0ztZ* zaR?7kr|s_U4kzXI2bxoSLc*@?@f)PNWItY6uRN06Ufktibzc|X{Bk_aoWTgs+kBg#aB{t&^tK+xaoDzf%-iXX_<67s zru{Hl+4VX8^38_Pgp@bNtsGKRWU!pO!!4F5N~Ivby~SN7gN>B9P7DC)s0|J z@o{-%x(Pa65~?a|iirKmU{W{mFKLBaDL(B>i)^N55HX}ee`~(2<&E^3DH-Oe)PWy8 zl;m#}B?@HYLf$Od>~mdT&C0jBZwV7(dB9$yc6)K{r{UO*Ra`iqoU6SBm8_pa~v?C-Fw`U>;psrW# zcj-y-OzjfYnd4@4rw`#|CN}d9f9?`-ss5d2Nvt0(LyqQaxJjvSg}shDP+v1L#-^98 zw7ductGP9Q92Pn>6tRAN`Gu{jYa+t-T>w*!1>+s-rTw(0`sD37D|c12>7X?Hk$}X@ z?_PONq{jP!iq^5DlwAilRl_7lFFp4l0<==zXHtBD@UPu^!=QBZM@nPDil{Zs!gB*OW=A?Kr} zpzPqg4<^FKCq)ac(##{ZE3pf}P!OnlQK{X0Yis%DEmi%O;4C6~!Na@YxP#(fc2P7{ zUvpP?Hdew0?%p&_TwrXGr_+~-MEpB7Dl7RkHOOgKpq%-xj-zvM-q+DLd@m$zPP}KF zns>$LNmSVN@HN2Lr>73(x=p_;KX+c=pN(#mC^Ncjji=4I`6~x`7fXqTR^I$6Y;BMA z*GEo^6dZo6eu)1R57YZ`W|=HQ&$v-!LC+;wU-R&Fin*LpOm~f&J6(wTi|H^fs;q*- z8m`ZEfO&+F#S%W-JBd6$-wH(8Yau_Rm)itWLB-zc>&}B~T2tIO@zn64f63_ujB&{a ze}clIRU%p+4A`Y3OW(pMFGk&7wt#c49+R7^lWj=bxn4d=iJWxtzA^+6U8#Q@EAb7V z!@7KO6*mjh-s4H9gAAy_s3Hx6T6Hq{Y52qM&z(jD=VTa9#$_zTthLIvcBV@bZFP88 zU%`f?GENj2Q!#9Ycm#|AWgZQqAiaBF`)VoNi;i(k^Om6#l=#yEXt%qSuM#Z zeN5EHnTq|*!vGnDNTa&`hF2FFMyeSzl4Fe$wXpS%eKs9uTIa?MHeXrIj{!1+5`fom zTDG>&z&hKSjB zPtfbl_~lXKV<%aI!hNxDNT|yN-IgmuA9eL7kLl4FJ4DX_d+gQ89w zW%@@0G7^qOrp>|a4@j$e1kh>2hNvE`(ar|lE3TdzX+@gHR`jI2Z{L2SV)om{41?Fe z^+)M!AEe)P*^~(H*TVpURMF3FN4NZ0c;PF3Z#G+lr;Qv#9LyGU{W7=(D@F>>o#MMI(UYoVl}L6dA6GqQ9d4F9iVYnNiixJtf(42-XWL>)EJ$Qsc| zt_Xhb$-P*=l(EIbG}R@MdI`D?^fzvj5Y?E@volgz$a?%t$Is+NS?u zkVV|_E>}bip18=r6Z59S1Y}f-r-QB>|69>n{+#jOj2tTTGAj3e2-UUKj+KO+T(1%# zG5iY)UOB3zUW80_%M5Ve%)=;-o=acf_KH`{4>rE7#Gdo$@8uG}SnIc)qayL;6CSov zdk^%pk9^B)xPUtWKA&wB1)mDLr&F$k6iSXCahpR?qtO$0$+P{$!I=Sv!EpPqC3uJh z6}_`BdZ-02^Y&)0$k(pmIHkAK&7e_}cd&bj2Xs41+ar1~3dBR|v!GqO!6u3t9F2U* z0u(HruS01oLa-zR9TxJGcKbm3dFEoS^lilp{)DhcvZbQWKj9yFgTMrnLejv3-w|@| zKc0xEJW6e61#YVAfm@4Bl3~(P&(0aOw=ED+%Lj~#gpD^2e;(_q4^gkdsbGQ(=xj|@ zfn&yz^g};2(sh^ufaC{6u88XIE6~TKFmB8nhvJu!EpdbN>NtKo3Sy6L`0P<9Z|{B%Gq5InC?*n1(O zGYpQS^Uvp4z{1HE*|SP)XOd2HDl7mX3QY1|sXPhCAbDl=Z;5NwNN2_DgwpcrPa0=cqmFV+F_*ue;Aj zt1G&A`uPL5;ZqJyMa*IarQ--fL%SUYUIV0=_dTGFK^b_`Qua+%>>oLHQ~`08QT(cs z44e>nQ4KU8-`mscUrTq1N|=n*oY+f=4kl-@s5y0I^94}$6?`PE`OI20w{F7Ot#-BV zl@VQgkA}9!mSYG$Q@R`w-lJ9BF%ee(9(;=ek=g&JGprG?6ScrU|8v22Nj`$JiUT=n z%HVk*a+kr++mM=pme=)*$5{Er$MNEuy!^JM%y{!C766>(BIV8q%bh#$9UdjgyD~+{ zE`g;ssz!EEwB^|(wVy!brN6>cXQbS4 z6E}rj+@)(RL9utKETi+BckYk^D>sc=c)2|Q89iN$6dYxzUz~l1YEE9#g9!NXncBdb zfNUcGxB5sRW1zQgX(Z(9Q0Wj`VqpUSl;79XUG5>ogM=qMKQOS7XY|wKj*yZ}(y5DI z8^8~}%k*RnIw0Ch7bj&CF@<1hpdlmLu+SVXHGs@ok)g6r&R7HJ_u;D{9MF#jXkHEZ z#_sZ#<)^ZBY*3Jm#2O^Vt)AVJ^j%A`6x84{zkU9RX}5Pav4vRAazQvH)N$baKft_4 zG^_<=Fg5t+>l=!Cw5>k0yp`d@WXk<#Kx)k|RRQ3JmtP4A0-*&xKMUYw#DkaXjKAD} z;MLjuP)-4kS-w*{!91m>-2ti3R|L$1)o81;AT!9n&tq3uPsce>j@%Mun14;umGT{Oi`=hcAO8(g@AyWhMy%pNM05O`!-cF=IaY$&@Hdcj9AqA*alj?|uuEkst4Yy6_Ys3zV@FO<|?_0Q8Q8*7F_ zr5HGZtULF&>%$ZI^kw$%9so0?6;yAx&g6lNy5!WaUho3+<_e4@rN!wxHF2262n(ke zbZ5-IfHob4>p0dJpHo61-3zVAM$?ICBQPS~G+pSFX;JeWd6mTxjCI74_xYd!6kGVu zYn20VvrQ-p_WKgrGT^dOJA+fq+1g%^|7hS75B_z;j1*cZD)##)?T5D%r2Vr()X+h{^nZ@0BkG}06`eTy^$y4|5W zw{v72Uz7{)J-;sR5G)-b z#e|W+(o{LGo(MKL*BRpg_zIr+-PLh?XiO*uBaZzI!3kB~#0)`aWVH_CVB8R-lTIT% zC09kQguf|9#r}m@A^!eqE8gATKP$s8_i(;B`G5FQ?SrjC%EIvW$6v!hD5F%0rj*66MiY%r_~EGz@Tv_QfekNuS8oOU4aNiQVF`ihy31t+rQ zz=?dAluPf!1*U=9D~LOP?fhlN zAY;DgT+J#JGBJE(O=98Cp44myvJQ85@ME&j4(>h0c*rBu*3m8A&B zYmKM>GNm&Y%J|7%mJ-i;zFaHjpBw<87vkvrRVT_5#M-o}^(CTY5N z{a2e{HiPc`P-{6PqXT3BXt{k5pr3vGPTWa@5MW-P)lJUCB#Q2dy8R>==pQG-2m|dR zqfA^(Yc@T#U7>{sk2O;!hUi^b;^UNl*geM{ZzKk5P!sXJdwqT|xazzI8!Jnl$!nC{ zFV+k=`~~ik{--}cAAs^ISB3tTUHe0Ce;oJi*Pf&T7K2*Y;VSOX`)2i*59|7ahBfZ6 z(OvdXrF6OnWuNEv9h#_`gO9utHnOU7f%F4pQ^z6sF{QU2W=k|)&48#`3h$+`Tcsf{ zb{2FA!7tE3q8|>Mk3b`%`AY;w^zC>b7DMmu)`>zc4sYjH;r{pO0DqNqLebzP7@GN4 z6s*S1#}SE2%mzOSqIo&rTsO0^NceZpDh-OL;|F=4-BX8FeAWza%2JWX2$(5n*f?lF zkBpdZru^;Y9HGX>MIwNKH33-8t53lPLdl8g%90?fHpM((g8b$b(5iuY+IF#ES@7); zav>j2)>DFY^tpG}OHY4)P%78$4!u!IYJ8fl22Mhv>aHaRj=s%qm z!J9f99)t>J%hs-A8RCfunZ4VhlfGl!X{k1``PZKSfb0)7lgshAbv$%Le7-+u@O6GpH0#|kx1Z-+(Mp4l_4wH}AEChC2|F~G} zr^@(u=rbIBk(Po1LV2N#P!#;xGE0LF=AG4A8O=+<|Hb0~Iu8{Th2AFd|9@5V_JV4kdEm6rBS+*lh==y1`~{X8$I?(8O%qGN{U}N z3H>8PT?})2!Oks|M>m^;>w%t8B2+55tW6QLZ@3|@L`D!nknbNu5hkZ!m+;sZtm zbFK;;X|;S;Q|9Pv|4=jS@q?9DfKN$M| EAItT73IG5A literal 0 HcmV?d00001 diff --git a/examples/compiled/arc_color_mappings.svg b/examples/compiled/arc_color_mappings.svg new file mode 100644 index 0000000000..29d8f12605 --- /dev/null +++ b/examples/compiled/arc_color_mappings.svg @@ -0,0 +1 @@ +561234category \ No newline at end of file diff --git a/examples/compiled/arc_color_mappings.vg.json b/examples/compiled/arc_color_mappings.vg.json new file mode 100644 index 0000000000..5daa21b31b --- /dev/null +++ b/examples/compiled/arc_color_mappings.vg.json @@ -0,0 +1,77 @@ +{ + "$schema": "https://vega.github.io/schema/vega/v5.json", + "description": "A simple pie chart with embedded data.", + "background": "white", + "padding": 5, + "width": 200, + "height": 200, + "data": [ + { + "name": "source_0", + "values": [ + {"category": 1, "value": 4}, + {"category": 2, "value": 6}, + {"category": 3, "value": 10}, + {"category": 4, "value": 3}, + {"category": 5, "value": 7}, + {"category": 6, "value": 8} + ] + }, + { + "name": "data_0", + "source": "source_0", + "transform": [ + { + "type": "stack", + "groupby": [], + "field": "value", + "sort": {"field": ["category"], "order": ["ascending"]}, + "as": ["value_start", "value_end"], + "offset": "zero" + }, + { + "type": "filter", + "expr": "isValid(datum[\"value\"]) && isFinite(+datum[\"value\"])" + } + ] + } + ], + "marks": [ + { + "name": "marks", + "type": "arc", + "style": ["arc"], + "from": {"data": "data_0"}, + "encode": { + "update": { + "fill": {"scale": "color", "field": "category"}, + "description": { + "signal": "\"value: \" + (format(datum[\"value\"], \"\")) + \"; category: \" + (isValid(datum[\"category\"]) ? datum[\"category\"] : \"\"+datum[\"category\"])" + }, + "x": {"signal": "width", "mult": 0.5}, + "y": {"signal": "height", "mult": 0.5}, + "outerRadius": {"signal": "min(width,height)/2"}, + "innerRadius": {"value": 0}, + "startAngle": {"scale": "theta", "field": "value_end"}, + "endAngle": {"scale": "theta", "field": "value_start"} + } + } + } + ], + "scales": [ + { + "name": "theta", + "type": "linear", + "domain": {"data": "data_0", "fields": ["value_start", "value_end"]}, + "range": [0, 6.283185307179586], + "zero": true + }, + { + "name": "color", + "type": "ordinal", + "domain": {"fields": [[5, 6], {"data": "data_0", "field": "category"}]}, + "range": ["purple", "green", "blue", "yellow", "magenta", "brown"] + } + ], + "legends": [{"fill": "color", "symbolType": "circle", "title": "category"}] +} diff --git a/examples/specs/arc_color_mappings.vl.json b/examples/specs/arc_color_mappings.vl.json new file mode 100644 index 0000000000..6573589373 --- /dev/null +++ b/examples/specs/arc_color_mappings.vl.json @@ -0,0 +1,60 @@ +{ + "$schema": "https://vega.github.io/schema/vega-lite/v5.json", + "description": "A simple pie chart with embedded data.", + "data": { + "values": [ + { + "category": 1, + "value": 4 + }, + { + "category": 2, + "value": 6 + }, + { + "category": 3, + "value": 10 + }, + { + "category": 4, + "value": 3 + }, + { + "category": 5, + "value": 7 + }, + { + "category": 6, + "value": 8 + } + ] + }, + "mark": "arc", + "encoding": { + "theta": { + "field": "value", + "type": "quantitative" + }, + "color": { + "field": "category", + "type": "nominal", + "scale": { + "range": [ + "purple", + "green", + "blue", + "yellow", + "magenta", + "brown" + ], + "domain": { + "unionWith": [ + 5, + 6 + ] + } + }, + "sort": null + } + } +} diff --git a/src/compile/scale/domain.ts b/src/compile/scale/domain.ts index bf4260df9b..b97603d2d1 100644 --- a/src/compile/scale/domain.ts +++ b/src/compile/scale/domain.ts @@ -251,7 +251,7 @@ function parseSingleChannelDomain( const unionWith = convertDomainIfItIsDateTime(domain.unionWith, type, timeUnit); - return makeExplicit([...defaultDomain.value, ...unionWith]); + return makeExplicit([...unionWith, ...defaultDomain.value]); } else if (isSignalRef(domain)) { return makeExplicit([domain]); } else if (domain && domain !== 'unaggregated' && !isParameterDomain(domain)) { diff --git a/test/compile/scale/domain.test.ts b/test/compile/scale/domain.test.ts index 498f9797d1..1827d1dd7a 100644 --- a/test/compile/scale/domain.test.ts +++ b/test/compile/scale/domain.test.ts @@ -50,7 +50,7 @@ describe('compile/scale', () => { }); const xDomain = testParseDomainForChannel(model, 'x'); - expect(xDomain).toEqual([{data: 'main', field: 'a'}, [0, 100]]); + expect(xDomain).toEqual([[0, 100], {data: 'main', field: 'a'}]); }); it('correctly parse signal domain', () => { From f02f3d348b521b2cf64cc0111e5539632f3df961 Mon Sep 17 00:00:00 2001 From: Kanit Wongsuphasawat Date: Mon, 10 Oct 2022 13:29:03 -0700 Subject: [PATCH 3/3] fix: update contributing.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9c9f3183f..f7f0c2f56f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -196,7 +196,7 @@ During development, it can be convenient to rebuild automatically or to run test ### Deployment -Publishing is handled by a 2-branch [pre-release process](https://intuit.github.io/auto/docs/generated/shipit#next-branch-default), configured in `publish.yml`. All changes should be based off the default `next` branch, and are published automatically. +Publishing is handled by a 2-branch [pre-release process](https://intuit.github.io/auto/docs/generated/shipit#next-branch-default), configured in `publish-to-npm.yml`. All changes should be based off the default `next` branch, and are published automatically. - PRs made into the default branch are auto-deployed to the `next` pre-release tag on NPM. The result can be installed with `npm install vega-lite/@next`. - When merging into `next`, please use the `squash and merge` strategy.