Skip to content

Commit

Permalink
fixup! refactor(material/button): switch to tokens theming API
Browse files Browse the repository at this point in the history
  • Loading branch information
wagnermaciel committed Sep 15, 2023
1 parent deddbef commit 9621ae0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/material/button/_button-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,14 @@

@mixin density($theme) {
$density-scale: theming.clamp-density(inspection.get-theme-density($theme), -3);

.mat-mdc-unelevated-button {
$density-tokens: tokens-mdc-button-filled.get-density-tokens($theme);
@include mdc-button-filled-theme.theme($density-tokens);
}

.mat-mdc-button,
.mat-mdc-raised-button,
.mat-mdc-unelevated-button,
.mat-mdc-outlined-button {
// Use `mat-mdc-button-base` to increase the specificity over the button's structural styles.
&.mat-mdc-button-base {
Expand Down
18 changes: 16 additions & 2 deletions src/material/core/tokens/m2/mdc/_button-filled.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@use 'sass:map';
@use '../../token-utils';
@use '../../../mdc-helpers/mdc-helpers';
@use '../../../style/sass-utils';
@use '../../../theming/inspection';
@use '../../../theming/theming';

// The prefix used to generate the fully qualified name for tokens in this file.
$prefix: (mdc, button-filled);
Expand All @@ -15,7 +17,6 @@ $prefix: (mdc, button-filled);
@function get-unthemable-tokens() {
@return (
container-elevation: 0,
container-height: 36px,
container-shape: 4px,
disabled-container-elevation: 0,
focus-container-elevation: 0,
Expand Down Expand Up @@ -77,7 +78,20 @@ $prefix: (mdc, button-filled);

// Tokens that can be configured through Angular Material's density theming API.
@function get-density-tokens($theme) {
@return ();
$scale: theming.clamp-density(inspection.get-theme-density($theme), -3);

@return (
container-height:
map.get(
(
0: 36px,
-1: 32px,
-2: 28px,
-3: 24px,
),
$scale
)
);
}

// Combines the tokens generated by the above functions into a single map with placeholder values.
Expand Down

0 comments on commit 9621ae0

Please sign in to comment.