Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(charts): defaultProps deprecation warning (v5) #11028

Merged
merged 1 commit into from
Sep 19, 2024
Merged

fix(charts): defaultProps deprecation warning (v5) #11028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/react-charts/src/components/ChartArea/examples/ChartArea.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class BottomAlignedLegend extends React.Component {
themeColor={ChartThemeColor.cyan}
width={650}
>
<ChartAxis label="Years"/>
<ChartAxis label="Years" fixAxisLabelHeight />
<ChartAxis dependentAxis showGrid/>
<ChartGroup>
<ChartArea
Expand Down
1 change: 0 additions & 1 deletion packages/react-charts/src/components/ChartCursorContainer/ChartCursorContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ export const ChartCursorContainer: React.FunctionComponent<ChartCursorContainerP
);
};
ChartCursorContainer.displayName = 'ChartCursorContainer';
ChartCursorContainer.defaultProps = (VictoryCursorContainer as any).defaultProps;

// Note: VictoryCursorContainer.defaultEvents & VictoryContainer.role must be hoisted
hoistNonReactStatics(ChartCursorContainer, VictoryCursorContainer);
13 changes: 6 additions & 7 deletions packages/react-charts/src/components/ChartCursorTooltip/ChartCursorFlyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@ interface ChartCursorFlyoutProps extends VictoryCommonPrimitiveProps {
}

const ChartCursorFlyout = (props: ChartCursorFlyoutProps) => {
props = evaluateProps(props);
props = evaluateProps({
pathComponent: <Path />,
role: 'presentation',
shapeRendering: 'auto',
...props
});

return React.cloneElement(props.pathComponent, {
...props.events,
Expand All @@ -125,10 +130,4 @@ const ChartCursorFlyout = (props: ChartCursorFlyoutProps) => {
});
};

ChartCursorFlyout.defaultProps = {
pathComponent: <Path />,
role: 'presentation',
shapeRendering: 'auto'
};

export { ChartCursorFlyout };
41 changes: 23 additions & 18 deletions packages/react-charts/src/components/ChartUtils/chart-container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,30 @@ import { LineSegment } from 'victory-core';
* @public
*/
export const createContainer = (behaviorA: ContainerType, behaviorB: ContainerType) => {
const container: any = victoryCreateContainer(behaviorA, behaviorB);
const Container: any = victoryCreateContainer(behaviorA, behaviorB);
const isCursor = behaviorA === 'cursor' || behaviorB === 'cursor';
const isVoronoi = behaviorA === 'voronoi' || behaviorB === 'voronoi';

if (!container?.defaultProps) {
container.defaultProps = {};
}
if (isCursor) {
container.defaultProps.cursorLabelComponent = <ChartLabel textAnchor="start" />;
container.defaultProps.cursorComponent = (
<LineSegment
style={{
stroke: chart_container_cursor_line_Fill.var
}}
/>
);
}
if (isVoronoi) {
container.defaultProps.labelComponent = <ChartCursorTooltip />;
}
return container;
const containerWrapper = (props: any) => {
const containerProps = {
...(isCursor && {
cursorLabelComponent: <ChartLabel textAnchor="start" />,
cursorComponent: (
<LineSegment
style={{
stroke: chart_container_cursor_line_Fill.var
}}
/>
)
}),
...(isVoronoi && { labelComponent: <ChartCursorTooltip /> }),
...props
};
return <Container {...containerProps} />;
};
containerWrapper.defaultEvents = Container.defaultEvents;
containerWrapper.displayName = Container.displayName;
containerWrapper.role = Container.role;

return containerWrapper;
};
4 changes: 2 additions & 2 deletions packages/react-charts/src/components/ChartUtils/chart-tooltip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const getCursorTooltipPoniterOrientation = ({
* Returns props associated with legend data
* @private
*/
export const getLegendTooltipDataProps = (defaultProps: ChartLegendProps) =>
export const getLegendTooltipDataProps = (props: ChartLegendProps) =>
merge(
{
borderPadding: 0,
Expand All @@ -112,7 +112,7 @@ export const getLegendTooltipDataProps = (defaultProps: ChartLegendProps) =>
}
}
},
{ ...defaultProps }
{ ...props }
);

/**
Expand Down
1 change: 0 additions & 1 deletion packages/react-charts/src/components/ChartVoronoiContainer/ChartVoronoiContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ export const ChartVoronoiContainer: React.FunctionComponent<ChartVoronoiContaine
);
};
ChartVoronoiContainer.displayName = 'ChartVoronoiContainer';
ChartVoronoiContainer.defaultProps = (VictoryVoronoiContainer as any).defaultProps;

// Note: VictoryVoronoiContainer.defaultEvents & VictoryContainer.role must be hoisted
hoistNonReactStatics(ChartVoronoiContainer, VictoryVoronoiContainer);
Loading