diff --git a/src/components/toggle/toggle.ios.scss b/src/components/toggle/toggle.ios.scss index 6c821cacf9..838ae48808 100644 --- a/src/components/toggle/toggle.ios.scss +++ b/src/components/toggle/toggle.ios.scss @@ -202,7 +202,7 @@ $toggle-ios-item-right-padding: 6px ($item-ios-padding-right / 2) 5px ($i padding: $toggle-ios-item-right-padding; } -.item-ios .toggle-ios[item-left] { +.item-ios .toggle-ios[slot="start"] { padding: $toggle-ios-item-left-padding; } diff --git a/src/components/toggle/toggle.md.scss b/src/components/toggle/toggle.md.scss index 4146c5f621..3212bccaa7 100644 --- a/src/components/toggle/toggle.md.scss +++ b/src/components/toggle/toggle.md.scss @@ -160,7 +160,7 @@ $toggle-md-item-right-padding: 12px ($item-md-padding-right / 2) 12px cursor: pointer; } -.item-md .toggle-md[item-left] { +.item-md .toggle-md[slot="start"] { padding: $toggle-md-item-left-padding; } diff --git a/src/components/toggle/toggle.scss b/src/components/toggle/toggle.scss index a9860eeb39..3b94397a15 100644 --- a/src/components/toggle/toggle.scss +++ b/src/components/toggle/toggle.scss @@ -4,16 +4,19 @@ // Toggle // -------------------------------------------------- -ion-toggle, -:host { +ion-toggle { display: inline-block; - visibility: inherit !important; + contain: content; } -ion-gesture { +ion-toggle.upgraded { + visibility: inherit; +} + +ion-toggle ion-gesture { display: block; - visibility: inherit !important; + visibility: inherit; } .toggle-cover { diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts index b40ef77753..ced713d26d 100644 --- a/src/components/toggle/toggle.ts +++ b/src/components/toggle/toggle.ts @@ -1,5 +1,5 @@ import { BooleanInputComponent, GestureDetail } from '../../util/interfaces'; -import { Component, h, Ionic, Listen, Method, Prop, Watch } from '../index'; +import { Component, h, Ionic, Listen, Prop, Watch } from '../index'; @Component({ @@ -8,7 +8,8 @@ import { Component, h, Ionic, Listen, Method, Prop, Watch } from '../index'; ios: 'toggle.ios.scss', md: 'toggle.md.scss', wp: 'toggle.wp.scss' - } + }, + shadow: false }) export class Toggle implements BooleanInputComponent { activated: boolean; @@ -78,7 +79,6 @@ export class Toggle implements BooleanInputComponent { ev.preventDefault(); } - @Method() toggle() { if (!this.disabled) { this.checked = !this.checked; diff --git a/src/components/toggle/toggle.wp.scss b/src/components/toggle/toggle.wp.scss index e2262add74..4613f4e6c8 100644 --- a/src/components/toggle/toggle.wp.scss +++ b/src/components/toggle/toggle.wp.scss @@ -168,7 +168,7 @@ $toggle-wp-item-right-padding: 12px ($item-wp-padding-right / 2) 12px cursor: pointer; } -.item-wp .toggle-wp[item-left] { +.item-wp .toggle-wp[slot="start"] { padding: $toggle-wp-item-left-padding; }