Permalink
Browse files

feat(forms): Added emitEvent to AbstractControl methods (#11949)

* feat(forms): Added emitEvent to AbstractControl methods

* style(forms): unified named parameter
  • Loading branch information...
Fank authored and alxhub committed Oct 19, 2016
1 parent 592f40a commit b9fc090143a6e9aa0f32fcd6b7380cab2c9b6907
@@ -249,7 +249,7 @@ export abstract class AbstractControl {
this._touched = true;
if (isPresent(this._parent) && !onlySelf) {
- this._parent.markAsTouched({onlySelf: onlySelf});
+ this._parent.markAsTouched({onlySelf});
}
}
@@ -267,7 +267,7 @@ export abstract class AbstractControl {
(control: AbstractControl) => { control.markAsUntouched({onlySelf: true}); });
if (isPresent(this._parent) && !onlySelf) {
- this._parent._updateTouched({onlySelf: onlySelf});
+ this._parent._updateTouched({onlySelf});
}
}
@@ -282,7 +282,7 @@ export abstract class AbstractControl {
this._pristine = false;
if (isPresent(this._parent) && !onlySelf) {
- this._parent.markAsDirty({onlySelf: onlySelf});
+ this._parent.markAsDirty({onlySelf});
}
}
@@ -299,7 +299,7 @@ export abstract class AbstractControl {
this._forEachChild((control: AbstractControl) => { control.markAsPristine({onlySelf: true}); });
if (isPresent(this._parent) && !onlySelf) {
- this._parent._updatePristine({onlySelf: onlySelf});
+ this._parent._updatePristine({onlySelf});
}
}
@@ -311,7 +311,7 @@ export abstract class AbstractControl {
this._status = PENDING;
if (isPresent(this._parent) && !onlySelf) {
- this._parent.markAsPending({onlySelf: onlySelf});
+ this._parent.markAsPending({onlySelf});
}
}
@@ -348,7 +348,7 @@ export abstract class AbstractControl {
enable({onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
this._status = VALID;
this._forEachChild((control: AbstractControl) => { control.enable({onlySelf: true}); });
- this.updateValueAndValidity({onlySelf: true, emitEvent: emitEvent});
+ this.updateValueAndValidity({onlySelf: true, emitEvent});
this._updateAncestors(onlySelf);
this._onDisabledChange.forEach((changeFn) => changeFn(false));
@@ -407,7 +407,7 @@ export abstract class AbstractControl {
}
if (isPresent(this._parent) && !onlySelf) {
- this._parent.updateValueAndValidity({onlySelf: onlySelf, emitEvent: emitEvent});
+ this._parent.updateValueAndValidity({onlySelf, emitEvent});
}
}
@@ -428,8 +428,8 @@ export abstract class AbstractControl {
this._status = PENDING;
this._cancelExistingSubscription();
var obs = toObservable(this.asyncValidator(this));
- this._asyncValidationSubscription = obs.subscribe(
- {next: (res: {[key: string]: any}) => this.setErrors(res, {emitEvent: emitEvent})});
+ this._asyncValidationSubscription =
+ obs.subscribe({next: (res: {[key: string]: any}) => this.setErrors(res, {emitEvent})});
}
}
@@ -582,7 +582,7 @@ export abstract class AbstractControl {
this._pristine = !this._anyControlsDirty();
if (isPresent(this._parent) && !onlySelf) {
- this._parent._updatePristine({onlySelf: onlySelf});
+ this._parent._updatePristine({onlySelf});
}
}
@@ -591,7 +591,7 @@ export abstract class AbstractControl {
this._touched = this._anyControlsTouched();
if (isPresent(this._parent) && !onlySelf) {
- this._parent._updateTouched({onlySelf: onlySelf});
+ this._parent._updateTouched({onlySelf});
}
}
@@ -694,7 +694,7 @@ export class FormControl extends AbstractControl {
if (this._onChange.length && emitModelToViewChange) {
this._onChange.forEach((changeFn) => changeFn(this._value, emitViewToModelChange));
}
- this.updateValueAndValidity({onlySelf: onlySelf, emitEvent: emitEvent});
+ this.updateValueAndValidity({onlySelf, emitEvent});
}
/**
@@ -741,11 +741,12 @@ export class FormControl extends AbstractControl {
* console.log(this.control.status); // 'DISABLED'
* ```
*/
- reset(formState: any = null, {onlySelf}: {onlySelf?: boolean} = {}): void {
+ reset(formState: any = null, {onlySelf, emitEvent}: {onlySelf?: boolean,
+ emitEvent?: boolean} = {}): void {
this._applyFormState(formState);
this.markAsPristine({onlySelf});
this.markAsUntouched({onlySelf});
- this.setValue(this._value, {onlySelf});
+ this.setValue(this._value, {onlySelf, emitEvent});
}
/**
@@ -938,13 +939,15 @@ export class FormGroup extends AbstractControl {
*
* ```
*/
- setValue(value: {[key: string]: any}, {onlySelf}: {onlySelf?: boolean} = {}): void {
+ setValue(
+ value: {[key: string]: any},
+ {onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
this._checkAllValuesPresent(value);
Object.keys(value).forEach(name => {
this._throwIfControlMissing(name);
- this.controls[name].setValue(value[name], {onlySelf: true});
+ this.controls[name].setValue(value[name], {onlySelf: true, emitEvent});
});
- this.updateValueAndValidity({onlySelf: onlySelf});
+ this.updateValueAndValidity({onlySelf, emitEvent});
}
/**
@@ -968,13 +971,15 @@ export class FormGroup extends AbstractControl {
*
* ```
*/
- patchValue(value: {[key: string]: any}, {onlySelf}: {onlySelf?: boolean} = {}): void {
+ patchValue(
+ value: {[key: string]: any},
+ {onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}): void {
Object.keys(value).forEach(name => {
if (this.controls[name]) {
- this.controls[name].patchValue(value[name], {onlySelf: true});
+ this.controls[name].patchValue(value[name], {onlySelf: true, emitEvent});
}
});
- this.updateValueAndValidity({onlySelf: onlySelf});
+ this.updateValueAndValidity({onlySelf, emitEvent});
}
/**
@@ -1009,13 +1014,14 @@ export class FormGroup extends AbstractControl {
* console.log(this.form.get('first').status); // 'DISABLED'
* ```
*/
- reset(value: any = {}, {onlySelf}: {onlySelf?: boolean} = {}): void {
+ reset(value: any = {}, {onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}):
+ void {
this._forEachChild((control: AbstractControl, name: string) => {
- control.reset(value[name], {onlySelf: true});
+ control.reset(value[name], {onlySelf: true, emitEvent});
});
- this.updateValueAndValidity({onlySelf: onlySelf});
- this._updatePristine({onlySelf: onlySelf});
- this._updateTouched({onlySelf: onlySelf});
+ this.updateValueAndValidity({onlySelf, emitEvent});
+ this._updatePristine({onlySelf});
+ this._updateTouched({onlySelf});
}
/**
@@ -1240,13 +1246,14 @@ export class FormArray extends AbstractControl {
* console.log(arr.value); // ['Nancy', 'Drew']
* ```
*/
- setValue(value: any[], {onlySelf}: {onlySelf?: boolean} = {}): void {
+ setValue(value: any[], {onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}):
+ void {
this._checkAllValuesPresent(value);
value.forEach((newValue: any, index: number) => {
this._throwIfControlMissing(index);
- this.at(index).setValue(newValue, {onlySelf: true});
+ this.at(index).setValue(newValue, {onlySelf: true, emitEvent});
});
- this.updateValueAndValidity({onlySelf: onlySelf});
+ this.updateValueAndValidity({onlySelf, emitEvent});
}
/**
@@ -1269,13 +1276,14 @@ export class FormArray extends AbstractControl {
* console.log(arr.value); // ['Nancy', null]
* ```
*/
- patchValue(value: any[], {onlySelf}: {onlySelf?: boolean} = {}): void {
+ patchValue(value: any[], {onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}):
+ void {
value.forEach((newValue: any, index: number) => {
if (this.at(index)) {
- this.at(index).patchValue(newValue, {onlySelf: true});
+ this.at(index).patchValue(newValue, {onlySelf: true, emitEvent});
}
});
- this.updateValueAndValidity({onlySelf: onlySelf});
+ this.updateValueAndValidity({onlySelf, emitEvent});
}
/**
@@ -1309,13 +1317,14 @@ export class FormArray extends AbstractControl {
* console.log(this.arr.get(0).status); // 'DISABLED'
* ```
*/
- reset(value: any = [], {onlySelf}: {onlySelf?: boolean} = {}): void {
+ reset(value: any = [], {onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}):
+ void {
this._forEachChild((control: AbstractControl, index: number) => {
- control.reset(value[index], {onlySelf: true});
+ control.reset(value[index], {onlySelf: true, emitEvent});
});
- this.updateValueAndValidity({onlySelf: onlySelf});
- this._updatePristine({onlySelf: onlySelf});
- this._updateTouched({onlySelf: onlySelf});
+ this.updateValueAndValidity({onlySelf, emitEvent});
+ this._updatePristine({onlySelf});
+ this._updateTouched({onlySelf});
}
/**
@@ -172,6 +172,16 @@ export function main() {
expect(logger).toEqual(['control1', 'control2', 'array', 'form']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ form.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ a.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c2.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ a.setValue(['one', 'two'], {emitEvent: false});
+ tick();
+ }));
+
it('should emit one statusChange event per control', () => {
form.statusChanges.subscribe(() => logger.push('form'));
a.statusChanges.subscribe(() => logger.push('array'));
@@ -277,6 +287,16 @@ export function main() {
expect(logger).toEqual(['control1', 'array', 'form']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ form.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ a.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c2.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ a.patchValue(['one', 'two'], {emitEvent: false});
+ tick();
+ }));
+
it('should emit one statusChange event per control', () => {
form.statusChanges.subscribe(() => logger.push('form'));
a.statusChanges.subscribe(() => logger.push('array'));
@@ -478,6 +498,17 @@ export function main() {
expect(logger).toEqual(['control1', 'control2', 'array', 'form']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ form.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ a.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c2.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c3.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ a.reset([], {emitEvent: false});
+ tick();
+ }));
+
it('should emit one statusChange event per reset control', () => {
form.statusChanges.subscribe(() => logger.push('form'));
a.statusChanges.subscribe(() => logger.push('array'));
@@ -555,6 +555,16 @@ export function main() {
expect(logger).toEqual(['control1', 'group']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ g.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c2.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ c.reset(null, {emitEvent: false});
+
+ tick();
+ }));
+
it('should emit one statusChange event per reset control', () => {
g.statusChanges.subscribe(() => logger.push('group'));
c.statusChanges.subscribe(() => logger.push('control1'));
@@ -236,6 +236,15 @@ export function main() {
expect(logger).toEqual(['control1', 'control2', 'group', 'form']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ form.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ g.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ g.setValue({'one': 'one', 'two': 'two'}, {emitEvent: false});
+ tick();
+ }));
+
it('should emit one statusChange event per control', () => {
form.statusChanges.subscribe(() => logger.push('form'));
g.statusChanges.subscribe(() => logger.push('group'));
@@ -341,6 +350,15 @@ export function main() {
expect(logger).toEqual(['control1', 'group', 'form']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ form.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ g.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ g.patchValue({'one': 'one', 'two': 'two'}, {emitEvent: false});
+ tick();
+ }));
+
it('should emit one statusChange event per control', () => {
form.statusChanges.subscribe(() => logger.push('form'));
g.statusChanges.subscribe(() => logger.push('group'));
@@ -541,6 +559,15 @@ export function main() {
expect(logger).toEqual(['control1', 'control2', 'group', 'form']);
});
+ it('should not fire an event when explicitly specified', fakeAsync(() => {
+ form.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ g.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+ c.valueChanges.subscribe((value) => { throw 'Should not happen'; });
+
+ g.reset({}, {emitEvent: false});
+ tick();
+ }));
+
it('should emit one statusChange event per reset control', () => {
form.statusChanges.subscribe(() => logger.push('form'));
g.statusChanges.subscribe(() => logger.push('group'));
Oops, something went wrong.

0 comments on commit b9fc090

Please sign in to comment.