Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added focus restoration when closing commit changes search

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2024-09-11 10:44:23 +02:00
parent e38746cd0e
commit 0f5e4248b9
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt
View File

@ -33,6 +33,7 @@ import com.jetpackduba.gitnuro.ui.tree_files.TreeItem
import com.jetpackduba.gitnuro.viewmodels.CommitChangesStateUi import com.jetpackduba.gitnuro.viewmodels.CommitChangesStateUi
import com.jetpackduba.gitnuro.viewmodels.CommitChangesViewModel import com.jetpackduba.gitnuro.viewmodels.CommitChangesViewModel
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.eclipse.jgit.diff.DiffEntry import org.eclipse.jgit.diff.DiffEntry
import org.eclipse.jgit.lib.PersonIdent import org.eclipse.jgit.lib.PersonIdent
@ -47,10 +48,20 @@ fun CommitChanges(
onBlame: (String) -> Unit, onBlame: (String) -> Unit,
onHistory: (String) -> Unit, onHistory: (String) -> Unit,
) { ) {
val tabFocusRequester = LocalTabFocusRequester.current
LaunchedEffect(selectedItem) { LaunchedEffect(selectedItem) {
commitChangesViewModel.loadChanges(selectedItem.revCommit) commitChangesViewModel.loadChanges(selectedItem.revCommit)
} }
LaunchedEffect(commitChangesViewModel) {
commitChangesViewModel.showSearch.collectLatest { show ->
if (!show) {
tabFocusRequester.requestFocus()
}
}
}
val commitChangesStatus = commitChangesViewModel.commitChangesStateUi.collectAsState().value val commitChangesStatus = commitChangesViewModel.commitChangesStateUi.collectAsState().value
val showSearch by commitChangesViewModel.showSearch.collectAsState() val showSearch by commitChangesViewModel.showSearch.collectAsState()
val changesListScroll by commitChangesViewModel.changesLazyListState.collectAsState() val changesListScroll by commitChangesViewModel.changesLazyListState.collectAsState()