Skip to content

SOLR-17936: add focus indicator to navigation sidebar entries #3744

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SOLR-17936: add focus indicator to navigation sidebar entries #3744

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
31 changes: 18 additions & 13 deletions 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 @@ -17,7 +17,6 @@

package org.apache.solr.ui.views.navigation

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -38,15 +37,17 @@ import androidx.compose.material.icons.rounded.Folder
import androidx.compose.material.icons.rounded.Hub
import androidx.compose.material.icons.rounded.Memory
import androidx.compose.material.icons.rounded.Security
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Tab
import androidx.compose.material3.Text
import androidx.compose.material3.VerticalDivider
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp
import org.apache.solr.ui.generated.resources.Res
Expand Down Expand Up @@ -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(
Expand Down