fix: tolerant invalid hash (#399)

dewfall123 · Oct 7, 2021 · efc5e1b · efc5e1b
1 parent 4b76617
commit efc5e1b
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/client/app/router.ts b/src/client/app/router.ts
@@ -84,9 +84,14 @@ export function createRouter(
         if (inBrowser) {
           nextTick(() => {
             if (targetLoc.hash && !scrollPosition) {
-              const target = document.querySelector(
-                decodeURIComponent(targetLoc.hash)
-              ) as HTMLElement
+              let target: HTMLElement | null = null
+              try {
+                target = document.querySelector(
+                  decodeURIComponent(targetLoc.hash)
+                ) as HTMLElement
+              } catch (e) {
+                console.warn(e)
+              }
               if (target) {
                 scrollTo(target, targetLoc.hash)
                 return
@@ -176,9 +181,16 @@ export function useRoute(): Route {
 }
 
 function scrollTo(el: HTMLElement, hash: string, smooth = false) {
-  const target = el.classList.contains('.header-anchor')
-    ? el
-    : document.querySelector(decodeURIComponent(hash))
+  let target: Element | null = null
+
+  try {
+    target = el.classList.contains('.header-anchor')
+      ? el
+      : document.querySelector(decodeURIComponent(hash))
+  } catch (e) {
+    console.warn(e)
+  }
+
   if (target) {
     const targetTop = (target as HTMLElement).offsetTop
     // only smooth scroll if distance is smaller than screen height.