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

Custom Sort Order #3423

Merged
merged 14 commits into from
Mar 29, 2018
Merged

Custom Sort Order #3423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
22acca0
reuse calculate node to generate new sort field
sirahd Feb 13, 2018
c30de25
rename the created data source to fieldname_sort_index
sirahd Feb 27, 2018
45e9cad
update docs to include examples
sirahd Feb 27, 2018
d260ade
remove comments and comment dataflow debug
sirahd Feb 27, 2018
857a652
uses vega-util function for array and string
sirahd Feb 27, 2018
b5ea38f
add custom sort examples
sirahd Mar 6, 2018
ac4d8db
update documentation
sirahd Mar 6, 2018
ae2b2c1
add unit tests and fix comment per @kanitw
sirahd Mar 6, 2018
c070957
fix documentation for style issue and clariy
sirahd Mar 7, 2018
f83592b
update schema and fix import error
sirahd Mar 7, 2018
177ead1
fixes rebase issue
sirahd Mar 18, 2018
90eabb3
Update sort.md
kanitw Mar 18, 2018
5efd2c6
remove iterating in parse and instead do for loop in each node, creat…
sirahd Mar 21, 2018
6fbdde7
update schema
sirahd Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions build/vega-lite-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,12 @@
},
"sort": {
"anyOf": [
{
"items": {
"type": "string"
},
"type": "array"
},
{
"$ref": "#/definitions/SortOrder"
},
Expand All @@ -996,7 +1002,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `null` (no sorting), or an array specifying the preferred order of values.\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"test": {
"$ref": "#/definitions/LogicalOperand<Predicate>"
Expand Down Expand Up @@ -1193,6 +1199,12 @@
},
"sort": {
"anyOf": [
{
"items": {
"type": "string"
},
"type": "array"
},
{
"$ref": "#/definitions/SortOrder"
},
Expand All @@ -1203,7 +1215,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `null` (no sorting), or an array specifying the preferred order of values.\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"timeUnit": {
"$ref": "#/definitions/TimeUnit",
Expand Down Expand Up @@ -2323,6 +2335,12 @@
},
"sort": {
"anyOf": [
{
"items": {
"type": "string"
},
"type": "array"
},
{
"$ref": "#/definitions/SortOrder"
},
Expand All @@ -2333,7 +2351,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `null` (no sorting), or an array specifying the preferred order of values.\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"timeUnit": {
"$ref": "#/definitions/TimeUnit",
Expand Down Expand Up @@ -4372,6 +4390,12 @@
},
"sort": {
"anyOf": [
{
"items": {
"type": "string"
},
"type": "array"
},
{
"$ref": "#/definitions/SortOrder"
},
Expand All @@ -4382,7 +4406,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `null` (no sorting), or an array specifying the preferred order of values.\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"stack": {
"anyOf": [
Expand Down
1 change: 1 addition & 0 deletions examples/compiled/bar_custom_sort.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
213 changes: 213 additions & 0 deletions examples/compiled/bar_custom_sort.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
{
"$schema": "https://vega.github.io/schema/vega/v3.0.json",
"description": "A simple bar chart with embedded data.",
"autosize": "pad",
"padding": 5,
"height": 200,
"style": "cell",
"data": [
{
"name": "source_0",
"values": [
{
"a": "A",
"b": 28
},
{
"a": "B",
"b": 55
},
{
"a": "C",
"b": 43
},
{
"a": "D",
"b": 91
},
{
"a": "E",
"b": 81
},
{
"a": "F",
"b": 53
},
{
"a": "G",
"b": 19
},
{
"a": "H",
"b": 87
},
{
"a": "I",
"b": 52
}
]
},
{
"name": "data_0",
"source": "source_0",
"transform": [
{
"type": "formula",
"expr": "toNumber(datum[\"b\"])",
"as": "b"
},
{
"type": "formula",
"expr": "datum.a === 'D' ? 0 : datum.a === 'G' ? 1 : datum.a === 'F' ? 2 : 3",
"as": "a_sort_index"
}
]
},
{
"name": "data_1",
"source": "data_0",
"transform": [
{
"type": "filter",
"expr": "datum[\"b\"] !== null && !isNaN(datum[\"b\"])"
}
]
}
],
"signals": [
{
"name": "x_step",
"value": 21
},
{
"name": "width",
"update": "bandspace(domain('x').length, 0.1, 0.05) * x_step"
}
],
"marks": [
{
"name": "marks",
"type": "rect",
"style": [
"bar"
],
"from": {
"data": "data_1"
},
"encode": {
"update": {
"fill": {
"value": "#4c78a8"
},
"x": {
"scale": "x",
"field": "a"
},
"width": {
"scale": "x",
"band": true
},
"y": {
"scale": "y",
"field": "b"
},
"y2": {
"scale": "y",
"value": 0
}
}
}
}
],
"scales": [
{
"name": "x",
"type": "band",
"domain": {
"data": "data_0",
"field": "a",
"sort": {
"op": "min",
"field": "a_sort_index"
}
},
"range": {
"step": {
"signal": "x_step"
}
},
"paddingInner": 0.1,
"paddingOuter": 0.05
},
{
"name": "y",
"type": "linear",
"domain": {
"data": "data_1",
"field": "b"
},
"range": [
{
"signal": "height"
},
0
],
"nice": true,
"zero": true
}
],
"axes": [
{
"scale": "x",
"orient": "bottom",
"labelOverlap": true,
"title": "a",
"zindex": 1,
"encode": {
"labels": {
"update": {
"angle": {
"value": 270
},
"align": {
"value": "right"
},
"baseline": {
"value": "middle"
}
}
}
}
},
{
"scale": "y",
"orient": "left",
"labelOverlap": true,
"tickCount": {
"signal": "ceil(height/40)"
},
"title": "b",
"zindex": 1
},
{
"scale": "y",
"orient": "left",
"domain": false,
"grid": true,
"labels": false,
"maxExtent": 0,
"minExtent": 0,
"tickCount": {
"signal": "ceil(height/40)"
},
"ticks": false,
"zindex": 0,
"gridScale": "x"
}
],
"config": {
"axisY": {
"minExtent": 30
}
}
}
Loading