diff --git a/examples/compiled/arc_color_mappings.vg.json b/examples/compiled/arc_color_mappings.vg.json index 5daa21b31bf..66c6500b6f8 100644 --- a/examples/compiled/arc_color_mappings.vg.json +++ b/examples/compiled/arc_color_mappings.vg.json @@ -5,6 +5,7 @@ "padding": 5, "width": 200, "height": 200, + "style": "view", "data": [ { "name": "source_0", diff --git a/examples/compiled/arc_pie_normalize_tooltip.vg.json b/examples/compiled/arc_pie_normalize_tooltip.vg.json index eaa71afdf9c..848ad49ca41 100644 --- a/examples/compiled/arc_pie_normalize_tooltip.vg.json +++ b/examples/compiled/arc_pie_normalize_tooltip.vg.json @@ -5,6 +5,7 @@ "padding": 5, "width": 200, "height": 200, + "style": "view", "data": [ { "name": "source_0", diff --git a/examples/compiled/dynamic_color_legend.png b/examples/compiled/dynamic_color_legend.png index fe0095cbbb5..ac93060f753 100644 Binary files a/examples/compiled/dynamic_color_legend.png and b/examples/compiled/dynamic_color_legend.png differ diff --git a/examples/compiled/dynamic_color_legend.svg b/examples/compiled/dynamic_color_legend.svg index 3f541c6cf31..f2b76486fa2 100644 --- a/examples/compiled/dynamic_color_legend.svg +++ b/examples/compiled/dynamic_color_legend.svg @@ -1 +1 @@ -JanFebMarAprMayJunJulAugSepOctNovDecDate−50510152025303540Maximum Daily Temperature (C)050100150200250300350400450500550600650Count of RecordsdrizzlefograinsnowsunWeathersunfogdrizzlerainsnowWeather01020304050PrecipitationSeattle Weather, 2012-2015 \ No newline at end of file +JanFebMarAprMayJunJulAugSepOctNovDecDate−50510152025303540Maximum Daily Temperature (C)050100150200250300350400450500550600650Count of RecordsdrizzlefograinsnowsunWeathersunfogdrizzlerainsnowWeather01020304050PrecipitationSeattle Weather, 2012-2015 \ No newline at end of file diff --git a/examples/compiled/dynamic_color_legend.vg.json b/examples/compiled/dynamic_color_legend.vg.json index 3513dc5ec98..c879e5b1caf 100644 --- a/examples/compiled/dynamic_color_legend.vg.json +++ b/examples/compiled/dynamic_color_legend.vg.json @@ -10,7 +10,7 @@ { "name": "source_0", "url": "data/seattle-weather.csv", - "format": {"type": "csv", "parse": {"date": "date"}, "delimiter": ","} + "format": {"type": "csv", "parse": {"date": "date"}} }, { "name": "data_0", @@ -66,7 +66,9 @@ { "name": "unit", "value": {}, - "on": [{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}] + "on": [ + {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + ] }, { "name": "brush", @@ -103,7 +105,9 @@ "events": { "source": "scope", "type": "mousedown", - "filter": ["!event.item || event.item.mark.name !== \"brush_brush\""] + "filter": [ + "!event.item || event.item.mark.name !== \"brush_brush\"" + ] }, "update": "[x(unit), x(unit)]" }, @@ -116,7 +120,9 @@ { "source": "scope", "type": "mousedown", - "filter": ["!event.item || event.item.mark.name !== \"brush_brush\""] + "filter": [ + "!event.item || event.item.mark.name !== \"brush_brush\"" + ] }, {"source": "window", "type": "mouseup"} ] @@ -361,7 +367,10 @@ }, {"value": 0} ], - "stroke": [{"test": "brush_x[0] !== brush_x[1]", "value": "white"}, {"value": null}] + "stroke": [ + {"test": "brush_x[0] !== brush_x[1]", "value": "white"}, + {"value": null} + ] } } } diff --git a/examples/compiled/histogram_nonlinear.png b/examples/compiled/histogram_nonlinear.png index 14fd59ba2fe..a853c092e78 100644 Binary files a/examples/compiled/histogram_nonlinear.png and b/examples/compiled/histogram_nonlinear.png differ diff --git a/examples/compiled/histogram_nonlinear.svg b/examples/compiled/histogram_nonlinear.svg index 3d5e576f930..6c6ef7a61ec 100644 --- a/examples/compiled/histogram_nonlinear.svg +++ b/examples/compiled/histogram_nonlinear.svg @@ -1 +1 @@ -08.3312.5016.6733.3350.0066.6783.330%50%100%Distribution of Frame Render Time (ms) \ No newline at end of file +12080603020151200%50%100%Distribution of Frame Render Time (fps) \ No newline at end of file diff --git a/examples/compiled/histogram_nonlinear.vg.json b/examples/compiled/histogram_nonlinear.vg.json index 2e175dd5463..0230f34fe85 100644 --- a/examples/compiled/histogram_nonlinear.vg.json +++ b/examples/compiled/histogram_nonlinear.vg.json @@ -4,7 +4,10 @@ "background": "white", "padding": 5, "height": 100, - "title": {"text": "Distribution of Frame Render Time (ms)", "frame": "group"}, + "title": { + "text": "Distribution of Frame Render Time (fps)", + "frame": "group" + }, "style": "cell", "data": [ { @@ -103,6 +106,15 @@ "grid": false, "labelAngle": 0, "labelBaseline": "top", + "encode": { + "labels": { + "update": { + "text": { + "signal": "datum.value === '∞' ? '0' : format(1000/datum.value, 'd')" + } + } + } + }, "zindex": 0 }, { diff --git a/examples/compiled/interactive_geo_earthquakes.vg.json b/examples/compiled/interactive_geo_earthquakes.vg.json index 24d9a2785ad..84686894050 100644 --- a/examples/compiled/interactive_geo_earthquakes.vg.json +++ b/examples/compiled/interactive_geo_earthquakes.vg.json @@ -4,6 +4,7 @@ "padding": 5, "width": 300, "height": 300, + "style": "view", "data": [ {"name": "source_0", "values": [{"type": "Sphere"}]}, { diff --git a/examples/specs/histogram_nonlinear.vl.json b/examples/specs/histogram_nonlinear.vl.json index 6a291c340fd..02113b43a08 100644 --- a/examples/specs/histogram_nonlinear.vl.json +++ b/examples/specs/histogram_nonlinear.vl.json @@ -45,7 +45,7 @@ } ] }, - "title": "Distribution of Frame Render Time (ms)", + "title": "Distribution of Frame Render Time (fps)", "width": {"step": 40}, "height": 100, "mark": {"type": "bar", "cornerRadiusEnd": 0, "orient": "vertical"}, @@ -55,7 +55,7 @@ "field": "startTime", "type": "ordinal", "scale": {"type": "point", "padding": 0}, - "axis": {"labelAngle": 0}, + "axis": {"labelAngle": 0, "labelExpr": "datum.value === '∞' ? '0' : format(1000/datum.value, 'd')"}, "sort": null }, "x2": {"field": "endTime"}, diff --git a/test-runtime/interval.test.ts b/test-runtime/interval.test.ts index 1ece7a2dd2a..5c707a5661c 100644 --- a/test-runtime/interval.test.ts +++ b/test-runtime/interval.test.ts @@ -201,7 +201,7 @@ describe('interval selections at runtime in unit views', () => { describe('geo-intervals', () => { it('should add IDs to the store', async () => { await embed(geoSpec()); - const store = await page.evaluate(brush('drag', 1)); + const store: any = await page.evaluate(brush('drag', 1)); expect(store).toHaveLength(13); for (const t of store) { expect(t).toHaveProperty('_vgsid_'); @@ -211,7 +211,7 @@ describe('interval selections at runtime in unit views', () => { it('should respect projections', async () => { await embed(geoSpec({encodings: ['longitude']})); - const store = await page.evaluate(brush('drag', 0)); + const store: any = await page.evaluate(brush('drag', 0)); expect(store).toHaveLength(20); for (const t of store) { expect(t).toHaveProperty('_vgsid_'); diff --git a/test-runtime/translate.test.ts b/test-runtime/translate.test.ts index ba0c7f3cd9b..db72e2e73b7 100644 --- a/test-runtime/translate.test.ts +++ b/test-runtime/translate.test.ts @@ -195,7 +195,7 @@ describe('Translate interval selections at runtime', () => { await testRender(`geo-0`); for (let i = 0; i < hits.translate.length; i++) { - const translate = await page.evaluate(brush('translate', i, null, true)); + const translate: any = await page.evaluate(brush('translate', i, null, true)); expect(translate.length).toBeGreaterThan(0); await testRender(`geo-${i + 1}`); } diff --git a/test-runtime/zoom.test.ts b/test-runtime/zoom.test.ts index f823ec3ba01..588b093a3f6 100644 --- a/test-runtime/zoom.test.ts +++ b/test-runtime/zoom.test.ts @@ -225,7 +225,7 @@ describe('Zoom interval selections at runtime', () => { await testRender(`geo-0`); for (let i = 0; i < hits.zoom.length; i++) { - const zoomed = await page.evaluate(zoom('zoom', i, i % 2 ? 'out' : 'in', null, true)); + const zoomed: any = await page.evaluate(zoom('zoom', i, i % 2 ? 'out' : 'in', null, true)); expect(zoomed.length).toBeGreaterThan(0); await testRender(`geo-${i + 1}`); }