Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion lib/src/entities/route_entity.dart
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,14 @@ class RouteEntity {

if (segment.contains('[')) {
final key = segment.replaceFirst('[', '').replaceFirst(']', '');
final value = num.tryParse(segmentCandidate) ?? segmentCandidate;

final isCandidateNumeric =
RegExp(r'^-?\d+(\.\d+)?$').hasMatch(segmentCandidate);

final value = isCandidateNumeric
? num.tryParse(segmentCandidate) ?? segmentCandidate
: segmentCandidate;

params[key] = value;
continue;
}
Expand Down
7 changes: 6 additions & 1 deletion lib/src/navigation/router_delegate.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ class RouteflyRouterDelegate extends RouterDelegate<RouteEntity> //
final page = route.settings as RouteflyPage;
page.entity.popCallback?.call(result);
configurations.removeWhere((e) => e.page.key == page.key);

if (configurations.last.type != RouteType.push) {
setNewRoutePath(configurations.last);
}

notifyListeners();

return true;
Expand All @@ -90,7 +95,7 @@ class RouteflyRouterDelegate extends RouterDelegate<RouteEntity> //
configurations = _across(routes);
currentConfiguration = configuration;
} else if (configuration.type == RouteType.pushNavigate) {
final acrossRoutes = _across(routes);
final acrossRoutes = _across(routes).where((e) => e.uri.path != '/');
configurations.removeWhere(acrossRoutes.contains);
configurations.addAll(acrossRoutes);
currentConfiguration = configuration;
Expand Down
16 changes: 16 additions & 0 deletions test/src/entities/route_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,20 @@ void main() {

expect(newRoute?.params, {'id': 1, 'key': 'text'});
});

test('When adding new info, it should not parse hex params into numeric', () {
const hexParam = '0x10';

final route = RouteEntity(
uri: Uri.parse('/user/[id]'),
routeBuilder: routeBuilder,
key: '/user/edit',
);

final newRoute = route.addNewInfo(
Uri.parse('/user/$hexParam'),
);

expect(newRoute?.params, {'id': hexParam});
});
}