feat: move selection emptiness check to predicate (#7155)

* feat: move selection emptiness check to predicate * chore: update schema [CI] * chore: update examples [CI] Co-authored-by: GitHub Actions Bot <[email protected]>
vega · Jan 15, 2021 · 18b61c5 · 18b61c5
1 parent 32dc0d2
commit 18b61c5
Show file tree

Hide file tree

Showing 113 changed files with 454 additions and 556 deletions.
diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json
diff --git a/examples/compiled/airport_connections.vg.json b/examples/compiled/airport_connections.vg.json
@@ -23,7 +23,10 @@
       "name": "data_0",
       "source": "source_1",
       "transform": [
-        {"type": "filter", "expr": "(vlSelectionTest(\"org_store\", datum))"},
+        {
+          "type": "filter",
+          "expr": "length(data(\"org_store\")) && vlSelectionTest(\"org_store\", datum)"
+        },
         {
           "type": "lookup",
           "from": "source_2",

diff --git a/examples/compiled/bar_count_minimap.vg.json b/examples/compiled/bar_count_minimap.vg.json
@@ -11,7 +11,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         }
       ]
     },

diff --git a/examples/compiled/brush_table.vg.json b/examples/compiled/brush_table.vg.json
@@ -36,7 +36,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "window",
@@ -377,7 +377,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },

diff --git a/examples/compiled/concat_bar_layer_circle.vg.json b/examples/compiled/concat_bar_layer_circle.vg.json
@@ -54,7 +54,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
+          "expr": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -329,7 +329,7 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+                  "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
                   "value": "steelblue"
                 },
                 {"value": "grey"}

diff --git a/examples/compiled/concat_hover.vg.json b/examples/compiled/concat_hover.vg.json
@@ -115,7 +115,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "(vlSelectionTest(\"hover_store\", datum))",
+                  "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },
@@ -247,7 +247,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "(vlSelectionTest(\"hover_store\", datum))",
+                  "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },

diff --git a/examples/compiled/concat_hover_filter.vg.json b/examples/compiled/concat_hover_filter.vg.json
@@ -26,7 +26,10 @@
       "name": "data_1",
       "source": "source_0",
       "transform": [
-        {"type": "filter", "expr": "(vlSelectionTest(\"hover_store\", datum))"}
+        {
+          "type": "filter",
+          "expr": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)"
+        }
       ]
     },
     {

diff --git a/examples/compiled/interactive_area_brush.vg.json b/examples/compiled/interactive_area_brush.vg.json
@@ -26,7 +26,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",

diff --git a/examples/compiled/interactive_bar_select_highlight.vg.json b/examples/compiled/interactive_bar_select_highlight.vg.json
@@ -140,18 +140,18 @@
           "cursor": {"value": "pointer"},
           "fillOpacity": [
             {
-              "test": "!(length(data(\"select_store\"))) || (vlSelectionTest(\"select_store\", datum))",
+              "test": "!length(data(\"select_store\")) || vlSelectionTest(\"select_store\", datum)",
               "value": 1
             },
             {"value": 0.3}
           ],
           "strokeWidth": [
             {
-              "test": "(!(length(data(\"select_store\"))) || (vlSelectionTest(\"select_store\", datum))) && (length(data(\"select_store\")))",
+              "test": "length(data(\"select_store\")) && vlSelectionTest(\"select_store\", datum)",
               "value": 2
             },
             {
-              "test": "(vlSelectionTest(\"highlight_store\", datum))",
+              "test": "length(data(\"highlight_store\")) && vlSelectionTest(\"highlight_store\", datum)",
               "value": 1
             },
             {"value": 0}

diff --git a/examples/compiled/interactive_brush.vg.json b/examples/compiled/interactive_brush.vg.json
@@ -321,7 +321,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },

diff --git a/examples/compiled/interactive_concat_layer.vg.json b/examples/compiled/interactive_concat_layer.vg.json
@@ -54,7 +54,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
+          "expr": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -343,7 +343,7 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+                  "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
                   "value": "steelblue"
                 },
                 {"value": "grey"}

diff --git a/examples/compiled/interactive_dashboard_europe_pop.vg.json b/examples/compiled/interactive_dashboard_europe_pop.vg.json
@@ -586,10 +586,10 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
-                  "value": "steelblue"
+                  "test": "length(data(\"brush_store\")) && vlSelectionTest(\"brush_store\", datum)",
+                  "value": "goldenrod"
                 },
-                {"value": "goldenrod"}
+                {"value": "steelblue"}
               ],
               "ariaRoleDescription": {"value": "bar"},
               "description": {
@@ -907,10 +907,10 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
-                  "value": "steelblue"
+                  "test": "length(data(\"brush_store\")) && vlSelectionTest(\"brush_store\", datum)",
+                  "value": "goldenrod"
                 },
-                {"value": "goldenrod"}
+                {"value": "steelblue"}
               ],
               "ariaRoleDescription": {"value": "bar"},
               "description": {
@@ -1307,10 +1307,10 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
-                  "value": "steelblue"
+                  "test": "length(data(\"brush_store\")) && vlSelectionTest(\"brush_store\", datum)",
+                  "value": "goldenrod"
                 },
-                {"value": "goldenrod"}
+                {"value": "steelblue"}
               ],
               "ariaRoleDescription": {"value": "point"},
               "description": {

diff --git a/examples/compiled/interactive_global_development.vg.json b/examples/compiled/interactive_global_development.vg.json
@@ -42,7 +42,7 @@
         {"type": "filter", "expr": "datum[\"country\"]===\"Afghanistan\""},
         {
           "type": "filter",
-          "expr": "!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum))"
+          "expr": "!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum)"
         }
       ]
     },
@@ -65,7 +65,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum))"
+          "expr": "!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum)"
         },
         {
           "type": "filter",
@@ -79,7 +79,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "(!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum))) && (((vlSelectionTest(\"clicked_store\", datum))) || ((vlSelectionTest(\"hovered_store\", datum))))"
+          "expr": "(!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum)) && ((length(data(\"clicked_store\")) && vlSelectionTest(\"clicked_store\", datum)) || (length(data(\"hovered_store\")) && vlSelectionTest(\"hovered_store\", datum)))"
         },
         {
           "type": "filter",
@@ -93,11 +93,11 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "(vlSelectionTest(\"hovered_store\", datum))"
+          "expr": "length(data(\"hovered_store\")) && vlSelectionTest(\"hovered_store\", datum)"
         },
         {
           "type": "filter",
-          "expr": "!(!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum)))"
+          "expr": "!(!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum))"
         },
         {
           "type": "filter",
@@ -166,23 +166,12 @@
       "name": "hovered_tuple_fields",
       "value": [{"type": "E", "field": "country"}]
     },
-    {
-      "name": "hovered_toggle",
-      "value": false,
-      "on": [
-        {
-          "events": [{"source": "scope", "type": "mouseover"}],
-          "update": "event.shiftKey"
-        },
-        {"events": [{"source": "view", "type": "dblclick"}], "update": "false"}
-      ]
-    },
     {
       "name": "hovered_modify",
       "on": [
         {
           "events": {"signal": "hovered_tuple"},
-          "update": "modify(\"hovered_store\", hovered_toggle ? null : hovered_tuple, hovered_toggle ? null : true, hovered_toggle ? hovered_tuple : null)"
+          "update": "modify(\"hovered_store\", hovered_tuple, true)"
         }
       ]
     },
@@ -277,7 +266,7 @@
               "stroke": {"value": "lightgray"},
               "opacity": [
                 {
-                  "test": "((vlSelectionTest(\"hovered_store\", datum))) || ((vlSelectionTest(\"clicked_store\", datum)))",
+                  "test": "(length(data(\"hovered_store\")) && vlSelectionTest(\"hovered_store\", datum)) || (length(data(\"clicked_store\")) && vlSelectionTest(\"clicked_store\", datum))",
                   "value": 0.8
                 },
                 {"value": 0}

diff --git a/examples/compiled/interactive_index_chart.vg.json b/examples/compiled/interactive_index_chart.vg.json
@@ -37,7 +37,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"index_store\"))) || (vlSelectionTest(\"index_store\", datum))"
+          "expr": "!length(data(\"index_store\")) || vlSelectionTest(\"index_store\", datum)"
         }
       ]
     },
@@ -65,7 +65,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"index_store\"))) || (vlSelectionTest(\"index_store\", datum))"
+          "expr": "!length(data(\"index_store\")) || vlSelectionTest(\"index_store\", datum)"
         }
       ]
     },

diff --git a/examples/compiled/interactive_layered_crossfilter.vg.json b/examples/compiled/interactive_layered_crossfilter.vg.json
@@ -69,7 +69,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -107,7 +107,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         }
       ]
     },

diff --git a/examples/compiled/interactive_layered_crossfilter_discrete.vg.json b/examples/compiled/interactive_layered_crossfilter_discrete.vg.json
@@ -69,7 +69,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -107,7 +107,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         }
       ]
     },

diff --git a/examples/compiled/interactive_legend.vg.json b/examples/compiled/interactive_legend.vg.json
@@ -147,7 +147,7 @@
               "fill": {"scale": "color", "field": "series"},
               "opacity": [
                 {
-                  "test": "!(length(data(\"industry_store\"))) || (vlSelectionTest(\"industry_store\", datum))",
+                  "test": "!length(data(\"industry_store\")) || vlSelectionTest(\"industry_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}

diff --git a/examples/compiled/interactive_legend_dblclick.vg.json b/examples/compiled/interactive_legend_dblclick.vg.json
@@ -147,7 +147,7 @@
               "fill": {"scale": "color", "field": "series"},
               "opacity": [
                 {
-                  "test": "!(length(data(\"industry_store\"))) || (vlSelectionTest(\"industry_store\", datum))",
+                  "test": "!length(data(\"industry_store\")) || vlSelectionTest(\"industry_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}

diff --git a/examples/compiled/interactive_line_hover.vg.json b/examples/compiled/interactive_line_hover.vg.json
@@ -117,7 +117,7 @@
               "strokeWidth": {"value": 8},
               "opacity": [
                 {
-                  "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+                  "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}
@@ -163,15 +163,15 @@
             "update": {
               "stroke": [
                 {
-                  "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+                  "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "symbol"
                 },
                 {"value": "grey"}
               ],
               "opacity": [
                 {
-                  "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+                  "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}
@@ -199,15 +199,15 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "scale": "color",
               "field": "symbol"
             },
             {"value": "grey"}
           ],
           "opacity": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "value": 1
             },
             {"value": 0.2}
@@ -234,15 +234,15 @@
           "dx": {"value": 4},
           "fill": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "scale": "color",
               "field": "symbol"
             },
             {"value": "grey"}
           ],
           "opacity": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "value": 1
             },
             {"value": 0.2}