@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
|
@@ -14,12 +14,15 @@ import { jsxs, jsx } from '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__*/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 = useRef(null);
|
|
25
28
|
var _useState = useState(chartType),
|
|
@@ -37,13 +40,13 @@ var CountSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
37
40
|
setTheme(chartTheme);
|
|
38
41
|
}, [chartTheme]);
|
|
39
42
|
var options = useMemoDebugger(function () {
|
|
40
|
-
if (isEmpty(
|
|
43
|
+
if (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(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__*/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 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__*/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__*/jsxs(ChartContainer, {
|
|
103
106
|
title: title,
|
|
104
107
|
onExport: onExport,
|
|
105
108
|
theme: theme,
|
|
106
109
|
options: options,
|
|
107
110
|
chartRef: chartRef,
|
|
108
|
-
isEmpty: isEmpty(
|
|
111
|
+
isEmpty: isEmpty(_series),
|
|
109
112
|
emptyIcon: CoreIcons.chartPie,
|
|
110
113
|
dataTableRenderer: 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__*/jsxs(ToggleButtonGroup, {
|
|
118
|
+
children: [showTypeSelector && /*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
116
119
|
value: type,
|
|
117
120
|
onChange: setType,
|
|
118
121
|
children: [/*#__PURE__*/jsx(Button, {
|
|
@@ -134,9 +137,9 @@ var CountSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
134
137
|
"aria-label": "bar",
|
|
135
138
|
icon: CoreIcons.chartBar
|
|
136
139
|
})]
|
|
137
|
-
}), /*#__PURE__*/jsx(Divider, {
|
|
140
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsx(Divider, {
|
|
138
141
|
vertical: true
|
|
139
|
-
}), /*#__PURE__*/jsx(PaletteSelect, {
|
|
142
|
+
}), showThemeSelector && /*#__PURE__*/jsx(PaletteSelect, {
|
|
140
143
|
theme: theme,
|
|
141
144
|
onClick: setTheme
|
|
142
145
|
})]
|
|
@@ -14,12 +14,15 @@ import { jsxs, jsx } from '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__*/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__*/memo(function (_ref) {
|
|
|
40
43
|
setTheme(chartTheme);
|
|
41
44
|
}, [chartTheme]);
|
|
42
45
|
var options = useMemoDebugger(function () {
|
|
43
|
-
if (isEmpty(
|
|
46
|
+
if (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__*/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__*/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__*/jsxs(ChartContainer, {
|
|
106
109
|
title: title,
|
|
107
110
|
onExport: onExport,
|
|
108
111
|
theme: theme,
|
|
109
112
|
options: options,
|
|
110
113
|
chartRef: chartRef,
|
|
111
|
-
isEmpty: isEmpty(
|
|
114
|
+
isEmpty: isEmpty(_series),
|
|
112
115
|
emptyIcon: CoreIcons.chartColumn,
|
|
113
116
|
dataTableRenderer: seriesRenderer,
|
|
114
117
|
onClick: function onClick(e) {
|
|
@@ -117,7 +120,7 @@ var DataSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
117
120
|
series: e.seriesId
|
|
118
121
|
});
|
|
119
122
|
},
|
|
120
|
-
children: [/*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
123
|
+
children: [showTypeSelector && /*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
121
124
|
value: type,
|
|
122
125
|
onChange: setType,
|
|
123
126
|
children: [/*#__PURE__*/jsx(Button, {
|
|
@@ -163,9 +166,9 @@ var DataSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
163
166
|
"aria-label": "bar-stacked",
|
|
164
167
|
value: "bar-stacked"
|
|
165
168
|
})]
|
|
166
|
-
}), /*#__PURE__*/jsx(Divider, {
|
|
169
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsx(Divider, {
|
|
167
170
|
vertical: true
|
|
168
|
-
}), /*#__PURE__*/jsx(PaletteSelect, {
|
|
171
|
+
}), showThemeSelector && /*#__PURE__*/jsx(PaletteSelect, {
|
|
169
172
|
theme: theme,
|
|
170
173
|
onClick: setTheme
|
|
171
174
|
})]
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
3
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
4
|
+
import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
|
|
4
5
|
import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
|
|
5
|
-
import { memo, useRef, useImperativeHandle, useEffect } from 'react';
|
|
6
|
+
import { memo, useRef, useState, useImperativeHandle, useEffect } from 'react';
|
|
6
7
|
import { ChartContainer } from '../wrapper/ChartContainer.js';
|
|
7
8
|
import { ChartWrapper } from '../wrapper/ChartWrapper.js';
|
|
8
|
-
import {
|
|
9
|
+
import { PaletteSelect } from '../wrapper/PaletteSelect.js';
|
|
10
|
+
import { jsxs, jsx } from '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__*/memo(function (_ref2) {
|
|
@@ -18,11 +20,16 @@ var GenericChartBase = /*#__PURE__*/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 = useRef(null);
|
|
29
|
+
var _useState = useState(chartTheme),
|
|
30
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
31
|
+
theme = _useState2[0],
|
|
32
|
+
setTheme = _useState2[1];
|
|
26
33
|
useImperativeHandle(_ref, function () {
|
|
27
34
|
return chartRef.current;
|
|
28
35
|
}, [chartRef.current]);
|
|
@@ -71,13 +78,16 @@ var GenericChartBase = /*#__PURE__*/memo(function (_ref2) {
|
|
|
71
78
|
};
|
|
72
79
|
}
|
|
73
80
|
}, [chartRef.current, onBrushSelected]);
|
|
74
|
-
return /*#__PURE__*/
|
|
75
|
-
theme: theme,
|
|
81
|
+
return /*#__PURE__*/jsxs(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__*/jsx(PaletteSelect, {
|
|
88
|
+
theme: theme,
|
|
89
|
+
onClick: setTheme
|
|
90
|
+
})]
|
|
81
91
|
});
|
|
82
92
|
});
|
|
83
93
|
GenericChartBase.displayName = "GenericChart";
|
|
@@ -20,10 +20,11 @@ echarts.registerMap("world", {
|
|
|
20
20
|
svg: WorldMap
|
|
21
21
|
});
|
|
22
22
|
var MapSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
23
|
-
var
|
|
23
|
+
var series = _ref.series,
|
|
24
24
|
onExport = _ref.onExport;
|
|
25
25
|
_ref.theme;
|
|
26
|
-
var
|
|
26
|
+
var showTypeSelector = _ref.showTypeSelector,
|
|
27
|
+
title = _ref.title,
|
|
27
28
|
_onClick = _ref.onClick;
|
|
28
29
|
var chartRef = useRef(null);
|
|
29
30
|
var _useState = useState("map"),
|
|
@@ -35,14 +36,14 @@ var MapSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
35
36
|
zoom = _useState4[0],
|
|
36
37
|
setZoom = _useState4[1];
|
|
37
38
|
var options = useMemoDebugger(function () {
|
|
38
|
-
if (isEmpty(
|
|
39
|
-
var sorted =
|
|
39
|
+
if (isEmpty(series)) return {};
|
|
40
|
+
var sorted = series.map(function (d) {
|
|
40
41
|
var _d$label;
|
|
41
42
|
return _objectSpread(_objectSpread({}, d), {}, {
|
|
42
43
|
label: (_d$label = d.label) !== null && _d$label !== void 0 ? _d$label : Countries.name(d.id)
|
|
43
44
|
});
|
|
44
45
|
}).sort(compareValues("desc", "count"));
|
|
45
|
-
var valueMap =
|
|
46
|
+
var valueMap = series.map(function (d) {
|
|
46
47
|
return d.count;
|
|
47
48
|
});
|
|
48
49
|
if (type === "column") {
|
|
@@ -132,10 +133,10 @@ var MapSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
132
133
|
})
|
|
133
134
|
}]
|
|
134
135
|
};
|
|
135
|
-
}, [
|
|
136
|
+
}, [series, title, type], "MapChart options");
|
|
136
137
|
useEffect(function () {
|
|
137
138
|
setZoom(1.25);
|
|
138
|
-
}, [
|
|
139
|
+
}, [series, type]);
|
|
139
140
|
useEffect(function () {
|
|
140
141
|
var _chartRef$current;
|
|
141
142
|
(_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 || _chartRef$current.setOption({
|
|
@@ -163,7 +164,7 @@ var MapSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
163
164
|
onChange: function onChange(e) {
|
|
164
165
|
return setZoom(e.target.valueAsNumber);
|
|
165
166
|
}
|
|
166
|
-
}), /*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
167
|
+
}), showTypeSelector && /*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
167
168
|
value: type,
|
|
168
169
|
onChange: setType,
|
|
169
170
|
children: [/*#__PURE__*/jsx(Button, {
|
|
@@ -14,14 +14,17 @@ import { jsxs, jsx } from '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__*/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 = useRef(null);
|
|
@@ -82,7 +85,7 @@ var TimeSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
82
85
|
}
|
|
83
86
|
}, [chartRef.current, onBrush]);
|
|
84
87
|
var options = useMemoDebugger(function () {
|
|
85
|
-
if (isEmpty(
|
|
88
|
+
if (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__*/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__*/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__*/jsxs(ChartContainer, {
|
|
152
155
|
title: title,
|
|
153
156
|
onExport: onExport,
|
|
154
157
|
theme: theme,
|
|
155
158
|
options: options,
|
|
156
159
|
chartRef: chartRef,
|
|
157
|
-
isEmpty: isEmpty(
|
|
160
|
+
isEmpty: isEmpty(_series),
|
|
158
161
|
emptyIcon: CoreIcons.chartColumn,
|
|
159
162
|
dataTableRenderer: timeSeriesRenderer,
|
|
160
163
|
onClick: function onClick(e) {
|
|
@@ -163,7 +166,7 @@ var TimeSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
163
166
|
series: e.seriesId
|
|
164
167
|
});
|
|
165
168
|
},
|
|
166
|
-
children: [/*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
169
|
+
children: [showTypeSelector && /*#__PURE__*/jsxs(ToggleButtonGroup, {
|
|
167
170
|
value: type,
|
|
168
171
|
onChange: setType,
|
|
169
172
|
children: [/*#__PURE__*/jsx(Button, {
|
|
@@ -191,9 +194,9 @@ var TimeSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
191
194
|
value: "column-stacked",
|
|
192
195
|
"aria-label": "column-stacked"
|
|
193
196
|
})]
|
|
194
|
-
}), /*#__PURE__*/jsx(Divider, {
|
|
197
|
+
}), showTypeSelector && showThemeSelector && /*#__PURE__*/jsx(Divider, {
|
|
195
198
|
vertical: true
|
|
196
|
-
}), /*#__PURE__*/jsx(PaletteSelect, {
|
|
199
|
+
}), showThemeSelector && /*#__PURE__*/jsx(PaletteSelect, {
|
|
197
200
|
theme: theme,
|
|
198
201
|
onClick: setTheme
|
|
199
202
|
})]
|
|
@@ -13,7 +13,7 @@ import { jsx } from 'react/jsx-runtime';
|
|
|
13
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; }
|
|
14
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; }
|
|
15
15
|
var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
16
|
-
var
|
|
16
|
+
var dataSeries = _ref.series,
|
|
17
17
|
sliderRange = _ref.range,
|
|
18
18
|
onBrush = _ref.onBrush;
|
|
19
19
|
var chartRef = useRef(null);
|
|
@@ -28,9 +28,9 @@ var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
28
28
|
return onBrush === null || onBrush === void 0 ? void 0 : onBrush(range);
|
|
29
29
|
}, [onBrush], 100);
|
|
30
30
|
useEffect(function () {
|
|
31
|
-
var
|
|
32
|
-
var defaultStart =
|
|
33
|
-
var defaultEnd =
|
|
31
|
+
var _dataSeries$, _dataSeries;
|
|
32
|
+
var defaultStart = dataSeries.length > 0 ? dataSeries === null || dataSeries === void 0 || (_dataSeries$ = dataSeries[0]) === null || _dataSeries$ === void 0 || (_dataSeries$ = _dataSeries$[0]) === null || _dataSeries$ === void 0 ? void 0 : _dataSeries$.getTime() : 0;
|
|
33
|
+
var defaultEnd = dataSeries.length > 0 ? dataSeries === null || dataSeries === void 0 || (_dataSeries = dataSeries[dataSeries.length - 1]) === null || _dataSeries === void 0 || (_dataSeries = _dataSeries[0]) === null || _dataSeries === void 0 ? void 0 : _dataSeries.getTime() : 32;
|
|
34
34
|
var getRangeValue = function getRangeValue() {
|
|
35
35
|
var v = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
|
|
36
36
|
var def = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
@@ -40,7 +40,7 @@ var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
40
40
|
startValue: getRangeValue(sliderRange === null || sliderRange === void 0 ? void 0 : sliderRange.start.getTime(), defaultStart),
|
|
41
41
|
endValue: getRangeValue(sliderRange === null || sliderRange === void 0 ? void 0 : sliderRange.end.getTime(), defaultEnd)
|
|
42
42
|
});
|
|
43
|
-
}, [sliderRange,
|
|
43
|
+
}, [sliderRange, dataSeries]);
|
|
44
44
|
var enableBrush = useCallback(function () {
|
|
45
45
|
var _chartRef$current, _chartRef$current2;
|
|
46
46
|
(_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 || _chartRef$current.dispatchAction({
|
|
@@ -79,7 +79,7 @@ var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
79
79
|
}
|
|
80
80
|
}, [chartRef.current, handleBrush], "TimeSldier onBrush");
|
|
81
81
|
var options = useMemoDebugger(function () {
|
|
82
|
-
if (isEmpty(
|
|
82
|
+
if (isEmpty(dataSeries)) {
|
|
83
83
|
var _chartRef$current3;
|
|
84
84
|
(_chartRef$current3 = chartRef.current) === null || _chartRef$current3 === void 0 || _chartRef$current3.clear();
|
|
85
85
|
return {};
|
|
@@ -124,7 +124,7 @@ var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
124
124
|
lineStyle: {
|
|
125
125
|
width: 2
|
|
126
126
|
},
|
|
127
|
-
data:
|
|
127
|
+
data: dataSeries
|
|
128
128
|
}];
|
|
129
129
|
return {
|
|
130
130
|
grid: {
|
|
@@ -160,7 +160,7 @@ var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
160
160
|
position: "top"
|
|
161
161
|
}
|
|
162
162
|
};
|
|
163
|
-
}, [
|
|
163
|
+
}, [dataSeries], "TimeSlider options");
|
|
164
164
|
useEffect(function () {
|
|
165
165
|
setTimeout(function () {
|
|
166
166
|
var _chartRef$current4;
|
|
@@ -178,7 +178,7 @@ var TimeSliderChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
178
178
|
return /*#__PURE__*/jsx(ChartContainer, {
|
|
179
179
|
options: options,
|
|
180
180
|
chartRef: chartRef,
|
|
181
|
-
isEmpty: isEmpty(
|
|
181
|
+
isEmpty: isEmpty(dataSeries)
|
|
182
182
|
});
|
|
183
183
|
});
|
|
184
184
|
TimeSliderChart.displayName = "TimeSliderChart";
|
|
@@ -13,16 +13,22 @@ import { jsx } from 'react/jsx-runtime';
|
|
|
13
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; }
|
|
14
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; }
|
|
15
15
|
var WordBubbleChart = /*#__PURE__*/memo(function (_ref) {
|
|
16
|
-
var
|
|
16
|
+
var series = _ref.series,
|
|
17
17
|
title = _ref.title,
|
|
18
18
|
onExport = _ref.onExport,
|
|
19
19
|
_onClick = _ref.onClick;
|
|
20
20
|
var isDark = useIsDark();
|
|
21
21
|
var options = useMemoDebugger(function () {
|
|
22
|
-
if (isEmpty(
|
|
22
|
+
if (isEmpty(series)) return {};
|
|
23
23
|
var palette = isDark ? ChartPalette.CloudDark : ChartPalette.CloudLight;
|
|
24
24
|
return {
|
|
25
25
|
legend: undefined,
|
|
26
|
+
tooltip: {
|
|
27
|
+
trigger: "axis",
|
|
28
|
+
confine: true,
|
|
29
|
+
position: "top",
|
|
30
|
+
appendToBody: true
|
|
31
|
+
},
|
|
26
32
|
series: [{
|
|
27
33
|
name: title,
|
|
28
34
|
type: "wordCloud",
|
|
@@ -41,7 +47,7 @@ var WordBubbleChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
41
47
|
return palette[dataIndex % palette.length];
|
|
42
48
|
}
|
|
43
49
|
},
|
|
44
|
-
data:
|
|
50
|
+
data: series.sort(compareValues("desc", "count")).map(function (_ref3, index) {
|
|
45
51
|
var key = _ref3.id,
|
|
46
52
|
label = _ref3.label,
|
|
47
53
|
count = _ref3.count;
|
|
@@ -52,12 +58,12 @@ var WordBubbleChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
52
58
|
})
|
|
53
59
|
}]
|
|
54
60
|
};
|
|
55
|
-
}, [
|
|
61
|
+
}, [series, title, isDark], "WordChart options");
|
|
56
62
|
return /*#__PURE__*/jsx(ChartContainer, {
|
|
57
63
|
title: title,
|
|
58
64
|
onExport: onExport,
|
|
59
65
|
options: options,
|
|
60
|
-
isEmpty: isEmpty(
|
|
66
|
+
isEmpty: isEmpty(series),
|
|
61
67
|
emptyIcon: CoreIcons.chartActivityScatter,
|
|
62
68
|
dataTableRenderer: countRenderer,
|
|
63
69
|
onClick: function onClick(e) {
|
|
@@ -197,7 +197,7 @@ var DarkThemeBase = {
|
|
|
197
197
|
splitLine: {
|
|
198
198
|
show: true,
|
|
199
199
|
lineStyle: {
|
|
200
|
-
color: ["#
|
|
200
|
+
color: ["#363636"]
|
|
201
201
|
}
|
|
202
202
|
},
|
|
203
203
|
splitArea: {
|
|
@@ -231,7 +231,7 @@ var DarkThemeBase = {
|
|
|
231
231
|
splitLine: {
|
|
232
232
|
show: true,
|
|
233
233
|
lineStyle: {
|
|
234
|
-
color: ["#
|
|
234
|
+
color: ["#363636"]
|
|
235
235
|
}
|
|
236
236
|
},
|
|
237
237
|
splitArea: {
|
|
@@ -265,7 +265,7 @@ var DarkThemeBase = {
|
|
|
265
265
|
splitLine: {
|
|
266
266
|
show: true,
|
|
267
267
|
lineStyle: {
|
|
268
|
-
color: ["#
|
|
268
|
+
color: ["#363636"]
|
|
269
269
|
}
|
|
270
270
|
},
|
|
271
271
|
splitArea: {
|
|
@@ -299,7 +299,7 @@ var DarkThemeBase = {
|
|
|
299
299
|
splitLine: {
|
|
300
300
|
show: true,
|
|
301
301
|
lineStyle: {
|
|
302
|
-
color: ["#
|
|
302
|
+
color: ["#363636"]
|
|
303
303
|
}
|
|
304
304
|
},
|
|
305
305
|
splitArea: {
|
|
@@ -309,11 +309,6 @@ var DarkThemeBase = {
|
|
|
309
309
|
}
|
|
310
310
|
}
|
|
311
311
|
},
|
|
312
|
-
visualMap: {
|
|
313
|
-
textStyle: {
|
|
314
|
-
color: "#eee"
|
|
315
|
-
}
|
|
316
|
-
},
|
|
317
312
|
toolbox: {
|
|
318
313
|
iconStyle: {
|
|
319
314
|
borderColor: "#999999"
|
|
@@ -326,9 +321,17 @@ var DarkThemeBase = {
|
|
|
326
321
|
},
|
|
327
322
|
legend: {
|
|
328
323
|
inactiveColor: "rgb(192 192 192 / .75)",
|
|
324
|
+
itemHeight: 8,
|
|
329
325
|
textStyle: {
|
|
326
|
+
fontSize: 10,
|
|
330
327
|
color: "#5d6d7d6"
|
|
331
|
-
}
|
|
328
|
+
},
|
|
329
|
+
pageTextStyle: {
|
|
330
|
+
fontSize: 8
|
|
331
|
+
},
|
|
332
|
+
pageIconSize: 8,
|
|
333
|
+
pageIconColor: "#6997A3",
|
|
334
|
+
pageIconInactiveColor: "#474B4A"
|
|
332
335
|
},
|
|
333
336
|
tooltip: {
|
|
334
337
|
backgroundColor: "#0C141D",
|