Skip to content

perf(material/radio): Optimize costly css selectors. #30470

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 1 commit into from
Feb 13, 2025
Merged

perf(material/radio): Optimize costly css selectors. #30470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 28 additions & 25 deletions src/material/radio/_radio-common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,41 @@ $_icon-size: 20px;

@if ($is-interactive) {
// MDC's hover indication comes from their ripple which we don't use.
&:hover .mdc-radio__native-control:not([disabled]):not(:focus) {
&:hover > .mdc-radio__native-control:not([disabled]):not(:focus) {
& ~ .mdc-radio__background::before {
opacity: 0.04;
transform: scale(1);
}
}

&:hover .mdc-radio__native-control:not([disabled]) ~ .mdc-radio__background {
.mdc-radio__outer-circle {
&:hover > .mdc-radio__native-control:not([disabled]) ~ .mdc-radio__background {
> .mdc-radio__outer-circle {
@include token-utils.use-tokens($tokens...) {
@include token-utils.create-token-slot(border-color, unselected-hover-icon-color);
}
}
}

&:hover .mdc-radio__native-control:enabled:checked + .mdc-radio__background {
.mdc-radio__outer-circle,
.mdc-radio__inner-circle {
&:hover > .mdc-radio__native-control:enabled:checked + .mdc-radio__background {
> .mdc-radio__outer-circle,
> .mdc-radio__inner-circle {
@include token-utils.use-tokens($tokens...) {
@include token-utils.create-token-slot(border-color, selected-hover-icon-color);
}
}
}

&:active .mdc-radio__native-control:enabled:not(:checked) + .mdc-radio__background {
.mdc-radio__outer-circle {
&:active > .mdc-radio__native-control:enabled:not(:checked) + .mdc-radio__background {
> .mdc-radio__outer-circle {
@include token-utils.use-tokens($tokens...) {
@include token-utils.create-token-slot(border-color, unselected-pressed-icon-color);
}
}
}

&:active .mdc-radio__native-control:enabled:checked + .mdc-radio__background {
.mdc-radio__outer-circle,
.mdc-radio__inner-circle {
&:active > .mdc-radio__native-control:enabled:checked + .mdc-radio__background {
> .mdc-radio__outer-circle,
> .mdc-radio__inner-circle {
@include token-utils.use-tokens($tokens...) {
@include token-utils.create-token-slot(border-color, selected-pressed-icon-color);
}
Expand Down Expand Up @@ -152,11 +152,11 @@ $_icon-size: 20px;
+ .mdc-radio__background {
transition: _enter-transition(opacity), _enter-transition(transform);

.mdc-radio__outer-circle {
> .mdc-radio__outer-circle {
transition: _enter-transition(border-color);
}

.mdc-radio__inner-circle {
> .mdc-radio__inner-circle {
transition: _enter-transition(transform), _enter-transition(border-color);
}
}
Expand All @@ -172,16 +172,16 @@ $_icon-size: 20px;

&:disabled {
@include token-utils.use-tokens($tokens...) {
&:not(:checked) + .mdc-radio__background .mdc-radio__outer-circle {
&:not(:checked) + .mdc-radio__background > .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, disabled-unselected-icon-color);
@include token-utils.create-token-slot(opacity, disabled-unselected-icon-opacity);
}

+ .mdc-radio__background {
cursor: default;

.mdc-radio__inner-circle,
.mdc-radio__outer-circle {
> .mdc-radio__inner-circle,
> .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, disabled-selected-icon-color);
@include token-utils.create-token-slot(opacity, disabled-selected-icon-opacity);
}
Expand All @@ -191,29 +191,29 @@ $_icon-size: 20px;

&:enabled {
@include token-utils.use-tokens($tokens...) {
&:not(:checked) + .mdc-radio__background .mdc-radio__outer-circle {
&:not(:checked) + .mdc-radio__background > .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, unselected-icon-color);
}

&:checked + .mdc-radio__background {
.mdc-radio__outer-circle,
.mdc-radio__inner-circle {
> .mdc-radio__outer-circle,
> .mdc-radio__inner-circle {
@include token-utils.create-token-slot(border-color, selected-icon-color);
}
}

@if ($is-interactive) {
&:focus:checked + .mdc-radio__background {
.mdc-radio__inner-circle,
.mdc-radio__outer-circle {
> .mdc-radio__inner-circle,
> .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, selected-focus-icon-color);
}
}
}
}
}

&:checked + .mdc-radio__background .mdc-radio__inner-circle {
&:checked + .mdc-radio__background > .mdc-radio__inner-circle {
transform: scale(0.5);
transition: _enter-transition(transform), _enter-transition(border-color);
}
Expand All @@ -224,16 +224,19 @@ $_icon-size: 20px;
pointer-events: auto;

@include token-utils.use-tokens($tokens...) {
.mdc-radio__native-control:not(:checked) + .mdc-radio__background .mdc-radio__outer-circle {
// stylelint-disable selector-combinator-space-before
.mdc-radio__native-control:not(:checked) + .mdc-radio__background
> .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, disabled-unselected-icon-color);
@include token-utils.create-token-slot(opacity, disabled-unselected-icon-opacity);
}
// stylelint-enable selector-combinator-space-before

&:hover .mdc-radio__native-control:checked + .mdc-radio__background,
.mdc-radio__native-control:checked:focus + .mdc-radio__background,
.mdc-radio__native-control + .mdc-radio__background {
.mdc-radio__inner-circle,
.mdc-radio__outer-circle {
> .mdc-radio__inner-circle,
> .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, disabled-selected-icon-color);
@include token-utils.create-token-slot(opacity, disabled-selected-icon-opacity);
}
Expand Down
6 changes: 3 additions & 3 deletions src/material/radio/radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
pointer-events: none;
border-radius: 50%;

.mat-ripple-element {
> .mat-ripple-element {
opacity: 0.14;
}

Expand All @@ -62,8 +62,8 @@
// We don't inherit the border focus style from MDC since we don't use their ripple.
// Instead we need to replicate it here.
@include token-utils.use-tokens(tokens-mdc-radio.$prefix, tokens-mdc-radio.get-token-slots()) {
.mdc-radio .mdc-radio__native-control:focus:enabled:not(:checked) {
& ~ .mdc-radio__background .mdc-radio__outer-circle {
.mdc-radio > .mdc-radio__native-control:focus:enabled:not(:checked) {
& ~ .mdc-radio__background > .mdc-radio__outer-circle {
@include token-utils.create-token-slot(border-color, unselected-focus-icon-color);
}
}
Expand Down
Loading