Skip to content

Commit

Permalink
fix(material): remove duplicated change event listener (#1649)
Browse files Browse the repository at this point in the history
fix #1644
  • Loading branch information
aitboudad committed Jul 5, 2019
1 parent 44535ac commit d28f7a8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
9 changes: 1 addition & 8 deletions src/material/checkbox/src/checkbox.type.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, ViewChild, AfterViewInit, OnDestroy } from '@angular/core';
import { FieldType } from '@ngx-formly/material/form-field';
import { MatCheckbox, MatCheckboxChange } from '@angular/material/checkbox';
import { MatCheckbox } from '@angular/material/checkbox';
import { FocusMonitor } from '@angular/cdk/a11y';

@Component({
Expand All @@ -11,7 +11,6 @@ import { FocusMonitor } from '@angular/cdk/a11y';
[id]="id"
[formlyAttributes]="field"
[tabindex]="to.tabindex || 0"
(change)="change($event)"
[indeterminate]="to.indeterminate && formControl.value === null"
[color]="to.color"
[labelPosition]="to.align || to.labelPosition">
Expand Down Expand Up @@ -41,12 +40,6 @@ export class FormlyFieldCheckbox extends FieldType implements AfterViewInit, OnD
super.onContainerClick(event);
}

change($event: MatCheckboxChange) {
if (this.to.change) {
this.to.change(this.field, $event);
}
}

ngAfterViewInit() {
super.ngAfterViewInit();
this.focusMonitor
Expand Down
11 changes: 2 additions & 9 deletions src/material/radio/src/radio.type.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Component, ViewChild } from '@angular/core';
import { FieldType } from '@ngx-formly/material/form-field';
import { MatRadioGroup, MatRadioChange } from '@angular/material/radio';
import { MatRadioGroup } from '@angular/material/radio';

@Component({
selector: 'formly-field-mat-radio',
template: `
<mat-radio-group
[formControl]="formControl"
[formlyAttributes]="field"
[tabindex]="to.tabindex || 0"
(change)="change($event)">
[tabindex]="to.tabindex || 0">
<mat-radio-button *ngFor="let option of to.options | formlySelectOptions:field | async; let i = index;"
[id]="id + '_' + i"
[color]="to.color"
Expand All @@ -36,10 +35,4 @@ export class FormlyFieldRadio extends FieldType {
}
super.onContainerClick(event);
}

change($event: MatRadioChange) {
if (this.to.change) {
this.to.change(this.field, $event);
}
}
}
2 changes: 1 addition & 1 deletion src/primeng/src/lib/types/checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FieldType } from '@ngx-formly/core';
[label]="to.label"
[formControl]="formControl"
[formlyAttributes]="field"
(valueChange)="to.change && to.change(field, $event)">
(onChange)="to.change && to.change(field, $event)">
</p-checkbox>
`,
})
Expand Down

0 comments on commit d28f7a8

Please sign in to comment.