@domql/router 2.3.2 → 2.3.4

package/index.js

@@ -1,40 +1,48 @@
 'use strict'
 
+import { merge } from '@domql/utils'
+
 export const getActiveRoute = (
   route = window.location.pathname, level
 ) => `/${route.split('/')[level + 1]}`
 
 export let lastLevel = 0
 
+const defaultOptions = {
+  level: lastLevel,
+  pushState: true,
+  scrollToTop: true,
+  scrollToNode: false
+}
+
 export const router = (
   element,
   path,
   state = {},
-  options = {
-    level: lastLevel,
-    pushState: true
-  }
+  options = defaultOptions
 ) => {
-  const level = lastLevel = options.level
-  const pushState = options.pushState || options.pushState === undefined
+  merge(options, defaultOptions)
+  lastLevel = options.lastLevel
 
   const [pathname, hash] = (path).split('#')
 
-  const route = getActiveRoute(pathname, level)
+  const route = getActiveRoute(pathname, options.level)
   const content = element.routes[route]
 
   if (content) {
-    if (pushState) window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ''))
+    if (options.pushState) window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ''))
 
     element.set({ extend: content })
     element.state.update({ route, hash })
 
     const rootNode = element.node
-    rootNode.scrollTo({ behavior: 'smooth', top: 0, left: 0 })
+    if (options.scrollToTop) rootNode.scrollTo({ behavior: 'smooth', top: 0, left: 0 })
+    if (options.scrollToNode) content.content.node.scrollTo({ behavior: 'smooth', top: 0, left: 0 })
+
     if (hash) {
       const activeNode = document.getElementById(hash)
       if (activeNode) {
-        const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - 140
+        const top = activeNode.getBoundingClientRect().top + rootNode.scrollToTopp - 140
         rootNode.scrollTo({ behavior: 'smooth', top, left: 0 })
       }
     }

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@domql/router",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "vpatch": "npm version patch && npm publish --access public"
   },
-  "gitHead": "e351985b592e8cb1f25130d9af8759ec9192b17f",
+  "dependencies": {
+    "@domql/utils": "latest"
+  },
+  "gitHead": "01460bf7ffc27c47ee985dfb593bff8fc9686ede",
   "source": "index.js"
 }