diff --git a/example/lib/app.dart b/example/lib/app.dart
index 5d05d28..fa71c6b 100644
--- a/example/lib/app.dart
+++ b/example/lib/app.dart
@@ -6,7 +6,7 @@ import 'package:mono_kit/mono_kit.dart';
 import 'router/router.dart';
 
 class App extends ConsumerWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
   static const title = 'adaptive_dialog Demo';
 
   @override
@@ -16,9 +16,7 @@ class App extends ConsumerWidget {
       title: title,
       theme: lightTheme(),
       darkTheme: darkTheme(),
-      routeInformationParser: router.routeInformationParser,
-      routerDelegate: router.routerDelegate,
-      routeInformationProvider: router.routeInformationProvider,
+      routerConfig: ref.watch(routerProvider),
       localizationsDelegates: const [
         GlobalMaterialLocalizations.delegate,
         GlobalWidgetsLocalizations.delegate,
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 3f6caaf..f5d981d 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,13 +1,13 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
 
 import 'app.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
-  GoRouter.setUrlPathStrategy(UrlPathStrategy.path);
+  setUrlStrategy(PathUrlStrategy());
   AdaptiveDialog.instance.updateConfiguration(
     macOS: AdaptiveDialogMacOSConfiguration(
       applicationIcon: ClipRRect(
diff --git a/example/lib/pages/alert_page.dart b/example/lib/pages/alert_page.dart
index 8cd4286..ccbe76c 100644
--- a/example/lib/pages/alert_page.dart
+++ b/example/lib/pages/alert_page.dart
@@ -7,11 +7,11 @@ import 'package:go_router/go_router.dart';
 class AlertRoute extends GoRouteData {
   const AlertRoute();
   @override
-  Widget build(BuildContext context) => const AlertPage();
+  Widget build(BuildContext context, GoRouterState state) => const AlertPage();
 }
 
 class AlertPage extends StatelessWidget {
-  const AlertPage({Key? key}) : super(key: key);
+  const AlertPage({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -99,7 +99,9 @@ class AlertPage extends StatelessWidget {
                 builder: (context, child) => Theme(
                   data: ThemeData(
                     textButtonTheme: TextButtonThemeData(
-                      style: TextButton.styleFrom(primary: Colors.orange),
+                      style: TextButton.styleFrom(
+                        foregroundColor: Colors.orange,
+                      ),
                     ),
                   ),
                   child: child,
diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart
index 45d67e3..26f18c8 100644
--- a/example/lib/pages/home_page.dart
+++ b/example/lib/pages/home_page.dart
@@ -7,7 +7,7 @@ import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class HomePage extends StatelessWidget {
-  const HomePage({Key? key}) : super(key: key);
+  const HomePage({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -54,7 +54,7 @@ class HomePage extends StatelessWidget {
 }
 
 class _StyleDropdownButton extends ConsumerWidget {
-  const _StyleDropdownButton({Key? key}) : super(key: key);
+  const _StyleDropdownButton();
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return Card(
diff --git a/example/lib/pages/nested_navigator_page.dart b/example/lib/pages/nested_navigator_page.dart
index 693c5f3..c8179f7 100644
--- a/example/lib/pages/nested_navigator_page.dart
+++ b/example/lib/pages/nested_navigator_page.dart
@@ -6,11 +6,12 @@ import 'package:go_router/go_router.dart';
 class NestedNavigatorRoute extends GoRouteData {
   const NestedNavigatorRoute();
   @override
-  Widget build(BuildContext context) => const NestedNavigatorPage();
+  Widget build(BuildContext context, GoRouterState state) =>
+      const NestedNavigatorPage();
 }
 
 class NestedNavigatorPage extends StatelessWidget {
-  const NestedNavigatorPage({Key? key}) : super(key: key);
+  const NestedNavigatorPage({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -23,7 +24,7 @@ class NestedNavigatorPage extends StatelessWidget {
 }
 
 class _RootPage extends StatelessWidget {
-  const _RootPage({Key? key}) : super(key: key);
+  const _RootPage();
   @override
   Widget build(BuildContext context) {
     return Scaffold(
diff --git a/example/lib/pages/sheet_page.dart b/example/lib/pages/sheet_page.dart
index d0e51d8..f61d9bb 100644
--- a/example/lib/pages/sheet_page.dart
+++ b/example/lib/pages/sheet_page.dart
@@ -8,11 +8,11 @@ import 'package:go_router/go_router.dart';
 class SheetRoute extends GoRouteData {
   const SheetRoute();
   @override
-  Widget build(BuildContext context) => const SheetPage();
+  Widget build(BuildContext context, GoRouterState state) => const SheetPage();
 }
 
 class SheetPage extends StatelessWidget {
-  const SheetPage({Key? key}) : super(key: key);
+  const SheetPage({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/example/lib/pages/text_input_dialog_page.dart b/example/lib/pages/text_input_dialog_page.dart
index 973665a..95c114f 100644
--- a/example/lib/pages/text_input_dialog_page.dart
+++ b/example/lib/pages/text_input_dialog_page.dart
@@ -9,11 +9,12 @@ import 'package:go_router/go_router.dart';
 class TextInputDialogRoute extends GoRouteData {
   const TextInputDialogRoute();
   @override
-  Widget build(BuildContext context) => const TextInputDialogPage();
+  Widget build(BuildContext context, GoRouterState state) =>
+      const TextInputDialogPage();
 }
 
 class TextInputDialogPage extends ConsumerWidget {
-  const TextInputDialogPage({Key? key}) : super(key: key);
+  const TextInputDialogPage({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
diff --git a/example/lib/router/router.dart b/example/lib/router/router.dart
index 4d79c5e..fbe9fb2 100644
--- a/example/lib/router/router.dart
+++ b/example/lib/router/router.dart
@@ -31,7 +31,7 @@ final routerProvider = Provider(
 class HomeRoute extends GoRouteData {
   const HomeRoute();
   @override
-  Widget build(BuildContext context) => const HomePage();
+  Widget build(BuildContext context, GoRouterState state) => const HomePage();
 }
 
 String pascalCaseFromRouteName(String name) => name.pascalCase;
diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock
index f8856a8..8331dea 100644
--- a/example/macos/Podfile.lock
+++ b/example/macos/Podfile.lock
@@ -25,7 +25,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   dynamic_color: 394d6a888650f8534e029b27d2f8bc5c64e44008
-  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
+  FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
   macos_ui: 125c911559d646194386d84c017ad6819122e2db
   url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
 
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 71a7141..c49d4cd 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "43.0.0"
+    version: "50.0.0"
   adaptive_dialog:
     dependency: "direct main"
     description:
@@ -21,14 +21,14 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.1"
+    version: "5.2.0"
   animations:
     dependency: transitive
     description:
       name: animations
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.7"
   args:
     dependency: transitive
     description:
@@ -56,14 +56,14 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
@@ -77,21 +77,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "2.1.0"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.3"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.2.3"
+    version: "7.2.7"
   built_collection:
     dependency: transitive
     description:
@@ -105,7 +105,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.4.0"
+    version: "8.4.2"
   characters:
     dependency: transitive
     description:
@@ -133,7 +133,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.0"
+    version: "4.4.0"
   collection:
     dependency: transitive
     description:
@@ -147,14 +147,14 @@ packages:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.1"
   cross_file:
     dependency: transitive
     description:
       name: cross_file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3+1"
+    version: "0.3.3+2"
   crypto:
     dependency: transitive
     description:
@@ -168,7 +168,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.4"
   disposable_provider:
     dependency: transitive
     description:
@@ -182,7 +182,7 @@ packages:
       name: dynamic_color
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.4"
   fake_async:
     dependency: transitive
     description:
@@ -196,7 +196,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   fixnum:
     dependency: transitive
     description:
@@ -234,21 +234,21 @@ packages:
       name: flutter_riverpod
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "2.1.1"
   flutter_svg:
     dependency: transitive
     description:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1+1"
+    version: "1.1.6"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
   flutter_web_plugins:
-    dependency: transitive
+    dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
@@ -258,49 +258,49 @@ packages:
       name: freezed_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "3.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   go_router:
     dependency: "direct main"
     description:
       name: go_router
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.2"
+    version: "6.0.0"
   go_router_builder:
     dependency: "direct dev"
     description:
       name: go_router_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.7"
+    version: "1.0.15"
   graphs:
     dependency: transitive
     description:
       name: graphs
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.4"
+    version: "0.13.5"
   http_multi_server:
     dependency: transitive
     description:
@@ -314,42 +314,42 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   image_picker:
     dependency: transitive
     description:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5+3"
+    version: "0.8.6"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5+1"
+    version: "0.8.5+4"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.8"
+    version: "2.1.10"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5+6"
+    version: "0.8.6+3"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.2"
   intersperse:
     dependency: transitive
     description:
@@ -384,35 +384,28 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.6.0"
-  lint:
-    dependency: transitive
-    description:
-      name: lint
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.10.0"
+    version: "4.7.0"
   lints:
     dependency: transitive
     description:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   macos_ui:
     dependency: "direct main"
     description:
       name: macos_ui
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.1"
+    version: "1.7.5"
   matcher:
     dependency: transitive
     description:
@@ -440,14 +433,14 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   mono_kit:
     dependency: "direct main"
     description:
       name: mono_kit
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.4"
+    version: "0.32.1"
   nested:
     dependency: transitive
     description:
@@ -475,14 +468,14 @@ packages:
       name: path_drawing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   path_to_regexp:
     dependency: transitive
     description:
@@ -496,14 +489,14 @@ packages:
       name: pedantic_mono
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.19.2"
+    version: "1.20.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
   pigment:
     dependency: transitive
     description:
@@ -517,7 +510,7 @@ packages:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   pool:
     dependency: transitive
     description:
@@ -531,70 +524,70 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.3"
+    version: "6.0.5"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.1"
   recase:
     dependency: "direct main"
     description:
       name: recase
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   riverpod:
     dependency: transitive
     description:
       name: riverpod
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "2.1.1"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.5"
+    version: "0.27.7"
   shelf:
     dependency: transitive
     description:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   simple_logger:
     dependency: "direct main"
     description:
       name: simple_logger
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.0+1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -606,14 +599,14 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -648,7 +641,7 @@ packages:
       name: stream_transform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
@@ -690,7 +683,7 @@ packages:
       name: tinycolor2
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.1"
   typed_data:
     dependency: transitive
     description:
@@ -704,14 +697,14 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.7"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.17"
+    version: "6.0.22"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -739,14 +732,14 @@ packages:
       name: url_launcher_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -767,7 +760,7 @@ packages:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   web_socket_channel:
     dependency: transitive
     description:
@@ -790,5 +783,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=2.18.0 <3.0.0"
+  flutter: ">=3.3.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 7567085..762193e 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -2,7 +2,7 @@ name: example
 description: Example application.
 version: 1.0.0+1
 environment:
-  sdk: '>=2.16.0 <3.0.0'
+  sdk: '>=2.18.0'
 dependencies:
   adaptive_dialog:
   flutter:
@@ -10,6 +10,8 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_riverpod:
+  flutter_web_plugins:
+    sdk: flutter
   go_router:
   macos_ui:
   mono_kit:
diff --git a/lib/src/text_input_dialog/ios_text_input_dialog.dart b/lib/src/text_input_dialog/ios_text_input_dialog.dart
index fac5475..21c4dc3 100644
--- a/lib/src/text_input_dialog/ios_text_input_dialog.dart
+++ b/lib/src/text_input_dialog/ios_text_input_dialog.dart
@@ -79,7 +79,7 @@ class _IOSTextInputDialogState extends State<IOSTextInputDialog> {
     }
 
     void cancel() => navigator.pop();
-    BoxDecoration _borderDecoration({
+    BoxDecoration borderDecoration({
       required bool isTopRounded,
       required bool isBottomRounded,
     }) {
@@ -138,7 +138,7 @@ class _IOSTextInputDialogState extends State<IOSTextInputDialog> {
                   autocorrect: field.autocorrect,
                   prefix: prefixText == null ? null : Text(prefixText),
                   suffix: suffixText == null ? null : Text(suffixText),
-                  decoration: _borderDecoration(
+                  decoration: borderDecoration(
                     isTopRounded: i == 0,
                     isBottomRounded: i == _textControllers.length - 1,
                   ),