Skip to content

fix(routing): use HybridHistoryDelegate.state() in RouteAware callbacks #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andycall merged 2 commits into from
Feb 14, 2026
Merged

fix(routing): use HybridHistoryDelegate.state() in RouteAware callbacks #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8051e
test(routing): add regression tests for issue #855
CGQAQ Feb 13, 2026
9dbfb76
fix(routing): use HybridHistoryDelegate.state() in RouteAware callbac…
CGQAQ Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion webf/lib/src/module/hybrid_history.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ class HybridHistoryModule extends WebFBaseModule {

HybridHistoryDelegate? _delegate;

set delegate(HybridHistoryDelegate value) {
HybridHistoryDelegate? get delegate => _delegate;

set delegate(HybridHistoryDelegate? value) {
_delegate = value;
}

Expand Down
20 changes: 16 additions & 4 deletions webf/lib/src/widget/router_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ class WebFRouterViewState extends State<WebFRouterView> with RouteAware {
@override
void didPop() {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;

// CRITICAL FIX: Use widget.path instead of route.settings.name for consistency
String path = widget.path;
Expand All @@ -80,7 +83,10 @@ class WebFRouterViewState extends State<WebFRouterView> with RouteAware {
@override
void didPopNext() {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;

// CRITICAL FIX: Use widget.path instead of route.settings.name for consistency
String path = widget.path;
Expand All @@ -95,7 +101,10 @@ class WebFRouterViewState extends State<WebFRouterView> with RouteAware {
@override
void didPush() {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;

// CRITICAL FIX: Use widget.path (the actual route path) instead of route.settings.name
// because go_router's universal catch-all route always returns 'universal-webf-route' as the name
Expand All @@ -113,7 +122,10 @@ class WebFRouterViewState extends State<WebFRouterView> with RouteAware {
@override
void didPushNext() {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;

// CRITICAL FIX: Use widget.path (the actual route path) instead of route.settings.name
// because go_router's universal catch-all route always returns 'universal-webf-route' as the name
Expand Down
20 changes: 16 additions & 4 deletions webf/lib/src/widget/webf.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,10 @@ class WebFState extends State<WebF> with RouteAware {
@override
void didPop() {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;
String path = route.settings.name ?? widget.controller.initialRoute ?? '/';

Event event = HybridRouterChangeEvent(state: state ?? widget.controller.initialState, kind: 'didPop', path: path);
Expand All @@ -502,7 +505,10 @@ class WebFState extends State<WebF> with RouteAware {
@override
void didPopNext() {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;
String path = route.settings.name ?? widget.controller.initialRoute ?? '';

Event event =
Expand All @@ -517,7 +523,10 @@ class WebFState extends State<WebF> with RouteAware {
@override
void didPush() async {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;
String path = route.settings.name ?? widget.controller.initialRoute ?? '';

await widget.controller.controlledInitCompleter.future;
Expand All @@ -538,7 +547,10 @@ class WebFState extends State<WebF> with RouteAware {
@override
void didPushNext() async {
ModalRoute route = ModalRoute.of(context)!;
var state = route.settings.arguments;
final delegate = widget.controller.hybridHistory.delegate;
final state = delegate != null
? delegate.state(context, null)
: route.settings.arguments;
String path = route.settings.name ?? widget.controller.initialRoute ?? '';

await widget.controller.controlledInitCompleter.future;
Expand Down
Loading
Loading