Use raw velocity rather than ratio for threshold

ice-orion · Aug 23, 2024 · a9a1c80 · a9a1c80
1 parent 896d56a
commit a9a1c80
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/cookbook/lib/tutorial/cupertino_modal_sheet.dart b/cookbook/lib/tutorial/cupertino_modal_sheet.dart
@@ -49,8 +49,11 @@ void _showModalSheet(BuildContext context, {required bool isFullScreen}) {
   // For declarative navigation (Navigator 2.0), use `CupertinoModalSheetPage` instead.
   final modalRoute = CupertinoModalSheetRoute(
     swipeDismissible: true, // Enable the swipe-to-dismiss behavior.
-    swipeDismissSensitivity:
-        SwipeDismissSensitivity(minFlingVelocity: 3.0, minDragDistance: 400.0),
+    // Use `SwipeDismissSensitivity` to tweak the sensitivity of the swipe-to-dismiss gesture.
+    swipeDismissSensitivity: const SwipeDismissSensitivity(
+      minFlingVelocity: 1500,
+      minDragDistance: 300,
+    ),
     builder: (context) => switch (isFullScreen) {
       true => const _FullScreenSheet(),
       false => const _HalfScreenSheet(),

diff --git a/cookbook/lib/tutorial/declarative_modal_sheet.dart b/cookbook/lib/tutorial/declarative_modal_sheet.dart
@@ -26,6 +26,12 @@ final _router = GoRouter(
               key: state.pageKey,
               // Enable the swipe-to-dismiss behavior.
               swipeDismissible: true,
+              // Use `SwipeDismissSensitivity` to tweak the sensitivity of
+              // the swipe-to-dismiss gesture.
+              swipeDismissSensitivity: const SwipeDismissSensitivity(
+                minFlingVelocity: 1500,
+                minDragDistance: 300,
+              ),
               child: const _ExampleSheet(),
             );
           },
@@ -85,7 +91,7 @@ class _ExampleSheet extends StatelessWidget {
             borderRadius: BorderRadius.circular(20),
           ),
           child: const SizedBox(
-            height: 500,
+            height: double.infinity,
             width: double.infinity,
           ),
         ),

diff --git a/package/lib/src/modal/modal_sheet.dart b/package/lib/src/modal/modal_sheet.dart
@@ -345,11 +345,9 @@ class _SwipeDismissibleController with SheetGestureTamperer {
 
     final viewportHeight = _context.size!.height;
     final draggedDistance = viewportHeight * (1 - transitionController.value);
-
     final effectiveVelocity = switch (axisDirection) {
-      VerticalDirection.up => velocity.pixelsPerSecond.dy / viewportHeight,
-      VerticalDirection.down =>
-        -1 * velocity.pixelsPerSecond.dy / viewportHeight,
+      VerticalDirection.up => velocity.pixelsPerSecond.dy,
+      VerticalDirection.down => -1 * velocity.pixelsPerSecond.dy,
     };
 
     final bool invokePop;

diff --git a/package/lib/src/modal/swipe_dismiss_sensitivity.dart b/package/lib/src/modal/swipe_dismiss_sensitivity.dart
@@ -7,8 +7,8 @@
 /// a swipe to result in a dismissal.
 class SwipeDismissSensitivity {
   const SwipeDismissSensitivity({
-    this.minFlingVelocity = 1.0,
-    this.minDragDistance = 300.0,
+    this.minFlingVelocity = 1500,
+    this.minDragDistance = 300,
   });
 
   /// The minimum velocity that a fling gesture must reach to trigger