@react-fabric/chart 1.0.0-beta.52 → 1.0.0-beta.53
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 +21 -12
- package/dist/cjs/charts/CountSeries.js +5 -3
- package/dist/cjs/charts/DataSeries.js +7 -4
- package/dist/cjs/charts/Generic.js +15 -5
- package/dist/cjs/charts/MapSeries.js +3 -2
- package/dist/cjs/charts/TimeSeries.js +7 -4
- package/dist/cjs/charts/WordBubble.js +6 -0
- package/dist/cjs/theme/darkBase.js +0 -5
- package/dist/cjs/theme/index.js +38 -18
- package/dist/cjs/theme/lightBase.js +0 -5
- 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 +21 -12
- package/dist/esm/charts/CountSeries.js +5 -3
- package/dist/esm/charts/DataSeries.js +7 -4
- package/dist/esm/charts/Generic.js +17 -7
- package/dist/esm/charts/MapSeries.js +3 -2
- package/dist/esm/charts/TimeSeries.js +7 -4
- package/dist/esm/charts/WordBubble.js +6 -0
- package/dist/esm/theme/darkBase.js +0 -5
- package/dist/esm/theme/index.js +38 -18
- package/dist/esm/theme/lightBase.js +0 -5
- 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/theme/darkBase.d.ts +0 -5
- package/dist/types/theme/index.d.ts +1 -1
- package/dist/types/theme/lightBase.d.ts +0 -5
- package/dist/types/types/charts.d.ts +1 -1
- package/dist/types/types/index.d.ts +3 -1
- package/package.json +3 -3
- package/src/charts/ActivityMap.tsx +53 -36
- package/src/charts/CountSeries.tsx +31 -25
- package/src/charts/DataSeries.tsx +60 -53
- package/src/charts/Generic.tsx +11 -4
- package/src/charts/MapSeries.tsx +26 -17
- package/src/charts/TimeSeries.tsx +40 -33
- package/src/charts/WordBubble.tsx +6 -0
- package/src/theme/darkBase.ts +0 -5
- package/src/theme/index.ts +94 -20
- package/src/theme/lightBase.ts +0 -5
- package/src/theme/palettes.ts +1 -52
- package/src/types/charts.ts +6 -2
- package/src/types/index.ts +6 -1
- package/src/wrapper/ChartContainer.tsx +1 -0
- package/src/wrapper/ChartToolbar.tsx +1 -1
|
@@ -20,6 +20,8 @@ var DataSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
20
20
|
categoryAxisName = _ref.categoryAxisName,
|
|
21
21
|
valueAxisName = _ref.valueAxisName,
|
|
22
22
|
title = _ref.title,
|
|
23
|
+
showThemeSelector = _ref.showThemeSelector,
|
|
24
|
+
showTypeSelector = _ref.showTypeSelector,
|
|
23
25
|
chartTheme = _ref.theme,
|
|
24
26
|
_ref$type = _ref.type,
|
|
25
27
|
chartType = _ref$type === void 0 ? "column" : _ref$type,
|
|
@@ -98,7 +100,8 @@ var DataSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
98
100
|
tooltip: {
|
|
99
101
|
trigger: _type === "radar" ? "item" : "axis",
|
|
100
102
|
confine: true,
|
|
101
|
-
position: "top"
|
|
103
|
+
position: "top",
|
|
104
|
+
appendToBody: true
|
|
102
105
|
}
|
|
103
106
|
};
|
|
104
107
|
}, [data, type, categories, categoryAxisName, valueAxisName], "DataChart options");
|
|
@@ -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";
|
|
@@ -23,7 +23,8 @@ var MapSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
23
23
|
var data = _ref.data,
|
|
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"),
|
|
@@ -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, {
|
|
@@ -19,6 +19,8 @@ var TimeSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
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,
|
|
@@ -144,7 +146,8 @@ var TimeSeriesChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
144
146
|
tooltip: {
|
|
145
147
|
trigger: "axis",
|
|
146
148
|
confine: true,
|
|
147
|
-
position: "top"
|
|
149
|
+
position: "top",
|
|
150
|
+
appendToBody: true
|
|
148
151
|
}
|
|
149
152
|
};
|
|
150
153
|
}, [data, type, categoryAxisName, valueAxisName], "TimeChart options");
|
|
@@ -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
|
})]
|
|
@@ -23,6 +23,12 @@ var WordBubbleChart = /*#__PURE__*/memo(function (_ref) {
|
|
|
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",
|
package/dist/esm/theme/index.js
CHANGED
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
4
4
|
import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
|
|
5
|
+
import Color from 'color';
|
|
5
6
|
import { DarkThemeBase } from './darkBase.js';
|
|
6
7
|
import { LightThemeBase } from './lightBase.js';
|
|
7
8
|
import { ChartPalette } from './palettes.js';
|
|
8
|
-
import Color from 'color';
|
|
9
9
|
|
|
10
10
|
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; }
|
|
11
11
|
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; }
|
|
12
12
|
var makePaletteSequence = function makePaletteSequence(colors) {
|
|
13
13
|
return [].concat(_toConsumableArray(colors), _toConsumableArray(_toConsumableArray(colors.slice(1, -1)).reverse()));
|
|
14
14
|
};
|
|
15
|
-
var registerTheme = function registerTheme(echarts, key, colors) {
|
|
15
|
+
var registerTheme = function registerTheme(echarts, key, colors, heatmap) {
|
|
16
16
|
var base = colors[0];
|
|
17
17
|
var handles = Color(base).mix(Color("#f1f5f9"), 0.15).hex();
|
|
18
18
|
var window = Color(base).alpha(0.1).hexa();
|
|
@@ -40,6 +40,17 @@ var registerTheme = function registerTheme(echarts, key, colors) {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
}),
|
|
43
|
+
visualMap: {
|
|
44
|
+
textStyle: {
|
|
45
|
+
color: "#666"
|
|
46
|
+
},
|
|
47
|
+
inRange: {
|
|
48
|
+
color: heatmap
|
|
49
|
+
},
|
|
50
|
+
outOfRange: {
|
|
51
|
+
color: "#d9d9d9"
|
|
52
|
+
}
|
|
53
|
+
},
|
|
43
54
|
color: makePaletteSequence(colors)
|
|
44
55
|
}));
|
|
45
56
|
echarts.registerTheme("".concat(key, "_dark"), _objectSpread(_objectSpread({}, DarkThemeBase), {}, {
|
|
@@ -66,6 +77,17 @@ var registerTheme = function registerTheme(echarts, key, colors) {
|
|
|
66
77
|
}
|
|
67
78
|
}
|
|
68
79
|
}),
|
|
80
|
+
visualMap: {
|
|
81
|
+
textStyle: {
|
|
82
|
+
color: "#eee"
|
|
83
|
+
},
|
|
84
|
+
inRange: {
|
|
85
|
+
color: heatmap
|
|
86
|
+
},
|
|
87
|
+
outOfRange: {
|
|
88
|
+
color: "#363636"
|
|
89
|
+
}
|
|
90
|
+
},
|
|
69
91
|
color: makePaletteSequence(colors)
|
|
70
92
|
}));
|
|
71
93
|
};
|
|
@@ -76,22 +98,20 @@ var registerThemes = function registerThemes(echarts) {
|
|
|
76
98
|
echarts.registerTheme("default_dark", _objectSpread(_objectSpread({}, DarkThemeBase), {}, {
|
|
77
99
|
color: ChartPalette.Default
|
|
78
100
|
}));
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
registerTheme(echarts, "
|
|
86
|
-
registerTheme(echarts, "
|
|
87
|
-
registerTheme(echarts, "
|
|
88
|
-
registerTheme(echarts, "
|
|
89
|
-
registerTheme(echarts, "
|
|
90
|
-
registerTheme(echarts, "
|
|
91
|
-
registerTheme(echarts, "
|
|
92
|
-
registerTheme(echarts, "
|
|
93
|
-
registerTheme(echarts, "ocean", ChartPalette.Ocean);
|
|
94
|
-
registerTheme(echarts, "wine", ChartPalette.Wine);
|
|
101
|
+
registerTheme(echarts, "activity", ChartPalette.Activity, [ChartPalette.Activity[2], ChartPalette.Activity[0], ChartPalette.Activity[1]]);
|
|
102
|
+
registerTheme(echarts, "qualitative", ChartPalette.Qualitative, [ChartPalette.Qualitative[2], ChartPalette.Qualitative[1], ChartPalette.Qualitative[0]]);
|
|
103
|
+
registerTheme(echarts, "diverging", ChartPalette.Diverging, [ChartPalette.Diverging[0], ChartPalette.Diverging[4], ChartPalette.Diverging[10]]);
|
|
104
|
+
registerTheme(echarts, "sequential", ChartPalette.Sequential, [ChartPalette.Sequential[4], ChartPalette.Sequential[2], ChartPalette.Sequential[0]]);
|
|
105
|
+
registerTheme(echarts, "spectral", ChartPalette.Spectral, [ChartPalette.Spectral[9], ChartPalette.Spectral[5], ChartPalette.Spectral[1]]);
|
|
106
|
+
registerTheme(echarts, "uber", ChartPalette.UberPool, [ChartPalette.UberPool[1], ChartPalette.UberPool[4], ChartPalette.UberPool[8]]);
|
|
107
|
+
registerTheme(echarts, "fireice", ChartPalette.FireIce, [ChartPalette.FireIce[0], ChartPalette.FireIce[4], ChartPalette.FireIce[7]]);
|
|
108
|
+
registerTheme(echarts, "warming", ChartPalette.GlobalWarming, [ChartPalette.GlobalWarming[0], ChartPalette.GlobalWarming[3], ChartPalette.GlobalWarming[6]]);
|
|
109
|
+
registerTheme(echarts, "sunrise", ChartPalette.Sunrise, [ChartPalette.Sunrise[1], ChartPalette.Sunrise[4], ChartPalette.Sunrise[7]]);
|
|
110
|
+
registerTheme(echarts, "ocean", ChartPalette.Ocean, [ChartPalette.Ocean[1], ChartPalette.Ocean[3], ChartPalette.Ocean[5]]);
|
|
111
|
+
registerTheme(echarts, "wine", ChartPalette.Wine, [ChartPalette.Wine[1], ChartPalette.Wine[3], ChartPalette.Wine[5]]);
|
|
112
|
+
registerTheme(echarts, "blue", ChartPalette.GreenBlue, [ChartPalette.GreenBlue[6], ChartPalette.GreenBlue[3], ChartPalette.GreenBlue[0]]);
|
|
113
|
+
registerTheme(echarts, "green", ChartPalette.YellowGreen, [ChartPalette.YellowGreen[6], ChartPalette.YellowGreen[3], ChartPalette.YellowGreen[0]]);
|
|
114
|
+
registerTheme(echarts, "red", ChartPalette.OrangeRed, [ChartPalette.OrangeRed[6], ChartPalette.OrangeRed[3], ChartPalette.OrangeRed[0]]);
|
|
95
115
|
};
|
|
96
116
|
|
|
97
117
|
export { registerTheme, registerThemes };
|
|
@@ -37,33 +37,33 @@ var GlobalWarming = ["#FFC300", "#E57F00", "#CB4600", "#B21800", "#98000A", "#7F
|
|
|
37
37
|
var Sunrise = ["#194266", "#355C7D", "#63617F", "#916681", "#C06C84", "#D28389", "#E59A8F", "#F8B195"];
|
|
38
38
|
var Ocean = ["#37535E", "#3A748A", "#4B9A95", "#5EAB8B", "#73BC84", "#92CC8B", "#BEDDA5", "#E5EEc1"];
|
|
39
39
|
var Wine = ["#2C1E3D", "#50315E", "#764476", "#9A5B88", "#B77495", "#CF91A3", "#E0B1B3", "#EDD1CA"];
|
|
40
|
-
var Spectral = ["#9e0142", "#d53e4f", "#f46d43", "#fdae61", "#fee08b", "#ffffbf", "#e6f598", "#abdda4", "#66c2a5", "#3288bd", "#
|
|
41
|
-
var PurpleBlueYellow = ["#2B1E3E", "#383C65", "#3E5F7E", "#49838A", "#5EA28D", "#82BB92", "#AECEA1"
|
|
42
|
-
var YellowGreen = ["#
|
|
43
|
-
var YellowGreenBlue = ["#
|
|
44
|
-
var GreenBlue = ["#
|
|
45
|
-
var BlueGreen = ["#
|
|
46
|
-
var PurpleBlueGreen = ["#
|
|
47
|
-
var PurpleBlue = ["#
|
|
48
|
-
var BluePurple = ["#
|
|
49
|
-
var RedPurple = ["#
|
|
50
|
-
var PurpleRed = ["#
|
|
51
|
-
var OrangeRed = ["#
|
|
52
|
-
var YellowOrangeRed = ["#
|
|
53
|
-
var YellowOrangeBrown = ["#
|
|
54
|
-
var Purple = ["#
|
|
55
|
-
var Blue = ["#
|
|
56
|
-
var Green = ["#
|
|
57
|
-
var Orange = ["#
|
|
58
|
-
var Red = ["#
|
|
59
|
-
var Grey = ["#
|
|
60
|
-
var OrangePurple = ["#7f3b08", "#b35806", "#e08214", "#fdb863", "#fee0b6", "#
|
|
61
|
-
var BrownGreen = ["#543005", "#8c510a", "#bf812d", "#dfc27d", "#f6e8c3", "#
|
|
62
|
-
var PurpleGreen = ["#40004b", "#762a83", "#9970ab", "#c2a5cf", "#
|
|
63
|
-
var PinkGreen = ["#8e0152", "#c51b7d", "#de77ae", "#f1b6da", "#
|
|
64
|
-
var RedBlue = ["#67001f", "#b2182b", "#d6604d", "#f4a582", "#fddbc7", "#
|
|
65
|
-
var RedGray = ["#67001f", "#b2182b", "#d6604d", "#f4a582", "#fddbc7", "#
|
|
66
|
-
var RedYellowBlue = ["#a50026", "#d73027", "#f46d43", "#fdae61", "#fee090", "#
|
|
40
|
+
var Spectral = ["#9e0142", "#d53e4f", "#f46d43", "#fdae61", "#fee08b", "#ffffbf", "#e6f598", "#abdda4", "#66c2a5", "#3288bd", "#134F74"];
|
|
41
|
+
var PurpleBlueYellow = ["#2B1E3E", "#383C65", "#3E5F7E", "#49838A", "#5EA28D", "#82BB92", "#AECEA1"];
|
|
42
|
+
var YellowGreen = ["#d9f0a3", "#addd8e", "#78c679", "#41ab5d", "#238443", "#006837", "#004529"];
|
|
43
|
+
var YellowGreenBlue = ["#c7e9b4", "#7fcdbb", "#41b6c4", "#1d91c0", "#225ea8", "#253494", "#081d58"];
|
|
44
|
+
var GreenBlue = ["#ccebc5", "#a8ddb5", "#7bccc4", "#4eb3d3", "#2b8cbe", "#0868ac", "#084081"];
|
|
45
|
+
var BlueGreen = ["#ccece6", "#99d8c9", "#66c2a4", "#41ae76", "#238b45", "#006d2c", "#00441b"];
|
|
46
|
+
var PurpleBlueGreen = ["#d0d1e6", "#a6bddb", "#67a9cf", "#3690c0", "#02818a", "#016c59", "#014636"];
|
|
47
|
+
var PurpleBlue = ["#d0d1e6", "#a6bddb", "#74a9cf", "#3690c0", "#0570b0", "#045a8d", "#023858"];
|
|
48
|
+
var BluePurple = ["#bfd3e6", "#9ebcda", "#8c96c6", "#8c6bb1", "#88419d", "#810f7c", "#4d004b"];
|
|
49
|
+
var RedPurple = ["#fcc5c0", "#fa9fb5", "#f768a1", "#dd3497", "#ae017e", "#7a0177", "#49006a"];
|
|
50
|
+
var PurpleRed = ["#d4b9da", "#c994c7", "#df65b0", "#e7298a", "#ce1256", "#980043", "#67001f"];
|
|
51
|
+
var OrangeRed = ["#fdd49e", "#fdbb84", "#fc8d59", "#ef6548", "#d7301f", "#b30000", "#7f0000"];
|
|
52
|
+
var YellowOrangeRed = ["#fed976", "#feb24c", "#fd8d3c", "#fc4e2a", "#e31a1c", "#bd0026", "#800026"];
|
|
53
|
+
var YellowOrangeBrown = ["#fee391", "#fec44f", "#fe9929", "#ec7014", "#cc4c02", "#993404", "#662506"];
|
|
54
|
+
var Purple = ["#dadaeb", "#bcbddc", "#9e9ac8", "#807dba", "#6a51a3", "#54278f", "#3f007d"];
|
|
55
|
+
var Blue = ["#c6dbef", "#9ecae1", "#6baed6", "#4292c6", "#2171b5", "#08519c", "#08306b"];
|
|
56
|
+
var Green = ["#c7e9c0", "#a1d99b", "#74c476", "#41ab5d", "#238b45", "#006d2c", "#00441b"];
|
|
57
|
+
var Orange = ["#fdd0a2", "#fdae6b", "#fd8d3c", "#f16913", "#d94801", "#a63603", "#7f2704"];
|
|
58
|
+
var Red = ["#fcbba1", "#fc9272", "#fb6a4a", "#ef3b2c", "#cb181d", "#a50f15", "#67000d"];
|
|
59
|
+
var Grey = ["#d9d9d9", "#bdbdbd", "#969696", "#737373", "#525252", "#252525", "#000000"];
|
|
60
|
+
var OrangePurple = ["#7f3b08", "#b35806", "#e08214", "#fdb863", "#fee0b6", "#b2abd2", "#8073ac", "#542788", "#2d004b"];
|
|
61
|
+
var BrownGreen = ["#543005", "#8c510a", "#bf812d", "#dfc27d", "#f6e8c3", "#80cdc1", "#35978f", "#01665e", "#003c30"];
|
|
62
|
+
var PurpleGreen = ["#40004b", "#762a83", "#9970ab", "#c2a5cf", "#d9f0d3", "#a6dba0", "#5aae61", "#1b7837", "#00441b"];
|
|
63
|
+
var PinkGreen = ["#8e0152", "#c51b7d", "#de77ae", "#f1b6da", "#e6f5d0", "#b8e186", "#7fbc41", "#4d9221", "#276419"];
|
|
64
|
+
var RedBlue = ["#67001f", "#b2182b", "#d6604d", "#f4a582", "#fddbc7", "#92c5de", "#4393c3", "#2166ac", "#053061"];
|
|
65
|
+
var RedGray = ["#67001f", "#b2182b", "#d6604d", "#f4a582", "#fddbc7", "#bababa", "#878787", "#4d4d4d", "#1a1a1a"];
|
|
66
|
+
var RedYellowBlue = ["#a50026", "#d73027", "#f46d43", "#fdae61", "#fee090", "#abd9e9", "#74add1", "#4575b4", "#313695"];
|
|
67
67
|
var RedYellowGreen = ["#a50026", "#d73027", "#f46d43", "#fdae61", "#fee08b", "#ffffbf", "#d9ef8b", "#a6d96a", "#66bd63", "#1a9850", "#006837"];
|
|
68
68
|
var ChartPalette = {
|
|
69
69
|
Default: Default,
|
package/dist/esm/types/charts.js
CHANGED
|
@@ -28,8 +28,8 @@ import { registerThemes, registerTheme as registerTheme$1 } from '../theme/index
|
|
|
28
28
|
*/
|
|
29
29
|
|
|
30
30
|
registerThemes(echarts);
|
|
31
|
-
var registerTheme = function registerTheme(key, colors) {
|
|
32
|
-
registerTheme$1(echarts, key, colors);
|
|
31
|
+
var registerTheme = function registerTheme(key, colors, heatmap) {
|
|
32
|
+
registerTheme$1(echarts, key, colors, heatmap);
|
|
33
33
|
};
|
|
34
34
|
|
|
35
35
|
export { registerTheme };
|
|
@@ -29,7 +29,7 @@ import { jsx } from 'react/jsx-runtime';
|
|
|
29
29
|
var ChartToolbar = function ChartToolbar(_ref) {
|
|
30
30
|
var children = _ref.children;
|
|
31
31
|
return /*#__PURE__*/jsx("div", {
|
|
32
|
-
className: classNames("flex flex-nowrap items-center justify-end bg-base area-head", "rf-chartToolbar"),
|
|
32
|
+
className: classNames("flex flex-nowrap items-center justify-end bg-base area-head", "rf-chartToolbar empty:hidden"),
|
|
33
33
|
children: children
|
|
34
34
|
});
|
|
35
35
|
};
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const registerTheme: (echarts: AnyObject, key: string, colors: string[]) => void;
|
|
1
|
+
export declare const registerTheme: (echarts: AnyObject, key: string, colors: string[], heatmap: string[]) => void;
|
|
2
2
|
export declare const registerThemes: (echarts: AnyObject) => void;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
export type Theme = "default" | "activity" | "cloud" | "qualitative" | "diverging" | "sequential" | "spectral" | "uber" | "fireice" | "warming" | "sunrise" | "ocean" | "wine";
|
|
1
|
+
export type Theme = "default" | "activity" | "cloud" | "qualitative" | "diverging" | "sequential" | "spectral" | "uber" | "fireice" | "warming" | "sunrise" | "ocean" | "wine" | "red" | "green" | "blue";
|
|
2
2
|
export interface BaseChart {
|
|
3
3
|
title?: string;
|
|
4
4
|
theme?: Theme;
|
|
5
|
+
showThemeSelector?: boolean;
|
|
6
|
+
showTypeSelector?: boolean;
|
|
5
7
|
onExport?: (chart: {
|
|
6
8
|
title: string;
|
|
7
9
|
image: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-fabric/chart",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.53",
|
|
4
4
|
"description": "RUF: Charting package",
|
|
5
5
|
"author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"watch": "npm-run-all -p watch:rollup watch:dts"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@react-fabric/core": "^1.0.0-beta.
|
|
38
|
+
"@react-fabric/core": "^1.0.0-beta.53",
|
|
39
39
|
"@react-fabric/utilities": "^1.0.0-beta.52",
|
|
40
40
|
"classnames": "^2.5.1",
|
|
41
41
|
"color": "^4.2.3",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"node": ">=18.12.0",
|
|
57
57
|
"npm": ">=8.19.0"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "1042327831f9c908912c552d5c2704b765a6f9c2"
|
|
60
60
|
}
|
|
@@ -37,6 +37,7 @@ import { activityRenderer } from "../types/utils";
|
|
|
37
37
|
import { ChartContainer } from "../wrapper/ChartContainer";
|
|
38
38
|
import { ChartWrapper } from "../wrapper/ChartWrapper";
|
|
39
39
|
import { PaletteSelect } from "../wrapper/PaletteSelect";
|
|
40
|
+
import { E } from "react-router/dist/development/register-DCE0tH5m";
|
|
40
41
|
|
|
41
42
|
export interface ActivityMapProps extends BaseChart {
|
|
42
43
|
heatmapPalette?: string[];
|
|
@@ -142,6 +143,8 @@ const ActivityMapChart = memo(
|
|
|
142
143
|
heatmapPalette,
|
|
143
144
|
highLabels,
|
|
144
145
|
lowLabels,
|
|
146
|
+
showThemeSelector,
|
|
147
|
+
showTypeSelector,
|
|
145
148
|
time = "day-hour",
|
|
146
149
|
type: chartType = "scatter",
|
|
147
150
|
onClick,
|
|
@@ -161,7 +164,7 @@ const ActivityMapChart = memo(
|
|
|
161
164
|
() => {
|
|
162
165
|
const defaultMap = time === "day-hour" ? DAY_HOUR : MONTH_DAY;
|
|
163
166
|
|
|
164
|
-
const options:
|
|
167
|
+
const options: EChartOption = {
|
|
165
168
|
series: [],
|
|
166
169
|
};
|
|
167
170
|
|
|
@@ -191,7 +194,7 @@ const ActivityMapChart = memo(
|
|
|
191
194
|
options.series = data.map((points, index) => {
|
|
192
195
|
const total = points.reduce((t, p) => t + p[2], 0);
|
|
193
196
|
return {
|
|
194
|
-
id: index
|
|
197
|
+
id: `${index}`,
|
|
195
198
|
name: defaultMap.high[index],
|
|
196
199
|
type,
|
|
197
200
|
symbolSize: function (dataItem: number[]) {
|
|
@@ -201,7 +204,7 @@ const ActivityMapChart = memo(
|
|
|
201
204
|
},
|
|
202
205
|
data: points,
|
|
203
206
|
universalTransition: true,
|
|
204
|
-
};
|
|
207
|
+
} as EChartOption.SeriesScatter;
|
|
205
208
|
});
|
|
206
209
|
|
|
207
210
|
if (type === "heatmap") {
|
|
@@ -210,19 +213,28 @@ const ActivityMapChart = memo(
|
|
|
210
213
|
);
|
|
211
214
|
options.grid = {
|
|
212
215
|
top: 32,
|
|
213
|
-
bottom:
|
|
216
|
+
bottom: 64,
|
|
214
217
|
};
|
|
215
|
-
options.
|
|
216
|
-
|
|
217
|
-
min: 1,
|
|
218
|
-
show: type === "heatmap",
|
|
219
|
-
color: heatmapPalette ?? [...ChartPalette.Heatmap],
|
|
220
|
-
max: Math.max(...dataPoints),
|
|
221
|
-
calculable: true,
|
|
222
|
-
orient: "horizontal",
|
|
223
|
-
left: "center",
|
|
224
|
-
bottom: 48,
|
|
218
|
+
options.legend = {
|
|
219
|
+
show: false,
|
|
225
220
|
};
|
|
221
|
+
options.visualMap = [
|
|
222
|
+
{
|
|
223
|
+
type: "piecewise",
|
|
224
|
+
min: 1,
|
|
225
|
+
show: type === "heatmap",
|
|
226
|
+
max: Math.max(...dataPoints),
|
|
227
|
+
// calculable: true,inRange:
|
|
228
|
+
orient: "horizontal",
|
|
229
|
+
left: "center",
|
|
230
|
+
bottom: 4,
|
|
231
|
+
},
|
|
232
|
+
];
|
|
233
|
+
if (heatmapPalette) {
|
|
234
|
+
options.visualMap[0].inRange = {
|
|
235
|
+
color: heatmapPalette,
|
|
236
|
+
};
|
|
237
|
+
}
|
|
226
238
|
}
|
|
227
239
|
|
|
228
240
|
return {
|
|
@@ -234,6 +246,7 @@ const ActivityMapChart = memo(
|
|
|
234
246
|
trigger: "item",
|
|
235
247
|
confine: true,
|
|
236
248
|
position: "top",
|
|
249
|
+
appendToBody: true,
|
|
237
250
|
valueFormatter: (c: AnyObject) => {
|
|
238
251
|
return isArray(c) ? c[2] : c;
|
|
239
252
|
},
|
|
@@ -241,7 +254,7 @@ const ActivityMapChart = memo(
|
|
|
241
254
|
...options,
|
|
242
255
|
};
|
|
243
256
|
},
|
|
244
|
-
[data, title, type],
|
|
257
|
+
[data, title, type, heatmapPalette],
|
|
245
258
|
"ActivityChart options",
|
|
246
259
|
);
|
|
247
260
|
|
|
@@ -257,28 +270,32 @@ const ActivityMapChart = memo(
|
|
|
257
270
|
dataTableRenderer={activityRenderer}
|
|
258
271
|
onClick={(e) => onClick?.(e.seriesIndex, e.dataIndex)}
|
|
259
272
|
>
|
|
260
|
-
|
|
261
|
-
<
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
273
|
+
{showTypeSelector && (
|
|
274
|
+
<ToggleButtonGroup value={type} onChange={setType as AnyObject}>
|
|
275
|
+
<Button
|
|
276
|
+
size="sm"
|
|
277
|
+
variant="link"
|
|
278
|
+
value="scatter"
|
|
279
|
+
aria-label="scatter"
|
|
280
|
+
icon={CoreIcons.chartActivityScatter}
|
|
281
|
+
/>
|
|
282
|
+
<Button
|
|
283
|
+
size="sm"
|
|
284
|
+
variant="link"
|
|
285
|
+
value="heatmap"
|
|
286
|
+
aria-label="heatmap"
|
|
287
|
+
icon={CoreIcons.chartActivityCalendar}
|
|
288
|
+
/>
|
|
289
|
+
</ToggleButtonGroup>
|
|
290
|
+
)}
|
|
291
|
+
{showTypeSelector && showThemeSelector && <Divider vertical />}
|
|
292
|
+
{showThemeSelector && (
|
|
293
|
+
<PaletteSelect
|
|
294
|
+
theme={theme}
|
|
295
|
+
onClick={setTheme}
|
|
296
|
+
defaultTheme="activity"
|
|
274
297
|
/>
|
|
275
|
-
|
|
276
|
-
<Divider vertical />
|
|
277
|
-
<PaletteSelect
|
|
278
|
-
theme={theme}
|
|
279
|
-
onClick={setTheme}
|
|
280
|
-
defaultTheme="activity"
|
|
281
|
-
/>
|
|
298
|
+
)}
|
|
282
299
|
</ChartContainer>
|
|
283
300
|
);
|
|
284
301
|
},
|