Skip to content

Commit 4dec56b

Browse files
authored
Fix PageView throws Null check error (#104405)
1 parent f377f61 commit 4dec56b

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

packages/flutter/lib/src/widgets/page_view.dart

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,20 @@ class _PagePosition extends ScrollPositionWithSingleContext implements PageMetri
462462
return result;
463463
}
464464

465+
@override
466+
void absorb(ScrollPosition other) {
467+
super.absorb(other);
468+
assert(_cachedPage == null);
469+
470+
if (other is! _PagePosition) {
471+
return;
472+
}
473+
474+
if (other._cachedPage != null) {
475+
_cachedPage = other._cachedPage;
476+
}
477+
}
478+
465479
@override
466480
bool applyContentDimensions(double minScrollExtent, double maxScrollExtent) {
467481
final double newMinScrollExtent = minScrollExtent + _initialPageOffset;

packages/flutter/test/widgets/page_view_test.dart

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,45 @@ void main() {
133133
expect(find.text('Illinois'), findsOneWidget);
134134
});
135135

136+
testWidgets('_PagePosition.applyViewportDimension should not throw', (WidgetTester tester) async {
137+
// Regression test for https://github.com/flutter/flutter/issues/101007
138+
final PageController controller = PageController(
139+
initialPage: 1,
140+
);
141+
142+
// Set the starting viewportDimension to 0.0
143+
await tester.binding.setSurfaceSize(Size.zero);
144+
final MediaQueryData mediaQueryData = MediaQueryData.fromWindow(tester.binding.window);
145+
146+
Widget build(Size size) {
147+
return MediaQuery(
148+
data: mediaQueryData.copyWith(size: size),
149+
child: Directionality(
150+
textDirection: TextDirection.ltr,
151+
child: Center(
152+
child: SizedBox.expand(
153+
child: PageView(
154+
controller: controller,
155+
onPageChanged: (int page) { },
156+
children: kStates.map<Widget>((String state) => Text(state)).toList(),
157+
),
158+
),
159+
),
160+
),
161+
);
162+
}
163+
164+
await tester.pumpWidget(build(Size.zero));
165+
const Size surfaceSize = Size(500,400);
166+
await tester.binding.setSurfaceSize(surfaceSize);
167+
await tester.pumpWidget(build(surfaceSize));
168+
169+
expect(tester.takeException(), isNull);
170+
171+
// Reset TestWidgetsFlutterBinding surfaceSize
172+
await tester.binding.setSurfaceSize(null);
173+
});
174+
136175
testWidgets('PageController cannot return page while unattached',
137176
(WidgetTester tester) async {
138177
final PageController controller = PageController();

0 commit comments

Comments
 (0)