Skip to content

fix(material/slide-toggle): m3 slide-toggle track #28539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2024
Merged

fix(material/slide-toggle): m3 slide-toggle track #28539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3933ad
fix(material/slide-toggle): m3 slide-toggle track
wagnermaciel Feb 5, 2024
44e81b0
fixup! fix(material/slide-toggle): m3 slide-toggle track
wagnermaciel Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/material-experimental/theming/_custom-tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,16 @@
unselected-handle-horizontal-margin: 0 8px,
unselected-with-icon-handle-horizontal-margin: 0 4px,
unselected-pressed-handle-horizontal-margin: 0 2px,
// The hidden and visible track represent whichever track is visible or
// hidden in the ui. This could be the .mdc-switch__track :before or
// :after depending on whether the switch is selected or unselected.
//
// The m2 slide-toggle uses transforms to hide & show the tracks while
// the m3 slide-toggle uses opacity.
visible-track-opacity: 1,
hidden-track-opacity: 0,
visible-track-transition: opacity 75ms,
hidden-track-transition: opacity 75ms,
), ());
}

Expand Down
12 changes: 12 additions & 0 deletions src/material/core/tokens/m2/mat/_switch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ $prefix: (mat, switch);
unselected-handle-horizontal-margin: 0,
unselected-with-icon-handle-horizontal-margin: 0,
unselected-pressed-handle-horizontal-margin: 0,

// The hidden and visible track represent whichever track is visible or
// hidden in the ui. This could be the .mdc-switch__track :before or
// :after depending on whether the switch is selected or unselected.
//
// The m2 slide-toggle uses transforms to hide & show the tracks while
// the m3 slide-toggle uses opacity.

visible-track-opacity: 1,
hidden-track-opacity: 1,
visible-track-transition: transform 75ms 0ms cubic-bezier(0, 0, 0.2, 1),
hidden-track-transition: transform 75ms 0ms cubic-bezier(0.4, 0, 0.6, 1),
);
}

Expand Down
31 changes: 31 additions & 0 deletions src/material/slide-toggle/slide-toggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,37 @@
margin 75ms cubic-bezier(0.4, 0, 0.2, 1);
}

// The hidden and visible track represent whichever track is visible or
// hidden in the ui. This could be the .mdc-switch__track :before or
// :after depending on whether the switch is selected or unselected.
//
// The m2 slide-toggle uses transforms to hide & show the tracks while
// the m3 slide-toggle uses opacity.

@include token-utils.use-tokens(m2-mat-switch.$prefix, m2-mat-switch.get-token-slots()) {
.mdc-switch--selected .mdc-switch__track {
&::before {
@include token-utils.create-token-slot(opacity, hidden-track-opacity);
@include token-utils.create-token-slot(transition, hidden-track-transition);
}
&::after {
@include token-utils.create-token-slot(opacity, visible-track-opacity);
@include token-utils.create-token-slot(transition, visible-track-transition);
}
}

.mdc-switch--unselected .mdc-switch__track {
&::before {
@include token-utils.create-token-slot(opacity, visible-track-opacity);
@include token-utils.create-token-slot(transition, visible-track-transition);
}
&::after {
@include token-utils.create-token-slot(opacity, hidden-track-opacity);
@include token-utils.create-token-slot(transition, hidden-track-transition);
}
}
}

@include token-utils.use-tokens(m2-mat-switch.$prefix, m2-mat-switch.get-token-slots()) {
.mat-mdc-slide-toggle {
.mdc-switch--unselected .mdc-switch__handle {
Expand Down