Skip to content

Commit d7a5fc6

Browse files
committed
fix(menu): drill-in disabled menu item chevron
A drill-in set to "open" was no longer showing the disabled color for the chevron icon. Moves disabled CSS after other CSS, which resolves this issue. Also includes this in the existing Storybook example for drill-in. Fixes #2176
1 parent a0ff750 commit d7a5fc6

File tree

2 files changed

+35
-29
lines changed

2 files changed

+35
-29
lines changed

components/menu/index.css

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -512,34 +512,6 @@ governing permissions and limitations under the License.
512512
}
513513
}
514514

515-
.spectrum-Menu-item.is-disabled,
516-
.spectrum-Menu-item[aria-disabled="true"] {
517-
background-color: transparent;
518-
519-
.spectrum-Menu-itemLabel,
520-
.spectrum-Menu-sectionHeading {
521-
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-content-color-disabled, var(--spectrum-menu-item-label-content-color-disabled)));
522-
}
523-
524-
.spectrum-Menu-itemDescription {
525-
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-description-color-disabled, var(--spectrum-menu-item-description-color-disabled)));
526-
}
527-
528-
.spectrum-Menu-itemIcon {
529-
fill: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
530-
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
531-
}
532-
533-
&:hover {
534-
cursor: default;
535-
536-
.spectrum-Menu-itemIcon {
537-
fill: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
538-
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
539-
}
540-
}
541-
}
542-
543515
.spectrum-Menu-itemIcon {
544516
grid-area: iconArea;
545517
align-self: start;
@@ -782,3 +754,32 @@ governing permissions and limitations under the License.
782754
}
783755
}
784756
}
757+
758+
/* Disabled menu items */
759+
.spectrum-Menu-item.is-disabled,
760+
.spectrum-Menu-item[aria-disabled="true"] {
761+
background-color: transparent;
762+
763+
.spectrum-Menu-itemLabel,
764+
.spectrum-Menu-sectionHeading {
765+
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-content-color-disabled, var(--spectrum-menu-item-label-content-color-disabled)));
766+
}
767+
768+
.spectrum-Menu-itemDescription {
769+
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-description-color-disabled, var(--spectrum-menu-item-description-color-disabled)));
770+
}
771+
772+
.spectrum-Menu-itemIcon {
773+
fill: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
774+
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
775+
}
776+
777+
&:hover {
778+
cursor: default;
779+
780+
.spectrum-Menu-itemIcon {
781+
fill: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
782+
color: var(--highcontrast-menu-item-color-disabled, var(--mod-menu-item-label-icon-color-disabled, var(--spectrum-menu-item-label-icon-color-disabled)));
783+
}
784+
}
785+
}

components/menu/stories/menu.stories.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,12 @@ DrillInSubmenu.args = {
342342
isDrillIn: true,
343343
isOpen: true,
344344
},
345-
{ label: "Select and Mask..." },
345+
{
346+
label: "Select and Mask...",
347+
isDrillIn: true,
348+
isDisabled: true,
349+
isOpen: true,
350+
},
346351
{ label: "Save Selection" },
347352
],
348353
};

0 commit comments

Comments
 (0)