Skip to content

Commit 6457474

Browse files
committed
Fix container mixin types
1 parent 0a737fa commit 6457474

8 files changed

+36
-13
lines changed

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-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-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-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-zoom-container.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,14 @@ function nativeZoomMixin<
8484
};
8585
}
8686

87-
const combinedMixin = flow(originalZoomMixin, nativeZoomMixin);
87+
const combinedMixin: (
88+
base: React.ComponentClass,
89+
) => React.ComponentClass<VictoryZoomContainerNativeProps> = flow(
90+
originalZoomMixin,
91+
nativeZoomMixin,
92+
);
8893

89-
export const zoomContainerMixin = (base): VictoryZoomContainerBase =>
94+
export const zoomContainerMixin = (base: React.ComponentClass) =>
9095
combinedMixin(base);
9196

9297
export const VictoryZoomContainer = zoomContainerMixin(VictoryContainer);

packages/victory-voronoi-container/src/victory-voronoi-container.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,3 @@ export function voronoiContainerMixin<
240240
}
241241

242242
export const VictoryVoronoiContainer = voronoiContainerMixin(VictoryContainer);
243-
export type VictoryVoronoiContainer = typeof VictoryVoronoiContainer;

packages/victory-zoom-container/src/victory-zoom-container.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,3 @@ export function zoomContainerMixin<
243243
}
244244

245245
export const VictoryZoomContainer = zoomContainerMixin(VictoryContainer);
246-
export type VictoryZoomContainer = typeof VictoryZoomContainer;

0 commit comments

Comments
 (0)