bimba-cli 0.5.3 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bimba-cli",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/HeapVoid/bimba.git"

package/serve.js

@@ -69,22 +69,30 @@ const hmrClient = `
 		import('/' + file + '?t=' + Date.now()).then(() => {
 			_hotTags = [];
 
-			// Remove duplicate root elements. Re-importing a module with a fresh
-			// ?t= query causes top-level code (e.g. imba.mount()) to run again,
-			// which can append a second copy of the root tag to body.
-			const seen = new Set();
-			[...document.body.children].forEach(el => {
-				const tag = el.tagName.toLowerCase();
-				if (seen.has(tag)) el.remove();
-				else seen.add(tag);
-			});
-
 			// Let Imba re-render in place from the patched prototypes. We do NOT
 			// touch instance DOM (no innerHTML reset, no symbol cleanup) — that
 			// would destroy rendered children like open popups / dropdowns and
 			// collapse any transient UI state. Prototype patching already makes
 			// the next render use the new methods; imba.commit() triggers it.
 			if (typeof imba !== 'undefined') imba.commit();
+
+			// Dedupe direct body children by tag — runs AFTER commit so it
+			// catches both:
+			//   1) Re-importing top-level code that calls imba.mount() again
+			//      (appends a second root tag to body).
+			//   2) Detached popups: a popup uses imba.mount(self) to reparent
+			//      itself to body, so on commit the parent re-renders, doesn't
+			//      see the popup among its children, and creates a brand-new
+			//      instance which gets appended to body. The original (with
+			//      its state) is first in body.children; the freshly-created
+			//      duplicate is last — removing later occurrences preserves
+			//      state.
+			const seen = new Set();
+			[...document.body.children].forEach(el => {
+				const tag = el.tagName.toLowerCase();
+				if (seen.has(tag)) el.remove();
+				else seen.add(tag);
+			});
 		});
 	}