@symbo.ls/router 2.12.89 → 2.12.94

package/index.js

@@ -52,7 +52,9 @@ export const router = (
   const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
 
-  const [pathname, hash] = path.split('#')
+  const urlObj = new options.window.URL(options.window.location.origin + path)
+  const { pathname, search, hash } = urlObj
+
   const rootRoute = getLocationPath(0, path)
   let routeArray = pathname.split('/')
 
@@ -73,7 +75,7 @@ export const router = (
 
   const wasModal = isModalRoute(options.window.location.pathname.split('#')[0], element)
   const isInitial = options.initialRender
-  const hashChanged = hash && hash !== options.window.location.hash.slice(1)
+  const hashChanged = hash && hash !== options.window.location.hash
   const pathChanged = pathname !== lastPathname
   lastPathname = pathname
 
@@ -81,7 +83,7 @@ export const router = (
   if (options.pushState) {
     options.window.history.pushState({
       prevUrl: options.window.location.href, ...state
-    }, null, route + (hash ? `#${hash}` : ''))
+    }, null, route + (search ? `${search}` : '') + (hash ? `${hash}` : ''))
   }
 
   const isModal = !!isModalRoute(pathname, element)
@@ -93,6 +95,7 @@ export const router = (
     if (options.updateState) {
       element.state.update({ route, hash, routeInContent, debugging: false }, {
         preventUpdate: options.preventUpdate,
+        updateByRouter: true,
         ...options.updateStateOptions
       })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.12.89",
+  "version": "2.12.94",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "139bed3c8f506cf74bbaf4753aadd7ab4daa3c9a",
+  "gitHead": "e09e8a3656bcb86dcd9965b7eb0a484c976fc8ec",
   "source": "index.js"
 }