Fixes flutter#11545

kishan-dhankecha · Dec 26, 2024 · 0c26633 · 0c26633
1 parent 01b001d
commit 0c26633
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/examples/cookbook/effects/shimmer_loading/lib/original_example.dart b/examples/cookbook/effects/shimmer_loading/lib/original_example.dart
@@ -247,8 +247,8 @@ class _ShimmerLoadingState extends State<ShimmerLoading> {
     }
 
     // Collect ancestor shimmer info.
-    final shimmer = Shimmer.of(context)!;
-    if (!shimmer.isSized) {
+    final shimmer = Shimmer.of(context);
+    if (shimmer == null || !shimmer.isSized) {
       // The ancestor Shimmer widget has not laid
       // itself out yet. Return an empty box.
       return const SizedBox();

diff --git a/examples/cookbook/effects/shimmer_loading/lib/shimmer_loading_state_pt2.dart b/examples/cookbook/effects/shimmer_loading/lib/shimmer_loading_state_pt2.dart
@@ -23,8 +23,8 @@ class _ShimmerLoadingState extends State<ShimmerLoading> {
     }
 
     // Collect ancestor shimmer information.
-    final shimmer = Shimmer.of(context)!;
-    if (!shimmer.isSized) {
+    final shimmer = Shimmer.of(context);
+    if (shimmer == null || !shimmer.isSized) {
       // The ancestor Shimmer widget isn't laid
       // out yet. Return an empty box.
       return const SizedBox();

diff --git a/src/content/cookbook/effects/shimmer-loading.md b/src/content/cookbook/effects/shimmer-loading.md
@@ -414,11 +414,11 @@ class _ShimmerLoadingState extends State<ShimmerLoading> {
       return widget.child;
     }
 
-    // Collect ancestor shimmer information.
-    final shimmer = Shimmer.of(context)!;
-    if (!shimmer.isSized) {
-      // The ancestor Shimmer widget isn't laid
-      // out yet. Return an empty box.
+    // Collect ancestor shimmer info.
+    final shimmer = Shimmer.of(context);
+    if (shimmer == null || !shimmer.isSized) {
+      // The ancestor Shimmer widget has not laid
+      // itself out yet. Return an empty box.
       return const SizedBox();
     }
     final shimmerSize = shimmer.size;
@@ -815,8 +815,8 @@ class _ShimmerLoadingState extends State<ShimmerLoading> {
     }
 
     // Collect ancestor shimmer info.
-    final shimmer = Shimmer.of(context)!;
-    if (!shimmer.isSized) {
+    final shimmer = Shimmer.of(context);
+    if (shimmer == null || !shimmer.isSized) {
       // The ancestor Shimmer widget has not laid
       // itself out yet. Return an empty box.
       return const SizedBox();