github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CupertinoPageScaffold resizeToAvoidBottomInset (#142776)

Browse Source 
Need to create a `MediaQuery` to expose the fact that the `viewInsets` have been consumed.

Fixes #142775
This commit is contained in:
Callum Moffat 2024-02-06 15:57:53 -05:00 committed by GitHub
parent 83aca58fa7
commit 1aa6ff5614
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/flutter/lib/src/cupertino/page_scaffold.dart
View File

@ -151,15 +151,17 @@ class _CupertinoPageScaffoldState extends State<CupertinoPageScaffold> {
), ),
); );
} }
} else { } else if (widget.resizeToAvoidBottomInset) {
// If there is no navigation bar, still may need to add padding in order // If there is no navigation bar, still may need to add padding in order
// to support resizeToAvoidBottomInset. // to support resizeToAvoidBottomInset.
final double bottomPadding = widget.resizeToAvoidBottomInset paddedContent = MediaQuery(
? existingMediaQuery.viewInsets.bottom data: existingMediaQuery.copyWith(
: 0.0; viewInsets: existingMediaQuery.viewInsets.copyWith(bottom: 0)
paddedContent = Padding( ),
padding: EdgeInsets.only(bottom: bottomPadding), child: Padding(
child: paddedContent, padding: EdgeInsets.only(bottom: existingMediaQuery.viewInsets.bottom),
child: paddedContent,
),
); );
} }

15
packages/flutter/test/cupertino/scaffold_test.dart
View File

@ -495,29 +495,39 @@ void main() {
navigationBar: showNavigationBar ? const CupertinoNavigationBar( navigationBar: showNavigationBar ? const CupertinoNavigationBar(
middle: Text('Title'), middle: Text('Title'),
) : null, ) : null,
child: const Center( child: Builder(
child: CupertinoTextField(), builder: (BuildContext context) => Center(
child: CupertinoTextField(
placeholder: MediaQuery.viewInsetsOf(context).toString(),
),
),
), ),
), ),
), ),
); );
} }
// CupertinoPageScaffold should consume the viewInsets in all cases
final String expectedViewInsets = EdgeInsets.zero.toString();
// When there is a nav bar and no keyboard. // When there is a nav bar and no keyboard.
await tester.pumpWidget(buildFrame(true, false)); await tester.pumpWidget(buildFrame(true, false));
final Offset positionNoInsetWithNavBar = tester.getTopLeft(find.byType(CupertinoTextField)); final Offset positionNoInsetWithNavBar = tester.getTopLeft(find.byType(CupertinoTextField));
expect((find.byType(CupertinoTextField).evaluate().first.widget as CupertinoTextField).placeholder, expectedViewInsets);
// When there is a nav bar and keyboard, the CupertinoTextField moves up. // When there is a nav bar and keyboard, the CupertinoTextField moves up.
await tester.pumpWidget(buildFrame(true, true)); await tester.pumpWidget(buildFrame(true, true));
await tester.pumpAndSettle(); await tester.pumpAndSettle();
final Offset positionWithInsetWithNavBar = tester.getTopLeft(find.byType(CupertinoTextField)); final Offset positionWithInsetWithNavBar = tester.getTopLeft(find.byType(CupertinoTextField));
expect(positionWithInsetWithNavBar.dy, lessThan(positionNoInsetWithNavBar.dy)); expect(positionWithInsetWithNavBar.dy, lessThan(positionNoInsetWithNavBar.dy));
expect((find.byType(CupertinoTextField).evaluate().first.widget as CupertinoTextField).placeholder, expectedViewInsets);
// When there is no nav bar and no keyboard, the CupertinoTextField is still // When there is no nav bar and no keyboard, the CupertinoTextField is still
// centered. // centered.
await tester.pumpWidget(buildFrame(false, false)); await tester.pumpWidget(buildFrame(false, false));
final Offset positionNoInsetNoNavBar = tester.getTopLeft(find.byType(CupertinoTextField)); final Offset positionNoInsetNoNavBar = tester.getTopLeft(find.byType(CupertinoTextField));
expect(positionNoInsetNoNavBar, equals(positionNoInsetWithNavBar)); expect(positionNoInsetNoNavBar, equals(positionNoInsetWithNavBar));
expect((find.byType(CupertinoTextField).evaluate().first.widget as CupertinoTextField).placeholder, expectedViewInsets);
// When there is a keyboard but no nav bar, the CupertinoTextField also // When there is a keyboard but no nav bar, the CupertinoTextField also
// moves up to the same position as when there is a keyboard and nav bar. // moves up to the same position as when there is a keyboard and nav bar.
@ -526,6 +536,7 @@ void main() {
final Offset positionWithInsetNoNavBar = tester.getTopLeft(find.byType(CupertinoTextField)); final Offset positionWithInsetNoNavBar = tester.getTopLeft(find.byType(CupertinoTextField));
expect(positionWithInsetNoNavBar.dy, lessThan(positionNoInsetNoNavBar.dy)); expect(positionWithInsetNoNavBar.dy, lessThan(positionNoInsetNoNavBar.dy));
expect(positionWithInsetNoNavBar, equals(positionWithInsetWithNavBar)); expect(positionWithInsetNoNavBar, equals(positionWithInsetWithNavBar));
expect((find.byType(CupertinoTextField).evaluate().first.widget as CupertinoTextField).placeholder, expectedViewInsets);
}); });
testWidgets('textScaleFactor is set to 1.0', (WidgetTester tester) async { testWidgets('textScaleFactor is set to 1.0', (WidgetTester tester) async {