Merge pull request #2493 from acterglobal/kumar/scroll-fixing

Chat List Fixes
acterglobal · Jan 13, 2025 · 229ca1f · 229ca1f
2 parents 1246daa + 148e261
commit 229ca1f
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 76 deletions.
diff --git a/app/lib/features/chat/widgets/chats_list.dart b/app/lib/features/chat/widgets/chats_list.dart
@@ -46,28 +46,22 @@ class ChatsList extends ConsumerWidget {
     return filteredChats.when(
       data: (chatsIds) {
         if (chatsIds.isEmpty) {
-          return SliverToBoxAdapter(
-            child: Center(
-              heightFactor: 10,
-              child: Text(lang.noChatsFoundMatchingYourFilter),
-            ),
+          return Center(
+            heightFactor: 10,
+            child: Text(lang.noChatsFoundMatchingYourFilter),
           );
         }
         return _renderList(context, chatsIds);
       },
-      loading: () => const SliverToBoxAdapter(
-        child: Center(
-          heightFactor: 10,
-          child: CircularProgressIndicator(),
-        ),
+      loading: () => Center(
+        heightFactor: 10,
+        child: CircularProgressIndicator(),
       ),
       error: (e, s) {
         _log.severe('Failed to filter convos', e, s);
-        return SliverToBoxAdapter(
-          child: Center(
-            heightFactor: 10,
-            child: Text(lang.searchingFailed(e)),
-          ),
+        return Center(
+          heightFactor: 10,
+          child: Text(lang.searchingFailed(e)),
         );
       },
       skipLoadingOnReload: true,
@@ -77,31 +71,27 @@ class ChatsList extends ConsumerWidget {
 
   Widget _renderSyncing(BuildContext context) {
     final lang = L10n.of(context);
-    return SliverToBoxAdapter(
-      child: Center(
-        heightFactor: 1.5,
-        child: EmptyState(
-          title: lang.noChatsStillSyncing,
-          subtitle: lang.noChatsStillSyncingSubtitle,
-          image: 'assets/images/empty_chat.svg',
-        ),
+    return Center(
+      heightFactor: 1.5,
+      child: EmptyState(
+        title: lang.noChatsStillSyncing,
+        subtitle: lang.noChatsStillSyncingSubtitle,
+        image: 'assets/images/empty_chat.svg',
       ),
     );
   }
 
   Widget _renderEmpty(BuildContext context) {
     final lang = L10n.of(context);
-    return SliverToBoxAdapter(
-      child: Center(
-        heightFactor: 1.5,
-        child: EmptyState(
-          title: lang.youHaveNoDMsAtTheMoment,
-          subtitle: lang.getInTouchWithOtherChangeMakers,
-          image: 'assets/images/empty_chat.svg',
-          primaryButton: ActerPrimaryActionButton(
-            onPressed: () => context.pushNamed(Routes.createChat.name),
-            child: Text(lang.sendDM),
-          ),
+    return Center(
+      heightFactor: 1.5,
+      child: EmptyState(
+        title: lang.youHaveNoDMsAtTheMoment,
+        subtitle: lang.getInTouchWithOtherChangeMakers,
+        image: 'assets/images/empty_chat.svg',
+        primaryButton: ActerPrimaryActionButton(
+          onPressed: () => context.pushNamed(Routes.createChat.name),
+          child: Text(lang.sendDM),
         ),
       ),
     );
@@ -245,7 +235,7 @@ class __AnimatedChatsListState extends State<_AnimatedChatsList> {
   @override
   Widget build(BuildContext context) {
     _log.fine('render list $_currentList');
-    return SliverAnimatedList(
+    return AnimatedList(
       key: _listKey,
       initialItemCount: _currentList.length,
       itemBuilder: buildItem,

diff --git a/app/lib/features/chat/widgets/rooms_list.dart b/app/lib/features/chat/widgets/rooms_list.dart
@@ -14,6 +14,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 
 final bucketGlobal = PageStorageBucket();
+
 typedef RoomSelectAction = Function(String);
 
 class RoomsListWidget extends ConsumerStatefulWidget {
@@ -155,44 +156,48 @@ class RoomsListWidgetState extends ConsumerState<RoomsListWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return PageStorage(
-      bucket: bucketGlobal,
-      child: CustomScrollView(
-        controller: controller,
-        key: const PageStorageKey<String>('convo-list'),
-        physics: const BouncingScrollPhysics(),
-        slivers: [
-          SliverAppBar(
-            automaticallyImplyLeading: false,
-            floating: true,
-            elevation: 0,
-            leading: Padding(
-              padding: const EdgeInsets.all(15),
-              child: roomListTitle(context),
-            ),
-            leadingWidth: double.infinity,
-            actions: renderActions(),
-          ),
-          SliverToBoxAdapter(
-            child: AnimatedOpacity(
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        elevation: 0,
+        leading: Padding(
+          padding: const EdgeInsets.all(15),
+          child: roomListTitle(context),
+        ),
+        leadingWidth: double.infinity,
+        actions: renderActions(),
+      ),
+      body: PageStorage(
+        bucket: bucketGlobal,
+        child: Column(
+          children: [
+            AnimatedOpacity(
               opacity: !_isSearchVisible ? 0 : 1,
               curve: Curves.easeInOut,
               duration: const Duration(milliseconds: 400),
               child: _isSearchVisible
                   ? Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 16),
-                      child: filterBox(context),
-                    )
+                padding: const EdgeInsets.symmetric(horizontal: 16),
+                child: filterBox(context),
+              )
                   : const SizedBox.shrink(),
             ),
-          ),
-          SliverToBoxAdapter(
-            child: searchTerms(context),
-          ),
-          ref.watch(isGuestProvider)
-              ? empty
-              : ChatsList(onSelected: widget.onSelected),
-        ],
+            searchTerms(context),
+            Expanded(
+              child: ref.watch(isGuestProvider)
+                  ? empty
+                  : ChatsList(
+                      onSelected: (roomId) {
+                        ref
+                            .read(roomListFilterProvider.notifier)
+                            .updateSearchTerm(null);
+                        setState(() => _isSearchVisible = false);
+                        widget.onSelected(roomId);
+                      },
+                    ),
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -256,10 +261,8 @@ class RoomsListWidgetState extends ConsumerState<RoomsListWidget> {
   }
 
   Widget get empty {
-    return SliverToBoxAdapter(
-      child: Center(
-        child: SvgPicture.asset('assets/images/empty_messages.svg'),
-      ),
+    return Center(
+      child: SvgPicture.asset('assets/images/empty_messages.svg'),
     );
   }
 }
diff --git a/app/test/features/chat/chat_listing_search_test.dart b/app/test/features/chat/chat_listing_search_test.dart
@@ -108,7 +108,10 @@ void main() {
           find.byKey(ActerSearchWidget.searchBarKey),
           findsOneWidget,
         );
-        await tester.enterText(find.byKey(ActerSearchWidget.searchBarKey), 'CD');
+        await tester.enterText(
+          find.byKey(ActerSearchWidget.searchBarKey),
+          'CD',
+        );
         await tester.pumpProviderScope(times: 2);
         // -- we only see subset
         expect(
@@ -119,7 +122,8 @@ void main() {
           ),
           findsExactly(2),
         );
-
+        await tester
+            .tap(find.byKey(ActerSearchWidget.clearSearchActionButtonKey));
         await tester.enterText(find.byKey(ActerSearchWidget.searchBarKey), 'E');
         await tester.pumpProviderScope(times: 2);
         // -- we only see subset
@@ -190,7 +194,8 @@ void main() {
           findsOneWidget,
         );
         await tester.enterText(
-          find.byKey(ActerSearchWidget.searchBarKey), 'mA', // part of one room ID
+          find.byKey(ActerSearchWidget.searchBarKey),
+          'mA', // part of one room ID
         );
         await tester.pumpProviderScope(times: 2);
         // -- we only see subset
@@ -206,9 +211,11 @@ void main() {
           find.text('Room ABC'),
           findsOne,
         );
-
+        await tester
+            .tap(find.byKey(ActerSearchWidget.clearSearchActionButtonKey));
         await tester.enterText(
-          find.byKey(ActerSearchWidget.searchBarKey), 'mD', // part of one room ID
+          find.byKey(ActerSearchWidget.searchBarKey),
+          'mD', // part of one room ID
         );
         await tester.pumpProviderScope(times: 2);
         // -- we only see subset
@@ -231,7 +238,7 @@ void main() {
         // and we close
         await tester
             .tap(find.byKey(RoomsListWidget.closeSearchActionButtonKey));
-        await tester.pumpProviderScope(times: 1);
+        await tester.pumpProviderScope(times: 2);
         // -- we should see all of them again
         expect(
           find.byType(