Fix layout issue with null appBar in NavigationView

Fixed bdlukaa#78
dev-hann · Oct 6, 2021 · fa2fc4a · fa2fc4a
1 parent 5a8aacd
commit fa2fc4a
Show file tree

Hide file tree

Showing 5 changed files with 4,510 additions and 2,255 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ Date format: DD/MM/YYYY
 ## [3.x.x] - Flutter 2.5.0 - [DD/MM/YYYY]
 
 - Added builder variant to `NavigationBody`. 
+- Fixed content bug when `AppBar` was not supplied too `NavigationView`
 
 ## [3.2.0] - Flutter 2.5.0 - [15/09/2021]
 

diff --git a/example/lib/screens/typography.dart b/example/lib/screens/typography.dart
@@ -94,21 +94,36 @@ class _TypographyPageState extends State<TypographyPage> {
                     // crossAxisAlignment: CrossAxisAlignment.start,
                     // mainAxisSize: MainAxisSize.min,
                     children: [
-                      Text('Display', style: typography.display?.apply(fontSizeFactor: scale)),
+                      Text('Display',
+                          style:
+                              typography.display?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Title Large', style: typography.titleLarge?.apply(fontSizeFactor: scale)),
+                      Text('Title Large',
+                          style: typography.titleLarge
+                              ?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Title', style: typography.title?.apply(fontSizeFactor: scale)),
+                      Text('Title',
+                          style:
+                              typography.title?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Subtitle', style: typography.subtitle?.apply(fontSizeFactor: scale)),
+                      Text('Subtitle',
+                          style: typography.subtitle
+                              ?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Body Large', style: typography.bodyLarge?.apply(fontSizeFactor: scale)),
+                      Text('Body Large',
+                          style: typography.bodyLarge
+                              ?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Body Strong', style: typography.bodyStrong?.apply(fontSizeFactor: scale)),
+                      Text('Body Strong',
+                          style: typography.bodyStrong
+                              ?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Body', style: typography.body?.apply(fontSizeFactor: scale)),
+                      Text('Body',
+                          style: typography.body?.apply(fontSizeFactor: scale)),
                       spacer,
-                      Text('Caption', style: typography.caption?.apply(fontSizeFactor: scale)),
+                      Text('Caption',
+                          style:
+                              typography.caption?.apply(fontSizeFactor: scale)),
                       spacer,
                     ],
                   ),

diff --git a/lib/src/controls/navigation/navigation_view/view.dart b/lib/src/controls/navigation/navigation_view/view.dart
@@ -161,7 +161,10 @@ class NavigationViewState extends State<NavigationView> {
               : null,
         );
       }
-      return const SizedBox.shrink();
+      return LayoutBuilder(
+        builder: (context, constraints) =>
+            SizedBox(width: constraints.maxWidth, height: 0),
+      );
     }();
 
     Widget paneResult = LayoutBuilder(

diff --git a/lib/src/controls/utils/scrollbar.dart b/lib/src/controls/utils/scrollbar.dart
@@ -129,8 +129,8 @@ class _ScrollbarState extends RawScrollbarState<Scrollbar> {
     super.handleThumbPressStart(localPosition);
     if (mounted) {
       setState(() {
-      _dragIsActive = true;
-    });
+        _dragIsActive = true;
+      });
     }
   }
 
@@ -139,8 +139,8 @@ class _ScrollbarState extends RawScrollbarState<Scrollbar> {
     super.handleThumbPressEnd(localPosition, velocity);
     if (mounted) {
       setState(() {
-      _dragIsActive = false;
-    });
+        _dragIsActive = false;
+      });
     }
   }
 
@@ -152,17 +152,17 @@ class _ScrollbarState extends RawScrollbarState<Scrollbar> {
       // Pointer is hovering over the scrollbar
       if (mounted) {
         setState(() {
-        _hoverIsActive = true;
-      });
+          _hoverIsActive = true;
+        });
       }
       _hoverController.forward();
     } else if (_hoverIsActive) {
       await _hoverController.reverse();
       // Pointer was, but is no longer over painted scrollbar.
       if (mounted) {
         setState(() {
-        _hoverIsActive = false;
-      });
+          _hoverIsActive = false;
+        });
       }
     }
   }
@@ -172,8 +172,8 @@ class _ScrollbarState extends RawScrollbarState<Scrollbar> {
     super.handleHoverExit(event);
     if (mounted) {
       setState(() {
-      _hoverIsActive = false;
-    });
+        _hoverIsActive = false;
+      });
     }
     _hoverController.reverse();
   }