cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(forms): change Array.reduce usage to Array.forEach (#35349)

Browse Source 
There is currently a bug in Chrome 80 that makes Array.reduce
not work according to spec. The functionality in forms that
retrieves controls from FormGroups and FormArrays (`form.get`)
relied on Array.reduce, so the Chrome bug broke forms for
many users.

This commit refactors our forms code to rely on Array.forEach
instead of Array.reduce to fix forms while we are waiting
for the Chrome fix to go live.

See https://bugs.chromium.org/p/chromium/issues/detail?id=1049982.

PR Close #35349
This commit is contained in:
Kara Erickson 2020-02-11 15:18:32 -08:00
parent b9b38f0ad2
commit eef047bc5f
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/forms/src/model.ts
View File

@ -52,17 +52,21 @@ function _find(control: AbstractControl, path: Array<string|number>| string, del
} }
if (Array.isArray(path) && path.length === 0) return null; if (Array.isArray(path) && path.length === 0) return null;
return path.reduce((v: AbstractControl | null, name) => { // Not using Array.reduce here due to a Chrome 80 bug
if (v instanceof FormGroup) { // https://bugs.chromium.org/p/chromium/issues/detail?id=1049982
return v.controls.hasOwnProperty(name as string) ? v.controls[name] : null; let controlToFind: AbstractControl|null = control;
path.forEach((name: string | number) => {
if (controlToFind instanceof FormGroup) {
controlToFind = controlToFind.controls.hasOwnProperty(name as string) ?
controlToFind.controls[name] :
null;
} else if (controlToFind instanceof FormArray) {
controlToFind = controlToFind.at(<number>name) || null;
} else {
controlToFind = null;
} }
});
if (v instanceof FormArray) { return controlToFind;
return v.at(<number>name) || null;
}
return null;
}, control);
} }
function coerceToValidator( function coerceToValidator(

12
packages/forms/src/validators.ts
View File

@ -465,9 +465,13 @@ function _executeAsyncValidators(control: AbstractControl, validators: AsyncVali
} }
function _mergeErrors(arrayOfErrors: ValidationErrors[]): ValidationErrors|null { function _mergeErrors(arrayOfErrors: ValidationErrors[]): ValidationErrors|null {
const res: {[key: string]: any} = let res: {[key: string]: any} = {};
arrayOfErrors.reduce((res: ValidationErrors | null, errors: ValidationErrors | null) => {
return errors != null ? {...res !, ...errors} : res !; // Not using Array.reduce here due to a Chrome 80 bug
}, {}); // https://bugs.chromium.org/p/chromium/issues/detail?id=1049982
arrayOfErrors.forEach((errors: ValidationErrors | null) => {
res = errors != null ? {...res !, ...errors} : res !;
});
return Object.keys(res).length === 0 ? null : res; return Object.keys(res).length === 0 ? null : res;
} }