Skip to content

perf(material/button): Use child rather than descendant selectors. #30379

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

Closed
wants to merge 1 commit into from
Closed

perf(material/button): Use child rather than descendant selectors. #30379

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
32 changes: 16 additions & 16 deletions src/material/button/_button-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
-webkit-tap-highlight-color: transparent;

// The ripple container should match the bounds of the entire button.
.mat-mdc-button-ripple,
.mat-mdc-button-persistent-ripple,
.mat-mdc-button-persistent-ripple::before {
> .mat-mdc-button-ripple,
> .mat-mdc-button-persistent-ripple,
> .mat-mdc-button-persistent-ripple::before {
@include layout-common.fill;

// Disable pointer events for the ripple container and state overlay because the container
Expand All @@ -29,61 +29,61 @@

// This style used to be applied by the MatRipple
// directive, which is no longer attached to this element.
.mat-mdc-button-ripple {
> .mat-mdc-button-ripple {
overflow: hidden;
}

// We use ::before so that we can reuse some of MDC's theming.
.mat-mdc-button-persistent-ripple::before {
> .mat-mdc-button-persistent-ripple::before {
content: '';
opacity: 0;
}

// The content should appear over the state and ripple layers, otherwise they may adversely affect
// the accessibility of the text content.
.mdc-button__label,
.mat-icon {
> .mdc-button__label,
> .mat-icon {
z-index: 1;
position: relative;
}

// The focus indicator should match the bounds of the entire button.
.mat-focus-indicator {
> .mat-focus-indicator {
@include layout-common.fill();
}

&:focus .mat-focus-indicator::before {
&:focus > .mat-focus-indicator::before {
content: '';
}
}

@mixin mat-private-button-ripple($prefix, $slots) {
@include token-utils.use-tokens($prefix, $slots) {
.mat-ripple-element {
> .mat-ripple-element {
@include token-utils.create-token-slot(background-color, ripple-color);
}

.mat-mdc-button-persistent-ripple::before {
> .mat-mdc-button-persistent-ripple::before {
@include token-utils.create-token-slot(background-color, state-layer-color);
}

&.mat-mdc-button-disabled .mat-mdc-button-persistent-ripple::before {
&.mat-mdc-button-disabled > .mat-mdc-button-persistent-ripple::before {
@include token-utils.create-token-slot(background-color, disabled-state-layer-color);
}

&:hover .mat-mdc-button-persistent-ripple::before {
&:hover > .mat-mdc-button-persistent-ripple::before {
@include token-utils.create-token-slot(opacity, hover-state-layer-opacity);
}

&.cdk-program-focused,
&.cdk-keyboard-focused,
&.mat-mdc-button-disabled-interactive:focus {
.mat-mdc-button-persistent-ripple::before {
> .mat-mdc-button-persistent-ripple::before {
@include token-utils.create-token-slot(opacity, focus-state-layer-opacity);
}
}

&:active .mat-mdc-button-persistent-ripple::before {
&:active > .mat-mdc-button-persistent-ripple::before {
@include token-utils.create-token-slot(opacity, pressed-state-layer-opacity);
}
}
Expand Down Expand Up @@ -116,7 +116,7 @@
}

@mixin mat-private-button-touch-target($is-square, $prefix, $slots) {
.mat-mdc-button-touch-target {
> .mat-mdc-button-touch-target {
position: absolute;
top: 50%;
height: 48px;
Expand Down
16 changes: 8 additions & 8 deletions src/material/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
display: none;
}

.mdc-button__label {
> .mdc-button__label {
position: relative;
}
}
Expand All @@ -78,7 +78,7 @@
@include token-utils.create-token-slot(text-transform, label-text-transform);
@include token-utils.create-token-slot(font-weight, label-text-weight);

&, .mdc-button__ripple {
&, > .mdc-button__ripple {
@include token-utils.create-token-slot(border-radius, container-shape);
}

Expand Down Expand Up @@ -137,7 +137,7 @@
@include token-utils.create-token-slot(background-color, container-color);
}

&, .mdc-button__ripple {
&, > .mdc-button__ripple {
@include token-utils.create-token-slot(border-radius, container-shape);
}

Expand Down Expand Up @@ -190,7 +190,7 @@
@include token-utils.create-token-slot(background-color, container-color);
}

&, .mdc-button__ripple {
&, > .mdc-button__ripple {
@include token-utils.create-token-slot(border-radius, container-shape);
}

Expand Down Expand Up @@ -302,8 +302,8 @@
// In order to work around this issue by *not* hiding overflow, we adjust the child elements
// to fully cover the actual button element. This means that the border-radius would be correct
// then. See: https://github.com/angular/components/issues/13738
.mat-mdc-outlined-button .mat-mdc-button-ripple,
.mat-mdc-outlined-button .mdc-button__ripple {
.mat-mdc-outlined-button > .mat-mdc-button-ripple,
.mat-mdc-outlined-button > .mdc-button__ripple {
$offset: -1px;
top: $offset;
left: $offset;
Expand All @@ -315,15 +315,15 @@
// the focus indicator is sufficiently contrastive and renders appropriately.
.mat-mdc-unelevated-button,
.mat-mdc-raised-button {
.mat-focus-indicator::before {
> .mat-focus-indicator::before {
$default-border-width: focus-indicators-private.$default-border-width;
$border-width: var(--mat-focus-indicator-border-width, #{$default-border-width});
$offset: calc(#{$border-width} + 2px);
margin: calc(#{$offset} * -1);
}
}

.mat-mdc-outlined-button .mat-focus-indicator::before {
.mat-mdc-outlined-button > .mat-focus-indicator::before {
$default-border-width: focus-indicators-private.$default-border-width;
$border-width: var(--mat-focus-indicator-border-width, #{$default-border-width});
$offset: calc(#{$border-width} + 3px);
Expand Down
6 changes: 3 additions & 3 deletions src/material/button/fab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@
// However, Angular Material expects a `mat-icon` instead. The following
// mixin will style the icons appropriately.
// stylelint-disable-next-line selector-class-pattern
.mat-icon, .material-icons {
> .mat-icon, > .material-icons {
transition: transform 180ms 90ms cubic-bezier(0, 0, 0.2, 1);
fill: currentColor;
will-change: transform;
}

.mat-focus-indicator::before {
> .mat-focus-indicator::before {
$default-border-width: focus-indicators-private.$default-border-width;
$border-width: var(--mat-focus-indicator-border-width, #{$default-border-width});
$offset: calc(#{$border-width} + 2px);
Expand Down Expand Up @@ -209,7 +209,7 @@

// All FABs are square except the extended ones so we
// need to set the touch target back to full-width.
.mat-mdc-button-touch-target {
> .mat-mdc-button-touch-target {
width: 100%;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/material/button/icon-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
}
}

.mat-mdc-button-persistent-ripple {
> .mat-mdc-button-persistent-ripple {
border-radius: 50%;
}

Expand Down
Loading