From 886de22182c657bfc4010fe31ec803695e5d666c Mon Sep 17 00:00:00 2001 From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 02:33:16 +0000 Subject: [PATCH] Reverts "sliverGridDelegate mainAxisExtent add assert (#148470)" (#149224) Reverts: flutter/flutter#148470 Initiated by: eyebrowsoffire Reason for reverting: Unit test failures closing the tree. Original PR Author: hello-coder-xu Reviewed By: {QuncCccccc, Piinks} This change reverts the following previous change: * sliverGridDelegate mainAxisExtent add assert,Avoid incorrect use * Fixes https://github.com/flutter/flutter/issues/138871 --- .../lib/src/rendering/sliver_grid.dart | 6 +-- .../flutter/test/widgets/grid_view_test.dart | 49 ------------------- 2 files changed, 2 insertions(+), 53 deletions(-) diff --git a/packages/flutter/lib/src/rendering/sliver_grid.dart b/packages/flutter/lib/src/rendering/sliver_grid.dart index f20485d589..3238894992 100644 --- a/packages/flutter/lib/src/rendering/sliver_grid.dart +++ b/packages/flutter/lib/src/rendering/sliver_grid.dart @@ -348,8 +348,7 @@ class SliverGridDelegateWithFixedCrossAxisCount extends SliverGridDelegate { }) : assert(crossAxisCount > 0), assert(mainAxisSpacing >= 0), assert(crossAxisSpacing >= 0), - assert(childAspectRatio > 0), - assert(mainAxisExtent == null || mainAxisExtent >= 0); + assert(childAspectRatio > 0); /// The number of children in the cross axis. final int crossAxisCount; @@ -447,8 +446,7 @@ class SliverGridDelegateWithMaxCrossAxisExtent extends SliverGridDelegate { }) : assert(maxCrossAxisExtent > 0), assert(mainAxisSpacing >= 0), assert(crossAxisSpacing >= 0), - assert(childAspectRatio > 0), - assert(mainAxisExtent == null || mainAxisExtent >= 0); + assert(childAspectRatio > 0); /// The maximum extent of tiles in the cross axis. /// diff --git a/packages/flutter/test/widgets/grid_view_test.dart b/packages/flutter/test/widgets/grid_view_test.dart index f08c141f0c..c03baf8c15 100644 --- a/packages/flutter/test/widgets/grid_view_test.dart +++ b/packages/flutter/test/widgets/grid_view_test.dart @@ -898,53 +898,4 @@ void main() { expect(controller.position.maxScrollExtent, 472.0); expect(controller.position.pixels, 472.0); }); - - testWidgets('SliverGridDelegate mainAxisExtent add assert', (WidgetTester tester) async { - Widget buildGridView(SliverGridDelegate delegate) { - return Directionality( - textDirection: TextDirection.ltr, - child: GridView.builder( - gridDelegate: delegate, - itemBuilder: (BuildContext context, int index) { - return Container( - height: 50, - alignment: Alignment.center, - child: Text('$index'), - ); - }, - itemCount: 50, - ), - ); - } - - expect( - () => tester.pumpWidget(buildGridView(SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, - mainAxisSpacing: 8, - crossAxisSpacing: 8, - mainAxisExtent: -100, - ))), - throwsA(isAssertionError.having( - (AssertionError e) => e.toString(), - '.toString()', - contains("'mainAxisExtent == null || mainAxisExtent >= 0': is not true."), - )), - ); - - expect( - () => tester.pumpWidget(buildGridView(SliverGridDelegateWithMaxCrossAxisExtent( - maxCrossAxisExtent: 100, - mainAxisSpacing: 8, - crossAxisSpacing: 8, - mainAxisExtent: -100, - ))), - throwsA(isAssertionError.having( - (AssertionError e) => e.toString(), - '.toString()', - contains("'mainAxisExtent == null || mainAxisExtent >= 0': is not true."), - )), - ); - }); - - }