mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
f64bfba860
Fixes https://github.com/flutter/flutter/issues/8476 More detailed list of changes in this patch: * Replaced the didTouch special logic with more generic logic that uses Activities instead. Now instead when you tap down the Scrollable calls `hold()` which begins a HoldScrollActivity which is a hybrid of DragStartDetails and IdleScrollActivity and can be canceled. When you let go, it gets canceled and that goes ballistic. * Make DragGestureRecognizer more aggressive about grabbing pointers, otherwise a second pointer in a situation with competing horizontal and vertical recognizers always gets taken by the other one. * Fixed the _GestureSemantics widget to call the "down" callbacks so that it follows the same pattern as "real" interactions. * Added tests for the above. * Added a hashCode to ScrollActivity.toString (and subclasses). * Added a toString to ScrollDragController, and include it in DragScrollActivity's toString. * s/coorindator/coordinator/ * Add a comment in DragStartDetails to distinguish it from the otherwise identical DragDownDetails, so we're not tempted to merge them.
99 lines
3.8 KiB
Dart
99 lines
3.8 KiB
Dart
// Copyright 2017 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/rendering.dart';
|
|
|
|
Future<Null> pumpTest(WidgetTester tester, TargetPlatform platform) async {
|
|
await tester.pumpWidget(new MaterialApp(
|
|
theme: new ThemeData(
|
|
platform: platform,
|
|
),
|
|
home: new CustomScrollView(
|
|
slivers: <Widget>[
|
|
const SliverToBoxAdapter(child: const SizedBox(height: 2000.0)),
|
|
],
|
|
),
|
|
));
|
|
await tester.pump(const Duration(seconds: 5)); // to let the theme animate
|
|
return null;
|
|
}
|
|
|
|
const double dragOffset = 200.0;
|
|
|
|
double getScrollOffset(WidgetTester tester) {
|
|
final RenderViewport viewport = tester.renderObject(find.byType(Viewport));
|
|
return viewport.offset.pixels;
|
|
}
|
|
|
|
void resetScrollOffset(WidgetTester tester) {
|
|
final RenderViewport viewport = tester.renderObject(find.byType(Viewport));
|
|
final ScrollPosition position = viewport.offset;
|
|
position.jumpTo(0.0);
|
|
}
|
|
|
|
void main() {
|
|
testWidgets('Flings on different platforms', (WidgetTester tester) async {
|
|
await pumpTest(tester, TargetPlatform.android);
|
|
await tester.fling(find.byType(Viewport), const Offset(0.0, -dragOffset), 1000.0);
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(); // trigger fling
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(const Duration(seconds: 5));
|
|
final double result1 = getScrollOffset(tester);
|
|
|
|
resetScrollOffset(tester);
|
|
|
|
await pumpTest(tester, TargetPlatform.iOS);
|
|
await tester.fling(find.byType(Viewport), const Offset(0.0, -dragOffset), 1000.0);
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(); // trigger fling
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(const Duration(seconds: 5));
|
|
final double result2 = getScrollOffset(tester);
|
|
|
|
expect(result1, lessThan(result2)); // iOS (result2) is slipperier than Android (result1)
|
|
});
|
|
|
|
testWidgets('Flings on different platforms', (WidgetTester tester) async {
|
|
await pumpTest(tester, TargetPlatform.iOS);
|
|
await tester.fling(find.byType(Viewport), const Offset(0.0, -dragOffset), 1000.0);
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(); // trigger fling
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(const Duration(seconds: 5));
|
|
final double result1 = getScrollOffset(tester);
|
|
|
|
resetScrollOffset(tester);
|
|
|
|
await pumpTest(tester, TargetPlatform.android);
|
|
await tester.fling(find.byType(Viewport), const Offset(0.0, -dragOffset), 1000.0);
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(); // trigger fling
|
|
expect(getScrollOffset(tester), dragOffset);
|
|
await tester.pump(const Duration(seconds: 5));
|
|
final double result2 = getScrollOffset(tester);
|
|
|
|
expect(result1, greaterThan(result2)); // iOS (result1) is slipperier than Android (result2)
|
|
});
|
|
|
|
testWidgets('Holding scroll', (WidgetTester tester) async {
|
|
await pumpTest(tester, TargetPlatform.iOS);
|
|
await tester.drag(find.byType(Viewport), const Offset(0.0, 200.0));
|
|
expect(getScrollOffset(tester), -200.0);
|
|
await tester.pump(); // trigger ballistic
|
|
await tester.pump(const Duration(milliseconds: 10));
|
|
expect(getScrollOffset(tester), greaterThan(-200.0));
|
|
expect(getScrollOffset(tester), lessThan(0.0));
|
|
final double position = getScrollOffset(tester);
|
|
final TestGesture gesture = await tester.startGesture(tester.getCenter(find.byType(Viewport)));
|
|
expect(await tester.pumpAndSettle(), 1);
|
|
expect(getScrollOffset(tester), position);
|
|
await gesture.up();
|
|
expect(await tester.pumpAndSettle(const Duration(minutes: 1)), 2);
|
|
expect(getScrollOffset(tester), 0.0);
|
|
});
|
|
}
|