@symbo.ls/router 2.12.94 → 2.12.100

package/index.js

@@ -1,8 +1,6 @@
 'use strict'
 
-import { setCookie } from '@domql/cookie'
-import { redirectBasedOnAuth } from '@symbo.ls/auth-redirect'
-import { isModalRoute } from '@symbo.ls/platform-utils'
+import { setCookie } from '@domql/utils'
 import { merge } from 'smbls'
 
 export const getLocationPath = (index = 0, route = window.location.pathname) => {
@@ -32,23 +30,24 @@ const defaultOptions = {
   authCheck: true,
   updateState: true,
   updateStateOptions: {
-    preventUpdate: ['Iframe'],
+    preventUpdate: ['Canvas'],
     preventUpdateTriggerStateUpdate: true
     // preventContentUpdate: true,
     // preventUpdate: ['MainHeaderCaptions', 'HeaderSubAside']
   },
-  preventUpdate: ['Iframe'],
+  preventUpdate: ['Canvas', 'Modal'],
   setOptions: {},
   scrollToOffset: 120,
   scrollToOptions: { behavior: 'smooth' }
 }
 
-export const router = (
+export function router (
   path = '/',
-  element,
+  el,
   state = {},
   passedOptions = {}
-) => {
+) {
+  const element = el || (this && this.getRoot())
   const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
 
@@ -59,8 +58,7 @@ export const router = (
   let routeArray = pathname.split('/')
 
   if (options.authCheck) {
-    const authRedirect = redirectBasedOnAuth(rootRoute, element, element.state)
-
+    const authRedirect = element.call('redirectBasedOnAuth', rootRoute)
     if (authRedirect && rootRoute !== authRedirect) {
       routeArray = authRedirect.split('/')
     }
@@ -73,7 +71,7 @@ export const router = (
 
   const content = element.routes[routeInContent] || element.routes['/*']
 
-  const wasModal = isModalRoute(options.window.location.pathname.split('#')[0], element)
+  const wasModal = element.call('isModalRoute', options.window.location.pathname.split('#')[0])
   const isInitial = options.initialRender
   const hashChanged = hash && hash !== options.window.location.hash
   const pathChanged = pathname !== lastPathname
@@ -86,7 +84,7 @@ export const router = (
     }, null, route + (search ? `${search}` : '') + (hash ? `${hash}` : ''))
   }
 
-  const isModal = !!isModalRoute(pathname, element)
+  const isModal = !!element.call('isModalRoute', pathname)
 
   if (pathChanged || !hashChanged) {
     // const rootRouteHasChanged = rootRoute !== element.state.rootRoute
@@ -96,6 +94,7 @@ export const router = (
       element.state.update({ route, hash, routeInContent, debugging: false }, {
         preventUpdate: options.preventUpdate,
         updateByRouter: true,
+        onlyUpdate: isModal && 'Modal',
         ...options.updateStateOptions
       })
     }
@@ -118,14 +117,10 @@ export const router = (
       }
       element.content.__ref.__componentKey = route
     }
-
-    if (!isModal && element.Modal?.content) {
-      element.Modal.removeContent()
-    }
   }
 
   const rootNode = element.node
-  const scrollNode = options.scrollDocument ? document.documentElement : rootNode
+  const scrollNode = options.scrollDocument ? options.window.document.documentElement : rootNode
   if (options.scrollToTop) {
     scrollNode.scrollTo({
       ...(options.scrollToOptions || {}), top: 0, left: 0
@@ -138,7 +133,7 @@ export const router = (
   }
 
   if (hash) {
-    const activeNode = document.getElementById(hash)
+    const activeNode = options.window.document.getElementById(hash.slice(1))
     if (activeNode) {
       const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0
       scrollNode.scrollTo({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.12.94",
+  "version": "2.12.100",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,6 +11,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "e09e8a3656bcb86dcd9965b7eb0a484c976fc8ec",
+  "gitHead": "04d5f0f5019789ef7a8367f5850862d6a976eb66",
   "source": "index.js"
 }