Revert "Update PopupMenuButton to match Material Design spec (#70160)" (#74439)

This reverts commit 79d0358e.

Revert "Update PopupMenuButton to match Material Design spec (#70160)" (#74439)
This reverts commit 79d0358e.
cecb7f3b · Jonah Williams · GitHub · 75dc45ab · cecb7f3b · cecb7f3b
Unverified Commit cecb7f3b authored Jan 21, 2021 by Jonah Williams Committed by GitHub Jan 21, 2021
3 changed files
--- a/packages/flutter/lib/src/material/popup_menu.dart
+++ b/packages/flutter/lib/src/material/popup_menu.dart
--- a/packages/flutter/test/material/popup_menu_test.dart
+++ b/packages/flutter/test/material/popup_menu_test.dart
--- a/packages/flutter_localizations/test/text_test.dart
+++ b/packages/flutter_localizations/test/text_test.dart
@@ -38,7 +38,6 @@ void main() {
              key: targetKey,
              builder: (BuildContext context) {
                return PopupMenuButton<int>(
-                  placement: PopupMenuPlacement.belowButton,
                  onSelected: (int value) {
                    Navigator.pushNamed(context, '/next');
                  },
@@ -79,20 +78,20 @@ void main() {
    Offset bottomLeft = tester.getBottomLeft(find.text('hello, world'));
    Offset bottomRight = tester.getBottomRight(find.text('hello, world'));

-    expect(topLeft, const Offset(392.0, 347.5));
-    expect(topRight, const Offset(596.0, 347.5));
-    expect(bottomLeft, const Offset(392.0, 364.5));
-    expect(bottomRight, const Offset(596.0, 364.5));
+    expect(topLeft, const Offset(392.0, 299.5));
+    expect(topRight, const Offset(596.0, 299.5));
+    expect(bottomLeft, const Offset(392.0, 316.5));
+    expect(bottomRight, const Offset(596.0, 316.5));

    topLeft = tester.getTopLeft(find.text('你好，世界'));
    topRight = tester.getTopRight(find.text('你好，世界'));
    bottomLeft = tester.getBottomLeft(find.text('你好，世界'));
    bottomRight = tester.getBottomRight(find.text('你好，世界'));

-    expect(topLeft, const Offset(392.0, 395.5));
-    expect(topRight, const Offset(477.0, 395.5));
-    expect(bottomLeft, const Offset(392.0, 412.5));
-    expect(bottomRight, const Offset(477.0, 412.5));
+    expect(topLeft, const Offset(392.0, 347.5));
+    expect(topRight, const Offset(477.0, 347.5));
+    expect(bottomLeft, const Offset(392.0, 364.5));
+    expect(bottomRight, const Offset(477.0, 364.5));
  });

  testWidgets('Text baseline with EN locale', (WidgetTester tester) async {
@@ -125,7 +124,6 @@ void main() {
              key: targetKey,
              builder: (BuildContext context) {
                return PopupMenuButton<int>(
-                  placement: PopupMenuPlacement.belowButton,
                  onSelected: (int value) {
                    Navigator.pushNamed(context, '/next');
                  },
@@ -166,19 +164,19 @@ void main() {
    Offset bottomLeft = tester.getBottomLeft(find.text('hello, world'));
    Offset bottomRight = tester.getBottomRight(find.text('hello, world'));

-    expect(topLeft, const Offset(392.0, 348.0));
-    expect(topRight, const Offset(584.0, 348.0));
-    expect(bottomLeft, const Offset(392.0, 364));
-    expect(bottomRight, const Offset(584.0, 364));
+    expect(topLeft, const Offset(392.0, 300.0));
+    expect(topRight, const Offset(584.0, 300.0));
+    expect(bottomLeft, const Offset(392.0, 316));
+    expect(bottomRight, const Offset(584.0, 316));

    topLeft = tester.getTopLeft(find.text('你好，世界'));
    topRight = tester.getTopRight(find.text('你好，世界'));
    bottomLeft = tester.getBottomLeft(find.text('你好，世界'));
    bottomRight = tester.getBottomRight(find.text('你好，世界'));

-    expect(topLeft, const Offset(392.0, 396.0));
-    expect(topRight, const Offset(472.0, 396.0));
-    expect(bottomLeft, const Offset(392.0, 412.0));
-    expect(bottomRight, const Offset(472.0, 412.0));
+    expect(topLeft, const Offset(392.0, 348.0));
+    expect(topRight, const Offset(472.0, 348.0));
+    expect(bottomLeft, const Offset(392.0, 364.0));
+    expect(bottomRight, const Offset(472.0, 364.0));
  });
 }