common typing fix

YSMJ1994 · Dec 17, 2019 · 8a2d5d7 · 8a2d5d7
1 parent 608e6ec
commit 8a2d5d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
@@ -84,9 +84,9 @@ declare global {
 		export default markdown;
 	}
 
-	type RC<P, S = {}> = FC<P> | ComponentClass<P, S>;
+	type RC<P = {}, S = {}> = FC<P> | ComponentClass<P, S>;
 
-	type Merge<T extends {}, P extends {}> = { [K in Exclude<keyof T, keyof P>]: T[K] } & { [K in keyof P]: P[K] };
+	type Merge<T extends {}, P extends {}> = Omit<T, keyof P> & P;
 
 	type PartialPart<T extends {}, P extends keyof T> = Merge<T, Partial<Pick<T, P>>>;