fix: Improve ReactRenderer types (#2011)

ueberdosis · Oct 11, 2021 · 31d8ab3 · 31d8ab3
1 parent 503a3f2
commit 31d8ab3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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<R> =
   | React.ComponentClass
   | React.FunctionComponent
-  | React.ForwardRefExoticComponent<{ items: any[], command: any } & React.RefAttributes<unknown>>
+  | React.ForwardRefExoticComponent<{ items: any[], command: any } & React.RefAttributes<R>>
 
-export class ReactRenderer {
+export class ReactRenderer<R = unknown> {
   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<R>, { 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
       }
     }