Skip to content

Commit

Permalink
Revert "Fix StretchingOverscrollIndicator clipping and add `clipBeh…
Browse files Browse the repository at this point in the history 
…avior` parameter" (#106207)
  • Loading branch information
@Piinks
Piinks authored Jun 17, 2022
1 parent 12f2a35 commit 02558d6
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 173 deletions.
1 change: 0 additions & 1 deletion packages/flutter/lib/src/material/app.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,6 @@ class MaterialScrollBehavior extends ScrollBehavior {
case AndroidOverscrollIndicator.stretch:
return StretchingOverscrollIndicator(
axisDirection: details.direction,
clipBehavior: details.clipBehavior,
child: child,
);
case AndroidOverscrollIndicator.glow:
Expand Down
12 changes: 2 additions & 10 deletions packages/flutter/lib/src/widgets/overscroll_indicator.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,9 @@ class StretchingOverscrollIndicator extends StatefulWidget {
super.key,
required this.axisDirection,
this.notificationPredicate = defaultScrollNotificationPredicate,
this.clipBehavior = Clip.hardEdge,
this.child,
}) : assert(axisDirection != null),
assert(notificationPredicate != null),
assert(clipBehavior != null);
assert(notificationPredicate != null);

/// {@macro flutter.overscroll.axisDirection}
final AxisDirection axisDirection;
Expand All @@ -668,11 +666,6 @@ class StretchingOverscrollIndicator extends StatefulWidget {
/// {@macro flutter.overscroll.notificationPredicate}
final ScrollNotificationPredicate notificationPredicate;

/// {@macro flutter.material.Material.clipBehavior}
///
/// Defaults to [Clip.hardEdge].
final Clip clipBehavior;

/// The widget below this widget in the tree.
///
/// The overscroll indicator will apply a stretch effect to this child. This
Expand Down Expand Up @@ -813,8 +806,7 @@ class _StretchingOverscrollIndicatorState extends State<StretchingOverscrollIndi
// screen, overflow from transforming the viewport is irrelevant.
return ClipRect(
clipBehavior: stretch != 0.0 && viewportDimension != mainAxisSize
? widget.clipBehavior
: Clip.none,
? Clip.hardEdge : Clip.none,
child: transform,
);
},
Expand Down
1 change: 0 additions & 1 deletion packages/flutter/lib/src/widgets/scroll_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,6 @@ abstract class ScrollView extends StatelessWidget {
viewportBuilder: (BuildContext context, ViewportOffset offset) {
return buildViewport(context, offset, axisDirection, slivers);
},
clipBehavior: clipBehavior,
);

final Widget scrollableResult = effectivePrimary && scrollController != null
Expand Down
20 changes: 1 addition & 19 deletions packages/flutter/lib/src/widgets/scrollable.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ class Scrollable extends StatefulWidget {
this.dragStartBehavior = DragStartBehavior.start,
this.restorationId,
this.scrollBehavior,
this.clipBehavior = Clip.hardEdge,
}) : assert(axisDirection != null),
assert(dragStartBehavior != null),
assert(viewportBuilder != null),
Expand Down Expand Up @@ -262,14 +261,6 @@ class Scrollable extends StatefulWidget {
/// [ScrollBehavior].
final ScrollBehavior? scrollBehavior;

/// {@macro flutter.material.Material.clipBehavior}
///
/// Defaults to [Clip.hardEdge].
///
/// Rather than clipping [Scrollable], this is passed to decorators in
/// [ScrollableDetails].
final Clip clipBehavior;

/// The axis along which the scroll view scrolls.
///
/// Determined by the [axisDirection].
Expand Down Expand Up @@ -806,7 +797,6 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
final ScrollableDetails details = ScrollableDetails(
direction: widget.axisDirection,
controller: _effectiveScrollController,
clipBehavior: widget.clipBehavior,
);

result = _configuration.buildScrollbar(
Expand All @@ -822,7 +812,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
state: this,
position: position,
registrar: registrar,
child: result,
child: result
);
}

Expand Down Expand Up @@ -1323,7 +1313,6 @@ class ScrollableDetails {
const ScrollableDetails({
required this.direction,
required this.controller,
required this.clipBehavior,
});

/// The direction in which this widget scrolls.
Expand All @@ -1337,13 +1326,6 @@ class ScrollableDetails {
/// This can be used by [ScrollBehavior] to apply a [Scrollbar] to the associated
/// [Scrollable].
final ScrollController controller;

/// {@macro flutter.material.Material.clipBehavior}
///
/// This can be used by [MaterialScrollBehavior] to clip [StretchingOverscrollIndicator].
///
/// Cannot be null.
final Clip clipBehavior;
}

/// With [_ScrollSemantics] certain child [SemanticsNode]s can be
Expand Down
78 changes: 0 additions & 78 deletions packages/flutter/test/material/app_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';

Expand Down Expand Up @@ -1266,83 +1265,6 @@ void main() {
expect(find.byType(GlowingOverscrollIndicator), findsNothing);
}, variant: TargetPlatformVariant.only(TargetPlatform.android));

testWidgets(
'ListView clip behavior updates overscroll indicator clip behavior', (WidgetTester tester) async {
Widget buildFrame(Clip clipBehavior) {
return MaterialApp(
theme: ThemeData(useMaterial3: true),
home: Column(
children: <Widget>[
SizedBox(
height: 300,
child: ListView.builder(
itemCount: 20,
clipBehavior: clipBehavior,
itemBuilder: (BuildContext context, int index){
return Padding(
padding: const EdgeInsets.all(10.0),
child: Text('Index $index'),
);
},
),
),
Opacity(
opacity: 0.5,
child: Container(
color: const Color(0xD0FF0000),
height: 100,
),
),
],
),
);
}

// Test default clip behavior.
await tester.pumpWidget(buildFrame(Clip.hardEdge));

expect(find.byType(StretchingOverscrollIndicator), findsOneWidget);
expect(find.byType(GlowingOverscrollIndicator), findsNothing);
expect(find.text('Index 1'), findsOneWidget);

RenderClipRect renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
// Currently not clipping
expect(renderClip.clipBehavior, equals(Clip.none));

TestGesture gesture = await tester.startGesture(tester.getCenter(find.text('Index 1')));
// Overscroll the start.
await gesture.moveBy(const Offset(0.0, 200.0));
await tester.pumpAndSettle();
expect(find.text('Index 1'), findsOneWidget);
expect(tester.getCenter(find.text('Index 1')).dy, greaterThan(0));
renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
// Now clipping
expect(renderClip.clipBehavior, equals(Clip.hardEdge));

await gesture.up();
await tester.pumpAndSettle();

// Test custom clip behavior.
await tester.pumpWidget(buildFrame(Clip.none));

renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
// Currently not clipping
expect(renderClip.clipBehavior, equals(Clip.none));

gesture = await tester.startGesture(tester.getCenter(find.text('Index 1')));
// Overscroll the start.
await gesture.moveBy(const Offset(0.0, 200.0));
await tester.pumpAndSettle();
expect(find.text('Index 1'), findsOneWidget);
expect(tester.getCenter(find.text('Index 1')).dy, greaterThan(0));
renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
// Now clipping
expect(renderClip.clipBehavior, equals(Clip.none));

await gesture.up();
await tester.pumpAndSettle();
}, variant: TargetPlatformVariant.only(TargetPlatform.android));

testWidgets('When `useInheritedMediaQuery` is true an existing MediaQuery is used if one is available', (WidgetTester tester) async {
late BuildContext capturedContext;
final UniqueKey uniqueKey = UniqueKey();
Expand Down
64 changes: 0 additions & 64 deletions packages/flutter/test/widgets/overscroll_stretch_indicator_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,70 +454,6 @@ void main() {
await tester.pumpAndSettle();
});

testWidgets('clipBehavior parameter updates overscroll clipping behavior', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/103491

Widget buildFrame(Clip clipBehavior) {
return Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(size: Size(800.0, 600.0)),
child: ScrollConfiguration(
behavior: const ScrollBehavior().copyWith(overscroll: false),
child: Column(
children: <Widget>[
StretchingOverscrollIndicator(
axisDirection: AxisDirection.down,
clipBehavior: clipBehavior,
child: SizedBox(
height: 300,
child: ListView.builder(
itemCount: 20,
itemBuilder: (BuildContext context, int index){
return Padding(
padding: const EdgeInsets.all(10.0),
child: Text('Index $index'),
);
},
),
),
),
Opacity(
opacity: 0.5,
child: Container(
color: const Color(0xD0FF0000),
height: 100,
),
),
],
),
),
),
);
}

await tester.pumpWidget(buildFrame(Clip.none));

expect(find.text('Index 1'), findsOneWidget);
expect(tester.getCenter(find.text('Index 1')).dy, 51.0);
RenderClipRect renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
// Currently not clipping
expect(renderClip.clipBehavior, equals(Clip.none));

final TestGesture gesture = await tester.startGesture(tester.getCenter(find.text('Index 1')));
// Overscroll the start.
await gesture.moveBy(const Offset(0.0, 200.0));
await tester.pumpAndSettle();
expect(find.text('Index 1'), findsOneWidget);
expect(tester.getCenter(find.text('Index 1')).dy, greaterThan(0));
renderClip = tester.allRenderObjects.whereType<RenderClipRect>().first;
// Now clipping
expect(renderClip.clipBehavior, equals(Clip.none));

await gesture.up();
await tester.pumpAndSettle();
});

testWidgets('Stretch limit', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/99264
await tester.pumpWidget(
Expand Down

0 comments on commit 02558d6

Please sign in to comment.