fix(dictionary): fixed scroll fetching

SethCohen · Apr 10, 2023 · c52d3b6 · c52d3b6
1 parent 5cbc6c5
commit c52d3b6
Showing 1 changed file with 28 additions and 20 deletions.
diff --git a/src/lib/features/dictionary/dictionary_page.dart b/src/lib/features/dictionary/dictionary_page.dart
@@ -39,27 +39,35 @@ class _DictionaryPageState extends State<DictionaryPage> {
           return Text('error ${snapshot.error}');
         }
 
-        return SingleChildScrollView(
-          child: Wrap(
-            spacing: 8,
-            runSpacing: 8,
-            children: List.generate(
-              snapshot.docs.length,
-              (index) {
-                if (snapshot.hasMore && index + 1 == snapshot.docs.length) {
-                  snapshot.fetchMore();
-                }
+        return NotificationListener<ScrollNotification>(
+          onNotification: (scrollNotification) {
+            const double threshold = 200.0;
 
-                return ConstrainedBox(
-                  constraints: BoxConstraints(
-                    maxWidth: screenWidth * 0.15,
-                  ),
-                  child: Flashcard(
-                    card: snapshot.docs[index].data(),
-                    type: CardType.dictionary,
-                  ),
-                );
-              },
+            if (scrollNotification.metrics.pixels >=
+                    scrollNotification.metrics.maxScrollExtent - threshold &&
+                snapshot.hasMore) {
+              snapshot.fetchMore();
+            }
+            return false;
+          },
+          child: SingleChildScrollView(
+            child: Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: List.generate(
+                snapshot.docs.length,
+                (index) {
+                  return ConstrainedBox(
+                    constraints: BoxConstraints(
+                      maxWidth: screenWidth * 0.15,
+                    ),
+                    child: Flashcard(
+                      card: snapshot.docs[index].data(),
+                      type: CardType.dictionary,
+                    ),
+                  );
+                },
+              ),
             ),
           ),
         );