Handle#6537 end drawer button #173026

ahmedsameha1 · 2025-07-31T04:59:33Z

This is my attempt to handle #6537 for the EndDrawerButton UI control.

gemini-code-assist

Code Review

This pull request refactors the tests for BackButton and CloseButton into logical groups, which improves organization. It also adds a new test for EndDrawerButton to address issue #6537. The review focuses on improving the new test to ensure it correctly validates the intended fix and is more readable.

gemini-code-assist · 2025-07-31T05:01:29Z

packages/flutter/test/material/back_button_test.dart

+  testWidgets('EndDrawerButton renders at zero area', (WidgetTester tester) async {
    await tester.pumpWidget(
      const MaterialApp(
-        home: Material(
-          child: CloseButton(
-            color: Colors.green,
-            style: ButtonStyle(iconColor: MaterialStatePropertyAll<Color>(Colors.red)),
-          ),
+        home: Center(
+          child: SizedBox.shrink(child: Scaffold(body: EndDrawerButton())),
        ),
      ),
    );
-
-    final RichText iconText = tester.firstWidget(
-      find.descendant(of: find.byType(CloseButton), matching: find.byType(RichText)),
-    );
-
-    expect(iconText.text.style!.color, Colors.red);
-  });
-
-  testWidgets('CloseButton onPressed overrides default pop behavior', (WidgetTester tester) async {
-    bool customCallbackWasCalled = false;
-    await tester.pumpWidget(
-      MaterialApp(
-        home: const Material(child: Text('Home')),
-        routes: <String, WidgetBuilder>{
-          '/next': (BuildContext context) {
-            return Material(
-              child: Center(child: CloseButton(onPressed: () => customCallbackWasCalled = true)),
-            );
-          },
-        },
-      ),
-    );
-
-    tester.state<NavigatorState>(find.byType(Navigator)).pushNamed('/next');
-
-    await tester.pumpAndSettle();
-    expect(find.text('Home'), findsNothing); // Start off on the second page.
-    expect(customCallbackWasCalled, false); // customCallbackWasCalled should still be false.
-    await tester.tap(find.byType(CloseButton));
-
-    await tester.pumpAndSettle();
-
-    // We're still on the second page.
-    expect(find.text('Home'), findsNothing);
-    // The custom callback is called, setting customCallbackWasCalled to true.
-    expect(customCallbackWasCalled, true);
+    final Finder endDrawerButtonIcon = find.byType(EndDrawerButtonIcon);
+    expect(tester.getSize(endDrawerButtonIcon).isEmpty, isTrue);
  });


The test for EndDrawerButton does not fully address issue #6537, which involves an exception when no Scaffold ancestor is present. The current test includes a Scaffold, so it doesn't cover the scenario described in the issue. The use of SizedBox.shrink also reduces readability.

Consider adding a test case that explicitly checks the behavior when no Scaffold is present. Also, for consistency with the other tests in this file, wrap the EndDrawerButton test in a group to keep tests logically organized.¹

group('EndDrawerButton', () { testWidgets('does not throw without a Scaffold ancestor', (WidgetTester tester) async { await tester.pumpWidget( const MaterialApp( // EndDrawerButton is not a descendant of a Scaffold. home: Material(child: EndDrawerButton()), ), ); // The test passes if it doesn't throw, and the button should not be visible. expect(find.byType(IconButton), findsNothing); }); });

Style Guide References

Footnotes

Class members (and by extension, tests in a file) should be ordered logically, for example by grouping related items. (link) ↩

dkwingsmt

LGTM

dkwingsmt

Checklist:

The test is in the correct file
The test name goes “does not crash at zero area”
The target widget is wrapped by Center (or is fullscreen)
The target widget does not have an overlay, or the overlay is tested
The target widget is expected to have a size of exactly Size.zero

dkwingsmt · 2025-09-18T04:34:30Z

packages/flutter/test/material/back_button_test.dart

-  testWidgets('CloseButton.style.iconColor parameter overrides CloseButton.color', (
-    WidgetTester tester,
-  ) async {
+  testWidgets('EndDrawerButton renders at zero area', (WidgetTester tester) async {


Suggested change

testWidgets('EndDrawerButton renders at zero area', (WidgetTester tester) async {

testWidgets('EndDrawerButton does not crash at zero area', (WidgetTester tester) async {

dkwingsmt · 2025-09-18T04:35:18Z

packages/flutter/test/material/back_button_test.dart

+    final Finder endDrawerButtonIcon = find.byType(EndDrawerButtonIcon);
+    expect(tester.getSize(endDrawerButtonIcon).isEmpty, isTrue);


Suggested change

final Finder endDrawerButtonIcon = find.byType(EndDrawerButtonIcon);

expect(tester.getSize(endDrawerButtonIcon).isEmpty, isTrue);

expect(tester.getSize(find.byType(EndDrawerButton)), Size.zero);

flutter-dashboard · 2025-09-19T17:37:14Z

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

For more guidance, visit Writing a golden file test for package:flutter.

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Changes reported for pull request #173026 at sha a49b12e

MitchellGoodwin

LGTM as well

MitchellGoodwin · 2025-10-08T17:23:02Z

@ahmedsameha1 I am unable to rebase through github, would you be able to rebase this PR so it can merge?

Manual roll Flutter from e11e2c1 to 7cd821c (73 revisions) Manual roll requested by tarrinneal@google.com flutter/flutter@e11e2c1...7cd821c 2025-10-14 bruno.leroux@gmail.com Fix computeDistanceToActualBaseline throws when accessing child size (flutter/flutter#176906) 2025-10-14 47866232+chunhtai@users.noreply.github.com iOS can set application locale before view controller is set (flutter/flutter#176592) 2025-10-14 jason-simmons@users.noreply.github.com Roll ANGLE to a branch based on d9fa255a5c22 (flutter/flutter#176747) 2025-10-14 47866232+chunhtai@users.noreply.github.com Relands "Fixes keyboard selects disabled radio" (flutter/flutter#176977) 2025-10-14 huy@nevercode.io Fix expansion tile is missing state announcement on non-Apple platforms (flutter/flutter#175480) 2025-10-14 30870216+gaaclarke@users.noreply.github.com impeller: allows access of float uniforms by name (flutter/flutter#176728) 2025-10-14 aam@google.com Roll dart sdk to 3.11.0-17.0.dev (flutter/flutter#176947) 2025-10-13 okorohelijah@google.com Move iOS integration tests (flutter/flutter#176940) 2025-10-13 ahmedsameha1@gmail.com Make sure that an InputDatePickerFormField doesn't crash in 0x0 envir… (flutter/flutter#176047) 2025-10-13 jason-simmons@users.noreply.github.com [web] Match the behavior of other platforms in Web Locale.toString if the country code is an empty string (flutter/flutter#176862) 2025-10-13 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Fixes keyboard selects disabled radio (#176727)" (flutter/flutter#176958) 2025-10-13 47866232+chunhtai@users.noreply.github.com Fixes keyboard selects disabled radio (flutter/flutter#176727) 2025-10-13 engine-flutter-autoroll@skia.org Roll Packages from e319c40 to d062181 (2 revisions) (flutter/flutter#176916) 2025-10-13 jason-simmons@users.noreply.github.com Roll SwiftShader to 794b0cfce1d8 (flutter/flutter#176806) 2025-10-13 32538273+ValentinVignal@users.noreply.github.com Make DropdownMenu generic type non nullable (flutter/flutter#176711) 2025-10-12 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from BWGpRvpdQh-HJpq1c... to _dd0Jv50H0oUI2Ad8... (flutter/flutter#176895) 2025-10-11 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from JpiUsek1hU5r9QVKP... to BWGpRvpdQh-HJpq1c... (flutter/flutter#176880) 2025-10-11 codefu@google.com fix: content hash check for LUCI_CONTEXT (flutter/flutter#176867) 2025-10-11 34465683+rkishan516@users.noreply.github.com Feat: make tooltip position customizeable (flutter/flutter#175047) 2025-10-11 engine-flutter-autoroll@skia.org Roll Dart SDK from d88d8bf2b53c to 65b171958c93 (3 revisions) (flutter/flutter#176871) 2025-10-11 34465683+rkishan516@users.noreply.github.com feat: apply radioGroup role to segmented control widgets (flutter/flutter#176157) 2025-10-10 ahmedsameha1@gmail.com Make sure that a CheckboxMenuButton doesn't crash in 0x0 environment (flutter/flutter#176450) 2025-10-10 Rusino@users.noreply.github.com [WebParagraph] Support for more styles, placeholders, decorations, etc (flutter/flutter#172853) 2025-10-10 jason-simmons@users.noreply.github.com Set up a version of build_ios_framework_module_test that only runs on x64 machines and extend its timeout (flutter/flutter#176811) 2025-10-10 engine-flutter-autoroll@skia.org Roll Packages from 0b41de3 to e319c40 (1 revision) (flutter/flutter#176833) 2025-10-10 danny@tuppeny.com [tool/dap] Forward app.warning events from Flutter to DAP client (flutter/flutter#176827) 2025-10-10 engine-flutter-autoroll@skia.org Roll Dart SDK from 70c00d3ceb3a to d88d8bf2b53c (1 revision) (flutter/flutter#176830) 2025-10-10 sokolovskyi.konstantin@gmail.com Remove unnecessary nullable types in examples. (flutter/flutter#176713) 2025-10-10 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from xArtL4DH0FsdwSqG_... to JpiUsek1hU5r9QVKP... (flutter/flutter#176822) 2025-10-10 bruno.leroux@gmail.com Cleanup OutlinedButton.icon documentation and implementation (flutter/flutter#176630) 2025-10-10 34871572+gmackall@users.noreply.github.com [HCPP] Properly remove hcpp views that are no longer visible (flutter/flutter#176742) 2025-10-10 ahmedsameha1@gmail.com Make sure that an InputChip doesn't crash in 0x0 environment (flutter/flutter#175930) 2025-10-10 737941+loic-sharma@users.noreply.github.com Update Flutter templates' Dart style (flutter/flutter#175963) 2025-10-10 ahmedsameha1@gmail.com Make sure that a DropdownButtonFormField doesn't crash in 0x0 environ… (flutter/flutter#174958) 2025-10-10 ahmedsameha1@gmail.com Make sure that an InkWell doesn't crash in 0x0 environment (flutter/flutter#175871) 2025-10-10 ahmedsameha1@gmail.com Handle#6537 end drawer button (flutter/flutter#173026) 2025-10-10 engine-flutter-autoroll@skia.org Roll Dart SDK from a9b7bd4b0b32 to 70c00d3ceb3a (4 revisions) (flutter/flutter#176815) 2025-10-10 robert.ancell@canonical.com Change default Linux thread policy to merge platform and UI threads. (flutter/flutter#176759) 2025-10-09 bkonyi@google.com [ Tool ] Roll package:dwds to 26.0.0 (flutter/flutter#176808) 2025-10-09 43054281+camsim99@users.noreply.github.com Update `CHANGELOG` to include 3.35.6 notes (flutter/flutter#176803) 2025-10-09 36861262+QuncCccccc@users.noreply.github.com Announce text and button together when DropdownMenu is treated as a button (flutter/flutter#176428) 2025-10-09 gregorysconrad@gmail.com [native_assets] create macOS CCompilerConfig via xcrun --find (flutter/flutter#175717) 2025-10-09 chinmaygarde@google.com [Impeller] Fix broken links in README. (flutter/flutter#176770) 2025-10-09 chinmaygarde@google.com Fix links to Custom Flutter Engine Embedders in README. (flutter/flutter#175807) ...

This is my attempt to handle flutter#6537 for the EndDrawerButton UI control. --------- Co-authored-by: Tong Mu <dkwingsmt@users.noreply.github.com>

ahmedsameha1 added 2 commits July 31, 2025 07:50

Grouping BackButton and CloseButton tests

fee5a71

Make sure that an EndDrawerButton doesn't crash in 0x0 environment

2b9bc92

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: material design flutter/packages/flutter/material repository. labels Jul 31, 2025

gemini-code-assist bot reviewed Jul 31, 2025

View reviewed changes

dkwingsmt requested review from MitchellGoodwin and dkwingsmt August 6, 2025 18:31

dkwingsmt approved these changes Aug 14, 2025

View reviewed changes

dkwingsmt self-requested a review August 27, 2025 18:22

dkwingsmt reviewed Sep 18, 2025

View reviewed changes

ahmedsameha1 added 2 commits September 19, 2025 19:48

Merge branch 'master' into handle#6537-EndDrawerButton

ee33200

Using Size.zero instead of isEmpty

a49b12e

flutter-dashboard bot added the will affect goldens Changes to golden files label Sep 19, 2025

Merge branch 'master' into handle#6537-EndDrawerButton

70bf9e9

MitchellGoodwin approved these changes Oct 8, 2025

View reviewed changes

Merge branch 'master' into handle#6537-EndDrawerButton

cbd3b9a

dkwingsmt added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 10, 2025

auto-submit bot added this pull request to the merge queue Oct 10, 2025

Merged via the queue into flutter:master with commit 6a424a6 Oct 10, 2025
77 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 10, 2025

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to 309bde139aab (46 revisions) flutter/packages#10202

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

b6b5e91

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to e7980672ba08 (47 revisions) flutter/packages#10204

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

8db3387

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to 54ac6899b6ba (48 revisions) flutter/packages#10205

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

81f27ee

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to fbfaf35e21d8 (49 revisions) flutter/packages#10207

Closed

engine-flutter-autoroll mentioned this pull request Oct 12, 2025

Roll Flutter from e11e2c11288b to 255b46490ada (57 revisions) flutter/packages#10216

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 12, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

1427c0f

engine-flutter-autoroll mentioned this pull request Oct 12, 2025

Roll Flutter from e11e2c11288b to 04ccef31019b (58 revisions) flutter/packages#10217

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 12, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

f246714

engine-flutter-autoroll mentioned this pull request Oct 12, 2025

Roll Flutter from e11e2c11288b to 04ccef31019b (58 revisions) flutter/packages#10218

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 12, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

7bb3477

engine-flutter-autoroll mentioned this pull request Oct 13, 2025

Roll Flutter from e11e2c11288b to 0205d4e8cc24 (59 revisions) flutter/packages#10222

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 13, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

a87c992

engine-flutter-autoroll mentioned this pull request Oct 13, 2025

Roll Flutter from e11e2c11288b to aed8fecfdd66 (60 revisions) flutter/packages#10223

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 13, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

2da27f0

engine-flutter-autoroll mentioned this pull request Oct 13, 2025

Roll Flutter from e11e2c11288b to c7fc71ec6829 (61 revisions) flutter/packages#10224

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 13, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

28b8d9a

engine-flutter-autoroll mentioned this pull request Oct 14, 2025

Roll Flutter from e11e2c11288b to c63c6b08a711 (69 revisions) flutter/packages#10225

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

058fc0a

engine-flutter-autoroll mentioned this pull request Oct 14, 2025

Roll Flutter from e11e2c11288b to 55712c460fb8 (71 revisions) flutter/packages#10226

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

06db15d

engine-flutter-autoroll mentioned this pull request Oct 14, 2025

Roll Flutter from e11e2c11288b to 48d5d48b5d90 (72 revisions) flutter/packages#10227

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

ef857fe

engine-flutter-autoroll mentioned this pull request Oct 14, 2025

Roll Flutter from e11e2c11288b to 7cd821c21093 (73 revisions) flutter/packages#10228

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

01b947b

engine-flutter-autoroll mentioned this pull request Oct 14, 2025

Manual roll Flutter from e11e2c11288b to 7cd821c21093 (73 revisions) flutter/packages#10229

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

5a6241e

engine-flutter-autoroll mentioned this pull request Oct 14, 2025

Roll Flutter from e11e2c11288b to 56ce192dc679 (74 revisions) flutter/packages#10230

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

0d62bcc

engine-flutter-autoroll mentioned this pull request Oct 15, 2025

Roll Flutter from e11e2c11288b to cb94cc070574 (75 revisions) flutter/packages#10233

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 15, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

2b0b067

engine-flutter-autoroll mentioned this pull request Oct 15, 2025

Roll Flutter from e11e2c11288b to cb94cc070574 (75 revisions) flutter/packages#10234

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 15, 2025

6a424a6 Handle#6537 end drawer button (flutter/flutter#173026)

0f65408

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Handle#6537 end drawer button #173026

Handle#6537 end drawer button #173026

Uh oh!

ahmedsameha1 commented Jul 31, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Jul 31, 2025

Uh oh!

dkwingsmt left a comment

Uh oh!

dkwingsmt left a comment

Uh oh!

dkwingsmt Sep 18, 2025

Uh oh!

dkwingsmt Sep 18, 2025

Uh oh!

flutter-dashboard bot commented Sep 19, 2025

Uh oh!

MitchellGoodwin left a comment

Uh oh!

MitchellGoodwin commented Oct 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	testWidgets('EndDrawerButton renders at zero area', (WidgetTester tester) async {
	testWidgets('EndDrawerButton does not crash at zero area', (WidgetTester tester) async {

		final Finder endDrawerButtonIcon = find.byType(EndDrawerButtonIcon);
		expect(tester.getSize(endDrawerButtonIcon).isEmpty, isTrue);

	final Finder endDrawerButtonIcon = find.byType(EndDrawerButtonIcon);
	expect(tester.getSize(endDrawerButtonIcon).isEmpty, isTrue);
	expect(tester.getSize(find.byType(EndDrawerButton)), Size.zero);

Handle#6537 end drawer button #173026

Handle#6537 end drawer button #173026

Uh oh!

Conversation

ahmedsameha1 commented Jul 31, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Jul 31, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

dkwingsmt left a comment

Choose a reason for hiding this comment

Uh oh!

dkwingsmt left a comment

Choose a reason for hiding this comment

Uh oh!

dkwingsmt Sep 18, 2025

Choose a reason for hiding this comment

Uh oh!

dkwingsmt Sep 18, 2025

Choose a reason for hiding this comment

Uh oh!

flutter-dashboard bot commented Sep 19, 2025

Uh oh!

MitchellGoodwin left a comment

Choose a reason for hiding this comment

Uh oh!

MitchellGoodwin commented Oct 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants