Unverified Commit dfd0c627 authored by GodHyum's avatar GodHyum Committed by GitHub

Remove back button when using end drawer (#63272)

parent 37b03ec2
...@@ -555,7 +555,7 @@ class _AppBarState extends State<AppBar> { ...@@ -555,7 +555,7 @@ class _AppBarState extends State<AppBar> {
tooltip: MaterialLocalizations.of(context).openAppDrawerTooltip, tooltip: MaterialLocalizations.of(context).openAppDrawerTooltip,
); );
} else { } else {
if (canPop) if (!hasEndDrawer && canPop)
leading = useCloseButton ? const CloseButton() : const BackButton(); leading = useCloseButton ? const CloseButton() : const BackButton();
} }
} }
......
...@@ -2194,4 +2194,21 @@ void main() { ...@@ -2194,4 +2194,21 @@ void main() {
// By default toolbarHeight is 56.0. // By default toolbarHeight is 56.0.
expect(tester.getRect(find.byKey(key)), const Rect.fromLTRB(0, 0, 100, 56)); expect(tester.getRect(find.byKey(key)), const Rect.fromLTRB(0, 0, 100, 56));
}); });
testWidgets("AppBar with EndDrawer doesn't have leading", (WidgetTester tester) async {
await tester.pumpWidget(MaterialApp(
home: Scaffold(
appBar: AppBar(),
endDrawer: const Drawer(),
),
));
final Finder endDrawerFinder = find.byTooltip('Open navigation menu');
await tester.tap(endDrawerFinder);
await tester.pump();
final Finder appBarFinder = find.byType(NavigationToolbar);
NavigationToolbar getAppBarWidget(Finder finder) => tester.widget<NavigationToolbar>(finder);
expect(getAppBarWidget(appBarFinder).leading, null);
});
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment