@domql/router 2.5.35 → 2.5.56

package/dist/cjs/index.js

@@ -25,6 +25,7 @@ __export(router_exports, {
   router: () => router
 });
 module.exports = __toCommonJS(router_exports);
+var import_event = require("@domql/event");
 var import_utils = require("@domql/utils");
 const getActiveRoute = (level = 0, route = import_utils.window.location.pathname) => {
   const routeArray = route.split("/");
@@ -48,8 +49,9 @@ const defaultOptions = {
   scrollToOptions: { behavior: "smooth" }
 };
 const router = (path, element, state = {}, passedOptions = {}) => {
-  const options = { ...defaultOptions, ...passedOptions };
+  const options = { ...defaultOptions, ...element.context.routerOptions, ...passedOptions };
   lastLevel = options.lastLevel;
+  const newElementKey = options.newElementKey;
   const [pathname, hash] = path.split("#");
   const rootNode = element.node;
   const route = getActiveRoute(options.level, pathname);
@@ -67,10 +69,13 @@ const router = (path, element, state = {}, passedOptions = {}) => {
     if (options.updateState) {
       element.state.update({ route, hash }, { preventContentUpdate: true });
     }
+    if (newElementKey && options.removeOldElement) {
+      element[newElementKey].remove();
+    }
     element.set({
       tag: options.useFragment && "fragment",
       extend: content
-    });
+    }, { newElementKey });
   }
   if (options.scrollToTop) {
     scrollNode.scrollTo({
@@ -97,5 +102,6 @@ const router = (path, element, state = {}, passedOptions = {}) => {
       });
     }
   }
+  (0, import_event.triggerEventOn)("routeChanged", element, options);
 };
 var router_default = router;

package/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+import { triggerEventOn } from '@domql/event'
 import { document, window } from '@domql/utils'
 
 export const getActiveRoute = (level = 0, route = window.location.pathname) => {
@@ -31,8 +32,9 @@ export const router = (
   state = {},
   passedOptions = {}
 ) => {
-  const options = { ...defaultOptions, ...passedOptions }
+  const options = { ...defaultOptions, ...element.context.routerOptions, ...passedOptions }
   lastLevel = options.lastLevel
+  const newElementKey = options.newElementKey
 
   const [pathname, hash] = path.split('#')
 
@@ -54,10 +56,13 @@ export const router = (
       element.state.update({ route, hash }, { preventContentUpdate: true })
     }
 
+    if (newElementKey && options.removeOldElement) {
+      element[newElementKey].remove()
+    }
     element.set({
       tag: options.useFragment && 'fragment',
       extend: content
-    })
+    }, { newElementKey })
   }
 
   if (options.scrollToTop) {
@@ -80,6 +85,9 @@ export const router = (
       })
     }
   }
+
+  // trigger `on.routeChanged`
+  triggerEventOn('routeChanged', element, options)
 }
 
 export default router

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/router",
-  "version": "2.5.35",
+  "version": "2.5.56",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -25,7 +25,7 @@
     "@domql/globals": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "8d7684fd84f5c48fb5cf71e76a05eda071c118f7",
+  "gitHead": "a832fd0b6d8c39f16e6c7b2b61ab6c3dccd1f539",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }