Skip to content

Commit 0270049

Browse files
authoredFeb 6, 2024
Victory native type fixes (#2785)
1 parent 4197142 commit 0270049

30 files changed

+123
-50
lines changed
 

‎.changeset/short-ads-hug.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"victory-brush-container": patch
3+
"victory-cursor-container": patch
4+
"victory-line": patch
5+
"victory-native": patch
6+
"victory-selection-container": patch
7+
"victory-voronoi-container": patch
8+
"victory-zoom-container": patch
9+
---
10+
11+
Fix victory-native component prop types

‎packages/victory-brush-container/src/victory-brush-container.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,3 @@ export const brushContainerMixin = <TBase extends Constructor>(base: TBase) =>
216216
};
217217

218218
export const VictoryBrushContainer = brushContainerMixin(VictoryContainer);
219-
export type VictoryBrushContainer = typeof VictoryBrushContainer;

‎packages/victory-cursor-container/src/victory-cursor-container.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,3 @@ export function cursorContainerMixin<
210210
}
211211

212212
export const VictoryCursorContainer = cursorContainerMixin(VictoryContainer);
213-
export type VictoryCursorContainer = typeof VictoryCursorContainer;

‎packages/victory-line/src/victory-line.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class VictoryLineBase extends React.Component<VictoryLineProps> {
6363
DefaultTransitions.continuousPolarTransitions();
6464
static continuous = true;
6565

66-
static defaultProps = {
66+
static defaultProps: VictoryLineProps = {
6767
containerComponent: <VictoryContainer />,
6868
dataComponent: <Curve />,
6969
labelComponent: <VictoryLabel renderInPortal />,

‎packages/victory-native/src/components/victory-area.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
3-
import { VictoryArea as VictoryAreaBase } from "victory-area/es";
3+
import {
4+
VictoryArea as VictoryAreaBase,
5+
VictoryAreaProps,
6+
} from "victory-area/es";
47

58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { VictoryClipContainer } from "./victory-clip-container";
811
import { Area } from "./victory-primitives/area";
912
import { wrapCoreComponent } from "../helpers/wrap-core-component";
1013

11-
export const VictoryArea = wrapCoreComponent({
14+
export const VictoryArea = wrapCoreComponent<VictoryAreaProps>({
1215
Component: VictoryAreaBase,
1316
defaultProps: {
1417
...VictoryAreaBase.defaultProps,

‎packages/victory-native/src/components/victory-axis.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryAxis as VictoryAxisBase } from "victory-axis/es";
4+
import {
5+
VictoryAxis as VictoryAxisBase,
6+
VictoryAxisProps,
7+
} from "victory-axis/es";
58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { LineSegment } from "./victory-primitives/line-segment";
811
import { wrapCoreComponent } from "../helpers/wrap-core-component";
912

10-
export const VictoryAxis = wrapCoreComponent({
13+
export const VictoryAxis = wrapCoreComponent<VictoryAxisProps>({
1114
Component: VictoryAxisBase,
1215
defaultProps: {
1316
...VictoryAxisBase.defaultProps,

‎packages/victory-native/src/components/victory-bar.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { G } from "react-native-svg";
44
import { VictoryLabel } from "./victory-label";
55
import { VictoryContainer } from "./victory-container";
66
import { Bar } from "./victory-primitives/bar";
7-
import { VictoryBar as VictoryBarBase } from "victory-bar/es";
7+
import { VictoryBar as VictoryBarBase, VictoryBarProps } from "victory-bar/es";
88
import { wrapCoreComponent } from "../helpers/wrap-core-component";
99

10-
export const VictoryBar = wrapCoreComponent({
10+
export const VictoryBar = wrapCoreComponent<VictoryBarProps>({
1111
Component: VictoryBarBase,
1212
defaultProps: {
1313
...VictoryBarBase.defaultProps,

‎packages/victory-native/src/components/victory-boxplot.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryBoxPlot as VictoryBoxPlotBase } from "victory-box-plot/es";
4+
import {
5+
VictoryBoxPlot as VictoryBoxPlotBase,
6+
VictoryBoxPlotProps,
7+
} from "victory-box-plot/es";
58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { Border } from "./victory-primitives/border";
811
import { Whisker } from "./victory-primitives/whisker";
912
import { LineSegment } from "./victory-primitives/line-segment";
1013
import { wrapCoreComponent } from "../helpers/wrap-core-component";
1114

12-
export const VictoryBoxPlot = wrapCoreComponent({
15+
export const VictoryBoxPlot = wrapCoreComponent<VictoryBoxPlotProps>({
1316
Component: VictoryBoxPlotBase,
1417
defaultProps: {
1518
...VictoryBoxPlotBase.defaultProps,

‎packages/victory-native/src/components/victory-brush-container.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,14 @@ function nativeBrushMixin<
8181
};
8282
}
8383

84-
const combinedMixin = flow(originalBrushMixin, nativeBrushMixin);
84+
const combinedMixin: (
85+
base: React.ComponentClass,
86+
) => React.ComponentClass<VictoryBrushContainerNativeProps> = flow(
87+
originalBrushMixin,
88+
nativeBrushMixin,
89+
);
8590

86-
export const brushContainerMixin = (base): VictoryBrushContainerBase =>
91+
export const brushContainerMixin = (base: React.ComponentClass) =>
8792
combinedMixin(base);
8893

8994
export const VictoryBrushContainer = brushContainerMixin(VictoryContainer);

‎packages/victory-native/src/components/victory-brush-line.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class VictoryNativeBrushLine<
134134
}
135135
}
136136

137-
export const VictoryBrushLine = wrapCoreComponent({
137+
export const VictoryBrushLine = wrapCoreComponent<VictoryNativeBrushLineProps>({
138138
Component: VictoryNativeBrushLine,
139139
defaultProps: {
140140
...VictoryNativeBrushLine.defaultProps,

‎packages/victory-native/src/components/victory-candlestick.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import { G } from "react-native-svg";
44
import { VictoryLabel } from "./victory-label";
55
import { VictoryContainer } from "./victory-container";
66
import { Candle } from "./victory-primitives/candle";
7-
import { VictoryCandlestick as VictoryCandlestickBase } from "victory-candlestick/es";
7+
import {
8+
VictoryCandlestick as VictoryCandlestickBase,
9+
VictoryCandlestickProps,
10+
} from "victory-candlestick/es";
811
import { wrapCoreComponent } from "../helpers/wrap-core-component";
912

10-
export const VictoryCandlestick = wrapCoreComponent({
13+
export const VictoryCandlestick = wrapCoreComponent<VictoryCandlestickProps>({
1114
Component: VictoryCandlestickBase,
1215
defaultProps: {
1316
...VictoryCandlestickBase.defaultProps,

‎packages/victory-native/src/components/victory-chart.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryChart as VictoryChartBase } from "victory-chart/es";
4+
import {
5+
VictoryChart as VictoryChartBase,
6+
VictoryChartProps,
7+
} from "victory-chart/es";
58
import { Background } from "./victory-primitives/background";
69
import { VictoryAxis } from "./victory-axis";
710
import { VictoryPolarAxis } from "./victory-polar-axis";
811
import { VictoryContainer } from "./victory-container";
912
import { wrapCoreComponent } from "../helpers/wrap-core-component";
1013

11-
export const VictoryChart = wrapCoreComponent({
14+
export const VictoryChart = wrapCoreComponent<VictoryChartProps>({
1215
Component: VictoryChartBase,
1316
defaultProps: {
1417
backgroundComponent: <Background />,

‎packages/victory-native/src/components/victory-cursor-container.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,14 @@ function nativeCursorMixin<
6969
};
7070
}
7171

72-
const combinedMixin = flow(originalCursorMixin, nativeCursorMixin);
72+
const combinedMixin: (
73+
base: React.ComponentClass,
74+
) => React.ComponentClass<VictoryCursorContainerNativeProps> = flow(
75+
originalCursorMixin,
76+
nativeCursorMixin,
77+
);
7378

74-
export const cursorContainerMixin = (base): VictoryCursorContainerBase =>
79+
export const cursorContainerMixin = (base: React.ComponentClass) =>
7580
combinedMixin(base);
7681

7782
export const VictoryCursorContainer = cursorContainerMixin(VictoryContainer);

‎packages/victory-native/src/components/victory-errorbar.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryErrorBar as VictoryErrorBarBase } from "victory-errorbar/es";
4+
import {
5+
VictoryErrorBar as VictoryErrorBarBase,
6+
VictoryErrorBarProps,
7+
} from "victory-errorbar/es";
58
import { VictoryContainer } from "./victory-container";
69
import { ErrorBar } from "./victory-primitives/error-bar";
710
import { wrapCoreComponent } from "../helpers/wrap-core-component";
811

9-
export const VictoryErrorBar = wrapCoreComponent({
12+
export const VictoryErrorBar = wrapCoreComponent<VictoryErrorBarProps>({
1013
Component: VictoryErrorBarBase,
1114
defaultProps: {
1215
...VictoryErrorBarBase.defaultProps,

‎packages/victory-native/src/components/victory-group.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryGroup as VictoryGroupBase } from "victory-group/es";
4+
import {
5+
VictoryGroup as VictoryGroupBase,
6+
VictoryGroupProps,
7+
} from "victory-group/es";
58
import { VictoryContainer } from "./victory-container";
69
import { wrapCoreComponent } from "../helpers/wrap-core-component";
710

8-
export const VictoryGroup = wrapCoreComponent({
11+
export const VictoryGroup = wrapCoreComponent<VictoryGroupProps>({
912
Component: VictoryGroupBase,
1013
defaultProps: {
1114
containerComponent: <VictoryContainer />,

‎packages/victory-native/src/components/victory-histogram.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import { G } from "react-native-svg";
44
import { VictoryLabel } from "./victory-label";
55
import { VictoryContainer } from "./victory-container";
66
import { Bar } from "./victory-primitives/bar";
7-
import { VictoryHistogram as VictoryHistogramBase } from "victory-histogram/es";
7+
import {
8+
VictoryHistogram as VictoryHistogramBase,
9+
VictoryHistogramProps,
10+
} from "victory-histogram/es";
811
import { wrapCoreComponent } from "../helpers/wrap-core-component";
912

10-
export const VictoryHistogram = wrapCoreComponent({
13+
export const VictoryHistogram = wrapCoreComponent<VictoryHistogramProps>({
1114
Component: VictoryHistogramBase,
1215
defaultProps: {
1316
...VictoryHistogramBase.defaultProps,

‎packages/victory-native/src/components/victory-legend.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import React from "react";
22
import { G } from "react-native-svg";
3-
import { VictoryLegend as VictoryLegendBase } from "victory-legend/es";
3+
import {
4+
VictoryLegend as VictoryLegendBase,
5+
VictoryLegendProps,
6+
} from "victory-legend/es";
47
import { Dimensions } from "react-native";
58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { Point } from "./victory-primitives/point";
811
import { Border } from "./victory-primitives/border";
912
import { wrapCoreComponent } from "../helpers/wrap-core-component";
1013

11-
export const VictoryLegend = wrapCoreComponent({
14+
export const VictoryLegend = wrapCoreComponent<VictoryLegendProps>({
1215
Component: VictoryLegendBase,
1316
defaultProps: {
1417
...VictoryLegendBase.defaultProps,

‎packages/victory-native/src/components/victory-line.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
3-
import { VictoryLine as VictoryLineBase } from "victory-line/es";
3+
import {
4+
VictoryLine as VictoryLineBase,
5+
VictoryLineProps,
6+
} from "victory-line/es";
47
import { VictoryLabel } from "./victory-label";
58
import { VictoryContainer } from "./victory-container";
69
import { VictoryClipContainer } from "./victory-clip-container";
710
import { Curve } from "./victory-primitives/curve";
811
import { wrapCoreComponent } from "../helpers/wrap-core-component";
912

10-
export const VictoryLine = wrapCoreComponent({
13+
export const VictoryLine = wrapCoreComponent<VictoryLineProps>({
1114
Component: VictoryLineBase,
1215
defaultProps: {
1316
...VictoryLineBase.defaultProps,

‎packages/victory-native/src/components/victory-pie.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryPie as VictoryPieBase } from "victory-pie/es";
4+
import { VictoryPie as VictoryPieBase, VictoryPieProps } from "victory-pie/es";
55
import { VictoryLabel } from "./victory-label";
66
import { VictoryContainer } from "./victory-container";
77
import { Slice } from "./victory-primitives/slice";
88
import { wrapCoreComponent } from "../helpers/wrap-core-component";
99

10-
export const VictoryPie = wrapCoreComponent({
10+
export const VictoryPie = wrapCoreComponent<VictoryPieProps>({
1111
Component: VictoryPieBase,
1212
defaultProps: {
1313
...VictoryPieBase.defaultProps,

‎packages/victory-native/src/components/victory-polar-axis.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryPolarAxis as VictoryPolarAxisBase } from "victory-polar-axis/es";
4+
import {
5+
VictoryPolarAxis as VictoryPolarAxisBase,
6+
VictoryPolarAxisProps,
7+
} from "victory-polar-axis/es";
58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { Arc } from "./victory-primitives/arc";
811
import { LineSegment } from "./victory-primitives/line-segment";
912
import { wrapCoreComponent } from "../helpers/wrap-core-component";
1013

11-
export const VictoryPolarAxis = wrapCoreComponent({
14+
export const VictoryPolarAxis = wrapCoreComponent<VictoryPolarAxisProps>({
1215
Component: VictoryPolarAxisBase,
1316
defaultProps: {
1417
...VictoryPolarAxisBase.defaultProps,

‎packages/victory-native/src/components/victory-scatter.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryScatter as VictoryScatterBase } from "victory-scatter/es";
4+
import {
5+
VictoryScatter as VictoryScatterBase,
6+
VictoryScatterProps,
7+
} from "victory-scatter/es";
58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { Point } from "./victory-primitives/point";
811
import { wrapCoreComponent } from "../helpers/wrap-core-component";
912

10-
export const VictoryScatter = wrapCoreComponent({
13+
export const VictoryScatter = wrapCoreComponent<VictoryScatterProps>({
1114
Component: VictoryScatterBase,
1215
defaultProps: {
1316
...VictoryScatterBase.defaultProps,

‎packages/victory-native/src/components/victory-selection-container.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,14 @@ function nativeSelectionMixin<
8181
};
8282
}
8383

84-
const combinedMixin = flow(originalSelectionMixin, nativeSelectionMixin);
84+
const combinedMixin: (
85+
base: React.ComponentClass,
86+
) => React.ComponentClass<VictorySelectionContainerNativeProps> = flow(
87+
originalSelectionMixin,
88+
nativeSelectionMixin,
89+
);
8590

86-
export const selectionContainerMixin = (base): VictorySelectionContainerBase =>
91+
export const selectionContainerMixin = (base: React.ComponentClass) =>
8792
combinedMixin(base);
8893

8994
export const VictorySelectionContainer =

‎packages/victory-native/src/components/victory-stack.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryStack as VictoryStackBase } from "victory-stack/es";
4+
import {
5+
VictoryStack as VictoryStackBase,
6+
VictoryStackProps,
7+
} from "victory-stack/es";
58
import { VictoryContainer } from "./victory-container";
69
import { wrapCoreComponent } from "../helpers/wrap-core-component";
710

8-
export const VictoryStack = wrapCoreComponent({
11+
export const VictoryStack = wrapCoreComponent<VictoryStackProps>({
912
Component: VictoryStackBase,
1013
defaultProps: {
1114
containerComponent: <VictoryContainer />,

‎packages/victory-native/src/components/victory-voronoi-container.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,14 @@ function nativeVoronoiMixin<
8080
};
8181
}
8282

83-
const combinedMixin = flow(originalVoronoiMixin, nativeVoronoiMixin);
83+
const combinedMixin: (
84+
base: React.ComponentClass,
85+
) => React.ComponentClass<VictoryVoronoiContainerNativeProps> = flow(
86+
originalVoronoiMixin,
87+
nativeVoronoiMixin,
88+
);
8489

85-
export const voronoiContainerMixin = (base): VictoryVoronoiContainerBase =>
90+
export const voronoiContainerMixin = (base: React.ComponentClass) =>
8691
combinedMixin(base);
8792

8893
export const VictoryVoronoiContainer = voronoiContainerMixin(VictoryContainer);

‎packages/victory-native/src/components/victory-voronoi.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import React from "react";
22
import { Dimensions } from "react-native";
33
import { G } from "react-native-svg";
4-
import { VictoryVoronoi as VictoryVoronoiBase } from "victory-voronoi/es";
4+
import {
5+
VictoryVoronoi as VictoryVoronoiBase,
6+
VictoryVoronoiProps,
7+
} from "victory-voronoi/es";
58
import { VictoryLabel } from "./victory-label";
69
import { VictoryContainer } from "./victory-container";
710
import { Voronoi } from "./victory-primitives/voronoi";
811
import { wrapCoreComponent } from "../helpers/wrap-core-component";
912

10-
export const VictoryVoronoi = wrapCoreComponent({
13+
export const VictoryVoronoi = wrapCoreComponent<VictoryVoronoiProps>({
1114
Component: VictoryVoronoiBase,
1215
defaultProps: {
1316
...VictoryVoronoiBase.defaultProps,

0 commit comments

Comments
 (0)