@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
package/src/charts/MapSeries.tsx
CHANGED
|
@@ -45,27 +45,35 @@ import {
|
|
|
45
45
|
import WorldMap from "../types/world.svg";
|
|
46
46
|
echarts.registerMap("world", { svg: WorldMap });
|
|
47
47
|
|
|
48
|
-
export interface MapSeriesProps extends BaseChart
|
|
48
|
+
export interface MapSeriesProps extends BaseChart {
|
|
49
|
+
series: Array<{ id: string; label?: string; count: number }>;
|
|
49
50
|
onClick?: (key: string) => void;
|
|
50
51
|
}
|
|
51
52
|
|
|
52
53
|
const MapSeriesChart: FC<MapSeriesProps> = memo(
|
|
53
|
-
({
|
|
54
|
+
({
|
|
55
|
+
series,
|
|
56
|
+
onExport,
|
|
57
|
+
theme: chartTheme,
|
|
58
|
+
showTypeSelector,
|
|
59
|
+
title,
|
|
60
|
+
onClick,
|
|
61
|
+
}: MapSeriesProps) => {
|
|
54
62
|
const chartRef = useRef<EChartsType>(null);
|
|
55
63
|
const [type, setType] = useState("map");
|
|
56
64
|
const [zoom, setZoom] = useState(1.25);
|
|
57
65
|
|
|
58
66
|
const options = useMemoDebugger<EChartOption>(
|
|
59
67
|
() => {
|
|
60
|
-
if (isEmpty(
|
|
68
|
+
if (isEmpty(series)) return {};
|
|
61
69
|
|
|
62
|
-
const sorted =
|
|
70
|
+
const sorted = series
|
|
63
71
|
.map((d) => ({
|
|
64
72
|
...d,
|
|
65
73
|
label: d.label ?? Countries.name(d.id),
|
|
66
74
|
}))
|
|
67
75
|
.sort(compareValues("desc", "count"));
|
|
68
|
-
const valueMap =
|
|
76
|
+
const valueMap = series.map((d) => d.count);
|
|
69
77
|
|
|
70
78
|
if (type === "column") {
|
|
71
79
|
return {
|
|
@@ -148,13 +156,13 @@ const MapSeriesChart: FC<MapSeriesProps> = memo(
|
|
|
148
156
|
],
|
|
149
157
|
};
|
|
150
158
|
},
|
|
151
|
-
[
|
|
159
|
+
[series, title, type],
|
|
152
160
|
"MapChart options",
|
|
153
161
|
);
|
|
154
162
|
|
|
155
163
|
useEffect(() => {
|
|
156
164
|
setZoom(1.25);
|
|
157
|
-
}, [
|
|
165
|
+
}, [series, type]);
|
|
158
166
|
|
|
159
167
|
useEffect(() => {
|
|
160
168
|
chartRef.current?.setOption({
|
|
@@ -185,22 +193,24 @@ const MapSeriesChart: FC<MapSeriesProps> = memo(
|
|
|
185
193
|
onChange={(e) => setZoom(e.target.valueAsNumber)}
|
|
186
194
|
/>
|
|
187
195
|
)}
|
|
188
|
-
|
|
189
|
-
<
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
196
|
+
{showTypeSelector && (
|
|
197
|
+
<ToggleButtonGroup value={type} onChange={setType as AnyObject}>
|
|
198
|
+
<Button
|
|
199
|
+
size="sm"
|
|
200
|
+
variant="link"
|
|
201
|
+
icon={CoreIcons.map}
|
|
202
|
+
aria-label="map"
|
|
203
|
+
value="map"
|
|
204
|
+
/>
|
|
205
|
+
<Button
|
|
206
|
+
size="sm"
|
|
207
|
+
variant="link"
|
|
208
|
+
icon={CoreIcons.chartColumn}
|
|
209
|
+
aria-label="column"
|
|
210
|
+
value="column"
|
|
211
|
+
/>
|
|
212
|
+
</ToggleButtonGroup>
|
|
213
|
+
)}
|
|
204
214
|
</ChartContainer>
|
|
205
215
|
);
|
|
206
216
|
},
|
|
@@ -45,13 +45,16 @@ export interface TimeSeriesProps extends BaseChart, TimeSeriesType {
|
|
|
45
45
|
|
|
46
46
|
const TimeSeriesChart: FC<TimeSeriesProps> = memo(
|
|
47
47
|
({
|
|
48
|
-
|
|
48
|
+
series: _series,
|
|
49
49
|
onExport,
|
|
50
50
|
categoryAxisName,
|
|
51
51
|
valueAxisName,
|
|
52
52
|
title,
|
|
53
|
+
showThemeSelector,
|
|
54
|
+
showTypeSelector,
|
|
53
55
|
theme: chartTheme,
|
|
54
56
|
type: chartType = "column",
|
|
57
|
+
options: optionOverride,
|
|
55
58
|
onClick,
|
|
56
59
|
onBrush,
|
|
57
60
|
}: TimeSeriesProps) => {
|
|
@@ -106,7 +109,7 @@ const TimeSeriesChart: FC<TimeSeriesProps> = memo(
|
|
|
106
109
|
|
|
107
110
|
const options = useMemoDebugger<EChartOption>(
|
|
108
111
|
() => {
|
|
109
|
-
if (isEmpty(
|
|
112
|
+
if (isEmpty(_series)) {
|
|
110
113
|
chartRef.current?.clear();
|
|
111
114
|
return {};
|
|
112
115
|
}
|
|
@@ -114,65 +117,73 @@ const TimeSeriesChart: FC<TimeSeriesProps> = memo(
|
|
|
114
117
|
const stack = type.includes("stacked") ? "stack" : undefined;
|
|
115
118
|
|
|
116
119
|
const [_type, stacked] = type.split("-");
|
|
117
|
-
const categoryAxis: AnyObject =
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
120
|
+
const categoryAxis: AnyObject = Object.assign(
|
|
121
|
+
{},
|
|
122
|
+
optionOverride?.xAxis,
|
|
123
|
+
{
|
|
124
|
+
name: categoryAxisName,
|
|
125
|
+
type: "time",
|
|
126
|
+
nameGap: 32,
|
|
127
|
+
nameLocation: "center",
|
|
128
|
+
axisTick: {
|
|
129
|
+
show: false,
|
|
130
|
+
},
|
|
131
|
+
axisLabel: {
|
|
132
|
+
formatter: {
|
|
133
|
+
year: "{yyyy}",
|
|
134
|
+
month: "{MMM}",
|
|
135
|
+
day: "{d}",
|
|
136
|
+
hour: "{HH}:{mm}",
|
|
137
|
+
minute: "{HH}:{mm}",
|
|
138
|
+
second: "{HH}:{mm}:{ss}",
|
|
139
|
+
millisecond: "{hh}:{mm}:{ss} {SSS}",
|
|
140
|
+
none: "{yyyy}-{MM}-{dd} {hh}:{mm}:{ss} {SSS}",
|
|
141
|
+
} as AnyObject,
|
|
142
|
+
},
|
|
143
|
+
} as EChartOption.XAxis,
|
|
144
|
+
);
|
|
145
|
+
const valueAxis: AnyObject = Object.assign({}, optionOverride?.yAxis, {
|
|
139
146
|
name: valueAxisName,
|
|
140
147
|
type: "value",
|
|
141
148
|
nameGap: 32,
|
|
142
149
|
nameLocation: "center",
|
|
143
|
-
} as EChartOption.YAxis;
|
|
150
|
+
} as EChartOption.YAxis);
|
|
144
151
|
|
|
145
|
-
const series =
|
|
152
|
+
const series = _series?.map(
|
|
146
153
|
(item) =>
|
|
147
154
|
({
|
|
148
|
-
|
|
149
|
-
stack,
|
|
155
|
+
...item,
|
|
156
|
+
stack: item.stack ?? stack,
|
|
150
157
|
areaStyle: stacked ? {} : undefined,
|
|
151
158
|
symbol: "none",
|
|
152
159
|
type: _type === "column" ? "bar" : _type,
|
|
153
|
-
name: item.
|
|
154
|
-
data: item.values,
|
|
160
|
+
name: item.name ?? item.id,
|
|
155
161
|
universalTransition: true,
|
|
156
162
|
}) as AnyObject,
|
|
157
163
|
);
|
|
158
164
|
|
|
159
165
|
return {
|
|
160
|
-
xAxis: categoryAxis,
|
|
161
|
-
yAxis: valueAxis,
|
|
162
|
-
series,
|
|
163
166
|
brush: {
|
|
164
167
|
toolbox: ["lineX", "clear"],
|
|
165
168
|
brushType: "lineX",
|
|
166
169
|
xAxisIndex: 0,
|
|
167
170
|
},
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
171
|
+
...optionOverride,
|
|
172
|
+
tooltip: Object.assign(
|
|
173
|
+
{
|
|
174
|
+
trigger: "axis",
|
|
175
|
+
confine: true,
|
|
176
|
+
position: "top",
|
|
177
|
+
appendToBody: true,
|
|
178
|
+
} as EChartOption.Tooltip,
|
|
179
|
+
optionOverride?.tooltip,
|
|
180
|
+
),
|
|
181
|
+
xAxis: categoryAxis,
|
|
182
|
+
yAxis: valueAxis,
|
|
183
|
+
series,
|
|
173
184
|
};
|
|
174
185
|
},
|
|
175
|
-
[
|
|
186
|
+
[_series, type, categoryAxisName, valueAxisName, optionOverride],
|
|
176
187
|
"TimeChart options",
|
|
177
188
|
);
|
|
178
189
|
|
|
@@ -183,43 +194,47 @@ const TimeSeriesChart: FC<TimeSeriesProps> = memo(
|
|
|
183
194
|
theme={theme}
|
|
184
195
|
options={options}
|
|
185
196
|
chartRef={chartRef}
|
|
186
|
-
isEmpty={isEmpty(
|
|
197
|
+
isEmpty={isEmpty(_series)}
|
|
187
198
|
emptyIcon={CoreIcons.chartColumn}
|
|
188
199
|
dataTableRenderer={timeSeriesRenderer}
|
|
189
200
|
onClick={(e) => onClick?.({ category: e.data[0], series: e.seriesId })}
|
|
190
201
|
>
|
|
191
|
-
|
|
192
|
-
<
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
202
|
+
{showTypeSelector && (
|
|
203
|
+
<ToggleButtonGroup value={type} onChange={setType as AnyObject}>
|
|
204
|
+
<Button
|
|
205
|
+
size="sm"
|
|
206
|
+
variant="link"
|
|
207
|
+
icon={CoreIcons.chartLine}
|
|
208
|
+
value="line"
|
|
209
|
+
aria-label="line"
|
|
210
|
+
/>
|
|
211
|
+
<Button
|
|
212
|
+
size="sm"
|
|
213
|
+
variant="link"
|
|
214
|
+
icon={CoreIcons.chartColumn}
|
|
215
|
+
value="column"
|
|
216
|
+
aria-label="column"
|
|
217
|
+
/>
|
|
218
|
+
<Button
|
|
219
|
+
size="sm"
|
|
220
|
+
variant="link"
|
|
221
|
+
icon={CoreIcons.chartLineStacked}
|
|
222
|
+
value="line-stacked"
|
|
223
|
+
aria-label="line-stacked"
|
|
224
|
+
/>
|
|
225
|
+
<Button
|
|
226
|
+
size="sm"
|
|
227
|
+
variant="link"
|
|
228
|
+
icon={CoreIcons.chartColumnStacked}
|
|
229
|
+
value="column-stacked"
|
|
230
|
+
aria-label="column-stacked"
|
|
231
|
+
/>
|
|
232
|
+
</ToggleButtonGroup>
|
|
233
|
+
)}
|
|
234
|
+
{showTypeSelector && showThemeSelector && <Divider vertical />}
|
|
235
|
+
{showThemeSelector && (
|
|
236
|
+
<PaletteSelect theme={theme} onClick={setTheme} />
|
|
237
|
+
)}
|
|
223
238
|
</ChartContainer>
|
|
224
239
|
);
|
|
225
240
|
},
|
|
@@ -35,13 +35,13 @@ import { ChartContainer } from "../wrapper/ChartContainer";
|
|
|
35
35
|
import { ChartWrapper } from "../wrapper/ChartWrapper";
|
|
36
36
|
|
|
37
37
|
export interface TimeSliderProps extends BaseChart {
|
|
38
|
-
|
|
38
|
+
series: Array<[Date, number]>;
|
|
39
39
|
range?: { start: Date; end: Date };
|
|
40
40
|
onBrush?: (range: { start: Date; end: Date }) => void;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
44
|
-
({
|
|
44
|
+
({ series: dataSeries, range: sliderRange, onBrush }: TimeSliderProps) => {
|
|
45
45
|
const chartRef = useRef<EChartsType>(null);
|
|
46
46
|
|
|
47
47
|
const [range, setRange] = useState({ startValue: 0, endValue: 0 });
|
|
@@ -53,9 +53,12 @@ const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
|
53
53
|
);
|
|
54
54
|
|
|
55
55
|
useEffect(() => {
|
|
56
|
-
const defaultStart =
|
|
56
|
+
const defaultStart =
|
|
57
|
+
dataSeries.length > 0 ? dataSeries?.[0]?.[0]?.getTime() : 0;
|
|
57
58
|
const defaultEnd =
|
|
58
|
-
|
|
59
|
+
dataSeries.length > 0
|
|
60
|
+
? dataSeries?.[dataSeries.length - 1]?.[0]?.getTime()
|
|
61
|
+
: 32;
|
|
59
62
|
|
|
60
63
|
const getRangeValue = (v: number = 0, def = 0) =>
|
|
61
64
|
v >= defaultStart && v <= defaultEnd ? v : def;
|
|
@@ -63,7 +66,7 @@ const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
|
63
66
|
startValue: getRangeValue(sliderRange?.start.getTime(), defaultStart),
|
|
64
67
|
endValue: getRangeValue(sliderRange?.end.getTime(), defaultEnd),
|
|
65
68
|
});
|
|
66
|
-
}, [sliderRange,
|
|
69
|
+
}, [sliderRange, dataSeries]);
|
|
67
70
|
|
|
68
71
|
const enableBrush = useCallback(() => {
|
|
69
72
|
chartRef.current?.dispatchAction({
|
|
@@ -107,7 +110,7 @@ const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
|
107
110
|
|
|
108
111
|
const options = useMemoDebugger<EChartOption>(
|
|
109
112
|
() => {
|
|
110
|
-
if (isEmpty(
|
|
113
|
+
if (isEmpty(dataSeries)) {
|
|
111
114
|
chartRef.current?.clear();
|
|
112
115
|
return {};
|
|
113
116
|
}
|
|
@@ -152,7 +155,7 @@ const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
|
152
155
|
type: "line",
|
|
153
156
|
smooth: true,
|
|
154
157
|
lineStyle: { width: 2 },
|
|
155
|
-
data,
|
|
158
|
+
data: dataSeries,
|
|
156
159
|
} as AnyObject,
|
|
157
160
|
];
|
|
158
161
|
|
|
@@ -194,7 +197,7 @@ const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
|
194
197
|
} as AnyObject,
|
|
195
198
|
};
|
|
196
199
|
},
|
|
197
|
-
[
|
|
200
|
+
[dataSeries],
|
|
198
201
|
"TimeSlider options",
|
|
199
202
|
);
|
|
200
203
|
|
|
@@ -219,7 +222,7 @@ const TimeSliderChart: FC<TimeSliderProps> = memo(
|
|
|
219
222
|
<ChartContainer
|
|
220
223
|
options={options}
|
|
221
224
|
chartRef={chartRef}
|
|
222
|
-
isEmpty={isEmpty(
|
|
225
|
+
isEmpty={isEmpty(dataSeries)}
|
|
223
226
|
/>
|
|
224
227
|
);
|
|
225
228
|
},
|
|
@@ -26,22 +26,23 @@ import { compareValues, isEmpty } from "@react-fabric/utilities";
|
|
|
26
26
|
import { type EChartOption } from "echarts";
|
|
27
27
|
import { memo, type FC } from "react";
|
|
28
28
|
import { ChartPalette } from "../theme/palettes";
|
|
29
|
-
import { type BaseChart
|
|
29
|
+
import { type BaseChart } from "../types";
|
|
30
30
|
import { countRenderer } from "../types/utils";
|
|
31
31
|
import { ChartContainer } from "../wrapper/ChartContainer";
|
|
32
32
|
import { ChartWrapper } from "../wrapper/ChartWrapper";
|
|
33
33
|
|
|
34
|
-
export interface WordBubbleProps extends Omit<BaseChart, "theme"
|
|
34
|
+
export interface WordBubbleProps extends Omit<BaseChart, "theme"> {
|
|
35
|
+
series: Array<{ id: string; label?: string; count: number }>;
|
|
35
36
|
onClick?: (key: string) => void;
|
|
36
37
|
}
|
|
37
38
|
|
|
38
39
|
const WordBubbleChart: FC<WordBubbleProps> = memo(
|
|
39
|
-
({
|
|
40
|
+
({ series, title, onExport, onClick }: WordBubbleProps) => {
|
|
40
41
|
const isDark = useIsDark();
|
|
41
42
|
|
|
42
43
|
const options = useMemoDebugger<EChartOption>(
|
|
43
44
|
() => {
|
|
44
|
-
if (isEmpty(
|
|
45
|
+
if (isEmpty(series)) return {};
|
|
45
46
|
|
|
46
47
|
const palette = isDark
|
|
47
48
|
? ChartPalette.CloudDark
|
|
@@ -49,6 +50,12 @@ const WordBubbleChart: FC<WordBubbleProps> = memo(
|
|
|
49
50
|
|
|
50
51
|
return {
|
|
51
52
|
legend: undefined,
|
|
53
|
+
tooltip: {
|
|
54
|
+
trigger: "axis",
|
|
55
|
+
confine: true,
|
|
56
|
+
position: "top",
|
|
57
|
+
appendToBody: true,
|
|
58
|
+
} as EChartOption.Tooltip,
|
|
52
59
|
series: [
|
|
53
60
|
{
|
|
54
61
|
name: title,
|
|
@@ -66,7 +73,7 @@ const WordBubbleChart: FC<WordBubbleProps> = memo(
|
|
|
66
73
|
color: ({ dataIndex }: KeyValue) =>
|
|
67
74
|
palette[dataIndex % palette.length],
|
|
68
75
|
},
|
|
69
|
-
data:
|
|
76
|
+
data: series
|
|
70
77
|
.sort(compareValues("desc", "count"))
|
|
71
78
|
.map(({ id: key, label, count }, index) => ({
|
|
72
79
|
name: label ?? key,
|
|
@@ -76,7 +83,7 @@ const WordBubbleChart: FC<WordBubbleProps> = memo(
|
|
|
76
83
|
],
|
|
77
84
|
};
|
|
78
85
|
},
|
|
79
|
-
[
|
|
86
|
+
[series, title, isDark],
|
|
80
87
|
"WordChart options",
|
|
81
88
|
);
|
|
82
89
|
|
|
@@ -85,7 +92,7 @@ const WordBubbleChart: FC<WordBubbleProps> = memo(
|
|
|
85
92
|
title={title}
|
|
86
93
|
onExport={onExport}
|
|
87
94
|
options={options}
|
|
88
|
-
isEmpty={isEmpty(
|
|
95
|
+
isEmpty={isEmpty(series)}
|
|
89
96
|
emptyIcon={CoreIcons.chartActivityScatter}
|
|
90
97
|
dataTableRenderer={countRenderer}
|
|
91
98
|
onClick={(e) => onClick?.(e?.name ?? "")}
|
package/src/theme/darkBase.ts
CHANGED
|
@@ -195,7 +195,7 @@ export const DarkThemeBase = {
|
|
|
195
195
|
splitLine: {
|
|
196
196
|
show: true,
|
|
197
197
|
lineStyle: {
|
|
198
|
-
color: ["#
|
|
198
|
+
color: ["#363636"],
|
|
199
199
|
},
|
|
200
200
|
},
|
|
201
201
|
splitArea: {
|
|
@@ -229,7 +229,7 @@ export const DarkThemeBase = {
|
|
|
229
229
|
splitLine: {
|
|
230
230
|
show: true,
|
|
231
231
|
lineStyle: {
|
|
232
|
-
color: ["#
|
|
232
|
+
color: ["#363636"],
|
|
233
233
|
},
|
|
234
234
|
},
|
|
235
235
|
splitArea: {
|
|
@@ -263,7 +263,7 @@ export const DarkThemeBase = {
|
|
|
263
263
|
splitLine: {
|
|
264
264
|
show: true,
|
|
265
265
|
lineStyle: {
|
|
266
|
-
color: ["#
|
|
266
|
+
color: ["#363636"],
|
|
267
267
|
},
|
|
268
268
|
},
|
|
269
269
|
splitArea: {
|
|
@@ -297,7 +297,7 @@ export const DarkThemeBase = {
|
|
|
297
297
|
splitLine: {
|
|
298
298
|
show: true,
|
|
299
299
|
lineStyle: {
|
|
300
|
-
color: ["#
|
|
300
|
+
color: ["#363636"],
|
|
301
301
|
},
|
|
302
302
|
},
|
|
303
303
|
splitArea: {
|
|
@@ -307,11 +307,6 @@ export const DarkThemeBase = {
|
|
|
307
307
|
},
|
|
308
308
|
},
|
|
309
309
|
},
|
|
310
|
-
visualMap: {
|
|
311
|
-
textStyle: {
|
|
312
|
-
color: "#eee",
|
|
313
|
-
},
|
|
314
|
-
},
|
|
315
310
|
toolbox: {
|
|
316
311
|
iconStyle: {
|
|
317
312
|
borderColor: "#999999",
|
|
@@ -324,9 +319,17 @@ export const DarkThemeBase = {
|
|
|
324
319
|
},
|
|
325
320
|
legend: {
|
|
326
321
|
inactiveColor: "rgb(192 192 192 / .75)",
|
|
322
|
+
itemHeight: 8,
|
|
327
323
|
textStyle: {
|
|
324
|
+
fontSize: 10,
|
|
328
325
|
color: "#5d6d7d6",
|
|
329
326
|
},
|
|
327
|
+
pageTextStyle: {
|
|
328
|
+
fontSize: 8,
|
|
329
|
+
},
|
|
330
|
+
pageIconSize: 8,
|
|
331
|
+
pageIconColor: "#6997A3",
|
|
332
|
+
pageIconInactiveColor: "#474B4A",
|
|
330
333
|
},
|
|
331
334
|
tooltip: {
|
|
332
335
|
backgroundColor: "#0C141D",
|
package/src/theme/index.ts
CHANGED
|
@@ -21,10 +21,10 @@
|
|
|
21
21
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
|
+
import Color from "color";
|
|
24
25
|
import { DarkThemeBase } from "./darkBase";
|
|
25
26
|
import { LightThemeBase } from "./lightBase";
|
|
26
27
|
import { ChartPalette } from "./palettes";
|
|
27
|
-
import Color from "color";
|
|
28
28
|
|
|
29
29
|
const makePaletteSequence = (colors: string[]) => {
|
|
30
30
|
return [...colors, ...[...colors.slice(1, -1)].reverse()];
|
|
@@ -34,6 +34,7 @@ export const registerTheme = (
|
|
|
34
34
|
echarts: AnyObject,
|
|
35
35
|
key: string,
|
|
36
36
|
colors: string[],
|
|
37
|
+
heatmap: string[],
|
|
37
38
|
) => {
|
|
38
39
|
const base = colors[0];
|
|
39
40
|
const handles = Color(base).mix(Color("#f1f5f9"), 0.15).hex();
|
|
@@ -62,6 +63,17 @@ export const registerTheme = (
|
|
|
62
63
|
},
|
|
63
64
|
},
|
|
64
65
|
},
|
|
66
|
+
visualMap: {
|
|
67
|
+
textStyle: {
|
|
68
|
+
color: "#666",
|
|
69
|
+
},
|
|
70
|
+
inRange: {
|
|
71
|
+
color: heatmap,
|
|
72
|
+
},
|
|
73
|
+
outOfRange: {
|
|
74
|
+
color: "#d9d9d9",
|
|
75
|
+
},
|
|
76
|
+
},
|
|
65
77
|
color: makePaletteSequence(colors),
|
|
66
78
|
});
|
|
67
79
|
echarts.registerTheme(`${key}_dark`, {
|
|
@@ -86,6 +98,17 @@ export const registerTheme = (
|
|
|
86
98
|
},
|
|
87
99
|
},
|
|
88
100
|
},
|
|
101
|
+
visualMap: {
|
|
102
|
+
textStyle: {
|
|
103
|
+
color: "#eee",
|
|
104
|
+
},
|
|
105
|
+
inRange: {
|
|
106
|
+
color: heatmap,
|
|
107
|
+
},
|
|
108
|
+
outOfRange: {
|
|
109
|
+
color: "#363636",
|
|
110
|
+
},
|
|
111
|
+
},
|
|
89
112
|
color: makePaletteSequence(colors),
|
|
90
113
|
});
|
|
91
114
|
};
|
|
@@ -100,23 +123,74 @@ export const registerThemes = (echarts: AnyObject) => {
|
|
|
100
123
|
color: ChartPalette.Default,
|
|
101
124
|
});
|
|
102
125
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
registerTheme(echarts, "diverging", ChartPalette.Diverging
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
registerTheme(echarts, "
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
126
|
+
registerTheme(echarts, "activity", ChartPalette.Activity, [
|
|
127
|
+
ChartPalette.Activity[2],
|
|
128
|
+
ChartPalette.Activity[0],
|
|
129
|
+
ChartPalette.Activity[1],
|
|
130
|
+
]);
|
|
131
|
+
registerTheme(echarts, "qualitative", ChartPalette.Qualitative, [
|
|
132
|
+
ChartPalette.Qualitative[2],
|
|
133
|
+
ChartPalette.Qualitative[1],
|
|
134
|
+
ChartPalette.Qualitative[0],
|
|
135
|
+
]);
|
|
136
|
+
registerTheme(echarts, "diverging", ChartPalette.Diverging, [
|
|
137
|
+
ChartPalette.Diverging[0],
|
|
138
|
+
ChartPalette.Diverging[4],
|
|
139
|
+
ChartPalette.Diverging[10],
|
|
140
|
+
]);
|
|
141
|
+
registerTheme(echarts, "sequential", ChartPalette.Sequential, [
|
|
142
|
+
ChartPalette.Sequential[4],
|
|
143
|
+
ChartPalette.Sequential[2],
|
|
144
|
+
ChartPalette.Sequential[0],
|
|
145
|
+
]);
|
|
146
|
+
registerTheme(echarts, "spectral", ChartPalette.Spectral, [
|
|
147
|
+
ChartPalette.Spectral[9],
|
|
148
|
+
ChartPalette.Spectral[5],
|
|
149
|
+
ChartPalette.Spectral[1],
|
|
150
|
+
]);
|
|
151
|
+
registerTheme(echarts, "uber", ChartPalette.UberPool, [
|
|
152
|
+
ChartPalette.UberPool[1],
|
|
153
|
+
ChartPalette.UberPool[4],
|
|
154
|
+
ChartPalette.UberPool[8],
|
|
155
|
+
]);
|
|
156
|
+
registerTheme(echarts, "fireice", ChartPalette.FireIce, [
|
|
157
|
+
ChartPalette.FireIce[0],
|
|
158
|
+
ChartPalette.FireIce[4],
|
|
159
|
+
ChartPalette.FireIce[7],
|
|
160
|
+
]);
|
|
161
|
+
registerTheme(echarts, "warming", ChartPalette.GlobalWarming, [
|
|
162
|
+
ChartPalette.GlobalWarming[0],
|
|
163
|
+
ChartPalette.GlobalWarming[3],
|
|
164
|
+
ChartPalette.GlobalWarming[6],
|
|
165
|
+
]);
|
|
166
|
+
registerTheme(echarts, "sunrise", ChartPalette.Sunrise, [
|
|
167
|
+
ChartPalette.Sunrise[1],
|
|
168
|
+
ChartPalette.Sunrise[4],
|
|
169
|
+
ChartPalette.Sunrise[7],
|
|
170
|
+
]);
|
|
171
|
+
registerTheme(echarts, "ocean", ChartPalette.Ocean, [
|
|
172
|
+
ChartPalette.Ocean[1],
|
|
173
|
+
ChartPalette.Ocean[3],
|
|
174
|
+
ChartPalette.Ocean[5],
|
|
175
|
+
]);
|
|
176
|
+
registerTheme(echarts, "wine", ChartPalette.Wine, [
|
|
177
|
+
ChartPalette.Wine[1],
|
|
178
|
+
ChartPalette.Wine[3],
|
|
179
|
+
ChartPalette.Wine[5],
|
|
180
|
+
]);
|
|
181
|
+
registerTheme(echarts, "blue", ChartPalette.GreenBlue.slice().reverse(), [
|
|
182
|
+
ChartPalette.GreenBlue[6],
|
|
183
|
+
ChartPalette.GreenBlue[3],
|
|
184
|
+
ChartPalette.GreenBlue[0],
|
|
185
|
+
]);
|
|
186
|
+
registerTheme(echarts, "green", ChartPalette.YellowGreen.slice().reverse(), [
|
|
187
|
+
ChartPalette.YellowGreen[6],
|
|
188
|
+
ChartPalette.YellowGreen[3],
|
|
189
|
+
ChartPalette.YellowGreen[0],
|
|
190
|
+
]);
|
|
191
|
+
registerTheme(echarts, "red", ChartPalette.OrangeRed.slice().reverse(), [
|
|
192
|
+
ChartPalette.OrangeRed[6],
|
|
193
|
+
ChartPalette.OrangeRed[3],
|
|
194
|
+
ChartPalette.OrangeRed[0],
|
|
195
|
+
]);
|
|
122
196
|
};
|