@symbo.ls/router 2.11.18 → 2.11.28

package/index.js

@@ -1,41 +1,44 @@
 'use strict'
 
-import { merge } from '@domql/utils'
 import { setCookie } from '@domql/cookie'
 import { redirectBasedOnAuth } from '@symbo.ls/auth-redirect'
+import { findModal } from '@symbo.ls/modals/action'
 
-export const getActiveRoute = (
-  route = window.location.pathname,
-  level
-) => `/${route.split('/')[level + 1]}`
+export const getActiveRoute = (level = 0, route = window.location.pathname) => {
+  const routeArray = route.split('/')
+  const activeRoute = routeArray[level + 1]
+  if (activeRoute) return `/${activeRoute}`
+}
 
 export let lastLevel = 0
 
 const defaultOptions = {
   level: lastLevel,
+  initialRender: false,
   pushState: true,
   scrollToTop: true,
   scrollToNode: false,
   scrollDocument: false,
   useFragment: false,
   updateState: true,
+  scrollToOffset: 120,
   scrollToOptions: { behavior: 'smooth' }
 }
 
 export const router = (
+  path = '/',
   element,
-  path,
   state = {},
-  options = defaultOptions
+  passedOptions = {}
 ) => {
-  merge(options, defaultOptions)
+  const options = { ...defaultOptions, ...passedOptions }
   lastLevel = options.level
 
   const [pathname, hash] = path.split('#')
   const routeArray = pathname.split('/')
-  const rootRoute = `/${routeArray[1] || ''}`
+  const rootRoute = getActiveRoute(0)
 
-  const authRedirect = redirectBasedOnAuth(element, element.state, { route: rootRoute })
+  const authRedirect = redirectBasedOnAuth(rootRoute, element, element.state)
 
   if (authRedirect && rootRoute !== authRedirect) {
     routeArray[1] = authRedirect.slice(1)
@@ -45,10 +48,13 @@ export const router = (
   const routeInContent = `/${routeArray[lastLevel + 1] || ''}`
   const content = element.routes[routeInContent] || element.routes['/*']
 
+  const isModal = (findModal(element, element.state) || {}).FoundModal
+  const isInitial = options.initialRender
+
   if (content) {
     if (options.pushState) window.history.pushState(state, null, route + (hash ? `#${hash}` : ''))
 
-    element.set({ tag: options.useFragment && 'fragment', extend: content })
+    if (isInitial || (!isInitial && !isModal)) element.set({ tag: options.useFragment && 'fragment', extend: content })
     if (options.updateState) element.state.update({ route, hash })
 
     const rootNode = element.node
@@ -67,7 +73,7 @@ export const router = (
     if (hash) {
       const activeNode = document.getElementById(hash)
       if (activeNode) {
-        const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - 120
+        const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0
         scrollNode.scrollTo({
           ...(options.scrollToOptions || {}), top, left: 0
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.11.18",
+  "version": "2.11.28",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "d6d07132f062d77e5a64ba90cdde1d419ed66150",
+  "gitHead": "26b6500bc487650001f793925123dc2048065a87",
   "source": "index.js"
 }