Skip to content

fix(material/menu): submenu icon not working in high contrast mode #23012

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.

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
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/material-experimental/mdc-menu/_menu-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// items so we have to grey them out ourselves.
.mat-mdc-menu-item[disabled] {
&,
&::after,
.mat-mdc-menu-submenu-icon,
.mat-icon-no-color {
@include mdc-theme.prop(color, text-disabled-on-background);
}
Expand All @@ -27,7 +27,7 @@
// Since we're creating `mat-icon` and the submenu trigger
// chevron ourselves, we have to handle the color as well.
.mat-mdc-menu-item .mat-icon-no-color,
.mat-mdc-menu-item-submenu-trigger::after {
.mat-mdc-menu-submenu-icon {
@include mdc-theme.prop(color, text-icon-on-background);
}

Expand Down
5 changes: 5 additions & 0 deletions src/material-experimental/mdc-menu/menu-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@
[matRippleDisabled]="disableRipple || disabled"
[matRippleTrigger]="_getHostElement()">
</div>
<svg
*ngIf="_triggersSubmenu"
class="mat-mdc-menu-submenu-icon"
viewBox="0 0 5 10"
focusable="false"><polygon points="0,0 5,5 0,10"/></svg>
5 changes: 4 additions & 1 deletion src/material-experimental/mdc-menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,14 @@ mat-menu {
}
}

// Renders out a chevron on menu items that trigger a sub-menu.
.mat-mdc-menu-item-submenu-trigger {
@include menu-common.item-submenu-trigger(mdc-list.$deprecated-side-padding);
}

.mat-mdc-menu-submenu-icon {
@include menu-common.item-submenu-icon(mdc-list.$deprecated-side-padding);
}

// Increase specificity because ripple styles are part of the `mat-core` mixin and can
// potentially overwrite the absolute position of the container.
.mat-mdc-menu-item .mat-mdc-menu-ripple {
Expand Down
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2070,7 +2070,9 @@ describe('MDC-based MatMenu', () => {
const menuItems = overlay.querySelectorAll('[mat-menu-item]');

expect(menuItems[0].classList).toContain('mat-mdc-menu-item-submenu-trigger');
expect(menuItems[0].querySelector('.mat-mdc-menu-submenu-icon')).toBeTruthy();
expect(menuItems[1].classList).not.toContain('mat-mdc-menu-item-submenu-trigger');
expect(menuItems[1].querySelector('.mat-mdc-menu-submenu-icon')).toBeFalsy();
});

it('should increase the sub-menu elevation based on its depth', () => {
Expand Down
46 changes: 22 additions & 24 deletions src/material/core/style/_menu-common.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './private';
@use '../../../cdk/a11y';
@use './list-common';
@use './layout-common';

Expand Down Expand Up @@ -58,36 +58,34 @@ $icon-margin: 16px !default;
}
}

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

// Renders a triangle to indicate that the menu item will open a sub-menu.
&::after {
$size: private.private-div($triangle-height, 2);

width: 0;
height: 0;
border-style: solid;
border-width: $size 0 $size $size;
border-color: transparent transparent transparent currentColor;
content: '';
display: inline-block;
position: absolute;
top: 50%;
right: $side-padding;
transform: translateY(-50%);
}

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

&::after {
right: auto;
left: $side-padding;
transform: rotateY(180deg) translateY(-50%);
}
@mixin item-submenu-icon($side-padding) {
position: absolute;
top: 50%;
right: $side-padding;
transform: translateY(-50%);
width: 5px;
height: 10px;
fill: currentColor;

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

// Fix for Chromium-based browsers blending in the `currentColor` with the background.
@include a11y.high-contrast(active, off) {
fill: CanvasText;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/material/menu/_menu-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

&[disabled] {
&,
&::after,
.mat-menu-submenu-icon,
.mat-icon-no-color {
color: theming.get-color-from-palette($foreground, 'disabled');
}
}
}

.mat-menu-item .mat-icon-no-color,
.mat-menu-item-submenu-trigger::after {
.mat-menu-submenu-icon {
color: theming.get-color-from-palette($foreground, 'icon');
}

Expand Down
6 changes: 6 additions & 0 deletions src/material/menu/menu-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@
[matRippleDisabled]="disableRipple || disabled"
[matRippleTrigger]="_getHostElement()">
</div>

<svg
*ngIf="_triggersSubmenu"
class="mat-menu-submenu-icon"
viewBox="0 0 5 10"
focusable="false"><polygon points="0,0 5,5 0,10"/></svg>
4 changes: 4 additions & 0 deletions src/material/menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ mat-menu {
@include menu-common.item-submenu-trigger(menu-common.$side-padding);
}

.mat-menu-submenu-icon {
@include menu-common.item-submenu-icon(menu-common.$side-padding);
}

button.mat-menu-item {
width: 100%;
}
Expand Down
2 changes: 2 additions & 0 deletions src/material/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,9 @@ describe('MatMenu', () => {
const menuItems = overlay.querySelectorAll('[mat-menu-item]');

expect(menuItems[0].classList).toContain('mat-menu-item-submenu-trigger');
expect(menuItems[0].querySelector('.mat-menu-submenu-icon')).toBeTruthy();
expect(menuItems[1].classList).not.toContain('mat-menu-item-submenu-trigger');
expect(menuItems[1].querySelector('.mat-menu-submenu-icon')).toBeFalsy();
});

it('should increase the sub-menu elevation based on its depth', () => {
Expand Down