fix: originalNode typescript (#274)

react-component · Aug 8, 2023 · ac67587 · ac67587 · vercel · Aug 8, 2023
1 parent 2c4bd0d
commit ac67587
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -86,8 +86,8 @@ export default () => (
 | maxScale | number | 50 | Max scale |
 | forceRender | boolean | - | Force render preview |
 | getContainer | string \| HTMLElement \| (() => HTMLElement) \| false | document.body | Return the mount node for preview |
-| imageRender | (originalNode: React.ReactNode, info: { transform: [TransformType](#TransformType) }) => React.ReactNode | - | Customize image |
-| toolbarRender | (originalNode: React.ReactNode, info: Omit<[ToolbarRenderInfoType](#ToolbarRenderInfoType), 'current' \| 'total'>) => React.ReactNode | - | Customize toolbar |
+| imageRender | (originalNode: React.ReactElement, info: { transform: [TransformType](#TransformType) }) => React.ReactNode | - | Customize image |
+| toolbarRender | (originalNode: React.ReactElement, info: Omit<[ToolbarRenderInfoType](#ToolbarRenderInfoType), 'current' \| 'total'>) => React.ReactNode | - | Customize toolbar |
 | onVisibleChange | (visible: boolean, prevVisible: boolean) => void | - | Callback when visible is changed |
 | onTransform | { transform: [TransformType](#TransformType), action: [TransformAction](#TransformAction) } | - | Callback when transform is changed |
 
@@ -130,8 +130,8 @@ export default () => (
 | forceRender | boolean | - | Force render preview |
 | getContainer | string \| HTMLElement \| (() => HTMLElement) \| false | document.body | Return the mount node for preview |
 | countRender | (current: number, total: number) => ReactNode | - | Customize count |
-| imageRender | (originalNode: React.ReactNode, info: { transform: [TransformType](#TransformType), current: number }) => React.ReactNode | - | Customize image |
-| toolbarRender | (originalNode: React.ReactNode, info: [ToolbarRenderInfoType](#ToolbarRenderInfoType)) => React.ReactNode | - | Customize toolbar |
+| imageRender | (originalNode: React.ReactElement, info: { transform: [TransformType](#TransformType), current: number }) => React.ReactNode | - | Customize image |
+| toolbarRender | (originalNode: React.ReactElement, info: [ToolbarRenderInfoType](#ToolbarRenderInfoType)) => React.ReactNode | - | Customize toolbar |
 | onVisibleChange | (visible: boolean, prevVisible: boolean, current: number) => void | - | Callback when visible is changed |
 | onTransform | { transform: [TransformType](#TransformType), action: [TransformAction](#TransformAction) } | - | Callback when transform is changed |
 

diff --git a/src/Image.tsx b/src/Image.tsx
@@ -32,12 +32,12 @@ export interface ImagePreviewType
   scaleStep?: number;
   movable?: boolean;
   imageRender?: (
-    originalNode: React.ReactNode,
+    originalNode: React.ReactElement,
     info: { transform: TransformType },
   ) => React.ReactNode;
   onTransform?: PreviewProps['onTransform'];
   toolbarRender?: (
-    originalNode: React.ReactNode,
+    originalNode: React.ReactElement,
     info: Omit<ToolbarRenderInfoType, 'current' | 'total'>,
   ) => React.ReactNode;
 }

diff --git a/src/Operations.tsx b/src/Operations.tsx
@@ -38,7 +38,7 @@ interface OperationsProps
   onFlipX: () => void;
   onFlipY: () => void;
   toolbarRender: (
-    originalNode: React.ReactNode,
+    originalNode: React.ReactElement,
     info: ToolbarRenderInfoType | Omit<ToolbarRenderInfoType, 'current' | 'total'>,
   ) => React.ReactNode;
 }

diff --git a/src/Preview.tsx b/src/Preview.tsx
@@ -61,12 +61,15 @@ export interface PreviewProps extends Omit<IDialogPropTypes, 'onClose'> {
   minScale?: number;
   maxScale?: number;
   imageRender?: (
-    originalNode: React.ReactNode,
+    originalNode: React.ReactElement,
     info: { transform: TransformType; current?: number },
   ) => React.ReactNode;
   onClose?: () => void;
   onTransform?: (info: { transform: TransformType; action: TransformAction }) => void;
-  toolbarRender?: (originalNode: React.ReactNode, info: ToolbarRenderInfoType) => React.ReactNode;
+  toolbarRender?: (
+    originalNode: React.ReactElement,
+    info: ToolbarRenderInfoType,
+  ) => React.ReactNode;
   onChange?: (current, prev) => void;
 }
 

diff --git a/src/PreviewGroup.tsx b/src/PreviewGroup.tsx
@@ -20,9 +20,12 @@ export interface PreviewGroupPreview
    */
   current?: number;
   countRender?: (current: number, total: number) => React.ReactNode;
-  toolbarRender?: (originalNode: React.ReactNode, info: ToolbarRenderInfoType) => React.ReactNode;
+  toolbarRender?: (
+    originalNode: React.ReactElement,
+    info: ToolbarRenderInfoType,
+  ) => React.ReactNode;
   imageRender?: (
-    originalNode: React.ReactNode,
+    originalNode: React.ReactElement,
     info: { transform: TransformType; current: number },
   ) => React.ReactNode;
   onVisibleChange?: (value: boolean, prevValue: boolean, current: number) => void;