Merge pull request #312 from adil192/null-aware

fix: use Scrollable.maybeOf
letsar · Jul 30, 2023 · fecd2ac · fecd2ac
2 parents 373e1aa + eee81f0
commit fecd2ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/src/widgets/sliver_aligned_grid.dart b/lib/src/widgets/sliver_aligned_grid.dart
@@ -188,7 +188,7 @@ class _Gap extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final axis = axisDirectionToAxis(Scrollable.of(context)!.axisDirection);
+    final axis = axisDirectionToAxis(Scrollable.of(context).axisDirection);
     return axis == Axis.vertical
         ? SizedBox(height: mainAxisExtent)
         : SizedBox(width: mainAxisExtent);

diff --git a/lib/src/widgets/staggered_grid.dart b/lib/src/widgets/staggered_grid.dart
@@ -82,7 +82,7 @@ class StaggeredGrid extends MultiChildRenderObjectWidget {
       mainAxisSpacing: mainAxisSpacing,
       crossAxisSpacing: crossAxisSpacing,
       axisDirection: axisDirection ??
-          Scrollable.of(context)?.axisDirection ??
+          Scrollable.maybeOf(context)?.axisDirection ??
           AxisDirection.down,
       textDirection: Directionality.of(context),
     );
@@ -98,7 +98,7 @@ class StaggeredGrid extends MultiChildRenderObjectWidget {
       ..mainAxisSpacing = mainAxisSpacing
       ..crossAxisSpacing = crossAxisSpacing
       ..axisDirection = axisDirection ??
-          Scrollable.of(context)?.axisDirection ??
+          Scrollable.maybeOf(context)?.axisDirection ??
           AxisDirection.down
       ..textDirection = Directionality.of(context);
   }