@symbo.ls/router 2.12.53 → 2.12.60

package/index.js

@@ -2,7 +2,7 @@
 
 import { setCookie } from '@domql/cookie'
 import { redirectBasedOnAuth } from '@symbo.ls/auth-redirect'
-import { checkRouteModal } from '@symbo.ls/platform-utils'
+import { isModalRoute } from '@symbo.ls/platform-utils'
 
 const { location } = window
 
@@ -59,9 +59,11 @@ export const router = (
   const route = routeArray.join('/').replace('//', '/')
   const routeInContent = `/${routeArray[lastLevel + 1] || ''}`
 
+  const isPreview = location.pathname.includes('/preview')
+
   const content = element.routes[routeInContent] || element.routes['/*']
 
-  const wasModal = checkRouteModal(location.pathname.split('#')[0], element)
+  const wasModal = isModalRoute(location.pathname.split('#')[0], element)
   const isInitial = options.initialRender
   const hashChanged = hash && hash !== window.location.hash.slice(1)
   const pathChanged = pathname !== lastPathname
@@ -69,10 +71,12 @@ export const router = (
 
   if (!content) return
   if (options.pushState) {
-    window.history.pushState({ prevUrl: window.location.href, ...state }, null, route + (hash ? `#${hash}` : ''))
+    window.history.pushState({
+      prevUrl: window.location.href, ...state
+    }, null, route + (hash ? `#${hash}` : ''))
   }
 
-  const isModal = checkRouteModal(pathname, element)
+  const isModal = isModalRoute(pathname, element)
 
   if (pathChanged || !hashChanged) {
     const hasSet = isInitial || (!isInitial && !isModal)
@@ -80,14 +84,27 @@ export const router = (
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
 
     if (options.updateState) {
-      element.state.update({ route, hash, routeInContent }, { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
+      element.state.update({
+        route, hash, routeInContent
+      }, {
+        preventUpdateTriggerStateUpdate: true,
+        preventContentUpdate: true,
+        preventUpdate: ['Modal', 'MainHeaderCaptions', 'HeaderSubAside']
+      })
+    }
+
+    if (!isModal && element.Modal) {
+      element.Modal.removeContent()
     }
 
     if (hasSet) {
       element.set({
         tag: options.useFragment && 'fragment',
         extend: content
-      }, (!isInitial && wasModal && { preventContentUpdate: true }))
+      }, {
+        // ...(!isInitial && wasModal && !options.forceContentUpdate && { preventContentUpdate: true }),
+        preventUpdate: ['MainHeaderCaptions', 'HeaderSubAside']
+      })
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.12.53",
+  "version": "2.12.60",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "929b3ddadd26272b059c9615d8c77c6b72f89eba",
+  "gitHead": "fb7db9d1214620c4cd3c107c4d9bd296b7d90f66",
   "source": "index.js"
 }