Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"clsx": "2.1.1",
"react-content-loader": "7.0.2",
"recharts": "2.12.7"
"recharts": "2.13.1"
},
"peerDependencies": {
"@ui5/webcomponents-react": "~2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/PieChart/PieChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
const hideDataLabel =
typeof measure.hideDataLabel === 'function' ? measure.hideDataLabel(props) : measure.hideDataLabel;
if (hideDataLabel || chartConfig.activeSegment === props.index) return null;
return Pie.renderLabelLineItem({}, props);
return Pie.renderLabelLineItem({}, props, undefined);
},
[chartConfig.activeSegment, measure.hideDataLabel]
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ interface IScatterChartConfig extends ICartesianChartConfig {
referenceLineX?: {
value?: number;
color?: string;
} & ReferenceLineProps;
//todo: remove "Omit" once ref type has been fixed
} & Omit<ReferenceLineProps, 'ref'>;
}

export interface ScatterChartProps extends Omit<IChartBaseProps<IScatterChartConfig>, 'dataset'> {
Expand Down
13 changes: 6 additions & 7 deletions packages/charts/src/interfaces/ICartesianChartConfig.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { BrushProps, ReferenceLineProps, XAxisProps, YAxisProps } from 'recharts';

//todo: remove ref Omit once types are fixed
export interface ICartesianChartConfig {
/**
* Defines whether the `YAxis` should be visible.
Expand All @@ -26,7 +26,6 @@ export interface ICartesianChartConfig {
gridVertical?: boolean;
gridHorizontal?: boolean;

//todo: remove "Omit" once ref type has been fixed
/**
* Defines whether it should be possible to zoom in on the chart.
* If this prop is applied and doesn't have a falsy value, a range slider is displayed on top of the chart, making it possible to zoom-in/zoom-out.
Expand Down Expand Up @@ -56,29 +55,29 @@ export interface ICartesianChartConfig {
referenceLine?: {
value?: number;
color?: string;
} & ReferenceLineProps;
} & Omit<ReferenceLineProps, 'ref'>;
/**
* Defines possible configurations for the `YAxis`.
*
* __Note:__ It is possible to overwrite internally used props. Please use with caution!
*/
yAxisConfig?: Omit<YAxisProps, 'mirror'>;
yAxisConfig?: Omit<YAxisProps, 'mirror' | 'ref'>;
/**
* Defines possible configurations for the `XAxis`.
*
* __Note:__ It is possible to overwrite internally used props. Please use with caution!
*/
xAxisConfig?: Omit<XAxisProps, 'mirror'>;
xAxisConfig?: Omit<XAxisProps, 'mirror' | 'ref'>;
/**
* Defines possible configurations for the second `YAxis`.
*
* __Note:__ It is possible to overwrite internally used props. Please use with caution!
*/
secondYAxisConfig?: Omit<YAxisProps, 'mirror'>;
secondYAxisConfig?: Omit<YAxisProps, 'mirror' | 'ref'>;
/**
* Defines possible configurations for the second `YAxis`.
*
* __Note:__ It is possible to overwrite internally used props. Please use with caution!
*/
secondXAxisConfig?: Omit<XAxisProps, 'mirror'>;
secondXAxisConfig?: Omit<XAxisProps, 'mirror' | 'ref'>;
}
21 changes: 14 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6014,7 +6014,7 @@ __metadata:
dependencies:
clsx: "npm:2.1.1"
react-content-loader: "npm:7.0.2"
recharts: "npm:2.12.7"
recharts: "npm:2.13.1"
peerDependencies:
"@ui5/webcomponents-react": ~2.3.0
"@ui5/webcomponents-react-base": ~2.3.0
Expand Down Expand Up @@ -18560,7 +18560,7 @@ __metadata:
languageName: node
linkType: hard

"react-is@npm:^16.10.2, react-is@npm:^16.13.1":
"react-is@npm:^16.13.1":
version: 16.13.1
resolution: "react-is@npm:16.13.1"
checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
Expand All @@ -18581,6 +18581,13 @@ __metadata:
languageName: node
linkType: hard

"react-is@npm:^18.3.1":
version: 18.3.1
resolution: "react-is@npm:18.3.1"
checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072
languageName: node
linkType: hard

"react-refresh@npm:^0.14.2":
version: 0.14.2
resolution: "react-refresh@npm:0.14.2"
Expand Down Expand Up @@ -18848,22 +18855,22 @@ __metadata:
languageName: node
linkType: hard

"recharts@npm:2.12.7":
version: 2.12.7
resolution: "recharts@npm:2.12.7"
"recharts@npm:2.13.1":
version: 2.13.1
resolution: "recharts@npm:2.13.1"
dependencies:
clsx: "npm:^2.0.0"
eventemitter3: "npm:^4.0.1"
lodash: "npm:^4.17.21"
react-is: "npm:^16.10.2"
react-is: "npm:^18.3.1"
react-smooth: "npm:^4.0.0"
recharts-scale: "npm:^0.4.4"
tiny-invariant: "npm:^1.3.1"
victory-vendor: "npm:^36.6.8"
peerDependencies:
react: ^16.0.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
checksum: 10c0/2522d841a1f4e4c0a37046ddb61fa958ac37a66df63dcd4c6cb9113e3f7a71892d74e44494a55bc40faa0afd74d9cf58fec3d2ce53a8ddf997e75367bdd033fc
checksum: 10c0/6bbab8e14397c4cbc73d1dcab48045c2a53650b53ac723713b6dad2367654647cf3a50e3de83678c34c76d5e8196341b9cf3e74a4344f842762e81d301b76a4e
languageName: node
linkType: hard

Expand Down
Loading