@symbo.ls/router 2.28.49 → 2.28.50

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
 
@@ -92,7 +101,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,
@@ -103,8 +112,6 @@ export async function router (path = '/', el, state = {}, passedOptions = {}) {
     )
   }
 
-  const isModal = Boolean(element.call('isModalRoute', pathname))
-
   if (pathChanged || !hashChanged) {
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
 
@@ -114,13 +121,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": "2.28.49",
+  "version": "2.28.50",
   "main": "index.js",
   "license": "MIT",
   "type": "module",
@@ -8,8 +8,8 @@
     "vpatch": "npm version patch && npm publish --access public"
   },
   "dependencies": {
-    "@domql/utils": "^2.28.49"
+    "@domql/utils": "^2.28.50"
   },
-  "gitHead": "c30cac084c3a84a5fe936f9215b91b87b77378f5",
+  "gitHead": "1118b1967af5775fd23520e21e543c4530b97864",
   "source": "index.js"
 }