feat(ObserveModel): add displayingChildModelMap

Author: LinXunFeng

lib/src/common/models/observe_model.dart

@@ -20,6 +20,9 @@ abstract class ObserveModel {
   /// Stores model list for children widgets those are displaying.
   List<ObserveDisplayingChildModel> innerDisplayingChildModelList;
 
+  /// Stores model map for children widgets those are displaying.
+  Map<int, ObserveDisplayingChildModel> innerDisplayingChildModelMap;
+
   /// Stores index list for children widgets those are displaying.
   List<int> get displayingChildIndexList =>
       innerDisplayingChildModelList.map((e) => e.index).toList();
@@ -35,5 +38,6 @@ abstract class ObserveModel {
     required this.sliver,
     required this.viewport,
     required this.innerDisplayingChildModelList,
+    required this.innerDisplayingChildModelMap,
   });
 }

lib/src/gridview/models/gridview_observe_model.dart

@@ -6,21 +6,22 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
 import 'package:scrollview_observer/src/common/models/observe_model.dart';
-
-import 'gridview_observe_displaying_child_model.dart';
+import 'package:scrollview_observer/src/gridview/models/gridview_observe_displaying_child_model.dart';
 
 class GridViewObserveModel extends ObserveModel {
   GridViewObserveModel({
     required this.sliverGrid,
     required RenderViewportBase viewport,
     required this.firstGroupChildList,
     required this.displayingChildModelList,
+    required this.displayingChildModelMap,
     required bool visible,
   }) : super(
           visible: visible,
           sliver: sliverGrid,
           viewport: viewport,
           innerDisplayingChildModelList: displayingChildModelList,
+          innerDisplayingChildModelMap: displayingChildModelMap,
         );
 
   /// The target sliverGrid.
@@ -32,19 +33,26 @@ class GridViewObserveModel extends ObserveModel {
   /// Stores observing model list of displaying children widgets.
   final List<GridViewObserveDisplayingChildModel> displayingChildModelList;
 
+  /// Stores observing model map of displaying children widgets.
+  final Map<int, GridViewObserveDisplayingChildModel> displayingChildModelMap;
+
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is GridViewObserveModel) {
       return listEquals(firstGroupChildList, other.firstGroupChildList) &&
-          listEquals(displayingChildModelList, other.displayingChildModelList);
+          listEquals(
+              displayingChildModelList, other.displayingChildModelList) &&
+          mapEquals(displayingChildModelMap, other.displayingChildModelMap);
     } else {
       return false;
     }
   }
 
   @override
   int get hashCode {
-    return firstGroupChildList.hashCode + displayingChildModelList.hashCode;
+    return firstGroupChildList.hashCode +
+        displayingChildModelList.hashCode +
+        displayingChildModelMap.hashCode;
   }
 }

lib/src/listview/models/listview_observe_model.dart

@@ -15,12 +15,14 @@ class ListViewObserveModel extends ObserveModel {
     required RenderViewportBase viewport,
     required this.firstChild,
     required this.displayingChildModelList,
+    required this.displayingChildModelMap,
     required bool visible,
   }) : super(
           visible: visible,
           sliver: sliverList,
           viewport: viewport,
           innerDisplayingChildModelList: displayingChildModelList,
+          innerDisplayingChildModelMap: displayingChildModelMap,
         );
 
   /// The target sliverList.
@@ -33,19 +35,26 @@ class ListViewObserveModel extends ObserveModel {
   /// Stores observing model list of displaying children widgets.
   final List<ListViewObserveDisplayingChildModel> displayingChildModelList;
 
+  /// Stores observing model map of displaying children widgets.
+  final Map<int, ListViewObserveDisplayingChildModel> displayingChildModelMap;
+
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is ListViewObserveModel) {
       return firstChild == other.firstChild &&
-          listEquals(displayingChildModelList, other.displayingChildModelList);
+          listEquals(
+              displayingChildModelList, other.displayingChildModelList) &&
+          mapEquals(displayingChildModelMap, other.displayingChildModelMap);
     } else {
       return false;
     }
   }
 
   @override
   int get hashCode {
-    return firstChild.hashCode + displayingChildModelList.hashCode;
+    return firstChild.hashCode +
+        displayingChildModelList.hashCode +
+        displayingChildModelMap.hashCode;
   }
 }

lib/src/observer_core.dart

@@ -39,6 +39,7 @@ class ObserverCore {
         visible: false,
         firstChild: null,
         displayingChildModelList: [],
+        displayingChildModelMap: {},
       );
     }
     final scrollDirection = _obj.constraints.axis;
@@ -90,18 +91,24 @@ class ObserverCore {
         visible: false,
         firstChild: null,
         displayingChildModelList: [],
+        displayingChildModelMap: {},
       );
     }
 
     if (targetFirstChild is! RenderIndexedSemantics) return null;
 
+    final firstDisplayingChildIndex = targetFirstChild.index;
+    final firstDisplayingChildModel = ListViewObserveDisplayingChildModel(
+      sliverList: _obj,
+      viewport: viewport,
+      index: firstDisplayingChildIndex,
+      renderObject: targetFirstChild,
+    );
+    Map<int, ListViewObserveDisplayingChildModel> displayingChildModelMap = {
+      firstDisplayingChildIndex: firstDisplayingChildModel,
+    };
     List<ListViewObserveDisplayingChildModel> displayingChildModelList = [
-      ListViewObserveDisplayingChildModel(
-        sliverList: _obj,
-        viewport: viewport,
-        index: targetFirstChild.index,
-        renderObject: targetFirstChild,
-      ),
+      firstDisplayingChildModel,
     ];
 
     // Find the remaining children that are being displayed
@@ -123,26 +130,26 @@ class ObserverCore {
         displayingChild = _obj.childAfter(displayingChild);
         continue;
       }
-      displayingChildModelList.add(ListViewObserveDisplayingChildModel(
+
+      final displayingChildIndex = displayingChild.index;
+      final displayingChildModel = ListViewObserveDisplayingChildModel(
         sliverList: _obj,
         viewport: viewport,
-        index: displayingChild.index,
+        index: displayingChildIndex,
         renderObject: displayingChild,
-      ));
+      );
+      displayingChildModelList.add(displayingChildModel);
+      displayingChildModelMap[displayingChildIndex] = displayingChildModel;
       displayingChild = _obj.childAfter(displayingChild);
     }
 
     return ListViewObserveModel(
       sliverList: _obj,
       viewport: viewport,
       visible: true,
-      firstChild: ListViewObserveDisplayingChildModel(
-        sliverList: _obj,
-        viewport: viewport,
-        index: targetFirstChild.index,
-        renderObject: targetFirstChild,
-      ),
+      firstChild: firstDisplayingChildModel,
       displayingChildModelList: displayingChildModelList,
+      displayingChildModelMap: displayingChildModelMap,
     );
   }
 
@@ -169,6 +176,7 @@ class ObserverCore {
         visible: false,
         firstGroupChildList: [],
         displayingChildModelList: [],
+        displayingChildModelMap: {},
       );
     }
     final scrollDirection = _obj.constraints.axis;
@@ -210,20 +218,26 @@ class ObserverCore {
         visible: false,
         firstGroupChildList: [],
         displayingChildModelList: [],
+        displayingChildModelMap: {},
       );
     }
 
     if (targetFirstChild is! RenderIndexedSemantics) return null;
     lastFirstGroupChildWidget = targetFirstChild;
 
+    final firstDisplayingChildIndex = targetFirstChild.index;
     final firstModel = GridViewObserveDisplayingChildModel(
       sliverGrid: _obj,
       viewport: viewport,
-      index: targetFirstChild.index,
+      index: firstDisplayingChildIndex,
       renderObject: targetFirstChild,
     );
-    List<GridViewObserveDisplayingChildModel> firstGroupChildModelList = [];
-    firstGroupChildModelList.add(firstModel);
+    Map<int, GridViewObserveDisplayingChildModel> displayingChildModelMap = {
+      firstDisplayingChildIndex: firstModel,
+    };
+    List<GridViewObserveDisplayingChildModel> firstGroupChildModelList = [
+      firstModel,
+    ];
 
     final showingChildrenMaxOffset =
         rawScrollViewOffset + _obj.constraints.remainingPaintExtent - overlap;
@@ -238,12 +252,15 @@ class ObserverCore {
         toNextOverPercent: toNextOverPercent,
       )) {
         if (targetChild is! RenderIndexedSemantics) break;
-        firstGroupChildModelList.add(GridViewObserveDisplayingChildModel(
+        final targetChildIndex = targetChild.index;
+        final displayingChildModel = GridViewObserveDisplayingChildModel(
           sliverGrid: _obj,
           viewport: viewport,
-          index: targetChild.index,
+          index: targetChildIndex,
           renderObject: targetChild,
-        ));
+        );
+        firstGroupChildModelList.add(displayingChildModel);
+        displayingChildModelMap[targetChildIndex] = displayingChildModel;
         lastFirstGroupChildWidget = targetChild;
       }
 
@@ -268,12 +285,15 @@ class ObserverCore {
         if (displayingChild is! RenderIndexedSemantics) {
           continue;
         }
-        showingChildModelList.add(GridViewObserveDisplayingChildModel(
+        final displayingChildIndex = displayingChild.index;
+        final displayingChildModel = GridViewObserveDisplayingChildModel(
           sliverGrid: _obj,
           viewport: viewport,
-          index: displayingChild.index,
+          index: displayingChildIndex,
           renderObject: displayingChild,
-        ));
+        );
+        showingChildModelList.add(displayingChildModel);
+        displayingChildModelMap[displayingChildIndex] = displayingChildModel;
       }
       displayingChild = _obj.childAfter(displayingChild);
     }
@@ -284,6 +304,7 @@ class ObserverCore {
       visible: true,
       firstGroupChildList: firstGroupChildModelList,
       displayingChildModelList: showingChildModelList,
+      displayingChildModelMap: displayingChildModelMap,
     );
   }
 }