Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions packages/material_ui/lib/src/menu_anchor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3697,6 +3697,7 @@ class _MenuPanelState extends State<_MenuPanel> {
final EdgeInsetsGeometry padding =
resolve<EdgeInsetsGeometry?>((MenuStyle? style) => style?.padding) ?? EdgeInsets.zero;
final Offset densityAdjustment = visualDensity.baseSizeAdjustment;
final MediaQueryData mediaQuery = MediaQuery.of(context);
// Per the Material Design team: don't allow the VisualDensity
// adjustment to reduce the width of the left/right padding. If we
// did, VisualDensity.compact, the default for desktop/web, would
Expand Down Expand Up @@ -3757,17 +3758,28 @@ class _MenuPanelState extends State<_MenuPanel> {
).copyWith(scrollbars: false, overscroll: false, physics: const ClampingScrollPhysics()),
child: PrimaryScrollController(
controller: scrollController,
child: Scrollbar(
thumbVisibility: displayScrollbar,
child: SingleChildScrollView(
controller: scrollController,
scrollDirection: widget.orientation,
child: Flex(
crossAxisAlignment: CrossAxisAlignment.start,
textDirection: Directionality.of(context),
direction: widget.orientation,
mainAxisSize: MainAxisSize.min,
children: children,
child: MediaQuery(
data: mediaQuery.removePadding(
removeLeft: true,
removeTop: true,
removeRight: true,
removeBottom: true,
),
child: Scrollbar(
thumbVisibility: displayScrollbar,
child: MediaQuery(
data: mediaQuery,
child: SingleChildScrollView(
controller: scrollController,
scrollDirection: widget.orientation,
child: Flex(
crossAxisAlignment: CrossAxisAlignment.start,
textDirection: Directionality.of(context),
direction: widget.orientation,
mainAxisSize: MainAxisSize.min,
children: children,
),
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog: |
- Fixes `MenuAnchor` scrollbars inheriting system safe-area padding.
version: patch
48 changes: 48 additions & 0 deletions packages/material_ui/test/menu_anchor_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,54 @@ void main() {
expect(find.byType(Scrollbar).last, paints..rrect(color: const Color(0xff00ff00)));
}, variant: TargetPlatformVariant.desktop());

// Regression test for https://github.com/flutter/flutter/issues/188155.
testWidgets('Menu scrollbar does not inherit MediaQuery padding', (WidgetTester tester) async {
addTearDown(tester.view.reset);
tester.view.devicePixelRatio = 1.0;
tester.view.padding = const FakeViewPadding(bottom: 24.0);
EdgeInsets? menuItemPadding;

await tester.pumpWidget(
MaterialApp(
home: Material(
child: MenuAnchor(
controller: controller,
style: const MenuStyle(
maximumSize: WidgetStatePropertyAll<Size>(Size.fromHeight(100.0)),
),
menuChildren: <Widget>[
Builder(
builder: (BuildContext context) {
menuItemPadding = MediaQuery.paddingOf(context);
return MenuItemButton(onPressed: () {}, child: const Text('Item 0'));
},
),
for (int i = 1; i < 4; i++) MenuItemButton(onPressed: () {}, child: Text('Item $i')),
],
builder: (BuildContext context, MenuController controller, Widget? child) {
return TextButton(onPressed: controller.open, child: const Text('Open menu'));
},
),
),
),
);

await tester.tap(find.text('Open menu'));
await tester.pumpAndSettle();

final CustomPaint scrollbarPaint = tester.widget<CustomPaint>(
find.descendant(
of: find.byType(Scrollbar),
matching: find.byWidgetPredicate(
(Widget widget) => widget is CustomPaint && widget.foregroundPainter is ScrollbarPainter,
),
),
);
final scrollbarPainter = scrollbarPaint.foregroundPainter! as ScrollbarPainter;
expect(scrollbarPainter.padding, EdgeInsets.zero);
expect(menuItemPadding, const EdgeInsets.only(bottom: 24.0));
});

testWidgets('Focus is returned to previous focus before invoking onPressed', (
WidgetTester tester,
) async {
Expand Down