fix(forms): reset() call with null values on nested group (#48830)

JeanMeche · atscott · commit ddd7212ee206 · 2023-10-10T15:34:31.000-07:00
Non typed forms allow to pass null to nested groups when calling `formGroup.reset()`, this commit prevent an undefined access. fixes #20509 PR Close #48830
diff --git a/packages/forms/src/model/form_group.ts b/packages/forms/src/model/form_group.ts
@@ -485,8 +485,9 @@ export class FormGroup<TControl extends {[K in keyof TControl]: AbstractControl<
       value: ɵTypedOrUntyped<TControl, ɵFormGroupValue<TControl>, any> = {} as unknown as
           ɵFormGroupValue<TControl>,
       options: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
-    this._forEachChild((control, name) => {
-      control.reset((value as any)[name], {onlySelf: true, emitEvent: options.emitEvent});
+    this._forEachChild((control: AbstractControl, name) => {
+      control.reset(
+          value ? (value as any)[name] : null, {onlySelf: true, emitEvent: options.emitEvent});
     });
     this._updatePristine(options);
     this._updateTouched(options);
diff --git a/packages/forms/test/form_group_spec.ts b/packages/forms/test/form_group_spec.ts
@@ -694,6 +694,19 @@ describe('FormGroup', () => {
       expect(g.disabled).toBe(false);
     });
 
+    it('should be able to reset a nested control with null', () => {
+      const g = new FormGroup({
+        id: new FormControl(2),
+        nested: new FormGroup<any>({
+          id: new FormControl(3),
+        }),
+      });
+
+      g.reset({id: 1, nested: null});
+      expect(g.get('nested')?.value).toEqual({id: null});
+      expect(g.get('nested.id')?.value).toBe(null);
+    });
+
     describe('reset() events', () => {
       let form: FormGroup, c3: FormControl, logger: any[];
 
