Fix #300, add state intersection

solidjs · Jan 14, 2021 · 2fe6903 · 2fe6903
1 parent 6b28920
commit 2fe6903
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/solid/src/reactive/state.ts b/packages/solid/src/reactive/state.ts
@@ -25,8 +25,9 @@ type AddSymbolToStringTag<T> = T extends { [Symbol.toStringTag]: infer V }
 type AddCallable<T> = T extends { (...x: any[]): infer V } ? { (...x: Parameters<T>): V } : {};
 
 export type NotWrappable = string | number | boolean | Function | null;
+// Intersection for missing fields https://github.com/microsoft/TypeScript/issues/13543
 export type State<T> = {
-  [P in keyof T]: T[P] extends object ? State<T[P]> : T[P];
+  [P in keyof T]: T[P] extends object ? State<T[P]> & T[P] : T[P];
 } & {
   [$RAW]?: T;
 } & AddSymbolToPrimitive<T> &