firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Actually consume top padding in bottomsheet if scrollcontrolled (#66257)" (#70392)

Browse Source
This commit is contained in:
Kate Lovett 2020-11-13 14:18:03 -06:00 committed by GitHub
parent a86dab0c40
commit 477a4241ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/material/bottom_sheet.dart
View File

@ -472,7 +472,7 @@ class _ModalBottomSheetRoute<T> extends PopupRoute<T> {
Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) { Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
// By definition, the bottom sheet is aligned to the bottom of the page // By definition, the bottom sheet is aligned to the bottom of the page
// and isn't exposed to the top padding of the MediaQuery. // and isn't exposed to the top padding of the MediaQuery.
Widget bottomSheet = MediaQuery.removePadding( final Widget bottomSheet = MediaQuery.removePadding(
context: context, context: context,
removeTop: true, removeTop: true,
child: Builder( child: Builder(
@ -490,11 +490,6 @@ class _ModalBottomSheetRoute<T> extends PopupRoute<T> {
}, },
), ),
); );
if (isScrollControlled)
bottomSheet = Padding(
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
child: bottomSheet
);
return capturedThemes.wrap(bottomSheet); return capturedThemes.wrap(bottomSheet);
} }
} }
@ -577,8 +572,7 @@ class _BottomSheetSuspendedCurve extends ParametricCurve<double> {
/// a bottom sheet that will utilize [DraggableScrollableSheet]. If you wish /// a bottom sheet that will utilize [DraggableScrollableSheet]. If you wish
/// to have a bottom sheet that has a scrollable child such as a [ListView] or /// to have a bottom sheet that has a scrollable child such as a [ListView] or
/// a [GridView] and have the bottom sheet be draggable, you should set this /// a [GridView] and have the bottom sheet be draggable, you should set this
/// parameter to true. When this parameter is set to true the top of [BottomSheet] will be padded /// parameter to true.
/// such that it avoids any system top padding given by the [MediaQuery]
/// ///
/// The `useRootNavigator` parameter ensures that the root navigator is used to /// The `useRootNavigator` parameter ensures that the root navigator is used to
/// display the [BottomSheet] when set to `true`. This is useful in the case /// display the [BottomSheet] when set to `true`. This is useful in the case

56
packages/flutter/test/material/bottom_sheet_test.dart
View File

@ -425,7 +425,7 @@ void main() {
expect(find.text('BottomSheet'), findsNothing); expect(find.text('BottomSheet'), findsNothing);
}); });
testWidgets('modal BottomSheet has no top MediaQuery when not scroll controlled', (WidgetTester tester) async { testWidgets('modal BottomSheet has no top MediaQuery', (WidgetTester tester) async {
late BuildContext outerContext; late BuildContext outerContext;
late BuildContext innerContext; late BuildContext innerContext;
@ -476,60 +476,6 @@ void main() {
); );
}); });
testWidgets('modal BottomSheet consumes top MediaQuery when scroll controlled', (WidgetTester tester) async {
late BuildContext outerContext;
late BuildContext innerContext;
final Key containerKey = UniqueKey();
await tester.pumpWidget(Localizations(
locale: const Locale('en', 'US'),
delegates: const <LocalizationsDelegate<dynamic>>[
DefaultWidgetsLocalizations.delegate,
DefaultMaterialLocalizations.delegate,
],
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(
padding: EdgeInsets.all(50.0),
size: Size(400.0, 600.0),
),
child: Navigator(
onGenerateRoute: (_) {
return PageRouteBuilder<void>(
pageBuilder: (BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
outerContext = context;
return Container();
},
);
},
),
),
),
));
showModalBottomSheet<void>(
context: outerContext,
isScrollControlled: true,
builder: (BuildContext context) {
innerContext = context;
return Container(key: containerKey);
},
);
await tester.pump();
await tester.pump(const Duration(seconds: 1));
expect(
MediaQuery.of(outerContext).padding,
const EdgeInsets.all(50.0),
);
expect(
MediaQuery.of(innerContext).padding,
const EdgeInsets.only(left: 50.0, right: 50.0, bottom: 50.0),
);
expect(tester.getTopLeft(find.byKey(containerKey)), const Offset(0.0, 50.0));
});
testWidgets('modal BottomSheet has semantics', (WidgetTester tester) async { testWidgets('modal BottomSheet has semantics', (WidgetTester tester) async {
final SemanticsTester semantics = SemanticsTester(tester); final SemanticsTester semantics = SemanticsTester(tester);
final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();