fix: correct FormGroup array types

timdeschryver · Feb 6, 2024 · 90d7705 · 90d7705
1 parent 3730d4e
commit 90d7705
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/apps/example/src/app/simple-form/simple-form.component.ts b/apps/example/src/app/simple-form/simple-form.component.ts
@@ -1,6 +1,7 @@
 import { Component, inject, Signal } from '@angular/core';
 import {
   FormField,
+  FormGroup,
   SetValidationState,
   SignalFormBuilder,
   SignalInputDebounceDirective,
@@ -159,7 +160,7 @@ export default class SimpleFormComponent {
           ),
         };
       }),
-      todos: this.sfb.createFormGroup<Todo[]>(
+      todos: this.sfb.createFormGroup<FormGroup<Todo>[]>(
         () => {
           return [];
         },

diff --git a/packages/platform/src/lib/form-group.ts b/packages/platform/src/lib/form-group.ts
@@ -27,7 +27,9 @@ import {
 export type FormGroup<Fields extends FormGroupCreatorOrSignal = {}> = {
   __type: 'FormGroup';
   value: Signal<UnwrappedFormGroup<Fields>>;
-  controls: Fields extends WritableSignal<FormGroup<infer FG>[]> ? WritableSignal<FormGroup<FG>[]> : FormGroupFields<Fields>;
+  controls: Fields extends WritableSignal<FormGroup<infer G>[]> 
+    ? FormGroupFields<Fields> & WritableSignal<FormGroup<G>[]> 
+    : FormGroupFields<Fields>;
   valid: Signal<boolean>;
   state: Signal<ValidationState>;
   dirtyState: Signal<DirtyState>;

diff --git a/packages/platform/src/lib/models.ts b/packages/platform/src/lib/models.ts
@@ -18,7 +18,7 @@ export type FormGroupFields<Fields extends FormGroupCreatorOrSignal> = {
     ? FormField<Fields[K]>
     : Fields[K] extends FormGroup<infer G>
     ? G extends unknown[]
-      ? FormGroup<WritableSignal<FormGroup<G[0]>[]>>
+      ? FormGroup<WritableSignal<G[0][]>>
       : Fields[K]
     : Fields[K];
 };