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

Update Scrollable on ScrollBehaviour change. (#131164)

Browse Source 
Fixes: #130793
This commit is contained in:
Chinmoy 2023-08-18 00:18:57 +05:30 committed by GitHub
parent 9e67e0e4a1
commit f1d04a46cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,6 +632,12 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
}
bool _shouldUpdatePosition(Scrollable oldWidget) {
if ((widget.scrollBehavior == null) != (oldWidget.scrollBehavior == null)) {
return true;
}
if (widget.scrollBehavior != null && oldWidget.scrollBehavior != null && widget.scrollBehavior!.shouldNotify(oldWidget.scrollBehavior!)) {
return true;
}
ScrollPhysics? newPhysics = widget.physics ?? widget.scrollBehavior?.getScrollPhysics(context);
ScrollPhysics? oldPhysics = oldWidget.physics ?? oldWidget.scrollBehavior?.getScrollPhysics(context);
do {

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

@ -1356,6 +1356,113 @@ void main() {
'AlwaysScrollableScrollPhysics ClampingScrollPhysics RangeMaintainingScrollPhysics',
);
});
testWidgets('dragDevices change updates widget', (WidgetTester tester) async {
bool enable = false;
await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MaterialApp(
home: Scaffold(
body: Scrollable(
scrollBehavior: const MaterialScrollBehavior().copyWith(dragDevices: <ui.PointerDeviceKind>{
if (enable) ui.PointerDeviceKind.mouse,
}),
viewportBuilder: (BuildContext context, ViewportOffset position) => Viewport(
offset: position,
slivers: const <Widget>[
SliverToBoxAdapter(child: SizedBox(height: 2000.0)),
],
),
),
floatingActionButton: FloatingActionButton(onPressed: () {
setState(() {
enable = !enable;
});
}),
),
);
},
);
},
)
);
// Gesture should not work.
TestGesture gesture = await tester.startGesture(tester.getCenter(find.byType(Scrollable), warnIfMissed: true), kind: ui.PointerDeviceKind.mouse);
expect(getScrollOffset(tester), 0.0);
await gesture.moveBy(const Offset(0.0, -200));
await tester.pumpAndSettle();
expect(getScrollOffset(tester), 0.0);
// Change state to include mouse pointer device.
await tester.tap(find.byType(FloatingActionButton));
await tester.pump();
// Gesture should work after state change.
gesture = await tester.startGesture(tester.getCenter(find.byType(Scrollable), warnIfMissed: true), kind: ui.PointerDeviceKind.mouse);
expect(getScrollOffset(tester), 0.0);
await gesture.moveBy(const Offset(0.0, -200));
await tester.pumpAndSettle();
expect(getScrollOffset(tester), 200);
});
testWidgets('dragDevices change updates widget when oldWidget scrollBehavior is null', (WidgetTester tester) async {
ScrollBehavior? scrollBehavior;
await tester.pumpWidget(
Builder(
builder: (BuildContext context) {
return StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MaterialApp(
home: Scaffold(
body: Scrollable(
physics: const ScrollPhysics(),
scrollBehavior: scrollBehavior,
viewportBuilder: (BuildContext context, ViewportOffset position) => Viewport(
offset: position,
slivers: const <Widget>[
SliverToBoxAdapter(child: SizedBox(height: 2000.0)),
],
),
),
floatingActionButton: FloatingActionButton(onPressed: () {
setState(() {
scrollBehavior = const MaterialScrollBehavior().copyWith(dragDevices: <ui.PointerDeviceKind>{
ui.PointerDeviceKind.mouse
});
});
}),
),
);
},
);
},
)
);
// Gesture should not work.
TestGesture gesture = await tester.startGesture(tester.getCenter(find.byType(Scrollable), warnIfMissed: true), kind: ui.PointerDeviceKind.mouse);
expect(getScrollOffset(tester), 0.0);
await gesture.moveBy(const Offset(0.0, -200));
await tester.pumpAndSettle();
expect(getScrollOffset(tester), 0.0);
// Change state to include mouse pointer device.
await tester.tap(find.byType(FloatingActionButton));
await tester.pump();
// Gesture should work after state change.
gesture = await tester.startGesture(tester.getCenter(find.byType(Scrollable), warnIfMissed: true), kind: ui.PointerDeviceKind.mouse);
expect(getScrollOffset(tester), 0.0);
await gesture.moveBy(const Offset(0.0, -200));
await tester.pumpAndSettle();
expect(getScrollOffset(tester), 200);
});
}
// ignore: must_be_immutable