Skip to content

Commit

Permalink
fix(angular): make sure angular form control onChange is fired when n…
Browse files Browse the repository at this point in the history
…eeded (#16126)

* Make sure, that angular form's onChange is not fired, when writeValue is called

* Update angular/src/directives/control-value-accessors/select-value-accessor.ts

Co-Authored-By: mmlleevvyy <levy@codeandmore.pl>

* set muteOnChange to false by default
  • Loading branch information
MarkChrisLevy authored and manucorporat committed Oct 30, 2018
1 parent e9579d5 commit d5f2e6f
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,25 @@ export class BooleanValueAccessor implements ControlValueAccessor {
onChange: (value: any) => void;
onTouched: () => void;

/**
* Whether onChange should be mutted (not be fired). Will be true only when writeValue was called, which
* means that value changed inside angular form (e.g. calling setValue on a control).
*/
private muteOnChange = false;

writeValue(value: any) {
this.muteOnChange = true;
this.element.nativeElement.checked = value;
setIonicClasses(this.element);
}

@HostListener('ionChange', ['$event.target.checked'])
_handleIonChange(value: any) {
this.onChange(value);
if (!this.muteOnChange) {
this.onChange(value);
}

this.muteOnChange = false;

requestAnimationFrame(() => {
setIonicClasses(this.element);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@ export class NumericValueAccessor implements ControlValueAccessor {
onChange: (value: any) => void;
onTouched: () => void;

/**
* Whether onChange should be mutted (not be fired). Will be true only when writeValue was called, which
* means that value changed inside angular form (e.g. calling setValue on a control).
*/
private muteOnChange = false;

writeValue(value: any) {
this.muteOnChange = true;

// The value needs to be normalized for IE9, otherwise it is set to 'null' when null
// Probably not an issue for us, but it doesn't really cost anything either
this.element.nativeElement.value = value == null ? '' : value;
Expand All @@ -33,7 +41,11 @@ export class NumericValueAccessor implements ControlValueAccessor {

@HostListener('ionChange', ['$event.target.value'])
_handleInputEvent(value: any) {
this.onChange(value);
if (!this.muteOnChange) {
this.onChange(value);
}

this.muteOnChange = false;

requestAnimationFrame(() => {
setIonicClasses(this.element);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ export class RadioValueAccessor implements ControlValueAccessor {
this.onTouched = () => {/**/};
}

/**
* Whether onChange should be mutted (not be fired). Will be true only when writeValue was called, which
* means that value changed inside angular form (e.g. calling setValue on a control).
*/
private muteOnChange = false;

writeValue(value: any) {
this.muteOnChange = true;
this.element.nativeElement.checked = this.value = value;

requestAnimationFrame(() => {
Expand All @@ -35,7 +42,11 @@ export class RadioValueAccessor implements ControlValueAccessor {

@HostListener('ionSelect', ['$event.target.checked'])
_handleIonSelect(value: any) {
this.onChange(value);
if (!this.muteOnChange) {
this.onChange(value);
}

this.muteOnChange = false;

requestAnimationFrame(() => {
setIonicClasses(this.element);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ export class SelectValueAccessor implements ControlValueAccessor {
onChange: (value: any) => void;
onTouched: () => void;

/**
* Whether onChange should be mutted (not be fired). Will be true only when writeValue was called, which
* means that value changed inside angular form (e.g. calling setValue on a control).
*/
private muteOnChange = false;

writeValue(value: any) {
this.muteOnChange = true;
this.element.nativeElement.value = value;

requestAnimationFrame(() => {
Expand All @@ -34,7 +41,11 @@ export class SelectValueAccessor implements ControlValueAccessor {

@HostListener('ionChange', ['$event.target.value'])
_handleChangeEvent(value: any) {
this.onChange(value);
if (!this.muteOnChange) {
this.onChange(value);
}

this.muteOnChange = false;

requestAnimationFrame(() => {
setIonicClasses(this.element);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ export class TextValueAccessor implements ControlValueAccessor {
onChange: (value: any) => void;
onTouched: () => void;

/**
* Whether onChange should be mutted (not be fired). Will be true only when writeValue was called, which
* means that value changed inside angular form (e.g. calling setValue on a control).
*/
private muteOnChange = false;

writeValue(value: any) {
this.muteOnChange = true;
this.element.nativeElement.value = value;

requestAnimationFrame(() => {
Expand All @@ -34,7 +41,11 @@ export class TextValueAccessor implements ControlValueAccessor {

@HostListener('ionChange', ['$event.target.value'])
_handleInputEvent(value: any) {
this.onChange(value);
if (!this.muteOnChange) {
this.onChange(value);
}

this.muteOnChange = false;

requestAnimationFrame(() => {
setIonicClasses(this.element);
Expand Down

0 comments on commit d5f2e6f

Please sign in to comment.