Skip to content
This repository has been archived by the owner on Jun 25, 2020. It is now read-only.

Commit

Permalink
feat: line chart with revised encodeable utilities (#26)
Browse files Browse the repository at this point in the history 
* feat: line chart

* feat: implement scale extraction

* refactor: no error

* fix: handle null

* fix: nicing and demo

* fix: legend and demo

* fix: remove commented code

* fix: clean

* fix: reviewer comments

* fix: legend and series

* docs: make demos tsx

* fix: reactnode

* fix: label angle

* fix: resolve labelxxx field names

* docs: try knobs

* feat: improve axis

* refactor: combine computelayout into axisagent

* refactor: cleaner use of scale

* fix: proptypes
  • Loading branch information
@kristw
kristw committed Mar 28, 2019
1 parent 3a4cc43 commit c9b8195
Show file tree
Hide file tree
Showing 60 changed files with 2,106 additions and 1,094 deletions.
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@
"license": "Apache-2.0",
"devDependencies": {
"@superset-ui/build-config": "^0.0.4",
"@superset-ui/chart": "^0.10.2",
"@superset-ui/chart": "^0.10.8",
"@superset-ui/color": "^0.10.0",
"@superset-ui/connection": "^0.10.0",
"@superset-ui/core": "^0.10.0",
"@superset-ui/dimension": "^0.10.4",
"@superset-ui/number-format": "^0.10.0",
"@superset-ui/time-format": "^0.10.0",
"@superset-ui/translation": "^0.10.0",
"@types/react": "^16.8.8",
"csstype": "^2.6.3",
"fast-glob": "^2.2.6",
"fs-extra": "^7.0.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/superset-ui-plugins-demo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
"@storybook/addon-knobs": "^4.0.2",
"@storybook/addon-options": "^4.0.3",
"@storybook/react": "^4.1.11",
"@superset-ui/chart": "^0.10.2",
"@superset-ui/chart": "^0.10.8",
"@superset-ui/color": "^0.10.1",
"@superset-ui/time-format": "^0.10.1",
"@superset-ui/translation": "^0.10.0",
"@types/react": "^16.8.8",
"babel-loader": "^8.0.4",
"bootstrap": "^3.3.6",
"cache-loader": "^1.2.2",
Expand Down
42 changes: 0 additions & 42 deletions packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/Stories.jsx
View file

This file was deleted.

2 changes: 2 additions & 0 deletions packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/constants.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const LINE_PLUGIN_TYPE = 'v2-line';
export const LINE_PLUGIN_LEGACY_TYPE = 'v2-line/legacy';
226 changes: 226 additions & 0 deletions packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/data.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
/* eslint-disable sort-keys, no-magic-numbers */
export default {
keys: ['name', 'x', 'y'],
values: [
{ x: -157766400000, y: 24703, name: 'Christopher' },
{ x: -126230400000, y: 27861, name: 'Christopher' },
{ x: -94694400000, y: 29436, name: 'Christopher' },
{ x: -63158400000, y: 31463, name: 'Christopher' },
{ x: -31536000000, y: 35718, name: 'Christopher' },
{ x: 0, y: 41758, name: 'Christopher' },
{ x: 31536000000, y: 48172, name: 'Christopher' },
{ x: 63072000000, y: 52092, name: 'Christopher' },
{ x: 94694400000, y: 48217, name: 'Christopher' },
{ x: 126230400000, y: 48476, name: 'Christopher' },
{ x: 157766400000, y: 46438, name: 'Christopher' },
{ x: 189302400000, y: 45086, name: 'Christopher' },
{ x: 220924800000, y: 46610, name: 'Christopher' },
{ x: 252460800000, y: 47107, name: 'Christopher' },
{ x: 283996800000, y: 50514, name: 'Christopher' },
{ x: 315532800000, y: 48969, name: 'Christopher' },
{ x: 347155200000, y: 50108, name: 'Christopher' },
{ x: 378691200000, y: 59055, name: 'Christopher' },
{ x: 410227200000, y: 59188, name: 'Christopher' },
{ x: 441763200000, y: 59859, name: 'Christopher' },
{ x: 473385600000, y: 59516, name: 'Christopher' },
{ x: 504921600000, y: 56633, name: 'Christopher' },
{ x: 536457600000, y: 54466, name: 'Christopher' },
{ x: 567993600000, y: 52996, name: 'Christopher' },
{ x: 599616000000, y: 53205, name: 'Christopher' },
{ x: 631152000000, y: 52322, name: 'Christopher' },
{ x: 662688000000, y: 47109, name: 'Christopher' },
{ x: 694224000000, y: 42470, name: 'Christopher' },
{ x: 725846400000, y: 38257, name: 'Christopher' },
{ x: 757382400000, y: 34823, name: 'Christopher' },
{ x: 788918400000, y: 32728, name: 'Christopher' },
{ x: 820454400000, y: 30988, name: 'Christopher' },
{ x: 852076800000, y: 29179, name: 'Christopher' },
{ x: 883612800000, y: 27083, name: 'Christopher' },
{ x: 915148800000, y: 25700, name: 'Christopher' },
{ x: 946684800000, y: 24959, name: 'Christopher' },
{ x: 978307200000, y: 23180, name: 'Christopher' },
{ x: 1009843200000, y: 21731, name: 'Christopher' },
{ x: 1041379200000, y: 20793, name: 'Christopher' },
{ x: 1072915200000, y: 19739, name: 'Christopher' },
{ x: 1104537600000, y: 19190, name: 'Christopher' },
{ x: 1136073600000, y: 19674, name: 'Christopher' },
{ x: 1167609600000, y: 19986, name: 'Christopher' },
{ x: 1199145600000, y: 17771, name: 'Christopher' },
{ x: -157766400000, y: 67646, name: 'David' },
{ x: -126230400000, y: 66207, name: 'David' },
{ x: -94694400000, y: 66581, name: 'David' },
{ x: -63158400000, y: 63531, name: 'David' },
{ x: -31536000000, y: 63502, name: 'David' },
{ x: 0, y: 61570, name: 'David' },
{ x: 31536000000, y: 52948, name: 'David' },
{ x: 63072000000, y: 46218, name: 'David' },
{ x: 94694400000, y: 40968, name: 'David' },
{ x: 126230400000, y: 41654, name: 'David' },
{ x: 157766400000, y: 39019, name: 'David' },
{ x: 189302400000, y: 39165, name: 'David' },
{ x: 220924800000, y: 40407, name: 'David' },
{ x: 252460800000, y: 40533, name: 'David' },
{ x: 283996800000, y: 41898, name: 'David' },
{ x: 315532800000, y: 41743, name: 'David' },
{ x: 347155200000, y: 40486, name: 'David' },
{ x: 378691200000, y: 40283, name: 'David' },
{ x: 410227200000, y: 39048, name: 'David' },
{ x: 441763200000, y: 38346, name: 'David' },
{ x: 473385600000, y: 38395, name: 'David' },
{ x: 504921600000, y: 37021, name: 'David' },
{ x: 536457600000, y: 36672, name: 'David' },
{ x: 567993600000, y: 35214, name: 'David' },
{ x: 599616000000, y: 35139, name: 'David' },
{ x: 631152000000, y: 33661, name: 'David' },
{ x: 662688000000, y: 30347, name: 'David' },
{ x: 694224000000, y: 28344, name: 'David' },
{ x: 725846400000, y: 26947, name: 'David' },
{ x: 757382400000, y: 24784, name: 'David' },
{ x: 788918400000, y: 22967, name: 'David' },
{ x: 820454400000, y: 22941, name: 'David' },
{ x: 852076800000, y: 21824, name: 'David' },
{ x: 883612800000, y: 20816, name: 'David' },
{ x: 915148800000, y: 20267, name: 'David' },
{ x: 946684800000, y: 19695, name: 'David' },
{ x: 978307200000, y: 19281, name: 'David' },
{ x: 1009843200000, y: 18600, name: 'David' },
{ x: 1041379200000, y: 18557, name: 'David' },
{ x: 1072915200000, y: 18315, name: 'David' },
{ x: 1104537600000, y: 18017, name: 'David' },
{ x: 1136073600000, y: 17510, name: 'David' },
{ x: 1167609600000, y: 17400, name: 'David' },
{ x: 1199145600000, y: 16049, name: 'David' },
{ x: -157766400000, y: 67506, name: 'James' },
{ x: -126230400000, y: 65036, name: 'James' },
{ x: -94694400000, y: 61554, name: 'James' },
{ x: -63158400000, y: 60584, name: 'James' },
{ x: -31536000000, y: 59824, name: 'James' },
{ x: 0, y: 61597, name: 'James' },
{ x: 31536000000, y: 54463, name: 'James' },
{ x: 63072000000, y: 46960, name: 'James' },
{ x: 94694400000, y: 42782, name: 'James' },
{ x: 126230400000, y: 41258, name: 'James' },
{ x: 157766400000, y: 39471, name: 'James' },
{ x: 189302400000, y: 38203, name: 'James' },
{ x: 220924800000, y: 39916, name: 'James' },
{ x: 252460800000, y: 39783, name: 'James' },
{ x: 283996800000, y: 39237, name: 'James' },
{ x: 315532800000, y: 39185, name: 'James' },
{ x: 347155200000, y: 38176, name: 'James' },
{ x: 378691200000, y: 38750, name: 'James' },
{ x: 410227200000, y: 36228, name: 'James' },
{ x: 441763200000, y: 35728, name: 'James' },
{ x: 473385600000, y: 35750, name: 'James' },
{ x: 504921600000, y: 33955, name: 'James' },
{ x: 536457600000, y: 32552, name: 'James' },
{ x: 567993600000, y: 32418, name: 'James' },
{ x: 599616000000, y: 32658, name: 'James' },
{ x: 631152000000, y: 32288, name: 'James' },
{ x: 662688000000, y: 30460, name: 'James' },
{ x: 694224000000, y: 28450, name: 'James' },
{ x: 725846400000, y: 26193, name: 'James' },
{ x: 757382400000, y: 24706, name: 'James' },
{ x: 788918400000, y: 22691, name: 'James' },
{ x: 820454400000, y: 21122, name: 'James' },
{ x: 852076800000, y: 20368, name: 'James' },
{ x: 883612800000, y: 19651, name: 'James' },
{ x: 915148800000, y: 18508, name: 'James' },
{ x: 946684800000, y: 17939, name: 'James' },
{ x: 978307200000, y: 17023, name: 'James' },
{ x: 1009843200000, y: 16905, name: 'James' },
{ x: 1041379200000, y: 16832, name: 'James' },
{ x: 1072915200000, y: 16459, name: 'James' },
{ x: 1104537600000, y: 16046, name: 'James' },
{ x: 1136073600000, y: 16139, name: 'James' },
{ x: 1167609600000, y: 15821, name: 'James' },
{ x: 1199145600000, y: 14920, name: 'James' },
{ x: -157766400000, y: 71390, name: 'John' },
{ x: -126230400000, y: 64858, name: 'John' },
{ x: -94694400000, y: 61480, name: 'John' },
{ x: -63158400000, y: 60754, name: 'John' },
{ x: -31536000000, y: 58644, name: 'John' },
{ x: 0, y: 58348, name: 'John' },
{ x: 31536000000, y: 51382, name: 'John' },
{ x: 63072000000, y: 43028, name: 'John' },
{ x: 94694400000, y: 39061, name: 'John' },
{ x: 126230400000, y: 37553, name: 'John' },
{ x: 157766400000, y: 34970, name: 'John' },
{ x: 189302400000, y: 33876, name: 'John' },
{ x: 220924800000, y: 34103, name: 'John' },
{ x: 252460800000, y: 33895, name: 'John' },
{ x: 283996800000, y: 35305, name: 'John' },
{ x: 315532800000, y: 35131, name: 'John' },
{ x: 347155200000, y: 34761, name: 'John' },
{ x: 378691200000, y: 34560, name: 'John' },
{ x: 410227200000, y: 33047, name: 'John' },
{ x: 441763200000, y: 32484, name: 'John' },
{ x: 473385600000, y: 31397, name: 'John' },
{ x: 504921600000, y: 30103, name: 'John' },
{ x: 536457600000, y: 29462, name: 'John' },
{ x: 567993600000, y: 29301, name: 'John' },
{ x: 599616000000, y: 29751, name: 'John' },
{ x: 631152000000, y: 29011, name: 'John' },
{ x: 662688000000, y: 27727, name: 'John' },
{ x: 694224000000, y: 26156, name: 'John' },
{ x: 725846400000, y: 24918, name: 'John' },
{ x: 757382400000, y: 24119, name: 'John' },
{ x: 788918400000, y: 23174, name: 'John' },
{ x: 820454400000, y: 22104, name: 'John' },
{ x: 852076800000, y: 21330, name: 'John' },
{ x: 883612800000, y: 20556, name: 'John' },
{ x: 915148800000, y: 20280, name: 'John' },
{ x: 946684800000, y: 20032, name: 'John' },
{ x: 978307200000, y: 18839, name: 'John' },
{ x: 1009843200000, y: 17400, name: 'John' },
{ x: 1041379200000, y: 17170, name: 'John' },
{ x: 1072915200000, y: 16381, name: 'John' },
{ x: 1104537600000, y: 15692, name: 'John' },
{ x: 1136073600000, y: 15083, name: 'John' },
{ x: 1167609600000, y: 14348, name: 'John' },
{ x: 1199145600000, y: 13110, name: 'John' },
{ x: -157766400000, y: 80812, name: 'Michael' },
{ x: -126230400000, y: 79709, name: 'Michael' },
{ x: -94694400000, y: 82204, name: 'Michael' },
{ x: -63158400000, y: 81785, name: 'Michael' },
{ x: -31536000000, y: 84893, name: 'Michael' },
{ x: 0, y: 85015, name: 'Michael' },
{ x: 31536000000, y: 77321, name: 'Michael' },
{ x: 63072000000, y: 71197, name: 'Michael' },
{ x: 94694400000, y: 67598, name: 'Michael' },
{ x: 126230400000, y: 67304, name: 'Michael' },
{ x: 157766400000, y: 68149, name: 'Michael' },
{ x: 189302400000, y: 66686, name: 'Michael' },
{ x: 220924800000, y: 67344, name: 'Michael' },
{ x: 252460800000, y: 66875, name: 'Michael' },
{ x: 283996800000, y: 67473, name: 'Michael' },
{ x: 315532800000, y: 68375, name: 'Michael' },
{ x: 347155200000, y: 68467, name: 'Michael' },
{ x: 378691200000, y: 67904, name: 'Michael' },
{ x: 410227200000, y: 67708, name: 'Michael' },
{ x: 441763200000, y: 67457, name: 'Michael' },
{ x: 473385600000, y: 64667, name: 'Michael' },
{ x: 504921600000, y: 63959, name: 'Michael' },
{ x: 536457600000, y: 63442, name: 'Michael' },
{ x: 567993600000, y: 63924, name: 'Michael' },
{ x: 599616000000, y: 65233, name: 'Michael' },
{ x: 631152000000, y: 65138, name: 'Michael' },
{ x: 662688000000, y: 60646, name: 'Michael' },
{ x: 694224000000, y: 54216, name: 'Michael' },
{ x: 725846400000, y: 49443, name: 'Michael' },
{ x: 757382400000, y: 44361, name: 'Michael' },
{ x: 788918400000, y: 41311, name: 'Michael' },
{ x: 820454400000, y: 38284, name: 'Michael' },
{ x: 852076800000, y: 37459, name: 'Michael' },
{ x: 883612800000, y: 36525, name: 'Michael' },
{ x: 915148800000, y: 33820, name: 'Michael' },
{ x: 946684800000, y: 31956, name: 'Michael' },
{ x: 978307200000, y: 29612, name: 'Michael' },
{ x: 1009843200000, y: 28156, name: 'Michael' },
{ x: 1041379200000, y: 27031, name: 'Michael' },
{ x: 1072915200000, y: 25418, name: 'Michael' },
{ x: 1104537600000, y: 23678, name: 'Michael' },
{ x: 1136073600000, y: 22498, name: 'Michael' },
{ x: 1167609600000, y: 21805, name: 'Michael' },
{ x: 1199145600000, y: 20271, name: 'Michael' },
],
};
94 changes: 94 additions & 0 deletions packages/superset-ui-plugins-demo/storybook/stories/preset-chart-xy/Line/data/data2.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/* eslint-disable sort-keys, no-magic-numbers */
export default {
keys: ['snapshot', 'x', 'y'],
values: [
{ x: -157766400000, y: 24703, snapshot: 'Last year' },
{ x: -126230400000, y: 27861, snapshot: 'Last year' },
{ x: -94694400000, y: 29436, snapshot: 'Last year' },
{ x: -63158400000, y: 31463, snapshot: 'Last year' },
{ x: -31536000000, y: 35718, snapshot: 'Last year' },
{ x: 0, y: 41758, snapshot: 'Last year' },
{ x: 31536000000, y: 48172, snapshot: 'Last year' },
{ x: 63072000000, y: 52092, snapshot: 'Last year' },
{ x: 94694400000, y: 48217, snapshot: 'Last year' },
{ x: 126230400000, y: 48476, snapshot: 'Last year' },
{ x: 157766400000, y: 46438, snapshot: 'Last year' },
{ x: 189302400000, y: 45086, snapshot: 'Last year' },
{ x: 220924800000, y: 46610, snapshot: 'Last year' },
{ x: 252460800000, y: 47107, snapshot: 'Last year' },
{ x: 283996800000, y: 50514, snapshot: 'Last year' },
{ x: 315532800000, y: 48969, snapshot: 'Last year' },
{ x: 347155200000, y: 50108, snapshot: 'Last year' },
{ x: 378691200000, y: 59055, snapshot: 'Last year' },
{ x: 410227200000, y: 59188, snapshot: 'Last year' },
{ x: 441763200000, y: 59859, snapshot: 'Last year' },
{ x: 473385600000, y: 59516, snapshot: 'Last year' },
{ x: 504921600000, y: 56633, snapshot: 'Last year' },
{ x: 536457600000, y: 54466, snapshot: 'Last year' },
{ x: 567993600000, y: 52996, snapshot: 'Last year' },
{ x: 599616000000, y: 53205, snapshot: 'Last year' },
{ x: 631152000000, y: 52322, snapshot: 'Last year' },
{ x: 662688000000, y: 47109, snapshot: 'Last year' },
{ x: 694224000000, y: 42470, snapshot: 'Last year' },
{ x: 725846400000, y: 38257, snapshot: 'Last year' },
{ x: 757382400000, y: 34823, snapshot: 'Last year' },
{ x: 788918400000, y: 32728, snapshot: 'Last year' },
{ x: 820454400000, y: 30988, snapshot: 'Last year' },
{ x: 852076800000, y: 29179, snapshot: 'Last year' },
{ x: 883612800000, y: 27083, snapshot: 'Last year' },
{ x: 915148800000, y: 25700, snapshot: 'Last year' },
{ x: 946684800000, y: 24959, snapshot: 'Last year' },
{ x: 978307200000, y: 23180, snapshot: 'Last year' },
{ x: 1009843200000, y: 21731, snapshot: 'Last year' },
{ x: 1041379200000, y: 20793, snapshot: 'Last year' },
{ x: 1072915200000, y: 19739, snapshot: 'Last year' },
{ x: 1104537600000, y: 19190, snapshot: 'Last year' },
{ x: 1136073600000, y: 19674, snapshot: 'Last year' },
{ x: 1167609600000, y: 19986, snapshot: 'Last year' },
{ x: 1199145600000, y: 17771, snapshot: 'Last year' },
{ x: -157766400000, y: 80812, snapshot: 'Current' },
{ x: -126230400000, y: 79709, snapshot: 'Current' },
{ x: -94694400000, y: 82204, snapshot: 'Current' },
{ x: -63158400000, y: 81785, snapshot: 'Current' },
{ x: -31536000000, y: 84893, snapshot: 'Current' },
{ x: 0, y: 85015, snapshot: 'Current' },
{ x: 31536000000, y: 77321, snapshot: 'Current' },
{ x: 63072000000, y: 71197, snapshot: 'Current' },
{ x: 94694400000, y: 67598, snapshot: 'Current' },
{ x: 126230400000, y: 67304, snapshot: 'Current' },
{ x: 157766400000, y: 68149, snapshot: 'Current' },
{ x: 189302400000, y: 66686, snapshot: 'Current' },
{ x: 220924800000, y: 67344, snapshot: 'Current' },
{ x: 252460800000, y: 66875, snapshot: 'Current' },
{ x: 283996800000, y: 67473, snapshot: 'Current' },
{ x: 315532800000, y: 68375, snapshot: 'Current' },
{ x: 347155200000, y: 68467, snapshot: 'Current' },
{ x: 378691200000, y: 67904, snapshot: 'Current' },
{ x: 410227200000, y: 67708, snapshot: 'Current' },
{ x: 441763200000, y: 67457, snapshot: 'Current' },
{ x: 473385600000, y: 64667, snapshot: 'Current' },
{ x: 504921600000, y: 63959, snapshot: 'Current' },
{ x: 536457600000, y: 63442, snapshot: 'Current' },
{ x: 567993600000, y: 63924, snapshot: 'Current' },
{ x: 599616000000, y: 65233, snapshot: 'Current' },
{ x: 631152000000, y: 65138, snapshot: 'Current' },
{ x: 662688000000, y: 60646, snapshot: 'Current' },
{ x: 694224000000, y: 54216, snapshot: 'Current' },
{ x: 725846400000, y: 49443, snapshot: 'Current' },
{ x: 757382400000, y: 44361, snapshot: 'Current' },
{ x: 788918400000, y: 41311, snapshot: 'Current' },
{ x: 820454400000, y: 38284, snapshot: 'Current' },
{ x: 852076800000, y: 37459, snapshot: 'Current' },
{ x: 883612800000, y: 36525, snapshot: 'Current' },
{ x: 915148800000, y: 33820, snapshot: 'Current' },
{ x: 946684800000, y: 31956, snapshot: 'Current' },
{ x: 978307200000, y: 29612, snapshot: 'Current' },
{ x: 1009843200000, y: 28156, snapshot: 'Current' },
{ x: 1041379200000, y: 27031, snapshot: 'Current' },
{ x: 1072915200000, y: 25418, snapshot: 'Current' },
{ x: 1104537600000, y: 23678, snapshot: 'Current' },
{ x: 1136073600000, y: 22498, snapshot: 'Current' },
{ x: 1167609600000, y: 21805, snapshot: 'Current' },
{ x: 1199145600000, y: 20271, snapshot: 'Current' },
],
};
0 ...book/stories/preset-chart-xy/Line/data.js → ...s/preset-chart-xy/Line/data/legacyData.js
View file
File renamed without changes.
Loading

0 comments on commit c9b8195

Please sign in to comment.