add onSwipeForbiden

HeavenOSK · Sep 11, 2022 · 7dbdd9e · 7dbdd9e
1 parent f06b9c9
commit 7dbdd9e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -68,14 +68,21 @@ class _HomeState extends State<Home> {
                 padding: const EdgeInsets.all(8),
                 child: SwipableStack(
                   detectableSwipeDirections: const {
-                    SwipeDirection.right,
-                    SwipeDirection.left,
+                    // SwipeDirection.right,
+                    // SwipeDirection.left,
+                    SwipeDirection.up,
+                    SwipeDirection.down,
                   },
                   controller: _controller,
                   stackClipBehaviour: Clip.none,
+                  onSwipeForbiden: (index, direction) {
+                    if (kDebugMode) {
+                      print('onSwipeForbiden $index, $direction');
+                    }
+                  },
                   onSwipeCompleted: (index, direction) {
                     if (kDebugMode) {
-                      print('$index, $direction');
+                      print('onSwipeCompleted $index, $direction');
                     }
                   },
                   horizontalSwipeThreshold: 0.8,

diff --git a/lib/src/model/swipe_rate_per_threshold.dart b/lib/src/model/swipe_rate_per_threshold.dart
@@ -94,17 +94,27 @@ extension _SwipableStackPositionX on _SwipableStackPosition {
     required double horizontalSwipeThreshold,
     required double verticalSwipeThreshold,
     required Set<SwipeDirection> detectableDirections,
+    required ValueChanged<SwipeDirection> isForbidden,
   }) {
     final directionRate = swipeDirectionRate(
       constraints: constraints,
       horizontalSwipeThreshold: horizontalSwipeThreshold,
       verticalSwipeThreshold: verticalSwipeThreshold,
       detectableDirections: detectableDirections,
     );
-    if (directionRate == null) {
-      return null;
-    }
-    if (directionRate.rate < 1) {
+
+    if (directionRate == null || directionRate.rate < 1) {
+      final directionRateForbid = swipeDirectionRate(
+        constraints: constraints,
+        horizontalSwipeThreshold: horizontalSwipeThreshold,
+        verticalSwipeThreshold: verticalSwipeThreshold,
+        detectableDirections: SwipeDirection.values.toSet(),
+      );
+
+      if (directionRateForbid != null && directionRateForbid.rate >= 1) {
+        isForbidden(directionRate!.direction);
+      }
+
       return null;
     } else {
       return directionRate.direction;

diff --git a/lib/src/swipable_stack.dart b/lib/src/swipable_stack.dart
@@ -22,6 +22,7 @@ class SwipableStack extends StatefulWidget {
     required this.builder,
     SwipableStackController? controller,
     this.onSwipeCompleted,
+    this.onSwipeForbiden,
     this.onWillMoveNext,
     this.overlayBuilder,
     this.horizontalSwipeThreshold = _defaultHorizontalSwipeThreshold,
@@ -58,6 +59,7 @@ class SwipableStack extends StatefulWidget {
 
   /// Callback called when the Swipe is completed.
   final SwipeCompletionCallback? onSwipeCompleted;
+  final SwipeCompletionCallback? onSwipeForbiden;
 
   /// Callback called just before launching the Swipe action.
   ///
@@ -412,6 +414,12 @@ class _SwipableStackState extends State<SwipableStack>
               horizontalSwipeThreshold: widget.horizontalSwipeThreshold,
               verticalSwipeThreshold: widget.verticalSwipeThreshold,
               detectableDirections: widget.detectableSwipeDirections,
+              isForbidden: (dir) {
+                widget.onSwipeForbiden?.call(
+                  _currentIndex,
+                  dir,
+                );
+              },
             );
 
             if (swipeAssistDirection == null) {
@@ -425,6 +433,7 @@ class _SwipableStackState extends State<SwipableStack>
                 true;
             if (!allowMoveNext) {
               _cancelSwipe();
+
               return;
             }
             _swipeNext(swipeAssistDirection);