From 31d8ab3593f18f8fec49b7e5ab22a7d979165ae6 Mon Sep 17 00:00:00 2001 From: Ricardo Amaral Date: Mon, 11 Oct 2021 19:37:35 +0100 Subject: [PATCH] fix: Improve ReactRenderer types (#2011) --- packages/react/src/ReactRenderer.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/react/src/ReactRenderer.tsx b/packages/react/src/ReactRenderer.tsx index a8300cfa..ddbc279a 100644 --- a/packages/react/src/ReactRenderer.tsx +++ b/packages/react/src/ReactRenderer.tsx @@ -23,12 +23,12 @@ export interface ReactRendererOptions { as?: string, } -type ComponentType = +type ComponentType = | React.ComponentClass | React.FunctionComponent - | React.ForwardRefExoticComponent<{ items: any[], command: any } & React.RefAttributes> + | React.ForwardRefExoticComponent<{ items: any[], command: any } & React.RefAttributes> -export class ReactRenderer { +export class ReactRenderer { id: string editor: ExtendedEditor @@ -41,9 +41,9 @@ export class ReactRenderer { reactElement: React.ReactNode - ref: React.Component | null = null + ref: R | null = null - constructor(component: ComponentType, { editor, props = {}, as = 'div' }: ReactRendererOptions) { + constructor(component: ComponentType, { editor, props = {}, as = 'div' }: ReactRendererOptions) { this.id = Math.floor(Math.random() * 0xFFFFFFFF).toString() this.component = component this.editor = editor as ExtendedEditor @@ -58,7 +58,7 @@ export class ReactRenderer { const props = this.props if (isClassComponent(Component) || isForwardRefComponent(Component)) { - props.ref = (ref: React.Component) => { + props.ref = (ref: R) => { this.ref = ref } }