fix: avoid superfluous dates when maxDate is set in VisibleDateRange.…

…days Fixes: #93
JonasWanke · Aug 6, 2021 · e864409 · e864409
1 parent 4f3aa42
commit e864409
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/lib/src/date/visible_date_range.dart b/lib/src/date/visible_date_range.dart
@@ -145,11 +145,11 @@ class DaysVisibleDateRange extends VisibleDateRange {
   }
 
   double _getMinimumPageForFocus(double focusPage) {
-    var page = focusPage;
+    var page = focusPage - visibleDayCount;
     while (true) {
       final target = getTargetPageForFocus(page);
-      if (target + visibleDayCount > page) return target;
-      page -= swipeRange;
+      if (target + visibleDayCount > focusPage) return target;
+      page += swipeRange;
     }
   }
 

diff --git a/test/date/visible_date_range_test.dart b/test/date/visible_date_range_test.dart
@@ -1,7 +1,9 @@
 import 'package:glados/glados.dart';
 import 'package:test/test.dart';
 import 'package:timetable/timetable.dart';
+import 'package:timetable/src/utils.dart';
 import 'package:tuple_glados/tuple_glados.dart';
+import 'package:supercharged/supercharged.dart';
 
 void main() {
   group('VisibleDateRange.days', () {
@@ -24,6 +26,26 @@ void main() {
         page.round(),
       );
     });
+
+    Glados(any.tuple2(any.positiveInt, any.positiveInt))
+        .test('scrolling with limits without swipe range', (it) {
+      final visibleDayCount = it.item1;
+      final maxDateOffset = it.item2;
+
+      final minDate = DateTimeTimetable.today();
+      final maxDate = minDate + maxDateOffset.days;
+      final range = DaysVisibleDateRange(
+        visibleDayCount,
+        minDate: minDate,
+        maxDate: maxDate,
+      );
+      expect(range.visibleDayCount, visibleDayCount);
+      expect(range.minPage, minDate.page);
+      expect(
+        range.maxPage,
+        (maxDate.page - visibleDayCount + 1).coerceAtLeast(minDate.page),
+      );
+    });
   });
 
   group('VisibleDateRange.week', () {