@mui/x-charts 7.8.0 → 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/useBarChartProps.d.ts +1 -1
- package/CHANGELOG.md +66 -0
- package/ChartContainer/ChartContainer.js +3 -1
- package/ChartsAxisHighlight/ChartsAxisHighlight.js +1 -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 -0
- 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 +5 -5
- package/ChartsXAxis/ChartsXAxis.js +7 -5
- package/LineChart/LineChart.d.ts +3 -3
- package/LineChart/MarkPlot.js +6 -2
- package/LineChart/useLineChartProps.d.ts +1 -1
- package/PieChart/PieChart.d.ts +3 -3
- 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 +1 -1
- package/SparkLineChart/SparkLineChart.d.ts +3 -3
- package/context/CartesianProvider/computeValue.d.ts +2 -2
- package/context/CartesianProvider/computeValue.js +21 -5
- package/context/ZAxisContextProvider.js +7 -2
- package/esm/ChartContainer/ChartContainer.js +3 -1
- package/esm/ChartsAxisHighlight/ChartsAxisHighlight.js +1 -1
- 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 +5 -5
- package/esm/ChartsXAxis/ChartsXAxis.js +7 -5
- package/esm/LineChart/MarkPlot.js +6 -2
- 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 +21 -5
- 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 +20 -9
- package/esm/hooks/useInteractionItemProps.js +11 -4
- package/esm/hooks/useScale.js +6 -13
- package/esm/internals/index.js +2 -0
- 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 +20 -9
- package/hooks/useInteractionItemProps.d.ts +4 -2
- package/hooks/useInteractionItemProps.js +11 -4
- package/hooks/useScale.js +5 -13
- package/index.js +1 -1
- package/internals/index.d.ts +2 -0
- package/internals/index.js +20 -0
- package/models/colorMapping.d.ts +1 -1
- package/models/z-axis.d.ts +8 -0
- package/modern/ChartContainer/ChartContainer.js +3 -1
- package/modern/ChartsAxisHighlight/ChartsAxisHighlight.js +1 -1
- 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 +5 -5
- package/modern/ChartsXAxis/ChartsXAxis.js +7 -5
- package/modern/LineChart/MarkPlot.js +6 -2
- 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 +21 -5
- 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 +20 -9
- package/modern/hooks/useInteractionItemProps.js +11 -4
- package/modern/hooks/useScale.js +6 -13
- package/modern/index.js +1 -1
- package/modern/internals/index.js +2 -0
- package/package.json +3 -3
- package/themeAugmentation/props.d.ts +2 -1
package/models/z-axis.d.ts
CHANGED
|
@@ -7,6 +7,14 @@ export interface ZAxisConfig<V = any> {
|
|
|
7
7
|
* The key used to retrieve `data` from the `dataset` prop.
|
|
8
8
|
*/
|
|
9
9
|
dataKey?: string;
|
|
10
|
+
/**
|
|
11
|
+
* The minimal value of the scale.
|
|
12
|
+
*/
|
|
13
|
+
min?: number;
|
|
14
|
+
/**
|
|
15
|
+
* The maximal value of the scale.
|
|
16
|
+
*/
|
|
17
|
+
max?: number;
|
|
10
18
|
colorMap?: OrdinalColorConfig | ContinuousColorConfig | PiecewiseColorConfig;
|
|
11
19
|
}
|
|
12
20
|
export interface ZAxisDefaultized extends ZAxisConfig {
|
|
@@ -283,7 +283,9 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
|
|
|
283
283
|
})]),
|
|
284
284
|
data: PropTypes.array,
|
|
285
285
|
dataKey: PropTypes.string,
|
|
286
|
-
id: PropTypes.string
|
|
286
|
+
id: PropTypes.string,
|
|
287
|
+
max: PropTypes.number,
|
|
288
|
+
min: PropTypes.number
|
|
287
289
|
}))
|
|
288
290
|
} : void 0;
|
|
289
291
|
export { ChartContainer };
|
|
@@ -86,7 +86,7 @@ function ChartsAxisHighlight(props) {
|
|
|
86
86
|
ownerState: {
|
|
87
87
|
axisHighlight: 'band'
|
|
88
88
|
}
|
|
89
|
-
}), isBandScaleY && yScale(axisY.value)
|
|
89
|
+
}), isBandScaleY && yScale(axisY.value) !== undefined && /*#__PURE__*/_jsx(ChartsAxisHighlightPath, {
|
|
90
90
|
d: `M ${xScale.range()[0]} ${
|
|
91
91
|
// @ts-expect-error, yScale value is checked in the statement above
|
|
92
92
|
yScale(axisY.value) - (yScale.step() - yScale.bandwidth()) / 2} l 0 ${yScale.step()} l ${xScale.range()[1] - xScale.range()[0]} 0 l 0 ${-yScale.step()} Z`,
|
package/modern/ChartsSurface.js
CHANGED
|
@@ -9,7 +9,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
9
9
|
const ChartChartsSurfaceStyles = styled('svg', {
|
|
10
10
|
name: 'MuiChartsSurface',
|
|
11
11
|
slot: 'Root'
|
|
12
|
-
})(() => ({
|
|
12
|
+
})(() => ({
|
|
13
|
+
// This prevents default touch actions when using the svg on mobile devices.
|
|
14
|
+
// For example, prevent page scroll & zoom.
|
|
15
|
+
touchAction: 'none'
|
|
16
|
+
}));
|
|
13
17
|
const ChartsSurface = /*#__PURE__*/React.forwardRef(function ChartsSurface(props, ref) {
|
|
14
18
|
const {
|
|
15
19
|
children,
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import * as React from 'react';
|
|
3
|
-
import PropTypes from 'prop-types';
|
|
4
3
|
import { useSlotProps } from '@mui/base/utils';
|
|
5
4
|
import { useCartesianContext } from '../context/CartesianProvider';
|
|
6
5
|
import { DefaultChartsAxisTooltipContent } from './DefaultChartsAxisTooltipContent';
|
|
@@ -9,6 +8,9 @@ import { useColorProcessor } from '../hooks/useColor';
|
|
|
9
8
|
import { isCartesianSeriesType } from '../internals/isCartesian';
|
|
10
9
|
import { useSeries } from '../hooks/useSeries';
|
|
11
10
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
11
|
+
/**
|
|
12
|
+
* @ignore - internal component.
|
|
13
|
+
*/
|
|
12
14
|
function ChartsAxisTooltipContent(props) {
|
|
13
15
|
const {
|
|
14
16
|
content,
|
|
@@ -71,41 +73,4 @@ function ChartsAxisTooltipContent(props) {
|
|
|
71
73
|
});
|
|
72
74
|
return /*#__PURE__*/_jsx(Content, _extends({}, chartTooltipContentProps));
|
|
73
75
|
}
|
|
74
|
-
process.env.NODE_ENV !== "production" ? ChartsAxisTooltipContent.propTypes = {
|
|
75
|
-
// ----------------------------- Warning --------------------------------
|
|
76
|
-
// | These PropTypes are generated from the TypeScript type definitions |
|
|
77
|
-
// | To update them edit the TypeScript types and run "pnpm proptypes" |
|
|
78
|
-
// ----------------------------------------------------------------------
|
|
79
|
-
axisData: PropTypes.shape({
|
|
80
|
-
x: PropTypes.shape({
|
|
81
|
-
index: PropTypes.number,
|
|
82
|
-
value: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number, PropTypes.string]).isRequired
|
|
83
|
-
}),
|
|
84
|
-
y: PropTypes.shape({
|
|
85
|
-
index: PropTypes.number,
|
|
86
|
-
value: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number, PropTypes.string]).isRequired
|
|
87
|
-
})
|
|
88
|
-
}).isRequired,
|
|
89
|
-
classes: PropTypes.object.isRequired,
|
|
90
|
-
content: PropTypes.elementType,
|
|
91
|
-
contentProps: PropTypes.shape({
|
|
92
|
-
axis: PropTypes.object,
|
|
93
|
-
axisData: PropTypes.shape({
|
|
94
|
-
x: PropTypes.shape({
|
|
95
|
-
index: PropTypes.number,
|
|
96
|
-
value: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number, PropTypes.string]).isRequired
|
|
97
|
-
}),
|
|
98
|
-
y: PropTypes.shape({
|
|
99
|
-
index: PropTypes.number,
|
|
100
|
-
value: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number, PropTypes.string]).isRequired
|
|
101
|
-
})
|
|
102
|
-
}),
|
|
103
|
-
axisValue: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number, PropTypes.string]),
|
|
104
|
-
classes: PropTypes.object,
|
|
105
|
-
dataIndex: PropTypes.number,
|
|
106
|
-
series: PropTypes.arrayOf(PropTypes.object),
|
|
107
|
-
sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
|
|
108
|
-
}),
|
|
109
|
-
sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
|
|
110
|
-
} : void 0;
|
|
111
76
|
export { ChartsAxisTooltipContent };
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import * as React from 'react';
|
|
3
|
-
import PropTypes from 'prop-types';
|
|
4
3
|
import { useSlotProps } from '@mui/base/utils';
|
|
5
4
|
import { DefaultChartsItemTooltipContent } from './DefaultChartsItemTooltipContent';
|
|
6
5
|
import { useCartesianContext } from '../context/CartesianProvider';
|
|
@@ -8,6 +7,9 @@ import { ZAxisContext } from '../context/ZAxisContextProvider';
|
|
|
8
7
|
import { useColorProcessor } from '../hooks/useColor';
|
|
9
8
|
import { useSeries } from '../hooks/useSeries';
|
|
10
9
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
10
|
+
/**
|
|
11
|
+
* @ignore - internal component.
|
|
12
|
+
*/
|
|
11
13
|
function ChartsItemTooltipContent(props) {
|
|
12
14
|
const {
|
|
13
15
|
content,
|
|
@@ -47,29 +49,4 @@ function ChartsItemTooltipContent(props) {
|
|
|
47
49
|
});
|
|
48
50
|
return /*#__PURE__*/_jsx(Content, _extends({}, chartTooltipContentProps));
|
|
49
51
|
}
|
|
50
|
-
process.env.NODE_ENV !== "production" ? ChartsItemTooltipContent.propTypes = {
|
|
51
|
-
// ----------------------------- Warning --------------------------------
|
|
52
|
-
// | These PropTypes are generated from the TypeScript type definitions |
|
|
53
|
-
// | To update them edit the TypeScript types and run "pnpm proptypes" |
|
|
54
|
-
// ----------------------------------------------------------------------
|
|
55
|
-
classes: PropTypes.object.isRequired,
|
|
56
|
-
content: PropTypes.elementType,
|
|
57
|
-
contentProps: PropTypes.shape({
|
|
58
|
-
classes: PropTypes.object,
|
|
59
|
-
getColor: PropTypes.func,
|
|
60
|
-
itemData: PropTypes.shape({
|
|
61
|
-
dataIndex: PropTypes.number,
|
|
62
|
-
seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
|
|
63
|
-
type: PropTypes.oneOf(['bar', 'line', 'pie', 'scatter']).isRequired
|
|
64
|
-
}),
|
|
65
|
-
series: PropTypes.object,
|
|
66
|
-
sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
|
|
67
|
-
}),
|
|
68
|
-
itemData: PropTypes.shape({
|
|
69
|
-
dataIndex: PropTypes.number,
|
|
70
|
-
seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
|
|
71
|
-
type: PropTypes.oneOf(['bar', 'line', 'pie', 'scatter']).isRequired
|
|
72
|
-
}).isRequired,
|
|
73
|
-
sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
|
|
74
|
-
} : void 0;
|
|
75
52
|
export { ChartsItemTooltipContent };
|
|
@@ -77,8 +77,14 @@ function ChartsTooltip(props) {
|
|
|
77
77
|
externalSlotProps: slotProps?.popper,
|
|
78
78
|
additionalProps: {
|
|
79
79
|
open: popperOpen,
|
|
80
|
-
placement: 'right-start',
|
|
81
|
-
anchorEl: generateVirtualElement(mousePosition)
|
|
80
|
+
placement: mousePosition?.pointerType === 'mouse' ? 'right-start' : 'top',
|
|
81
|
+
anchorEl: generateVirtualElement(mousePosition),
|
|
82
|
+
modifiers: [{
|
|
83
|
+
name: 'offset',
|
|
84
|
+
options: {
|
|
85
|
+
offset: [0, mousePosition?.pointerType === 'touch' ? 40 - mousePosition.height : 0]
|
|
86
|
+
}
|
|
87
|
+
}]
|
|
82
88
|
},
|
|
83
89
|
ownerState: {}
|
|
84
90
|
});
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { styled } from '@mui/material/styles';
|
|
2
2
|
import { shouldForwardProp } from '@mui/system';
|
|
3
3
|
import { chartsTooltipClasses } from './chartsTooltipClasses';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* @ignore - internal component.
|
|
7
|
+
*/
|
|
4
8
|
export const ChartsTooltipPaper = styled('div', {
|
|
5
9
|
name: 'MuiChartsTooltip',
|
|
6
10
|
slot: 'Container'
|
|
@@ -13,6 +17,10 @@ export const ChartsTooltipPaper = styled('div', {
|
|
|
13
17
|
transition: theme.transitions.create('box-shadow'),
|
|
14
18
|
borderRadius: theme.shape.borderRadius
|
|
15
19
|
}));
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* @ignore - internal component.
|
|
23
|
+
*/
|
|
16
24
|
export const ChartsTooltipTable = styled('table', {
|
|
17
25
|
name: 'MuiChartsTooltip',
|
|
18
26
|
slot: 'Table'
|
|
@@ -24,6 +32,10 @@ export const ChartsTooltipTable = styled('table', {
|
|
|
24
32
|
borderBottom: `solid ${(theme.vars || theme).palette.divider} 1px`
|
|
25
33
|
}
|
|
26
34
|
}));
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* @ignore - internal component.
|
|
38
|
+
*/
|
|
27
39
|
export const ChartsTooltipRow = styled('tr', {
|
|
28
40
|
name: 'MuiChartsTooltip',
|
|
29
41
|
slot: 'Row'
|
|
@@ -37,6 +49,10 @@ export const ChartsTooltipRow = styled('tr', {
|
|
|
37
49
|
paddingBottom: theme.spacing(1)
|
|
38
50
|
}
|
|
39
51
|
}));
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* @ignore - internal component.
|
|
55
|
+
*/
|
|
40
56
|
export const ChartsTooltipCell = styled('td', {
|
|
41
57
|
name: 'MuiChartsTooltip',
|
|
42
58
|
slot: 'Cell'
|
|
@@ -59,6 +75,10 @@ export const ChartsTooltipCell = styled('td', {
|
|
|
59
75
|
paddingRight: theme.spacing(2)
|
|
60
76
|
}
|
|
61
77
|
}));
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* @ignore - internal component.
|
|
81
|
+
*/
|
|
62
82
|
export const ChartsTooltipMark = styled('div', {
|
|
63
83
|
name: 'MuiChartsTooltip',
|
|
64
84
|
slot: 'Mark',
|
|
@@ -3,4 +3,5 @@ export * from './chartsTooltipClasses';
|
|
|
3
3
|
export * from './ChartsAxisTooltipContent';
|
|
4
4
|
export * from './ChartsItemTooltipContent';
|
|
5
5
|
export * from './DefaultChartsAxisTooltipContent';
|
|
6
|
-
export * from './DefaultChartsItemTooltipContent';
|
|
6
|
+
export * from './DefaultChartsItemTooltipContent';
|
|
7
|
+
export * from './ChartsTooltipTable';
|
|
@@ -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;
|
|
@@ -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, {
|
|
@@ -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)) {
|
|
@@ -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 };
|
|
@@ -10,6 +10,16 @@ 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
|
+
};
|
|
13
23
|
const isDateData = data => data?.[0] instanceof Date;
|
|
14
24
|
function createDateFormatter(axis, range) {
|
|
15
25
|
const timeScale = scaleTime(axis.data, range);
|
|
@@ -19,7 +29,7 @@ function createDateFormatter(axis, range) {
|
|
|
19
29
|
}
|
|
20
30
|
const DEFAULT_CATEGORY_GAP_RATIO = 0.2;
|
|
21
31
|
const DEFAULT_BAR_GAP_RATIO = 0.1;
|
|
22
|
-
export function computeValue(drawingArea, formattedSeries, inAxis, extremumGetters, axisName) {
|
|
32
|
+
export function computeValue(drawingArea, formattedSeries, inAxis, extremumGetters, axisName, zoomRange = [0, 100]) {
|
|
23
33
|
const DEFAULT_AXIS_KEY = axisName === 'x' ? DEFAULT_X_AXIS_KEY : DEFAULT_Y_AXIS_KEY;
|
|
24
34
|
const allAxis = [...(inAxis?.map((axis, index) => _extends({
|
|
25
35
|
id: `defaultized-${axisName}-axis-${index}`
|
|
@@ -39,11 +49,12 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
|
|
|
39
49
|
const barGapRatio = axis.barGapRatio ?? DEFAULT_BAR_GAP_RATIO;
|
|
40
50
|
// Reverse range because ordinal scales are presented from top to bottom on y-axis
|
|
41
51
|
const scaleRange = axisName === 'x' ? range : [range[1], range[0]];
|
|
52
|
+
const zoomedRange = zoomedScaleRange(scaleRange, zoomRange);
|
|
42
53
|
completeAxis[axis.id] = _extends({
|
|
43
54
|
categoryGapRatio,
|
|
44
55
|
barGapRatio
|
|
45
56
|
}, axis, {
|
|
46
|
-
scale: scaleBand(axis.data,
|
|
57
|
+
scale: scaleBand(axis.data, zoomedRange).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
|
|
47
58
|
tickNumber: axis.data.length,
|
|
48
59
|
colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' ? getOrdinalColorScale(_extends({
|
|
49
60
|
values: axis.data
|
|
@@ -56,8 +67,9 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
|
|
|
56
67
|
}
|
|
57
68
|
if (isPointScaleConfig(axis)) {
|
|
58
69
|
const scaleRange = axisName === 'x' ? range : [...range].reverse();
|
|
70
|
+
const zoomedRange = zoomedScaleRange(scaleRange, zoomRange);
|
|
59
71
|
completeAxis[axis.id] = _extends({}, axis, {
|
|
60
|
-
scale: scalePoint(axis.data,
|
|
72
|
+
scale: scalePoint(axis.data, zoomedRange),
|
|
61
73
|
tickNumber: axis.data.length,
|
|
62
74
|
colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' ? getOrdinalColorScale(_extends({
|
|
63
75
|
values: axis.data
|
|
@@ -74,11 +86,15 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
|
|
|
74
86
|
}
|
|
75
87
|
const scaleType = axis.scaleType ?? 'linear';
|
|
76
88
|
const extremums = [axis.min ?? minData, axis.max ?? maxData];
|
|
77
|
-
const
|
|
89
|
+
const rawTickNumber = getTickNumber(_extends({}, axis, {
|
|
78
90
|
range,
|
|
79
91
|
domain: extremums
|
|
80
92
|
}));
|
|
81
|
-
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);
|
|
82
98
|
const [minDomain, maxDomain] = scale.domain();
|
|
83
99
|
const domain = [axis.min ?? minDomain, axis.max ?? maxDomain];
|
|
84
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
|
+
}
|
|
@@ -98,7 +98,7 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
98
98
|
};
|
|
99
99
|
const handleMove = event => {
|
|
100
100
|
const target = 'targetTouches' in event ? event.targetTouches[0] : event;
|
|
101
|
-
const svgPoint = getSVGPoint(
|
|
101
|
+
const svgPoint = getSVGPoint(element, target);
|
|
102
102
|
mousePosition.current = {
|
|
103
103
|
x: svgPoint.x,
|
|
104
104
|
y: svgPoint.y
|
|
@@ -121,15 +121,26 @@ export const useAxisEvents = disableAxisListener => {
|
|
|
121
121
|
}
|
|
122
122
|
});
|
|
123
123
|
};
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
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);
|
|
128
138
|
return () => {
|
|
129
|
-
element.removeEventListener('
|
|
130
|
-
element.removeEventListener('
|
|
131
|
-
element.removeEventListener('
|
|
132
|
-
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);
|
|
133
144
|
};
|
|
134
145
|
}, [svgRef, dispatch, left, width, top, height, usedYAxis, yAxis, usedXAxis, xAxis, disableAxisListener]);
|
|
135
146
|
};
|