firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace dynamic by Object/Object? in router.dart (#80476)

Browse Source
This commit is contained in:
Amine Dakhli 2021-04-17 01:24:04 +01:00 committed by GitHub
parent aa7ab10822
commit aa9f6a2a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/flutter/lib/src/widgets/router.dart
View File

@ -306,7 +306,7 @@ class Router<T> extends StatefulWidget {
/// ///
/// * [maybeOf], which is a similar function, but it will return null instead /// * [maybeOf], which is a similar function, but it will return null instead
/// of throwing an exception if no [Router] ancestor exists. /// of throwing an exception if no [Router] ancestor exists.
static Router<dynamic> of(BuildContext context) { static Router<T> of<T extends Object?>(BuildContext context) {
final _RouterScope? scope = context.dependOnInheritedWidgetOfExactType<_RouterScope>(); final _RouterScope? scope = context.dependOnInheritedWidgetOfExactType<_RouterScope>();
assert(() { assert(() {
if (scope == null) { if (scope == null) {
@ -318,7 +318,7 @@ class Router<T> extends StatefulWidget {
} }
return true; return true;
}()); }());
return scope!.routerState.widget; return scope!.routerState.widget as Router<T>;
} }
/// Retrieves the immediate [Router] ancestor from the given context. /// Retrieves the immediate [Router] ancestor from the given context.
@ -334,9 +334,9 @@ class Router<T> extends StatefulWidget {
/// ///
/// * [of], a similar method that returns a non-nullable value, and will /// * [of], a similar method that returns a non-nullable value, and will
/// throw if no [Router] ancestor exists. /// throw if no [Router] ancestor exists.
static Router<dynamic>? maybeOf(BuildContext context) { static Router<T>? maybeOf<T extends Object?>(BuildContext context) {
final _RouterScope? scope = context.dependOnInheritedWidgetOfExactType<_RouterScope>(); final _RouterScope? scope = context.dependOnInheritedWidgetOfExactType<_RouterScope>();
return scope?.routerState.widget; return scope?.routerState.widget as Router<T>?;
} }
/// Forces the [Router] to run the [callback] and reports the route /// Forces the [Router] to run the [callback] and reports the route
@ -704,9 +704,9 @@ class _RouterScope extends InheritedWidget {
final ValueListenable<RouteInformation?>? routeInformationProvider; final ValueListenable<RouteInformation?>? routeInformationProvider;
final BackButtonDispatcher? backButtonDispatcher; final BackButtonDispatcher? backButtonDispatcher;
final RouteInformationParser<dynamic>? routeInformationParser; final RouteInformationParser<Object?>? routeInformationParser;
final RouterDelegate<dynamic> routerDelegate; final RouterDelegate<Object?> routerDelegate;
final _RouterState<dynamic> routerState; final _RouterState<Object?> routerState;
@override @override
bool updateShouldNotify(_RouterScope oldWidget) { bool updateShouldNotify(_RouterScope oldWidget) {