@symbo.ls/router 2.12.64 → 2.12.66

package/index.js

@@ -3,7 +3,7 @@
 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 getLocationPath = (index = 0, route = window.location.pathname) => {
   const routeArray = route.split('/')
@@ -11,9 +11,9 @@ export const getLocationPath = (index = 0, route = window.location.pathname) =>
   if (activeRoute) return `/${activeRoute}`
 }
 
-export const getLastLocationPath = (route = window.location.pathname) => {
+export const getLastLocationPath = (level = 0, route = window.location.pathname) => {
   const routeArray = route.split('/')
-  const activeRoute = routeArray[routeArray.length - 1]
+  const activeRoute = routeArray[routeArray.length - level - 1]
   if (activeRoute) return `/${activeRoute}`
 }
 
@@ -21,6 +21,7 @@ export let lastPathname
 export let lastLevel = 0
 
 const defaultOptions = {
+  window,
   level: lastLevel,
   initialRender: false,
   pushState: true,
@@ -32,8 +33,8 @@ const defaultOptions = {
   updateState: true,
   updateStateOptions: {
     preventUpdateTriggerStateUpdate: true,
-    preventContentUpdate: true,
-    preventUpdate: ['Modal', 'MainHeaderCaptions', 'HeaderSubAside']
+    // preventContentUpdate: true,
+    preventUpdate: ['MainHeaderCaptions', 'HeaderSubAside']
   },
   preventUpdate: ['MainHeaderCaptions', 'HeaderSubAside'],
   setOptions: {},
@@ -47,7 +48,7 @@ export const router = (
   state = {},
   passedOptions = {}
 ) => {
-  const options = deepMerge(passedOptions, defaultOptions)
+  const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
 
   const [pathname, hash] = path.split('#')
@@ -69,23 +70,22 @@ export const router = (
 
   const content = element.routes[routeInContent] || element.routes['/*']
 
-  const wasModal = isModalRoute(window.location.pathname.split('#')[0], element)
+  const wasModal = isModalRoute(options.window.location.pathname.split('#')[0], element)
   const isInitial = options.initialRender
-  const hashChanged = hash && hash !== window.location.hash.slice(1)
+  const hashChanged = hash && hash !== options.window.location.hash.slice(1)
   const pathChanged = pathname !== lastPathname
   lastPathname = pathname
 
   if (!content) return
   if (options.pushState) {
-    window.history.pushState({
-      prevUrl: window.location.href, ...state
+    options.window.history.pushState({
+      prevUrl: options.window.location.href, ...state
     }, null, route + (hash ? `#${hash}` : ''))
   }
 
   const isModal = isModalRoute(pathname, element)
 
   if (pathChanged || !hashChanged) {
-    const hasSet = isInitial || (!isInitial && !isModal)
     // const rootRouteHasChanged = rootRoute !== element.state.rootRoute
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
 
@@ -96,12 +96,7 @@ export const router = (
       })
     }
 
-    if (!isModal && element.Modal) {
-      element.Modal.removeContent()
-    } else if (isModal && element.content?.Tabs) {
-      element.content.Tabs.update()
-    }
-
+    const hasSet = isInitial || (!isInitial && !isModal)
     if (hasSet) {
       if (options.forceContentUpdate || (!isInitial && wasModal)) {
         element.content.update()
@@ -116,6 +111,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.64",
+  "version": "2.12.66",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "301d177fb42ff3de5ff2c3b6c3bd8711ba7c42f2",
+  "gitHead": "7df1ed1d116dbd34daebaf7dbcb54ae7fa92d487",
   "source": "index.js"
 }