Merge pull request #204 from Tlaster/bugfix/group_route_path

disable path matching for group route
Tlaster · Dec 4, 2023 · 15dfc8e · 15dfc8e
2 parents 3a3f55d + 60bf060
commit 15dfc8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/docs/component/navigation.md b/docs/component/navigation.md
@@ -109,6 +109,7 @@ Optional syntax is also supported for regex path variable: `/user/{id:[0-9]+}?`:
  - matches `/user/123`
 
 ### Group
+Note: group's `route` and `initialRoute` does not support path variable and regex, only static route is supported. 
 ```kotlin
 group(route = "/group", initialRoute = "/nestedScreen1") {
     scene(route = "/nestedScreen1") {

diff --git a/precompose/src/commonMain/kotlin/moe/tlaster/precompose/navigation/RouteBuilder.kt b/precompose/src/commonMain/kotlin/moe/tlaster/precompose/navigation/RouteBuilder.kt
@@ -67,6 +67,8 @@ class RouteBuilder(
         initialRoute: String,
         content: RouteBuilder.() -> Unit,
     ) {
+        require(!route.contains("{")) { "GroupRoute does not support path matching" }
+        require(!initialRoute.contains("{")) { "GroupRoute does not support path matching" }
         content.invoke(this)
         val actualInitialRoute = this.route.firstOrNull { it.route == initialRoute }
             ?: throw IllegalArgumentException("Initial route $initialRoute not found")