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

Fix out of range spring simulation in ClampingScrollSimulation (#22394)

Browse Source 
If the scroll is out of range for any reason (for instance, changing scroll physics or manually messing with scroll position), the spring simulation causes the scroll position to slingshot towards the end. Also, before this change, `end` was unused.
This commit is contained in:
Dwayne Slater 2018-10-17 04:49:27 -04:00 committed by Michael Goderbauer
parent 936dea28da
commit cab7ecb8e5
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,7 +427,7 @@ class ClampingScrollPhysics extends ScrollPhysics {
return ScrollSpringSimulation(
spring,
position.pixels,
position.maxScrollExtent,
end,
math.min(0.0, velocity),
tolerance: tolerance
);

18
packages/flutter/test/widgets/clamp_overscrolls_test.dart
View File

@ -11,10 +11,11 @@ import 'package:flutter/widgets.dart';
// The top of the bottom widget is at 550 (the top of the top widget
// is at 0). The top of the bottom widget is 500 when it has been
// scrolled completely into view.
Widget buildFrame(ScrollPhysics physics) {
Widget buildFrame(ScrollPhysics physics, {ScrollController scrollController}) {
return SingleChildScrollView(
key: UniqueKey(),
physics: physics,
controller: scrollController,
child: SizedBox(
height: 650.0,
child: Column(
@ -89,4 +90,19 @@ void main() {
await tester.pump();
expect(scrollable.position.pixels, equals(50.0));
});
testWidgets('ClampingScrollPhysics handles out of bounds ScrollPosition', (WidgetTester tester) async {
Future<void> testOutOfBounds(ScrollPhysics physics, double initialOffset, double expectedOffset) async {
final ScrollController scrollController = ScrollController(initialScrollOffset: initialOffset);
await tester.pumpWidget(buildFrame(physics, scrollController: scrollController));
final ScrollableState scrollable = tester.state(find.byType(Scrollable));
expect(scrollable.position.pixels, equals(initialOffset));
await tester.pump(const Duration(seconds: 1)); // Allow overscroll to settle
expect(scrollable.position.pixels, equals(expectedOffset));
}
await testOutOfBounds(const ClampingScrollPhysics(), -400.0, 0.0);
await testOutOfBounds(const ClampingScrollPhysics(), 800.0, 50.0);
});
}