Fix some Spanning Widgets issues

 # Changelog
 
+## 3.6.3
+
+- Fix some Spanning Widgets issues
+
 ## 3.6.2
 
 - Fix arabic ranges according to Wikipedia [elibyy]
@@ -105,7 +109,7 @@
 - A borderRadius can only be given for a uniform Border
 - Add LayoutWidgetBuilder
 - Add GridPaper widget
-- Improve internal sructure
+- Improve internal structure
 - Add some asserts on the TtfParser
 - Add document loading
 - Remove deprecated methods
@@ -117,7 +121,7 @@
 
 ## 1.13.0
 
-- Implement different border radius on all corners
+- Implement different border-radius on all corners
 - Add AcroForm widgets
 - Add document outline support
 - Update analysis options
@@ -130,7 +134,7 @@
 - Automatically calculate Shape() bounding box
 - Improve gradient functions
 - Add blend mode
-- Add soft mask
+- Add soft-mask support
 - Remove dependency to the deprecated utf library
 - Fix RichText.maxLines with multiple TextSpan
 - Fix Exif parsing
@@ -171,7 +175,7 @@
 
 ## 1.9.0
 
-- Allow MultiPage to relayout individual pages with support for flex
+- Allow MultiPage to re-layout individual pages with support for flex
 - Implement BoxShadow for rect and circle BoxDecorations
 - Implement TextStyle.letterSpacing
 - Implement Arabic writing support [Anas Altair]

@@ -336,6 +336,7 @@ class GridView extends MultiChildWidget with SpanningWidget {
 
   @override
   void restoreContext(_GridViewContext context) {
+    _context.apply(context);
     _context.firstChild = context.lastChild;
   }
 

@@ -96,7 +96,7 @@ class _PartitionsContext extends WidgetContext {
   WidgetContext clone() {
     final context = _PartitionsContext(partitionContext.length);
     for (var index = 0; index < partitionContext.length; index++) {
-      context.partitionContext[index] = partitionContext[index]!.clone();
+      context.partitionContext[index] = partitionContext[index]?.clone();
     }
 
     return context;
@@ -224,7 +224,9 @@ class Partitions extends Widget with SpanningWidget {
     _context.apply(context);
     var index = 0;
     for (final child in children) {
-      child.restoreContext(_context.partitionContext[index]!);
+      if (child.canSpan) {
+        child.restoreContext(_context.partitionContext[index]!);
+      }
       index++;
     }
   }
@@ -233,7 +235,9 @@ class Partitions extends Widget with SpanningWidget {
   WidgetContext saveContext() {
     var index = 0;
     for (final child in children) {
-      _context.partitionContext[index] = child.saveContext();
+      if (child.canSpan) {
+        _context.partitionContext[index] = child.saveContext();
+      }
       index++;
     }
     return _context;

@@ -256,7 +256,9 @@ abstract class StatelessWidget extends Widget with SpanningWidget {
 
   @override
   bool get canSpan =>
-      _child is SpanningWidget && (_child as SpanningWidget).canSpan;
+      _child != null &&
+      _child is SpanningWidget &&
+      (_child as SpanningWidget).canSpan;
 
   @override
   bool get hasMoreWidgets =>

@@ -393,6 +393,7 @@ class Wrap extends MultiChildWidget with SpanningWidget {
 
   @override
   void restoreContext(_WrapContext context) {
+    _context.apply(context);
     _context.firstChild = context.lastChild;
   }
 

@@ -3,7 +3,7 @@ description: A pdf producer for Dart. It can create pdf files for both web or fl
 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
 repository: https://github.com/DavBfr/dart_pdf
 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
-version: 3.6.2
+version: 3.6.3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"