diff --git a/example/lib/main.dart b/example/lib/main.dart
index 2c821116..e48886a0 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -29,7 +29,8 @@ class _MainAppState extends State<MainApp> {
 
   @override
   Widget build(BuildContext context) {
-    SliverWoltModalSheetPage page1(BuildContext modalSheetContext, TextTheme textTheme) {
+    SliverWoltModalSheetPage page1(
+        BuildContext modalSheetContext, TextTheme textTheme) {
       return WoltModalSheetPage(
         hasSabGradient: false,
         stickyActionBar: Padding(
@@ -78,13 +79,15 @@ Pagination involves a sequence of screens the user navigates sequentially. We ch
       );
     }
 
-    SliverWoltModalSheetPage page2(BuildContext modalSheetContext, TextTheme textTheme) {
+    SliverWoltModalSheetPage page2(
+        BuildContext modalSheetContext, TextTheme textTheme) {
       return SliverWoltModalSheetPage(
         pageTitle: Padding(
           padding: const EdgeInsets.all(_pagePadding),
           child: Text(
             'Material Colors',
-            style: textTheme.headlineMedium!.copyWith(fontWeight: FontWeight.bold),
+            style:
+                textTheme.headlineMedium!.copyWith(fontWeight: FontWeight.bold),
           ),
         ),
         heroImage: Image(
@@ -164,7 +167,8 @@ Pagination involves a sequence of screens the user navigates sequentially. We ch
                       padding: const EdgeInsets.all(_pagePadding),
                       child: Switch(
                         value: !_isLightTheme,
-                        onChanged: (_) => setState(() => _isLightTheme = !_isLightTheme),
+                        onChanged: (_) =>
+                            setState(() => _isLightTheme = !_isLightTheme),
                       ),
                     ),
                     const Text('Dark Theme'),
diff --git a/lib/src/content/wolt_modal_sheet_animated_switcher.dart b/lib/src/content/wolt_modal_sheet_animated_switcher.dart
index f9a0d8e6..8bdb5b5b 100644
--- a/lib/src/content/wolt_modal_sheet_animated_switcher.dart
+++ b/lib/src/content/wolt_modal_sheet_animated_switcher.dart
@@ -30,15 +30,16 @@ class WoltModalSheetAnimatedSwitcher extends StatefulWidget {
     required this.sheetWidth,
     required this.showDragHandle,
     Key? key,
-  })
-      : assert(pageIndex >= 0 && pageIndex < pages.length),
+  })  : assert(pageIndex >= 0 && pageIndex < pages.length),
         super(key: key);
 
   @override
-  State<WoltModalSheetAnimatedSwitcher> createState() => _WoltModalSheetAnimatedSwitcherState();
+  State<WoltModalSheetAnimatedSwitcher> createState() =>
+      _WoltModalSheetAnimatedSwitcherState();
 }
 
-class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedSwitcher>
+class _WoltModalSheetAnimatedSwitcherState
+    extends State<WoltModalSheetAnimatedSwitcher>
     with TickerProviderStateMixin {
   PaginatingWidgetsGroup? _incomingPageWidgets;
   PaginatingWidgetsGroup? _outgoingPageWidgets;
@@ -52,7 +53,9 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
   bool get _hasTopBarLayer {
     final themeData = Theme.of(context).extension<WoltModalSheetThemeData>();
     final defaultThemeData = WoltModalSheetDefaultThemeData(context);
-    return _page.hasTopBarLayer ?? themeData?.hasTopBarLayer ?? defaultThemeData.hasTopBarLayer;
+    return _page.hasTopBarLayer ??
+        themeData?.hasTopBarLayer ??
+        defaultThemeData.hasTopBarLayer;
   }
 
   late List<GlobalKey> _titleKeys;
@@ -67,7 +70,8 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
   List<ScrollController> _scrollControllers = [];
 
   /// The [ScrollController] of the current [WoltModalSheetPage] main content.
-  ScrollController get _currentPageScrollController => _scrollControllers[_pageIndex];
+  ScrollController get _currentPageScrollController =>
+      _scrollControllers[_pageIndex];
 
   /// List of [ValueNotifier] objects, each one for the listening of the scroll position updates
   /// in each [WoltModalSheetPage] main content.
@@ -75,7 +79,8 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
 
   /// The current scroll position of the current [WoltModalSheetPage] main content. This is
   /// needed to create a [ScrollController] with initial scroll offset when changing pages.
-  ValueNotifier<double> get _currentPageScrollPosition => _scrollPositions[_pageIndex];
+  ValueNotifier<double> get _currentPageScrollPosition =>
+      _scrollPositions[_pageIndex];
 
   /// Subscription for discovering the state of the soft-keyboard visibility
   late StreamSubscription<bool> _softKeyboardVisibilitySubscription;
@@ -93,7 +98,8 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
   /// sent by the Flutter SDK. However, the keyboard closing events do not cause a change in the
   /// scroll controller. Therefore, we need to manually trigger a re-paint when the keyboard is
   /// closing.
-  final ValueNotifier<SoftKeyboardClosedEvent> _softKeyboardClosedNotifier = ValueNotifier(
+  final ValueNotifier<SoftKeyboardClosedEvent> _softKeyboardClosedNotifier =
+      ValueNotifier(
     const SoftKeyboardClosedEvent(eventId: 0),
   );
 
@@ -123,14 +129,17 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
 
   void _resetScrollPositions() {
     _scrollPositions.clear();
-    _scrollPositions = [for (int i = 0; i < _pagesCount; i++) ValueNotifier(0.0)];
+    _scrollPositions = [
+      for (int i = 0; i < _pagesCount; i++) ValueNotifier(0.0)
+    ];
   }
 
   void _resetScrollControllers() {
     _scrollControllers.clear();
     _scrollControllers = [
       for (int i = 0; i < _pagesCount; i++)
-        (_page.scrollController ?? ScrollController(initialScrollOffset: _scrollPositions[i].value))
+        (_page.scrollController ??
+            ScrollController(initialScrollOffset: _scrollPositions[i].value))
     ];
   }
 
@@ -138,7 +147,8 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
     for (final scrollController in _scrollControllers) {
       scrollController.addListener(() {
         if (_currentPageScrollController.hasClients) {
-          _currentPageScrollPosition.value = _currentPageScrollController.position.pixels;
+          _currentPageScrollPosition.value =
+              _currentPageScrollController.position.pixels;
         }
       });
     }
@@ -146,15 +156,18 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
 
   void _subscribeToSoftKeyboardClosedEvent() {
     _softKeyboardVisibilitySubscription =
-        KeyboardVisibilityController().onChange.listen((bool visible,) async {
-          if (!visible) {
-            /// Wait for closing soft keyboard animation to finish before emitting new value.
-            await Future.delayed(const Duration(milliseconds: 250));
-            final int lastEventId = _softKeyboardClosedNotifier.value.eventId;
-            final newEventId = lastEventId + 1;
-            _softKeyboardClosedNotifier.value = SoftKeyboardClosedEvent(eventId: newEventId);
-          }
-        });
+        KeyboardVisibilityController().onChange.listen((
+      bool visible,
+    ) async {
+      if (!visible) {
+        /// Wait for closing soft keyboard animation to finish before emitting new value.
+        await Future.delayed(const Duration(milliseconds: 250));
+        final int lastEventId = _softKeyboardClosedNotifier.value.eventId;
+        final newEventId = lastEventId + 1;
+        _softKeyboardClosedNotifier.value =
+            SoftKeyboardClosedEvent(eventId: newEventId);
+      }
+    });
   }
 
   @override
@@ -261,10 +274,11 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
 
     // An AnimationController is created and attached to this State object (with 'this' as the vsync).
     _animationController = AnimationController(
-      duration: const Duration(milliseconds: defaultWoltModalTransitionAnimationDuration),
+      duration: const Duration(
+          milliseconds: defaultWoltModalTransitionAnimationDuration),
       vsync: this,
     )
-    // We also attach a status listener to the animation controller. When the animation is completed, it will trigger a state change.
+      // We also attach a status listener to the animation controller. When the animation is completed, it will trigger a state change.
       ..addStatusListener((status) {
         if (status == AnimationStatus.completed) {
           setState(() {
@@ -272,7 +286,8 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
             // We clear the _outgoingPageWidgets, which was storing the "outgoing" page (the page we're transitioning from)
             _outgoingPageWidgets = null;
             // We ensure that the animation controller's value is set to its upper bound (which should be 1.0)
-            _animationController?.value = _animationController?.upperBound ?? 1.0;
+            _animationController?.value =
+                _animationController?.upperBound ?? 1.0;
             // We dispose of the animation controller to free up resources as we're done with this animation
             _animationController?.dispose();
             // We also set the animation controller reference to null as it's no longer needed.
@@ -304,35 +319,39 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
     }
   }
 
-  PaginatingWidgetsGroup _createIncomingWidgets(AnimationController animationController) {
+  PaginatingWidgetsGroup _createIncomingWidgets(
+      AnimationController animationController) {
     final themeData = Theme.of(context).extension<WoltModalSheetThemeData>();
     final defaultThemeData = WoltModalSheetDefaultThemeData(context);
     final hasTopBarLayer = _hasTopBarLayer;
     final isTopBarLayerAlwaysVisible = _page.isTopBarLayerAlwaysVisible ??
         themeData?.isTopBarLayerAlwaysVisible ??
         defaultThemeData.isTopBarLayerAlwaysVisible;
-    final topBarTitle = WoltModalSheetTopBarTitle(page: _page, pageTitleKey: _pageTitleKey);
-    final navBarHeight =
-        _page.navBarHeight ?? themeData?.navBarHeight ?? defaultThemeData.navBarHeight;
+    final topBarTitle =
+        WoltModalSheetTopBarTitle(page: _page, pageTitleKey: _pageTitleKey);
+    final navBarHeight = _page.navBarHeight ??
+        themeData?.navBarHeight ??
+        defaultThemeData.navBarHeight;
     final WoltModalSheetAnimationStyle animationStyle =
         themeData?.animationStyle ?? defaultThemeData.animationStyle;
-    const animatedBuilderKey = ValueKey(WoltModalSheetPageTransitionState.incoming);
+    const animatedBuilderKey =
+        ValueKey(WoltModalSheetPageTransitionState.incoming);
     // If the page uses the default top bar, we should show the top bar title to be represented in
     // the middle of the navigation toolbar.
     final shouldShowTopBarTitle = hasTopBarLayer && _page.topBar == null;
     Widget? navigationToolbarMiddle;
     if (shouldShowTopBarTitle) {
       navigationToolbarMiddle =
-      isTopBarLayerAlwaysVisible || _page is NonScrollingWoltModalSheetPage
-          ? Center(child: topBarTitle)
-          : WoltModalSheetTopBarTitleFlow(
-        scrollAnimationStyle: animationStyle.scrollAnimationStyle,
-        page: _page,
-        scrollController: _currentPageScrollController,
-        titleKey: _pageTitleKey,
-        topBarTitle: topBarTitle,
-        softKeyboardClosedListenable: _softKeyboardClosedNotifier,
-      );
+          isTopBarLayerAlwaysVisible || _page is NonScrollingWoltModalSheetPage
+              ? Center(child: topBarTitle)
+              : WoltModalSheetTopBarTitleFlow(
+                  scrollAnimationStyle: animationStyle.scrollAnimationStyle,
+                  page: _page,
+                  scrollController: _currentPageScrollController,
+                  titleKey: _pageTitleKey,
+                  topBarTitle: topBarTitle,
+                  softKeyboardClosedListenable: _softKeyboardClosedNotifier,
+                );
     }
     return PaginatingWidgetsGroup(
       mainContentAnimatedBuilder: MainContentAnimatedBuilder(
@@ -340,8 +359,10 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
         paginationAnimationStyle: animationStyle.paginationAnimationStyle,
         pageTransitionState: WoltModalSheetPageTransitionState.incoming,
         controller: animationController,
-        incomingOffstagedMainContentKey: _incomingOffstagedMainContentKeys[_pageIndex],
-        outgoingOffstagedMainContentKey: _outgoingOffstagedMainContentKeys[_pageIndex],
+        incomingOffstagedMainContentKey:
+            _incomingOffstagedMainContentKeys[_pageIndex],
+        outgoingOffstagedMainContentKey:
+            _outgoingOffstagedMainContentKeys[_pageIndex],
         forwardMove: _isForwardMove,
         sheetWidth: widget.sheetWidth,
         child: _createMainContent(
@@ -361,15 +382,16 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
         pageTransitionState: WoltModalSheetPageTransitionState.incoming,
         controller: animationController,
         child: hasTopBarLayer
-            ? (isTopBarLayerAlwaysVisible || _page is NonScrollingWoltModalSheetPage
-            ? WoltModalSheetTopBar(page: _page)
-            : WoltModalSheetTopBarFlow(
-          scrollAnimationStyle: animationStyle.scrollAnimationStyle,
-          page: _page,
-          scrollController: _currentPageScrollController,
-          titleKey: _pageTitleKey,
-          softKeyboardClosedListenable: _softKeyboardClosedNotifier,
-        ))
+            ? (isTopBarLayerAlwaysVisible ||
+                    _page is NonScrollingWoltModalSheetPage
+                ? WoltModalSheetTopBar(page: _page)
+                : WoltModalSheetTopBarFlow(
+                    scrollAnimationStyle: animationStyle.scrollAnimationStyle,
+                    page: _page,
+                    scrollController: _currentPageScrollController,
+                    titleKey: _pageTitleKey,
+                    softKeyboardClosedListenable: _softKeyboardClosedNotifier,
+                  ))
             : const SizedBox.shrink(),
       ),
       navigationToolbarAnimatedBuilder: NavigationToolbarAnimatedBuilder(
@@ -397,9 +419,12 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
     );
   }
 
-  PaginatingWidgetsGroup _createOutgoingWidgets(AnimationController animationController,
-      PaginatingWidgetsGroup currentWidgetsToBeOutgoing,) {
-    const animatedBuilderKey = ValueKey(WoltModalSheetPageTransitionState.outgoing);
+  PaginatingWidgetsGroup _createOutgoingWidgets(
+    AnimationController animationController,
+    PaginatingWidgetsGroup currentWidgetsToBeOutgoing,
+  ) {
+    const animatedBuilderKey =
+        ValueKey(WoltModalSheetPageTransitionState.outgoing);
     final themeData = Theme.of(context).extension<WoltModalSheetThemeData>();
     final defaultThemeData = WoltModalSheetDefaultThemeData(context);
     final WoltModalSheetAnimationStyle animationStyle =
@@ -410,8 +435,10 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
         paginationAnimationStyle: animationStyle.paginationAnimationStyle,
         pageTransitionState: WoltModalSheetPageTransitionState.outgoing,
         controller: animationController,
-        incomingOffstagedMainContentKey: _incomingOffstagedMainContentKeys[_pageIndex],
-        outgoingOffstagedMainContentKey: _outgoingOffstagedMainContentKeys[_pageIndex],
+        incomingOffstagedMainContentKey:
+            _incomingOffstagedMainContentKeys[_pageIndex],
+        outgoingOffstagedMainContentKey:
+            _outgoingOffstagedMainContentKeys[_pageIndex],
         forwardMove: _isForwardMove,
         sheetWidth: widget.sheetWidth,
         child: ExcludeFocus(
@@ -433,7 +460,8 @@ class _WoltModalSheetAnimatedSwitcherState extends State<WoltModalSheetAnimatedS
         paginationAnimationStyle: animationStyle.paginationAnimationStyle,
         pageTransitionState: WoltModalSheetPageTransitionState.outgoing,
         controller: animationController,
-        child: currentWidgetsToBeOutgoing.navigationToolbarAnimatedBuilder.child,
+        child:
+            currentWidgetsToBeOutgoing.navigationToolbarAnimatedBuilder.child,
       ),
       sabAnimatedBuilder: SabAnimatedBuilder(
         key: animatedBuilderKey,
diff --git a/lib/src/wolt_modal_sheet.dart b/lib/src/wolt_modal_sheet.dart
index 9c420e23..fc725d12 100644
--- a/lib/src/wolt_modal_sheet.dart
+++ b/lib/src/wolt_modal_sheet.dart
@@ -231,7 +231,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   ///   - A `Future` that resolves to the value returned
   static Future<T?> showWithDynamicPath<T>({
     required BuildContext context,
-    required ValueNotifier<WoltModalSheetPageListBuilder> pageListBuilderNotifier,
+    required ValueNotifier<WoltModalSheetPageListBuilder>
+        pageListBuilderNotifier,
     WoltModalTypeBuilder? modalTypeBuilder,
     ValueNotifier<int>? pageIndexNotifier,
     Widget Function(Widget)? decorator,
@@ -253,7 +254,8 @@ class WoltModalSheet<T> extends StatefulWidget {
     double? maxPageHeight,
     Color? modalBarrierColor,
   }) {
-    final NavigatorState navigator = Navigator.of(context, rootNavigator: useRootNavigator);
+    final NavigatorState navigator =
+        Navigator.of(context, rootNavigator: useRootNavigator);
     final themeData = Theme.of(context).extension<WoltModalSheetThemeData>();
     return navigator.push<T>(
       WoltModalSheetRoute<T>(
@@ -300,7 +302,8 @@ class WoltModalSheet<T> extends StatefulWidget {
     if (context is StatefulElement && context.state is WoltModalSheetState) {
       woltModalSheetState = context.state as WoltModalSheetState;
     }
-    woltModalSheetState ??= context.findAncestorStateOfType<WoltModalSheetState>();
+    woltModalSheetState ??=
+        context.findAncestorStateOfType<WoltModalSheetState>();
 
     assert(() {
       if (woltModalSheetState == null) {
@@ -326,7 +329,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   ///
   /// Returns:
   /// None.
-  static void replaceCurrentPage(BuildContext context, SliverWoltModalSheetPage newPage) {
+  static void replaceCurrentPage(
+      BuildContext context, SliverWoltModalSheetPage newPage) {
     WoltModalSheet.of(context).replaceCurrentPage(newPage);
   }
 
@@ -356,7 +360,8 @@ class WoltModalSheet<T> extends StatefulWidget {
     List<SliverWoltModalSheetPage> newPages, {
     int? selectedPageIndex,
   }) {
-    WoltModalSheet.of(context).replaceAllPages(newPages, selectedPageIndex: selectedPageIndex);
+    WoltModalSheet.of(context)
+        .replaceAllPages(newPages, selectedPageIndex: selectedPageIndex);
   }
 
   /// Adds one or more new pages to the modal sheet stack without making them the current view.
@@ -367,7 +372,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   ///
   /// Parameters:
   /// - [pages]: The List of [SliverWoltModalSheetPage] to be added to the stack. Can also be a single page.
-  static void addPages(BuildContext context, List<SliverWoltModalSheetPage> pages) {
+  static void addPages(
+      BuildContext context, List<SliverWoltModalSheetPage> pages) {
     WoltModalSheet.of(context).addPages(pages);
   }
 
@@ -396,7 +402,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   ///
   /// Returns:
   /// None.
-  static void addOrReplacePages(BuildContext context, List<SliverWoltModalSheetPage> pages) {
+  static void addOrReplacePages(
+      BuildContext context, List<SliverWoltModalSheetPage> pages) {
     return WoltModalSheet.of(context).addOrReplacePages(pages);
   }
 
@@ -407,7 +414,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   ///
   /// Returns:
   /// None.
-  static void addOrReplacePage(BuildContext context, SliverWoltModalSheetPage page) {
+  static void addOrReplacePage(
+      BuildContext context, SliverWoltModalSheetPage page) {
     return addOrReplacePages(context, [page]);
   }
 
@@ -426,7 +434,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   ///
   /// Returns:
   /// None.
-  static void pushPages(BuildContext context, List<SliverWoltModalSheetPage> pages) {
+  static void pushPages(
+      BuildContext context, List<SliverWoltModalSheetPage> pages) {
     return WoltModalSheet.of(context).pushPages(pages);
   }
 
@@ -516,7 +525,8 @@ class WoltModalSheet<T> extends StatefulWidget {
   /// Returns:
   /// - [bool]: Returns `true` if replacing  page was successful, `false` if no page with the
   /// specified [id] is found.
-  static bool replacePage(BuildContext context, Object id, SliverWoltModalSheetPage page) {
+  static bool replacePage(
+      BuildContext context, Object id, SliverWoltModalSheetPage page) {
     return WoltModalSheet.of(context).replacePage(id, page);
   }
 
@@ -586,12 +596,14 @@ class WoltModalSheetState extends State<WoltModalSheet> {
   Widget Function(Widget) get _decorator =>
       widget.decorator ?? (widget) => Builder(builder: (_) => widget);
 
-  bool get _dismissUnderway => widget.animationController!.status == AnimationStatus.reverse;
+  bool get _dismissUnderway =>
+      widget.animationController!.status == AnimationStatus.reverse;
 
   final GlobalKey _childKey = GlobalKey(debugLabel: 'BottomSheet child');
 
   double get _childHeight {
-    final RenderBox renderBox = _childKey.currentContext!.findRenderObject()! as RenderBox;
+    final RenderBox renderBox =
+        _childKey.currentContext!.findRenderObject()! as RenderBox;
     return renderBox.size.height;
   }
 
@@ -613,7 +625,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
       // set in a declarative way using the WoltModalSheetRoute.
       setState(() {
         final pages = widget.pageListBuilderNotifier.value(context);
-        assert(pages.isNotEmpty, 'pageListBuilder must return a non-empty list.');
+        assert(
+            pages.isNotEmpty, 'pageListBuilder must return a non-empty list.');
         _pages
           ..clear()
           ..addAll(pages);
@@ -628,7 +641,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
     if (_pages.isEmpty) {
       // Get the initial page list from the initially provided pageListBuilder.
       final initialPages = widget.pageListBuilderNotifier.value(context);
-      assert(initialPages.isNotEmpty, 'pageListBuilder must return a non-empty list.');
+      assert(initialPages.isNotEmpty,
+          'pageListBuilder must return a non-empty list.');
       _pages = initialPages;
     }
   }
@@ -649,7 +663,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
           late ShapeBorder shape;
           switch (_modalType) {
             case WoltModalType.bottomSheet:
-              shape = themeData?.bottomSheetShape ?? defaultThemeData.bottomSheetShape;
+              shape = themeData?.bottomSheetShape ??
+                  defaultThemeData.bottomSheetShape;
               break;
             case WoltModalType.dialog:
               shape = themeData?.dialogShape ?? defaultThemeData.dialogShape;
@@ -661,24 +676,33 @@ class WoltModalSheetState extends State<WoltModalSheet> {
                   themeData?.enableDrag ??
                   defaultThemeData.enableDrag);
           final showDragHandle = widget.showDragHandle ??
-              (enableDrag && (themeData?.showDragHandle ?? defaultThemeData.showDragHandle));
+              (enableDrag &&
+                  (themeData?.showDragHandle ??
+                      defaultThemeData.showDragHandle));
           final pageBackgroundColor = page.backgroundColor ??
               themeData?.backgroundColor ??
               defaultThemeData.backgroundColor;
-          final minPageHeight =
-              widget.minPageHeight ?? themeData?.minPageHeight ?? defaultThemeData.minPageHeight;
-          final maxPageHeight =
-              widget.maxPageHeight ?? themeData?.maxPageHeight ?? defaultThemeData.maxPageHeight;
-          final minDialogWidth =
-              widget.minDialogWidth ?? themeData?.minDialogWidth ?? defaultThemeData.minDialogWidth;
-          final maxDialogWidth =
-              widget.maxDialogWidth ?? themeData?.maxDialogWidth ?? defaultThemeData.maxDialogWidth;
-          final shadowColor = themeData?.shadowColor ?? defaultThemeData.shadowColor;
+          final minPageHeight = widget.minPageHeight ??
+              themeData?.minPageHeight ??
+              defaultThemeData.minPageHeight;
+          final maxPageHeight = widget.maxPageHeight ??
+              themeData?.maxPageHeight ??
+              defaultThemeData.maxPageHeight;
+          final minDialogWidth = widget.minDialogWidth ??
+              themeData?.minDialogWidth ??
+              defaultThemeData.minDialogWidth;
+          final maxDialogWidth = widget.maxDialogWidth ??
+              themeData?.maxDialogWidth ??
+              defaultThemeData.maxDialogWidth;
+          final shadowColor =
+              themeData?.shadowColor ?? defaultThemeData.shadowColor;
           final surfaceTintColor = page.surfaceTintColor ??
               themeData?.surfaceTintColor ??
               defaultThemeData.surfaceTintColor;
-          final modalElevation = themeData?.modalElevation ?? defaultThemeData.modalElevation;
-          final clipBehavior = themeData?.clipBehavior ?? defaultThemeData.clipBehavior;
+          final modalElevation =
+              themeData?.modalElevation ?? defaultThemeData.modalElevation;
+          final clipBehavior =
+              themeData?.clipBehavior ?? defaultThemeData.clipBehavior;
           final resizeToAvoidBottomInset = page.resizeToAvoidBottomInset ??
               themeData?.resizeToAvoidBottomInset ??
               defaultThemeData.resizeToAvoidBottomInset;
@@ -701,7 +725,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
                   behavior: HitTestBehavior.opaque,
                   onTap: () {
                     if (widget.route.barrierDismissible) {
-                      final onModalDismissedWithBarrierTap = widget.onModalDismissedWithBarrierTap;
+                      final onModalDismissedWithBarrierTap =
+                          widget.onModalDismissedWithBarrierTap;
                       if (onModalDismissedWithBarrierTap != null) {
                         onModalDismissedWithBarrierTap();
                       } else {
@@ -721,7 +746,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
                     child: GestureDetector(
                       excludeFromSemantics: true,
                       onVerticalDragStart: enableDrag ? _handleDragStart : null,
-                      onVerticalDragUpdate: enableDrag ? _handleDragUpdate : null,
+                      onVerticalDragUpdate:
+                          enableDrag ? _handleDragUpdate : null,
                       onVerticalDragEnd: enableDrag ? _handleDragEnd : null,
                       child: Material(
                         color: pageBackgroundColor,
@@ -795,7 +821,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
     }
     bool isClosing = false;
     if (details.velocity.pixelsPerSecond.dy > _minFlingVelocity) {
-      final double flingVelocity = -details.velocity.pixelsPerSecond.dy / _childHeight;
+      final double flingVelocity =
+          -details.velocity.pixelsPerSecond.dy / _childHeight;
       if (widget.animationController!.value > 0.0) {
         widget.animationController!.fling(velocity: flingVelocity);
       }
@@ -870,7 +897,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
       _pages = List<SliverWoltModalSheetPage>.from(_pages)..addAll(pages);
     } else {
       // Replace all pages beyond the current one with new pages.
-      _pages = List<SliverWoltModalSheetPage>.from(_pages.take(_currentPageIndex + 1))
+      _pages = List<SliverWoltModalSheetPage>.from(
+          _pages.take(_currentPageIndex + 1))
         ..addAll(pages);
     }
   }
@@ -1039,7 +1067,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
     if (indexToStopRemoving == -1 || indexToStopRemoving == _currentPageIndex) {
       return false;
     }
-    final sublist = List<SliverWoltModalSheetPage>.from(_pages).sublist(0, indexToStopRemoving + 1);
+    final sublist = List<SliverWoltModalSheetPage>.from(_pages)
+        .sublist(0, indexToStopRemoving + 1);
     _pages = sublist;
     // Update the indexToStopRemoving if the removed page is before the current page.
     if (indexToStopRemoving < _currentPageIndex) {
@@ -1118,7 +1147,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
   ///
   /// Returns:
   ///   This method does not return a value.
-  void replaceAllPages(List<SliverWoltModalSheetPage> newPages, {int? selectedPageIndex}) {
+  void replaceAllPages(List<SliverWoltModalSheetPage> newPages,
+      {int? selectedPageIndex}) {
     if (newPages.isEmpty) {
       throw ArgumentError('newPages must not be empty.');
     }
@@ -1126,7 +1156,8 @@ class WoltModalSheetState extends State<WoltModalSheet> {
     // Make sure selectedPageIndex is within the bounds of the new list.
     if (selectedPageIndex != null &&
         (selectedPageIndex >= newPages.length || selectedPageIndex < 0)) {
-      throw ArgumentError('selectedPageIndex must be within the bounds of the newPages list.');
+      throw ArgumentError(
+          'selectedPageIndex must be within the bounds of the newPages list.');
     }
 
     setState(() {