@symbo.ls/router 2.12.62 → 2.12.65

package/index.js

@@ -3,11 +3,11 @@
 import { setCookie } from '@domql/cookie'
 import { redirectBasedOnAuth } from '@symbo.ls/auth-redirect'
 import { isModalRoute } from '@symbo.ls/platform-utils'
-import { deepMerge } from '@domql/utils'
+import { merge } from '@domql/utils'
 
-export const getActiveRoute = (level = 0, route = window.location.pathname) => {
+export const getLocationPath = (index = 0, route = window.location.pathname) => {
   const routeArray = route.split('/')
-  const activeRoute = routeArray[level + 1]
+  const activeRoute = routeArray[index + 1]
   if (activeRoute) return `/${activeRoute}`
 }
 
@@ -47,11 +47,11 @@ export const router = (
   state = {},
   passedOptions = {}
 ) => {
-  const options = deepMerge(passedOptions, defaultOptions)
+  const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
 
   const [pathname, hash] = path.split('#')
-  const rootRoute = getActiveRoute(0, path)
+  const rootRoute = getLocationPath(0, path)
   let routeArray = pathname.split('/')
 
   if (options.authCheck) {
@@ -96,12 +96,6 @@ export const router = (
       })
     }
 
-    if (!isModal && element.Modal) {
-      element.Modal.removeContent()
-    } else if (isModal && element.content?.Tabs) {
-      element.content.Tabs.update()
-    }
-
     if (hasSet) {
       if (options.forceContentUpdate || (!isInitial && wasModal)) {
         element.content.update()
@@ -116,6 +110,12 @@ export const router = (
         })
       }
     }
+
+    if (!isModal && element.Modal.content) {
+      element.Modal.removeContent()
+    } else if (isModal && element.content?.Tabs) {
+      element.content.Tabs.update()
+    }
   }
 
   const rootNode = element.node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.12.62",
+  "version": "2.12.65",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "c4a5ed5b900cf83573a4b15c5c86dc4a568fd589",
+  "gitHead": "6590c42ef1d9670bc29e76efc22962abf4c49196",
   "source": "index.js"
 }