feat(router): title update on navigation

aidenybai · Mar 13, 2022 · 3f7b3a8 · 3f7b3a8
1 parent 37101c4
commit 3f7b3a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/packages/router/router.ts b/packages/router/router.ts
@@ -1,7 +1,5 @@
 import { normalizeRelativeURLs } from './utils';
-import { fromDomNodeToVNode } from '../shared/convert';
-import { patch } from '../million/render';
-import { OLD_VNODE_FIELD } from '../million/types';
+import { morph } from '../morph/morph';
 import { getURL } from './utils';
 
 const parser: DOMParser = new DOMParser();
@@ -22,17 +20,14 @@ export const navigate = async (url: URL, isBack = false, htmlString?: string) =>
 
   const html = parser.parseFromString(newPageHtmlString, 'text/html');
   normalizeRelativeURLs(html, url);
-  console.log(htmlString);
 
-  if (!document.head[OLD_VNODE_FIELD]) {
-    document.head[OLD_VNODE_FIELD] = fromDomNodeToVNode(document.head);
-  }
-  if (!document.body[OLD_VNODE_FIELD]) {
-    document.body[OLD_VNODE_FIELD] = fromDomNodeToVNode(document.body);
+  const title = html.querySelector('title');
+  if (title) {
+    document.title = title.text;
   }
 
-  patch(document.head, fromDomNodeToVNode(html.head));
-  patch(document.body, fromDomNodeToVNode(html.body));
+  morph(html.head, document.head);
+  morph(html.body, document.body);
 };
 
 export const router = (routes?: Record<string, string>) => {

diff --git a/packages/router/utils.ts b/packages/router/utils.ts
@@ -3,8 +3,8 @@ export const setAttribute = (el: Element, attr: string, base: string | URL) => {
 };
 
 export const normalizeRelativeURLs = (el: Element | Document, base: string | URL) => {
-  const hrefs = el.querySelectorAll(':is([href^="./"], [href^="../"])');
-  const srcs = el.querySelectorAll(':is([src^="./"], [src^="../"])');
+  const hrefs = el.querySelectorAll('[href^="./"], [href^="../"]');
+  const srcs = el.querySelectorAll('[src^="./"], [src^="../"]');
   for (let i = 0; i < hrefs.length; i++) {
     setAttribute(hrefs[i], 'href', base);
   }