@symbo.ls/router 2.12.58 → 2.12.61

package/index.js

@@ -2,9 +2,8 @@
 
 import { setCookie } from '@domql/cookie'
 import { redirectBasedOnAuth } from '@symbo.ls/auth-redirect'
-import { checkRouteModal } from '@symbo.ls/platform-utils'
-
-const { location } = window
+import { isModalRoute } from '@symbo.ls/platform-utils'
+import { deepMerge } from '@domql/utils'
 
 export const getActiveRoute = (level = 0, route = window.location.pathname) => {
   const routeArray = route.split('/')
@@ -31,6 +30,12 @@ const defaultOptions = {
   useFragment: false,
   authCheck: true,
   updateState: true,
+  updateStateOptions: {
+    preventUpdateTriggerStateUpdate: true,
+    preventContentUpdate: true,
+    preventUpdate: ['Modal', 'MainHeaderCaptions', 'HeaderSubAside']
+  },
+  setOptions: {},
   scrollToOffset: 120,
   scrollToOptions: { behavior: 'smooth' }
 }
@@ -41,7 +46,7 @@ export const router = (
   state = {},
   passedOptions = {}
 ) => {
-  const options = { ...defaultOptions, ...passedOptions }
+  const options = deepMerge(passedOptions, defaultOptions)
   lastLevel = options.level
 
   const [pathname, hash] = path.split('#')
@@ -59,9 +64,11 @@ export const router = (
   const route = routeArray.join('/').replace('//', '/')
   const routeInContent = `/${routeArray[lastLevel + 1] || ''}`
 
+  // const isPreview = location.pathname.includes('/editor')
+
   const content = element.routes[routeInContent] || element.routes['/*']
 
-  const wasModal = checkRouteModal(location.pathname.split('#')[0], element)
+  const wasModal = isModalRoute(window.location.pathname.split('#')[0], element)
   const isInitial = options.initialRender
   const hashChanged = hash && hash !== window.location.hash.slice(1)
   const pathChanged = pathname !== lastPathname
@@ -69,10 +76,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,16 +89,28 @@ export const router = (
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
 
     if (options.updateState) {
-      element.state.update({
-        route, hash, routeInContent
-      }, { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true, preventUpdate: ['Modal'] })
+      element.state.update({ route, hash, routeInContent }, options.updateStateOptions)
+    }
+
+    if (!isModal && element.Modal) {
+      element.Modal.removeContent()
+    } else if (isModal && element.content?.Tabs) {
+      element.content.Tabs.update()
     }
 
     if (hasSet) {
-      element.set({
-        tag: options.useFragment && 'fragment',
-        extend: content
-      }, (!isInitial && wasModal && { preventContentUpdate: true }))
+      if (options.forceContentUpdate || (!isInitial && wasModal)) {
+        element.content.update()
+      } else {
+        element.set({
+          tag: options.useFragment && 'fragment',
+          extend: content
+        }, {
+        // ...(!isInitial && wasModal && !options.forceContentUpdate && { preventContentUpdate: true }),
+          preventUpdate: ['MainHeaderCaptions', 'HeaderSubAside'],
+          ...options.setOptions
+        })
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.12.58",
+  "version": "2.12.61",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "a46a93b31d174d3f09041704c573030a15f8b7b7",
+  "gitHead": "5d82942254ae88d047def5720cfc95b165cd3031",
   "source": "index.js"
 }