fix(ui-drilldown): disabled options no longer show hover/focus styles

ToMESSKa · ToMESSKa · commit 9c9e8bbaa69f · 2026-07-16T06:32:13.000-07:00
Closes: INSTUI-5077
diff --git a/packages/ui-drilldown/src/Drilldown/v1/index.tsx b/packages/ui-drilldown/src/Drilldown/v1/index.tsx
@@ -1258,13 +1258,9 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
         optionProps.role = customRole || 'menuitemcheckbox'
       }
     }
-    // display option as highlighted
-    if (id === this.state.highlightedOptionId) {
+    // display option as highlighted, but never highlight disabled options
+    if (id === this.state.highlightedOptionId && !isOptionDisabled) {
       optionProps.variant = 'highlighted'
-
-      if (isOptionDisabled) {
-        optionProps.variant = 'highlighted-disabled'
-      }
     }
 
     if (href) {
diff --git a/packages/ui-drilldown/src/Drilldown/v2/index.tsx b/packages/ui-drilldown/src/Drilldown/v2/index.tsx
@@ -1255,13 +1255,9 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {
         optionProps.role = customRole || 'menuitemcheckbox'
       }
     }
-    // display option as highlighted
-    if (id === this.state.highlightedOptionId) {
+    // display option as highlighted, but never highlight disabled options
+    if (id === this.state.highlightedOptionId && !isOptionDisabled) {
       optionProps.variant = 'highlighted'
-
-      if (isOptionDisabled) {
-        optionProps.variant = 'highlighted-disabled'
-      }
     }
 
     if (href) {

Original file line number	Diff line number	Diff line change
`@@ -1258,13 +1258,9 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {`
`1258`	`1258`	`optionProps.role = customRole \|\| 'menuitemcheckbox'`
`1259`	`1259`	`}`
`1260`	`1260`	`}`
`1261`		`- // display option as highlighted`
`1262`		`- if (id === this.state.highlightedOptionId) {`
	`1261`	`+ // display option as highlighted, but never highlight disabled options`
	`1262`	`+ if (id === this.state.highlightedOptionId && !isOptionDisabled) {`
`1263`	`1263`	`optionProps.variant = 'highlighted'`
`1264`		`-`
`1265`		`- if (isOptionDisabled) {`
`1266`		`- optionProps.variant = 'highlighted-disabled'`
`1267`		`- }`
`1268`	`1264`	`}`
`1269`	`1265`
`1270`	`1266`	`if (href) {`
Original file line number	Diff line number	Diff line change
`@@ -1255,13 +1255,9 @@ class Drilldown extends Component<DrilldownProps, DrilldownState> {`
`1255`	`1255`	`optionProps.role = customRole \|\| 'menuitemcheckbox'`
`1256`	`1256`	`}`
`1257`	`1257`	`}`
`1258`		`- // display option as highlighted`
`1259`		`- if (id === this.state.highlightedOptionId) {`
	`1258`	`+ // display option as highlighted, but never highlight disabled options`
	`1259`	`+ if (id === this.state.highlightedOptionId && !isOptionDisabled) {`
`1260`	`1260`	`optionProps.variant = 'highlighted'`
`1261`		`-`
`1262`		`- if (isOptionDisabled) {`
`1263`		`- optionProps.variant = 'highlighted-disabled'`
`1264`		`- }`
`1265`	`1261`	`}`
`1266`	`1262`
`1267`	`1263`	`if (href) {`