development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 11:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "improve the scrollbar behavior when viewport size changed (#76102)" (#80059)

Browse source
This commit is contained in:
Kate Lovett 2021-04-08 18:09:03 -05:00 committed by GitHub
parent 913c57021d
commit 58c4bd1063
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 88 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

190
packages/flutter/lib/src/widgets/scrollbar.dart
View file

@ -276,21 +276,14 @@ class ScrollbarPainter extends ChangeNotifier implements CustomPainter {
Rect? _trackRect; Rect? _trackRect;
late double _thumbOffset; late double _thumbOffset;
/// Update with new [ScrollMetrics]. If the metrics change, the scrollbar will /// Update with new [ScrollMetrics]. The scrollbar will show and redraw itself
/// show and redraw itself based on these new metrics. /// based on these new metrics.
/// ///
/// The scrollbar will remain on screen. /// The scrollbar will remain on screen.
void update( void update(
ScrollMetrics metrics, ScrollMetrics metrics,
AxisDirection axisDirection, AxisDirection axisDirection,
) { ) {
if (_lastMetrics != null &&
_lastMetrics!.extentBefore == metrics.extentBefore &&
_lastMetrics!.extentInside == metrics.extentInside &&
_lastMetrics!.extentAfter == metrics.extentAfter &&
_lastAxisDirection == axisDirection)
return;
_lastMetrics = metrics; _lastMetrics = metrics;
_lastAxisDirection = axisDirection; _lastAxisDirection = axisDirection;
notifyListeners(); notifyListeners();
@ -937,90 +930,90 @@ class RawScrollbarState<T extends RawScrollbar> extends State<T> with TickerProv
@override @override
void didChangeDependencies() { void didChangeDependencies() {
super.didChangeDependencies(); super.didChangeDependencies();
_maybeRequestEmptyScrollEvent(); _maybeTriggerScrollbar();
} }
// Waits one frame and cause an empty scroll event (zero delta pixels). // Waits one frame and cause an empty scroll event (zero delta pixels).
// //
// This allows the thumb to show immediately when isAlwaysShown is true. // This allows the thumb to show immediately when isAlwaysShown is true.
// A scroll event is required in order to paint the thumb. // A scroll event is required in order to paint the thumb.
void _maybeRequestEmptyScrollEvent() { void _maybeTriggerScrollbar() {
if (!showScrollbar)
return;
WidgetsBinding.instance!.addPostFrameCallback((Duration duration) { WidgetsBinding.instance!.addPostFrameCallback((Duration duration) {
_fadeoutTimer?.cancel(); if (showScrollbar) {
// Wait one frame and cause an empty scroll event. This allows the _fadeoutTimer?.cancel();
// thumb to show immediately when isAlwaysShown is true. A scroll // Wait one frame and cause an empty scroll event. This allows the
// event is required in order to paint the thumb. // thumb to show immediately when isAlwaysShown is true. A scroll
final ScrollController? scrollController = widget.controller ?? PrimaryScrollController.of(context); // event is required in order to paint the thumb.
final bool tryPrimary = widget.controller == null; final ScrollController? scrollController = widget.controller ?? PrimaryScrollController.of(context);
final String controllerForError = tryPrimary final bool tryPrimary = widget.controller == null;
? 'provided ScrollController' final String controllerForError = tryPrimary
: 'PrimaryScrollController'; ? 'provided ScrollController'
assert( : 'PrimaryScrollController';
scrollController != null, assert(
'A ScrollController is required when Scrollbar.isAlwaysShown is true. ' scrollController != null,
'${tryPrimary ? 'The Scrollbar was not provided a ScrollController, ' 'A ScrollController is required when Scrollbar.isAlwaysShown is true. '
'and attempted to use the PrimaryScrollController, but none was found.' :''}', '${tryPrimary ? 'The Scrollbar was not provided a ScrollController, '
); 'and attempted to use the PrimaryScrollController, but none was found.' :''}',
assert (() { );
if (!scrollController!.hasClients) { assert (() {
throw FlutterError.fromParts(<DiagnosticsNode>[ if (!scrollController!.hasClients) {
ErrorSummary( throw FlutterError.fromParts(<DiagnosticsNode>[
'The Scrollbar\'s ScrollController has no ScrollPosition attached.', ErrorSummary(
), 'The Scrollbar\'s ScrollController has no ScrollPosition attached.',
ErrorDescription( ),
'A Scrollbar cannot be painted without a ScrollPosition. ', ErrorDescription(
), 'A Scrollbar cannot be painted without a ScrollPosition. ',
ErrorHint( ),
'The Scrollbar attempted to use the $controllerForError. This ' ErrorHint(
'ScrollController should be associated with the ScrollView that ' 'The Scrollbar attempted to use the $controllerForError. This '
'the Scrollbar is being applied to. ' 'ScrollController should be associated with the ScrollView that '
'${tryPrimary 'the Scrollbar is being applied to. '
? 'A ScrollView with an Axis.vertical ' '${tryPrimary
'ScrollDirection will automatically use the ' ? 'A ScrollView with an Axis.vertical '
'PrimaryScrollController if the user has not provided a ' 'ScrollDirection will automatically use the '
'ScrollController, but a ScrollDirection of Axis.horizontal will ' 'PrimaryScrollController if the user has not provided a '
'not. To use the PrimaryScrollController explicitly, set ScrollView.primary ' 'ScrollController, but a ScrollDirection of Axis.horizontal will '
'to true for the Scrollable widget.' 'not. To use the PrimaryScrollController explicitly, set ScrollView.primary '
: 'When providing your own ScrollController, ensure both the ' 'to true for the Scrollable widget.'
'Scrollbar and the Scrollable widget use the same one.' : 'When providing your own ScrollController, ensure both the '
}', 'Scrollbar and the Scrollable widget use the same one.'
), }',
]); ),
} ]);
return true; }
}()); return true;
assert (() { }());
try { assert (() {
scrollController!.position; try {
} catch (_) { scrollController!.position;
throw FlutterError.fromParts(<DiagnosticsNode>[ } catch (_) {
ErrorSummary( throw FlutterError.fromParts(<DiagnosticsNode>[
'The $controllerForError is currently attached to more than one ' ErrorSummary(
'ScrollPosition.', 'The $controllerForError is currently attached to more than one '
), 'ScrollPosition.',
ErrorDescription( ),
'The Scrollbar requires a single ScrollPosition in order to be painted.', ErrorDescription(
), 'The Scrollbar requires a single ScrollPosition in order to be painted.',
ErrorHint( ),
'When Scrollbar.isAlwaysShown is true, the associated Scrollable ' ErrorHint(
'widgets must have unique ScrollControllers. ' 'When Scrollbar.isAlwaysShown is true, the associated Scrollable '
'${tryPrimary 'widgets must have unique ScrollControllers. '
? 'The PrimaryScrollController is used by default for ' '${tryPrimary
'ScrollViews with an Axis.vertical ScrollDirection, ' ? 'The PrimaryScrollController is used by default for '
'unless the ScrollView has been provided its own ' 'ScrollViews with an Axis.vertical ScrollDirection, '
'ScrollController. More than one Scrollable may have tried ' 'unless the ScrollView has been provided its own '
'to use the PrimaryScrollController of the current context.' 'ScrollController. More than one Scrollable may have tried '
: 'The provided ScrollController must be unique to a ' 'to use the PrimaryScrollController of the current context.'
'Scrollable widget.' : 'The provided ScrollController must be unique to a '
}', 'Scrollable widget.'
), }',
]); ),
} ]);
return true; }
}()); return true;
scrollController!.position.didUpdateScrollPositionBy(0); }());
scrollController!.position.didUpdateScrollPositionBy(0);
}
}); });
} }
@ -1042,14 +1035,13 @@ class RawScrollbarState<T extends RawScrollbar> extends State<T> with TickerProv
@override @override
void didUpdateWidget(T oldWidget) { void didUpdateWidget(T oldWidget) {
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
// If `isAlwaysShown` is true and does not change, if (widget.isAlwaysShown != oldWidget.isAlwaysShown) {
// it may be necessary to trigger a scroll event to show or hide the bar when the if (widget.isAlwaysShown == true) {
// scrollable widget viewport size changed. _maybeTriggerScrollbar();
if (widget.isAlwaysShown == true) { _fadeoutAnimationController.animateTo(1.0);
_maybeRequestEmptyScrollEvent(); } else {
_fadeoutAnimationController.animateTo(1.0); _fadeoutAnimationController.reverse();
} else if (widget.isAlwaysShown != oldWidget.isAlwaysShown) { }
_fadeoutAnimationController.reverse();
} }
} }
@ -1211,19 +1203,13 @@ class RawScrollbarState<T extends RawScrollbar> extends State<T> with TickerProv
return false; return false;
final ScrollMetrics metrics = notification.metrics; final ScrollMetrics metrics = notification.metrics;
if (metrics.maxScrollExtent <= metrics.minScrollExtent) { if (metrics.maxScrollExtent <= metrics.minScrollExtent)
// Hide the bar when the Scrollable widget has no space to scroll.
if (_fadeoutAnimationController.status != AnimationStatus.dismissed
&& _fadeoutAnimationController.status != AnimationStatus.reverse)
_fadeoutAnimationController.reverse();
return false; return false;
}
if (notification is ScrollUpdateNotification || if (notification is ScrollUpdateNotification ||
notification is OverscrollNotification) { notification is OverscrollNotification) {
// Any movements always makes the scrollbar start showing up. // Any movements always makes the scrollbar start showing up.
if (_fadeoutAnimationController.status != AnimationStatus.forward if (_fadeoutAnimationController.status != AnimationStatus.forward)
&& _fadeoutAnimationController.status != AnimationStatus.completed)
_fadeoutAnimationController.forward(); _fadeoutAnimationController.forward();
_fadeoutTimer?.cancel(); _fadeoutTimer?.cancel();

31
packages/flutter/test/widgets/scrollbar_test.dart
View file

@ -1152,35 +1152,4 @@ void main() {
), ),
); );
}); });
testWidgets('The bar can show or hide when the viewport size change', (WidgetTester tester) async {
final ScrollController scrollController = ScrollController();
Widget buildFrame(double height) {
return Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(),
child: RawScrollbar(
controller: scrollController,
isAlwaysShown: true,
child: SingleChildScrollView(
controller: scrollController,
child: SizedBox(width: double.infinity, height: height)
),
),
),
);
}
await tester.pumpWidget(buildFrame(600.0));
await tester.pumpAndSettle();
expect(find.byType(RawScrollbar), isNot(paints..rect())); // Not shown.
await tester.pumpWidget(buildFrame(600.1));
await tester.pumpAndSettle();
expect(find.byType(RawScrollbar), paints..rect()..rect()); // Show the bar.
await tester.pumpWidget(buildFrame(600.0));
await tester.pumpAndSettle();
expect(find.byType(RawScrollbar), isNot(paints..rect())); // Hide the bar.
});
} }