Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: preserve node order in swapWithParent #7639

Merged
merged 5 commits into from Dec 9, 2021
Merged

fix: preserve node order in swapWithParent #7639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9460999
fix: preserve node order in swapwithparents
RobinL Dec 8, 2021
0933eeb
chore: update examples [CI]
Dec 8, 2021
1da2608
style: auto-formatting [CI]
Dec 8, 2021
b89c54a
Update src/compile/data/dataflow.ts
domoritz Dec 9, 2021
85d30e0
docs: update src/compile/data/dataflow.ts
domoritz Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions examples/compiled/facet_bullet.vg.json
View file
Open in desktop
Expand Up @@ -80,7 +80,12 @@
]
},
{
"name": "data_1",
"name": "row_domain",
"source": "data_0",
"transform": [{"type": "aggregate", "groupby": ["title"]}]
},
{
"name": "data_2",
"source": "data_0",
"transform": [
{
Expand All @@ -98,7 +103,7 @@
]
},
{
"name": "data_2",
"name": "data_3",
"source": "data_0",
"transform": [
{
Expand All @@ -116,7 +121,7 @@
]
},
{
"name": "data_3",
"name": "data_4",
"source": "data_0",
"transform": [
{
Expand All @@ -134,7 +139,7 @@
]
},
{
"name": "data_4",
"name": "data_5",
"source": "data_0",
"transform": [
{
Expand All @@ -152,7 +157,7 @@
]
},
{
"name": "data_5",
"name": "data_6",
"source": "data_0",
"transform": [
{
Expand All @@ -170,19 +175,14 @@
]
},
{
"name": "data_6",
"name": "data_7",
"source": "data_0",
"transform": [
{
"type": "filter",
"expr": "isValid(datum[\"markers.0\"]) && isFinite(+datum[\"markers.0\"])"
}
]
},
{
"name": "row_domain",
"source": "data_0",
"transform": [{"type": "aggregate", "groupby": ["title"]}]
}
],
"signals": [
Expand Down
30 changes: 15 additions & 15 deletions examples/compiled/interactive_multi_line_pivot_tooltip.vg.json
View file
Open in desktop
Expand Up @@ -17,15 +17,12 @@
"source": "source_0",
"transform": [
{
"type": "pivot",
"field": "symbol",
"value": "price",
"groupby": ["date"]
"type": "filter",
"expr": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)"
},
{"type": "formula", "expr": "toDate(datum[\"date\"])", "as": "date"},
{
"type": "filter",
"expr": "(isDate(datum[\"date\"]) || (isValid(datum[\"date\"]) && isFinite(+datum[\"date\"])))"
"expr": "(isDate(datum[\"date\"]) || (isValid(datum[\"date\"]) && isFinite(+datum[\"date\"]))) && isValid(datum[\"price\"]) && isFinite(+datum[\"price\"])"
}
]
},
Expand All @@ -34,12 +31,15 @@
"source": "source_0",
"transform": [
{
"type": "filter",
"expr": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)"
"type": "pivot",
"field": "symbol",
"value": "price",
"groupby": ["date"]
},
{"type": "formula", "expr": "toDate(datum[\"date\"])", "as": "date"},
{
"type": "filter",
"expr": "(isDate(datum[\"date\"]) || (isValid(datum[\"date\"]) && isFinite(+datum[\"date\"]))) && isValid(datum[\"price\"]) && isFinite(+datum[\"price\"])"
"expr": "(isDate(datum[\"date\"]) || (isValid(datum[\"date\"]) && isFinite(+datum[\"date\"])))"
}
]
}
Expand Down Expand Up @@ -147,7 +147,7 @@
"type": "symbol",
"style": ["point"],
"interactive": false,
"from": {"data": "data_1"},
"from": {"data": "data_0"},
"encode": {
"update": {
"opacity": {"value": 0.7},
Expand All @@ -167,7 +167,7 @@
"type": "rule",
"style": ["rule"],
"interactive": true,
"from": {"data": "data_0"},
"from": {"data": "data_1"},
"encode": {
"update": {
"stroke": {"value": "black"},
Expand Down Expand Up @@ -223,8 +223,8 @@
"domain": {
"fields": [
{"data": "source_0", "field": "date"},
{"data": "data_1", "field": "date"},
{"data": "data_0", "field": "date"}
{"data": "data_0", "field": "date"},
{"data": "data_1", "field": "date"}
]
},
"range": [0, {"signal": "width"}]
Expand All @@ -235,7 +235,7 @@
"domain": {
"fields": [
{"data": "source_0", "field": "price"},
{"data": "data_1", "field": "price"}
{"data": "data_0", "field": "price"}
]
},
"range": [{"signal": "height"}, 0],
Expand All @@ -248,7 +248,7 @@
"domain": {
"fields": [
{"data": "source_0", "field": "symbol"},
{"data": "data_1", "field": "symbol"}
{"data": "data_0", "field": "symbol"}
],
"sort": true
},
Expand Down
36 changes: 18 additions & 18 deletions examples/compiled/interactive_seattle_weather.vg.json
View file
Open in desktop
Expand Up @@ -16,6 +16,10 @@
"name": "data_0",
"source": "source_0",
"transform": [
{
"type": "filter",
"expr": "!length(data(\"click_store\")) || vlSelectionTest(\"click_store\", datum)"
},
{
"field": "date",
"type": "timeunit",
Expand All @@ -24,25 +28,14 @@
},
{
"type": "filter",
"expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
},
{
"type": "aggregate",
"groupby": ["weather"],
"ops": ["count"],
"fields": [null],
"as": ["__count"]
"expr": "(isDate(datum[\"monthdate_date\"]) || (isValid(datum[\"monthdate_date\"]) && isFinite(+datum[\"monthdate_date\"]))) && isValid(datum[\"temp_max\"]) && isFinite(+datum[\"temp_max\"]) && isValid(datum[\"precipitation\"]) && isFinite(+datum[\"precipitation\"])"
}
]
},
{
"name": "data_1",
"source": "source_0",
"transform": [
{
"type": "filter",
"expr": "!length(data(\"click_store\")) || vlSelectionTest(\"click_store\", datum)"
},
{
"field": "date",
"type": "timeunit",
Expand All @@ -51,7 +44,14 @@
},
{
"type": "filter",
"expr": "(isDate(datum[\"monthdate_date\"]) || (isValid(datum[\"monthdate_date\"]) && isFinite(+datum[\"monthdate_date\"]))) && isValid(datum[\"temp_max\"]) && isFinite(+datum[\"temp_max\"]) && isValid(datum[\"precipitation\"]) && isFinite(+datum[\"precipitation\"])"
"expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
},
{
"type": "aggregate",
"groupby": ["weather"],
"ops": ["count"],
"fields": [null],
"as": ["__count"]
}
]
}
Expand Down Expand Up @@ -304,7 +304,7 @@
"type": "symbol",
"style": ["point"],
"interactive": true,
"from": {"data": "data_1"},
"from": {"data": "data_0"},
"encode": {
"update": {
"opacity": {"value": 0.7},
Expand Down Expand Up @@ -480,7 +480,7 @@
"type": "rect",
"style": ["bar"],
"interactive": true,
"from": {"data": "data_0"},
"from": {"data": "data_1"},
"encode": {
"update": {
"fill": [
Expand Down Expand Up @@ -555,7 +555,7 @@
{
"name": "concat_0_x",
"type": "time",
"domain": {"data": "data_1", "field": "monthdate_date"},
"domain": {"data": "data_0", "field": "monthdate_date"},
"range": [0, {"signal": "width"}]
},
{
Expand All @@ -568,15 +568,15 @@
{
"name": "concat_1_x",
"type": "linear",
"domain": {"data": "data_0", "field": "__count"},
"domain": {"data": "data_1", "field": "__count"},
"range": [0, {"signal": "width"}],
"nice": true,
"zero": true
},
{
"name": "concat_1_y",
"type": "band",
"domain": {"data": "data_0", "field": "weather", "sort": true},
"domain": {"data": "data_1", "field": "weather", "sort": true},
"range": {"step": {"signal": "concat_1_y_step"}},
"paddingInner": 0.1,
"paddingOuter": 0.05
Expand Down
8 changes: 5 additions & 3 deletions src/compile/data/dataflow.ts
View file
Open in desktop
Expand Up @@ -116,10 +116,12 @@ export abstract class DataFlowNode {
// remove old links
this._children = []; // equivalent to removing every child link one by one
parent.removeChild(this);
parent.parent.removeChild(parent);
const loc = parent.parent.removeChild(parent);

// swap two nodes but maintain order in children
this._parent = newParent;
newParent.addChild(this, loc);

// swap two nodes
this.parent = newParent;
parent.parent = this;
}
}
Expand Down