Remove autoLoad in RefreshConfiguration

peng8350 · May 7, 2021 · bd5b264 · bd5b264
1 parent 22a700f
commit bd5b264
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 59 deletions.
diff --git a/lib/src/internals/indicator_wrap.dart b/lib/src/internals/indicator_wrap.dart
@@ -405,9 +405,6 @@ abstract class LoadIndicatorState<T extends LoadIndicator> extends State<T>
             configuration!.footerTriggerDistance &&
         _position!.extentBefore > 2.0 &&
         _enableLoading) {
-      if (!configuration!.autoLoad && mode == LoadStatus.idle) {
-        return false;
-      }
       if (!configuration!.enableLoadingWhenFailed &&
           mode == LoadStatus.failed) {
         return false;
@@ -558,10 +555,6 @@ abstract class LoadIndicatorState<T extends LoadIndicator> extends State<T>
             return GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () {
-                if ((mode == LoadStatus.idle && !configuration!.autoLoad) ||
-                    (_mode!.value == LoadStatus.failed)) {
-                  enterLoading();
-                }
                 if (widget.onClick != null) {
                   widget.onClick!();
                 }

diff --git a/lib/src/smart_refresher.dart b/lib/src/smart_refresher.dart
@@ -858,9 +858,6 @@ class RefreshConfiguration extends InheritedWidget {
   /// when listView data small(not enough one page) , it should be hide
   final bool hideFooterWhenNotFull;
 
-  /// whether footer can trigger load by reaching footerDistance when idle
-  final bool autoLoad;
-
   /// whether user can drag viewport when twoLeveling
   final bool enableScrollWhenTwoLevel;
 
@@ -932,7 +929,6 @@ class RefreshConfiguration extends InheritedWidget {
       this.twiceTriggerDistance: 150.0,
       this.closeTwoLevelDistance: 80.0,
       this.skipCanRefresh: false,
-      this.autoLoad: true,
       this.maxOverScrollExtent,
       this.enableBallisticLoad: true,
       this.maxUnderScrollExtent,
@@ -971,7 +967,6 @@ class RefreshConfiguration extends InheritedWidget {
     double? twiceTriggerDistance,
     double? closeTwoLevelDistance,
     bool? skipCanRefresh,
-    bool? autoLoad,
     double? maxOverScrollExtent,
     double? maxUnderScrollExtent,
     double? topHitBoundary,
@@ -983,7 +978,6 @@ class RefreshConfiguration extends InheritedWidget {
     bool? hideFooterWhenNotFull,
   })  : assert(RefreshConfiguration.of(context) != null,
             "search RefreshConfiguration anscestor return null,please  Make sure that RefreshConfiguration is the ancestor of that element"),
-        autoLoad = autoLoad ?? RefreshConfiguration.of(context)!.autoLoad,
         headerBuilder =
             headerBuilder ?? RefreshConfiguration.of(context)!.headerBuilder,
         footerBuilder =
@@ -1038,7 +1032,7 @@ class RefreshConfiguration extends InheritedWidget {
 
   @override
   bool updateShouldNotify(RefreshConfiguration oldWidget) {
-    return autoLoad != oldWidget.autoLoad ||
+    return
         skipCanRefresh != oldWidget.skipCanRefresh ||
         hideFooterWhenNotFull != oldWidget.hideFooterWhenNotFull ||
         dragSpeedRatio != oldWidget.dragSpeedRatio ||

diff --git a/test/loadmore_test.dart b/test/loadmore_test.dart
@@ -458,51 +458,10 @@ void main() {
     });
   });
 
-  testWidgets("when autoLoad = false or enableLoadingWhenFailed = true",
+  testWidgets("when enableLoadingWhenFailed = true",
       (tester) async {
-    final RefreshController _refreshController = RefreshController();
-    await tester.pumpWidget(Directionality(
-      textDirection: TextDirection.ltr,
-      child: RefreshConfiguration(
-        child: SmartRefresher(
-          header: TestHeader(),
-          footer: TestFooter(),
-          enablePullUp: true,
-          enablePullDown: true,
-          child: ListView.builder(
-            itemBuilder: (c, i) => Center(
-              child: Text(data[i]),
-            ),
-            itemCount: 20,
-            itemExtent: 100,
-          ),
-          controller: _refreshController,
-        ),
-        autoLoad: false,
-        enableLoadingWhenFailed: false,
-      ),
-    ));
-
-    _refreshController.position!
-        .jumpTo(_refreshController.position!.maxScrollExtent);
-    await tester.drag(find.byType(Scrollable), const Offset(0, -150.0));
-    expect(_refreshController.footerStatus, LoadStatus.idle);
-    await tester.pumpAndSettle(Duration(milliseconds: 500));
-    expect(_refreshController.footerStatus, LoadStatus.idle);
-
-    _refreshController.footerMode!.value = LoadStatus.failed;
-    _refreshController.position!
-        .jumpTo(_refreshController.position!.maxScrollExtent - 30.0);
-    expect(_refreshController.position!.pixels,
-        _refreshController.position!.maxScrollExtent - 30.0);
-    expect(_refreshController.footerStatus, LoadStatus.failed);
-    await tester.pump();
-    await tester.drag(find.byType(Scrollable), const Offset(0, -100.0));
-    await tester.pump();
-    expect(_refreshController.footerStatus, LoadStatus.failed);
-    await tester.pumpAndSettle(Duration(milliseconds: 200));
-    expect(_refreshController.footerStatus, LoadStatus.failed);
 
+    RefreshController _refreshController  = RefreshController();
     await tester.pumpWidget(Directionality(
       textDirection: TextDirection.ltr,
       child: RefreshConfiguration(
@@ -520,7 +479,7 @@ void main() {
           ),
           controller: _refreshController,
         ),
-        autoLoad: true,
+
         enableLoadingWhenFailed: true,
       ),
     ));

diff --git a/test/smart_refresher_test.dart b/test/smart_refresher_test.dart
@@ -326,7 +326,6 @@ void main() {
       dragSpeedRatio: 0.8,
       closeTwoLevelDistance: 100,
       footerTriggerDistance: 150,
-      autoLoad: false,
       enableScrollWhenRefreshCompleted: true,
       child: Builder(
         builder: (c1) {