Fixes after merge

This commit is contained in:
Damontecres 2026-01-12 03:06:06 -05:00
parent 84fb998cc5
commit 3670736611
No known key found for this signature in database
2 changed files with 6 additions and 0 deletions

View file

@ -47,6 +47,7 @@ fun DiscoverPage(
)
var selectedTabIndex by rememberSaveable { mutableIntStateOf(rememberedTabIndex) }
val focusRequester = remember { FocusRequester() }
val tabFocusRequesters = remember(tabs) { List(tabs.size) { FocusRequester() } }
val firstTabFocusRequester = remember { FocusRequester() }
LaunchedEffect(Unit) { firstTabFocusRequester.tryRequestFocus() }
@ -76,6 +77,7 @@ fun DiscoverPage(
.focusRequester(firstTabFocusRequester),
tabs = tabs,
onClick = { selectedTabIndex = it },
focusRequesters = tabFocusRequesters,
)
}
when (selectedTabIndex) {
@ -93,6 +95,7 @@ fun DiscoverPage(
// Requests
1 -> {
SeerrRequestsPage(
focusRequesterOnEmpty = tabFocusRequesters.getOrNull(selectedTabIndex),
modifier =
Modifier
.fillMaxSize()

View file

@ -143,6 +143,7 @@ data class RequestGridItem(
@Composable
fun SeerrRequestsPage(
focusRequesterOnEmpty: FocusRequester?,
modifier: Modifier = Modifier,
viewModel: SeerrRequestsViewModel = hiltViewModel(),
) {
@ -164,6 +165,8 @@ fun SeerrRequestsPage(
LaunchedEffect(Unit) {
if (state.data.isNotEmpty()) {
focusRequester.tryRequestFocus()
} else {
focusRequesterOnEmpty?.tryRequestFocus()
}
}
Column(modifier = modifier) {