firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add vertical alignment offset to the ``MenuAnchor`` widget when overflowing (#123740)

Browse Source 
Positioning of cascading menus.
This commit is contained in:
Henry Riehl
2023-04-07 00:57:30 +01:00
committed by GitHub
parent 8fdd2e0833
commit 73996ea40b
2 changed files with 105 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter/lib/src/material/menu_anchor.dart
View File

@@ -3177,7 +3177,12 @@ class _MenuLayout extends SingleChildLayoutDelegate {
} else if (offBottom(y)) {
final double newY = anchorRect.top - childSize.height;
if (!offTop(newY)) {
y = newY;
// Only move the menu up if its parent is horizontal (MenuAchor/MenuBar).
if (parentOrientation == Axis.horizontal) {
y = newY - alignmentOffset.dy;
} else {
y = newY;
}
} else {
y = allowedRect.bottom - childSize.height;
}

99
packages/flutter/test/material/menu_anchor_test.dart
View File

@@ -2481,6 +2481,105 @@ void main() {
);
});
testWidgets('vertically constrained menus are positioned above the anchor by default', (WidgetTester tester) async {
await changeSurfaceSize(tester, const Size(800, 600));
await tester.pumpWidget(
MaterialApp(
home: Builder(
builder: (BuildContext context) {
return Directionality(
textDirection: TextDirection.ltr,
child: Align(
alignment: Alignment.bottomLeft,
child: MenuAnchor(
menuChildren: const <Widget> [
MenuItemButton(child: Text('Button1'),
),
],
builder: (BuildContext context, MenuController controller, Widget? child) {
return FilledButton(
onPressed: () {
if (controller.isOpen) {
controller.close();
} else {
controller.open();
}
},
child: const Text('Tap me'),
);
},
),
),
);
},
),
),
);
await tester.pump();
await tester.tap(find.text('Tap me'));
await tester.pump();
expect(find.byType(MenuItemButton), findsNWidgets(1));
// Test the default offset (0, 0) vertical position.
expect(
collectSubmenuRects(),
equals(const <Rect>[
Rect.fromLTRB(0.0, 488.0, 122.0, 552.0),
]),
);
});
testWidgets('vertically constrained menus are positioned above the anchor with the provided offset', (WidgetTester tester) async {
await changeSurfaceSize(tester, const Size(800, 600));
await tester.pumpWidget(
MaterialApp(
home: Builder(
builder: (BuildContext context) {
return Directionality(
textDirection: TextDirection.ltr,
child: Align(
alignment: Alignment.bottomLeft,
child: MenuAnchor(
alignmentOffset: const Offset(0, 50),
menuChildren: const <Widget> [
MenuItemButton(child: Text('Button1'),
),
],
builder: (BuildContext context, MenuController controller, Widget? child) {
return FilledButton(
onPressed: () {
if (controller.isOpen) {
controller.close();
} else {
controller.open();
}
},
child: const Text('Tap me'),
);
},
),
),
);
},
),
),
);
await tester.pump();
await tester.tap(find.text('Tap me'));
await tester.pump();
expect(find.byType(MenuItemButton), findsNWidgets(1));
// Test the offset (0, 50) vertical position.
expect(
collectSubmenuRects(),
equals(const <Rect>[
Rect.fromLTRB(0.0, 438.0, 122.0, 502.0),
]),
);
});
Future<void> buildDensityPaddingApp(WidgetTester tester, {
required TextDirection textDirection,
VisualDensity visualDensity = VisualDensity.standard,