fix: focus body after navigation

natemoo-re · Mar 17, 2023 · 410d14c · 410d14c
1 parent e46b663
commit 410d14c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/brave-maps-hammer.md b/.changeset/brave-maps-hammer.md
@@ -0,0 +1,5 @@
+---
+"micromorph": patch
+---
+
+Focus body after navigation
diff --git a/src/nav.ts b/src/nav.ts
@@ -49,6 +49,9 @@ export default function createRouter(opts: Options = {}) {
         await micromorph(document, html);
         if (opts.scrollToTop ?? true) {
           window.scrollTo({ top: 0 });
+          if (!document.activeElement?.closest('[data-persist]')) {
+            document.body.focus();
+          }
         }
         await afterDiff();
         delete announcer.dataset.persist;

diff --git a/src/spa.ts b/src/spa.ts
@@ -65,7 +65,10 @@ async function navigate(url: URL, isBack: boolean = false, opts: Options) {
     if (document.startViewTransition) {
       await document.startViewTransition(() => micromorph(document, html))
     } else {
-
+      micromorph(document, html);
+    }
+    if (!document.activeElement?.closest('[data-persist]')) {
+      document.body.focus();
     }
     await afterDiff();
     delete announcer.dataset.persist;