properly restore focus on episode screen

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/overview/episode/EpisodeOverviewComponent.kt

@@ -20,7 +20,6 @@ import org.koin.core.annotation.Named
 import ru.shadowsparky.domain.Clip
 import ru.shadowsparky.domain.ClipboardManager
 import ru.shadowsparky.domain.DispatcherProvider
-import ru.shadowsparky.ui.nav.RootComponent
 import ru.shadowsparky.ui.nav.ComponentFactory
 import ru.shadowsparky.ui.nav.RouteNavigator
 import ru.shadowsparky.vbox.shared.domain.AddOfflineVideoUseCase
@@ -71,7 +70,7 @@ class EpisodeOverviewComponent(
         }
     }
 
-    val recentlyFlow = recentlyWatchedRepository.queryRecentlyWatched(id, seasonId)
+    private val recentlyFlow = recentlyWatchedRepository.queryRecentlyWatched(id, seasonId)
 
     private val episodes = recentlyFlow.combine(episodesFromServer) { watched, season ->
         val episode = season.episodes

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/overview/episode/EpisodeOverviewScreen.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularWavyProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -30,6 +31,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -39,6 +41,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
@@ -175,38 +178,45 @@ fun EpisodesOverviewList(
             buttonText = stringResource(Res.string.retry)
         ) { loadLinks() }
     } else if (episodes != null) {
+        val lazyListState = rememberLazyListState()
+        var focusedIndex by rememberSaveable { mutableIntStateOf(0) }
         val requester = remember { FocusRequester() }
         ExpressiveLazyColumn(
             modifier = Modifier.fillMaxSize(),
             contentPadding = contentPadding,
-            content = {
-                section {
-                    itemsIndexed(
-                        episodes,
-                        { it.episode.episode }
-                    ) { index, episode ->
-                        EpisodeInfo(
-                            if (index == 0) {
+            state = lazyListState,
+        ) {
+            section {
+                itemsIndexed(
+                    items = episodes,
+                    key = { item -> item.episode.episode }
+                ) { index, episode ->
+                    EpisodeInfo(
+                        Modifier.onFocusChanged { state ->
+                            if (state.isFocused) focusedIndex = index
+                        }.then(
+                            if (index == focusedIndex) {
                                 Modifier.focusRequester(requester)
                             } else {
                                 Modifier
-                            },
-                            onLaunch,
-                            episode,
-                            onClipboardAction,
-                            index,
-                            onOfflineClicked,
-                            isSaveMode
-                        )
-                    }
+                            }
+                        ),
+                        onLaunch,
+                        episode,
+                        onClipboardAction,
+                        index,
+                        onOfflineClicked,
+                        isSaveMode
+                    )
                 }
             }
-        )
+        }
         LaunchedEffect(episodes) {
-            if (episodes.isNotEmpty()) {
-                withFrameNanos {}
-                requester.requestFocus()
-            }
+            if (episodes.isEmpty()) return@LaunchedEffect
+            val index = focusedIndex.coerceIn(episodes.indices)
+            lazyListState.scrollToItem(index)
+            withFrameNanos {}
+            requester.requestFocus()
         }
     } else {
         Loading()