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

Don't enable scroll wheel when scrolling is off (#37211)

Browse Source 
NeverScrollableScrollPhysics should prevent all scrolling, but the new
scrollwheel codepath wasn't checking it.

Fixes #35304
This commit is contained in:
stuartmorgan 2019-08-02 20:08:43 -07:00 committed by GitHub
parent 2b1db6c109
commit abe67b4a1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter/lib/src/widgets/scrollable.dart
View File

@ -547,6 +547,9 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin
void _handlePointerScroll(PointerEvent event) { void _handlePointerScroll(PointerEvent event) {
assert(event is PointerScrollEvent); assert(event is PointerScrollEvent);
if (_physics != null && !_physics.shouldAcceptUserOffset(position)) {
return;
}
final double targetScrollOffset = _targetScrollOffsetForPointerScroll(event); final double targetScrollOffset = _targetScrollOffsetForPointerScroll(event);
if (targetScrollOffset != position.pixels) { if (targetScrollOffset != position.pixels) {
position.jumpTo(targetScrollOffset); position.jumpTo(targetScrollOffset);

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

@ -8,13 +8,14 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
Future<void> pumpTest(WidgetTester tester, TargetPlatform platform) async { Future<void> pumpTest(WidgetTester tester, TargetPlatform platform, {bool scrollable = true}) async {
await tester.pumpWidget(MaterialApp( await tester.pumpWidget(MaterialApp(
theme: ThemeData( theme: ThemeData(
platform: platform, platform: platform,
), ),
home: const CustomScrollView( home: CustomScrollView(
slivers: <Widget>[ physics: scrollable ? null : const NeverScrollableScrollPhysics(),
slivers: const <Widget>[
SliverToBoxAdapter(child: SizedBox(height: 2000.0)), SliverToBoxAdapter(child: SizedBox(height: 2000.0)),
], ],
), ),
@ -236,4 +237,15 @@ void main() {
await tester.sendEventToBinding(testPointer.scroll(const Offset(0.0, -30.0)), result); await tester.sendEventToBinding(testPointer.scroll(const Offset(0.0, -30.0)), result);
expect(getScrollOffset(tester), 0.0); expect(getScrollOffset(tester), 0.0);
}); });
testWidgets('Scroll pointer signals are ignored when scrolling is disabled', (WidgetTester tester) async {
await pumpTest(tester, TargetPlatform.fuchsia, scrollable: false);
final Offset scrollEventLocation = tester.getCenter(find.byType(Viewport));
final TestPointer testPointer = TestPointer(1, ui.PointerDeviceKind.mouse);
// Create a hover event so that |testPointer| has a location when generating the scroll.
testPointer.hover(scrollEventLocation);
final HitTestResult result = tester.hitTestOnBinding(scrollEventLocation);
await tester.sendEventToBinding(testPointer.scroll(const Offset(0.0, 20.0)), result);
expect(getScrollOffset(tester), 0.0);
});
} }