@domql/router 2.0.8 → 2.2.5

package/index.js

@@ -1,18 +1,40 @@
 'use strict'
 
-export const splitRoute = (route = window.location.pathname) => route.slice(1).split('/')
+export const splitRoute = (route = window.location.pathname) => route.split('/')
 
 export const router = (rootElement, path, state = {}, level = 0, pushState = true) => {
   const route = path || window.location.pathname
+
+  if (path.slice(0, 1) === '#') {
+    window.location.hash = path
+    return
+  }
+
   const routes = splitRoute(route)
+  let currentRoute = routes[level + 1]
 
-  const content = rootElement.routes[`/${routes[level]}`]
+  const hasHash = currentRoute.split('#')
+  if (hasHash[1]) currentRoute = hasHash[0]
+
+  const content = rootElement.routes[`/${currentRoute}`]
 
   if (content) {
-    if (pushState) window.history.pushState(state, null, route)
+    currentRoute = `/${currentRoute}`
+    if (hasHash[1]) currentRoute += `#${hasHash[1]}`
+    if (pushState) window.history.pushState(state, null, currentRoute)
+
+    const rootNode = rootElement.node
+    rootNode.scrollTo({ behavior: 'smooth', top: 0, left: 0 })
+    if (hasHash[1]) {
+      const activeNode = document.getElementById(hasHash[1])
+      if (activeNode) {
+        const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - 140
+        rootNode.scrollTo({ behavior: 'smooth', top, left: 0 })
+      }
+    }
+
     rootElement.set({ proto: content })
-      .node.scrollIntoView({ behavior: 'smooth' })
   }
 
-  if (level === 0) rootElement.state.update({ activePage: routes[level] })
+  if (level === 0) rootElement.state.update({ currentRoute })
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@domql/router",
-  "version": "2.0.8",
+  "version": "2.2.5",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "vpatch": "npm version patch && npm publish --access public"
   },
-  "gitHead": "b60c46e45c462d00976902d6cdbea6fd5504542b",
+  "gitHead": "c275ad11c795e7abd68cce00d0c758905c4e4f18",
   "source": "index.js"
 }