Fix race condition causing crash when interacting with an animating scrollable (#164392)

Fix https://github.com/flutter/flutter/issues/163297
Fix https://github.com/flutter/flutter/issues/14452

Partial patch: https://github.com/flutter/flutter/pull/37267

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [ ] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
This commit is contained in:
Victor Sanni 2025-03-05 09:41:20 -08:00 committed by GitHub
parent 86e4c12a06
commit 57cddce924
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 57 additions and 1 deletions

View File

@ -872,7 +872,10 @@ class ScrollableState extends State<Scrollable>
assert(_drag == null);
_drag = position.drag(details, _disposeDrag);
assert(_drag != null);
assert(_hold == null);
// _hold might be non-null if the scroll position is currently animating.
if (_hold != null) {
_disposeHold();
}
}
void _handleDragUpdate(DragUpdateDetails details) {

View File

@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/gestures.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
@ -103,6 +104,58 @@ void main() {
reason: 'Expected an animation.',
);
});
testWidgets('HoldActivity can interrupt ScrollPosition.animateTo', (WidgetTester tester) async {
const double animationExtent = 100.0;
const double dragExtent = 30.0;
final ScrollController controller = ScrollController();
addTearDown(controller.dispose);
await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: NotificationListener<ScrollNotification>(
onNotification: (ScrollNotification notification) {
controller.position.animateTo(
animationExtent,
duration: const Duration(seconds: 1),
curve: Curves.linear,
);
return true;
},
child: ListView(
controller: controller,
dragStartBehavior: DragStartBehavior.down,
children: List<Widget>.generate(
80,
(int i) => Text('$i', textDirection: TextDirection.ltr),
),
),
),
),
);
expectNoAnimation();
// Drag to initiate the scroll animation.
await tester.drag(find.byType(Scrollable), const Offset(0.0, 1.0));
await tester.pump();
// Pump to halfway through the animation.
await tester.pump(const Duration(milliseconds: 500));
expect(controller.position.pixels, animationExtent / 2);
// Interrupt the scroll animation.
final TestGesture gesture = await tester.startGesture(
tester.getCenter(find.byType(Scrollable)),
);
await gesture.moveBy(const Offset(0.0, dragExtent));
await gesture.up();
await tester.pump(const Duration(milliseconds: 500));
// The drag stops the animation, and the drag extent is respected.
expect(controller.position.pixels, (animationExtent / 2) - dragExtent);
});
}
void expectNoAnimation() {