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

Dimissing the system keyboard shouldn't defeat scrolling (#9470)

Browse Source
This commit is contained in:
Hans Muller 2017-04-19 11:10:34 -07:00 committed by GitHub
parent 0252622869
commit 2366cf73bc
2 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/widgets/scroll_position.dart
View File

@ -59,7 +59,7 @@ abstract class ScrollPhysics {
/// there is actually content outside the viewport to reveal.
bool shouldAcceptUserOffset(ScrollPosition position) {
if (parent == null)
return position.minScrollExtent != position.maxScrollExtent;
return position.pixels != 0.0 || position.minScrollExtent != position.maxScrollExtent;
return parent.shouldAcceptUserOffset(position);
}

75
packages/flutter/test/widgets/list_view_misc_test.dart
View File

@ -148,4 +148,79 @@ void main() {
);
expect(maxScrollOffset, equals(26.0));
});
testWidgets('Resizing a ListView child restores scroll offset', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/9221
final AnimationController controller = new AnimationController(
vsync: const TestVSync(),
duration: const Duration(milliseconds: 200),
);
// The overall height of the frame is (as ever) 600
Widget buildFrame() {
return new Column(
children: <Widget>[
new Flexible(
// The overall height of the ListView's contents is 500
child: new ListView(
children: <Widget>[
const SizedBox(
height: 150.0,
child: const Center(
child: const Text('top')
),
),
const SizedBox(
height: 200.0,
child: const Center(
child: const Text('middle')
),
),
const SizedBox(
height: 150.0,
child: const Center(
child: const Text('bottom')
),
),
],
),
),
// If this widget's height is > 100 the ListView can scroll.
new SizeTransition(
sizeFactor: controller.view,
child: const SizedBox(
height: 300.0,
child: const Text('keyboard'),
),
),
],
);
}
await tester.pumpWidget(buildFrame());
expect(find.text('top'), findsOneWidget);
final ScrollPosition position = Scrollable.of(tester.element(find.text('middle'))).position;
expect(position.viewportDimension, 600.0);
expect(position.pixels, 0.0);
// Animate the 'keyboard' height from 0 to 300
controller.forward();
await tester.pumpAndSettle();
expect(position.viewportDimension, 300.0);
// Scroll the ListView upwards
position.jumpTo(200.0);
await tester.pumpAndSettle();
expect(position.pixels, 200.0);
expect(find.text('top'), findsNothing);
// Animate the 'keyboard' height back to 0. This causes the scroll
// offset to return to 0.0
controller.reverse();
await tester.pumpAndSettle();
expect(position.viewportDimension, 600.0);
expect(position.pixels, 0.0);
expect(find.text('top'), findsOneWidget);
});
}