feat: apply default configuration to widget slides

mkobuolys · Oct 31, 2024 · 1e9e890 · 1e9e890
1 parent 77e8819
commit 1e9e890
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/packages/flutter_deck/lib/src/flutter_deck_app.dart b/packages/flutter_deck/lib/src/flutter_deck_app.dart
@@ -210,18 +210,25 @@ class _FlutterDeckAppState extends State<FlutterDeckApp> {
 
   FlutterDeckRouterSlide? _buildRouterSlide((int, Widget) indexedSlide) {
     final (index, slide) = indexedSlide;
-    final slideConfiguration =
-        slide is FlutterDeckSlideWidget ? slide.configuration : null;
 
-    if (slideConfiguration?.hidden ?? false) return null;
+    var slideWidget = slide;
 
-    final configuration = slideConfiguration ??
-        FlutterDeckSlideConfiguration(route: '/slide-${index + 1}');
+    if (slideWidget is! FlutterDeckSlideWidget) {
+      final defaultConfiguration = FlutterDeckSlideConfiguration(
+        route: '/slide-${index + 1}',
+      );
+
+      slideWidget = slide.withSlideConfiguration(defaultConfiguration);
+    }
+
+    final configuration = slideWidget.configuration!;
+
+    if (configuration.hidden) return null;
 
     return FlutterDeckRouterSlide(
       configuration: configuration.mergeWithGlobal(widget.configuration),
       route: configuration.route,
-      widget: slide,
+      widget: slideWidget,
     );
   }
 

diff --git a/packages/flutter_deck/lib/src/flutter_deck_slide.dart b/packages/flutter_deck/lib/src/flutter_deck_slide.dart
@@ -391,3 +391,16 @@ class _SlideBody extends StatelessWidget {
     );
   }
 }
+
+///
+extension FlutterDeckSlideWidgetX on Widget {
+  ///
+  FlutterDeckSlideWidget withSlideConfiguration(
+    FlutterDeckSlideConfiguration configuration,
+  ) {
+    return FlutterDeckSlide.custom(
+      configuration: configuration,
+      builder: (context) => this,
+    );
+  }
+}