chore: Follow up pop space view

krille-chan · Jul 18, 2024 · 754870e · 754870e
1 parent 956a2e6
commit 754870e
Show file tree

Hide file tree

Showing 2 changed files with 275 additions and 275 deletions.
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
@@ -30,9 +30,14 @@ class ChatListView extends StatelessWidget {
         final selectMode = controller.selectMode;
         return PopScope(
           canPop: controller.selectMode == SelectMode.normal &&
-              !controller.isSearchMode,
+              !controller.isSearchMode &&
+              controller.activeSpaceId == null,
           onPopInvoked: (pop) {
             if (pop) return;
+            if (controller.activeSpaceId != null) {
+              controller.clearActiveSpace();
+              return;
+            }
             final selMode = controller.selectMode;
             if (controller.isSearchMode) {
               controller.cancelSearch();