Skip to content

fix(material/menu): Update token values and styles for M3 #28470

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 9, 2024
Merged

fix(material/menu): Update token values and styles for M3 #28470

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
11 changes: 10 additions & 1 deletion src/material-experimental/theming/_custom-tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,9 +856,13 @@
@return mat.private-merge-all(
_generate-typography-tokens($systems, item-label-text, label-large),
(
container-shape: _hardcode(4px, $exclude-hardcoded),
container-shape: map.get($systems, md-sys-shape, corner-extra-small),
divider-color: map.get($systems, md-sys-color, surface-variant),
divider-bottom-spacing: _hardcode(8px, $exclude-hardcoded),
divider-top-spacing: _hardcode(8px, $exclude-hardcoded),
item-label-text-color: map.get($systems, md-sys-color, on-surface),
item-icon-color: map.get($systems, md-sys-color, on-surface-variant),
item-icon-size: _hardcode(24px, $exclude-hardcoded),
item-hover-state-layer-color: mat.private-safe-color-change(
map.get($systems, md-sys-color, on-surface),
$alpha: map.get($systems, md-sys-state, hover-state-layer-opacity)
Expand All @@ -867,6 +871,11 @@
map.get($systems, md-sys-color, on-surface),
$alpha: map.get($systems, md-sys-state, focus-state-layer-opacity)
),
item-spacing: _hardcode(12px, $exclude-hardcoded),
item-leading-spacing: _hardcode(12px, $exclude-hardcoded),
item-trailing-spacing: _hardcode(12px, $exclude-hardcoded),
item-with-icon-leading-spacing: _hardcode(12px, $exclude-hardcoded),
item-with-icon-trailing-spacing: _hardcode(12px, $exclude-hardcoded),
container-color: map.get($systems, md-sys-color, surface-container),
)
);
Expand Down
23 changes: 5 additions & 18 deletions src/material/core/style/_menu-common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,29 +59,16 @@ $icon-margin: 16px !default;
}
}

@mixin item-submenu-trigger($side-padding) {
// Increase the side padding to prevent the indicator from overlapping the text.
padding-right: $side-padding * 2;

[dir='rtl'] & {
padding-right: $side-padding;
padding-left: $side-padding * 2;
}
}

@mixin item-submenu-icon($side-padding) {
position: absolute;
top: 50%;
right: $side-padding;
transform: translateY(-50%);
width: 5px;
@mixin item-submenu-icon($item-spacing, $icon-size) {
width: $icon-size;
height: 10px;
fill: currentColor;
padding-left: $item-spacing;

[dir='rtl'] & {
right: auto;
left: $side-padding;
transform: translateY(-50%) scaleX(-1);
padding-right: $item-spacing;
padding-left: 0;
}

// Fix for Chromium-based browsers blending in the `currentColor` with the background.
Expand Down
9 changes: 9 additions & 0 deletions src/material/core/tokens/m2/mat/_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ $prefix: (mat, menu);
@function get-unthemable-tokens() {
@return (
container-shape: 4px,
divider-bottom-spacing: 0,
divider-top-spacing: 0,
item-spacing: 16px,
item-icon-size: 24px,
item-leading-spacing: 16px,
item-trailing-spacing: 16px,
item-with-icon-leading-spacing: 16px,
item-with-icon-trailing-spacing: 16px,
);
}

Expand All @@ -26,6 +34,7 @@ $prefix: (mat, menu);
item-hover-state-layer-color: $active-state-layer-color,
item-focus-state-layer-color: $active-state-layer-color,
container-color: inspection.get-theme-color($theme, background, card),
divider-color: inspection.get-theme-color($theme, foreground, divider),
);
}

Expand Down
52 changes: 43 additions & 9 deletions src/material/menu/menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ mat-menu {
&,
.mat-mdc-menu-item .mat-mdc-menu-item-text {
@include mdc-typography.smooth-font();
flex: 1;
white-space: normal;

@include token-utils.use-tokens(tokens-mat-menu.$prefix, tokens-mat-menu.get-token-slots()) {
Expand Down Expand Up @@ -64,11 +65,37 @@ mat-menu {
}
}

.mat-divider {
// Use margin instead of padding since divider uses border-top for line
@include token-utils.use-tokens(
tokens-mat-menu.$prefix,
tokens-mat-menu.get-token-slots()
) {
color: var(#{token-utils.get-token-variable(divider-color)});
margin-bottom: var(#{token-utils.get-token-variable(divider-bottom-spacing)});
margin-top: var(#{token-utils.get-token-variable(divider-top-spacing)});
}
}

.mat-mdc-menu-item {
@include mdc-helpers.disable-mdc-fallback-declarations {
@include mdc-list-mixins.item-base;
@include mdc-list-mixins.item-spacing(
mdc-list-variables.$side-padding, $query: mdc-helpers.$mdc-base-styles-query);
@include token-utils.use-tokens(tokens-mat-menu.$prefix, tokens-mat-menu.get-token-slots()) {
@include mdc-list-mixins.item-spacing(
var(#{token-utils.get-token-variable(item-leading-spacing)}),
var(#{token-utils.get-token-variable(item-trailing-spacing)}),
$query: mdc-helpers.$mdc-base-styles-query
);

// stylelint-disable-next-line selector-class-pattern
&:has(.material-icons, mat-icon, [matButtonIcon]) {
@include mdc-list-mixins.item-spacing(
var(#{token-utils.get-token-variable(item-with-icon-leading-spacing)}),
var(#{token-utils.get-token-variable(item-with-icon-trailing-spacing)}),
$query: mdc-helpers.$mdc-base-styles-query
);
}
}
}

// MDC's menu items are `<li>` nodes which don't need resets, however ours
Expand Down Expand Up @@ -129,22 +156,24 @@ mat-menu {

.mat-icon {
flex-shrink: 0;
margin-right: mdc-list-variables.$side-padding;
@include token-utils.use-tokens(tokens-mat-menu.$prefix, tokens-mat-menu.get-token-slots()) {
margin-right: var(#{token-utils.get-token-variable(item-spacing)});
height: var(#{token-utils.get-token-variable(item-icon-size)});
width: var(#{token-utils.get-token-variable(item-icon-size)});
}
}

[dir='rtl'] & {
text-align: right;

.mat-icon {
margin-right: 0;
margin-left: mdc-list-variables.$side-padding;
@include token-utils.use-tokens(tokens-mat-menu.$prefix, tokens-mat-menu.get-token-slots()) {
margin-left: var(#{token-utils.get-token-variable(item-spacing)});
}
}
}

&.mat-mdc-menu-item-submenu-trigger {
@include menu-common.item-submenu-trigger(mdc-list-variables.$side-padding);
}

&:not([disabled]) {
@include token-utils.use-tokens(tokens-mat-menu.$prefix, tokens-mat-menu.get-token-slots()) {
&:hover {
Expand All @@ -169,7 +198,12 @@ mat-menu {
}

.mat-mdc-menu-submenu-icon {
@include menu-common.item-submenu-icon(mdc-list-variables.$side-padding);
@include token-utils.use-tokens(tokens-mat-menu.$prefix, tokens-mat-menu.get-token-slots()) {
@include menu-common.item-submenu-icon(
var(#{token-utils.get-token-variable(item-spacing)}),
var(#{token-utils.get-token-variable(item-icon-size)})
);
}
}

// Increase specificity because ripple styles are part of the `mat-core` mixin and can
Expand Down