@domql/router 2.2.4 → 2.2.7

package/index.js

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

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@domql/router",
-  "version": "2.2.4",
+  "version": "2.2.7",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "vpatch": "npm version patch && npm publish --access public"
   },
-  "gitHead": "a105ac3a4a89d120ec7199d9a4b9706e76ce128f",
+  "gitHead": "9952e1abd4466080e0f8d5031fe4962694746591",
   "source": "index.js"
 }