clean moutables on unmount and return temp when render content

beforesemicolon · Jul 20, 2024 · b7bb1e6 · b7bb1e6
1 parent 556a916
commit b7bb1e6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/html.spec.ts b/src/html.spec.ts
@@ -1334,7 +1334,7 @@ describe('html', () => {
 			setX(20)
 
 			expect(document.body.innerHTML).toBe('<span>Non Zero: 20</span>')
-			expect(document.body.children[0]).toEqual(n) // node should be kept
+			expect(document.body.children[0]).not.toEqual(n)
 		})
 
 		it('when nested', () => {

diff --git a/src/html.ts b/src/html.ts
@@ -156,6 +156,10 @@ export class HtmlTemplate {
                 effectUnsub()
             }
 
+            for (const item of this.#mountables) {
+                item.unmount()
+            }
+
             for (const node of this.#nodes) {
                 if (
                     node instanceof ReactiveNode ||

diff --git a/src/utils/render-content.ts b/src/utils/render-content.ts
@@ -5,15 +5,15 @@ export const renderContent = (
     content: unknown,
     parentNode: HTMLElement | DocumentFragment,
     cb?: (item: HtmlTemplate | Node) => void
-): Node[] => {
+): Array<HtmlTemplate | Node> => {
     if (content instanceof HtmlTemplate) {
         content.render(parentNode)
         cb?.(content)
-        return content.nodes
+        return [content]
     }
 
     if (Array.isArray(content)) {
-        let nodes: Node[] = []
+        let nodes: Array<HtmlTemplate | Node> = []
 
         for (const item of content) {
             if (Array.isArray(item)) {