@kubit-ui-web/react-charts 1.6.0 → 1.7.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/dist/cjs/charts/lineChart/context/buildLineContextValue.d.ts +1 -3
- package/dist/cjs/charts/lineChart/context/buildLineContextValue.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/context/buildLineContextValue.js +64 -128
- package/dist/cjs/charts/lineChart/fragments/fixture/contextData.d.ts +2 -43
- package/dist/cjs/charts/lineChart/fragments/fixture/contextData.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/fragments/fixture/contextData.js +8 -6
- package/dist/cjs/charts/lineChart/fragments/lineChartPath.js +3 -3
- package/dist/cjs/charts/lineChart/fragments/lineChartXAxis.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/fragments/lineChartXAxis.js +3 -8
- package/dist/cjs/charts/lineChart/fragments/lineChartYAxis.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/fragments/lineChartYAxis.js +9 -9
- package/dist/cjs/charts/lineChart/lineChart.type.d.ts +12 -7
- package/dist/cjs/charts/lineChart/lineChart.type.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/lineChartStructure.js +11 -10
- package/dist/cjs/charts/lineChart/utils/getCoordinates.d.ts +25 -0
- package/dist/cjs/charts/lineChart/utils/getCoordinates.d.ts.map +1 -0
- package/dist/cjs/charts/lineChart/utils/getCoordinates.js +55 -0
- package/dist/cjs/charts/lineChart/utils/getExtraSpacing.d.ts +1 -3
- package/dist/cjs/charts/lineChart/utils/getExtraSpacing.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/utils/getExtraSpacing.js +68 -51
- package/dist/cjs/charts/lineChart/utils/getTicks.d.ts +21 -0
- package/dist/cjs/charts/lineChart/utils/getTicks.d.ts.map +1 -0
- package/dist/cjs/charts/lineChart/utils/getTicks.js +36 -0
- package/dist/cjs/charts/lineChart/utils/handleNodesFocus.d.ts.map +1 -1
- package/dist/cjs/charts/lineChart/utils/handleNodesFocus.js +14 -25
- package/dist/cjs/charts/lineChart/utils/tickTextPosition.d.ts +33 -0
- package/dist/cjs/charts/lineChart/utils/tickTextPosition.d.ts.map +1 -0
- package/dist/cjs/charts/lineChart/utils/tickTextPosition.js +109 -0
- package/dist/cjs/charts/lineChart/utils/validations.d.ts +54 -0
- package/dist/cjs/charts/lineChart/utils/validations.d.ts.map +1 -0
- package/dist/cjs/charts/lineChart/utils/validations.js +117 -0
- package/dist/cjs/components/chartText/chartText.d.ts.map +1 -1
- package/dist/cjs/components/chartText/chartText.js +2 -2
- package/dist/cjs/components/line/line.d.ts.map +1 -1
- package/dist/cjs/components/line/line.js +2 -2
- package/dist/cjs/components/line/line.types.d.ts +2 -0
- package/dist/cjs/components/line/line.types.d.ts.map +1 -1
- package/dist/cjs/components/node/node.d.ts.map +1 -1
- package/dist/cjs/components/node/node.js +1 -1
- package/dist/cjs/components/node/node.types.d.ts +2 -0
- package/dist/cjs/components/node/node.types.d.ts.map +1 -1
- package/dist/cjs/components/path/path.js +1 -1
- package/dist/cjs/utils/pickCustomAttributes/pickCustomAttributes.d.ts +7 -6
- package/dist/cjs/utils/pickCustomAttributes/pickCustomAttributes.d.ts.map +1 -1
- package/dist/cjs/utils/pickCustomAttributes/pickCustomAttributes.js +8 -7
- package/dist/esm/charts/lineChart/context/buildLineContextValue.d.ts +1 -3
- package/dist/esm/charts/lineChart/context/buildLineContextValue.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/context/buildLineContextValue.js +64 -128
- package/dist/esm/charts/lineChart/fragments/fixture/contextData.d.ts +2 -43
- package/dist/esm/charts/lineChart/fragments/fixture/contextData.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/fragments/fixture/contextData.js +8 -6
- package/dist/esm/charts/lineChart/fragments/lineChartPath.js +3 -3
- package/dist/esm/charts/lineChart/fragments/lineChartXAxis.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/fragments/lineChartXAxis.js +3 -8
- package/dist/esm/charts/lineChart/fragments/lineChartYAxis.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/fragments/lineChartYAxis.js +9 -9
- package/dist/esm/charts/lineChart/lineChart.type.d.ts +12 -7
- package/dist/esm/charts/lineChart/lineChart.type.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/lineChartStructure.js +11 -10
- package/dist/esm/charts/lineChart/utils/getCoordinates.d.ts +25 -0
- package/dist/esm/charts/lineChart/utils/getCoordinates.d.ts.map +1 -0
- package/dist/esm/charts/lineChart/utils/getCoordinates.js +55 -0
- package/dist/esm/charts/lineChart/utils/getExtraSpacing.d.ts +1 -3
- package/dist/esm/charts/lineChart/utils/getExtraSpacing.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/utils/getExtraSpacing.js +68 -51
- package/dist/esm/charts/lineChart/utils/getTicks.d.ts +21 -0
- package/dist/esm/charts/lineChart/utils/getTicks.d.ts.map +1 -0
- package/dist/esm/charts/lineChart/utils/getTicks.js +36 -0
- package/dist/esm/charts/lineChart/utils/handleNodesFocus.d.ts.map +1 -1
- package/dist/esm/charts/lineChart/utils/handleNodesFocus.js +14 -25
- package/dist/esm/charts/lineChart/utils/tickTextPosition.d.ts +33 -0
- package/dist/esm/charts/lineChart/utils/tickTextPosition.d.ts.map +1 -0
- package/dist/esm/charts/lineChart/utils/tickTextPosition.js +109 -0
- package/dist/esm/charts/lineChart/utils/validations.d.ts +54 -0
- package/dist/esm/charts/lineChart/utils/validations.d.ts.map +1 -0
- package/dist/esm/charts/lineChart/utils/validations.js +117 -0
- package/dist/esm/components/chartText/chartText.d.ts.map +1 -1
- package/dist/esm/components/chartText/chartText.js +2 -2
- package/dist/esm/components/line/line.d.ts.map +1 -1
- package/dist/esm/components/line/line.js +2 -2
- package/dist/esm/components/line/line.types.d.ts +2 -0
- package/dist/esm/components/line/line.types.d.ts.map +1 -1
- package/dist/esm/components/node/node.d.ts.map +1 -1
- package/dist/esm/components/node/node.js +1 -1
- package/dist/esm/components/node/node.types.d.ts +2 -0
- package/dist/esm/components/node/node.types.d.ts.map +1 -1
- package/dist/esm/components/path/path.js +1 -1
- package/dist/esm/utils/pickCustomAttributes/pickCustomAttributes.d.ts +7 -6
- package/dist/esm/utils/pickCustomAttributes/pickCustomAttributes.d.ts.map +1 -1
- package/dist/esm/utils/pickCustomAttributes/pickCustomAttributes.js +8 -7
- package/dist/kubit-ui-web-react-charts.cjs.js +1 -1
- package/dist/kubit-ui-web-react-charts.es.js +1 -1
- package/dist/kubit-ui-web-react-charts.umd.js +1 -1
- package/dist/types/charts/lineChart/context/buildLineContextValue.d.ts +1 -3
- package/dist/types/charts/lineChart/context/buildLineContextValue.d.ts.map +1 -1
- package/dist/types/charts/lineChart/fragments/fixture/contextData.d.ts +2 -43
- package/dist/types/charts/lineChart/fragments/fixture/contextData.d.ts.map +1 -1
- package/dist/types/charts/lineChart/fragments/lineChartXAxis.d.ts.map +1 -1
- package/dist/types/charts/lineChart/fragments/lineChartYAxis.d.ts.map +1 -1
- package/dist/types/charts/lineChart/lineChart.type.d.ts +12 -7
- package/dist/types/charts/lineChart/lineChart.type.d.ts.map +1 -1
- package/dist/types/charts/lineChart/utils/getCoordinates.d.ts +25 -0
- package/dist/types/charts/lineChart/utils/getCoordinates.d.ts.map +1 -0
- package/dist/types/charts/lineChart/utils/getExtraSpacing.d.ts +1 -3
- package/dist/types/charts/lineChart/utils/getExtraSpacing.d.ts.map +1 -1
- package/dist/types/charts/lineChart/utils/getTicks.d.ts +21 -0
- package/dist/types/charts/lineChart/utils/getTicks.d.ts.map +1 -0
- package/dist/types/charts/lineChart/utils/handleNodesFocus.d.ts.map +1 -1
- package/dist/types/charts/lineChart/utils/tickTextPosition.d.ts +33 -0
- package/dist/types/charts/lineChart/utils/tickTextPosition.d.ts.map +1 -0
- package/dist/types/charts/lineChart/utils/validations.d.ts +54 -0
- package/dist/types/charts/lineChart/utils/validations.d.ts.map +1 -0
- package/dist/types/components/chartText/chartText.d.ts.map +1 -1
- package/dist/types/components/line/line.d.ts.map +1 -1
- package/dist/types/components/line/line.types.d.ts +2 -0
- package/dist/types/components/line/line.types.d.ts.map +1 -1
- package/dist/types/components/node/node.d.ts.map +1 -1
- package/dist/types/components/node/node.types.d.ts +2 -0
- package/dist/types/components/node/node.types.d.ts.map +1 -1
- package/dist/types/utils/pickCustomAttributes/pickCustomAttributes.d.ts +7 -6
- package/dist/types/utils/pickCustomAttributes/pickCustomAttributes.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -4,8 +4,6 @@ interface BuildContextValue {
|
|
|
4
4
|
children: ChildrenType;
|
|
5
5
|
data: IDataPoint[];
|
|
6
6
|
xKey: string;
|
|
7
|
-
ajustedX: number;
|
|
8
|
-
ajustedY: number;
|
|
9
7
|
canvasHeight: number;
|
|
10
8
|
canvasWidth: number;
|
|
11
9
|
viewBox: string;
|
|
@@ -18,6 +16,6 @@ type OmitProps = 'data' | 'xKey' | 'canvasHeight' | 'canvasWidth' | 'canvasExtra
|
|
|
18
16
|
* @param {BuildContextValue} options - The options for building the context value.
|
|
19
17
|
* @returns {LineContextValue} - The built context value.
|
|
20
18
|
*/
|
|
21
|
-
export declare const buildLineContextValue: ({ addError,
|
|
19
|
+
export declare const buildLineContextValue: ({ addError, canvasHeight, canvasWidth, children, data, viewBox, xKey, }: BuildContextValue) => Omit<LineChartContextType, OmitProps>;
|
|
22
20
|
export {};
|
|
23
21
|
//# sourceMappingURL=buildLineContextValue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildLineContextValue.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/context/buildLineContextValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"buildLineContextValue.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/context/buildLineContextValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAUjE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAaxF,UAAU,iBAAiB;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,UAAU,EAAE,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,OAAO,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;CACzF;AAED,KAAK,SAAS,GACV,MAAM,GACN,MAAM,GACN,cAAc,GACd,aAAa,GACb,kBAAkB,GAClB,YAAY,GACZ,YAAY,GACZ,SAAS,GACT,SAAS,CAAC;AAEd;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,yEAQnC,iBAAiB,KAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAkN1D,CAAC"}
|
|
@@ -1,40 +1,29 @@
|
|
|
1
1
|
import { ErrorType } from '../../../types/errors.type';
|
|
2
2
|
import { Positions } from '../../../types/position.enum';
|
|
3
|
-
import { BuildError, buildCanvasDimensionsError, buildError, } from '../../../utils/buildErrors/buildErrors';
|
|
4
|
-
import { getXCoordinates, getYCoordinates } from '../../../utils/getCoordinates/getCoordinates';
|
|
5
3
|
import { getPoints } from '../../../utils/getPoints/getPoints';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
4
|
+
import { BREAK_AXIS_DEFAULTS, CHART_CANVAS_DEFAULTS, LINE_CHART_FALLBACK_DATA, SHARED_FALLBACK_DATA, } from '../../constants/chartDefaults';
|
|
5
|
+
import { getXCoordinates, getYCoordinates } from '../utils/getCoordinates';
|
|
8
6
|
import { getExtraSpacing } from '../utils/getExtraSpacing';
|
|
7
|
+
import { getXTicks, getYTicks } from '../utils/getTicks';
|
|
8
|
+
import { validateCanvasDimensions, validateData, validateXCoordinates, validateXTickValues, validateYCoordinates, validateYTickValues, } from '../utils/validations';
|
|
9
9
|
/**
|
|
10
10
|
* Builds the context value for the line chart.
|
|
11
11
|
*
|
|
12
12
|
* @param {BuildContextValue} options - The options for building the context value.
|
|
13
13
|
* @returns {LineContextValue} - The built context value.
|
|
14
14
|
*/
|
|
15
|
-
export const buildLineContextValue = ({ addError,
|
|
15
|
+
export const buildLineContextValue = ({ addError, canvasHeight, canvasWidth, children, data, viewBox, xKey, }) => {
|
|
16
16
|
let error = undefined;
|
|
17
|
-
|
|
18
|
-
if (
|
|
19
|
-
const dataError = {
|
|
20
|
-
error: buildError(BuildError.LINE_CHART_NO_DATA),
|
|
21
|
-
};
|
|
22
|
-
addError?.('LINE_CHART_CONTEXT_ERROR', dataError);
|
|
17
|
+
const { error: dataError } = validateData({ data, addError });
|
|
18
|
+
if (dataError) {
|
|
23
19
|
error = dataError;
|
|
24
20
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
// 2. Validate canvas dimensions
|
|
33
|
-
if (canvasWidth <= 0 || canvasHeight <= 0) {
|
|
34
|
-
const canvasError = {
|
|
35
|
-
error: buildCanvasDimensionsError(canvasWidth, canvasHeight),
|
|
36
|
-
};
|
|
37
|
-
addError?.('LINE_CHART_CONTEXT_ERROR', canvasError);
|
|
21
|
+
const { error: canvasError } = validateCanvasDimensions({
|
|
22
|
+
canvasWidth,
|
|
23
|
+
canvasHeight,
|
|
24
|
+
addError,
|
|
25
|
+
});
|
|
26
|
+
if (canvasError) {
|
|
38
27
|
error = canvasError;
|
|
39
28
|
}
|
|
40
29
|
// Use safe defaults for data processing if there are critical errors
|
|
@@ -55,9 +44,7 @@ export const buildLineContextValue = ({ addError, ajustedX, ajustedY, canvasHeig
|
|
|
55
44
|
/**
|
|
56
45
|
* Get the extra spacings for the line chart.
|
|
57
46
|
*/
|
|
58
|
-
const {
|
|
59
|
-
ajustedX,
|
|
60
|
-
ajustedY,
|
|
47
|
+
const { xAxisLeftSpacing, xAxisTopSpacing, xAxisRightSpacing, xAxisBottomSpacing, yAxisLeftSpacing, yAxisTopSpacing, yAxisRightSpacing, yAxisBottomSpacing, lineChartXPosition, lineChartYPosition, xAxisText, xBreakAxis, xData, yAxisText, yBreakAxis, yData, } = getExtraSpacing({
|
|
61
48
|
canvasHeight: safeCanvasHeight,
|
|
62
49
|
canvasWidth: safeCanvasWidth,
|
|
63
50
|
children,
|
|
@@ -65,85 +52,35 @@ export const buildLineContextValue = ({ addError, ajustedX, ajustedY, canvasHeig
|
|
|
65
52
|
viewBox,
|
|
66
53
|
xKey,
|
|
67
54
|
});
|
|
68
|
-
/**
|
|
69
|
-
* Calculate the tick values for the X Axis.
|
|
70
|
-
*/
|
|
71
|
-
const crossXAxis = lineChartXPosition !== Positions.TOP && lineChartXPosition !== Positions.BOTTOM;
|
|
72
|
-
const yAxisSpace = extraSpaceLeftX + extraSpaceRightX;
|
|
73
55
|
const xTickValues = getXTicks({
|
|
74
|
-
initPos: extraSpaceLeftX,
|
|
75
|
-
maxSpaceAvailable: safeCanvasWidth,
|
|
76
|
-
otherAxisSpace: yAxisSpace,
|
|
77
|
-
securitySpace: securityXSpace,
|
|
78
56
|
tickValues: xData,
|
|
57
|
+
maxSpaceAvailable: safeCanvasWidth,
|
|
58
|
+
xAxisLeftSpacing,
|
|
59
|
+
xAxisRightSpacing,
|
|
60
|
+
yAxisLeftSpacing,
|
|
61
|
+
yAxisRightSpacing,
|
|
79
62
|
});
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
error: buildError(BuildError.INVALID_X_TICK),
|
|
83
|
-
};
|
|
84
|
-
addError?.('LINE_CHART_CONTEXT_ERROR', xTickError);
|
|
63
|
+
const { error: xTickError } = validateXTickValues({ xTickValues, addError });
|
|
64
|
+
if (!error && xTickError) {
|
|
85
65
|
error = xTickError;
|
|
86
66
|
}
|
|
87
|
-
// Validate X-axis tick values
|
|
88
|
-
if (xTickValues) {
|
|
89
|
-
const hasInsufficientTicks = xTickValues.length < AXIS_VALIDATION.MIN_TICK_COUNT;
|
|
90
|
-
const hasIdenticalValues = xTickValues.length >= AXIS_VALIDATION.MIN_TICK_COUNT &&
|
|
91
|
-
new Set(xTickValues.map(tick => tick.value)).size === AXIS_VALIDATION.UNIQUE_VALUE_THRESHOLD;
|
|
92
|
-
if (hasInsufficientTicks) {
|
|
93
|
-
const xAxisError = {
|
|
94
|
-
error: buildError(BuildError.LINE_CHART_X_AXIS_INSUFFICIENT_TICKS),
|
|
95
|
-
};
|
|
96
|
-
addError?.('LINE_CHART_X_AXIS_ERROR', xAxisError);
|
|
97
|
-
if (!error) {
|
|
98
|
-
error = xAxisError;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
if (hasIdenticalValues) {
|
|
102
|
-
const xAxisError = {
|
|
103
|
-
error: buildError(BuildError.LINE_CHART_X_AXIS_IDENTICAL_VALUES),
|
|
104
|
-
};
|
|
105
|
-
addError?.('LINE_CHART_X_AXIS_ERROR', xAxisError);
|
|
106
|
-
if (!error) {
|
|
107
|
-
error = xAxisError;
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
67
|
/**
|
|
112
68
|
* Calculate the tick values for the Y Axis.
|
|
113
69
|
*/
|
|
114
|
-
const crossYAxis = lineChartYPosition !== Positions.LEFT && lineChartYPosition !== Positions.RIGHT;
|
|
115
|
-
const otherAxisSpace = extraSpaceTopY + extraSpaceBottomY;
|
|
116
70
|
const yTickValues = getYTicks({
|
|
117
|
-
initPos: safeCanvasHeight - extraSpaceBottomY,
|
|
118
71
|
maxSpaceAvailable: safeCanvasHeight,
|
|
119
|
-
otherAxisSpace,
|
|
120
|
-
securitySpace: securityYSpace,
|
|
121
72
|
tickValues: yData,
|
|
73
|
+
xAxisTopSpacing,
|
|
74
|
+
xAxisBottomSpacing,
|
|
75
|
+
yAxisTopSpacing,
|
|
76
|
+
yAxisBottomSpacing,
|
|
122
77
|
});
|
|
123
|
-
|
|
124
|
-
if (
|
|
125
|
-
|
|
126
|
-
const hasIdenticalValues = yTickValues.length >= AXIS_VALIDATION.MIN_TICK_COUNT &&
|
|
127
|
-
new Set(yTickValues.map(tick => tick.value)).size === AXIS_VALIDATION.UNIQUE_VALUE_THRESHOLD;
|
|
128
|
-
if (hasInsufficientTicks) {
|
|
129
|
-
const yAxisError = {
|
|
130
|
-
error: buildError(BuildError.LINE_CHART_Y_AXIS_INSUFFICIENT_TICKS),
|
|
131
|
-
};
|
|
132
|
-
addError?.('LINE_CHART_Y_AXIS_ERROR', yAxisError);
|
|
133
|
-
if (!error) {
|
|
134
|
-
error = yAxisError;
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
if (hasIdenticalValues) {
|
|
138
|
-
const yAxisError = {
|
|
139
|
-
error: buildError(BuildError.LINE_CHART_Y_AXIS_IDENTICAL_VALUES),
|
|
140
|
-
};
|
|
141
|
-
addError?.('LINE_CHART_Y_AXIS_ERROR', yAxisError);
|
|
142
|
-
if (!error) {
|
|
143
|
-
error = yAxisError;
|
|
144
|
-
}
|
|
145
|
-
}
|
|
78
|
+
const { error: yTickError } = validateYTickValues({ yTickValues, addError });
|
|
79
|
+
if (!error && yTickError) {
|
|
80
|
+
error = yTickError;
|
|
146
81
|
}
|
|
82
|
+
const crossXAxis = lineChartXPosition !== Positions.TOP && lineChartXPosition !== Positions.BOTTOM;
|
|
83
|
+
const crossYAxis = lineChartYPosition !== Positions.LEFT && lineChartYPosition !== Positions.RIGHT;
|
|
147
84
|
/**
|
|
148
85
|
* Calculate the custom breakAxis for the X and Y Axis.
|
|
149
86
|
*/
|
|
@@ -160,12 +97,16 @@ export const buildLineContextValue = ({ addError, ajustedX, ajustedY, canvasHeig
|
|
|
160
97
|
canvasHeight: safeCanvasHeight,
|
|
161
98
|
canvasWidth: safeCanvasWidth,
|
|
162
99
|
customBreakAxis: Number(customBreakXAxis),
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
100
|
+
lineChartXPosition,
|
|
101
|
+
lineChartYPosition,
|
|
102
|
+
xAxisLeftSpacing,
|
|
103
|
+
xAxisTopSpacing,
|
|
104
|
+
xAxisRightSpacing,
|
|
105
|
+
xAxisBottomSpacing,
|
|
106
|
+
yAxisLeftSpacing,
|
|
107
|
+
yAxisTopSpacing,
|
|
108
|
+
yAxisRightSpacing,
|
|
109
|
+
yAxisBottomSpacing,
|
|
169
110
|
});
|
|
170
111
|
/**
|
|
171
112
|
* Calculate the Y coordinates for the line chart.
|
|
@@ -174,42 +115,37 @@ export const buildLineContextValue = ({ addError, ajustedX, ajustedY, canvasHeig
|
|
|
174
115
|
canvasHeight: safeCanvasHeight,
|
|
175
116
|
canvasWidth: safeCanvasWidth,
|
|
176
117
|
customBreakAxis: Number(customBreakYAxis),
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
118
|
+
lineChartXPosition,
|
|
119
|
+
lineChartYPosition,
|
|
120
|
+
xAxisLeftSpacing,
|
|
121
|
+
xAxisTopSpacing,
|
|
122
|
+
xAxisRightSpacing,
|
|
123
|
+
xAxisBottomSpacing,
|
|
124
|
+
yAxisLeftSpacing,
|
|
125
|
+
yAxisTopSpacing,
|
|
126
|
+
yAxisRightSpacing,
|
|
127
|
+
yAxisBottomSpacing,
|
|
183
128
|
});
|
|
184
|
-
|
|
185
|
-
if (
|
|
186
|
-
|
|
187
|
-
error: buildError(BuildError.LINE_CHART_X_AXIS_ZERO_LENGTH),
|
|
188
|
-
};
|
|
189
|
-
addError?.('LINE_CHART_X_AXIS_ERROR', xAxisError);
|
|
190
|
-
if (!error) {
|
|
191
|
-
error = xAxisError;
|
|
192
|
-
}
|
|
129
|
+
const { error: xCoordinatesError } = validateXCoordinates({ xCoordinates, addError });
|
|
130
|
+
if (!error && xCoordinatesError) {
|
|
131
|
+
error = xCoordinatesError;
|
|
193
132
|
}
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
};
|
|
198
|
-
addError?.('LINE_CHART_Y_AXIS_ERROR', yAxisError);
|
|
199
|
-
if (!error) {
|
|
200
|
-
error = yAxisError;
|
|
201
|
-
}
|
|
133
|
+
const { error: yCoordinatesError } = validateYCoordinates({ yCoordinates, addError });
|
|
134
|
+
if (!error && yCoordinatesError) {
|
|
135
|
+
error = yCoordinatesError;
|
|
202
136
|
}
|
|
203
137
|
const baseContext = {
|
|
204
138
|
addError,
|
|
205
139
|
crossXAxis,
|
|
206
140
|
crossYAxis,
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
141
|
+
xAxisLeftSpacing,
|
|
142
|
+
xAxisTopSpacing,
|
|
143
|
+
xAxisRightSpacing,
|
|
144
|
+
xAxisBottomSpacing,
|
|
145
|
+
yAxisLeftSpacing,
|
|
146
|
+
yAxisTopSpacing,
|
|
147
|
+
yAxisRightSpacing,
|
|
148
|
+
yAxisBottomSpacing,
|
|
213
149
|
xAxisCoordinates: {
|
|
214
150
|
coordinates: xCoordinates,
|
|
215
151
|
tickValues: xTickValues ||
|
|
@@ -1,44 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const CONTEXT:
|
|
3
|
-
addError: undefined;
|
|
4
|
-
canvasExtraSpace: number;
|
|
5
|
-
canvasHeight: number;
|
|
6
|
-
canvasWidth: number;
|
|
7
|
-
crossXAxis: boolean;
|
|
8
|
-
crossYAxis: boolean;
|
|
9
|
-
data: {
|
|
10
|
-
testKey: number;
|
|
11
|
-
xKey: number;
|
|
12
|
-
}[];
|
|
13
|
-
dataTestId: string;
|
|
14
|
-
extraSpaceBottomY: number;
|
|
15
|
-
extraSpaceLeftX: number;
|
|
16
|
-
extraSpaceRightX: number;
|
|
17
|
-
extraSpaceTopY: number;
|
|
18
|
-
securityXSpace: number;
|
|
19
|
-
securityYSpace: number;
|
|
20
|
-
xAxisCoordinates: {
|
|
21
|
-
coordinates: {
|
|
22
|
-
x1: number;
|
|
23
|
-
x2: number;
|
|
24
|
-
y1: number;
|
|
25
|
-
y2: number;
|
|
26
|
-
};
|
|
27
|
-
tickValues: TickData[];
|
|
28
|
-
};
|
|
29
|
-
xAxisText: number;
|
|
30
|
-
xCursor: number;
|
|
31
|
-
xKey: string;
|
|
32
|
-
yAxisCoordinates: {
|
|
33
|
-
coordinates: {
|
|
34
|
-
x1: number;
|
|
35
|
-
x2: number;
|
|
36
|
-
y1: number;
|
|
37
|
-
y2: number;
|
|
38
|
-
};
|
|
39
|
-
tickValues: TickData[];
|
|
40
|
-
};
|
|
41
|
-
yAxisText: number;
|
|
42
|
-
yCursor: number;
|
|
43
|
-
};
|
|
1
|
+
import type { LineChartContextType } from '../../lineChart.type';
|
|
2
|
+
export declare const CONTEXT: LineChartContextType;
|
|
44
3
|
//# sourceMappingURL=contextData.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contextData.d.ts","sourceRoot":"","sources":["../../../../../../src/charts/lineChart/fragments/fixture/contextData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contextData.d.ts","sourceRoot":"","sources":["../../../../../../src/charts/lineChart/fragments/fixture/contextData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,eAAO,MAAM,OAAO,EAAE,oBA0CrB,CAAC"}
|
|
@@ -11,12 +11,14 @@ export const CONTEXT = {
|
|
|
11
11
|
{ testKey: 30, xKey: 3 },
|
|
12
12
|
],
|
|
13
13
|
dataTestId: 'test',
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
xAxisLeftSpacing: 0,
|
|
15
|
+
xAxisTopSpacing: 0,
|
|
16
|
+
xAxisRightSpacing: 0,
|
|
17
|
+
xAxisBottomSpacing: 0,
|
|
18
|
+
yAxisLeftSpacing: 0,
|
|
19
|
+
yAxisTopSpacing: 0,
|
|
20
|
+
yAxisRightSpacing: 0,
|
|
21
|
+
yAxisBottomSpacing: 0,
|
|
20
22
|
xAxisCoordinates: {
|
|
21
23
|
coordinates: { x1: 0, x2: 100, y1: 0, y2: 0 },
|
|
22
24
|
tickValues: [
|
|
@@ -85,13 +85,13 @@ export const LineChartPath = ({ ariaLabel, closestClick, curved, getNodeFocusInf
|
|
|
85
85
|
curved,
|
|
86
86
|
extendToBottom: false,
|
|
87
87
|
points,
|
|
88
|
-
svgHeight:
|
|
88
|
+
svgHeight: yAxisCoordinates.coordinates.y2,
|
|
89
89
|
});
|
|
90
90
|
const dataFill = getPathData({
|
|
91
91
|
curved,
|
|
92
92
|
extendToBottom: !!props.fill || !!props.gradient,
|
|
93
93
|
points,
|
|
94
|
-
svgHeight:
|
|
94
|
+
svgHeight: yAxisCoordinates.coordinates.y2,
|
|
95
95
|
});
|
|
96
96
|
// the ref to the path and handler the nodes focus
|
|
97
97
|
useEffect(() => {
|
|
@@ -145,5 +145,5 @@ export const LineChartPath = ({ ariaLabel, closestClick, curved, getNodeFocusInf
|
|
|
145
145
|
// Handle deprecated ariaLabel - give precedence to ariaLabel for backward compatibility
|
|
146
146
|
...(ariaLabel && { 'aria-label': ariaLabel }),
|
|
147
147
|
};
|
|
148
|
-
return (_jsxs(_Fragment, { children: [_jsx(Path, { ref: innerRefs, d: dataOnlyLine, dFill: dataFill, dataTestId: `${context.dataTestId}path`, dataValue: context.data, points: points, xKey: context.xKey, onClick: handleClick, ...mergedProps }), lineProjection && (_jsx(LineChartProjection, { curved: curved, dataKey: props.dataKey, lineProjection: lineProjection, points: points, svgHeight:
|
|
148
|
+
return (_jsxs(_Fragment, { children: [_jsx(Path, { ref: innerRefs, d: dataOnlyLine, dFill: dataFill, dataTestId: `${context.dataTestId}path`, dataValue: context.data, points: points, xKey: context.xKey, onClick: handleClick, ...mergedProps }), lineProjection && (_jsx(LineChartProjection, { curved: curved, dataKey: props.dataKey, lineProjection: lineProjection, points: points, svgHeight: yAxisCoordinates.coordinates.y2 })), showIndicator && (_jsxs(_Fragment, { children: [!!lineIndicator && isCursorWithinPathArea && (_jsx(Line, { ...lineIndicator, className: "pointer-events-none", x1: context.xCursor, x2: context.xCursor, y1: y1, y2: y2 })), _jsx("g", { ref: indicatorRef, className: "pointer-events-none", children: _jsx(Node, { ...nodeIndicatorConfig }) })] }))] }));
|
|
149
149
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineChartXAxis.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/fragments/lineChartXAxis.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAiC,MAAM,OAAO,CAAC;AAS/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"lineChartXAxis.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/fragments/lineChartXAxis.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAiC,MAAM,OAAO,CAAC;AAS/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAwDlD,CAAC"}
|
|
@@ -9,8 +9,6 @@ import { LineChartContext } from '../context/lineChartContext';
|
|
|
9
9
|
export const LineChartXAxis = ({ ariaLabel, position = Positions.BOTTOM, tickLine, tickText, valueFormatter = (value) => value, ...props }) => {
|
|
10
10
|
const { xAxisCoordinates: { coordinates, tickValues: contextTickValues }, xCursor, ...context } = useContext(LineChartContext);
|
|
11
11
|
const tickTextY = getTickTextYCoordinate(position, coordinates.y1, Number(tickText?.fontSize), tickText?.top ?? 0);
|
|
12
|
-
const y1 = context.extraSpaceTopY;
|
|
13
|
-
const y2 = Number(context.canvasHeight) - context.extraSpaceBottomY;
|
|
14
12
|
const tickValues = tickText
|
|
15
13
|
? TickDataUtils.formatTicksValues(contextTickValues, valueFormatter)
|
|
16
14
|
: undefined;
|
|
@@ -23,13 +21,10 @@ export const LineChartXAxis = ({ ariaLabel, position = Positions.BOTTOM, tickLin
|
|
|
23
21
|
...customAttributes,
|
|
24
22
|
...(finalAriaLabel && { 'aria-label': finalAriaLabel }),
|
|
25
23
|
};
|
|
26
|
-
return (_jsx(XAxis, { ...coordinates, ...mergedProps, canvasHeight: Number(context.canvasHeight), canvasWidth: Number(context.canvasWidth), cursor: xCursor, dataTestId: `${context.dataTestId}xAxis`,
|
|
27
|
-
left: context.extraSpaceLeftX,
|
|
28
|
-
right: context.extraSpaceRightX,
|
|
29
|
-
}, tickLine: {
|
|
24
|
+
return (_jsx(XAxis, { ...coordinates, ...mergedProps, canvasHeight: Number(context.canvasHeight), canvasWidth: Number(context.canvasWidth), cursor: xCursor, dataTestId: `${context.dataTestId}xAxis`, tickLine: {
|
|
30
25
|
...tickLine,
|
|
31
|
-
y1,
|
|
32
|
-
y2,
|
|
26
|
+
y1: context.yAxisCoordinates.coordinates.y1,
|
|
27
|
+
y2: context.yAxisCoordinates.coordinates.y2,
|
|
33
28
|
}, tickText: {
|
|
34
29
|
...tickText,
|
|
35
30
|
y: tickTextY,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineChartYAxis.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/fragments/lineChartYAxis.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lineChartYAxis.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/fragments/lineChartYAxis.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA4DxD,CAAC"}
|
|
@@ -3,10 +3,9 @@ import { useContext } from 'react';
|
|
|
3
3
|
import { YAxis } from '../../../components/axisChart/yAxis/yAxis';
|
|
4
4
|
import { TickDataUtils } from '../../../components/tick/tick.types';
|
|
5
5
|
import { Positions } from '../../../types/position.enum';
|
|
6
|
-
import { ajustedTextSpace } from '../../../utils/ajustedTextSpace/ajustedTextSpace';
|
|
7
|
-
import { getTickTextXCoordinate } from '../../../utils/getTickTextCoordinate/getTickTextCoordinates';
|
|
8
6
|
import { pickCustomAttributes } from '../../../utils/pickCustomAttributes/pickCustomAttributes';
|
|
9
7
|
import { LineChartContext } from '../context/lineChartContext';
|
|
8
|
+
import { getYAxisTextXCoordinate } from '../utils/tickTextPosition';
|
|
10
9
|
export const LineChartYAxis = ({ ariaLabel, position = Positions.LEFT, tickLine, tickText, valueFormatter = (value) => value,
|
|
11
10
|
// NOTE: tickValues prop is destructured but NOT USED - see TODO in lineChart.type.ts
|
|
12
11
|
...props }) => {
|
|
@@ -16,11 +15,12 @@ export const LineChartYAxis = ({ ariaLabel, position = Positions.LEFT, tickLine,
|
|
|
16
15
|
// 1. Check if props.tickValues exists
|
|
17
16
|
// 2. Use custom tick values instead of context values when provided
|
|
18
17
|
// 3. Update buildLineContextValue to handle custom Y-axis tick values
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
const xTickText = getYAxisTextXCoordinate({
|
|
19
|
+
tickText,
|
|
20
|
+
yAxisPosition: position,
|
|
21
|
+
textWidth: context.yAxisText,
|
|
22
|
+
yAxisX1: coordinates.x1,
|
|
23
|
+
});
|
|
24
24
|
const tickValues = tickText
|
|
25
25
|
? TickDataUtils.formatTicksValues(contextTickValues, valueFormatter)
|
|
26
26
|
: undefined;
|
|
@@ -35,7 +35,7 @@ export const LineChartYAxis = ({ ariaLabel, position = Positions.LEFT, tickLine,
|
|
|
35
35
|
};
|
|
36
36
|
return (_jsx(YAxis, { ...coordinates, ...mergedProps, canvasHeight: Number(context.canvasHeight), canvasWidth: Number(context.canvasWidth), cursor: yCursor, dataTestId: `${context.dataTestId}yAxis`, tickLine: {
|
|
37
37
|
...tickLine,
|
|
38
|
-
x1: context.
|
|
39
|
-
x2:
|
|
38
|
+
x1: context.xAxisCoordinates.coordinates.x1,
|
|
39
|
+
x2: context.xAxisCoordinates.coordinates.x2,
|
|
40
40
|
}, tickText: { ...tickText, x: xTickText }, tickValues: tickValues }));
|
|
41
41
|
};
|
|
@@ -23,12 +23,14 @@ export interface LineChartCoordinatesData {
|
|
|
23
23
|
tickValues: TickData[];
|
|
24
24
|
}
|
|
25
25
|
export interface LineChartExtraSpacings {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
26
|
+
xAxisLeftSpacing: number;
|
|
27
|
+
xAxisTopSpacing: number;
|
|
28
|
+
xAxisRightSpacing: number;
|
|
29
|
+
xAxisBottomSpacing: number;
|
|
30
|
+
yAxisLeftSpacing: number;
|
|
31
|
+
yAxisTopSpacing: number;
|
|
32
|
+
yAxisRightSpacing: number;
|
|
33
|
+
yAxisBottomSpacing: number;
|
|
32
34
|
lineChartXPosition: (typeof Positions)[keyof typeof Positions];
|
|
33
35
|
lineChartYPosition: (typeof Positions)[keyof typeof Positions];
|
|
34
36
|
xData: string[];
|
|
@@ -104,13 +106,16 @@ export interface LineChartXAxisProps extends Omit<XAxisProps, OmitProps | 'ariaL
|
|
|
104
106
|
ariaLabel?: string;
|
|
105
107
|
[key: `data-${string}`]: string | number | boolean | undefined;
|
|
106
108
|
}
|
|
107
|
-
export interface LineChartYAxisProps extends Omit<YAxisProps, OmitProps | 'ariaLabel'>, React.AriaAttributes {
|
|
109
|
+
export interface LineChartYAxisProps extends Omit<YAxisProps, OmitProps | 'ariaLabel' | 'tickText'>, React.AriaAttributes {
|
|
108
110
|
/**
|
|
109
111
|
* TODO: This prop is defined in the interface but NOT IMPLEMENTED in LineChartYAxis component.
|
|
110
112
|
* The component currently ignores this prop and uses auto-generated tick values from context.
|
|
111
113
|
* Implementation needed in lineChartYAxis.tsx to properly handle custom tick values.
|
|
112
114
|
*/
|
|
113
115
|
tickValues?: TickValuesAxisProps;
|
|
116
|
+
tickText?: YAxisProps['tickText'] & {
|
|
117
|
+
useAxisAsOrigin?: boolean;
|
|
118
|
+
};
|
|
114
119
|
valueFormatter?: ValueFormatter;
|
|
115
120
|
/**
|
|
116
121
|
* @deprecated Use aria-label instead for better accessibility standards
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineChart.type.d.ts","sourceRoot":"","sources":["../../../../src/charts/lineChart/lineChart.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,YAAY,CAAC,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC,CAAC;AAEzF,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,oBAAoB,CAAC;IAClC,UAAU,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,
|
|
1
|
+
{"version":3,"file":"lineChart.type.d.ts","sourceRoot":"","sources":["../../../../src/charts/lineChart/lineChart.type.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,9 +60,6 @@ export const LineChartStructure = ({ ariaHidden, ariaLabel, canvasConfig = Defau
|
|
|
60
60
|
];
|
|
61
61
|
const arrayChildren = (Children.toArray(children) || []);
|
|
62
62
|
const chidrenWithDefaultAxis = defaultAxis.concat(arrayChildren);
|
|
63
|
-
const maxValue = Math.max(parsedCanvas.width, parsedCanvas.height, parsedCanvasExtraSpace ?? 0);
|
|
64
|
-
const ajustedX = isNaN(parsedCanvas.width / maxValue) ? 0 : parsedCanvas.width / maxValue;
|
|
65
|
-
const ajustedY = isNaN(parsedCanvas.height / maxValue) ? 0 : parsedCanvas.height / maxValue;
|
|
66
63
|
// watch the Y childs keys
|
|
67
64
|
getChildrenAttr({
|
|
68
65
|
attrName: 'dataKey',
|
|
@@ -79,8 +76,6 @@ export const LineChartStructure = ({ ariaHidden, ariaLabel, canvasConfig = Defau
|
|
|
79
76
|
addError: (errorType, error) => {
|
|
80
77
|
errorAccumulator.addError(errorType, error);
|
|
81
78
|
},
|
|
82
|
-
ajustedX,
|
|
83
|
-
ajustedY,
|
|
84
79
|
canvasHeight: parsedCanvas.height,
|
|
85
80
|
canvasWidth: parsedCanvas.width,
|
|
86
81
|
children: chidrenWithDefaultAxis,
|
|
@@ -117,12 +112,18 @@ export const LineChartStructure = ({ ariaHidden, ariaLabel, canvasConfig = Defau
|
|
|
117
112
|
}, [canvasWidth, canvasHeight]);
|
|
118
113
|
useEffect(() => {
|
|
119
114
|
getPathArea?.({
|
|
120
|
-
x1: contextValue.
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
y2:
|
|
115
|
+
x1: contextValue.xAxisCoordinates.coordinates.x1,
|
|
116
|
+
y1: contextValue.yAxisCoordinates.coordinates.y1,
|
|
117
|
+
x2: contextValue.xAxisCoordinates.coordinates.x2,
|
|
118
|
+
y2: contextValue.yAxisCoordinates.coordinates.y2,
|
|
124
119
|
});
|
|
125
|
-
}, [
|
|
120
|
+
}, [
|
|
121
|
+
contextValue.xAxisCoordinates.coordinates.x1,
|
|
122
|
+
contextValue.yAxisCoordinates.coordinates.y1,
|
|
123
|
+
contextValue.xAxisCoordinates.coordinates.x2,
|
|
124
|
+
contextValue.yAxisCoordinates.coordinates.y2,
|
|
125
|
+
getPathArea,
|
|
126
|
+
]);
|
|
126
127
|
return (_jsx(SvgContainer, { ref: svgRef, ariaHidden: ariaHidden, ariaLabel: ariaLabel, caption: caption, className: classNames, "data-kbt-svg": true, dataTestId: dataTestId, height: height, role: role, tabIndex: tabIndex, viewBox: viewBox, width: width, ...props, children: _jsx(LineChartContext.Provider, { value: {
|
|
127
128
|
...contextValue,
|
|
128
129
|
canvasExtraSpace: parsedCanvasExtraSpace,
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Positions } from '../../../types/position.enum';
|
|
2
|
+
type GetCoordinates = (params: {
|
|
3
|
+
lineChartXPosition: (typeof Positions)[keyof typeof Positions];
|
|
4
|
+
lineChartYPosition: (typeof Positions)[keyof typeof Positions];
|
|
5
|
+
canvasHeight: number;
|
|
6
|
+
canvasWidth: number;
|
|
7
|
+
customBreakAxis: number;
|
|
8
|
+
xAxisLeftSpacing: number;
|
|
9
|
+
xAxisTopSpacing: number;
|
|
10
|
+
xAxisRightSpacing: number;
|
|
11
|
+
xAxisBottomSpacing: number;
|
|
12
|
+
yAxisLeftSpacing: number;
|
|
13
|
+
yAxisTopSpacing: number;
|
|
14
|
+
yAxisRightSpacing: number;
|
|
15
|
+
yAxisBottomSpacing: number;
|
|
16
|
+
}) => {
|
|
17
|
+
x1: number;
|
|
18
|
+
x2: number;
|
|
19
|
+
y1: number;
|
|
20
|
+
y2: number;
|
|
21
|
+
};
|
|
22
|
+
export declare const getXCoordinates: GetCoordinates;
|
|
23
|
+
export declare const getYCoordinates: GetCoordinates;
|
|
24
|
+
export {};
|
|
25
|
+
//# sourceMappingURL=getCoordinates.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCoordinates.d.ts","sourceRoot":"","sources":["../../../../../src/charts/lineChart/utils/getCoordinates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE;IAC7B,kBAAkB,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;IAC/D,kBAAkB,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;CAC5B,KAAK;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD,eAAO,MAAM,eAAe,EAAE,cA2C7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,cAyC7B,CAAC"}
|