diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json index 8532a959ee..ee01f9dafd 100644 --- a/build/vega-lite-schema.json +++ b/build/vega-lite-schema.json @@ -12499,7 +12499,7 @@ "description": "With layered and multi-view displays, a strategy that determines how selections' data queries are resolved when applied in a filter transform, conditional encoding rule, or scale domain.\n\nOne of:\n- `\"global\"` -- only one brush exists for the entire SPLOM. When the user begins to drag, any previous brushes are cleared, and a new one is constructed.\n- `\"union\"` -- each cell contains its own brush, and points are highlighted if they lie within _any_ of these individual brushes.\n- `\"intersect\"` -- each cell contains its own brush, and points are highlighted only if they fall within _all_ of these individual brushes.\n\n__Default value:__ `global`.\n\n__See also:__ [`resolve` examples](https://vega.github.io/vega-lite/docs/selection.html#resolve) in the documentation." }, "translate": { - "description": "When truthy, allows a user to interactively move an interval selection back-and-forth. Can be `true`, `false` (to disable panning), or a [Vega event stream definition](https://vega.github.io/vega/docs/event-streams/) which must include a start and end event to trigger continuous panning. Discrete panning (e.g., pressing the left/right arrow keys) will be supported in future versions.\n\n__Default value:__ `true`, which corresponds to `[mousedown, window:mouseup] > window:mousemove!`. This default allows users to clicks and drags within an interval selection to reposition it.\n\n__See also:__ [`translate` examples](https://vega.github.io/vega-lite/docs/selection.html#translate) in the documentation.", + "description": "When truthy, allows a user to interactively move an interval selection back-and-forth. Can be `true`, `false` (to disable panning), or a [Vega event stream definition](https://vega.github.io/vega/docs/event-streams/) which must include a start and end event to trigger continuous panning. Discrete panning (e.g., pressing the left/right arrow keys) will be supported in future versions.\n\n__Default value:__ `true`, which corresponds to `[pointerdown, window:pointerup] > window:pointermove!`. This default allows users to clicks and drags within an interval selection to reposition it.\n\n__See also:__ [`translate` examples](https://vega.github.io/vega-lite/docs/selection.html#translate) in the documentation.", "type": [ "string", "boolean" @@ -12574,7 +12574,7 @@ "description": "With layered and multi-view displays, a strategy that determines how selections' data queries are resolved when applied in a filter transform, conditional encoding rule, or scale domain.\n\nOne of:\n- `\"global\"` -- only one brush exists for the entire SPLOM. When the user begins to drag, any previous brushes are cleared, and a new one is constructed.\n- `\"union\"` -- each cell contains its own brush, and points are highlighted if they lie within _any_ of these individual brushes.\n- `\"intersect\"` -- each cell contains its own brush, and points are highlighted only if they fall within _all_ of these individual brushes.\n\n__Default value:__ `global`.\n\n__See also:__ [`resolve` examples](https://vega.github.io/vega-lite/docs/selection.html#resolve) in the documentation." }, "translate": { - "description": "When truthy, allows a user to interactively move an interval selection back-and-forth. Can be `true`, `false` (to disable panning), or a [Vega event stream definition](https://vega.github.io/vega/docs/event-streams/) which must include a start and end event to trigger continuous panning. Discrete panning (e.g., pressing the left/right arrow keys) will be supported in future versions.\n\n__Default value:__ `true`, which corresponds to `[mousedown, window:mouseup] > window:mousemove!`. This default allows users to clicks and drags within an interval selection to reposition it.\n\n__See also:__ [`translate` examples](https://vega.github.io/vega-lite/docs/selection.html#translate) in the documentation.", + "description": "When truthy, allows a user to interactively move an interval selection back-and-forth. Can be `true`, `false` (to disable panning), or a [Vega event stream definition](https://vega.github.io/vega/docs/event-streams/) which must include a start and end event to trigger continuous panning. Discrete panning (e.g., pressing the left/right arrow keys) will be supported in future versions.\n\n__Default value:__ `true`, which corresponds to `[pointerdown, window:pointerup] > window:pointermove!`. This default allows users to clicks and drags within an interval selection to reposition it.\n\n__See also:__ [`translate` examples](https://vega.github.io/vega-lite/docs/selection.html#translate) in the documentation.", "type": [ "string", "boolean" diff --git a/examples/compiled/airport_connections.vg.json b/examples/compiled/airport_connections.vg.json index 364fc421b5..92a8c59421 100644 --- a/examples/compiled/airport_connections.vg.json +++ b/examples/compiled/airport_connections.vg.json @@ -121,7 +121,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -135,7 +135,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_2_voronoi" } ], @@ -154,7 +154,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_2_voronoi" } ], diff --git a/examples/compiled/bar_count_minimap.vg.json b/examples/compiled/bar_count_minimap.vg.json index 55686d7c9f..da5f50f1c4 100644 --- a/examples/compiled/bar_count_minimap.vg.json +++ b/examples/compiled/bar_count_minimap.vg.json @@ -55,7 +55,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -149,7 +149,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -159,17 +159,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, concat_1_height)]" @@ -229,7 +229,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -245,15 +245,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/brush_table.vg.json b/examples/compiled/brush_table.vg.json index 5e761e0377..43feeb43ee 100644 --- a/examples/compiled/brush_table.vg.json +++ b/examples/compiled/brush_table.vg.json @@ -73,7 +73,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -101,7 +101,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -111,17 +111,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, concat_0_width)]" @@ -160,7 +160,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -170,17 +170,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, concat_0_height)]" @@ -248,7 +248,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -264,15 +264,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/circle_bubble_health_income.vg.json b/examples/compiled/circle_bubble_health_income.vg.json index 1ed6e4370b..d9c92b761e 100644 --- a/examples/compiled/circle_bubble_health_income.vg.json +++ b/examples/compiled/circle_bubble_health_income.vg.json @@ -25,7 +25,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "view", "update": "vlSelectionResolve(\"view_store\", \"union\")"}, @@ -78,7 +78,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"x\"), extent_y: domain(\"y\")}" } ] @@ -91,11 +91,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/concat_bar_layer_circle.vg.json b/examples/compiled/concat_bar_layer_circle.vg.json index 4bdc186d2f..170abb4319 100644 --- a/examples/compiled/concat_bar_layer_circle.vg.json +++ b/examples/compiled/concat_bar_layer_circle.vg.json @@ -119,7 +119,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/concat_hover.vg.json b/examples/compiled/concat_hover.vg.json index bcac8cf22a..56846cba0c 100644 --- a/examples/compiled/concat_hover.vg.json +++ b/examples/compiled/concat_hover.vg.json @@ -42,7 +42,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -67,7 +67,7 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"concat_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -82,7 +82,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, { @@ -195,7 +195,7 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"concat_1\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -210,7 +210,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, { diff --git a/examples/compiled/concat_hover_filter.vg.json b/examples/compiled/concat_hover_filter.vg.json index ecab1973b5..120ca84bc5 100644 --- a/examples/compiled/concat_hover_filter.vg.json +++ b/examples/compiled/concat_hover_filter.vg.json @@ -72,7 +72,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -97,7 +97,7 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"concat_0_layer_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -112,7 +112,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, { @@ -238,7 +238,7 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"concat_1_layer_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -253,7 +253,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, { diff --git a/examples/compiled/dynamic_color_legend.vg.json b/examples/compiled/dynamic_color_legend.vg.json index 0f7b189077..4193e2fd7e 100644 --- a/examples/compiled/dynamic_color_legend.vg.json +++ b/examples/compiled/dynamic_color_legend.vg.json @@ -67,7 +67,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -104,7 +104,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -114,17 +114,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -187,7 +187,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -203,15 +203,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_1d_geo_brush.vg.json b/examples/compiled/interactive_1d_geo_brush.vg.json index cc4abb825d..305a000a68 100644 --- a/examples/compiled/interactive_1d_geo_brush.vg.json +++ b/examples/compiled/interactive_1d_geo_brush.vg.json @@ -54,7 +54,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -86,7 +86,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -96,17 +96,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_latitude_1[0], clamp(y(unit), 0, height)]" @@ -143,7 +143,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_y: slice(brush_latitude_1)}" } @@ -157,15 +161,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_airport_crossfilter.vg.json b/examples/compiled/interactive_airport_crossfilter.vg.json index dcd9ead942..ec0ea33fd0 100644 --- a/examples/compiled/interactive_airport_crossfilter.vg.json +++ b/examples/compiled/interactive_airport_crossfilter.vg.json @@ -208,7 +208,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -250,7 +250,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -260,17 +260,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_latitude_1[0], clamp(y(unit), 0, concat_0_height)]" @@ -296,7 +296,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -306,17 +306,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_longitude_1[0], clamp(x(unit), 0, concat_0_width)]" @@ -355,7 +355,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -371,15 +371,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_area_brush.vg.json b/examples/compiled/interactive_area_brush.vg.json index 1c3914f04e..a6200b8a34 100644 --- a/examples/compiled/interactive_area_brush.vg.json +++ b/examples/compiled/interactive_area_brush.vg.json @@ -56,7 +56,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -70,7 +70,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -80,17 +80,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -151,7 +151,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x)}" } @@ -165,15 +169,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_bar_select_highlight.vg.json b/examples/compiled/interactive_bar_select_highlight.vg.json index 348178735e..4c67db065f 100644 --- a/examples/compiled/interactive_bar_select_highlight.vg.json +++ b/examples/compiled/interactive_bar_select_highlight.vg.json @@ -58,7 +58,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -73,7 +73,7 @@ "name": "highlight_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -85,7 +85,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/interactive_bin_extent.vg.json b/examples/compiled/interactive_bin_extent.vg.json index 5c34e37243..99a55e1a2e 100644 --- a/examples/compiled/interactive_bin_extent.vg.json +++ b/examples/compiled/interactive_bin_extent.vg.json @@ -93,7 +93,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -121,7 +121,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -131,17 +131,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -204,7 +204,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -220,15 +220,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_bin_extent_bottom.vg.json b/examples/compiled/interactive_bin_extent_bottom.vg.json index 3147f356c0..d4c500689f 100644 --- a/examples/compiled/interactive_bin_extent_bottom.vg.json +++ b/examples/compiled/interactive_bin_extent_bottom.vg.json @@ -94,7 +94,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -203,7 +203,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -213,17 +213,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -286,7 +286,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -302,15 +302,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_brush.vg.json b/examples/compiled/interactive_brush.vg.json index 14ada8c39e..45decf1ac6 100644 --- a/examples/compiled/interactive_brush.vg.json +++ b/examples/compiled/interactive_brush.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -51,7 +51,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -61,17 +61,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -111,7 +111,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -121,17 +121,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -197,7 +197,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x), extent_y: slice(brush_y)}" } @@ -211,15 +215,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_concat_layer.vg.json b/examples/compiled/interactive_concat_layer.vg.json index 3c7d4eed1c..8fe143bcde 100644 --- a/examples/compiled/interactive_concat_layer.vg.json +++ b/examples/compiled/interactive_concat_layer.vg.json @@ -119,7 +119,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/interactive_dashboard_europe_pop.vg.json b/examples/compiled/interactive_dashboard_europe_pop.vg.json index 7907c00a1f..5816e34a46 100644 --- a/examples/compiled/interactive_dashboard_europe_pop.vg.json +++ b/examples/compiled/interactive_dashboard_europe_pop.vg.json @@ -373,7 +373,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -401,7 +401,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -411,17 +411,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, concat_0_height)]" @@ -481,7 +481,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -497,15 +497,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -725,7 +725,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -735,17 +735,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, concat_1_height)]" @@ -805,7 +805,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -821,15 +821,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1049,7 +1049,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1059,17 +1059,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, concat_2_width)]" @@ -1108,7 +1108,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1118,17 +1118,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, concat_2_height)]" @@ -1206,7 +1206,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1222,15 +1222,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_global_development.vg.json b/examples/compiled/interactive_global_development.vg.json index 4e5bb816f3..abfdd0571a 100644 --- a/examples/compiled/interactive_global_development.vg.json +++ b/examples/compiled/interactive_global_development.vg.json @@ -111,7 +111,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -155,7 +155,7 @@ "name": "hovered_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"layer_1_layer_1\", fields: hovered_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"country\"]]} : null", "force": true }, diff --git a/examples/compiled/interactive_histogram_full_height_hover.vg.json b/examples/compiled/interactive_histogram_full_height_hover.vg.json index 27e61a9435..ecb49a4857 100644 --- a/examples/compiled/interactive_histogram_full_height_hover.vg.json +++ b/examples/compiled/interactive_histogram_full_height_hover.vg.json @@ -71,7 +71,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -82,11 +82,11 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"layer_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, - {"events": [{"source": "view", "type": "mouseout"}], "update": "null"} + {"events": [{"source": "view", "type": "pointerout"}], "update": "null"} ] }, { @@ -94,10 +94,13 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, - {"events": [{"source": "view", "type": "mouseout"}], "update": "false"} + { + "events": [{"source": "view", "type": "pointerout"}], + "update": "false" + } ] }, { diff --git a/examples/compiled/interactive_index_chart.vg.json b/examples/compiled/interactive_index_chart.vg.json index eb99021bba..58c0e70a1e 100644 --- a/examples/compiled/interactive_index_chart.vg.json +++ b/examples/compiled/interactive_index_chart.vg.json @@ -101,7 +101,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -115,7 +115,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_0_voronoi" } ], @@ -137,7 +137,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_0_voronoi" } ], diff --git a/examples/compiled/interactive_layered_crossfilter.vg.json b/examples/compiled/interactive_layered_crossfilter.vg.json index cbba42703a..5e60173eee 100644 --- a/examples/compiled/interactive_layered_crossfilter.vg.json +++ b/examples/compiled/interactive_layered_crossfilter.vg.json @@ -187,7 +187,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -215,7 +215,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -225,17 +225,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -298,7 +298,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -314,15 +314,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -576,7 +576,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -586,17 +586,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -659,7 +659,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -675,15 +675,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -937,7 +937,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -947,17 +947,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1020,7 +1020,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1036,15 +1036,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_layered_crossfilter_discrete.vg.json b/examples/compiled/interactive_layered_crossfilter_discrete.vg.json index c0623669b1..3a58160721 100644 --- a/examples/compiled/interactive_layered_crossfilter_discrete.vg.json +++ b/examples/compiled/interactive_layered_crossfilter_discrete.vg.json @@ -187,7 +187,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/interactive_legend.vg.json b/examples/compiled/interactive_legend.vg.json index b47ef7c183..5acf51dd37 100644 --- a/examples/compiled/interactive_legend.vg.json +++ b/examples/compiled/interactive_legend.vg.json @@ -49,7 +49,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/interactive_legend_dblclick.vg.json b/examples/compiled/interactive_legend_dblclick.vg.json index d56c30d385..f30cd40e67 100644 --- a/examples/compiled/interactive_legend_dblclick.vg.json +++ b/examples/compiled/interactive_legend_dblclick.vg.json @@ -49,7 +49,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/interactive_line_brush_cursor.vg.json b/examples/compiled/interactive_line_brush_cursor.vg.json index d49201148c..a79c1cba91 100644 --- a/examples/compiled/interactive_line_brush_cursor.vg.json +++ b/examples/compiled/interactive_line_brush_cursor.vg.json @@ -21,7 +21,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -35,7 +35,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -45,17 +45,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -116,7 +116,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x)}" } @@ -130,15 +134,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_line_hover.vg.json b/examples/compiled/interactive_line_hover.vg.json index 1963e9a726..290fea3598 100644 --- a/examples/compiled/interactive_line_hover.vg.json +++ b/examples/compiled/interactive_line_hover.vg.json @@ -46,7 +46,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -57,7 +57,7 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"layer_0\", fields: hover_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"symbol\"]]} : null", "force": true }, @@ -70,7 +70,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/interactive_line_point_hover.vg.json b/examples/compiled/interactive_line_point_hover.vg.json index ecb72ef7d3..217995417c 100644 --- a/examples/compiled/interactive_line_point_hover.vg.json +++ b/examples/compiled/interactive_line_point_hover.vg.json @@ -33,7 +33,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -44,11 +44,11 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"layer_1\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, - {"events": [{"source": "view", "type": "mouseout"}], "update": "null"} + {"events": [{"source": "view", "type": "pointerout"}], "update": "null"} ] }, { @@ -56,10 +56,13 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, - {"events": [{"source": "view", "type": "mouseout"}], "update": "false"} + { + "events": [{"source": "view", "type": "pointerout"}], + "update": "false" + } ] }, { diff --git a/examples/compiled/interactive_multi_line_label.vg.json b/examples/compiled/interactive_multi_line_label.vg.json index 2603c47971..903598cd43 100644 --- a/examples/compiled/interactive_multi_line_label.vg.json +++ b/examples/compiled/interactive_multi_line_label.vg.json @@ -65,7 +65,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -79,7 +79,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_0_layer_1_voronoi" } ], @@ -101,7 +101,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_0_layer_1_voronoi" } ], diff --git a/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json b/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json index 3086ee2732..37bd13d8d1 100644 --- a/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json +++ b/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json @@ -49,7 +49,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -63,14 +63,14 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_1_voronoi" } ], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"layer_1\", fields: hover_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"date\"]]} : null", "force": true }, - {"events": [{"source": "view", "type": "mouseout"}], "update": "null"} + {"events": [{"source": "view", "type": "pointerout"}], "update": "null"} ] }, {"name": "hover_tuple_fields", "value": [{"type": "E", "field": "date"}]}, @@ -82,13 +82,16 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "layer_1_voronoi" } ], "update": "event.shiftKey" }, - {"events": [{"source": "view", "type": "mouseout"}], "update": "false"} + { + "events": [{"source": "view", "type": "pointerout"}], + "update": "false" + } ] }, { diff --git a/examples/compiled/interactive_multi_line_tooltip.vg.json b/examples/compiled/interactive_multi_line_tooltip.vg.json index e2e040cc4b..9eed96e4d9 100644 --- a/examples/compiled/interactive_multi_line_tooltip.vg.json +++ b/examples/compiled/interactive_multi_line_tooltip.vg.json @@ -40,7 +40,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -51,7 +51,7 @@ "name": "hover_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"layer_2\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -63,7 +63,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/interactive_overview_detail.vg.json b/examples/compiled/interactive_overview_detail.vg.json index e429262af7..1a09c1638c 100644 --- a/examples/compiled/interactive_overview_detail.vg.json +++ b/examples/compiled/interactive_overview_detail.vg.json @@ -62,7 +62,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -175,7 +175,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -185,17 +185,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -258,7 +258,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -274,15 +274,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_paintbrush.vg.json b/examples/compiled/interactive_paintbrush.vg.json index 2bf757ea3e..453313cf66 100644 --- a/examples/compiled/interactive_paintbrush.vg.json +++ b/examples/compiled/interactive_paintbrush.vg.json @@ -29,7 +29,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -41,7 +41,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mouseover", "markname": "voronoi"} + {"source": "scope", "type": "pointerover", "markname": "voronoi"} ], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true @@ -55,7 +55,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mouseover", "markname": "voronoi"} + {"source": "scope", "type": "pointerover", "markname": "voronoi"} ], "update": "event.shiftKey" }, diff --git a/examples/compiled/interactive_paintbrush_color.vg.json b/examples/compiled/interactive_paintbrush_color.vg.json index 5d7bd66460..c15d875689 100644 --- a/examples/compiled/interactive_paintbrush_color.vg.json +++ b/examples/compiled/interactive_paintbrush_color.vg.json @@ -29,7 +29,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -40,7 +40,7 @@ "name": "paintbrush_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -52,7 +52,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/interactive_paintbrush_color_nearest.vg.json b/examples/compiled/interactive_paintbrush_color_nearest.vg.json index d8860ed764..f7d962fa2d 100644 --- a/examples/compiled/interactive_paintbrush_color_nearest.vg.json +++ b/examples/compiled/interactive_paintbrush_color_nearest.vg.json @@ -29,7 +29,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -41,7 +41,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mouseover", "markname": "voronoi"} + {"source": "scope", "type": "pointerover", "markname": "voronoi"} ], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true @@ -55,7 +55,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mouseover", "markname": "voronoi"} + {"source": "scope", "type": "pointerover", "markname": "voronoi"} ], "update": "event.shiftKey" }, diff --git a/examples/compiled/interactive_paintbrush_interval.vg.json b/examples/compiled/interactive_paintbrush_interval.vg.json index a7bc7dbf2a..ca92f23c6d 100644 --- a/examples/compiled/interactive_paintbrush_interval.vg.json +++ b/examples/compiled/interactive_paintbrush_interval.vg.json @@ -25,7 +25,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -39,7 +39,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"paintbrush_brush\"" ] @@ -49,17 +49,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"paintbrush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[paintbrush_x[0], clamp(x(unit), 0, width)]" @@ -98,7 +98,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"paintbrush_brush\"" ] @@ -108,17 +108,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"paintbrush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[paintbrush_y[0], clamp(y(unit), 0, height)]" @@ -186,7 +186,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "paintbrush_brush" } ], @@ -202,15 +202,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "paintbrush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_paintbrush_simple_false.vg.json b/examples/compiled/interactive_paintbrush_simple_false.vg.json index 65a995d1a9..c5954a16e8 100644 --- a/examples/compiled/interactive_paintbrush_simple_false.vg.json +++ b/examples/compiled/interactive_paintbrush_simple_false.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -40,7 +40,7 @@ "name": "paintbrush_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -52,7 +52,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/interactive_paintbrush_simple_true.vg.json b/examples/compiled/interactive_paintbrush_simple_true.vg.json index d152b0696a..6e225de8b8 100644 --- a/examples/compiled/interactive_paintbrush_simple_true.vg.json +++ b/examples/compiled/interactive_paintbrush_simple_true.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -40,7 +40,7 @@ "name": "paintbrush_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -52,7 +52,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/interactive_panzoom_splom.vg.json b/examples/compiled/interactive_panzoom_splom.vg.json index b4d3aaaa81..ee08ac75c4 100644 --- a/examples/compiled/interactive_panzoom_splom.vg.json +++ b/examples/compiled/interactive_panzoom_splom.vg.json @@ -103,7 +103,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -186,7 +186,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Horsepowercolumn_Miles_per_Gallon_x\"), extent_y: domain(\"child__row_Horsepowercolumn_Miles_per_Gallon_y\")}" } ] @@ -199,11 +199,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -388,7 +388,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Horsepowercolumn_Acceleration_x\"), extent_y: domain(\"child__row_Horsepowercolumn_Acceleration_y\")}" } ] @@ -401,11 +401,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -569,7 +569,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Horsepowercolumn_Horsepower_x\")}" } ] @@ -582,11 +582,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -773,7 +773,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Accelerationcolumn_Miles_per_Gallon_x\"), extent_y: domain(\"child__row_Accelerationcolumn_Miles_per_Gallon_y\")}" } ] @@ -786,11 +786,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -954,7 +954,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Accelerationcolumn_Acceleration_x\")}" } ] @@ -967,11 +967,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -1156,7 +1156,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Accelerationcolumn_Horsepower_x\"), extent_y: domain(\"child__row_Accelerationcolumn_Horsepower_y\")}" } ] @@ -1169,11 +1169,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -1337,7 +1337,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Miles_per_Galloncolumn_Miles_per_Gallon_x\")}" } ] @@ -1350,11 +1350,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -1541,7 +1541,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Miles_per_Galloncolumn_Acceleration_x\"), extent_y: domain(\"child__row_Miles_per_Galloncolumn_Acceleration_y\")}" } ] @@ -1554,11 +1554,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], @@ -1745,7 +1745,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"child__row_Miles_per_Galloncolumn_Horsepower_x\"), extent_y: domain(\"child__row_Miles_per_Galloncolumn_Horsepower_y\")}" } ] @@ -1758,11 +1758,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_panzoom_vconcat_shared.vg.json b/examples/compiled/interactive_panzoom_vconcat_shared.vg.json index 1b0b71ce9e..ad089bb44d 100644 --- a/examples/compiled/interactive_panzoom_vconcat_shared.vg.json +++ b/examples/compiled/interactive_panzoom_vconcat_shared.vg.json @@ -33,7 +33,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -115,7 +115,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"x\"), extent_y: domain(\"concat_0_y\")}" } ] @@ -128,11 +128,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_point_init.vg.json b/examples/compiled/interactive_point_init.vg.json index b9052f95b0..7ea5d46c2c 100644 --- a/examples/compiled/interactive_point_init.vg.json +++ b/examples/compiled/interactive_point_init.vg.json @@ -45,7 +45,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/interactive_query_widgets.vg.json b/examples/compiled/interactive_query_widgets.vg.json index 545c77863f..27a4d523a2 100644 --- a/examples/compiled/interactive_query_widgets.vg.json +++ b/examples/compiled/interactive_query_widgets.vg.json @@ -58,7 +58,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/interactive_seattle_weather.vg.json b/examples/compiled/interactive_seattle_weather.vg.json index 95aedce2d9..985b686756 100644 --- a/examples/compiled/interactive_seattle_weather.vg.json +++ b/examples/compiled/interactive_seattle_weather.vg.json @@ -67,7 +67,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -99,7 +99,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -109,17 +109,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -182,7 +182,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -198,15 +198,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_splom.vg.json b/examples/compiled/interactive_splom.vg.json index 977b8fa8e7..8f688c7d15 100644 --- a/examples/compiled/interactive_splom.vg.json +++ b/examples/compiled/interactive_splom.vg.json @@ -104,7 +104,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -139,7 +139,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -150,18 +150,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -200,7 +200,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -211,18 +211,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -293,7 +293,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -310,16 +310,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -433,7 +433,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -449,15 +449,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -651,7 +651,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -662,18 +662,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -712,7 +712,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -723,18 +723,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -803,7 +803,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -820,16 +820,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -941,7 +941,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -957,15 +957,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1159,7 +1159,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -1170,18 +1170,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1244,7 +1244,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -1261,16 +1261,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1361,7 +1361,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -1377,15 +1377,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1576,7 +1576,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -1587,18 +1587,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1637,7 +1637,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -1648,18 +1648,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -1730,7 +1730,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -1747,16 +1747,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1870,7 +1870,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -1886,15 +1886,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2088,7 +2088,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -2099,18 +2099,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2175,7 +2175,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -2192,16 +2192,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2292,7 +2292,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -2308,15 +2308,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2507,7 +2507,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -2518,18 +2518,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2568,7 +2568,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -2579,18 +2579,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2659,7 +2659,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -2676,16 +2676,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2797,7 +2797,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -2813,15 +2813,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -3015,7 +3015,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -3026,18 +3026,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -3104,7 +3104,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -3121,16 +3121,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -3221,7 +3221,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -3237,15 +3237,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -3436,7 +3436,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -3447,18 +3447,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -3497,7 +3497,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -3508,18 +3508,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -3590,7 +3590,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -3607,16 +3607,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -3730,7 +3730,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -3746,15 +3746,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -3948,7 +3948,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -3959,18 +3959,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -4009,7 +4009,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -4020,18 +4020,18 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -4102,7 +4102,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -4119,16 +4119,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -4242,7 +4242,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -4258,15 +4258,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/interactive_stocks_nearest_index.vg.json b/examples/compiled/interactive_stocks_nearest_index.vg.json index 5d86de0ea9..f777d3801b 100644 --- a/examples/compiled/interactive_stocks_nearest_index.vg.json +++ b/examples/compiled/interactive_stocks_nearest_index.vg.json @@ -42,7 +42,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -56,7 +56,7 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "markname": "layer_1_voronoi" } ], @@ -78,7 +78,7 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "markname": "layer_1_voronoi" } ], diff --git a/examples/compiled/isotype_grid.vg.json b/examples/compiled/isotype_grid.vg.json index cfd0b76d02..d234ae61f2 100644 --- a/examples/compiled/isotype_grid.vg.json +++ b/examples/compiled/isotype_grid.vg.json @@ -126,7 +126,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -140,7 +140,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"highlight_brush\"" ] @@ -150,17 +150,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"highlight_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[highlight_x[0], clamp(x(unit), 0, width)]" @@ -196,7 +196,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"highlight_brush\"" ] @@ -206,17 +206,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"highlight_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[highlight_y[0], clamp(y(unit), 0, height)]" @@ -279,7 +279,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "highlight_brush" } ], @@ -295,15 +295,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "highlight_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/param_expr.vg.json b/examples/compiled/param_expr.vg.json index 8c7127f51a..8a5e816f5e 100644 --- a/examples/compiled/param_expr.vg.json +++ b/examples/compiled/param_expr.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_bind_cylyr.vg.json b/examples/compiled/selection_bind_cylyr.vg.json index c4ef29ebb6..9afdab62a9 100644 --- a/examples/compiled/selection_bind_cylyr.vg.json +++ b/examples/compiled/selection_bind_cylyr.vg.json @@ -25,7 +25,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_bind_origin.vg.json b/examples/compiled/selection_bind_origin.vg.json index 8b6c71f01f..e7935ec60f 100644 --- a/examples/compiled/selection_bind_origin.vg.json +++ b/examples/compiled/selection_bind_origin.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_brush_timeunit.vg.json b/examples/compiled/selection_brush_timeunit.vg.json index 3e6799ba00..e0300cf272 100644 --- a/examples/compiled/selection_brush_timeunit.vg.json +++ b/examples/compiled/selection_brush_timeunit.vg.json @@ -65,7 +65,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -93,7 +93,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -103,17 +103,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -176,7 +176,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -192,15 +192,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_clear_brush.vg.json b/examples/compiled/selection_clear_brush.vg.json index b42df697ed..5d9945b9b0 100644 --- a/examples/compiled/selection_clear_brush.vg.json +++ b/examples/compiled/selection_clear_brush.vg.json @@ -36,7 +36,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -50,7 +50,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -60,17 +60,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -79,7 +79,10 @@ "events": {"signal": "brush_scale_trigger"}, "update": "[scale(\"x\", brush_Horsepower[0]), scale(\"x\", brush_Horsepower[1])]" }, - {"events": [{"source": "view", "type": "mouseup"}], "update": "[0, 0]"}, + { + "events": [{"source": "view", "type": "pointerup"}], + "update": "[0, 0]" + }, { "events": {"signal": "brush_translate_delta"}, "update": "clampRange(panLinear(brush_translate_anchor.extent_x, brush_translate_delta.x / span(brush_translate_anchor.extent_x)), 0, width)" @@ -107,7 +110,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -117,17 +120,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -136,7 +139,10 @@ "events": {"signal": "brush_scale_trigger"}, "update": "[scale(\"y\", brush_Miles_per_Gallon[0]), scale(\"y\", brush_Miles_per_Gallon[1])]" }, - {"events": [{"source": "view", "type": "mouseup"}], "update": "[0, 0]"}, + { + "events": [{"source": "view", "type": "pointerup"}], + "update": "[0, 0]" + }, { "events": {"signal": "brush_translate_delta"}, "update": "clampRange(panLinear(brush_translate_anchor.extent_y, brush_translate_delta.y / span(brush_translate_anchor.extent_y)), 0, height)" @@ -190,7 +196,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x), extent_y: slice(brush_y)}" } @@ -204,15 +214,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_composition_and.vg.json b/examples/compiled/selection_composition_and.vg.json index 5cf170d729..d7736f2efa 100644 --- a/examples/compiled/selection_composition_and.vg.json +++ b/examples/compiled/selection_composition_and.vg.json @@ -33,7 +33,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "alex", "update": "vlSelectionResolve(\"alex_store\", \"union\")"}, @@ -48,7 +48,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" @@ -59,17 +59,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[alex_x[0], clamp(x(unit), 0, width)]" @@ -105,7 +105,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" @@ -116,17 +116,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[alex_y[0], clamp(y(unit), 0, height)]" @@ -189,7 +189,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"], "markname": "alex_brush" } @@ -206,15 +206,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"], "markname": "alex_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], @@ -271,7 +271,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" @@ -282,17 +282,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[morgan_x[0], clamp(x(unit), 0, width)]" @@ -328,7 +328,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" @@ -339,17 +339,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[morgan_y[0], clamp(y(unit), 0, height)]" @@ -412,7 +412,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "morgan_brush" } @@ -429,15 +429,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "morgan_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_composition_or.vg.json b/examples/compiled/selection_composition_or.vg.json index 5122dc54e3..78ada163fa 100644 --- a/examples/compiled/selection_composition_or.vg.json +++ b/examples/compiled/selection_composition_or.vg.json @@ -33,7 +33,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "alex", "update": "vlSelectionResolve(\"alex_store\", \"union\")"}, @@ -48,7 +48,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" @@ -59,17 +59,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[alex_x[0], clamp(x(unit), 0, width)]" @@ -105,7 +105,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" @@ -116,17 +116,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[alex_y[0], clamp(y(unit), 0, height)]" @@ -189,7 +189,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"], "markname": "alex_brush" } @@ -206,15 +206,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"], "markname": "alex_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], @@ -271,7 +271,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" @@ -282,17 +282,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[morgan_x[0], clamp(x(unit), 0, width)]" @@ -328,7 +328,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" @@ -339,17 +339,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[morgan_y[0], clamp(y(unit), 0, height)]" @@ -412,7 +412,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "morgan_brush" } @@ -429,15 +429,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "morgan_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_concat.vg.json b/examples/compiled/selection_concat.vg.json index 3201351e9b..b27c82ddda 100644 --- a/examples/compiled/selection_concat.vg.json +++ b/examples/compiled/selection_concat.vg.json @@ -34,7 +34,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -68,7 +68,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -78,17 +78,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -127,7 +127,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -137,17 +137,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -215,7 +215,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -231,15 +231,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -516,7 +516,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"concat_1_x\"), extent_y: domain(\"concat_1_y\")}" } ] @@ -529,11 +529,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_filter.vg.json b/examples/compiled/selection_filter.vg.json index 73c168c3cd..66fca00b44 100644 --- a/examples/compiled/selection_filter.vg.json +++ b/examples/compiled/selection_filter.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -65,7 +65,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -75,17 +75,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -124,7 +124,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -134,17 +134,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -212,7 +212,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -228,15 +228,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_filter_composition.vg.json b/examples/compiled/selection_filter_composition.vg.json index cdffdfbf11..23a7655f3f 100644 --- a/examples/compiled/selection_filter_composition.vg.json +++ b/examples/compiled/selection_filter_composition.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -65,7 +65,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -75,17 +75,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -124,7 +124,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -134,17 +134,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -212,7 +212,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -228,15 +228,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_filter_false.vg.json b/examples/compiled/selection_filter_false.vg.json index 9609103d4a..1afab12e88 100644 --- a/examples/compiled/selection_filter_false.vg.json +++ b/examples/compiled/selection_filter_false.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -65,7 +65,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -75,17 +75,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -124,7 +124,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -134,17 +134,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -212,7 +212,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -228,15 +228,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_filter_true.vg.json b/examples/compiled/selection_filter_true.vg.json index 73c168c3cd..66fca00b44 100644 --- a/examples/compiled/selection_filter_true.vg.json +++ b/examples/compiled/selection_filter_true.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -65,7 +65,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -75,17 +75,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -124,7 +124,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -134,17 +134,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -212,7 +212,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -228,15 +228,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_heatmap.vg.json b/examples/compiled/selection_heatmap.vg.json index 02149f6e3f..c3d9ddae10 100644 --- a/examples/compiled/selection_heatmap.vg.json +++ b/examples/compiled/selection_heatmap.vg.json @@ -46,7 +46,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_insert.vg.json b/examples/compiled/selection_insert.vg.json index 8205b993ef..4fe9089c4e 100644 --- a/examples/compiled/selection_insert.vg.json +++ b/examples/compiled/selection_insert.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_interval_mark_style.vg.json b/examples/compiled/selection_interval_mark_style.vg.json index a736606940..f49328edbc 100644 --- a/examples/compiled/selection_interval_mark_style.vg.json +++ b/examples/compiled/selection_interval_mark_style.vg.json @@ -33,7 +33,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "alex", "update": "vlSelectionResolve(\"alex_store\", \"union\")"}, @@ -48,7 +48,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" @@ -59,17 +59,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[alex_x[0], clamp(x(unit), 0, width)]" @@ -105,7 +105,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" @@ -116,17 +116,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.shiftKey", "!event.item || event.item.mark.name !== \"alex_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[alex_y[0], clamp(y(unit), 0, height)]" @@ -189,7 +189,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"], "markname": "alex_brush" } @@ -206,15 +206,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"], "markname": "alex_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], @@ -271,7 +271,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" @@ -282,17 +282,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[morgan_x[0], clamp(x(unit), 0, width)]" @@ -328,7 +328,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" @@ -339,17 +339,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"morgan_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[morgan_y[0], clamp(y(unit), 0, height)]" @@ -412,7 +412,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "morgan_brush" } @@ -429,15 +429,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "morgan_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_layer_bar_month.vg.json b/examples/compiled/selection_layer_bar_month.vg.json index c9333dbbc1..bf4b4c590d 100644 --- a/examples/compiled/selection_layer_bar_month.vg.json +++ b/examples/compiled/selection_layer_bar_month.vg.json @@ -68,7 +68,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -82,7 +82,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -92,17 +92,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -160,7 +160,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x)}" } @@ -174,15 +178,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_multi_condition.vg.json b/examples/compiled/selection_multi_condition.vg.json index 364a2694df..809a795d4e 100644 --- a/examples/compiled/selection_multi_condition.vg.json +++ b/examples/compiled/selection_multi_condition.vg.json @@ -30,7 +30,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -48,7 +48,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -58,17 +58,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -107,7 +107,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -117,17 +117,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -191,7 +191,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x), extent_y: slice(brush_y)}" } @@ -205,15 +209,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -268,7 +272,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mouseover", "markname": "voronoi"} + {"source": "scope", "type": "pointerover", "markname": "voronoi"} ], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 && indexof(item().mark.name, 'brush_brush') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true @@ -282,7 +286,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mouseover", "markname": "voronoi"} + {"source": "scope", "type": "pointerover", "markname": "voronoi"} ], "update": "event.shiftKey" }, diff --git a/examples/compiled/selection_project_binned_interval.vg.json b/examples/compiled/selection_project_binned_interval.vg.json index 25ed79224f..145fcf8212 100644 --- a/examples/compiled/selection_project_binned_interval.vg.json +++ b/examples/compiled/selection_project_binned_interval.vg.json @@ -80,7 +80,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -94,7 +94,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -104,17 +104,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -175,7 +175,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x)}" } @@ -189,15 +193,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_project_interval.vg.json b/examples/compiled/selection_project_interval.vg.json index 920b039888..617dbefacc 100644 --- a/examples/compiled/selection_project_interval.vg.json +++ b/examples/compiled/selection_project_interval.vg.json @@ -32,7 +32,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "pts", "update": "vlSelectionResolve(\"pts_store\", \"union\")"}, @@ -43,7 +43,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[x(unit), x(unit)]" @@ -51,17 +51,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[y(unit), y(unit)]" @@ -105,17 +105,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_y[0], clamp(y(unit), 0, height)]" @@ -176,7 +176,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "pts_brush"} + {"source": "scope", "type": "pointerdown", "markname": "pts_brush"} ], "update": "{x: x(unit), y: y(unit), extent_x: slice(pts_x), extent_y: slice(pts_y)}" } @@ -190,15 +190,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "pts_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_project_interval_x.vg.json b/examples/compiled/selection_project_interval_x.vg.json index d7f80f4b6f..158d58798c 100644 --- a/examples/compiled/selection_project_interval_x.vg.json +++ b/examples/compiled/selection_project_interval_x.vg.json @@ -32,7 +32,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "pts", "update": "vlSelectionResolve(\"pts_store\", \"union\")"}, @@ -43,7 +43,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[x(unit), x(unit)]" @@ -51,17 +51,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_x[0], clamp(x(unit), 0, width)]" @@ -119,7 +119,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "pts_brush"} + {"source": "scope", "type": "pointerdown", "markname": "pts_brush"} ], "update": "{x: x(unit), y: y(unit), extent_x: slice(pts_x)}" } @@ -133,15 +133,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "pts_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_project_interval_x_y.vg.json b/examples/compiled/selection_project_interval_x_y.vg.json index 920b039888..617dbefacc 100644 --- a/examples/compiled/selection_project_interval_x_y.vg.json +++ b/examples/compiled/selection_project_interval_x_y.vg.json @@ -32,7 +32,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "pts", "update": "vlSelectionResolve(\"pts_store\", \"union\")"}, @@ -43,7 +43,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[x(unit), x(unit)]" @@ -51,17 +51,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[y(unit), y(unit)]" @@ -105,17 +105,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_y[0], clamp(y(unit), 0, height)]" @@ -176,7 +176,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "pts_brush"} + {"source": "scope", "type": "pointerdown", "markname": "pts_brush"} ], "update": "{x: x(unit), y: y(unit), extent_x: slice(pts_x), extent_y: slice(pts_y)}" } @@ -190,15 +190,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "pts_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_project_interval_y.vg.json b/examples/compiled/selection_project_interval_y.vg.json index 82bf700c3f..e9edd1f855 100644 --- a/examples/compiled/selection_project_interval_y.vg.json +++ b/examples/compiled/selection_project_interval_y.vg.json @@ -32,7 +32,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "pts", "update": "vlSelectionResolve(\"pts_store\", \"union\")"}, @@ -43,7 +43,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[y(unit), y(unit)]" @@ -51,17 +51,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_y[0], clamp(y(unit), 0, height)]" @@ -119,7 +119,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "pts_brush"} + {"source": "scope", "type": "pointerdown", "markname": "pts_brush"} ], "update": "{x: x(unit), y: y(unit), extent_y: slice(pts_y)}" } @@ -133,15 +133,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "pts_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_project_multi.vg.json b/examples/compiled/selection_project_multi.vg.json index c39000ed97..88afcd2dae 100644 --- a/examples/compiled/selection_project_multi.vg.json +++ b/examples/compiled/selection_project_multi.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_multi_cylinders.vg.json b/examples/compiled/selection_project_multi_cylinders.vg.json index 5f2b17dfb1..65e4a56ba1 100644 --- a/examples/compiled/selection_project_multi_cylinders.vg.json +++ b/examples/compiled/selection_project_multi_cylinders.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_multi_cylinders_origin.vg.json b/examples/compiled/selection_project_multi_cylinders_origin.vg.json index 15a499a87f..c2915a3315 100644 --- a/examples/compiled/selection_project_multi_cylinders_origin.vg.json +++ b/examples/compiled/selection_project_multi_cylinders_origin.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_multi_origin.vg.json b/examples/compiled/selection_project_multi_origin.vg.json index 1069a118d1..fe2706224b 100644 --- a/examples/compiled/selection_project_multi_origin.vg.json +++ b/examples/compiled/selection_project_multi_origin.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_single.vg.json b/examples/compiled/selection_project_single.vg.json index b7f8608b82..e65908bfec 100644 --- a/examples/compiled/selection_project_single.vg.json +++ b/examples/compiled/selection_project_single.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_single_cylinders.vg.json b/examples/compiled/selection_project_single_cylinders.vg.json index b87e9c6243..45bc7d1c36 100644 --- a/examples/compiled/selection_project_single_cylinders.vg.json +++ b/examples/compiled/selection_project_single_cylinders.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_single_cylinders_origin.vg.json b/examples/compiled/selection_project_single_cylinders_origin.vg.json index 951f2afa2b..e057d5b625 100644 --- a/examples/compiled/selection_project_single_cylinders_origin.vg.json +++ b/examples/compiled/selection_project_single_cylinders_origin.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_project_single_origin.vg.json b/examples/compiled/selection_project_single_origin.vg.json index 2f15503822..9f6e5e4d74 100644 --- a/examples/compiled/selection_project_single_origin.vg.json +++ b/examples/compiled/selection_project_single_origin.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_resolution_global.vg.json b/examples/compiled/selection_resolution_global.vg.json index ca0a20cd5c..b7fe8358d3 100644 --- a/examples/compiled/selection_resolution_global.vg.json +++ b/examples/compiled/selection_resolution_global.vg.json @@ -73,7 +73,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -101,7 +101,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -111,17 +111,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -160,7 +160,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -170,17 +170,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -251,7 +251,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -267,15 +267,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -515,7 +515,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -525,17 +525,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -574,7 +574,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -584,17 +584,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -663,7 +663,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -679,15 +679,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -927,7 +927,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -937,17 +937,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1010,7 +1010,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1026,15 +1026,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1271,7 +1271,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1281,17 +1281,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1330,7 +1330,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1340,17 +1340,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -1421,7 +1421,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1437,15 +1437,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1685,7 +1685,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1695,17 +1695,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1770,7 +1770,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1786,15 +1786,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2031,7 +2031,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2041,17 +2041,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2090,7 +2090,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2100,17 +2100,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2179,7 +2179,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2195,15 +2195,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2443,7 +2443,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2453,17 +2453,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2530,7 +2530,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2546,15 +2546,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2791,7 +2791,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2801,17 +2801,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2850,7 +2850,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2860,17 +2860,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2941,7 +2941,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2957,15 +2957,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -3205,7 +3205,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -3215,17 +3215,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -3264,7 +3264,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -3274,17 +3274,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -3355,7 +3355,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -3371,15 +3371,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_resolution_intersect.vg.json b/examples/compiled/selection_resolution_intersect.vg.json index be6ea11495..b626c86515 100644 --- a/examples/compiled/selection_resolution_intersect.vg.json +++ b/examples/compiled/selection_resolution_intersect.vg.json @@ -73,7 +73,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -101,7 +101,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -111,17 +111,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -160,7 +160,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -170,17 +170,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -251,7 +251,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -267,15 +267,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -467,7 +467,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -477,17 +477,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -526,7 +526,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -536,17 +536,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -615,7 +615,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -631,15 +631,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -831,7 +831,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -841,17 +841,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -914,7 +914,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -930,15 +930,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1127,7 +1127,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1137,17 +1137,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1186,7 +1186,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1196,17 +1196,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -1277,7 +1277,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1293,15 +1293,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1493,7 +1493,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1503,17 +1503,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1578,7 +1578,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1594,15 +1594,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1791,7 +1791,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1801,17 +1801,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1850,7 +1850,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1860,17 +1860,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -1939,7 +1939,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1955,15 +1955,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2155,7 +2155,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2165,17 +2165,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2242,7 +2242,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2258,15 +2258,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2455,7 +2455,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2465,17 +2465,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2514,7 +2514,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2524,17 +2524,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2605,7 +2605,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2621,15 +2621,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2821,7 +2821,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2831,17 +2831,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2880,7 +2880,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2890,17 +2890,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2971,7 +2971,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2987,15 +2987,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_resolution_union.vg.json b/examples/compiled/selection_resolution_union.vg.json index 4e64c836da..02b5f23bc7 100644 --- a/examples/compiled/selection_resolution_union.vg.json +++ b/examples/compiled/selection_resolution_union.vg.json @@ -73,7 +73,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -101,7 +101,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -111,17 +111,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -160,7 +160,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -170,17 +170,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -251,7 +251,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -267,15 +267,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -467,7 +467,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -477,17 +477,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -526,7 +526,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -536,17 +536,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -615,7 +615,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -631,15 +631,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -831,7 +831,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -841,17 +841,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -914,7 +914,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -930,15 +930,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1127,7 +1127,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1137,17 +1137,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1186,7 +1186,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1196,17 +1196,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -1277,7 +1277,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1293,15 +1293,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1493,7 +1493,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1503,17 +1503,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1578,7 +1578,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1594,15 +1594,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -1791,7 +1791,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1801,17 +1801,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -1850,7 +1850,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -1860,17 +1860,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -1939,7 +1939,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -1955,15 +1955,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2155,7 +2155,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2165,17 +2165,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2242,7 +2242,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2258,15 +2258,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2455,7 +2455,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2465,17 +2465,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2514,7 +2514,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2524,17 +2524,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2605,7 +2605,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2621,15 +2621,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], @@ -2821,7 +2821,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2831,17 +2831,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, childWidth)]" @@ -2880,7 +2880,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -2890,17 +2890,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, childHeight)]" @@ -2971,7 +2971,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" } ], @@ -2987,15 +2987,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_toggle_altKey.vg.json b/examples/compiled/selection_toggle_altKey.vg.json index 76543aaf80..02f223abcc 100644 --- a/examples/compiled/selection_toggle_altKey.vg.json +++ b/examples/compiled/selection_toggle_altKey.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_toggle_altKey_shiftKey.vg.json b/examples/compiled/selection_toggle_altKey_shiftKey.vg.json index cc209911a9..7875b981b1 100644 --- a/examples/compiled/selection_toggle_altKey_shiftKey.vg.json +++ b/examples/compiled/selection_toggle_altKey_shiftKey.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_toggle_shiftKey.vg.json b/examples/compiled/selection_toggle_shiftKey.vg.json index ce9a4407e0..d135317d00 100644 --- a/examples/compiled/selection_toggle_shiftKey.vg.json +++ b/examples/compiled/selection_toggle_shiftKey.vg.json @@ -28,7 +28,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_translate_brush_drag.vg.json b/examples/compiled/selection_translate_brush_drag.vg.json index 234a882a85..7ac727c13e 100644 --- a/examples/compiled/selection_translate_brush_drag.vg.json +++ b/examples/compiled/selection_translate_brush_drag.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -38,7 +38,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -48,17 +48,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -107,17 +107,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -181,7 +181,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x), extent_y: slice(brush_y)}" } @@ -195,15 +199,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_translate_brush_shift-drag.vg.json b/examples/compiled/selection_translate_brush_shift-drag.vg.json index 0a1ee503c2..d70260814f 100644 --- a/examples/compiled/selection_translate_brush_shift-drag.vg.json +++ b/examples/compiled/selection_translate_brush_shift-drag.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -38,7 +38,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -48,17 +48,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -107,17 +107,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -183,7 +183,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -200,16 +200,16 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_translate_scatterplot_drag.vg.json b/examples/compiled/selection_translate_scatterplot_drag.vg.json index 56e1ae94cb..c24d1ad55f 100644 --- a/examples/compiled/selection_translate_scatterplot_drag.vg.json +++ b/examples/compiled/selection_translate_scatterplot_drag.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "grid", "update": "vlSelectionResolve(\"grid_store\", \"union\")"}, @@ -77,7 +77,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"x\"), extent_y: domain(\"y\")}" } ] @@ -90,11 +90,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_translate_scatterplot_shift-drag.vg.json b/examples/compiled/selection_translate_scatterplot_shift-drag.vg.json index 122f1a31e3..a6e17a8825 100644 --- a/examples/compiled/selection_translate_scatterplot_shift-drag.vg.json +++ b/examples/compiled/selection_translate_scatterplot_shift-drag.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "grid", "update": "vlSelectionResolve(\"grid_store\", \"union\")"}, @@ -80,7 +80,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"] } ], @@ -96,15 +96,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_type_interval.vg.json b/examples/compiled/selection_type_interval.vg.json index 920b039888..617dbefacc 100644 --- a/examples/compiled/selection_type_interval.vg.json +++ b/examples/compiled/selection_type_interval.vg.json @@ -32,7 +32,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "pts", "update": "vlSelectionResolve(\"pts_store\", \"union\")"}, @@ -43,7 +43,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[x(unit), x(unit)]" @@ -51,17 +51,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[y(unit), y(unit)]" @@ -105,17 +105,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_y[0], clamp(y(unit), 0, height)]" @@ -176,7 +176,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "pts_brush"} + {"source": "scope", "type": "pointerdown", "markname": "pts_brush"} ], "update": "{x: x(unit), y: y(unit), extent_x: slice(pts_x), extent_y: slice(pts_y)}" } @@ -190,15 +190,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "pts_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_type_interval_invert.vg.json b/examples/compiled/selection_type_interval_invert.vg.json index 40947e9b51..04ca6d0f8d 100644 --- a/examples/compiled/selection_type_interval_invert.vg.json +++ b/examples/compiled/selection_type_interval_invert.vg.json @@ -32,7 +32,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "pts", "update": "vlSelectionResolve(\"pts_store\", \"union\")"}, @@ -43,7 +43,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[x(unit), x(unit)]" @@ -51,17 +51,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.item || event.item.mark.name !== \"pts_brush\""] }, "update": "[y(unit), y(unit)]" @@ -105,17 +105,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"pts_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[pts_y[0], clamp(y(unit), 0, height)]" @@ -176,7 +176,7 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "pts_brush"} + {"source": "scope", "type": "pointerdown", "markname": "pts_brush"} ], "update": "{x: x(unit), y: y(unit), extent_x: slice(pts_x), extent_y: slice(pts_y)}" } @@ -190,15 +190,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "pts_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_type_point.vg.json b/examples/compiled/selection_type_point.vg.json index 6dba2e61ad..77df606b03 100644 --- a/examples/compiled/selection_type_point.vg.json +++ b/examples/compiled/selection_type_point.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_type_single_dblclick.vg.json b/examples/compiled/selection_type_single_dblclick.vg.json index ea489ca44a..29abd06d18 100644 --- a/examples/compiled/selection_type_single_dblclick.vg.json +++ b/examples/compiled/selection_type_single_dblclick.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/compiled/selection_type_single_mouseover.png b/examples/compiled/selection_type_single_pointerover.png similarity index 100% rename from examples/compiled/selection_type_single_mouseover.png rename to examples/compiled/selection_type_single_pointerover.png diff --git a/examples/compiled/selection_type_single_mouseover.svg b/examples/compiled/selection_type_single_pointerover.svg similarity index 100% rename from examples/compiled/selection_type_single_mouseover.svg rename to examples/compiled/selection_type_single_pointerover.svg diff --git a/examples/compiled/selection_type_single_mouseover.vg.json b/examples/compiled/selection_type_single_pointerover.vg.json similarity index 95% rename from examples/compiled/selection_type_single_mouseover.vg.json rename to examples/compiled/selection_type_single_pointerover.vg.json index 91347e543e..bacea56be8 100644 --- a/examples/compiled/selection_type_single_mouseover.vg.json +++ b/examples/compiled/selection_type_single_pointerover.vg.json @@ -37,7 +37,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -48,7 +48,7 @@ "name": "pts_tuple", "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null", "force": true }, @@ -60,7 +60,7 @@ "value": false, "on": [ { - "events": [{"source": "scope", "type": "mouseover"}], + "events": [{"source": "scope", "type": "pointerover"}], "update": "event.shiftKey" }, {"events": [{"source": "view", "type": "dblclick"}], "update": "false"} diff --git a/examples/compiled/selection_zoom_brush_shift-wheel.vg.json b/examples/compiled/selection_zoom_brush_shift-wheel.vg.json index 7362482219..5d496bfd45 100644 --- a/examples/compiled/selection_zoom_brush_shift-wheel.vg.json +++ b/examples/compiled/selection_zoom_brush_shift-wheel.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -38,7 +38,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -48,17 +48,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -107,17 +107,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -181,7 +181,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x), extent_y: slice(brush_y)}" } @@ -195,15 +199,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_zoom_brush_wheel.vg.json b/examples/compiled/selection_zoom_brush_wheel.vg.json index 234a882a85..7ac727c13e 100644 --- a/examples/compiled/selection_zoom_brush_wheel.vg.json +++ b/examples/compiled/selection_zoom_brush_wheel.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -38,7 +38,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -48,17 +48,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, width)]" @@ -97,7 +97,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] @@ -107,17 +107,17 @@ { "events": { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] }, "update": "[brush_y[0], clamp(y(unit), 0, height)]" @@ -181,7 +181,11 @@ "on": [ { "events": [ - {"source": "scope", "type": "mousedown", "markname": "brush_brush"} + { + "source": "scope", + "type": "pointerdown", + "markname": "brush_brush" + } ], "update": "{x: x(unit), y: y(unit), extent_x: slice(brush_x), extent_y: slice(brush_y)}" } @@ -195,15 +199,15 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "markname": "brush_brush" }, - {"source": "window", "type": "mouseup"} + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_zoom_scatterplot_shift-wheel.vg.json b/examples/compiled/selection_zoom_scatterplot_shift-wheel.vg.json index 63d372ae17..c3fba0391e 100644 --- a/examples/compiled/selection_zoom_scatterplot_shift-wheel.vg.json +++ b/examples/compiled/selection_zoom_scatterplot_shift-wheel.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "grid", "update": "vlSelectionResolve(\"grid_store\", \"union\")"}, @@ -77,7 +77,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"x\"), extent_y: domain(\"y\")}" } ] @@ -90,11 +90,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/selection_zoom_scatterplot_wheel.vg.json b/examples/compiled/selection_zoom_scatterplot_wheel.vg.json index 56e1ae94cb..c24d1ad55f 100644 --- a/examples/compiled/selection_zoom_scatterplot_wheel.vg.json +++ b/examples/compiled/selection_zoom_scatterplot_wheel.vg.json @@ -24,7 +24,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, {"name": "grid", "update": "vlSelectionResolve(\"grid_store\", \"union\")"}, @@ -77,7 +77,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousedown"}], + "events": [{"source": "scope", "type": "pointerdown"}], "update": "{x: x(unit), y: y(unit), extent_x: domain(\"x\"), extent_y: domain(\"y\")}" } ] @@ -90,11 +90,11 @@ "events": [ { "source": "window", - "type": "mousemove", + "type": "pointermove", "consume": true, "between": [ - {"source": "scope", "type": "mousedown"}, - {"source": "window", "type": "mouseup"} + {"source": "scope", "type": "pointerdown"}, + {"source": "window", "type": "pointerup"} ] } ], diff --git a/examples/compiled/trellis_selections.vg.json b/examples/compiled/trellis_selections.vg.json index 4aabf916a0..e8f493be87 100644 --- a/examples/compiled/trellis_selections.vg.json +++ b/examples/compiled/trellis_selections.vg.json @@ -31,7 +31,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { @@ -42,7 +42,7 @@ "events": [ { "source": "scope", - "type": "mouseover", + "type": "pointerover", "markname": "child_voronoi" } ], @@ -150,7 +150,7 @@ "value": {}, "on": [ { - "events": [{"source": "scope", "type": "mousemove"}], + "events": [{"source": "scope", "type": "pointermove"}], "update": "isTuple(facet) ? facet : group(\"cell\").datum" } ] @@ -162,7 +162,7 @@ { "events": { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" @@ -173,17 +173,17 @@ { "events": { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": [ "event.shiftKey", "!event.item || event.item.mark.name !== \"brush_brush\"" ] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] }, "update": "[brush_x[0], clamp(x(unit), 0, child_width)]" @@ -246,7 +246,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" } @@ -263,15 +263,15 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["event.shiftKey"], "markname": "brush_brush" }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], @@ -381,7 +381,7 @@ "events": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] } ], @@ -397,14 +397,14 @@ "events": [ { "source": "scope", - "type": "mousemove", + "type": "pointermove", "between": [ { "source": "scope", - "type": "mousedown", + "type": "pointerdown", "filter": ["!event.shiftKey"] }, - {"source": "scope", "type": "mouseup"} + {"source": "scope", "type": "pointerup"} ] } ], diff --git a/examples/compiled/vconcat_flatten.vg.json b/examples/compiled/vconcat_flatten.vg.json index ee2c0c5d71..06b7593fdc 100644 --- a/examples/compiled/vconcat_flatten.vg.json +++ b/examples/compiled/vconcat_flatten.vg.json @@ -80,7 +80,7 @@ "name": "unit", "value": {}, "on": [ - {"events": "mousemove", "update": "isTuple(group()) ? group() : unit"} + {"events": "pointermove", "update": "isTuple(group()) ? group() : unit"} ] }, { diff --git a/examples/specs/airport_connections.vl.json b/examples/specs/airport_connections.vl.json index 4a55f74dda..32ccb4ec23 100644 --- a/examples/specs/airport_connections.vl.json +++ b/examples/specs/airport_connections.vl.json @@ -63,7 +63,7 @@ "name": "org", "select": { "type": "point", - "on": "mouseover", + "on": "pointerover", "nearest": true, "fields": ["origin"] } diff --git a/examples/specs/concat_hover.vl.json b/examples/specs/concat_hover.vl.json index 6b6aea0957..15dff37cda 100644 --- a/examples/specs/concat_hover.vl.json +++ b/examples/specs/concat_hover.vl.json @@ -5,7 +5,7 @@ "hconcat": [{ "params": [{ "name": "hover", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }], "mark": "point", "encoding": { @@ -22,7 +22,7 @@ },{ "params": [{ "name": "hover", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }], "mark": "point", "encoding": { diff --git a/examples/specs/concat_hover_filter.vl.json b/examples/specs/concat_hover_filter.vl.json index 659a82d522..d88b2ab328 100644 --- a/examples/specs/concat_hover_filter.vl.json +++ b/examples/specs/concat_hover_filter.vl.json @@ -11,7 +11,7 @@ { "params": [{ "name": "hover", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }], "mark": "point" }, @@ -32,7 +32,7 @@ "params": [{ "name": "hover", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }], "mark": "point" }, diff --git a/examples/specs/interactive_bar_select_highlight.vl.json b/examples/specs/interactive_bar_select_highlight.vl.json index 9019349b28..81ad0a99c4 100644 --- a/examples/specs/interactive_bar_select_highlight.vl.json +++ b/examples/specs/interactive_bar_select_highlight.vl.json @@ -11,7 +11,7 @@ "params": [ { "name": "highlight", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }, {"name": "select", "select": "point"} ], diff --git a/examples/specs/interactive_global_development.vl.json b/examples/specs/interactive_global_development.vl.json index 277452ca4a..9a9243ccde 100644 --- a/examples/specs/interactive_global_development.vl.json +++ b/examples/specs/interactive_global_development.vl.json @@ -97,7 +97,7 @@ "type": "point", "fields": ["country"], "toggle": false, - "on": "mouseover" + "on": "pointerover" } }, { diff --git a/examples/specs/interactive_histogram_full_height_hover.vl.json b/examples/specs/interactive_histogram_full_height_hover.vl.json index 4f09a40f56..ef361cce41 100644 --- a/examples/specs/interactive_histogram_full_height_hover.vl.json +++ b/examples/specs/interactive_histogram_full_height_hover.vl.json @@ -6,7 +6,7 @@ "params": [ { "name": "hover", - "select": {"type": "point", "on": "mouseover", "clear": "mouseout"} + "select": {"type": "point", "on": "pointerover", "clear": "pointerout"} } ], "mark": {"type": "bar", "color": "#eee", "tooltip": true}, diff --git a/examples/specs/interactive_index_chart.vl.json b/examples/specs/interactive_index_chart.vl.json index 4c8e77073a..db9f872a26 100644 --- a/examples/specs/interactive_index_chart.vl.json +++ b/examples/specs/interactive_index_chart.vl.json @@ -14,7 +14,7 @@ "select": { "type": "point", "encodings": ["x"], - "on": "mouseover", + "on": "pointerover", "nearest": true } }], diff --git a/examples/specs/interactive_line_hover.vl.json b/examples/specs/interactive_line_hover.vl.json index 64013b3dca..cb548ad2cf 100644 --- a/examples/specs/interactive_line_hover.vl.json +++ b/examples/specs/interactive_line_hover.vl.json @@ -31,7 +31,7 @@ "select": { "type": "point", "fields": ["symbol"], - "on": "mouseover" + "on": "pointerover" } }], "mark": {"type": "line", "strokeWidth": 8, "stroke": "transparent"} diff --git a/examples/specs/interactive_line_point_hover.vl.json b/examples/specs/interactive_line_point_hover.vl.json index 99d08dfdae..ef00f44197 100644 --- a/examples/specs/interactive_line_point_hover.vl.json +++ b/examples/specs/interactive_line_point_hover.vl.json @@ -8,22 +8,22 @@ "color": {"field": "symbol", "type": "nominal"} }, "layer": [{ - "mark": "line" - }, { - "params": [{ - "name": "hover", - "select": {"type": "point", "on": "mouseover", "clear": "mouseout"} - }], - "mark": {"type": "circle", "tooltip": true}, - "encoding": { - "opacity": { - "condition": {"test": {"param": "hover", "empty": false}, "value": 1}, - "value": 0 - }, - "size": { - "condition": {"test": {"param": "hover", "empty": false}, "value": 48}, - "value": 100 + "mark": "line" + }, { + "params": [{ + "name": "hover", + "select": {"type": "point", "on": "pointerover", "clear": "pointerout"} + }], + "mark": {"type": "circle", "tooltip": true}, + "encoding": { + "opacity": { + "condition": {"test": {"param": "hover", "empty": false}, "value": 1}, + "value": 0 + }, + "size": { + "condition": {"test": {"param": "hover", "empty": false}, "value": 48}, + "value": 100 + } } - } - }] + }] } diff --git a/examples/specs/interactive_multi_line_label.vl.json b/examples/specs/interactive_multi_line_label.vl.json index b7af2c2a71..c93b05980e 100644 --- a/examples/specs/interactive_multi_line_label.vl.json +++ b/examples/specs/interactive_multi_line_label.vl.json @@ -21,7 +21,7 @@ "type": "point", "encodings": ["x"], "nearest": true, - "on": "mouseover" + "on": "pointerover" } }], "mark": "point", diff --git a/examples/specs/interactive_multi_line_pivot_tooltip.vl.json b/examples/specs/interactive_multi_line_pivot_tooltip.vl.json index e9c15f2ad5..32fd991b85 100644 --- a/examples/specs/interactive_multi_line_pivot_tooltip.vl.json +++ b/examples/specs/interactive_multi_line_pivot_tooltip.vl.json @@ -37,8 +37,8 @@ "type": "point", "fields": ["date"], "nearest": true, - "on": "mouseover", - "clear": "mouseout" + "on": "pointerover", + "clear": "pointerout" } }] } diff --git a/examples/specs/interactive_multi_line_tooltip.vl.json b/examples/specs/interactive_multi_line_tooltip.vl.json index c28fbda126..89400a15e6 100644 --- a/examples/specs/interactive_multi_line_tooltip.vl.json +++ b/examples/specs/interactive_multi_line_tooltip.vl.json @@ -23,7 +23,7 @@ "mark": "rule", "params": [{ "name": "hover", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }], "encoding": { "color": { diff --git a/examples/specs/interactive_paintbrush.vl.json b/examples/specs/interactive_paintbrush.vl.json index ab529ce9f0..4971a67a0b 100644 --- a/examples/specs/interactive_paintbrush.vl.json +++ b/examples/specs/interactive_paintbrush.vl.json @@ -4,7 +4,7 @@ "data": {"url": "data/cars.json"}, "params": [{ "name": "paintbrush", - "select": {"type": "point", "on": "mouseover", "nearest": true} + "select": {"type": "point", "on": "pointerover", "nearest": true} }], "mark": "point", "encoding": { diff --git a/examples/specs/interactive_paintbrush_color.vl.json b/examples/specs/interactive_paintbrush_color.vl.json index 54d8de8d5b..4694cb3007 100644 --- a/examples/specs/interactive_paintbrush_color.vl.json +++ b/examples/specs/interactive_paintbrush_color.vl.json @@ -6,7 +6,7 @@ "name": "paintbrush", "select": { "type": "point", - "on": "mouseover" + "on": "pointerover" } }], "mark": "circle", diff --git a/examples/specs/interactive_paintbrush_color_nearest.vl.json b/examples/specs/interactive_paintbrush_color_nearest.vl.json index 0da8b24649..0b2818c4f5 100644 --- a/examples/specs/interactive_paintbrush_color_nearest.vl.json +++ b/examples/specs/interactive_paintbrush_color_nearest.vl.json @@ -6,7 +6,7 @@ "name": "paintbrush", "select": { "type": "point", - "on": "mouseover", + "on": "pointerover", "nearest": true } }], diff --git a/examples/specs/interactive_paintbrush_simple_false.vl.json b/examples/specs/interactive_paintbrush_simple_false.vl.json index 732a34d5ae..5745cd40ad 100644 --- a/examples/specs/interactive_paintbrush_simple_false.vl.json +++ b/examples/specs/interactive_paintbrush_simple_false.vl.json @@ -8,7 +8,7 @@ }, { "name": "paintbrush", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} } ], "mark": "point", diff --git a/examples/specs/interactive_paintbrush_simple_true.vl.json b/examples/specs/interactive_paintbrush_simple_true.vl.json index 72006efef3..c84add42ae 100644 --- a/examples/specs/interactive_paintbrush_simple_true.vl.json +++ b/examples/specs/interactive_paintbrush_simple_true.vl.json @@ -8,7 +8,7 @@ }, { "name": "paintbrush", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} } ], "mark": "point", diff --git a/examples/specs/interactive_splom.vl.json b/examples/specs/interactive_splom.vl.json index bdd6356332..d04683426b 100644 --- a/examples/specs/interactive_splom.vl.json +++ b/examples/specs/interactive_splom.vl.json @@ -13,8 +13,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -23,7 +23,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" diff --git a/examples/specs/interactive_stocks_nearest_index.vl.json b/examples/specs/interactive_stocks_nearest_index.vl.json index eab7a9737c..e3143105b1 100644 --- a/examples/specs/interactive_stocks_nearest_index.vl.json +++ b/examples/specs/interactive_stocks_nearest_index.vl.json @@ -20,7 +20,7 @@ "select": { "type": "point", "encodings": ["x"], - "on": "mousemove", + "on": "pointermove", "nearest": true } }], diff --git a/examples/specs/normalized/airport_connections_normalized.vl.json b/examples/specs/normalized/airport_connections_normalized.vl.json index 8da3df8011..731a599ae4 100644 --- a/examples/specs/normalized/airport_connections_normalized.vl.json +++ b/examples/specs/normalized/airport_connections_normalized.vl.json @@ -54,7 +54,7 @@ "name": "org", "select": { "type": "point", - "on": "mouseover", + "on": "pointerover", "nearest": true, "fields": ["origin"] } diff --git a/examples/specs/normalized/concat_hover_filter_normalized.vl.json b/examples/specs/normalized/concat_hover_filter_normalized.vl.json index 272cc55817..94ebea2af3 100644 --- a/examples/specs/normalized/concat_hover_filter_normalized.vl.json +++ b/examples/specs/normalized/concat_hover_filter_normalized.vl.json @@ -7,7 +7,7 @@ "layer": [ { "params": [ - {"name": "hover", "select": {"type": "point", "on": "mouseover"}} + {"name": "hover", "select": {"type": "point", "on": "pointerover"}} ], "mark": "point", "encoding": { @@ -29,7 +29,7 @@ "layer": [ { "params": [ - {"name": "hover", "select": {"type": "point", "on": "mouseover"}} + {"name": "hover", "select": {"type": "point", "on": "pointerover"}} ], "mark": "point", "encoding": { diff --git a/examples/specs/normalized/interactive_global_development_normalized.vl.json b/examples/specs/normalized/interactive_global_development_normalized.vl.json index 63ccc600b8..9338c9f947 100644 --- a/examples/specs/normalized/interactive_global_development_normalized.vl.json +++ b/examples/specs/normalized/interactive_global_development_normalized.vl.json @@ -77,7 +77,7 @@ "type": "point", "fields": ["country"], "toggle": false, - "on": "mouseover" + "on": "pointerover" } }, { diff --git a/examples/specs/normalized/interactive_index_chart_normalized.vl.json b/examples/specs/normalized/interactive_index_chart_normalized.vl.json index 7ed6a83679..58f2a560ef 100644 --- a/examples/specs/normalized/interactive_index_chart_normalized.vl.json +++ b/examples/specs/normalized/interactive_index_chart_normalized.vl.json @@ -12,7 +12,7 @@ "select": { "type": "point", "encodings": ["x"], - "on": "mouseover", + "on": "pointerover", "nearest": true } } diff --git a/examples/specs/normalized/interactive_line_hover_normalized.vl.json b/examples/specs/normalized/interactive_line_hover_normalized.vl.json index 13bf2b7a85..f1ef97fbf6 100644 --- a/examples/specs/normalized/interactive_line_hover_normalized.vl.json +++ b/examples/specs/normalized/interactive_line_hover_normalized.vl.json @@ -9,7 +9,7 @@ { "name": "hover", "value": [{"symbol": "AAPL"}], - "select": {"type": "point", "fields": ["symbol"], "on": "mouseover"} + "select": {"type": "point", "fields": ["symbol"], "on": "pointerover"} } ], "mark": {"type": "line", "strokeWidth": 8, "stroke": "transparent"}, diff --git a/examples/specs/normalized/interactive_line_point_hover_normalized.vl.json b/examples/specs/normalized/interactive_line_point_hover_normalized.vl.json index 3b055ad9fd..e20f6158be 100644 --- a/examples/specs/normalized/interactive_line_point_hover_normalized.vl.json +++ b/examples/specs/normalized/interactive_line_point_hover_normalized.vl.json @@ -15,7 +15,11 @@ "params": [ { "name": "hover", - "select": {"type": "point", "on": "mouseover", "clear": "mouseout"} + "select": { + "type": "point", + "on": "pointerover", + "clear": "pointerout" + } } ], "mark": {"type": "circle", "tooltip": true}, diff --git a/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json b/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json index a5373f65e9..67a5af7496 100644 --- a/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json +++ b/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json @@ -22,7 +22,7 @@ "type": "point", "encodings": ["x"], "nearest": true, - "on": "mouseover" + "on": "pointerover" } } ], diff --git a/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json b/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json index 4b1c08c934..0f61fff482 100644 --- a/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json +++ b/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json @@ -48,8 +48,8 @@ "type": "point", "fields": ["date"], "nearest": true, - "on": "mouseover", - "clear": "mouseout" + "on": "pointerover", + "clear": "pointerout" } } ], diff --git a/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json b/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json index 879624a3f8..d2dd6225ac 100644 --- a/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json +++ b/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json @@ -29,7 +29,7 @@ { "mark": "rule", "params": [ - {"name": "hover", "select": {"type": "point", "on": "mouseover"}} + {"name": "hover", "select": {"type": "point", "on": "pointerover"}} ], "encoding": { "x": {"timeUnit": "yearmonthdate", "field": "date"}, diff --git a/examples/specs/normalized/interactive_splom_normalized.vl.json b/examples/specs/normalized/interactive_splom_normalized.vl.json index 55081c17a6..07b31425bf 100644 --- a/examples/specs/normalized/interactive_splom_normalized.vl.json +++ b/examples/specs/normalized/interactive_splom_normalized.vl.json @@ -12,8 +12,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -22,7 +22,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -50,8 +50,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -60,7 +60,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -88,8 +88,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -98,7 +98,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -126,8 +126,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -136,7 +136,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -164,8 +164,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -174,7 +174,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -202,8 +202,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -212,7 +212,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -240,8 +240,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -250,7 +250,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -278,8 +278,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -288,7 +288,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" @@ -316,8 +316,8 @@ "select": { "type": "interval", "resolve": "union", - "on": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!", + "on": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![event.shiftKey]" } }, @@ -326,7 +326,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], window:mouseup] > window:mousemove!", + "translate": "[pointerdown[!event.shiftKey], window:pointerup] > window:pointermove!", "zoom": "wheel![!event.shiftKey]" }, "bind": "scales" diff --git a/examples/specs/normalized/interactive_stocks_nearest_index_normalized.vl.json b/examples/specs/normalized/interactive_stocks_nearest_index_normalized.vl.json index daf6d65288..37ad5678fb 100644 --- a/examples/specs/normalized/interactive_stocks_nearest_index_normalized.vl.json +++ b/examples/specs/normalized/interactive_stocks_nearest_index_normalized.vl.json @@ -19,7 +19,7 @@ "select": { "type": "point", "encodings": ["x"], - "on": "mousemove", + "on": "pointermove", "nearest": true } } diff --git a/examples/specs/normalized/trellis_selections_normalized.vl.json b/examples/specs/normalized/trellis_selections_normalized.vl.json index 9109dae859..05e1afc7a5 100644 --- a/examples/specs/normalized/trellis_selections_normalized.vl.json +++ b/examples/specs/normalized/trellis_selections_normalized.vl.json @@ -22,8 +22,8 @@ "type": "interval", "encodings": ["x"], "resolve": "intersect", - "on": "[mousedown[event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[event.shiftKey], mouseup] > mousemove" + "on": "[pointerdown[event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[event.shiftKey], pointerup] > pointermove" } }, { @@ -31,7 +31,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], mouseup] > mousemove" + "translate": "[pointerdown[!event.shiftKey], pointerup] > pointermove" }, "bind": "scales" }, @@ -41,7 +41,7 @@ "type": "point", "fields": ["X"], "resolve": "global", - "on": "mouseover", + "on": "pointerover", "nearest": true }, "bind": {"input": "number"} diff --git a/examples/specs/selection_clear_brush.vl.json b/examples/specs/selection_clear_brush.vl.json index 22a9866faf..c4ad9e7889 100644 --- a/examples/specs/selection_clear_brush.vl.json +++ b/examples/specs/selection_clear_brush.vl.json @@ -2,10 +2,10 @@ "$schema": "https://vega.github.io/schema/vega-lite/v5.json", "data": {"url": "data/cars.json"}, "params": [{ - "name": "brush", - "value": {"x": [55, 160], "y": [13, 37]}, - "select": {"type": "interval", "clear": "mouseup"} - }], + "name": "brush", + "value": {"x": [55, 160], "y": [13, 37]}, + "select": {"type": "interval", "clear": "pointerup"} + }], "mark": "point", "encoding": { "x": {"field": "Horsepower", "type": "quantitative"}, diff --git a/examples/specs/selection_composition_and.vl.json b/examples/specs/selection_composition_and.vl.json index eac872e8e3..b0f96323ad 100644 --- a/examples/specs/selection_composition_and.vl.json +++ b/examples/specs/selection_composition_and.vl.json @@ -6,16 +6,16 @@ "name": "alex", "select": { "type": "interval", - "on": "[mousedown[!event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[!event.shiftKey], mouseup] > mousemove" + "on": "[pointerdown[!event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[!event.shiftKey], pointerup] > pointermove" } }, { "name": "morgan", "select": { "type": "interval", - "on": "[mousedown[event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[event.shiftKey], mouseup] > mousemove", + "on": "[pointerdown[event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[event.shiftKey], pointerup] > pointermove", "mark": {"fill": "#fdbb84", "fillOpacity": 0.5, "stroke": "#e34a33"} } } diff --git a/examples/specs/selection_composition_or.vl.json b/examples/specs/selection_composition_or.vl.json index daadd12db2..229401a885 100644 --- a/examples/specs/selection_composition_or.vl.json +++ b/examples/specs/selection_composition_or.vl.json @@ -6,16 +6,16 @@ "name": "alex", "select": { "type": "interval", - "on": "[mousedown[!event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[!event.shiftKey], mouseup] > mousemove" + "on": "[pointerdown[!event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[!event.shiftKey], pointerup] > pointermove" } }, { "name": "morgan", "select": { "type": "interval", - "on": "[mousedown[event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[event.shiftKey], mouseup] > mousemove", + "on": "[pointerdown[event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[event.shiftKey], pointerup] > pointermove", "mark": {"fill": "#fdbb84", "fillOpacity": 0.5, "stroke": "#e34a33"} } } diff --git a/examples/specs/selection_interval_mark_style.vl.json b/examples/specs/selection_interval_mark_style.vl.json index 536d4832c8..2d3602652a 100644 --- a/examples/specs/selection_interval_mark_style.vl.json +++ b/examples/specs/selection_interval_mark_style.vl.json @@ -6,16 +6,16 @@ "name": "alex", "select": { "type": "interval", - "on": "[mousedown[!event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[!event.shiftKey], mouseup] > mousemove" + "on": "[pointerdown[!event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[!event.shiftKey], pointerup] > pointermove" } }, { "name": "morgan", "select": { "type": "interval", - "on": "[mousedown[event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[event.shiftKey], mouseup] > mousemove", + "on": "[pointerdown[event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[event.shiftKey], pointerup] > pointermove", "mark": {"fill": "#fdbb84", "fillOpacity": 0.5, "stroke": "#e34a33"} } } diff --git a/examples/specs/selection_layer.json b/examples/specs/selection_layer.json index b916704345..c26ebe3dbc 100644 --- a/examples/specs/selection_layer.json +++ b/examples/specs/selection_layer.json @@ -9,7 +9,7 @@ "name": "grid", "select": { "type": "interval", - "translate": "[mousedown[!event.shiftKey], mouseup] > mousemove" + "translate": "[pointerdown[!event.shiftKey], pointerup] > pointermove" }, "bind": "scales" }, @@ -38,8 +38,8 @@ "name": "brush", "select": { "type": "interval", - "on": "[mousedown[event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[event.shiftKey], mouseup] > mousemove" + "on": "[pointerdown[event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[event.shiftKey], pointerup] > pointermove" } } ], diff --git a/examples/specs/selection_multi_condition.vl.json b/examples/specs/selection_multi_condition.vl.json index 30b8f38cc6..98334d62cd 100644 --- a/examples/specs/selection_multi_condition.vl.json +++ b/examples/specs/selection_multi_condition.vl.json @@ -8,7 +8,7 @@ "name": "hoverbrush", "select": { "type": "point", - "on": "mouseover", "nearest": true + "on": "pointerover", "nearest": true } } ], diff --git a/examples/specs/selection_translate_brush_shift-drag.vl.json b/examples/specs/selection_translate_brush_shift-drag.vl.json index 1ae8bdc369..f94e82f27e 100644 --- a/examples/specs/selection_translate_brush_shift-drag.vl.json +++ b/examples/specs/selection_translate_brush_shift-drag.vl.json @@ -5,7 +5,7 @@ "name": "brush", "select": { "type": "interval", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!" + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!" } }], "mark": {"type": "circle", "clip": true}, diff --git a/examples/specs/selection_translate_scatterplot_shift-drag.vl.json b/examples/specs/selection_translate_scatterplot_shift-drag.vl.json index ae4709fa51..406b413233 100644 --- a/examples/specs/selection_translate_scatterplot_shift-drag.vl.json +++ b/examples/specs/selection_translate_scatterplot_shift-drag.vl.json @@ -5,7 +5,7 @@ "name": "grid", "select": { "type": "interval", - "translate": "[mousedown[event.shiftKey], window:mouseup] > window:mousemove!" + "translate": "[pointerdown[event.shiftKey], window:pointerup] > window:pointermove!" }, "bind": "scales" }], diff --git a/examples/specs/selection_type_single_mouseover.vl.json b/examples/specs/selection_type_single_pointerover.vl.json similarity index 87% rename from examples/specs/selection_type_single_mouseover.vl.json rename to examples/specs/selection_type_single_pointerover.vl.json index 04dc440cf1..67b0328d28 100644 --- a/examples/specs/selection_type_single_mouseover.vl.json +++ b/examples/specs/selection_type_single_pointerover.vl.json @@ -3,7 +3,7 @@ "data": {"url": "data/cars.json"}, "params": [{ "name": "pts", - "select": {"type": "point", "on": "mouseover"} + "select": {"type": "point", "on": "pointerover"} }], "mark": "rect", "encoding": { diff --git a/examples/specs/trellis_selections.vl.json b/examples/specs/trellis_selections.vl.json index 7f4ed90cb2..adcea7a106 100644 --- a/examples/specs/trellis_selections.vl.json +++ b/examples/specs/trellis_selections.vl.json @@ -10,8 +10,8 @@ "type": "interval", "encodings": ["x"], "resolve": "intersect", - "on": "[mousedown[event.shiftKey], mouseup] > mousemove", - "translate": "[mousedown[event.shiftKey], mouseup] > mousemove" + "on": "[pointerdown[event.shiftKey], pointerup] > pointermove", + "translate": "[pointerdown[event.shiftKey], pointerup] > pointermove" } }, { @@ -19,7 +19,7 @@ "select": { "type": "interval", "resolve": "global", - "translate": "[mousedown[!event.shiftKey], mouseup] > mousemove" + "translate": "[pointerdown[!event.shiftKey], pointerup] > pointermove" }, "bind": "scales" }, @@ -29,7 +29,7 @@ "type": "point", "fields": ["X"], "resolve": "global", - "on": "mouseover", + "on": "pointerover", "nearest": true }, "bind": {"input": "number"} diff --git a/site/docs/parameter/select.md b/site/docs/parameter/select.md index 4490c71ced..bb8e4c5b03 100644 --- a/site/docs/parameter/select.md +++ b/site/docs/parameter/select.md @@ -82,7 +82,7 @@ The `on` property modifies the event that triggers the selection. For instance, a single rectangle in the heatmap below can now be selected on mouse hover instead. -
+
### `clear` diff --git a/site/static/index.ts b/site/static/index.ts index 33936da0b2..f359698165 100644 --- a/site/static/index.ts +++ b/site/static/index.ts @@ -241,7 +241,7 @@ if (carousel) { [].forEach.call(slides, (slide: Element) => { const video = slide.querySelector('video'); if (video) { - video.addEventListener('mouseover', () => { + video.addEventListener('pointerover', () => { (slide.querySelector('.example-vis') as any).style.visibility = 'visible'; video.style.display = 'none'; video.pause(); diff --git a/src/compile/selection/assemble.ts b/src/compile/selection/assemble.ts index 1b12eb3ee3..53974a2a1d 100644 --- a/src/compile/selection/assemble.ts +++ b/src/compile/selection/assemble.ts @@ -72,7 +72,7 @@ export function assembleFacetSignals(model: FacetModel, signals: Signal[]) { value: {}, on: [ { - events: parseSelector('mousemove', 'scope'), + events: parseSelector('pointermove', 'scope'), update: `isTuple(facet) ? facet : group(${name}).datum` } ] @@ -111,7 +111,7 @@ export function assembleTopLevelSignals(model: UnitModel, signals: Signal[]) { signals.unshift({ name: 'unit', value: {}, - on: [{events: 'mousemove', update: 'isTuple(group()) ? group() : unit'}] + on: [{events: 'pointermove', update: 'isTuple(group()) ? group() : unit'}] }); } } diff --git a/src/selection.ts b/src/selection.ts index 4bd56525cb..e607590b7c 100644 --- a/src/selection.ts +++ b/src/selection.ts @@ -169,7 +169,7 @@ export interface IntervalSelectionConfig extends BaseSelectionConfig<'interval'> * which must include a start and end event to trigger continuous panning. * Discrete panning (e.g., pressing the left/right arrow keys) will be supported in future versions. * - * __Default value:__ `true`, which corresponds to `[mousedown, window:mouseup] > window:mousemove!`. + * __Default value:__ `true`, which corresponds to `[pointerdown, window:pointerup] > window:pointermove!`. * This default allows users to clicks and drags within an interval selection to reposition it. * * __See also:__ [`translate` examples](https://vega.github.io/vega-lite/docs/selection.html#translate) in the documentation. @@ -310,9 +310,9 @@ export const defaultConfig: SelectionConfig = { clear: 'dblclick' }, interval: { - on: '[mousedown, window:mouseup] > window:mousemove!', + on: '[pointerdown, window:pointerup] > window:pointermove!', encodings: ['x', 'y'], - translate: '[mousedown, window:mouseup] > window:mousemove!', + translate: '[pointerdown, window:pointerup] > window:pointermove!', zoom: 'wheel!', mark: {fill: '#333', fillOpacity: 0.125, stroke: 'white'}, resolve: 'global', diff --git a/test-runtime/index.html b/test-runtime/index.html index b3f511838c..aeaef0f71a 100644 --- a/test-runtime/index.html +++ b/test-runtime/index.html @@ -1,111 +1,111 @@ - - - - - -
- - + + + +
+ + - - + const vgSpec = vegaLite.compile(vlSpec).spec; + view = new vega.View(vega.parse(vgSpec)) + .renderer('svg') + .initialize('#vis') + .run(); + } + + const winSrc = ['pointermove', 'pointerup']; + function pointerEvt(type, target, opts) { + opts.bubbles = true; + target = winSrc.indexOf(type) < 0 ? target : window; + + target.dispatchEvent( + new PointerEvent('pointermove', { ...opts, clientX: opts.clientX - 5, clientY: opts.clientY - 5 }) + ); + + target.dispatchEvent(new PointerEvent('pointermove', opts)); + + target.dispatchEvent(type === 'wheel' ? new WheelEvent('wheel', opts) : new PointerEvent(type, opts)); + + target.dispatchEvent( + new PointerEvent('pointermove', { ...opts, clientX: opts.clientX + 5, clientY: opts.clientY + 5 }) + ); + } + + function mark(id, parent) { + return document.querySelector((parent ? `g.${parent} ` : '') + `g.mark-symbol.role-mark path:nth-child(${id})`); + } + + function coords(el) { + const rect = el.getBoundingClientRect(); + return [Math.ceil(rect.left + rect.width / 2), Math.ceil(rect.top + rect.height / 2)]; + } + + function brushOrEl(el, parent, _) { + return !_ ? el : document.querySelector((parent ? `g.${parent} ` : '') + 'g.sel_brush > path'); + } + + function click(el, evt) { + pointerEvt('pointerdown', el, evt); + pointerEvt('pointerup', window, evt); + pointerEvt('click', el, evt); + } + + async function brush(id0, id1, parent, targetBrush) { + const el0 = mark(id0, parent); + const el1 = mark(id1, parent); + const [mdX, mdY] = coords(el0); + const [muX, muY] = coords(el1); + pointerEvt('pointerdown', brushOrEl(el0, parent, targetBrush), { clientX: mdX, clientY: mdY }); + pointerEvt('pointerup', window, { clientX: muX, clientY: muY }); + return (await view.runAsync()).data('sel_store'); + } + + async function pt(id, parent, shiftKey) { + const el = mark(id, parent); + const [clientX, clientY] = coords(el); + click(el, { clientX, clientY, shiftKey }); + return (await view.runAsync()).data('sel_store'); + } + + async function clear(id, parent, shiftKey) { + const bg = document.querySelector((parent ? `g.${parent} ` : '') + 'path.background'); + const el = mark(id, parent); + let [clientX, clientY] = coords(el); + clientX += 10; + clientY -= 10; + click(bg, { clientX, clientY, shiftKey }); + return (await view.runAsync()).data('sel_store'); + } + + async function zoom(id, delta, parent, targetBrush) { + const el = mark(id, parent); + const [clientX, clientY] = coords(el); + pointerEvt('wheel', brushOrEl(el, parent, targetBrush), { + clientX, + clientY, + deltaX: delta, + deltaY: delta, + deltaZ: delta + }); + pointerEvt('wheel', brushOrEl(el, parent, targetBrush), { + clientX, + clientY, + deltaX: Math.sign(delta), + deltaY: Math.sign(delta), + deltaZ: Math.sign(delta) + }); + return (await view.runAsync()).data('sel_store'); + } + + + \ No newline at end of file diff --git a/test/compile/selection/clear.test.ts b/test/compile/selection/clear.test.ts index 38c7c13edb..08aa58f325 100644 --- a/test/compile/selection/clear.test.ts +++ b/test/compile/selection/clear.test.ts @@ -19,8 +19,8 @@ describe('Clear selection transform, point types', () => { model.parseScale(); const selCmpts = (model.component.selection = parseUnitSelection(model, [ {name: 'one', select: 'point'}, - {name: 'three', select: {type: 'point', clear: 'mouseout'}}, - {name: 'four', select: {type: 'point', clear: 'mouseout'}}, + {name: 'three', select: {type: 'point', clear: 'pointerout'}}, + {name: 'four', select: {type: 'point', clear: 'pointerout'}}, {name: 'five', select: {type: 'point', clear: false}}, {name: 'six', select: {type: 'point', clear: false}}, { @@ -81,7 +81,7 @@ describe('Clear selection transform, point types', () => { 'datum && item().mark.marktype !== \'group\' && indexof(item().mark.role, \'legend\') < 0 ? {unit: "", _vgsid_: (item().isVoronoi ? datum.datum : datum)["_vgsid_"]} : null', force: true }, - {events: parseSelector('mouseout', 'view'), update: 'null'} + {events: parseSelector('pointerout', 'view'), update: 'null'} ] } ]); @@ -98,7 +98,7 @@ describe('Clear selection transform, point types', () => { 'datum && item().mark.marktype !== \'group\' && indexof(item().mark.role, \'legend\') < 0 ? {unit: "", _vgsid_: (item().isVoronoi ? datum.datum : datum)["_vgsid_"]} : null', force: true }, - {events: parseSelector('mouseout', 'view'), update: 'null'} + {events: parseSelector('pointerout', 'view'), update: 'null'} ] } ]); @@ -200,11 +200,11 @@ describe('Clear selection transform, interval type', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[two_x[0], clamp(x(unit), 0, width)]' }, { @@ -222,11 +222,11 @@ describe('Clear selection transform, interval type', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[y(unit), y(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[two_y[0], clamp(y(unit), 0, height)]' }, { diff --git a/test/compile/selection/facets.test.ts b/test/compile/selection/facets.test.ts index f276685d8d..4a2cadf775 100644 --- a/test/compile/selection/facets.test.ts +++ b/test/compile/selection/facets.test.ts @@ -41,7 +41,7 @@ describe('Faceted Selections', () => { value: {}, on: [ { - events: [{source: 'scope', type: 'mousemove'}], + events: [{source: 'scope', type: 'pointermove'}], update: 'isTuple(facet) ? facet : group("cell").datum' } ] diff --git a/test/compile/selection/interval.test.ts b/test/compile/selection/interval.test.ts index c626cd0784..17a0988f9b 100644 --- a/test/compile/selection/interval.test.ts +++ b/test/compile/selection/interval.test.ts @@ -35,7 +35,7 @@ describe('Interval Selections', () => { name: 'thr-ee', select: { type: 'interval', - on: '[mousedown, mouseup] > mousemove, [keydown, keyup] > keypress', + on: '[pointerdown, pointerup] > pointermove, [keydown, keyup] > keypress', clear: false, translate: false, zoom: false, @@ -100,11 +100,11 @@ describe('Interval Selections', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[one_x[0], clamp(x(unit), 0, width)]' }, { @@ -150,11 +150,11 @@ describe('Interval Selections', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, mouseup] > mousemove', 'scope')[0], + events: parseSelector('[pointerdown, pointerup] > pointermove', 'scope')[0], update: '[thr_ee_x[0], clamp(x(unit), 0, width)]' }, { @@ -185,11 +185,11 @@ describe('Interval Selections', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[y(unit), y(unit)]' }, { - events: parseSelector('[mousedown, mouseup] > mousemove', 'scope')[0], + events: parseSelector('[pointerdown, pointerup] > pointermove', 'scope')[0], update: '[thr_ee_y[0], clamp(y(unit), 0, height)]' }, { @@ -237,11 +237,11 @@ describe('Interval Selections', () => { init: '[scale("x", 50), scale("x", 70)]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[four_x[0], clamp(x(unit), 0, width)]' }, { @@ -282,11 +282,11 @@ describe('Interval Selections', () => { init: '[scale("x", 50), scale("x", 60)]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[five_x[0], clamp(x(unit), 0, width)]' }, { @@ -310,11 +310,11 @@ describe('Interval Selections', () => { init: '[scale("y", 23), scale("y", 54)]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[y(unit), y(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[five_y[0], clamp(y(unit), 0, height)]' }, { @@ -355,11 +355,11 @@ describe('Interval Selections', () => { init: '[scale("x", datetime(2000, 9, 5, 0, 0, 0, 0)), scale("x", datetime(2001, 0, 13, 0, 0, 0, 0))]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[six_x[0], clamp(x(unit), 0, width)]' }, { @@ -897,11 +897,11 @@ describe('Interval Selections', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[y(unit), y(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[one_latitude_1[0], clamp(y(unit), 0, height)]' } ] @@ -911,11 +911,11 @@ describe('Interval Selections', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[one_longitude_1[0], clamp(x(unit), 0, width)]' } ] @@ -931,11 +931,11 @@ describe('Interval Selections', () => { value: [], on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[two_longitude_1[0], clamp(x(unit), 0, width)]' } ] @@ -955,11 +955,11 @@ describe('Interval Selections', () => { init: '[three_init[0][1], three_init[1][1]]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[y(unit), y(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[three_latitude_1[0], clamp(y(unit), 0, height)]' } ] @@ -969,11 +969,11 @@ describe('Interval Selections', () => { init: '[three_init[0][0], three_init[1][0]]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[x(unit), x(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[three_longitude_1[0], clamp(x(unit), 0, width)]' } ] @@ -997,11 +997,11 @@ describe('Interval Selections', () => { init: '[four_init[0][1], four_init[1][1]]', on: [ { - events: parseSelector('mousedown', 'scope')[0], + events: parseSelector('pointerdown', 'scope')[0], update: '[y(unit), y(unit)]' }, { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope')[0], + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope')[0], update: '[four_latitude_1[0], clamp(y(unit), 0, height)]' } ] diff --git a/test/compile/selection/legends.test.ts b/test/compile/selection/legends.test.ts index ba01ec528f..f6e7973853 100644 --- a/test/compile/selection/legends.test.ts +++ b/test/compile/selection/legends.test.ts @@ -68,7 +68,7 @@ describe('Interactive Legends', () => { { name: 'two', select: {type: 'point', fields: ['Origin']}, - bind: {legend: 'dblclick, mouseover'} + bind: {legend: 'dblclick, pointerover'} }, { name: 'four', @@ -78,12 +78,12 @@ describe('Interactive Legends', () => { { name: 'seven', select: {type: 'point', fields: ['Origin'], on: 'click'}, - bind: {legend: 'mouseover'} + bind: {legend: 'pointerover'} }, { name: 'eight', select: {type: 'point', encodings: ['color'], on: 'click', clear: 'dblclick'}, - bind: {legend: 'mouseover'} + bind: {legend: 'pointerover'} }, { name: 'nine', @@ -162,7 +162,7 @@ describe('Interactive Legends', () => { }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_symbols' }, { @@ -172,7 +172,7 @@ describe('Interactive Legends', () => { }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_labels' }, { @@ -182,7 +182,7 @@ describe('Interactive Legends', () => { }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_entries' } ], @@ -197,7 +197,7 @@ describe('Interactive Legends', () => { }, { source: 'view', - type: 'mouseover' + type: 'pointerover' } ], update: '!event.item || !datum ? null : two_Origin_legend', @@ -250,17 +250,17 @@ describe('Interactive Legends', () => { events: [ { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_symbols' }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_labels' }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_entries' } ], @@ -271,7 +271,7 @@ describe('Interactive Legends', () => { events: [ { source: 'view', - type: 'mouseover' + type: 'pointerover' } ], update: '!event.item || !datum ? null : seven_Origin_legend', @@ -287,17 +287,17 @@ describe('Interactive Legends', () => { events: [ { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_symbols' }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_labels' }, { source: 'view', - type: 'mouseover', + type: 'pointerover', markname: 'Origin_legend_entries' } ], @@ -308,7 +308,7 @@ describe('Interactive Legends', () => { events: [ { source: 'view', - type: 'mouseover' + type: 'pointerover' } ], update: '!event.item || !datum ? null : eight_Origin_legend', diff --git a/test/compile/selection/nearest.test.ts b/test/compile/selection/nearest.test.ts index 7f09cfa0e5..bac2a5ef65 100644 --- a/test/compile/selection/nearest.test.ts +++ b/test/compile/selection/nearest.test.ts @@ -56,11 +56,11 @@ function getModel(markType: any) { }, { name: 'ten', - select: {type: 'point', nearest: true, on: 'mouseover'} + select: {type: 'point', nearest: true, on: 'pointerover'} }, { name: 'eleven', - select: {type: 'point', nearest: true, on: 'mouseover, dblclick'} + select: {type: 'point', nearest: true, on: 'pointerover, dblclick'} } ]); model.parseMarkGroup(); @@ -111,9 +111,9 @@ describe('Nearest Selection Transform', () => { it('scopes events to the voronoi mark', () => { const selCmpts = getModel('circle').component.selection; expect(selCmpts['one'].events).toEqual([{source: 'scope', type: 'click', markname: 'voronoi'}]); - expect(selCmpts['ten'].events).toEqual([{source: 'scope', type: 'mouseover', markname: 'voronoi'}]); + expect(selCmpts['ten'].events).toEqual([{source: 'scope', type: 'pointerover', markname: 'voronoi'}]); expect(selCmpts['eleven'].events).toEqual([ - {source: 'scope', type: 'mouseover', markname: 'voronoi'}, + {source: 'scope', type: 'pointerover', markname: 'voronoi'}, {source: 'scope', type: 'dblclick', markname: 'voronoi'} ]); }); diff --git a/test/compile/selection/parse.test.ts b/test/compile/selection/parse.test.ts index f2a57b9ac4..1b0ac8fa42 100644 --- a/test/compile/selection/parse.test.ts +++ b/test/compile/selection/parse.test.ts @@ -35,7 +35,7 @@ describe('Selection', () => { expect(component.two.name).toBe('two'); expect(component.two.type).toBe('interval'); - expect(component.two.translate).toBe('[mousedown, window:mouseup] > window:mousemove!'); + expect(component.two.translate).toBe('[pointerdown, window:pointerup] > window:pointermove!'); expect(component.two.zoom).toBe('wheel!'); expect(component['two'].project.items).toEqual( expect.arrayContaining([ @@ -57,7 +57,7 @@ describe('Selection', () => { ); expect(component['two'].events).toEqual( parseSelector( - '[mousedown[!event.item || event.item.mark.name !== "two_brush"], window:mouseup] > window:mousemove!', + '[pointerdown[!event.item || event.item.mark.name !== "two_brush"], window:pointerup] > window:pointermove!', 'scope' ) ); @@ -77,7 +77,7 @@ describe('Selection', () => { name: 'two', select: { type: 'point', - on: 'mouseover', + on: 'pointerover', toggle: 'event.ctrlKey', encodings: ['color'] } @@ -86,7 +86,7 @@ describe('Selection', () => { name: 'three', select: { type: 'interval', - on: '[mousedown[!event.shiftKey], mouseup] > mousemove', + on: '[pointerdown[!event.shiftKey], pointerup] > pointermove', encodings: ['y'], translate: false, zoom: 'wheel[event.altKey]' @@ -111,7 +111,7 @@ describe('Selection', () => { {field: 'Origin', channel: 'color', index: 0, type: 'E', signals: {data: 'two_Origin', visual: 'two_color'}} ]) ); - expect(component['two'].events).toEqual(parseSelector('mouseover', 'scope')); + expect(component['two'].events).toEqual(parseSelector('pointerover', 'scope')); expect(component.three.name).toBe('three'); expect(component.three.type).toBe('interval'); @@ -129,15 +129,15 @@ describe('Selection', () => { ]) ); expect(component['three'].events).toEqual( - parseSelector('[mousedown[!event.shiftKey], mouseup] > mousemove', 'scope') + parseSelector('[pointerdown[!event.shiftKey], pointerup] > pointermove', 'scope') ); }); it('respects selection configs', () => { model.config.selection = { - point: {on: 'mouseover', encodings: ['color'], toggle: 'event.ctrlKey'}, + point: {on: 'pointerover', encodings: ['color'], toggle: 'event.ctrlKey'}, interval: { - on: '[mousedown[!event.shiftKey], mouseup] > mousemove', + on: '[pointerdown[!event.shiftKey], pointerup] > pointermove', encodings: ['y'], zoom: 'wheel[event.altKey]' } @@ -158,7 +158,7 @@ describe('Selection', () => { {field: 'Origin', channel: 'color', index: 0, type: 'E', signals: {data: 'one_Origin', visual: 'one_color'}} ]) ); - expect(component['one'].events).toEqual(parseSelector('mouseover', 'scope')); + expect(component['one'].events).toEqual(parseSelector('pointerover', 'scope')); expect(component.two.name).toBe('two'); expect(component.two.type).toBe('interval'); @@ -176,7 +176,7 @@ describe('Selection', () => { ]) ); expect(component['two'].events).toEqual( - parseSelector('[mousedown[!event.shiftKey], mouseup] > mousemove', 'scope') + parseSelector('[pointerdown[!event.shiftKey], pointerup] > pointermove', 'scope') ); }); @@ -341,7 +341,7 @@ describe('Selection', () => { value: [{x: {year: 2005, month: 1, date: 1}}], select: { type: 'point', - on: 'mouseover', + on: 'pointerover', encodings: ['x'], nearest: true } diff --git a/test/compile/selection/point.test.ts b/test/compile/selection/point.test.ts index 95a5c28c7a..44999ce6c2 100644 --- a/test/compile/selection/point.test.ts +++ b/test/compile/selection/point.test.ts @@ -30,7 +30,7 @@ describe('Multi Selection', () => { encodings: ['y', 'color'], nearest: true, clear: false, - on: 'mouseover', + on: 'pointerover', toggle: false, resolve: 'intersect' } @@ -258,7 +258,7 @@ describe('Multi Selection', () => { { name: 'unit', value: {}, - on: [{events: 'mousemove', update: 'isTuple(group()) ? group() : unit'}] + on: [{events: 'pointermove', update: 'isTuple(group()) ? group() : unit'}] } ]) ); diff --git a/test/compile/selection/toggle.test.ts b/test/compile/selection/toggle.test.ts index 743ad983ec..82012dd5fb 100644 --- a/test/compile/selection/toggle.test.ts +++ b/test/compile/selection/toggle.test.ts @@ -25,7 +25,7 @@ describe('Toggle Selection Transform', () => { type: 'point', encodings: ['y', 'color'], resolve: 'union', - on: 'mouseover', + on: 'pointerover', clear: false, toggle: 'event.ctrlKey' } diff --git a/test/compile/selection/translate.test.ts b/test/compile/selection/translate.test.ts index 264fe5d69e..a9445a30ad 100644 --- a/test/compile/selection/translate.test.ts +++ b/test/compile/selection/translate.test.ts @@ -46,7 +46,7 @@ function getModel( name: 'five', select: { type: 'interval', - translate: '[mousedown, mouseup] > mousemove, [keydown, keyup] > touchmove' + translate: '[pointerdown, pointerup] > pointermove, [keydown, keyup] > touchmove' } }, { @@ -92,7 +92,7 @@ describe('Translate Selection Transform', () => { value: {}, on: [ { - events: parseSelector('@four_brush:mousedown', 'scope'), + events: parseSelector('@four_brush:pointerdown', 'scope'), update: '{x: x(unit), y: y(unit), extent_x: slice(four_x), extent_y: slice(four_y)}' } ] @@ -102,7 +102,7 @@ describe('Translate Selection Transform', () => { value: {}, on: [ { - events: parseSelector('[@four_brush:mousedown, window:mouseup] > window:mousemove!', 'scope'), + events: parseSelector('[@four_brush:pointerdown, window:pointerup] > window:pointermove!', 'scope'), update: '{x: four_translate_anchor.x - x(unit), y: four_translate_anchor.y - y(unit)}' } ] @@ -121,7 +121,7 @@ describe('Translate Selection Transform', () => { value: {}, on: [ { - events: parseSelector('@five_brush:mousedown, @five_brush:keydown', 'scope'), + events: parseSelector('@five_brush:pointerdown, @five_brush:keydown', 'scope'), update: '{x: x(unit), y: y(unit), extent_x: slice(five_x), extent_y: slice(five_y)}' } ] @@ -132,7 +132,7 @@ describe('Translate Selection Transform', () => { on: [ { events: parseSelector( - '[@five_brush:mousedown, mouseup] > mousemove, [@five_brush:keydown, keyup] > touchmove', + '[@five_brush:pointerdown, pointerup] > pointermove, [@five_brush:keydown, keyup] > touchmove', 'scope' ), update: '{x: five_translate_anchor.x - x(unit), y: five_translate_anchor.y - y(unit)}' @@ -153,7 +153,7 @@ describe('Translate Selection Transform', () => { value: {}, on: [ { - events: parseSelector('mousedown', 'scope'), + events: parseSelector('pointerdown', 'scope'), update: '{x: x(unit), y: y(unit), extent_x: domain("x"), extent_y: domain("y")}' } ] @@ -163,7 +163,7 @@ describe('Translate Selection Transform', () => { value: {}, on: [ { - events: parseSelector('[mousedown, window:mouseup] > window:mousemove!', 'scope'), + events: parseSelector('[pointerdown, window:pointerup] > window:pointermove!', 'scope'), update: '{x: six_translate_anchor.x - x(unit), y: six_translate_anchor.y - y(unit)}' } ] diff --git a/test/config.test.ts b/test/config.test.ts index fa9cb2dfd0..22ee16fe09 100644 --- a/test/config.test.ts +++ b/test/config.test.ts @@ -124,12 +124,12 @@ describe('config', () => { }); it('correctly merges object-valued configs', () => { - const cfg = initConfig({selection: {point: {on: 'mouseover'}, interval: {encodings: ['x']}}}); + const cfg = initConfig({selection: {point: {on: 'pointerover'}, interval: {encodings: ['x']}}}); expect(cfg.selection).toHaveProperty('point'); expect(cfg.selection).toHaveProperty('interval'); // Overrides correctly - expect(cfg.selection.point).toHaveProperty('on', 'mouseover'); + expect(cfg.selection.point).toHaveProperty('on', 'pointerover'); expect(cfg.selection.interval).toHaveProperty('encodings', ['x']); // Preserves defaults diff --git a/test/normalize/selectioncompat.test.ts b/test/normalize/selectioncompat.test.ts index 2879efc935..a57cd4d2df 100644 --- a/test/normalize/selectioncompat.test.ts +++ b/test/normalize/selectioncompat.test.ts @@ -415,7 +415,7 @@ describe('SelectionCompatibilityNormalizer', () => { selection: { hover: { type: 'single', - on: 'mouseover', + on: 'pointerover', empty: 'all', fields: ['symbol'], init: {symbol: 'AAPL'} @@ -451,7 +451,7 @@ describe('SelectionCompatibilityNormalizer', () => { value: {symbol: 'AAPL'}, select: { type: 'point', - on: 'mouseover', + on: 'pointerover', fields: ['symbol'], toggle: false }