fix(material/menu): icons in menu not inheriting disabled color (#20948)

crisbeto · annieyw · commit e629d65217aa · 2020-11-23T20:37:57.000-08:00
Fixes that the icons inside a disabled menu item still have their non-disabled color. Fixes #20947. (cherry picked from commit 832d2a0)
diff --git a/src/material-experimental/mdc-menu/_menu-theme.scss b/src/material-experimental/mdc-menu/_menu-theme.scss
@@ -14,7 +14,9 @@
     // MDC doesn't appear to have disabled styling for menu
     // items so we have to grey them out ourselves.
     .mat-mdc-menu-item[disabled] {
-      &, &::after {
+      &,
+      &::after,
+      .mat-icon-no-color {
         @include mdc-theme-prop(color, text-disabled-on-background);
       }
     }
diff --git a/src/material/menu/_menu-theme.scss b/src/material/menu/_menu-theme.scss
@@ -20,7 +20,9 @@
     color: mat-color($foreground, 'text');
 
     &[disabled] {
-      &, &::after {
+      &,
+      &::after,
+      .mat-icon-no-color {
         color: mat-color($foreground, 'disabled');
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@`
`14`	`14`	`// MDC doesn't appear to have disabled styling for menu`
`15`	`15`	`// items so we have to grey them out ourselves.`
`16`	`16`	`.mat-mdc-menu-item[disabled] {`
`17`		`- &, &::after {`
	`17`	`+ &,`
	`18`	`+ &::after,`
	`19`	`+ .mat-icon-no-color {`
`18`	`20`	`@include mdc-theme-prop(color, text-disabled-on-background);`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@`
`20`	`20`	`color: mat-color($foreground, 'text');`
`21`	`21`
`22`	`22`	`&[disabled] {`
`23`		`- &, &::after {`
	`23`	`+ &,`
	`24`	`+ &::after,`
	`25`	`+ .mat-icon-no-color {`
`24`	`26`	`color: mat-color($foreground, 'disabled');`
`25`	`27`	`}`
`26`	`28`	`}`