@symbo.ls/router 2.34.34 → 3.1.1

package/index.js

@@ -51,25 +51,12 @@ const defaultOptions = {
   scrollToOptions: { behavior: 'smooth' }
 }
 
-const lastElement = {}
-
 // eslint-disable-next-line default-param-last
-export async function router(path = '/', el, state = {}, passedOptions = {}) {
-  const rootElem = this && this.getRoot()
-  const element = el && el.routes ? el : rootElem
+export async function router (path = '/', el, state = {}, passedOptions = {}) {
+  const element = el || (this && this.getRoot())
   const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
 
-  const isModal = element.getRootState('activeModal')
-  if (isModal) {
-    if (options.event) {
-      options.event.preventDefault()
-      options.event.stopPropagation()
-    }
-    element.call('closeModal')
-    if (options.event) {options.event.preventDefault()}
-  }
-
   const urlObj = new options.window.URL(options.window.location.origin + path)
   const { pathname, search, hash } = urlObj
 
@@ -86,7 +73,10 @@ export async function router(path = '/', el, state = {}, passedOptions = {}) {
   const route = routeArray.join('/').replace('//', '/')
   const routeInContent = `/${routeArray[lastLevel + 1] || ''}`
 
-  const content = element.routes[routeInContent] || element.routes['/*']
+  // const isPreview = location.pathname.includes('/editor')
+
+  const pages = element.routes || element.context.pages
+  const content = pages[routeInContent] || pages['/*']
 
   const wasModal = element.call(
     'isModalRoute',
@@ -103,7 +93,7 @@ export async function router(path = '/', el, state = {}, passedOptions = {}) {
   ) {
     return
   }
-  if (options.pushState && options.level === 0) {
+  if (options.pushState) {
     options.window.history.pushState(
       {
         prevUrl: options.window.location.href,
@@ -114,48 +104,41 @@ export async function router(path = '/', el, state = {}, passedOptions = {}) {
     )
   }
 
+  const isModal = Boolean(element.call('isModalRoute', pathname))
+
   if (pathChanged || !hashChanged) {
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
-    // console.log('ROUTER SETTING')
 
     if (options.updateState) {
       await element.state.update(
         { route, hash, routeInContent, debugging: false },
         {
           preventUpdate: [options.preventUpdate, 'content'],
-          // preventContentUpdate: true, // prevent only platform.content
           updateByRouter: true,
+          onlyUpdate: isModal && 'Modal',
           ...options.updateStateOptions
         }
       )
     }
 
-    const hasSet = isInitial || !isInitial
+    const hasSet = isInitial || (!isInitial && !isModal)
     if (hasSet) {
-      if (
-        element.content &&
-        (options.forceContentUpdate || (!isInitial && wasModal))
-      ) {
-        await element.content?.update(
+      if (options.forceContentUpdate || (!isInitial && wasModal)) {
+        await element.content.update(
           {},
           {
             preventUpdate: options.preventUpdate
           }
         )
       } else {
-        lastElement.content = content
-        element.removeContent()
         await element.set(
           {
             tag: options.useFragment && 'fragment',
-            extend: content
+            extends: content
           },
           {
             // ...(!isInitial && wasModal && !options.forceContentUpdate && { preventContentUpdate: true }),
-            lastElement,
-            routerContentElement: content,
             preventUpdate: options.preventUpdate,
-
             ...options.setOptions
           }
         )

package/package.json

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