Skip to content

refactor(material/button): switch typography to tokens #27999

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
Dec 8, 2023
Merged

refactor(material/button): switch typography to tokens #27999

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
8a3f37d
refactor(material/button): switch typography to tokens
wagnermaciel Nov 29, 2023
755583a
fixup! refactor(material/button): switch typography to tokens
wagnermaciel Nov 30, 2023
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
22 changes: 11 additions & 11 deletions src/material/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '@material/button/button' as mdc-button;
@use '@material/button/button-text-theme' as mdc-button-text-theme;
@use '@material/button/button-filled-theme' as mdc-button-filled-theme;
@use '@material/button/button-protected-theme' as mdc-button-protected-theme;
Expand All @@ -19,7 +18,7 @@
@use '../core/tokens/m2/mat/protected-button' as tokens-mat-protected-button;
@use '../core/tokens/m2/mdc/text-button' as tokens-mdc-text-button;
@use '../core/tokens/m2/mat/text-button' as tokens-mat-text-button;

@use '../core/style/sass-utils';

@mixin _text-button-variant($theme, $palette) {
$mdc-tokens: if($palette,
Expand Down Expand Up @@ -165,15 +164,16 @@
}

@mixin typography($theme) {
@include mdc-helpers.using-mdc-typography($theme) {
@include mdc-button.without-ripple($query: mdc-helpers.$mdc-typography-styles-query);
}

.mat-mdc-button,
.mat-mdc-raised-button,
.mat-mdc-outlined-button,
.mat-mdc-unelevated-button {
line-height: inherit;
@include sass-utils.current-selector-or-root() {
$text-typography-tokens: tokens-mdc-text-button.get-typography-tokens($theme);
$filled-typography-tokens: tokens-mdc-filled-button.get-typography-tokens($theme);
$outlined-typography-tokens: tokens-mdc-outlined-button.get-typography-tokens($theme);
$protected-typography-tokens: tokens-mdc-protected-button.get-typography-tokens($theme);

@include mdc-button-text-theme.theme($text-typography-tokens);
@include mdc-button-filled-theme.theme($filled-typography-tokens);
@include mdc-button-outlined-theme.theme($outlined-typography-tokens);
@include mdc-button-protected-theme.theme($protected-typography-tokens);
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/material/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
}
}

.mat-mdc-button-base {
text-decoration: none;
}

.mat-mdc-button,
.mat-mdc-unelevated-button,
.mat-mdc-raised-button,
Expand Down
13 changes: 7 additions & 6 deletions src/material/core/tokens/m2/mdc/_filled-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ $prefix: (mdc, filled-button);
container-shadow-color: null,
focus-label-text-color: null,
hover-label-text-color: null,
label-text-font: null,
label-text-size: null,
label-text-tracking: null,
label-text-transform: null,
label-text-weight: null,
pressed-label-text-color: null,
with-icon-disabled-icon-color: null,
with-icon-focus-icon-color: null,
Expand Down Expand Up @@ -81,7 +76,13 @@ $prefix: (mdc, filled-button);

// Tokens that can be configured through Angular Material's typography theming API.
@function get-typography-tokens($theme) {
@return ();
@return (
label-text-font: inspection.get-theme-typography($theme, button, font-family),
label-text-size: inspection.get-theme-typography($theme, button, font-size),
label-text-tracking: inspection.get-theme-typography($theme, button, letter-spacing),
label-text-weight: inspection.get-theme-typography($theme, button, font-weight),
label-text-transform: none,
);
}

// Tokens that can be configured through Angular Material's density theming API.
Expand Down
14 changes: 7 additions & 7 deletions src/material/core/tokens/m2/mdc/_outlined-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ $prefix: (mdc, outlined-button);
with-icon-focus-icon-color: null,
with-icon-pressed-icon-color: null,
with-icon-disabled-icon-color: null,

label-text-size: null,
label-text-font: null,
label-text-weight: null,
label-text-tracking: null,
label-text-transform: null
);
}

Expand Down Expand Up @@ -87,7 +81,13 @@ $prefix: (mdc, outlined-button);

// Tokens that can be configured through Angular Material's typography theming API.
@function get-typography-tokens($theme) {
@return ();
@return (
label-text-font: inspection.get-theme-typography($theme, button, font-family),
label-text-size: inspection.get-theme-typography($theme, button, font-size),
label-text-tracking: inspection.get-theme-typography($theme, button, letter-spacing),
label-text-weight: inspection.get-theme-typography($theme, button, font-weight),
label-text-transform: none,
);
}

// Tokens that can be configured through Angular Material's density theming API.
Expand Down
13 changes: 7 additions & 6 deletions src/material/core/tokens/m2/mdc/_protected-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ $prefix: (mdc, protected-button);
disabled-container-elevation: null,
focus-container-elevation: null,
pressed-container-elevation: null,
label-text-font: null,
label-text-size: null,
label-text-tracking: null,
label-text-transform: null,
label-text-weight: null,
with-icon-icon-size: null,
focus-label-text-color: null,
hover-label-text-color: null,
Expand Down Expand Up @@ -80,7 +75,13 @@ $prefix: (mdc, protected-button);

// Tokens that can be configured through Angular Material's typography theming API.
@function get-typography-tokens($theme) {
@return ();
@return (
label-text-font: inspection.get-theme-typography($theme, button, font-family),
label-text-size: inspection.get-theme-typography($theme, button, font-size),
label-text-tracking: inspection.get-theme-typography($theme, button, letter-spacing),
label-text-weight: inspection.get-theme-typography($theme, button, font-weight),
label-text-transform: none,
);
}

// Tokens that can be configured through Angular Material's density theming API.
Expand Down
15 changes: 7 additions & 8 deletions src/material/core/tokens/m2/mdc/_text-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ $prefix: (mdc, text-button);
// prevent the buttons from collapsing if a density mixin isn't included.
container-height: 36px,

// TODO: handle these through the typography styles eventually.
label-text-font: null,
label-text-size: null,
label-text-tracking: null,
label-text-transform: null,
label-text-weight: null,

// =============================================================================================
// = TOKENS NOT USED IN ANGULAR MATERIAL =
// =============================================================================================
Expand Down Expand Up @@ -74,7 +67,13 @@ $prefix: (mdc, text-button);

// Tokens that can be configured through Angular Material's typography theming API.
@function get-typography-tokens($theme) {
@return ();
@return (
label-text-font: inspection.get-theme-typography($theme, button, font-family),
label-text-size: inspection.get-theme-typography($theme, button, font-size),
label-text-tracking: inspection.get-theme-typography($theme, button, letter-spacing),
label-text-weight: inspection.get-theme-typography($theme, button, font-weight),
label-text-transform: none,
);
}

// Tokens that can be configured through Angular Material's density theming API.
Expand Down