Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Prevent swipe-to-dismiss on CupertinoRoute when blocked by PopScope #1117

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Fix: Prevent swipe-to-dismiss on CupertinoRoute when blocked by PopScope #1117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/src/router/widgets/custom_cupertino_transitions_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// The adjustments made to this code is to disable unwanted shadow
// of routes when used as nested routes, e.g inside of a TabsRouter

import 'package:flutter/cupertino.dart' show CupertinoDynamicColor;
import 'package:flutter/foundation.dart';
import 'dart:math';
import 'dart:ui' show lerpDouble;

import 'package:flutter/cupertino.dart' show CupertinoDynamicColor;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
Expand Down Expand Up @@ -179,6 +179,9 @@ mixin CustomCupertinoRouteTransitionMixin<T> on PageRoute<T> {
// If attempts to dismiss this route might be vetoed such as in a page
// with forms, then do not allow the user to dismiss the route with a swipe.
if (route.hasScopedWillPopCallback) return false;
// If dismiss is blocked by any PopEntries, then don't allow the user to
// dismiss the route with a swipe
if (route.popDisposition == RoutePopDisposition.doNotPop) return false;
// Fullscreen dialogs aren't dismissible by back swipe.
if (route.fullscreenDialog) return false;
// If we're in an animation already, we cannot be manually swiped.
Expand Down
Loading