From 6d969a6185eb2452a8283f6bff9e2890589a6358 Mon Sep 17 00:00:00 2001 From: linxianxi <904492381@qq.com> Date: Thu, 3 Aug 2023 09:03:14 +0800 Subject: [PATCH] fix: originalNode typescript --- README.md | 8 ++++---- src/Image.tsx | 4 ++-- src/Operations.tsx | 2 +- src/Preview.tsx | 7 +++++-- src/PreviewGroup.tsx | 7 +++++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c4b2db0c..ddb9af8b 100644 --- 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 index f1eefd93..a774df34 100644 --- 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, ) => React.ReactNode; } diff --git a/src/Operations.tsx b/src/Operations.tsx index 64511482..9b249027 100644 --- 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, ) => React.ReactNode; } diff --git a/src/Preview.tsx b/src/Preview.tsx index 6856e761..d235cdf0 100644 --- a/src/Preview.tsx +++ b/src/Preview.tsx @@ -61,12 +61,15 @@ export interface PreviewProps extends Omit { 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 index 655965e8..045b6030 100644 --- 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;