@symbo.ls/router 3.1.1 → 3.2.3

package/index.js

@@ -57,6 +57,15 @@ export async function router (path = '/', el, state = {}, passedOptions = {}) {
   const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
 
+  const isModal = element.getRootState('activeModal')
+  if (isModal) {
+    if (options.event) {
+      options.event.preventDefault()
+      options.event.stopPropagation()
+    }
+    return element.call('closeModal')
+  }
+
   const urlObj = new options.window.URL(options.window.location.origin + path)
   const { pathname, search, hash } = urlObj
 
@@ -74,9 +83,9 @@ export async function router (path = '/', el, state = {}, passedOptions = {}) {
   const routeInContent = `/${routeArray[lastLevel + 1] || ''}`
 
   // const isPreview = location.pathname.includes('/editor')
-
-  const pages = element.routes || element.context.pages
-  const content = pages[routeInContent] || pages['/*']
+  // const pages = element.routes || element.context.pages
+  // const content = pages[routeInContent] || pages['/*']
+  const content = element.routes[routeInContent] || element.routes['/*']
 
   const wasModal = element.call(
     'isModalRoute',
@@ -93,7 +102,7 @@ export async function router (path = '/', el, state = {}, passedOptions = {}) {
   ) {
     return
   }
-  if (options.pushState) {
+  if (options.pushState && options.level === 0) {
     options.window.history.pushState(
       {
         prevUrl: options.window.location.href,
@@ -104,8 +113,6 @@ export async function router (path = '/', el, state = {}, passedOptions = {}) {
     )
   }
 
-  const isModal = Boolean(element.call('isModalRoute', pathname))
-
   if (pathChanged || !hashChanged) {
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
 
@@ -115,13 +122,12 @@ export async function router (path = '/', el, state = {}, passedOptions = {}) {
         {
           preventUpdate: [options.preventUpdate, 'content'],
           updateByRouter: true,
-          onlyUpdate: isModal && 'Modal',
           ...options.updateStateOptions
         }
       )
     }
 
-    const hasSet = isInitial || (!isInitial && !isModal)
+    const hasSet = isInitial || !isInitial
     if (hasSet) {
       if (options.forceContentUpdate || (!isInitial && wasModal)) {
         await element.content.update(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "3.1.1",
+  "version": "3.2.3",
   "main": "index.js",
   "license": "MIT",
   "type": "module",
@@ -8,8 +8,8 @@
     "vpatch": "npm version patch && npm publish --access public"
   },
   "dependencies": {
-    "@domql/utils": "^3.1.1"
+    "@domql/utils": "^3.2.3"
   },
-  "gitHead": "39fb7a8c07355468ccce79e2f787ca3fa0715692",
+  "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",
   "source": "index.js"
 }