Fix BrowserRouter for WasmJs target by simplifying expect/actual func… (

#415) Fix BrowserRouter for WasmJs target by simplifying expect/actual functions (cherry picked from commit 9e3a4c7) Co-authored-by: Robert Jaros <[email protected]>
hfhbd · Oct 27, 2024 · 973728b · 973728b
1 parent 8ba33a2
commit 973728b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/jsMain/kotlin/app/softwork/routingcompose/browserApi.js.kt b/src/jsMain/kotlin/app/softwork/routingcompose/browserApi.js.kt
@@ -3,8 +3,8 @@ package app.softwork.routingcompose
 internal actual typealias Window = org.w3c.dom.Window
 
 internal actual typealias History = org.w3c.dom.History
-internal actual fun History.pushState(data: Any?, title: String, url: String?) {
-    this.pushState(data, title, url)
+internal actual fun History.pushState(title: String, url: String?) {
+    this.pushState(null, title, url)
 }
 
 internal actual typealias Location = org.w3c.dom.Location

diff --git a/src/jsSharedMain/kotlin/app/softwork/routingcompose/BrowserRouter.kt b/src/jsSharedMain/kotlin/app/softwork/routingcompose/BrowserRouter.kt
@@ -39,7 +39,6 @@ internal class BrowserRouter : Router {
             currentLocation.value = window.location.newPath().takeUnless { it == "/" } ?: initPath
             window.onpopstate = {
                 currentLocation.value = window.location.newPath()
-                Unit
             }
         }
         return currentLocation
@@ -51,7 +50,7 @@ internal class BrowserRouter : Router {
         if (hide) {
             currentLocation.value = to
         } else {
-            window.history.pushState(null, "", to)
+            window.history.pushState("", to)
             /*
              The history API unfortunately provides no callback to listen to
              [window.history.pushState], so we need to notify subscribers when pushing a new path.

diff --git a/src/jsSharedMain/kotlin/app/softwork/routingcompose/HashRouter.kt b/src/jsSharedMain/kotlin/app/softwork/routingcompose/HashRouter.kt
@@ -28,7 +28,6 @@ internal class HashRouter : Router {
             currentHash.value = window.location.hash.currentURL() ?: initPath
             window.onhashchange = {
                 currentHash.value = window.location.hash.currentURL() ?: ""
-                Unit
             }
         }
         return currentHash

diff --git a/src/jsSharedMain/kotlin/app/softwork/routingcompose/browserApi.kt b/src/jsSharedMain/kotlin/app/softwork/routingcompose/browserApi.kt
@@ -10,7 +10,7 @@ internal expect var Window.onpopstate: () -> Unit
 internal expect var Window.onhashchange: () -> Unit
 
 internal expect abstract class History
-internal expect fun History.pushState(data: Any?, title: String, url: String?)
+internal expect fun History.pushState(title: String, url: String?)
 
 internal expect abstract class Location {
     var pathname: String

diff --git a/src/wasmJsMain/kotlin/app/softwork/routingcompose/browserApi.wasm.kt b/src/wasmJsMain/kotlin/app/softwork/routingcompose/browserApi.wasm.kt
@@ -4,8 +4,8 @@ internal actual typealias Window = org.w3c.dom.Window
 
 internal actual typealias History = org.w3c.dom.History
 
-internal actual fun History.pushState(data: Any?, title: String, url: String?) {
-    this.pushState(data, title, url)
+internal actual fun History.pushState(title: String, url: String?) {
+    this.pushState(null, title, url)
 }
 
 internal actual typealias Location = org.w3c.dom.Location