From 66e8f53ba02a16924104730e62246b0b4e072ff4 Mon Sep 17 00:00:00 2001
From: Bruno Leroux <bruno.leroux@gmail.com>
Date: Wed, 6 Nov 2024 08:14:05 +0100
Subject: [PATCH] Cleanup MenuAnchor and Improve DropdownMenu tests readability
 (#158175)

## Description

This PR fixes some typos on `MenuAnchor` and improve the readability of a `DropdownMenu` test utility function.

@justinmc I'm still considering creating a test utils file for DropdownMenu but there are few utilities and I'm worried that helper functions in utils file will cripple completion results (not a big deal because it is just for people working on the framework) but I think this should be used carefully. For instance the function `getButtonMaterial` would have to be renamed to something less generic if exposed more broadly (`getMenuItemButtonMaterial` for instance).
---
 packages/flutter/lib/src/material/menu_anchor.dart    | 11 ++++-------
 .../flutter/test/material/dropdown_menu_test.dart     | 10 +++++++---
 .../test/material/dropdown_menu_theme_test.dart       | 10 +++++++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/flutter/lib/src/material/menu_anchor.dart b/packages/flutter/lib/src/material/menu_anchor.dart
index d8a2407a3d..4248ae25b0 100644
--- a/packages/flutter/lib/src/material/menu_anchor.dart
+++ b/packages/flutter/lib/src/material/menu_anchor.dart
@@ -438,14 +438,12 @@ class _MenuAnchorState extends State<MenuAnchor> {
     // This `Shortcuts` is needed so that shortcuts work when the focus is on
     // MenuAnchor (specifically, the root menu, since submenus have their own
     // `Shortcuts`).
-    return
-    Shortcuts(
+    return Shortcuts(
       shortcuts: _kMenuTraversalShortcuts,
       // Ignore semantics here and since the same information is typically
       // also provided by the children.
       includeSemantics: false,
-      child:
-      _MenuAnchorScope(
+      child: _MenuAnchorScope(
         anchorKey: _anchorKey,
         anchor: this,
         isOpen: _isOpen,
@@ -459,7 +457,7 @@ class _MenuAnchorState extends State<MenuAnchor> {
       actions: <Type, Action<Intent>>{
         DismissIntent: DismissMenuAction(controller: _menuController),
       },
-      child:  Builder(
+      child: Builder(
         key: _anchorKey,
         builder: (BuildContext context) {
           return widget.builder?.call(context, _menuController, widget.child)
@@ -3391,7 +3389,7 @@ class _MenuPanel extends StatefulWidget {
   /// The layout orientation of this panel.
   final Axis orientation;
 
-  /// The list of widgets to use as children of this menu bar.
+  /// The list of widgets to use as children of this menu panel.
   ///
   /// These are the top level [SubmenuButton]s.
   final List<Widget> children;
@@ -3747,7 +3745,6 @@ bool get _usesSymbolicModifiers {
   return _isCupertino;
 }
 
-
 bool get _platformSupportsAccelerators {
   // On iOS and macOS, pressing the Option key (a.k.a. the Alt key) causes a
   // different set of characters to be generated, and the native menus don't
diff --git a/packages/flutter/test/material/dropdown_menu_test.dart b/packages/flutter/test/material/dropdown_menu_test.dart
index 8aec198fa6..1156fe00a8 100644
--- a/packages/flutter/test/material/dropdown_menu_test.dart
+++ b/packages/flutter/test/material/dropdown_menu_test.dart
@@ -70,11 +70,15 @@ void main() {
     return color == themeData.colorScheme.onSurface.withOpacity(0.12);
   }
 
+  Finder findMenuPanel() {
+    return find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_MenuPanel');
+  }
+
   Finder findMenuMaterial() {
-    return find.ancestor(
-      of: find.widgetWithText(TextButton, TestMenu.mainMenu0.label),
+    return find.descendant(
+      of: findMenuPanel(),
       matching: find.byType(Material),
-    ).at(1);
+    ).first;
   }
 
   testWidgets('DropdownMenu defaults', (WidgetTester tester) async {
diff --git a/packages/flutter/test/material/dropdown_menu_theme_test.dart b/packages/flutter/test/material/dropdown_menu_theme_test.dart
index 61d1fe13a2..9e5e86f429 100644
--- a/packages/flutter/test/material/dropdown_menu_theme_test.dart
+++ b/packages/flutter/test/material/dropdown_menu_theme_test.dart
@@ -22,11 +22,15 @@ void main() {
     ));
   }
 
+  Finder findMenuPanel() {
+    return find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_MenuPanel');
+  }
+
   Material getMenuMaterial(WidgetTester tester) {
-    return tester.widget<Material>(find.ancestor(
-      of: find.widgetWithText(TextButton, 'Item 0'),
+    return tester.widget<Material>(find.descendant(
+      of: findMenuPanel(),
       matching: find.byType(Material),
-    ).at(1));
+    ).first);
   }
 
   test('DropdownMenuThemeData copyWith, ==, hashCode basics', () {