Fixed commit/merge/rebase button being disabled when filtering all items

Author: JetpackDuba

src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt

@@ -347,7 +347,7 @@ private fun CommitField(
 fun ColumnScope.StagedView(
     stageStateUi: StageStateUi.Loaded,
     showSearchUnstaged: Boolean,
-    searchFilterUnstaged: TextFieldValue,
+    searchFilterStaged: TextFieldValue,
     stagedListState: LazyListState,
     selectedEntryType: DiffType?,
     onSearchFilterToggled: (Boolean) -> Unit,
@@ -381,7 +381,7 @@ fun ColumnScope.StagedView(
         entryType = EntryType.STAGED,
         stageStateUi = stageStateUi,
         showSearchUnstaged = showSearchUnstaged,
-        searchFilterUnstaged = searchFilterUnstaged,
+        searchFilterUnstaged = searchFilterStaged,
         listState = stagedListState,
         selectedEntryType = selectedEntryType,
         onSearchFilterToggled = onSearchFilterToggled,
@@ -397,8 +397,20 @@ fun ColumnScope.StagedView(
         onAlternateShowAsTree = onAlternateShowAsTree,
         onTreeDirectoryClicked = onTreeDirectoryClicked,
         onTreeDirectoryAction = onTreeDirectoryAction,
-        onTreeEntries = { it.staged },
-        onListEntries = { it.staged },
+        onTreeEntries = {
+            if (searchFilterStaged.text.trim().isEmpty()) {
+                it.staged
+            } else {
+                it.filteredStaged
+            }
+        },
+        onListEntries = {
+            if (searchFilterStaged.text.trim().isEmpty()) {
+                it.staged
+            } else {
+                it.filteredStaged
+            }
+        },
         onGetSelectedEntry = { if (selectedEntryType is DiffType.StagedDiff) selectedEntryType else null },
     )
 }
@@ -457,8 +469,20 @@ fun ColumnScope.UnstagedView(
         onAlternateShowAsTree = onAlternateShowAsTree,
         onTreeDirectoryClicked = onTreeDirectoryClicked,
         onTreeDirectoryAction = onTreeDirectoryAction,
-        onTreeEntries = { it.unstaged },
-        onListEntries = { it.unstaged },
+        onTreeEntries = {
+            if (searchFilterUnstaged.text.trim().isEmpty()) {
+                it.unstaged
+            } else {
+                it.filteredUnstaged
+            }
+        },
+        onListEntries = {
+            if (searchFilterUnstaged.text.trim().isEmpty()) {
+                it.unstaged
+            } else {
+                it.filteredUnstaged
+            }
+        },
         onGetSelectedEntry = { if (selectedEntryType is DiffType.UnstagedDiff) selectedEntryType else null },
     )
 }

src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt

@@ -101,7 +101,7 @@ class StatusViewModel @Inject constructor(
                 state.staged
             }.prioritizeConflicts()
 
-            state.copy(staged = staged, unstaged = unstaged)
+            state.copy(filteredStaged = staged, filteredUnstaged = unstaged)
 
         } else {
             state
@@ -128,12 +128,19 @@ class StatusViewModel @Inject constructor(
                             stageStateFiltered.unstaged,
                             contractedDirectories
                         ) { it.filePath },
+                        filteredStaged = entriesToTreeEntry(stageStateFiltered.filteredStaged, contractedDirectories) { it.filePath },
+                        filteredUnstaged = entriesToTreeEntry(
+                            stageStateFiltered.filteredUnstaged,
+                            contractedDirectories
+                        ) { it.filePath },
                         isPartiallyReloading = stageStateFiltered.isPartiallyReloading,
                     )
                 } else {
                     StageStateUi.ListLoaded(
                         staged = stageStateFiltered.staged,
                         unstaged = stageStateFiltered.unstaged,
+                        filteredStaged = stageStateFiltered.filteredStaged,
+                        filteredUnstaged = stageStateFiltered.filteredUnstaged,
                         isPartiallyReloading = stageStateFiltered.isPartiallyReloading,
                     )
                 }
@@ -310,7 +317,9 @@ class StatusViewModel @Inject constructor(
 
                 _stageState.value = StageState.Loaded(
                     staged = staged,
+                    filteredStaged = staged,
                     unstaged = unstaged,
+                    filteredUnstaged = unstaged,
                     isPartiallyReloading = false,
                 )
             }
@@ -610,7 +619,9 @@ sealed interface StageState {
     data object Loading : StageState
     data class Loaded(
         val staged: List<StatusEntry>,
+        val filteredStaged: List<StatusEntry>,
         val unstaged: List<StatusEntry>,
+        val filteredUnstaged: List<StatusEntry>,
         val isPartiallyReloading: Boolean,
     ) : StageState
 }
@@ -637,7 +648,9 @@ sealed interface StageStateUi {
 
     data class TreeLoaded(
         val staged: List<TreeItem<StatusEntry>>,
+        val filteredStaged: List<TreeItem<StatusEntry>>,
         val unstaged: List<TreeItem<StatusEntry>>,
+        val filteredUnstaged: List<TreeItem<StatusEntry>>,
         val isPartiallyReloading: Boolean,
     ) : Loaded {
 
@@ -651,7 +664,9 @@ sealed interface StageStateUi {
 
     data class ListLoaded(
         val staged: List<StatusEntry>,
+        val filteredStaged: List<StatusEntry>,
         val unstaged: List<StatusEntry>,
+        val filteredUnstaged: List<StatusEntry>,
         val isPartiallyReloading: Boolean,
     ) : Loaded {
         override val hasStagedFiles: Boolean = staged.isNotEmpty()