@mui/x-charts 7.7.1 → 7.9.0
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/BarChart/BarChart.d.ts +3 -3
- package/BarChart/BarElement.d.ts +225 -228
- package/BarChart/BarLabel/BarLabel.d.ts +225 -228
- package/BarChart/BarLabel/getBarLabel.d.ts +1 -1
- package/BarChart/useBarChartProps.d.ts +20 -88
- package/CHANGELOG.md +166 -1
- package/ChartContainer/ChartContainer.d.ts +1 -1
- package/ChartContainer/ChartContainer.js +3 -1
- package/ChartContainer/useChartContainerHooks.d.ts +1 -1
- package/ChartsAxisHighlight/ChartsAxisHighlight.js +19 -4
- package/ChartsReferenceLine/common.d.ts +0 -1
- package/ChartsSurface.js +5 -1
- package/ChartsTooltip/ChartsAxisTooltipContent.d.ts +3 -3
- package/ChartsTooltip/ChartsAxisTooltipContent.js +4 -39
- package/ChartsTooltip/ChartsItemTooltipContent.d.ts +7 -6
- package/ChartsTooltip/ChartsItemTooltipContent.js +4 -27
- package/ChartsTooltip/ChartsTooltip.d.ts +10 -9
- package/ChartsTooltip/ChartsTooltip.js +8 -2
- package/ChartsTooltip/ChartsTooltipTable.d.ts +15 -1
- package/ChartsTooltip/ChartsTooltipTable.js +19 -0
- package/ChartsTooltip/index.d.ts +1 -0
- package/ChartsTooltip/index.js +11 -0
- package/ChartsTooltip/utils.d.ts +7 -6
- package/ChartsTooltip/utils.js +24 -30
- package/ChartsVoronoiHandler/ChartsVoronoiHandler.js +6 -6
- package/ChartsXAxis/ChartsXAxis.js +7 -5
- package/ChartsYAxis/ChartsYAxis.js +3 -1
- package/Gauge/GaugeProvider.d.ts +1 -1
- package/LineChart/AnimatedArea.d.ts +225 -228
- package/LineChart/AnimatedLine.d.ts +225 -228
- package/LineChart/LineChart.d.ts +3 -3
- package/LineChart/MarkPlot.js +6 -2
- package/LineChart/useLineChartProps.d.ts +26 -103
- package/LineChart/useLineChartProps.js +3 -3
- package/PieChart/PieArc.d.ts +0 -1
- package/PieChart/PieArcLabel.d.ts +0 -1
- package/PieChart/PieChart.d.ts +3 -3
- package/PieChart/dataTransform/transition.d.ts +0 -1
- package/ResponsiveChartContainer/ResizableContainer.d.ts +1 -2
- package/ResponsiveChartContainer/ResponsiveChartContainer.js +3 -1
- package/ScatterChart/Scatter.js +7 -5
- package/ScatterChart/ScatterChart.d.ts +3 -3
- package/ScatterChart/ScatterChart.js +3 -1
- package/ScatterChart/useScatterChartProps.d.ts +20 -75
- package/SparkLineChart/SparkLineChart.d.ts +3 -3
- package/context/CartesianProvider/computeValue.d.ts +2 -2
- package/context/CartesianProvider/computeValue.js +36 -5
- package/context/CartesianProvider/normalizeAxis.d.ts +1 -1
- package/context/ZAxisContextProvider.js +7 -2
- package/esm/BarChart/useBarChartProps.js +0 -1
- package/esm/ChartContainer/ChartContainer.js +3 -1
- package/esm/ChartsAxisHighlight/ChartsAxisHighlight.js +19 -4
- package/esm/ChartsSurface.js +5 -1
- package/esm/ChartsTooltip/ChartsAxisTooltipContent.js +3 -38
- package/esm/ChartsTooltip/ChartsItemTooltipContent.js +3 -26
- package/esm/ChartsTooltip/ChartsTooltip.js +8 -2
- package/esm/ChartsTooltip/ChartsTooltipTable.js +20 -0
- package/esm/ChartsTooltip/index.js +2 -1
- package/esm/ChartsTooltip/utils.js +23 -30
- package/esm/ChartsVoronoiHandler/ChartsVoronoiHandler.js +6 -6
- package/esm/ChartsXAxis/ChartsXAxis.js +7 -5
- package/esm/ChartsYAxis/ChartsYAxis.js +3 -1
- package/esm/LineChart/MarkPlot.js +6 -2
- package/esm/LineChart/useLineChartProps.js +3 -3
- package/esm/ResponsiveChartContainer/ResponsiveChartContainer.js +3 -1
- package/esm/ScatterChart/Scatter.js +7 -5
- package/esm/ScatterChart/ScatterChart.js +3 -1
- package/esm/context/CartesianProvider/computeValue.js +37 -6
- package/esm/context/ZAxisContextProvider.js +7 -2
- package/esm/hooks/index.js +1 -0
- package/esm/hooks/useAxis.js +17 -0
- package/esm/hooks/useAxisEvents.js +25 -17
- package/esm/hooks/useInteractionItemProps.js +11 -4
- package/esm/hooks/useScale.js +7 -14
- package/esm/hooks/useTicks.js +2 -1
- package/esm/internals/getSVGPoint.js +11 -0
- package/esm/internals/index.js +4 -0
- package/esm/internals/utils.js +0 -12
- package/hooks/index.d.ts +1 -0
- package/hooks/index.js +12 -0
- package/hooks/useAxis.d.ts +2 -0
- package/hooks/useAxis.js +24 -0
- package/hooks/useAxisEvents.js +25 -17
- package/hooks/useChartDimensions.d.ts +1 -1
- package/hooks/useColor.d.ts +1 -1
- package/hooks/useInteractionItemProps.d.ts +4 -2
- package/hooks/useInteractionItemProps.js +11 -4
- package/hooks/useScale.js +6 -14
- package/hooks/useTicks.js +2 -1
- package/index.js +1 -1
- package/internals/components/AxisSharedComponents.d.ts +0 -1
- package/internals/components/ChartsAxesGradients/ChartsAxesGradients.d.ts +1 -1
- package/internals/defaultizeColor.d.ts +68 -68
- package/internals/getSVGPoint.d.ts +6 -0
- package/internals/getSVGPoint.js +17 -0
- package/internals/getWordsByLines.d.ts +0 -1
- package/internals/index.d.ts +4 -0
- package/internals/index.js +40 -0
- package/internals/useAnimatedPath.d.ts +0 -1
- package/internals/utils.d.ts +0 -6
- package/internals/utils.js +0 -13
- package/models/axis.d.ts +1 -2
- package/models/colorMapping.d.ts +1 -1
- package/models/z-axis.d.ts +8 -0
- package/modern/BarChart/useBarChartProps.js +0 -1
- package/modern/ChartContainer/ChartContainer.js +3 -1
- package/modern/ChartsAxisHighlight/ChartsAxisHighlight.js +19 -4
- package/modern/ChartsSurface.js +5 -1
- package/modern/ChartsTooltip/ChartsAxisTooltipContent.js +3 -38
- package/modern/ChartsTooltip/ChartsItemTooltipContent.js +3 -26
- package/modern/ChartsTooltip/ChartsTooltip.js +8 -2
- package/modern/ChartsTooltip/ChartsTooltipTable.js +20 -0
- package/modern/ChartsTooltip/index.js +2 -1
- package/modern/ChartsTooltip/utils.js +23 -30
- package/modern/ChartsVoronoiHandler/ChartsVoronoiHandler.js +6 -6
- package/modern/ChartsXAxis/ChartsXAxis.js +7 -5
- package/modern/ChartsYAxis/ChartsYAxis.js +3 -1
- package/modern/LineChart/MarkPlot.js +6 -2
- package/modern/LineChart/useLineChartProps.js +3 -3
- package/modern/ResponsiveChartContainer/ResponsiveChartContainer.js +3 -1
- package/modern/ScatterChart/Scatter.js +7 -5
- package/modern/ScatterChart/ScatterChart.js +3 -1
- package/modern/context/CartesianProvider/computeValue.js +37 -6
- package/modern/context/ZAxisContextProvider.js +7 -2
- package/modern/hooks/index.js +1 -0
- package/modern/hooks/useAxis.js +17 -0
- package/modern/hooks/useAxisEvents.js +25 -17
- package/modern/hooks/useInteractionItemProps.js +11 -4
- package/modern/hooks/useScale.js +7 -14
- package/modern/hooks/useTicks.js +2 -1
- package/modern/index.js +1 -1
- package/modern/internals/getSVGPoint.js +11 -0
- package/modern/internals/index.js +4 -0
- package/modern/internals/utils.js +0 -12
- package/package.json +3 -3
- package/themeAugmentation/props.d.ts +2 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
1
2
|
import * as React from 'react';
|
|
2
3
|
import { useSvgRef } from '../hooks';
|
|
3
4
|
export function generateVirtualElement(mousePosition) {
|
|
@@ -20,26 +21,19 @@ export function generateVirtualElement(mousePosition) {
|
|
|
20
21
|
x,
|
|
21
22
|
y
|
|
22
23
|
} = mousePosition;
|
|
24
|
+
const boundingBox = {
|
|
25
|
+
width: 0,
|
|
26
|
+
height: 0,
|
|
27
|
+
x,
|
|
28
|
+
y,
|
|
29
|
+
top: y,
|
|
30
|
+
right: x,
|
|
31
|
+
bottom: y,
|
|
32
|
+
left: x
|
|
33
|
+
};
|
|
23
34
|
return {
|
|
24
|
-
getBoundingClientRect: () => ({
|
|
25
|
-
|
|
26
|
-
height: 0,
|
|
27
|
-
x,
|
|
28
|
-
y,
|
|
29
|
-
top: y,
|
|
30
|
-
right: x,
|
|
31
|
-
bottom: y,
|
|
32
|
-
left: x,
|
|
33
|
-
toJSON: () => JSON.stringify({
|
|
34
|
-
width: 0,
|
|
35
|
-
height: 0,
|
|
36
|
-
x,
|
|
37
|
-
y,
|
|
38
|
-
top: y,
|
|
39
|
-
right: x,
|
|
40
|
-
bottom: y,
|
|
41
|
-
left: x
|
|
42
|
-
})
|
|
35
|
+
getBoundingClientRect: () => _extends({}, boundingBox, {
|
|
36
|
+
toJSON: () => JSON.stringify(boundingBox)
|
|
43
37
|
})
|
|
44
38
|
};
|
|
45
39
|
}
|
|
@@ -57,21 +51,20 @@ export function useMouseTracker() {
|
|
|
57
51
|
setMousePosition(null);
|
|
58
52
|
};
|
|
59
53
|
const handleMove = event => {
|
|
60
|
-
const target = 'targetTouches' in event ? event.targetTouches[0] : event;
|
|
61
54
|
setMousePosition({
|
|
62
|
-
x:
|
|
63
|
-
y:
|
|
55
|
+
x: event.clientX,
|
|
56
|
+
y: event.clientY,
|
|
57
|
+
height: event.height,
|
|
58
|
+
pointerType: event.pointerType
|
|
64
59
|
});
|
|
65
60
|
};
|
|
66
|
-
element.addEventListener('
|
|
67
|
-
element.addEventListener('
|
|
68
|
-
element.addEventListener('
|
|
69
|
-
element.addEventListener('touchmove', handleMove);
|
|
61
|
+
element.addEventListener('pointerdown', handleMove);
|
|
62
|
+
element.addEventListener('pointermove', handleMove);
|
|
63
|
+
element.addEventListener('pointerup', handleOut);
|
|
70
64
|
return () => {
|
|
71
|
-
element.removeEventListener('
|
|
72
|
-
element.removeEventListener('
|
|
73
|
-
element.
|
|
74
|
-
element.addEventListener('touchmove', handleMove);
|
|
65
|
+
element.removeEventListener('pointerdown', handleMove);
|
|
66
|
+
element.removeEventListener('pointermove', handleMove);
|
|
67
|
+
element.removeEventListener('pointerup', handleOut);
|
|
75
68
|
};
|
|
76
69
|
}, [svgRef]);
|
|
77
70
|
return mousePosition;
|
|
@@ -5,7 +5,7 @@ import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
|
|
|
5
5
|
import { InteractionContext } from '../context/InteractionProvider';
|
|
6
6
|
import { useCartesianContext } from '../context/CartesianProvider';
|
|
7
7
|
import { getValueToPositionMapper } from '../hooks/useScale';
|
|
8
|
-
import { getSVGPoint } from '../internals/
|
|
8
|
+
import { getSVGPoint } from '../internals/getSVGPoint';
|
|
9
9
|
import { useDrawingArea, useSvgRef } from '../hooks';
|
|
10
10
|
import { useHighlighted } from '../context';
|
|
11
11
|
import { useScatterSeries } from '../hooks/useSeries';
|
|
@@ -96,7 +96,7 @@ function ChartsVoronoiHandler(props) {
|
|
|
96
96
|
// TODO: A perf optimisation of voronoi could be to use the last point as the initial point for the next search.
|
|
97
97
|
function getClosestPoint(event) {
|
|
98
98
|
// Get mouse coordinate in global SVG space
|
|
99
|
-
const svgPoint = getSVGPoint(
|
|
99
|
+
const svgPoint = getSVGPoint(element, event);
|
|
100
100
|
const outsideX = svgPoint.x < left || svgPoint.x > left + width;
|
|
101
101
|
const outsideY = svgPoint.y < top || svgPoint.y > top + height;
|
|
102
102
|
if (outsideX || outsideY) {
|
|
@@ -191,12 +191,12 @@ function ChartsVoronoiHandler(props) {
|
|
|
191
191
|
dataIndex
|
|
192
192
|
});
|
|
193
193
|
};
|
|
194
|
-
element.addEventListener('
|
|
195
|
-
element.addEventListener('
|
|
194
|
+
element.addEventListener('pointerout', handleMouseOut);
|
|
195
|
+
element.addEventListener('pointermove', handleMouseMove);
|
|
196
196
|
element.addEventListener('click', handleMouseClick);
|
|
197
197
|
return () => {
|
|
198
|
-
element.removeEventListener('
|
|
199
|
-
element.removeEventListener('
|
|
198
|
+
element.removeEventListener('pointerout', handleMouseOut);
|
|
199
|
+
element.removeEventListener('pointermove', handleMouseMove);
|
|
200
200
|
element.removeEventListener('click', handleMouseClick);
|
|
201
201
|
};
|
|
202
202
|
}, [svgRef, dispatch, left, width, top, height, yAxis, xAxis, voronoiMaxRadius, onItemClick, setHighlighted, clearHighlighted]);
|
|
@@ -209,10 +209,10 @@ function ChartsXAxis(inProps) {
|
|
|
209
209
|
transform: `translate(0, ${position === 'bottom' ? top + height : top})`,
|
|
210
210
|
className: classes.root,
|
|
211
211
|
children: [!disableLine && /*#__PURE__*/_jsx(Line, _extends({
|
|
212
|
-
x1:
|
|
213
|
-
x2:
|
|
212
|
+
x1: left,
|
|
213
|
+
x2: left + width,
|
|
214
214
|
className: classes.line
|
|
215
|
-
}, slotProps?.axisLine)), xTicksWithDimension.map(({
|
|
215
|
+
}, slotProps?.axisLine)), xTicksWithDimension.filter(tick => tick.offset >= left - 1 && tick.offset <= left + width + 1).map(({
|
|
216
216
|
formattedValue,
|
|
217
217
|
offset,
|
|
218
218
|
labelOffset,
|
|
@@ -220,13 +220,15 @@ function ChartsXAxis(inProps) {
|
|
|
220
220
|
}, index) => {
|
|
221
221
|
const xTickLabel = labelOffset ?? 0;
|
|
222
222
|
const yTickLabel = positionSign * (tickSize + 3);
|
|
223
|
+
const showTick = offset >= left - 1 && offset <= left + width + 1;
|
|
224
|
+
const showTickLabel = offset + xTickLabel >= left - 1 && offset + xTickLabel <= left + width + 1;
|
|
223
225
|
return /*#__PURE__*/_jsxs("g", {
|
|
224
226
|
transform: `translate(${offset}, 0)`,
|
|
225
227
|
className: classes.tickContainer,
|
|
226
|
-
children: [!disableTicks && /*#__PURE__*/_jsx(Tick, _extends({
|
|
228
|
+
children: [!disableTicks && showTick && /*#__PURE__*/_jsx(Tick, _extends({
|
|
227
229
|
y2: positionSign * tickSize,
|
|
228
230
|
className: classes.tick
|
|
229
|
-
}, slotProps?.axisTick)), formattedValue !== undefined && !skipLabel && /*#__PURE__*/_jsx(TickLabel, _extends({
|
|
231
|
+
}, slotProps?.axisTick)), formattedValue !== undefined && !skipLabel && showTickLabel && /*#__PURE__*/_jsx(TickLabel, _extends({
|
|
230
232
|
x: xTickLabel,
|
|
231
233
|
y: yTickLabel
|
|
232
234
|
}, axisTickLabelProps, {
|
|
@@ -81,6 +81,7 @@ function ChartsYAxis(inProps) {
|
|
|
81
81
|
tickLabelInterval
|
|
82
82
|
} = defaultizedProps;
|
|
83
83
|
const theme = useTheme();
|
|
84
|
+
const isRTL = theme.direction === 'rtl';
|
|
84
85
|
const classes = useUtilityClasses(_extends({}, defaultizedProps, {
|
|
85
86
|
theme
|
|
86
87
|
}));
|
|
@@ -108,13 +109,14 @@ function ChartsYAxis(inProps) {
|
|
|
108
109
|
const Tick = slots?.axisTick ?? 'line';
|
|
109
110
|
const TickLabel = slots?.axisTickLabel ?? ChartsText;
|
|
110
111
|
const Label = slots?.axisLabel ?? ChartsText;
|
|
112
|
+
const revertAnchor = !isRTL && position === 'right' || isRTL && position !== 'right';
|
|
111
113
|
const axisTickLabelProps = useSlotProps({
|
|
112
114
|
elementType: TickLabel,
|
|
113
115
|
externalSlotProps: slotProps?.axisTickLabel,
|
|
114
116
|
additionalProps: {
|
|
115
117
|
style: _extends({
|
|
116
118
|
fontSize: tickFontSize,
|
|
117
|
-
textAnchor:
|
|
119
|
+
textAnchor: revertAnchor ? 'start' : 'end',
|
|
118
120
|
dominantBaseline: 'central'
|
|
119
121
|
}, tickLabelStyle)
|
|
120
122
|
},
|
|
@@ -11,6 +11,7 @@ import { DEFAULT_X_AXIS_KEY } from '../constants';
|
|
|
11
11
|
import { cleanId } from '../internals/utils';
|
|
12
12
|
import getColor from './getColor';
|
|
13
13
|
import { useLineSeries } from '../hooks/useSeries';
|
|
14
|
+
import { useDrawingArea } from '../hooks/useDrawingArea';
|
|
14
15
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
15
16
|
/**
|
|
16
17
|
* Demos:
|
|
@@ -33,6 +34,10 @@ function MarkPlot(props) {
|
|
|
33
34
|
const seriesData = useLineSeries();
|
|
34
35
|
const axisData = useCartesianContext();
|
|
35
36
|
const chartId = useChartId();
|
|
37
|
+
const {
|
|
38
|
+
left,
|
|
39
|
+
width
|
|
40
|
+
} = useDrawingArea();
|
|
36
41
|
const Mark = slots?.mark ?? MarkElement;
|
|
37
42
|
if (seriesData === undefined) {
|
|
38
43
|
return null;
|
|
@@ -67,13 +72,12 @@ function MarkPlot(props) {
|
|
|
67
72
|
const xScale = getValueToPositionMapper(xAxis[xAxisKey].scale);
|
|
68
73
|
const yScale = yAxis[yAxisKey].scale;
|
|
69
74
|
const xData = xAxis[xAxisKey].data;
|
|
70
|
-
const xRange = xAxis[xAxisKey].scale.range();
|
|
71
75
|
const yRange = yScale.range();
|
|
72
76
|
const isInRange = ({
|
|
73
77
|
x,
|
|
74
78
|
y
|
|
75
79
|
}) => {
|
|
76
|
-
if (x <
|
|
80
|
+
if (x < left || x > left + width) {
|
|
77
81
|
return false;
|
|
78
82
|
}
|
|
79
83
|
if (y < Math.min(...yRange) || y > Math.max(...yRange)) {
|
|
@@ -81,19 +81,19 @@ export const useLineChartProps = props => {
|
|
|
81
81
|
const areaPlotProps = {
|
|
82
82
|
slots,
|
|
83
83
|
slotProps,
|
|
84
|
-
onAreaClick,
|
|
84
|
+
onItemClick: onAreaClick,
|
|
85
85
|
skipAnimation
|
|
86
86
|
};
|
|
87
87
|
const linePlotProps = {
|
|
88
88
|
slots,
|
|
89
89
|
slotProps,
|
|
90
|
-
onLineClick,
|
|
90
|
+
onItemClick: onLineClick,
|
|
91
91
|
skipAnimation
|
|
92
92
|
};
|
|
93
93
|
const markPlotProps = {
|
|
94
94
|
slots,
|
|
95
95
|
slotProps,
|
|
96
|
-
onMarkClick,
|
|
96
|
+
onItemClick: onMarkClick,
|
|
97
97
|
skipAnimation
|
|
98
98
|
};
|
|
99
99
|
const overlayProps = {
|
|
@@ -229,7 +229,9 @@ process.env.NODE_ENV !== "production" ? ResponsiveChartContainer.propTypes = {
|
|
|
229
229
|
})]),
|
|
230
230
|
data: PropTypes.array,
|
|
231
231
|
dataKey: PropTypes.string,
|
|
232
|
-
id: PropTypes.string
|
|
232
|
+
id: PropTypes.string,
|
|
233
|
+
max: PropTypes.number,
|
|
234
|
+
min: PropTypes.number
|
|
233
235
|
}))
|
|
234
236
|
} : void 0;
|
|
235
237
|
export { ResponsiveChartContainer };
|
|
@@ -5,6 +5,7 @@ import { getValueToPositionMapper } from '../hooks/useScale';
|
|
|
5
5
|
import { useInteractionItemProps } from '../hooks/useInteractionItemProps';
|
|
6
6
|
import { InteractionContext } from '../context/InteractionProvider';
|
|
7
7
|
import { useHighlighted } from '../context';
|
|
8
|
+
import { useDrawingArea } from '../hooks/useDrawingArea';
|
|
8
9
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
9
10
|
/**
|
|
10
11
|
* Demos:
|
|
@@ -26,6 +27,10 @@ function Scatter(props) {
|
|
|
26
27
|
markerSize,
|
|
27
28
|
onItemClick
|
|
28
29
|
} = props;
|
|
30
|
+
const {
|
|
31
|
+
left,
|
|
32
|
+
width
|
|
33
|
+
} = useDrawingArea();
|
|
29
34
|
const {
|
|
30
35
|
useVoronoiInteraction
|
|
31
36
|
} = React.useContext(InteractionContext);
|
|
@@ -38,10 +43,7 @@ function Scatter(props) {
|
|
|
38
43
|
const cleanData = React.useMemo(() => {
|
|
39
44
|
const getXPosition = getValueToPositionMapper(xScale);
|
|
40
45
|
const getYPosition = getValueToPositionMapper(yScale);
|
|
41
|
-
const xRange = xScale.range();
|
|
42
46
|
const yRange = yScale.range();
|
|
43
|
-
const minXRange = Math.min(...xRange);
|
|
44
|
-
const maxXRange = Math.max(...xRange);
|
|
45
47
|
const minYRange = Math.min(...yRange);
|
|
46
48
|
const maxYRange = Math.max(...yRange);
|
|
47
49
|
const temp = [];
|
|
@@ -49,7 +51,7 @@ function Scatter(props) {
|
|
|
49
51
|
const scatterPoint = series.data[i];
|
|
50
52
|
const x = getXPosition(scatterPoint.x);
|
|
51
53
|
const y = getYPosition(scatterPoint.y);
|
|
52
|
-
const isInRange = x >=
|
|
54
|
+
const isInRange = x >= left && x <= left + width && y >= minYRange && y <= maxYRange;
|
|
53
55
|
const pointCtx = {
|
|
54
56
|
type: 'scatter',
|
|
55
57
|
seriesId: series.id,
|
|
@@ -74,7 +76,7 @@ function Scatter(props) {
|
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
return temp;
|
|
77
|
-
}, [xScale, yScale, series.data, series.id,
|
|
79
|
+
}, [xScale, yScale, left, width, series.data, series.id, isHighlighted, isFaded, getInteractionItemProps, colorGetter, color]);
|
|
78
80
|
return /*#__PURE__*/_jsx("g", {
|
|
79
81
|
children: cleanData.map(dataPoint => /*#__PURE__*/_jsx("circle", _extends({
|
|
80
82
|
cx: 0,
|
|
@@ -339,7 +339,9 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
|
|
|
339
339
|
})]),
|
|
340
340
|
data: PropTypes.array,
|
|
341
341
|
dataKey: PropTypes.string,
|
|
342
|
-
id: PropTypes.string
|
|
342
|
+
id: PropTypes.string,
|
|
343
|
+
max: PropTypes.number,
|
|
344
|
+
min: PropTypes.number
|
|
343
345
|
}))
|
|
344
346
|
} : void 0;
|
|
345
347
|
export { ScatterChart };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
|
-
import { scaleBand, scalePoint } from 'd3-scale';
|
|
2
|
+
import { scaleBand, scalePoint, scaleTime } from 'd3-scale';
|
|
3
3
|
import { DEFAULT_X_AXIS_KEY, DEFAULT_Y_AXIS_KEY } from '../../constants';
|
|
4
4
|
import { isBandScaleConfig, isPointScaleConfig } from '../../models/axis';
|
|
5
5
|
import { getColorScale, getOrdinalColorScale } from '../../internals/colorScale';
|
|
@@ -10,9 +10,26 @@ const getRange = (drawingArea, axisName, isReverse) => {
|
|
|
10
10
|
const range = axisName === 'x' ? [drawingArea.left, drawingArea.left + drawingArea.width] : [drawingArea.top + drawingArea.height, drawingArea.top];
|
|
11
11
|
return isReverse ? range.reverse() : range;
|
|
12
12
|
};
|
|
13
|
+
const zoomedScaleRange = (scaleRange, zoomRange) => {
|
|
14
|
+
const rangeGap = scaleRange[1] - scaleRange[0];
|
|
15
|
+
const zoomGap = zoomRange[1] - zoomRange[0];
|
|
16
|
+
|
|
17
|
+
// If current zoom show the scale between p1 and p2 percents
|
|
18
|
+
// The range should be extended by adding [0, p1] and [p2, 100] segments
|
|
19
|
+
const min = scaleRange[0] - zoomRange[0] * rangeGap / zoomGap;
|
|
20
|
+
const max = scaleRange[1] + (100 - zoomRange[1]) * rangeGap / zoomGap;
|
|
21
|
+
return [min, max];
|
|
22
|
+
};
|
|
23
|
+
const isDateData = data => data?.[0] instanceof Date;
|
|
24
|
+
function createDateFormatter(axis, range) {
|
|
25
|
+
const timeScale = scaleTime(axis.data, range);
|
|
26
|
+
return (v, {
|
|
27
|
+
location
|
|
28
|
+
}) => location === 'tick' ? timeScale.tickFormat(axis.tickNumber)(v) : `${v.toLocaleString()}`;
|
|
29
|
+
}
|
|
13
30
|
const DEFAULT_CATEGORY_GAP_RATIO = 0.2;
|
|
14
31
|
const DEFAULT_BAR_GAP_RATIO = 0.1;
|
|
15
|
-
export function computeValue(drawingArea, formattedSeries, inAxis, extremumGetters, axisName) {
|
|
32
|
+
export function computeValue(drawingArea, formattedSeries, inAxis, extremumGetters, axisName, zoomRange = [0, 100]) {
|
|
16
33
|
const DEFAULT_AXIS_KEY = axisName === 'x' ? DEFAULT_X_AXIS_KEY : DEFAULT_Y_AXIS_KEY;
|
|
17
34
|
const allAxis = [...(inAxis?.map((axis, index) => _extends({
|
|
18
35
|
id: `defaultized-${axisName}-axis-${index}`
|
|
@@ -32,26 +49,36 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
|
|
|
32
49
|
const barGapRatio = axis.barGapRatio ?? DEFAULT_BAR_GAP_RATIO;
|
|
33
50
|
// Reverse range because ordinal scales are presented from top to bottom on y-axis
|
|
34
51
|
const scaleRange = axisName === 'x' ? range : [range[1], range[0]];
|
|
52
|
+
const zoomedRange = zoomedScaleRange(scaleRange, zoomRange);
|
|
35
53
|
completeAxis[axis.id] = _extends({
|
|
36
54
|
categoryGapRatio,
|
|
37
55
|
barGapRatio
|
|
38
56
|
}, axis, {
|
|
39
|
-
scale: scaleBand(axis.data,
|
|
57
|
+
scale: scaleBand(axis.data, zoomedRange).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
|
|
40
58
|
tickNumber: axis.data.length,
|
|
41
59
|
colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' ? getOrdinalColorScale(_extends({
|
|
42
60
|
values: axis.data
|
|
43
61
|
}, axis.colorMap)) : getColorScale(axis.colorMap))
|
|
44
62
|
});
|
|
63
|
+
if (isDateData(axis.data)) {
|
|
64
|
+
const dateFormatter = createDateFormatter(axis, scaleRange);
|
|
65
|
+
completeAxis[axis.id].valueFormatter = axis.valueFormatter ?? dateFormatter;
|
|
66
|
+
}
|
|
45
67
|
}
|
|
46
68
|
if (isPointScaleConfig(axis)) {
|
|
47
69
|
const scaleRange = axisName === 'x' ? range : [...range].reverse();
|
|
70
|
+
const zoomedRange = zoomedScaleRange(scaleRange, zoomRange);
|
|
48
71
|
completeAxis[axis.id] = _extends({}, axis, {
|
|
49
|
-
scale: scalePoint(axis.data,
|
|
72
|
+
scale: scalePoint(axis.data, zoomedRange),
|
|
50
73
|
tickNumber: axis.data.length,
|
|
51
74
|
colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' ? getOrdinalColorScale(_extends({
|
|
52
75
|
values: axis.data
|
|
53
76
|
}, axis.colorMap)) : getColorScale(axis.colorMap))
|
|
54
77
|
});
|
|
78
|
+
if (isDateData(axis.data)) {
|
|
79
|
+
const dateFormatter = createDateFormatter(axis, scaleRange);
|
|
80
|
+
completeAxis[axis.id].valueFormatter = axis.valueFormatter ?? dateFormatter;
|
|
81
|
+
}
|
|
55
82
|
}
|
|
56
83
|
if (axis.scaleType === 'band' || axis.scaleType === 'point') {
|
|
57
84
|
// Could be merged with the two previous "if conditions" but then TS does not get that `axis.scaleType` can't be `band` or `point`.
|
|
@@ -59,11 +86,15 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
|
|
|
59
86
|
}
|
|
60
87
|
const scaleType = axis.scaleType ?? 'linear';
|
|
61
88
|
const extremums = [axis.min ?? minData, axis.max ?? maxData];
|
|
62
|
-
const
|
|
89
|
+
const rawTickNumber = getTickNumber(_extends({}, axis, {
|
|
63
90
|
range,
|
|
64
91
|
domain: extremums
|
|
65
92
|
}));
|
|
66
|
-
const
|
|
93
|
+
const tickNumber = rawTickNumber / ((zoomRange[1] - zoomRange[0]) / 100);
|
|
94
|
+
const zoomedRange = zoomedScaleRange(range, zoomRange);
|
|
95
|
+
|
|
96
|
+
// TODO: move nice to prop? Disable when there is zoom?
|
|
97
|
+
const scale = getScale(scaleType, extremums, zoomedRange).nice(rawTickNumber);
|
|
67
98
|
const [minDomain, maxDomain] = scale.domain();
|
|
68
99
|
const domain = [axis.min ?? minDomain, axis.max ?? maxDomain];
|
|
69
100
|
completeAxis[axis.id] = _extends({}, axis, {
|
|
@@ -37,7 +37,10 @@ function ZAxisContextProvider(props) {
|
|
|
37
37
|
completedZAxis[axis.id] = _extends({}, axis, {
|
|
38
38
|
colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' && axis.data ? getOrdinalColorScale(_extends({
|
|
39
39
|
values: axis.data
|
|
40
|
-
}, axis.colorMap)) : getColorScale(axis.colorMap
|
|
40
|
+
}, axis.colorMap)) : getColorScale(axis.colorMap.type === 'continuous' ? _extends({
|
|
41
|
+
min: axis.min,
|
|
42
|
+
max: axis.max
|
|
43
|
+
}, axis.colorMap) : axis.colorMap))
|
|
41
44
|
});
|
|
42
45
|
});
|
|
43
46
|
return {
|
|
@@ -83,7 +86,9 @@ process.env.NODE_ENV !== "production" ? ZAxisContextProvider.propTypes = {
|
|
|
83
86
|
})]),
|
|
84
87
|
data: PropTypes.array,
|
|
85
88
|
dataKey: PropTypes.string,
|
|
86
|
-
id: PropTypes.string
|
|
89
|
+
id: PropTypes.string,
|
|
90
|
+
max: PropTypes.number,
|
|
91
|
+
min: PropTypes.number
|
|
87
92
|
}))
|
|
88
93
|
} : void 0;
|
|
89
94
|
export { ZAxisContextProvider };
|
package/modern/hooks/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './useDrawingArea';
|
|
2
2
|
export * from './useChartId';
|
|
3
3
|
export * from './useScale';
|
|
4
|
+
export * from './useAxis';
|
|
4
5
|
export * from './useColorScale';
|
|
5
6
|
export * from './useSvgRef';
|
|
6
7
|
export { useSeries as unstable_useSeries, usePieSeries as unstable_usePieSeries, useLineSeries as unstable_useLineSeries, useBarSeries as unstable_useBarSeries, useScatterSeries as unstable_useScatterSeries } from './useSeries';
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { useCartesianContext } from '../context/CartesianProvider';
|
|
2
|
+
export function useXAxis(identifier) {
|
|
3
|
+
const {
|
|
4
|
+
xAxis,
|
|
5
|
+
xAxisIds
|
|
6
|
+
} = useCartesianContext();
|
|
7
|
+
const id = typeof identifier === 'string' ? identifier : xAxisIds[identifier ?? 0];
|
|
8
|
+
return xAxis[id];
|
|
9
|
+
}
|
|
10
|
+
export function useYAxis(identifier) {
|
|
11
|
+
const {
|
|
12
|
+
yAxis,
|
|
13
|
+
yAxisIds
|
|
14
|
+
} = useCartesianContext();
|
|
15
|
+
const id = typeof identifier === 'string' ? identifier : yAxisIds[identifier ?? 0];
|
|
16
|
+
return yAxis[id];
|
|
17
|
+
}
|
|
@@ -2,7 +2,7 @@ import * as React from 'react';
|
|
|
2
2
|
import { InteractionContext } from '../context/InteractionProvider';
|
|
3
3
|
import { useCartesianContext } from '../context/CartesianProvider';
|
|
4
4
|
import { isBandScale } from '../internals/isBandScale';
|
|
5
|
-
import { getSVGPoint } from '../internals/
|
|
5
|
+
import { getSVGPoint } from '../internals/getSVGPoint';
|
|
6
6
|
import { useSvgRef } from './useSvgRef';
|
|
7
7
|
import { useDrawingArea } from './useDrawingArea';
|
|
8
8
|
function getAsANumber(value) {
|
|
@@ -38,10 +38,7 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
38
38
|
if (element === null || disableAxisListener) {
|
|
39
39
|
return () => {};
|
|
40
40
|
}
|
|
41
|
-
|
|
42
|
-
if (usedXAxis === null) {
|
|
43
|
-
return null;
|
|
44
|
-
}
|
|
41
|
+
function getNewAxisState(axisConfig, mouseValue) {
|
|
45
42
|
const {
|
|
46
43
|
scale,
|
|
47
44
|
data: axisData,
|
|
@@ -89,7 +86,7 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
89
86
|
index: dataIndex,
|
|
90
87
|
value: axisData[dataIndex]
|
|
91
88
|
};
|
|
92
|
-
}
|
|
89
|
+
}
|
|
93
90
|
const handleOut = () => {
|
|
94
91
|
mousePosition.current = {
|
|
95
92
|
x: -1,
|
|
@@ -101,7 +98,7 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
101
98
|
};
|
|
102
99
|
const handleMove = event => {
|
|
103
100
|
const target = 'targetTouches' in event ? event.targetTouches[0] : event;
|
|
104
|
-
const svgPoint = getSVGPoint(
|
|
101
|
+
const svgPoint = getSVGPoint(element, target);
|
|
105
102
|
mousePosition.current = {
|
|
106
103
|
x: svgPoint.x,
|
|
107
104
|
y: svgPoint.y
|
|
@@ -114,8 +111,8 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
114
111
|
});
|
|
115
112
|
return;
|
|
116
113
|
}
|
|
117
|
-
const newStateX =
|
|
118
|
-
const newStateY =
|
|
114
|
+
const newStateX = getNewAxisState(xAxis[usedXAxis], svgPoint.x);
|
|
115
|
+
const newStateY = getNewAxisState(yAxis[usedYAxis], svgPoint.y);
|
|
119
116
|
dispatch({
|
|
120
117
|
type: 'updateAxis',
|
|
121
118
|
data: {
|
|
@@ -124,15 +121,26 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
124
121
|
}
|
|
125
122
|
});
|
|
126
123
|
};
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
124
|
+
const handleDown = event => {
|
|
125
|
+
const target = event.currentTarget;
|
|
126
|
+
if (!target) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
if (target.hasPointerCapture(event.pointerId)) {
|
|
130
|
+
target.releasePointerCapture(event.pointerId);
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
element.addEventListener('pointerdown', handleDown);
|
|
134
|
+
element.addEventListener('pointermove', handleMove);
|
|
135
|
+
element.addEventListener('pointerout', handleOut);
|
|
136
|
+
element.addEventListener('pointercancel', handleOut);
|
|
137
|
+
element.addEventListener('pointerleave', handleOut);
|
|
131
138
|
return () => {
|
|
132
|
-
element.removeEventListener('
|
|
133
|
-
element.removeEventListener('
|
|
134
|
-
element.removeEventListener('
|
|
135
|
-
element.removeEventListener('
|
|
139
|
+
element.removeEventListener('pointerdown', handleDown);
|
|
140
|
+
element.removeEventListener('pointermove', handleMove);
|
|
141
|
+
element.removeEventListener('pointerout', handleOut);
|
|
142
|
+
element.removeEventListener('pointercancel', handleOut);
|
|
143
|
+
element.removeEventListener('pointerleave', handleOut);
|
|
136
144
|
};
|
|
137
145
|
}, [svgRef, dispatch, left, width, top, height, usedYAxis, yAxis, usedXAxis, xAxis, disableAxisListener]);
|
|
138
146
|
};
|
|
@@ -13,7 +13,12 @@ export const useInteractionItemProps = skip => {
|
|
|
13
13
|
return () => ({});
|
|
14
14
|
}
|
|
15
15
|
const getInteractionItemProps = data => {
|
|
16
|
-
const
|
|
16
|
+
const onPointerDown = event => {
|
|
17
|
+
if (event.currentTarget.hasPointerCapture(event.pointerId)) {
|
|
18
|
+
event.currentTarget.releasePointerCapture(event.pointerId);
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
const onPointerEnter = () => {
|
|
17
22
|
dispatchInteraction({
|
|
18
23
|
type: 'enterItem',
|
|
19
24
|
data
|
|
@@ -23,7 +28,8 @@ export const useInteractionItemProps = skip => {
|
|
|
23
28
|
dataIndex: data.dataIndex
|
|
24
29
|
});
|
|
25
30
|
};
|
|
26
|
-
const
|
|
31
|
+
const onPointerLeave = event => {
|
|
32
|
+
event.currentTarget.releasePointerCapture(event.pointerId);
|
|
27
33
|
dispatchInteraction({
|
|
28
34
|
type: 'leaveItem',
|
|
29
35
|
data
|
|
@@ -31,8 +37,9 @@ export const useInteractionItemProps = skip => {
|
|
|
31
37
|
clearHighlighted();
|
|
32
38
|
};
|
|
33
39
|
return {
|
|
34
|
-
|
|
35
|
-
|
|
40
|
+
onPointerEnter,
|
|
41
|
+
onPointerLeave,
|
|
42
|
+
onPointerDown
|
|
36
43
|
};
|
|
37
44
|
};
|
|
38
45
|
return getInteractionItemProps;
|
package/modern/hooks/useScale.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { useCartesianContext } from '../context/CartesianProvider';
|
|
2
1
|
import { isBandScale } from '../internals/isBandScale';
|
|
2
|
+
import { useXAxis, useYAxis } from './useAxis';
|
|
3
|
+
|
|
3
4
|
/**
|
|
4
5
|
* For a given scale return a function that map value to their position.
|
|
5
6
|
* Useful when dealing with specific scale such as band.
|
|
@@ -8,23 +9,15 @@ import { isBandScale } from '../internals/isBandScale';
|
|
|
8
9
|
*/
|
|
9
10
|
export function getValueToPositionMapper(scale) {
|
|
10
11
|
if (isBandScale(scale)) {
|
|
11
|
-
return value => scale(value) + scale.bandwidth() / 2;
|
|
12
|
+
return value => (scale(value) ?? 0) + scale.bandwidth() / 2;
|
|
12
13
|
}
|
|
13
14
|
return value => scale(value);
|
|
14
15
|
}
|
|
15
16
|
export function useXScale(identifier) {
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
xAxisIds
|
|
19
|
-
} = useCartesianContext();
|
|
20
|
-
const id = typeof identifier === 'string' ? identifier : xAxisIds[identifier ?? 0];
|
|
21
|
-
return xAxis[id].scale;
|
|
17
|
+
const axis = useXAxis(identifier);
|
|
18
|
+
return axis.scale;
|
|
22
19
|
}
|
|
23
20
|
export function useYScale(identifier) {
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
yAxisIds
|
|
27
|
-
} = useCartesianContext();
|
|
28
|
-
const id = typeof identifier === 'string' ? identifier : yAxisIds[identifier ?? 0];
|
|
29
|
-
return yAxis[id].scale;
|
|
21
|
+
const axis = useYAxis(identifier);
|
|
22
|
+
return axis.scale;
|
|
30
23
|
}
|
package/modern/hooks/useTicks.js
CHANGED
|
@@ -34,7 +34,8 @@ export function useTicks(options) {
|
|
|
34
34
|
const domain = scale.domain();
|
|
35
35
|
if (scale.bandwidth() > 0) {
|
|
36
36
|
// scale type = 'band'
|
|
37
|
-
|
|
37
|
+
const filteredDomain = typeof tickInterval === 'function' && domain.filter(tickInterval) || typeof tickInterval === 'object' && tickInterval || domain;
|
|
38
|
+
return [...filteredDomain.map(value => ({
|
|
38
39
|
value,
|
|
39
40
|
formattedValue: valueFormatter?.(value, {
|
|
40
41
|
location: 'tick'
|
package/modern/index.js
CHANGED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Transform mouse event position to coordinates inside the SVG.
|
|
3
|
+
* @param svg The SVG element
|
|
4
|
+
* @param event The mouseEvent to transform
|
|
5
|
+
*/
|
|
6
|
+
export function getSVGPoint(svg, event) {
|
|
7
|
+
const pt = svg.createSVGPoint();
|
|
8
|
+
pt.x = event.clientX;
|
|
9
|
+
pt.y = event.clientY;
|
|
10
|
+
return pt.matrixTransform(svg.getScreenCTM().inverse());
|
|
11
|
+
}
|
|
@@ -6,6 +6,8 @@ export * from '../ResponsiveChartContainer/ResizableContainer';
|
|
|
6
6
|
// hooks
|
|
7
7
|
export { useReducedMotion } from '../hooks/useReducedMotion';
|
|
8
8
|
export { useSeries } from '../hooks/useSeries';
|
|
9
|
+
export { useInteractionItemProps } from '../hooks/useInteractionItemProps';
|
|
10
|
+
export { useDrawingArea } from '../hooks/useDrawingArea';
|
|
9
11
|
export { useChartContainerHooks } from '../ChartContainer/useChartContainerHooks';
|
|
10
12
|
export { useScatterChartProps } from '../ScatterChart/useScatterChartProps';
|
|
11
13
|
export { useLineChartProps } from '../LineChart/useLineChartProps';
|
|
@@ -14,6 +16,8 @@ export { useBarChartProps } from '../BarChart/useBarChartProps';
|
|
|
14
16
|
// utils
|
|
15
17
|
export * from './defaultizeValueFormatter';
|
|
16
18
|
export * from './configInit';
|
|
19
|
+
export * from './getLabel';
|
|
20
|
+
export * from './getSVGPoint';
|
|
17
21
|
|
|
18
22
|
// contexts
|
|
19
23
|
|