Skip to content

Commit 533f80a

Browse files
committed
Trim location
1 parent 5f8017f commit 533f80a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lib/src/controller/information_provider.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ abstract base class OctopusInformationProvider extends RouteInformationProvider
4949
);
5050

5151
static RouteInformation initialRouteInformation() {
52-
final platformDefault =
53-
WidgetsBinding.instance.platformDispatcher.defaultRouteName;
52+
var platformDefault =
53+
WidgetsBinding.instance.platformDispatcher.defaultRouteName.trim();
54+
if (platformDefault.isEmpty || !platformDefault.startsWith('/'))
55+
platformDefault = '/$platformDefault';
5456
Uri? uri;
55-
if (platformDefault == '/' || platformDefault == '') {
57+
if (platformDefault == '/') {
5658
uri = Uri();
5759
} else {
5860
uri = Uri.tryParse(platformDefault);

lib/src/state/state.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ sealed class OctopusState extends OctopusNodeBase {
155155
/// {@macro octopus_state}
156156
@factory
157157
static OctopusState$Mutable fromLocation(String location) =>
158-
StateUtil.decodeLocation(location);
158+
StateUtil.decodeLocation(location.trim());
159159

160160
/// Create state from [Uri]
161161
///
162162
/// {@macro octopus_state}
163163
@factory
164164
static OctopusState$Mutable fromUri(Uri uri) =>
165-
StateUtil.decodeLocation(uri.toString());
165+
StateUtil.decodeLocation(uri.toString().trim());
166166

167167
/// Create state from list of nodes
168168
///

0 commit comments

Comments
 (0)