diff --git a/src/components/toggle/test/basic/app-module.ts b/src/components/toggle/test/basic/app-module.ts index d9f511ac969..0251a00dd71 100644 --- a/src/components/toggle/test/basic/app-module.ts +++ b/src/components/toggle/test/basic/app-module.ts @@ -15,8 +15,8 @@ export class E2EPage { appleCtrl = new FormControl(false); bananaCtrl = new FormControl(true); - cherryCtrl = new FormControl(false); - grapeCtrl = new FormControl(true); + cherryCtrl = new FormControl({value: false, disabled: true}); + grapeCtrl = new FormControl({value: true, disabled: true}); fruitsForm = new FormGroup({ 'apple': this.appleCtrl, @@ -35,7 +35,7 @@ export class E2EPage { } toggleGrapeDisabled() { - this.grapeDisabled = !this.grapeDisabled; + this.grapeCtrl.enabled ? this.grapeCtrl.disable() : this.grapeCtrl.enable(); } appleChange(toggle: Toggle) { diff --git a/src/components/toggle/test/basic/main.html b/src/components/toggle/test/basic/main.html index af69cced184..8da29221b6f 100644 --- a/src/components/toggle/test/basic/main.html +++ b/src/components/toggle/test/basic/main.html @@ -35,12 +35,12 @@ Cherry, formControlName, disabled - + Grape, formControlName, checked, disabled - + @@ -53,6 +53,11 @@ + + disabled="true" + + + diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts index 9b4b7163524..6d387c5218d 100644 --- a/src/components/toggle/toggle.ts +++ b/src/components/toggle/toggle.ts @@ -304,6 +304,13 @@ export class Toggle extends Ion implements IonicTapInput, AfterContentInit, Cont this._elementRef.nativeElement.querySelector('button').focus(); } + /** + * @private + */ + setDisabledState(isDisabled: boolean) { + this.disabled = isDisabled; + } + /** * @private */