From d0f46d90c4b32772b7e2aae60d84e1f40bb41fed Mon Sep 17 00:00:00 2001 From: Fan Du Date: Thu, 9 Nov 2023 16:18:00 -0800 Subject: [PATCH 1/4] test: add a broken example --- ...oral_color_config_time_unit_band_position.vl.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 examples/specs/bar_temporal_color_config_time_unit_band_position.vl.json diff --git a/examples/specs/bar_temporal_color_config_time_unit_band_position.vl.json b/examples/specs/bar_temporal_color_config_time_unit_band_position.vl.json new file mode 100644 index 0000000000..ee4e07b650 --- /dev/null +++ b/examples/specs/bar_temporal_color_config_time_unit_band_position.vl.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://vega.github.io/schema/vega-lite/v5.json", + "description": "Stock prices of 5 Tech Companies over Time.", + "data": {"url": "data/stocks.csv"}, + "mark": {"type": "bar"}, + "encoding": { + "x": {"field": "symbol", "type": "nominal"}, + "y": {"aggregate": "sum", "field": "price", "type": "quantitative"}, + "color": {"timeUnit": "year", "field": "date"} + }, + "config": {"bar": {"timeUnitBandPosition": 0}} +} From 57305cb33556b2d523bc026ce6c91299d0f3ed19 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Fri, 10 Nov 2023 00:31:58 +0000 Subject: [PATCH 2/4] chore: update examples [CI] --- ...l_color_config_time_unit_band_position.png | Bin 0 -> 14369 bytes ...l_color_config_time_unit_band_position.svg | 1 + ...lor_config_time_unit_band_position.vg.json | 149 ++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 examples/compiled/bar_temporal_color_config_time_unit_band_position.png create mode 100644 examples/compiled/bar_temporal_color_config_time_unit_band_position.svg create mode 100644 examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json diff --git a/examples/compiled/bar_temporal_color_config_time_unit_band_position.png b/examples/compiled/bar_temporal_color_config_time_unit_band_position.png new file mode 100644 index 0000000000000000000000000000000000000000..53d51077ba30f18526ada2365f601ffc46e67012 GIT binary patch literal 14369 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

_Q`~%<-%q2K<2k zo)kWRl3PAu4xrp;4o?PXjDF9Z4*V*U9HS;}pA{}fTu-&JzWx*iZkg$rG*E?iG82{* z?q>WMtF*hqt(o-C?9~s-5K(-S)09ucbyQRObngN?d&P(oVgQV}^xjD#45+9`?Vko@ zN9iTUy#&IPrQVVJx&va)dkJ3I**vHXzB-)%h;`%sOr>tU>W06{9yk_5 zY17?ZU9E4}WY@oPCL;)-(DQLi5PY#$pO8bqqFqVU4222KB(qKM!LJ`?Az!eF_Kaks$Ct zqygq3yg;Z{R8<*)6xAxXWF{peL;FGYe@4#&)wpe9a`ENMms5+2gow4heG9aKrvCgH zXHU+GFZy=CGX%~5mVgEe9}!K!Cb_dOt@-Y<8!fn3!1O z{9mV(tB?t?c=2Lms?mpbPxvi3g4$R~#&q}qgj3xAb_J{t%7eeZPrZ2Y!UD<%$U(^B ziWX5YL#h0MRWEVz^XJ*=LeCkTX!Pn8#7a`pAHQzSWF*F)D0gVj>OU1gO#kkVK4d0i6K)i+T^} zXcj0^`fJwbm6VkYjf}j7jN1?-n)eZ|zP^4-OUrp49uk;gIE_?PR2cN6+yn|C3%1R# z?qmvM(j`}gmMw4m{fwuu#a zq3GolZ|CKbBHMa07dyOXx?^<4CJxP2+!bf+=u+69<*rp;Qv16f8N6N|4HFMp(L+7V zzPZX5so-o)!uz`4tNZJZf_?qCn)vnlKLmjO3Kv#A!@`|#Zu|Ch4EwWPwl{5P^8eQs zhW`ZHX<$_2soIxt)|k8Ez!cQEKN4pq3lP`S9Bp-Da&>)O9hUkPKF{w1if1yl#Xji3 z;W`MtIjzZ_m6ZiCI+FemZj?E~jnAv^?B8En|52dbbs-sk!tSdttt+~z64TMqWkqwY zfrkvwCZe|E0-sXUR##U?;jQ-IPH9cb3fdl0-hnzjn1}lepBVG(ii%42|GuxMir6V8 z7?AzkNgbaNgMsdOrp0tR#2#ya6t))t}36%v1x`JrDns zqo((-Z*e|0vu&y1iGnnLy5ZJ6e-u^@1Y5E6hKt4i?@!4XUqVk?+bbN(@uyRk&e`ee z>Y6-xG9;cGlhZ!SY?UwJwv+RqGqN)}`QCxc{eX2aZUeuHZ-X?2azaZ{UzGYNP~Qrd zqYJ11u>vsnLYP=sb^HMu0ZhIy5>Fr&AiT~OhQrVWI@?l{m*E%|7Dg}i(z&>Ef74{k z@3QtEzHuA!`8b&p?0A&}YFG4@Tj@g+GZosL;6{$Q{%=-IENcY}dtU7_rNfzXUiw^C92N>i#NO@GJTUFP3MKv7MGkAhHc>3X-Thm=LE}q z9UXJvZV|^sP(a@cs+n}pH&#;_|Dzj^9zPa6c;w}NxHC}gF;-#ImGyRPV|)9>(ZZ!D zzD79km{d@nk7Garpo}jxDdh_EVa2Q_TIlp&;-r|*biqIwF5=B>T<|BqkeD(cgWMwNS&lz8{og=I}SmKF|k4L8iLiq)_xCra9nWaxyFM7V+b#vMisCu5=xIC+S|KcXd7D^hL(?BJ#d$ZwP zEaRHW%47ijFu*~8tS+XOl+eI*jPm9C`ueQ*Ki+EvMpfXnrpK#OK?##@L(YUJnc3OF z6c}uQ!uA{5Aeb4+TEoEHUGNKtr6LjzpN|Yd3B}%iCuZD63LQd& zu6PkuwX7=D`>^D0sYB9mR!mzr=49;CCd`LggQdUnvz!7F>I*n9p=bu_*Lx^4;FWVH zruCKai{?H$^jtFK$&7EunD6V`tWVwimLN_IEEFP54oL2V%R(YYj1x>|au1RZSJ+$t zY3K*DYt5~#cp*X;FI{Q`;{+y2U)Z}q<&%a9C?Uh9(B z&!!%nc+$GMy3oA)#cD7mQ;N-B?8_u+YHsc=exia-rhsy_eCRbhGcz?kt+p(C8_0GW z)ISDY4r5YOC<9mb`nELAsO1l zR3oW&$C~KC0DA->$jTNdYrUC@bd^h`{Jgv^uz6_GthS{>j|IgHXcofw)Qbl$eNyt} z<>g<%48uWS>=PYuE-+}sMMUy5-VDm~o$!p7TZKb!f*o2EAP7S}mR9Q-BxtNG_N%I@ zhAZtj0k!<0#ejUO5^HQ}$xzsibR9r?SxZkZ4A}On#7QKl ziXe>CuX>!ceOkN8k+Ko<>tUWwAdHVm!-1jGM2?R5st(1G!cx~G_$5~Izs!CKKXc~H zD>#`M7)Eo3;m7n&)b|Tx5^s7Z1lLkZma1)2#=IPZK_zJ4`UC9)*-MnNL_33axW#QV zzCR&cVh>idQ%SmU6WWAT_P?8s3W4LCM&fTOd{^CbxqIi%)6EuE=>b;sK1Lfety-n# zXK`_H8Fc-?x`nwBbS^Y-9=yt{;FEemw@$dyqwh^plHS_EuP{34jNm4HXz!pSa0U=R z74Cb*)7e47`ff9L2K(9s`Dt9DDCZsmnk3lgI9Wp@B!4I;vf#Hw8 zz%4*qH|gmY3Tp}q3KSNweLM9hM-<@JqqqS@0S1>k$FEDzQ2;2$3O}O)>OlZnO)25p z86SKy5c|530^6ain7WB=*z?fKYcLt#3Q0>zMTHA95=aBU@&?3hI&dVddJp%=CGHoX znm9d9j-1eG5MV3ld;yHiOpFe&pWK8Hw4AIXgBBH(L_82VT}f;Cb=FTzO+~6|PL9?* z;UbdoX>zc41=~~~KMn$;dB{~(?YWJutv5In!otD@FiA{$?#k;X0sl|)C*j~d8N&{v zmRm2(uYvLG4>wQ1c(MTYhmNX@x)Z|4J6n~*GQOv$C*lP- z1YXZKvKymRvc^OHEWh1rRrgHWp~eB;jV)FT4i0v?K5Q5qqy@Wo>^vj9$g1<`x$0oN7c`v(uLoBpisP2QD?hV$FtP zxaf%ML&UFLLrZvt+b%!6Zt%}URY{goj;~0EbyGzef|G}ffTJ~%p&%Myo8Eliorvax)Qnut4ZQm)Lf-FZ(s2 z!>IqpRM8iA{+on7t7K-zVPtIl9&2#|di-gW?j_JAf>6|3;d~e+b)8C~p<~n%a7I1v zY=k_`F)d7n1Oj3}OF6WfXAS1W{%c^BLwA7*x>%=D%n1vjM;P_)-85LYcNDYZ1IxfT zgCuj1V$spk3dq*XAFM!4JSrf1752Z?BRMJ9h*R*)@YqkRU|<=BzI|~F5Ev6SICt)x z1?UJHOR5PUB( zrfYA`F)&;~l(=Y$;F;mCcGo7KKpR^}90-yHSQ}%)2C&P}(9J(v$J_^V^nC42P2O?u z-=kh_baHa{y`&po(bo@P$Q0hmForzJDJpu)r(c(VV*vHSDCCIo7*eAchP(MIK+PCI z4S?smVnS%VGPzz4gO@AN5n8EUt20KlAU$9-pNv@|3daBjN&Y3ydxA@`*Qy+ zjzN5Ud=9i=V6+iliD+&0722`dql33HYV*s=MDJ^8n1U9|fnftu#0}^*>=Jk?g2=bY z$z-A1)0!Oi-zUAjeSFX!FF06$dn}V4hkRm~3Gf2YDKl}qUub_GXpvNZ|3&#n(0O|W z7N^(eK#azN2TKWeG7i2r0;Pt|)M>Q9gVhUVPN1;vpnjk;a5F^+`?v?*#4e|Z3lzy~Utc^B8_?zbk_*!uq7aJy5XpDHE&hPK z1XgGxj|&uOYUbQF3MGiGN*#l-w$V(7qf4F~2b16Tr^{RK1y4gz-PDVqbG{oA3X>-=+JPl1HpI16Qfu*WPx4cm5ECTleJhWDLCj4{)hadjJ3c literal 0 HcmV?d00001 diff --git a/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg b/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg new file mode 100644 index 0000000000..e48d78e0ea --- /dev/null +++ b/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg @@ -0,0 +1 @@ +AAPLAMZNGOOGIBMMSFTsymbol05,00010,00015,00020,00025,00030,000Sum of price0NaNdate (year) \ No newline at end of file diff --git a/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json b/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json new file mode 100644 index 0000000000..92e1ca508c --- /dev/null +++ b/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json @@ -0,0 +1,149 @@ +{ + "$schema": "https://vega.github.io/schema/vega/v5.json", + "description": "Stock prices of 5 Tech Companies over Time.", + "background": "white", + "padding": 5, + "height": 200, + "style": "cell", + "data": [ + { + "name": "source_0", + "url": "data/stocks.csv", + "format": {"type": "csv", "parse": {"date": "date"}}, + "transform": [ + { + "field": "date", + "type": "timeunit", + "units": ["year"], + "as": ["year_date", "year_date_end"] + }, + { + "type": "aggregate", + "groupby": ["symbol", "year_date", "year_date_end"], + "ops": ["sum"], + "fields": ["price"], + "as": ["sum_price"] + }, + { + "type": "stack", + "groupby": ["symbol"], + "field": "sum_price", + "sort": {"field": ["year_date"], "order": ["descending"]}, + "as": ["sum_price_start", "sum_price_end"], + "offset": "zero" + }, + { + "type": "filter", + "expr": "isValid(datum[\"sum_price\"]) && isFinite(+datum[\"sum_price\"]) && (isDate(datum[\"year_date\"]) || (isValid(datum[\"year_date\"]) && isFinite(+datum[\"year_date\"])))" + } + ] + } + ], + "signals": [ + {"name": "x_step", "value": 20}, + { + "name": "width", + "update": "bandspace(domain('x').length, 0.1, 0.05) * x_step" + } + ], + "marks": [ + { + "name": "marks", + "type": "rect", + "style": ["bar"], + "from": {"data": "source_0"}, + "encode": { + "update": { + "fill": {"scale": "color", "field": "year_date"}, + "ariaRoleDescription": {"value": "bar"}, + "description": { + "signal": "\"symbol: \" + (isValid(datum[\"symbol\"]) ? datum[\"symbol\"] : \"\"+datum[\"symbol\"]) + \"; Sum of price: \" + (format(datum[\"sum_price\"], \"\")) + \"; date (year): \" + (timeFormat(datum[\"year_date\"], timeUnitSpecifier([\"year\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"})))" + }, + "x": {"scale": "x", "field": "symbol"}, + "width": {"signal": "max(0.25, bandwidth('x'))"}, + "y": {"scale": "y", "field": "sum_price_end"}, + "y2": {"scale": "y", "field": "sum_price_start"} + } + } + } + ], + "scales": [ + { + "name": "x", + "type": "band", + "domain": {"data": "source_0", "field": "symbol", "sort": true}, + "range": {"step": {"signal": "x_step"}}, + "paddingInner": 0.1, + "paddingOuter": 0.05 + }, + { + "name": "y", + "type": "linear", + "domain": { + "data": "source_0", + "fields": ["sum_price_start", "sum_price_end"] + }, + "range": [{"signal": "height"}, 0], + "nice": true, + "zero": true + }, + { + "name": "color", + "type": "time", + "domain": { + "data": "source_0", + "fields": [ + "year_date_offsetted_rect_start", + "year_date_offsetted_rect_end" + ] + }, + "range": "ramp", + "interpolate": "hcl" + } + ], + "axes": [ + { + "scale": "y", + "orient": "left", + "gridScale": "x", + "grid": true, + "tickCount": {"signal": "ceil(height/40)"}, + "domain": false, + "labels": false, + "aria": false, + "maxExtent": 0, + "minExtent": 0, + "ticks": false, + "zindex": 0 + }, + { + "scale": "x", + "orient": "bottom", + "grid": false, + "title": "symbol", + "labelAlign": "right", + "labelAngle": 270, + "labelBaseline": "middle", + "zindex": 0 + }, + { + "scale": "y", + "orient": "left", + "grid": false, + "title": "Sum of price", + "labelOverlap": true, + "tickCount": {"signal": "ceil(height/40)"}, + "zindex": 0 + } + ], + "legends": [ + { + "fill": "color", + "format": { + "signal": "timeUnitSpecifier([\"year\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"})" + }, + "gradientLength": {"signal": "clamp(height, 64, 200)"}, + "title": "date (year)" + } + ] +} From 6258cd9d58c2b128e5982daf7542ee2c682f3b7f Mon Sep 17 00:00:00 2001 From: Fan Du Date: Thu, 9 Nov 2023 16:33:40 -0800 Subject: [PATCH 3/4] fix: make isRectWithOffset check consistent --- src/compile/scale/domain.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compile/scale/domain.ts b/src/compile/scale/domain.ts index 1fde82c326..b98669a66f 100644 --- a/src/compile/scale/domain.ts +++ b/src/compile/scale/domain.ts @@ -10,7 +10,7 @@ import { SHARED_DOMAIN_OPS } from '../../aggregate'; import {isBinning, isBinParams, isParameterExtent} from '../../bin'; -import {getSecondaryRangeChannel, isScaleChannel, ScaleChannel} from '../../channel'; +import {getSecondaryRangeChannel, isScaleChannel, isXorY, ScaleChannel} from '../../channel'; import { binRequiresRange, getBandPosition, @@ -356,7 +356,7 @@ function parseSingleChannelDomain( const data = model.requestDataName(DataSourceType.Main); const bandPosition = getBandPosition({fieldDef, fieldDef2, markDef, config}); - const isRectWithOffset = isRectBasedMark(mark) && bandPosition !== 0.5; + const isRectWithOffset = isRectBasedMark(mark) && bandPosition !== 0.5 && isXorY(channel); return makeImplicit([ { data, From f8b0b5e09a9a7b96b0f47353eb471682d1d4ba37 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Fri, 10 Nov 2023 00:36:26 +0000 Subject: [PATCH 4/4] chore: update examples [CI] --- ...l_color_config_time_unit_band_position.png | Bin 14369 -> 17626 bytes ...l_color_config_time_unit_band_position.svg | 2 +- ...lor_config_time_unit_band_position.vg.json | 8 +------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/examples/compiled/bar_temporal_color_config_time_unit_band_position.png b/examples/compiled/bar_temporal_color_config_time_unit_band_position.png index 53d51077ba30f18526ada2365f601ffc46e67012..1f5c7fdad4a26972ce7d6aac7df0f350e1ce9ab3 100644 GIT binary patch literal 17626 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

t6t&ybKS2 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 F{y+6!9^e1~ literal 14369 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

_Q`~%<-%q2K<2k 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 diff --git a/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg b/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg index e48d78e0ea..eb89dbae65 100644 --- a/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg +++ b/examples/compiled/bar_temporal_color_config_time_unit_band_position.svg @@ -1 +1 @@ -AAPLAMZNGOOGIBMMSFTsymbol05,00010,00015,00020,00025,00030,000Sum of price0NaNdate (year) \ No newline at end of file +AAPLAMZNGOOGIBMMSFTsymbol05,00010,00015,00020,00025,00030,000Sum of price200020022004200620082010date (year) \ No newline at end of file diff --git a/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json b/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json index 92e1ca508c..a1e33bc152 100644 --- a/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json +++ b/examples/compiled/bar_temporal_color_config_time_unit_band_position.vg.json @@ -90,13 +90,7 @@ { "name": "color", "type": "time", - "domain": { - "data": "source_0", - "fields": [ - "year_date_offsetted_rect_start", - "year_date_offsetted_rect_end" - ] - }, + "domain": {"data": "source_0", "fields": ["year_date", "year_date_end"]}, "range": "ramp", "interpolate": "hcl" }