setUrlFromNavRoute can be static

square · Jan 24, 2025 · 7f45498 · 7f45498
1 parent e03f5ad
commit 7f45498
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/invert-report/src/jsMain/kotlin/MainComposables.kt b/invert-report/src/jsMain/kotlin/MainComposables.kt
@@ -60,7 +60,7 @@ fun setupNavigation(routeManager: NavRouteManager, navRouteRepo: NavRouteRepo) {
     val javaScriptNavigationAndHistory = JavaScriptNavigationAndHistory(routeManager, navRouteRepo)
     // Update Route on Every Change
     navRouteRepo.navRoute.onEach {
-        javaScriptNavigationAndHistory.setUrlFromNavRoute(it)
+        JavaScriptNavigationAndHistory.setUrlFromNavRoute(it)
     }.launchIn(GlobalScope)
 
     // Register for Browser Back/Forward Button Events

diff --git a/invert-report/src/jsMain/kotlin/history/JavaScriptNavigationAndHistory.kt b/invert-report/src/jsMain/kotlin/history/JavaScriptNavigationAndHistory.kt
@@ -26,6 +26,43 @@ class JavaScriptNavigationAndHistory(
       keysForObject(this).forEach { map[it] = this.get(it) }
       return map
     }
+
+    fun setUrlFromNavRoute(navRoute: NavRoute) {
+      val newUrl = URL(window.location.toString())
+
+      val currUrlParamsMap = mutableMapOf<String, String>().also { urlParamsMap ->
+        keysForObject(newUrl.searchParams).forEach { key ->
+          newUrl.searchParams.get(key)?.let { value ->
+            if (value.isNotBlank()) {
+              urlParamsMap[key] = value
+            }
+          }
+        }
+      }
+
+      val newNavRouteParamsMap = navRoute.toSearchParams()
+      if (currUrlParamsMap != newNavRouteParamsMap) {
+        // Clear current params from Current URL Search Params
+        newUrl.search = ""
+
+        // Populate Search Params with key/values
+        newNavRouteParamsMap.forEach { (key, value) ->
+          if (value.isNotBlank()) {
+            newUrl.searchParams.set(key, value)
+          }
+        }
+
+        // Convert params to JSON
+        val jsonState = InvertJson.encodeToString(HistoryState.serializer(), HistoryState(navRoute.toSearchParams()))
+        val isNewPage =
+          currUrlParamsMap[BaseNavRoute.PAGE_ID_PARAM] != newNavRouteParamsMap[BaseNavRoute.PAGE_ID_PARAM]
+        if (isNewPage) {
+          window.history.pushState(jsonState, "", newUrl.toString())
+        } else {
+          window.history.replaceState(jsonState, "", newUrl.toString())
+        }
+      }
+    }
   }
 
   fun registerForPopstate() {
@@ -51,41 +88,4 @@ class JavaScriptNavigationAndHistory(
       }
     }, false)
   }
-
-  fun setUrlFromNavRoute(navRoute: NavRoute) {
-    val newUrl = URL(window.location.toString())
-
-    val currUrlParamsMap = mutableMapOf<String, String>().also { urlParamsMap ->
-      keysForObject(newUrl.searchParams).forEach { key ->
-        newUrl.searchParams.get(key)?.let { value ->
-          if (value.isNotBlank()) {
-            urlParamsMap[key] = value
-          }
-        }
-      }
-    }
-
-    val newNavRouteParamsMap = navRoute.toSearchParams()
-    if (currUrlParamsMap != newNavRouteParamsMap) {
-      // Clear current params from Current URL Search Params
-      newUrl.search = ""
-
-      // Populate Search Params with key/values
-      newNavRouteParamsMap.forEach { (key, value) ->
-        if (value.isNotBlank()) {
-          newUrl.searchParams.set(key, value)
-        }
-      }
-
-      // Convert params to JSON
-      val jsonState = InvertJson.encodeToString(HistoryState.serializer(), HistoryState(navRoute.toSearchParams()))
-      val isNewPage =
-        currUrlParamsMap[BaseNavRoute.PAGE_ID_PARAM] != newNavRouteParamsMap[BaseNavRoute.PAGE_ID_PARAM]
-      if (isNewPage) {
-        window.history.pushState(jsonState, "", newUrl.toString())
-      } else {
-        window.history.replaceState(jsonState, "", newUrl.toString())
-      }
-    }
-  }
 }