Skip to content

SOLR-17936: add focus indicator to navigation sidebar entries in new UI #3716

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

SOLR-17936: add focus indicator to navigation sidebar entries in new UI #3716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.solr.ui.views.navigation

import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -44,8 +45,13 @@ import androidx.compose.material3.Tab
import androidx.compose.material3.Text
import androidx.compose.material3.VerticalDivider
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -124,14 +130,21 @@ private fun MenuElement(
onClick: () -> Unit = {},
) {
val alpha = if (enabled) 1f else 0.38f
var borderAlpha by remember {
mutableFloatStateOf(0f)
}
Tab(
modifier = modifier.background(
if (selected) {
MaterialTheme.colorScheme.primaryContainer.copy(alpha = alpha)
} else {
Color.Unspecified
},
),
).border(
width = 2.dp, color = MaterialTheme.colorScheme.outline.copy(alpha = borderAlpha)
).onFocusChanged {
borderAlpha = if (it.isFocused) 1f else 0f
},
selected = selected,
enabled = enabled,
selectedContentColor = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = alpha),
Expand Down
Loading