Apache Solr open-source search software
SOLR-17936: add focus indicator to navigation sidebar entries (#3744)
Jane Sandbergd6be7a4ae935
diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.ktindex 201cf73b633..cfd1606506b 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt@@ -17,7 +17,6 @@package org.apache.solr.ui.views.navigation-import androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row@@ -38,15 +37,17 @@ import androidx.compose.material.icons.rounded.Folderimport androidx.compose.material.icons.rounded.Hubimport androidx.compose.material.icons.rounded.Memoryimport androidx.compose.material.icons.rounded.Security+import androidx.compose.material3.Button+import androidx.compose.material3.ButtonDefaultsimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme-import androidx.compose.material3.Tabimport androidx.compose.material3.Textimport androidx.compose.material3.VerticalDividerimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color+import androidx.compose.ui.graphics.RectangleShapeimport androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.unit.dpimport org.apache.solr.ui.generated.resources.Res@@ -124,18 +125,22 @@ private fun MenuElement(onClick: () -> Unit = {},) {val alpha = if (enabled) 1f else 0.38f- Tab(- modifier = modifier.background(- if (selected) {- MaterialTheme.colorScheme.primaryContainer.copy(alpha = alpha)- } else {- Color.Unspecified- },- ),- selected = selected,+ Button(+ colors = if (selected) {+ ButtonDefaults.buttonColors(+ containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = alpha),+ contentColor = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = alpha),+ disabledContainerColor = Color.Transparent,+ )+ } else {+ ButtonDefaults.buttonColors(+ containerColor = Color.Transparent,+ contentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = alpha),+ disabledContainerColor = Color.Transparent,+ )+ },+ shape = RectangleShape,enabled = enabled,- selectedContentColor = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = alpha),- unselectedContentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = alpha),onClick = onClick,) {Row(