Improve typing (#1616)

* sync types.ts and components.ts * Improve ref typing in refs.ts and types.ts (have I understood this correct?) * Revert "Improve ref typing in refs.ts and types.ts (have I understood this correct?)" This reverts commit 62a5cfa. * Fix type error in inferno-redux
infernojs · Nov 13, 2022 · f606368 · f606368
1 parent e3c3deb
commit f606368
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/packages/inferno-redux/src/components/Provider.ts b/packages/inferno-redux/src/components/Provider.ts
@@ -18,7 +18,7 @@ export interface Props<A extends Action = AnyAction> {
   children?: Inferno.InfernoNode;
 }
 
-export class Provider<A extends Action = AnyAction> extends Component<Props<A>, null> {
+export class Provider<A extends Action = AnyAction> extends Component<Props<A>> {
   public static displayName = 'Provider';
   private readonly store: Store<any, A>;
 
@@ -37,7 +37,7 @@ export class Provider<A extends Action = AnyAction> extends Component<Props<A>,
     return this.props.children;
   }
 
-  public componentWillReceiveProps?(nextProps: Props<A>, nextContext: any): void;
+  public componentWillReceiveProps?(nextProps: Readonly<{ children?: Inferno.InfernoNode } & Props<A>>, nextContext: any): void;
 }
 
 if (process.env.NODE_ENV !== 'production') {

diff --git a/packages/inferno/src/core/component.ts b/packages/inferno/src/core/component.ts
@@ -1,5 +1,5 @@
 import type { Inferno } from './types';
-import { IComponent } from './types';
+import { IComponent, VNode } from './types';
 import { combineFrom, isFunction, isNullOrUndef, throwError } from 'inferno-shared';
 import { updateClassComponent } from '../DOM/patching';
 import { AnimationQueues, callAll, callAllAnimationHooks, EMPTY_OBJ, findDOMFromVNode, renderCheck } from '../DOM/utils/common';
@@ -158,7 +158,7 @@ export abstract class Component<P = {}, S = {}> implements IComponent<P, S> {
   }
 
   public setState<K extends keyof S>(
-    newState: ((prevState: Readonly<S>, props: Readonly<P>) => Pick<S, K> | S | null) | (Pick<S, K> | S | null),
+    newState: ((prevState: Readonly<S>, props: Readonly<{ children?: Inferno.InfernoNode } & P>) => Pick<S, K> | S | null) | (Pick<S, K> | S | null),
     callback?: () => void
   ): void {
     if (this.$UN) {
@@ -188,6 +188,12 @@ export abstract class Component<P = {}, S = {}> implements IComponent<P, S> {
 
   public componentWillUnmount?(): void;
 
+  public componentDidAppear?(domNode: Element): void;
+
+  public componentWillDisappear?(domNode: Element, callback: Function): void;
+
+  public componentWillMove?(parentVNode: VNode, parentDOM: Element, dom: Element): void;
+
   public getChildContext?(): void;
 
   public getSnapshotBeforeUpdate?(prevProps: Readonly<{ children?: Inferno.InfernoNode } & P>, prevState: Readonly<S>): any;

diff --git a/packages/inferno/src/core/types.ts b/packages/inferno/src/core/types.ts
@@ -33,11 +33,11 @@ export interface IComponent<P, S> {
 
   componentWillReceiveProps?(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextContext: any): void;
 
-  shouldComponentUpdate?(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextState: S, context: any): boolean;
+  shouldComponentUpdate?(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextState: Readonly<S>, context: any): boolean;
 
-  componentWillUpdate?(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextState: S, context: any): void;
+  componentWillUpdate?(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextState: Readonly<S>, context: any): void;
 
-  componentDidUpdate?(prevProps: Readonly<{ children?: Inferno.InfernoNode } & P>, prevState: S, snapshot: any): void;
+  componentDidUpdate?(prevProps: Readonly<{ children?: Inferno.InfernoNode } & P>, prevState: Readonly<S>, snapshot: any): void;
 
   componentWillUnmount?(): void;
 
@@ -49,9 +49,9 @@ export interface IComponent<P, S> {
 
   getChildContext?(): void;
 
-  getSnapshotBeforeUpdate?(prevProps: Readonly<{ children?: Inferno.InfernoNode } & P>, prevState: S): any;
+  getSnapshotBeforeUpdate?(prevProps: Readonly<{ children?: Inferno.InfernoNode } & P>, prevState: Readonly<S>): any;
 
-  render(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextState: S, nextContext: any): Inferno.InfernoNode;
+  render(nextProps: Readonly<{ children?: Inferno.InfernoNode } & P>, nextState: Readonly<S>, nextContext: any): Inferno.InfernoNode;
 }
 
 export interface SemiSyntheticEvent<T> extends Event {