@react-fabric/chart 1.0.0-beta.52 → 1.0.0-beta.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/charts/ActivityMap.js +36 -26
- package/dist/cjs/charts/CountSeries.js +17 -14
- package/dist/cjs/charts/DataSeries.js +30 -27
- package/dist/cjs/charts/Generic.js +15 -5
- package/dist/cjs/charts/MapSeries.js +9 -8
- package/dist/cjs/charts/TimeSeries.js +31 -28
- package/dist/cjs/charts/TimeSlider.js +9 -9
- package/dist/cjs/charts/WordBubble.js +11 -5
- package/dist/cjs/theme/darkBase.js +13 -10
- package/dist/cjs/theme/index.js +38 -18
- package/dist/cjs/theme/lightBase.js +18 -15
- package/dist/cjs/theme/palettes.js +27 -27
- package/dist/cjs/types/charts.js +2 -2
- package/dist/cjs/wrapper/ChartContainer.js +2 -1
- package/dist/cjs/wrapper/ChartToolbar.js +1 -1
- package/dist/esm/charts/ActivityMap.js +36 -26
- package/dist/esm/charts/CountSeries.js +17 -14
- package/dist/esm/charts/DataSeries.js +30 -27
- package/dist/esm/charts/Generic.js +17 -7
- package/dist/esm/charts/MapSeries.js +9 -8
- package/dist/esm/charts/TimeSeries.js +31 -28
- package/dist/esm/charts/TimeSlider.js +9 -9
- package/dist/esm/charts/WordBubble.js +11 -5
- package/dist/esm/theme/darkBase.js +13 -10
- package/dist/esm/theme/index.js +38 -18
- package/dist/esm/theme/lightBase.js +18 -15
- package/dist/esm/theme/palettes.js +27 -27
- package/dist/esm/types/charts.js +2 -2
- package/dist/esm/wrapper/ChartContainer.js +2 -1
- package/dist/esm/wrapper/ChartToolbar.js +1 -1
- package/dist/types/charts/ActivityMap.d.ts +1 -1
- package/dist/types/charts/MapSeries.d.ts +7 -2
- package/dist/types/charts/TimeSlider.d.ts +1 -1
- package/dist/types/charts/WordBubble.d.ts +7 -2
- package/dist/types/theme/darkBase.d.ts +8 -5
- package/dist/types/theme/index.d.ts +1 -1
- package/dist/types/theme/lightBase.d.ts +8 -5
- package/dist/types/types/charts.d.ts +1 -1
- package/dist/types/types/index.d.ts +30 -12
- package/package.json +3 -3
- package/src/charts/ActivityMap.tsx +75 -55
- package/src/charts/CountSeries.tsx +53 -41
- package/src/charts/DataSeries.tsx +98 -73
- package/src/charts/Generic.tsx +11 -4
- package/src/charts/MapSeries.tsx +33 -23
- package/src/charts/TimeSeries.tsx +87 -72
- package/src/charts/TimeSlider.tsx +12 -9
- package/src/charts/WordBubble.tsx +14 -7
- package/src/theme/darkBase.ts +12 -9
- package/src/theme/index.ts +94 -20
- package/src/theme/lightBase.ts +17 -14
- package/src/theme/palettes.ts +1 -52
- package/src/types/charts.ts +6 -2
- package/src/types/index.ts +40 -4
- package/src/wrapper/ChartContainer.tsx +1 -0
- package/src/wrapper/ChartToolbar.tsx +1 -1
|
@@ -6,7 +6,6 @@ var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
|
|
|
6
6
|
var core = require('@react-fabric/core');
|
|
7
7
|
var utilities = require('@react-fabric/utilities');
|
|
8
8
|
var react = require('react');
|
|
9
|
-
var palettes = require('../theme/palettes.js');
|
|
10
9
|
var utils = require('../types/utils.js');
|
|
11
10
|
var ChartContainer = require('../wrapper/ChartContainer.js');
|
|
12
11
|
var ChartWrapper = require('../wrapper/ChartWrapper.js');
|
|
@@ -24,15 +23,18 @@ var MONTH_DAY = {
|
|
|
24
23
|
low: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"]
|
|
25
24
|
};
|
|
26
25
|
var ActivityMapChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
27
|
-
var _ref$
|
|
28
|
-
|
|
26
|
+
var _ref$series = _ref.series,
|
|
27
|
+
series = _ref$series === void 0 ? [] : _ref$series,
|
|
29
28
|
title = _ref.title,
|
|
30
29
|
onExport = _ref.onExport,
|
|
30
|
+
optionOverride = _ref.options,
|
|
31
31
|
_ref$theme = _ref.theme,
|
|
32
32
|
chartTheme = _ref$theme === void 0 ? "activity" : _ref$theme,
|
|
33
33
|
heatmapPalette = _ref.heatmapPalette,
|
|
34
34
|
highLabels = _ref.highLabels,
|
|
35
35
|
lowLabels = _ref.lowLabels,
|
|
36
|
+
showThemeSelector = _ref.showThemeSelector,
|
|
37
|
+
showTypeSelector = _ref.showTypeSelector,
|
|
36
38
|
_ref$time = _ref.time,
|
|
37
39
|
time = _ref$time === void 0 ? "day-hour" : _ref$time,
|
|
38
40
|
_ref$type = _ref.type,
|
|
@@ -58,8 +60,8 @@ var ActivityMapChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
58
60
|
var options = {
|
|
59
61
|
series: []
|
|
60
62
|
};
|
|
61
|
-
if (utilities.isEmpty(
|
|
62
|
-
options.xAxis = {
|
|
63
|
+
if (utilities.isEmpty(series)) return {};
|
|
64
|
+
options.xAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.xAxis, {
|
|
63
65
|
type: "category",
|
|
64
66
|
data: lowLabels !== null && lowLabels !== void 0 ? lowLabels : defaultMap.low,
|
|
65
67
|
boundaryGap: type === "heatmap",
|
|
@@ -69,8 +71,8 @@ var ActivityMapChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
69
71
|
axisLine: {
|
|
70
72
|
show: false
|
|
71
73
|
}
|
|
72
|
-
};
|
|
73
|
-
options.yAxis = {
|
|
74
|
+
});
|
|
75
|
+
options.yAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.yAxis, {
|
|
74
76
|
type: "category",
|
|
75
77
|
axisLabel: {
|
|
76
78
|
margin: 16
|
|
@@ -79,13 +81,13 @@ var ActivityMapChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
79
81
|
axisLine: {
|
|
80
82
|
show: false
|
|
81
83
|
}
|
|
82
|
-
};
|
|
83
|
-
options.series =
|
|
84
|
+
});
|
|
85
|
+
options.series = series.map(function (points, index) {
|
|
84
86
|
var total = points.reduce(function (t, p) {
|
|
85
87
|
return t + p[2];
|
|
86
88
|
}, 0);
|
|
87
89
|
return {
|
|
88
|
-
id: index,
|
|
90
|
+
id: "".concat(index),
|
|
89
91
|
name: defaultMap.high[index],
|
|
90
92
|
type: type,
|
|
91
93
|
symbolSize: function symbolSize(dataItem) {
|
|
@@ -96,55 +98,63 @@ var ActivityMapChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
96
98
|
};
|
|
97
99
|
});
|
|
98
100
|
if (type === "heatmap") {
|
|
99
|
-
var dataPoints =
|
|
101
|
+
var dataPoints = series.map(function (points) {
|
|
100
102
|
return Math.max.apply(Math, _toConsumableArray(points.map(function (pt) {
|
|
101
103
|
return pt[2];
|
|
102
104
|
})));
|
|
103
105
|
});
|
|
104
106
|
options.grid = {
|
|
105
107
|
top: 32,
|
|
106
|
-
bottom:
|
|
108
|
+
bottom: 64
|
|
107
109
|
};
|
|
108
|
-
options.
|
|
110
|
+
options.legend = {
|
|
111
|
+
show: false
|
|
112
|
+
};
|
|
113
|
+
options.visualMap = [{
|
|
109
114
|
type: "piecewise",
|
|
110
115
|
min: 1,
|
|
111
116
|
show: type === "heatmap",
|
|
112
|
-
color: heatmapPalette !== null && heatmapPalette !== void 0 ? heatmapPalette : _toConsumableArray(palettes.ChartPalette.Heatmap),
|
|
113
117
|
max: Math.max.apply(Math, _toConsumableArray(dataPoints)),
|
|
114
|
-
calculable: true,
|
|
118
|
+
// calculable: true,inRange:
|
|
115
119
|
orient: "horizontal",
|
|
116
120
|
left: "center",
|
|
117
|
-
bottom:
|
|
118
|
-
};
|
|
121
|
+
bottom: 4
|
|
122
|
+
}];
|
|
123
|
+
if (heatmapPalette) {
|
|
124
|
+
options.visualMap[0].inRange = {
|
|
125
|
+
color: heatmapPalette
|
|
126
|
+
};
|
|
127
|
+
}
|
|
119
128
|
}
|
|
120
|
-
return _objectSpread({
|
|
129
|
+
return _objectSpread(_objectSpread({
|
|
121
130
|
grid: {
|
|
122
131
|
top: 32,
|
|
123
132
|
bottom: 64
|
|
124
133
|
},
|
|
125
|
-
tooltip: {
|
|
134
|
+
tooltip: Object.assign({
|
|
126
135
|
trigger: "item",
|
|
127
136
|
confine: true,
|
|
128
137
|
position: "top",
|
|
138
|
+
appendToBody: true,
|
|
129
139
|
valueFormatter: function valueFormatter(c) {
|
|
130
140
|
return utilities.isArray(c) ? c[2] : c;
|
|
131
141
|
}
|
|
132
|
-
}
|
|
133
|
-
}, options);
|
|
134
|
-
}, [
|
|
142
|
+
}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.tooltip)
|
|
143
|
+
}, optionOverride), options);
|
|
144
|
+
}, [series, title, type, heatmapPalette, optionOverride], "ActivityChart options");
|
|
135
145
|
return /*#__PURE__*/jsxRuntime.jsxs(ChartContainer.ChartContainer, {
|
|
136
146
|
title: title,
|
|
137
147
|
onExport: onExport,
|
|
138
148
|
theme: theme,
|
|
139
149
|
options: options,
|
|
140
150
|
chartRef: chartRef,
|
|
141
|
-
isEmpty: utilities.isEmpty(
|
|
151
|
+
isEmpty: utilities.isEmpty(series),
|
|
142
152
|
emptyIcon: core.CoreIcons.chartActivityScatter,
|
|
143
153
|
dataTableRenderer: utils.activityRenderer,
|
|
144
154
|
onClick: function onClick(e) {
|
|
145
155
|
return _onClick === null || _onClick === void 0 ? void 0 : _onClick(e.seriesIndex, e.dataIndex);
|
|
146
156
|
},
|
|
147
|
-
children: [/*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
157
|
+
children: [showTypeSelector && /*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
148
158
|
value: type,
|
|
149
159
|
onChange: setType,
|
|
150
160
|
children: [/*#__PURE__*/jsxRuntime.jsx(core.Button, {
|
|
@@ -160,9 +170,9 @@ var ActivityMapChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
160
170
|
"aria-label": "heatmap",
|
|
161
171
|
icon: core.CoreIcons.chartActivityCalendar
|
|
162
172
|
})]
|
|
163
|
-
}), /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
173
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
164
174
|
vertical: true
|
|
165
|
-
}), /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
175
|
+
}), showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
166
176
|
theme: theme,
|
|
167
177
|
onClick: setTheme,
|
|
168
178
|
defaultTheme: "activity"
|
|
@@ -14,12 +14,15 @@ var jsxRuntime = require('react/jsx-runtime');
|
|
|
14
14
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
15
15
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
16
16
|
var CountSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
17
|
-
var
|
|
17
|
+
var _series = _ref.series,
|
|
18
18
|
title = _ref.title,
|
|
19
19
|
onExport = _ref.onExport,
|
|
20
20
|
chartTheme = _ref.theme,
|
|
21
21
|
_ref$type = _ref.type,
|
|
22
22
|
chartType = _ref$type === void 0 ? "pie" : _ref$type,
|
|
23
|
+
optionOverride = _ref.options,
|
|
24
|
+
showThemeSelector = _ref.showThemeSelector,
|
|
25
|
+
showTypeSelector = _ref.showTypeSelector,
|
|
23
26
|
_onClick = _ref.onClick;
|
|
24
27
|
var chartRef = react.useRef(null);
|
|
25
28
|
var _useState = react.useState(chartType),
|
|
@@ -37,13 +40,13 @@ var CountSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
37
40
|
setTheme(chartTheme);
|
|
38
41
|
}, [chartTheme]);
|
|
39
42
|
var options = core.useMemoDebugger(function () {
|
|
40
|
-
if (utilities.isEmpty(
|
|
43
|
+
if (utilities.isEmpty(_series)) {
|
|
41
44
|
var _chartRef$current;
|
|
42
45
|
(_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 || _chartRef$current.clear();
|
|
43
46
|
return {};
|
|
44
47
|
}
|
|
45
|
-
var sorted =
|
|
46
|
-
var categoryAxis = {
|
|
48
|
+
var sorted = _series === null || _series === void 0 ? void 0 : _series.sort(utilities.compareValues("desc", "count"));
|
|
49
|
+
var categoryAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.xAxis, {
|
|
47
50
|
type: "category",
|
|
48
51
|
name: title !== null && title !== void 0 ? title : "Count Series",
|
|
49
52
|
nameLocation: "center",
|
|
@@ -51,15 +54,15 @@ var CountSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
51
54
|
show: false
|
|
52
55
|
},
|
|
53
56
|
data: []
|
|
54
|
-
};
|
|
55
|
-
var valueAxis = {
|
|
57
|
+
});
|
|
58
|
+
var valueAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.yAxis, {
|
|
56
59
|
type: "value",
|
|
57
60
|
axisLabel: {
|
|
58
61
|
formatter: function formatter(val) {
|
|
59
62
|
return utilities.Format.number(val);
|
|
60
63
|
}
|
|
61
64
|
}
|
|
62
|
-
};
|
|
65
|
+
});
|
|
63
66
|
var series = type === "pie" ? [{
|
|
64
67
|
type: "pie",
|
|
65
68
|
name: title !== null && title !== void 0 ? title : "Count Series",
|
|
@@ -92,27 +95,27 @@ var CountSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
92
95
|
universalTransition: true
|
|
93
96
|
};
|
|
94
97
|
});
|
|
95
|
-
return {
|
|
98
|
+
return _objectSpread(_objectSpread({}, optionOverride), {}, {
|
|
96
99
|
series: series,
|
|
97
100
|
countSeries: true,
|
|
98
101
|
xAxis: type === "pie" ? null : type === "bar" ? valueAxis : categoryAxis,
|
|
99
102
|
yAxis: type === "pie" ? null : type === "bar" ? categoryAxis : valueAxis
|
|
100
|
-
};
|
|
101
|
-
}, [
|
|
103
|
+
});
|
|
104
|
+
}, [_series, title, type, optionOverride], "CountChart options");
|
|
102
105
|
return /*#__PURE__*/jsxRuntime.jsxs(ChartContainer.ChartContainer, {
|
|
103
106
|
title: title,
|
|
104
107
|
onExport: onExport,
|
|
105
108
|
theme: theme,
|
|
106
109
|
options: options,
|
|
107
110
|
chartRef: chartRef,
|
|
108
|
-
isEmpty: utilities.isEmpty(
|
|
111
|
+
isEmpty: utilities.isEmpty(_series),
|
|
109
112
|
emptyIcon: core.CoreIcons.chartPie,
|
|
110
113
|
dataTableRenderer: utils.countRenderer,
|
|
111
114
|
onClick: function onClick(e) {
|
|
112
115
|
var _e$data$id;
|
|
113
116
|
return _onClick === null || _onClick === void 0 ? void 0 : _onClick((_e$data$id = e.data.id) !== null && _e$data$id !== void 0 ? _e$data$id : e.seriesId);
|
|
114
117
|
},
|
|
115
|
-
children: [/*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
118
|
+
children: [showTypeSelector && /*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
116
119
|
value: type,
|
|
117
120
|
onChange: setType,
|
|
118
121
|
children: [/*#__PURE__*/jsxRuntime.jsx(core.Button, {
|
|
@@ -134,9 +137,9 @@ var CountSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
134
137
|
"aria-label": "bar",
|
|
135
138
|
icon: core.CoreIcons.chartBar
|
|
136
139
|
})]
|
|
137
|
-
}), /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
140
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
138
141
|
vertical: true
|
|
139
|
-
}), /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
142
|
+
}), showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
140
143
|
theme: theme,
|
|
141
144
|
onClick: setTheme
|
|
142
145
|
})]
|
|
@@ -14,12 +14,15 @@ var jsxRuntime = require('react/jsx-runtime');
|
|
|
14
14
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
15
15
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
16
16
|
var DataSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
17
|
-
var
|
|
17
|
+
var _series = _ref.series,
|
|
18
18
|
onExport = _ref.onExport,
|
|
19
19
|
categories = _ref.categories,
|
|
20
20
|
categoryAxisName = _ref.categoryAxisName,
|
|
21
21
|
valueAxisName = _ref.valueAxisName,
|
|
22
22
|
title = _ref.title,
|
|
23
|
+
optionOverride = _ref.options,
|
|
24
|
+
showThemeSelector = _ref.showThemeSelector,
|
|
25
|
+
showTypeSelector = _ref.showTypeSelector,
|
|
23
26
|
chartTheme = _ref.theme,
|
|
24
27
|
_ref$type = _ref.type,
|
|
25
28
|
chartType = _ref$type === void 0 ? "column" : _ref$type,
|
|
@@ -40,7 +43,7 @@ var DataSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
40
43
|
setTheme(chartTheme);
|
|
41
44
|
}, [chartTheme]);
|
|
42
45
|
var options = core.useMemoDebugger(function () {
|
|
43
|
-
if (utilities.isEmpty(
|
|
46
|
+
if (utilities.isEmpty(_series)) {
|
|
44
47
|
var _chartRef$current;
|
|
45
48
|
(_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 || _chartRef$current.clear();
|
|
46
49
|
return {};
|
|
@@ -50,7 +53,7 @@ var DataSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
50
53
|
_type$split2 = _slicedToArray(_type$split, 2),
|
|
51
54
|
_type = _type$split2[0],
|
|
52
55
|
stacked = _type$split2[1];
|
|
53
|
-
var categoryAxis = _type === "radar" ? undefined : {
|
|
56
|
+
var categoryAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.xAxis, _type === "radar" ? undefined : {
|
|
54
57
|
name: categoryAxisName,
|
|
55
58
|
type: "category",
|
|
56
59
|
nameGap: 32,
|
|
@@ -59,56 +62,56 @@ var DataSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
59
62
|
show: false
|
|
60
63
|
},
|
|
61
64
|
data: categories
|
|
62
|
-
};
|
|
63
|
-
var valueAxis = _type === "radar" ? undefined : {
|
|
65
|
+
});
|
|
66
|
+
var valueAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.yAxis, _type === "radar" ? undefined : {
|
|
64
67
|
name: valueAxisName,
|
|
65
68
|
type: "value",
|
|
66
69
|
nameGap: 32,
|
|
67
70
|
nameLocation: "center"
|
|
68
|
-
};
|
|
69
|
-
var radar = _type !== "radar" ? undefined : {
|
|
71
|
+
});
|
|
72
|
+
var radar = _type !== "radar" ? undefined : Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.radar, {
|
|
70
73
|
shape: "circle",
|
|
71
74
|
indicator: categories === null || categories === void 0 ? void 0 : categories.map(function (c) {
|
|
72
75
|
return {
|
|
73
76
|
name: c
|
|
74
77
|
};
|
|
75
78
|
})
|
|
76
|
-
};
|
|
77
|
-
var series =
|
|
78
|
-
var _item$label, _item$
|
|
79
|
-
return {
|
|
80
|
-
|
|
81
|
-
stack: stack,
|
|
79
|
+
});
|
|
80
|
+
var series = _series === null || _series === void 0 ? void 0 : _series.map(function (item, index) {
|
|
81
|
+
var _item$stack, _item$label, _item$name;
|
|
82
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
83
|
+
stack: (_item$stack = item.stack) !== null && _item$stack !== void 0 ? _item$stack : stack,
|
|
82
84
|
areaStyle: stacked ? {} : undefined,
|
|
83
85
|
type: _type === "column" ? "bar" : _type,
|
|
84
86
|
name: (_item$label = item.label) !== null && _item$label !== void 0 ? _item$label : item.id,
|
|
85
87
|
universalTransition: true,
|
|
86
88
|
data: _type === "radar" ? [{
|
|
87
|
-
value: item.
|
|
89
|
+
value: item.data,
|
|
88
90
|
id: item.id,
|
|
89
|
-
name: (_item$
|
|
90
|
-
}] : item.
|
|
91
|
-
};
|
|
91
|
+
name: (_item$name = item.name) !== null && _item$name !== void 0 ? _item$name : item.id
|
|
92
|
+
}] : item.data
|
|
93
|
+
});
|
|
92
94
|
});
|
|
93
|
-
return {
|
|
95
|
+
return _objectSpread(_objectSpread({}, optionOverride), {}, {
|
|
94
96
|
xAxis: type.startsWith("bar") ? valueAxis : categoryAxis,
|
|
95
97
|
yAxis: type.startsWith("bar") ? categoryAxis : valueAxis,
|
|
96
98
|
radar: radar,
|
|
97
99
|
series: series,
|
|
98
|
-
tooltip: {
|
|
100
|
+
tooltip: Object.assign({
|
|
99
101
|
trigger: _type === "radar" ? "item" : "axis",
|
|
100
102
|
confine: true,
|
|
101
|
-
position: "top"
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
103
|
+
position: "top",
|
|
104
|
+
appendToBody: true
|
|
105
|
+
}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.tooltip)
|
|
106
|
+
});
|
|
107
|
+
}, [_series, type, categories, categoryAxisName, valueAxisName, optionOverride], "DataChart options");
|
|
105
108
|
return /*#__PURE__*/jsxRuntime.jsxs(ChartContainer.ChartContainer, {
|
|
106
109
|
title: title,
|
|
107
110
|
onExport: onExport,
|
|
108
111
|
theme: theme,
|
|
109
112
|
options: options,
|
|
110
113
|
chartRef: chartRef,
|
|
111
|
-
isEmpty: utilities.isEmpty(
|
|
114
|
+
isEmpty: utilities.isEmpty(_series),
|
|
112
115
|
emptyIcon: core.CoreIcons.chartColumn,
|
|
113
116
|
dataTableRenderer: utils.seriesRenderer,
|
|
114
117
|
onClick: function onClick(e) {
|
|
@@ -117,7 +120,7 @@ var DataSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
117
120
|
series: e.seriesId
|
|
118
121
|
});
|
|
119
122
|
},
|
|
120
|
-
children: [/*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
123
|
+
children: [showTypeSelector && /*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
121
124
|
value: type,
|
|
122
125
|
onChange: setType,
|
|
123
126
|
children: [/*#__PURE__*/jsxRuntime.jsx(core.Button, {
|
|
@@ -163,9 +166,9 @@ var DataSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
163
166
|
"aria-label": "bar-stacked",
|
|
164
167
|
value: "bar-stacked"
|
|
165
168
|
})]
|
|
166
|
-
}), /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
169
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
167
170
|
vertical: true
|
|
168
|
-
}), /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
171
|
+
}), showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
169
172
|
theme: theme,
|
|
170
173
|
onClick: setTheme
|
|
171
174
|
})]
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
4
|
+
var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
|
|
4
5
|
var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
|
|
5
6
|
var react = require('react');
|
|
6
7
|
var ChartContainer = require('../wrapper/ChartContainer.js');
|
|
7
8
|
var ChartWrapper = require('../wrapper/ChartWrapper.js');
|
|
9
|
+
var PaletteSelect = require('../wrapper/PaletteSelect.js');
|
|
8
10
|
var jsxRuntime = require('react/jsx-runtime');
|
|
9
11
|
|
|
10
|
-
var _excluded = ["chartRef", "onBrush", "onBrushEnd", "onBrushSelected", "dataTableRenderer", "onClick", "onRendered", "actions", "title", "theme"];
|
|
12
|
+
var _excluded = ["chartRef", "onBrush", "onBrushEnd", "onBrushSelected", "dataTableRenderer", "onClick", "onRendered", "showThemeSelector", "actions", "title", "theme"];
|
|
11
13
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
12
14
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
13
15
|
var GenericChartBase = /*#__PURE__*/react.memo(function (_ref2) {
|
|
@@ -18,11 +20,16 @@ var GenericChartBase = /*#__PURE__*/react.memo(function (_ref2) {
|
|
|
18
20
|
dataTableRenderer = _ref2.dataTableRenderer,
|
|
19
21
|
onClick = _ref2.onClick,
|
|
20
22
|
onRendered = _ref2.onRendered,
|
|
23
|
+
showThemeSelector = _ref2.showThemeSelector,
|
|
21
24
|
actions = _ref2.actions,
|
|
22
25
|
title = _ref2.title,
|
|
23
|
-
|
|
26
|
+
chartTheme = _ref2.theme,
|
|
24
27
|
options = _objectWithoutProperties(_ref2, _excluded);
|
|
25
28
|
var chartRef = react.useRef(null);
|
|
29
|
+
var _useState = react.useState(chartTheme),
|
|
30
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
31
|
+
theme = _useState2[0],
|
|
32
|
+
setTheme = _useState2[1];
|
|
26
33
|
react.useImperativeHandle(_ref, function () {
|
|
27
34
|
return chartRef.current;
|
|
28
35
|
}, [chartRef.current]);
|
|
@@ -71,13 +78,16 @@ var GenericChartBase = /*#__PURE__*/react.memo(function (_ref2) {
|
|
|
71
78
|
};
|
|
72
79
|
}
|
|
73
80
|
}, [chartRef.current, onBrushSelected]);
|
|
74
|
-
return /*#__PURE__*/jsxRuntime.
|
|
75
|
-
theme: theme,
|
|
81
|
+
return /*#__PURE__*/jsxRuntime.jsxs(ChartContainer.ChartContainer, {
|
|
76
82
|
options: options,
|
|
77
83
|
chartRef: chartRef,
|
|
84
|
+
theme: theme,
|
|
78
85
|
title: title,
|
|
79
86
|
dataTableRenderer: dataTableRenderer,
|
|
80
|
-
children: actions
|
|
87
|
+
children: [actions, showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
88
|
+
theme: theme,
|
|
89
|
+
onClick: setTheme
|
|
90
|
+
})]
|
|
81
91
|
});
|
|
82
92
|
});
|
|
83
93
|
GenericChartBase.displayName = "GenericChart";
|
|
@@ -39,10 +39,11 @@ echarts__namespace.registerMap("world", {
|
|
|
39
39
|
svg: world_svg
|
|
40
40
|
});
|
|
41
41
|
var MapSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
42
|
-
var
|
|
42
|
+
var series = _ref.series,
|
|
43
43
|
onExport = _ref.onExport;
|
|
44
44
|
_ref.theme;
|
|
45
|
-
var
|
|
45
|
+
var showTypeSelector = _ref.showTypeSelector,
|
|
46
|
+
title = _ref.title,
|
|
46
47
|
_onClick = _ref.onClick;
|
|
47
48
|
var chartRef = react.useRef(null);
|
|
48
49
|
var _useState = react.useState("map"),
|
|
@@ -54,14 +55,14 @@ var MapSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
54
55
|
zoom = _useState4[0],
|
|
55
56
|
setZoom = _useState4[1];
|
|
56
57
|
var options = core.useMemoDebugger(function () {
|
|
57
|
-
if (utilities.isEmpty(
|
|
58
|
-
var sorted =
|
|
58
|
+
if (utilities.isEmpty(series)) return {};
|
|
59
|
+
var sorted = series.map(function (d) {
|
|
59
60
|
var _d$label;
|
|
60
61
|
return _objectSpread(_objectSpread({}, d), {}, {
|
|
61
62
|
label: (_d$label = d.label) !== null && _d$label !== void 0 ? _d$label : utilities.Countries.name(d.id)
|
|
62
63
|
});
|
|
63
64
|
}).sort(utilities.compareValues("desc", "count"));
|
|
64
|
-
var valueMap =
|
|
65
|
+
var valueMap = series.map(function (d) {
|
|
65
66
|
return d.count;
|
|
66
67
|
});
|
|
67
68
|
if (type === "column") {
|
|
@@ -151,10 +152,10 @@ var MapSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
151
152
|
})
|
|
152
153
|
}]
|
|
153
154
|
};
|
|
154
|
-
}, [
|
|
155
|
+
}, [series, title, type], "MapChart options");
|
|
155
156
|
react.useEffect(function () {
|
|
156
157
|
setZoom(1.25);
|
|
157
|
-
}, [
|
|
158
|
+
}, [series, type]);
|
|
158
159
|
react.useEffect(function () {
|
|
159
160
|
var _chartRef$current;
|
|
160
161
|
(_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 || _chartRef$current.setOption({
|
|
@@ -182,7 +183,7 @@ var MapSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
182
183
|
onChange: function onChange(e) {
|
|
183
184
|
return setZoom(e.target.valueAsNumber);
|
|
184
185
|
}
|
|
185
|
-
}), /*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
186
|
+
}), showTypeSelector && /*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
186
187
|
value: type,
|
|
187
188
|
onChange: setType,
|
|
188
189
|
children: [/*#__PURE__*/jsxRuntime.jsx(core.Button, {
|
|
@@ -14,14 +14,17 @@ var jsxRuntime = require('react/jsx-runtime');
|
|
|
14
14
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
15
15
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
16
16
|
var TimeSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
17
|
-
var
|
|
17
|
+
var _series = _ref.series,
|
|
18
18
|
onExport = _ref.onExport,
|
|
19
19
|
categoryAxisName = _ref.categoryAxisName,
|
|
20
20
|
valueAxisName = _ref.valueAxisName,
|
|
21
21
|
title = _ref.title,
|
|
22
|
+
showThemeSelector = _ref.showThemeSelector,
|
|
23
|
+
showTypeSelector = _ref.showTypeSelector,
|
|
22
24
|
chartTheme = _ref.theme,
|
|
23
25
|
_ref$type = _ref.type,
|
|
24
26
|
chartType = _ref$type === void 0 ? "column" : _ref$type,
|
|
27
|
+
optionOverride = _ref.options,
|
|
25
28
|
_onClick = _ref.onClick,
|
|
26
29
|
onBrush = _ref.onBrush;
|
|
27
30
|
var chartRef = react.useRef(null);
|
|
@@ -82,7 +85,7 @@ var TimeSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
82
85
|
}
|
|
83
86
|
}, [chartRef.current, onBrush]);
|
|
84
87
|
var options = core.useMemoDebugger(function () {
|
|
85
|
-
if (utilities.isEmpty(
|
|
88
|
+
if (utilities.isEmpty(_series)) {
|
|
86
89
|
var _chartRef$current3;
|
|
87
90
|
(_chartRef$current3 = chartRef.current) === null || _chartRef$current3 === void 0 || _chartRef$current3.clear();
|
|
88
91
|
return {};
|
|
@@ -92,7 +95,7 @@ var TimeSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
92
95
|
_type$split2 = _slicedToArray(_type$split, 2),
|
|
93
96
|
_type = _type$split2[0],
|
|
94
97
|
stacked = _type$split2[1];
|
|
95
|
-
var categoryAxis = {
|
|
98
|
+
var categoryAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.xAxis, {
|
|
96
99
|
name: categoryAxisName,
|
|
97
100
|
type: "time",
|
|
98
101
|
nameGap: 32,
|
|
@@ -112,49 +115,49 @@ var TimeSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
112
115
|
none: "{yyyy}-{MM}-{dd} {hh}:{mm}:{ss} {SSS}"
|
|
113
116
|
}
|
|
114
117
|
}
|
|
115
|
-
};
|
|
116
|
-
var valueAxis = {
|
|
118
|
+
});
|
|
119
|
+
var valueAxis = Object.assign({}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.yAxis, {
|
|
117
120
|
name: valueAxisName,
|
|
118
121
|
type: "value",
|
|
119
122
|
nameGap: 32,
|
|
120
123
|
nameLocation: "center"
|
|
121
|
-
};
|
|
122
|
-
var series =
|
|
123
|
-
var _item$
|
|
124
|
-
return {
|
|
125
|
-
|
|
126
|
-
stack: stack,
|
|
124
|
+
});
|
|
125
|
+
var series = _series === null || _series === void 0 ? void 0 : _series.map(function (item) {
|
|
126
|
+
var _item$stack, _item$name;
|
|
127
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
128
|
+
stack: (_item$stack = item.stack) !== null && _item$stack !== void 0 ? _item$stack : stack,
|
|
127
129
|
areaStyle: stacked ? {} : undefined,
|
|
128
130
|
symbol: "none",
|
|
129
131
|
type: _type === "column" ? "bar" : _type,
|
|
130
|
-
name: (_item$
|
|
131
|
-
data: item.values,
|
|
132
|
+
name: (_item$name = item.name) !== null && _item$name !== void 0 ? _item$name : item.id,
|
|
132
133
|
universalTransition: true
|
|
133
|
-
};
|
|
134
|
+
});
|
|
134
135
|
});
|
|
135
|
-
return {
|
|
136
|
-
xAxis: categoryAxis,
|
|
137
|
-
yAxis: valueAxis,
|
|
138
|
-
series: series,
|
|
136
|
+
return _objectSpread(_objectSpread({
|
|
139
137
|
brush: {
|
|
140
138
|
toolbox: ["lineX", "clear"],
|
|
141
139
|
brushType: "lineX",
|
|
142
140
|
xAxisIndex: 0
|
|
143
|
-
}
|
|
144
|
-
|
|
141
|
+
}
|
|
142
|
+
}, optionOverride), {}, {
|
|
143
|
+
tooltip: Object.assign({
|
|
145
144
|
trigger: "axis",
|
|
146
145
|
confine: true,
|
|
147
|
-
position: "top"
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
146
|
+
position: "top",
|
|
147
|
+
appendToBody: true
|
|
148
|
+
}, optionOverride === null || optionOverride === void 0 ? void 0 : optionOverride.tooltip),
|
|
149
|
+
xAxis: categoryAxis,
|
|
150
|
+
yAxis: valueAxis,
|
|
151
|
+
series: series
|
|
152
|
+
});
|
|
153
|
+
}, [_series, type, categoryAxisName, valueAxisName, optionOverride], "TimeChart options");
|
|
151
154
|
return /*#__PURE__*/jsxRuntime.jsxs(ChartContainer.ChartContainer, {
|
|
152
155
|
title: title,
|
|
153
156
|
onExport: onExport,
|
|
154
157
|
theme: theme,
|
|
155
158
|
options: options,
|
|
156
159
|
chartRef: chartRef,
|
|
157
|
-
isEmpty: utilities.isEmpty(
|
|
160
|
+
isEmpty: utilities.isEmpty(_series),
|
|
158
161
|
emptyIcon: core.CoreIcons.chartColumn,
|
|
159
162
|
dataTableRenderer: utils.timeSeriesRenderer,
|
|
160
163
|
onClick: function onClick(e) {
|
|
@@ -163,7 +166,7 @@ var TimeSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
163
166
|
series: e.seriesId
|
|
164
167
|
});
|
|
165
168
|
},
|
|
166
|
-
children: [/*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
169
|
+
children: [showTypeSelector && /*#__PURE__*/jsxRuntime.jsxs(core.ToggleButtonGroup, {
|
|
167
170
|
value: type,
|
|
168
171
|
onChange: setType,
|
|
169
172
|
children: [/*#__PURE__*/jsxRuntime.jsx(core.Button, {
|
|
@@ -191,9 +194,9 @@ var TimeSeriesChart = /*#__PURE__*/react.memo(function (_ref) {
|
|
|
191
194
|
value: "column-stacked",
|
|
192
195
|
"aria-label": "column-stacked"
|
|
193
196
|
})]
|
|
194
|
-
}), /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
197
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(core.Divider, {
|
|
195
198
|
vertical: true
|
|
196
|
-
}), /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
199
|
+
}), showThemeSelector && /*#__PURE__*/jsxRuntime.jsx(PaletteSelect.PaletteSelect, {
|
|
197
200
|
theme: theme,
|
|
198
201
|
onClick: setTheme
|
|
199
202
|
})]
|