@rindo/core 4.23.0 → 4.23.2

package/internal/client/index.js

@@ -1,5 +1,5 @@
 /*
- Rindo Client Platform v4.23.0 | MIT Licensed | https://rindojs.web.app
+ Rindo Client Platform v4.23.2 | MIT Licensed | https://rindojs.web.app
  */
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -18,9 +18,21 @@ var Build = {
 
 // src/client/client-host-ref.ts
 import { BUILD as BUILD2 } from "@rindo/core/internal/app-data";
+
+// src/utils/constants.ts
+var SVG_NS = "http://www.w3.org/2000/svg";
+var HTML_NS = "http://www.w3.org/1999/xhtml";
+
+// src/client/client-host-ref.ts
 var hostRefs = BUILD2.hotModuleReplacement ? window.__RINDO_HOSTREFS__ || (window.__RINDO_HOSTREFS__ = /* @__PURE__ */ new WeakMap()) : /* @__PURE__ */ new WeakMap();
+var deleteHostRef = (ref) => hostRefs.delete(ref);
 var getHostRef = (ref) => hostRefs.get(ref);
-var registerInstance = (lazyInstance, hostRef) => hostRefs.set(hostRef.$lazyInstance$ = lazyInstance, hostRef);
+var registerInstance = (lazyInstance, hostRef) => {
+  hostRefs.set(hostRef.$lazyInstance$ = lazyInstance, hostRef);
+  if (BUILD2.modernPropertyDecls && (BUILD2.state || BUILD2.prop)) {
+    reWireGetterSetter(lazyInstance, hostRef);
+  }
+};
 var registerHost = (hostElement, cmpMeta) => {
   const hostRef = {
     $flags$: 0,
@@ -39,9 +51,35 @@ var registerHost = (hostElement, cmpMeta) => {
     hostElement["s-p"] = [];
     hostElement["s-rc"] = [];
   }
-  return hostRefs.set(hostElement, hostRef);
+  const ref = hostRefs.set(hostElement, hostRef);
+  if (!BUILD2.lazyLoad && BUILD2.modernPropertyDecls && (BUILD2.state || BUILD2.prop)) {
+    reWireGetterSetter(hostElement, hostRef);
+  }
+  return ref;
 };
 var isMemberInElement = (elm, memberName) => memberName in elm;
+var reWireGetterSetter = (instance, hostRef) => {
+  var _a;
+  const cmpMeta = hostRef.$cmpMeta$;
+  const members = Object.entries((_a = cmpMeta.$members$) != null ? _a : {});
+  members.map(([memberName, [memberFlags]]) => {
+    if (BUILD2.state && BUILD2.prop && (memberFlags & 2048 /* Getter */) === 0 && (memberFlags & 31 /* Prop */ || memberFlags & 32 /* State */)) {
+      const ogValue = instance[memberName];
+      const lazyDescriptor = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(instance), memberName);
+      Object.defineProperty(instance, memberName, {
+        get() {
+          return lazyDescriptor.get.call(this);
+        },
+        set(newValue) {
+          lazyDescriptor.set.call(this, newValue);
+        },
+        configurable: true,
+        enumerable: true
+      });
+      instance[memberName] = hostRef.$instanceValues$.has(memberName) ? hostRef.$instanceValues$.get(memberName) : ogValue;
+    }
+  });
+};
 
 // src/client/client-load-module.ts
 import { BUILD as BUILD4 } from "@rindo/core/internal/app-data";
@@ -243,7 +281,7 @@ var readTask = /* @__PURE__ */ queueTask(queueDomReads, false);
 var writeTask = /* @__PURE__ */ queueTask(queueDomWrites, true);
 
 // src/client/index.ts
-import { BUILD as BUILD27, Env, NAMESPACE as NAMESPACE2 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD28, Env, NAMESPACE as NAMESPACE2 } from "@rindo/core/internal/app-data";
 
 // src/runtime/asset-path.ts
 var getAssetPath = (path) => {
@@ -253,15 +291,10 @@ var getAssetPath = (path) => {
 var setAssetPath = (path) => plt.$resourcesUrl$ = path;
 
 // src/runtime/bootstrap-custom-element.ts
-import { BUILD as BUILD24 } from "@rindo/core/internal/app-data";
-
-// src/utils/constants.ts
-var EMPTY_OBJ = {};
-var SVG_NS = "http://www.w3.org/2000/svg";
-var HTML_NS = "http://www.w3.org/1999/xhtml";
+import { BUILD as BUILD25 } from "@rindo/core/internal/app-data";
 
 // src/utils/helpers.ts
-var isDef = (v) => v != null;
+var isDef = (v) => v != null && v !== void 0;
 var isComplexType = (o) => {
   o = typeof o;
   return o === "object" || o === "function";
@@ -323,19 +356,122 @@ var unwrapErr = (result) => {
 };
 
 // src/runtime/connected-callback.ts
-import { BUILD as BUILD22 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD23 } from "@rindo/core/internal/app-data";
 
 // src/runtime/client-hydrate.ts
-import { BUILD as BUILD13 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD14 } from "@rindo/core/internal/app-data";
 
 // src/runtime/dom-extras.ts
-import { BUILD as BUILD11 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD12 } from "@rindo/core/internal/app-data";
+
+// src/runtime/slot-polyfill-utils.ts
+import { BUILD as BUILD7 } from "@rindo/core/internal/app-data";
+var updateFallbackSlotVisibility = (elm) => {
+  const childNodes = elm.__childNodes || elm.childNodes;
+  if (elm.tagName && elm.tagName.includes("-") && elm["s-cr"] && elm.tagName !== "SLOT-FB") {
+    getHostSlotNodes(childNodes, elm.tagName).forEach((slotNode) => {
+      var _a;
+      if (slotNode.nodeType === 1 /* ElementNode */ && slotNode.tagName === "SLOT-FB") {
+        if ((_a = getHostSlotChildNodes(slotNode, slotNode["s-sn"], false)) == null ? void 0 : _a.length) {
+          slotNode.hidden = true;
+        } else {
+          slotNode.hidden = false;
+        }
+      }
+    });
+  }
+  for (const childNode of childNodes) {
+    if (childNode.nodeType === 1 /* ElementNode */ && (childNode.__childNodes || childNode.childNodes).length) {
+      updateFallbackSlotVisibility(childNode);
+    }
+  }
+};
+var getSlottedChildNodes = (childNodes) => {
+  const result = [];
+  for (let i2 = 0; i2 < childNodes.length; i2++) {
+    const slottedNode = childNodes[i2]["s-nr"];
+    if (slottedNode && slottedNode.isConnected) {
+      result.push(slottedNode);
+    }
+  }
+  return result;
+};
+var getHostSlotNodes = (childNodes, hostName, slotName) => {
+  let i2 = 0;
+  let slottedNodes = [];
+  let childNode;
+  for (; i2 < childNodes.length; i2++) {
+    childNode = childNodes[i2];
+    if (childNode["s-sr"] && childNode["s-hn"] === hostName && (!slotName || childNode["s-sn"] === slotName)) {
+      slottedNodes.push(childNode);
+      if (typeof slotName !== "undefined") return slottedNodes;
+    }
+    slottedNodes = [...slottedNodes, ...getHostSlotNodes(childNode.childNodes, hostName, slotName)];
+  }
+  return slottedNodes;
+};
+var getHostSlotChildNodes = (node, slotName, includeSlot = true) => {
+  const childNodes = [];
+  if (includeSlot && node["s-sr"] || !node["s-sr"]) childNodes.push(node);
+  while ((node = node.nextSibling) && node["s-sn"] === slotName) {
+    childNodes.push(node);
+  }
+  return childNodes;
+};
+var isNodeLocatedInSlot = (nodeToRelocate, slotName) => {
+  if (nodeToRelocate.nodeType === 1 /* ElementNode */) {
+    if (nodeToRelocate.getAttribute("slot") === null && slotName === "") {
+      return true;
+    }
+    if (nodeToRelocate.getAttribute("slot") === slotName) {
+      return true;
+    }
+    return false;
+  }
+  if (nodeToRelocate["s-sn"] === slotName) {
+    return true;
+  }
+  return slotName === "";
+};
+var addSlotRelocateNode = (newChild, slotNode, prepend, position) => {
+  let slottedNodeLocation;
+  if (newChild["s-ol"] && newChild["s-ol"].isConnected) {
+    slottedNodeLocation = newChild["s-ol"];
+  } else {
+    slottedNodeLocation = document.createTextNode("");
+    slottedNodeLocation["s-nr"] = newChild;
+  }
+  if (!slotNode["s-cr"] || !slotNode["s-cr"].parentNode) return;
+  const parent = slotNode["s-cr"].parentNode;
+  const appendMethod = prepend ? parent.__prepend || parent.prepend : parent.__appendChild || parent.appendChild;
+  if (typeof position !== "undefined") {
+    if (BUILD7.hydrateClientSide) {
+      slottedNodeLocation["s-oo"] = position;
+      const childNodes = parent.__childNodes || parent.childNodes;
+      const slotRelocateNodes = [slottedNodeLocation];
+      childNodes.forEach((n) => {
+        if (n["s-nr"]) slotRelocateNodes.push(n);
+      });
+      slotRelocateNodes.sort((a, b) => {
+        if (!a["s-oo"] || a["s-oo"] < b["s-oo"]) return -1;
+        else if (!b["s-oo"] || b["s-oo"] < a["s-oo"]) return 1;
+        return 0;
+      });
+      slotRelocateNodes.forEach((n) => appendMethod.call(parent, n));
+    }
+  } else {
+    appendMethod.call(parent, slottedNodeLocation);
+  }
+  newChild["s-ol"] = slottedNodeLocation;
+  newChild["s-sh"] = slotNode["s-hn"];
+};
+var getSlotName = (node) => node["s-sn"] || node.nodeType === 1 && node.getAttribute("slot") || "";
 
 // src/runtime/vdom/vdom-render.ts
-import { BUILD as BUILD10 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD11 } from "@rindo/core/internal/app-data";
 
 // src/runtime/vdom/h.ts
-import { BUILD as BUILD7 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD8 } from "@rindo/core/internal/app-data";
 var h = (nodeName, vnodeData, ...children) => {
   let child = null;
   let key = null;
@@ -351,7 +487,7 @@ var h = (nodeName, vnodeData, ...children) => {
       } else if (child != null && typeof child !== "boolean") {
         if (simple = typeof nodeName !== "function" && !isComplexType(child)) {
           child = String(child);
-        } else if (BUILD7.isDev && typeof nodeName !== "function" && child.$flags$ === void 0) {
+        } else if (BUILD8.isDev && typeof nodeName !== "function" && child.$flags$ === void 0) {
           consoleDevError(`vNode passed as children has unexpected type.
 Make sure it's using the correct h() function.
 Empty objects can also be the cause, look for JSX comments that became objects.`);
@@ -367,28 +503,28 @@ Empty objects can also be the cause, look for JSX comments that became objects.`
   };
   walk(children);
   if (vnodeData) {
-    if (BUILD7.isDev && nodeName === "input") {
+    if (BUILD8.isDev && nodeName === "input") {
       validateInputProperties(vnodeData);
     }
-    if (BUILD7.vdomKey && vnodeData.key) {
+    if (BUILD8.vdomKey && vnodeData.key) {
       key = vnodeData.key;
     }
-    if (BUILD7.slotRelocation && vnodeData.name) {
+    if (BUILD8.slotRelocation && vnodeData.name) {
       slotName = vnodeData.name;
     }
-    if (BUILD7.vdomClass) {
+    if (BUILD8.vdomClass) {
       const classData = vnodeData.className || vnodeData.class;
       if (classData) {
         vnodeData.class = typeof classData !== "object" ? classData : Object.keys(classData).filter((k) => classData[k]).join(" ");
       }
     }
   }
-  if (BUILD7.isDev && vNodeChildren.some(isHost)) {
+  if (BUILD8.isDev && vNodeChildren.some(isHost)) {
     consoleDevError(`The <Host> must be the single root component. Make sure:
 - You are NOT using hostData() and <Host> in the same component.
 - <Host> is used once, and it's the single root component of the render() function.`);
   }
-  if (BUILD7.vdomFunctional && typeof nodeName === "function") {
+  if (BUILD8.vdomFunctional && typeof nodeName === "function") {
     return nodeName(
       vnodeData === null ? {} : vnodeData,
       vNodeChildren,
@@ -400,10 +536,10 @@ Empty objects can also be the cause, look for JSX comments that became objects.`
   if (vNodeChildren.length > 0) {
     vnode.$children$ = vNodeChildren;
   }
-  if (BUILD7.vdomKey) {
+  if (BUILD8.vdomKey) {
     vnode.$key$ = key;
   }
-  if (BUILD7.slotRelocation) {
+  if (BUILD8.slotRelocation) {
     vnode.$name$ = slotName;
   }
   return vnode;
@@ -416,13 +552,13 @@ var newVNode = (tag, text) => {
     $elm$: null,
     $children$: null
   };
-  if (BUILD7.vdomAttribute) {
+  if (BUILD8.vdomAttribute) {
     vnode.$attrs$ = null;
   }
-  if (BUILD7.vdomKey) {
+  if (BUILD8.vdomKey) {
     vnode.$key$ = null;
   }
-  if (BUILD7.slotRelocation) {
+  if (BUILD8.slotRelocation) {
     vnode.$name$ = null;
   }
   return vnode;
@@ -475,28 +611,35 @@ var validateInputProperties = (inputElm) => {
 };
 
 // src/runtime/vdom/update-element.ts
-import { BUILD as BUILD9 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD10 } from "@rindo/core/internal/app-data";
 
 // src/runtime/vdom/set-accessor.ts
-import { BUILD as BUILD8 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD9 } from "@rindo/core/internal/app-data";
 var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
   if (oldValue !== newValue) {
     let isProp = isMemberInElement(elm, memberName);
     let ln = memberName.toLowerCase();
-    if (BUILD8.vdomClass && memberName === "class") {
+    if (BUILD9.vdomClass && memberName === "class") {
       const classList = elm.classList;
       const oldClasses = parseClassList(oldValue);
-      const newClasses = parseClassList(newValue);
-      if (elm["s-si"] && newClasses.indexOf(elm["s-si"]) < 0) {
+      let newClasses = parseClassList(newValue);
+      if (elm["s-si"]) {
         newClasses.push(elm["s-si"]);
+        oldClasses.forEach((c) => {
+          if (c.startsWith(elm["s-si"])) newClasses.push(c);
+        });
+        newClasses = [...new Set(newClasses)];
+        classList.add(...newClasses);
+        delete elm["s-si"];
+      } else {
+        classList.remove(...oldClasses.filter((c) => c && !newClasses.includes(c)));
+        classList.add(...newClasses.filter((c) => c && !oldClasses.includes(c)));
       }
-      classList.remove(...oldClasses.filter((c) => c && !newClasses.includes(c)));
-      classList.add(...newClasses.filter((c) => c && !oldClasses.includes(c)));
-    } else if (BUILD8.vdomStyle && memberName === "style") {
-      if (BUILD8.updatable) {
+    } else if (BUILD9.vdomStyle && memberName === "style") {
+      if (BUILD9.updatable) {
         for (const prop in oldValue) {
           if (!newValue || newValue[prop] == null) {
-            if (!BUILD8.hydrateServerSide && prop.includes("-")) {
+            if (!BUILD9.hydrateServerSide && prop.includes("-")) {
               elm.style.removeProperty(prop);
             } else {
               elm.style[prop] = "";
@@ -506,19 +649,19 @@ var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
       }
       for (const prop in newValue) {
         if (!oldValue || newValue[prop] !== oldValue[prop]) {
-          if (!BUILD8.hydrateServerSide && prop.includes("-")) {
+          if (!BUILD9.hydrateServerSide && prop.includes("-")) {
             elm.style.setProperty(prop, newValue[prop]);
           } else {
             elm.style[prop] = newValue[prop];
           }
         }
       }
-    } else if (BUILD8.vdomKey && memberName === "key") {
-    } else if (BUILD8.vdomRef && memberName === "ref") {
+    } else if (BUILD9.vdomKey && memberName === "key") {
+    } else if (BUILD9.vdomRef && memberName === "ref") {
       if (newValue) {
         newValue(elm);
       }
-    } else if (BUILD8.vdomListener && (BUILD8.lazyLoad ? !isProp : !elm.__lookupSetter__(memberName)) && memberName[0] === "o" && memberName[1] === "n") {
+    } else if (BUILD9.vdomListener && (BUILD9.lazyLoad ? !isProp : !elm.__lookupSetter__(memberName)) && memberName[0] === "o" && memberName[1] === "n") {
       if (memberName[2] === "-") {
         memberName = memberName.slice(3);
       } else if (isMemberInElement(win, ln)) {
@@ -536,7 +679,7 @@ var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
           plt.ael(elm, memberName, newValue, capture);
         }
       }
-    } else if (BUILD8.vdomPropOrAttr) {
+    } else if (BUILD9.vdomPropOrAttr) {
       const isComplex = isComplexType(newValue);
       if ((isProp || isComplex && newValue !== null) && !isSvg) {
         try {
@@ -558,7 +701,7 @@ var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
         }
       }
       let xlink = false;
-      if (BUILD8.vdomXlink) {
+      if (BUILD9.vdomXlink) {
         if (ln !== (ln = ln.replace(/^xlink\:?/, ""))) {
           memberName = ln;
           xlink = true;
@@ -566,7 +709,7 @@ var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
       }
       if (newValue == null || newValue === false) {
         if (newValue !== false || elm.getAttribute(memberName) === "") {
-          if (BUILD8.vdomXlink && xlink) {
+          if (BUILD9.vdomXlink && xlink) {
             elm.removeAttributeNS(XLINK_NS, memberName);
           } else {
             elm.removeAttribute(memberName);
@@ -574,7 +717,7 @@ var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
         }
       } else if ((!isProp || flags & 4 /* isHost */ || isSvg) && !isComplex) {
         newValue = newValue === true ? "" : newValue;
-        if (BUILD8.vdomXlink && xlink) {
+        if (BUILD9.vdomXlink && xlink) {
           elm.setAttributeNS(XLINK_NS, memberName, newValue);
         } else {
           elm.setAttribute(memberName, newValue);
@@ -584,16 +727,24 @@ var setAccessor = (elm, memberName, oldValue, newValue, isSvg, flags) => {
   }
 };
 var parseClassListRegex = /\s/;
-var parseClassList = (value) => !value ? [] : value.split(parseClassListRegex);
+var parseClassList = (value) => {
+  if (typeof value === "object" && "baseVal" in value) {
+    value = value.baseVal;
+  }
+  if (!value) {
+    return [];
+  }
+  return value.split(parseClassListRegex);
+};
 var CAPTURE_EVENT_SUFFIX = "Capture";
 var CAPTURE_EVENT_REGEX = new RegExp(CAPTURE_EVENT_SUFFIX + "$");
 
 // src/runtime/vdom/update-element.ts
 var updateElement = (oldVnode, newVnode, isSvgMode2) => {
   const elm = newVnode.$elm$.nodeType === 11 /* DocumentFragment */ && newVnode.$elm$.host ? newVnode.$elm$.host : newVnode.$elm$;
-  const oldVnodeAttrs = oldVnode && oldVnode.$attrs$ || EMPTY_OBJ;
-  const newVnodeAttrs = newVnode.$attrs$ || EMPTY_OBJ;
-  if (BUILD9.updatable) {
+  const oldVnodeAttrs = oldVnode && oldVnode.$attrs$ || {};
+  const newVnodeAttrs = newVnode.$attrs$ || {};
+  if (BUILD10.updatable) {
     for (const memberName of sortedAttrNames(Object.keys(oldVnodeAttrs))) {
       if (!(memberName in newVnodeAttrs)) {
         setAccessor(elm, memberName, oldVnodeAttrs[memberName], void 0, isSvgMode2, newVnode.$flags$);
@@ -622,19 +773,16 @@ var useNativeShadowDom = false;
 var checkSlotFallbackVisibility = false;
 var checkSlotRelocate = false;
 var isSvgMode = false;
-var createElm = (oldParentVNode, newParentVNode, childIndex, parentElm) => {
+var createElm = (oldParentVNode, newParentVNode, childIndex) => {
   var _a;
   const newVNode2 = newParentVNode.$children$[childIndex];
   let i2 = 0;
   let elm;
   let childNode;
   let oldVNode;
-  if (BUILD10.slotRelocation && !useNativeShadowDom) {
+  if (BUILD11.slotRelocation && !useNativeShadowDom) {
     checkSlotRelocate = true;
     if (newVNode2.$tag$ === "slot") {
-      if (scopeId) {
-        parentElm.classList.add(scopeId + "-s");
-      }
       newVNode2.$flags$ |= newVNode2.$children$ ? (
         // slot element has fallback content
         // still create an element that "mocks" the slot element
@@ -647,48 +795,43 @@ var createElm = (oldParentVNode, newParentVNode, childIndex, parentElm) => {
       );
     }
   }
-  if (BUILD10.isDev && newVNode2.$elm$) {
+  if (BUILD11.isDev && newVNode2.$elm$) {
     consoleDevError(
       `The JSX ${newVNode2.$text$ !== null ? `"${newVNode2.$text$}" text` : `"${newVNode2.$tag$}" element`} node should not be shared within the same renderer. The renderer caches element lookups in order to improve performance. However, a side effect from this is that the exact same JSX node should not be reused. For more information please see https://rindojs.web.app/docs/templating-jsx#avoid-shared-jsx-nodes`
     );
   }
-  if (BUILD10.vdomText && newVNode2.$text$ !== null) {
+  if (BUILD11.vdomText && newVNode2.$text$ !== null) {
     elm = newVNode2.$elm$ = doc.createTextNode(newVNode2.$text$);
-  } else if (BUILD10.slotRelocation && newVNode2.$flags$ & 1 /* isSlotReference */) {
-    elm = newVNode2.$elm$ = BUILD10.isDebug || BUILD10.hydrateServerSide ? slotReferenceDebugNode(newVNode2) : doc.createTextNode("");
+  } else if (BUILD11.slotRelocation && newVNode2.$flags$ & 1 /* isSlotReference */) {
+    elm = newVNode2.$elm$ = BUILD11.isDebug || BUILD11.hydrateServerSide ? slotReferenceDebugNode(newVNode2) : doc.createTextNode("");
   } else {
-    if (BUILD10.svg && !isSvgMode) {
+    if (BUILD11.svg && !isSvgMode) {
       isSvgMode = newVNode2.$tag$ === "svg";
     }
-    elm = newVNode2.$elm$ = BUILD10.svg ? doc.createElementNS(
+    elm = newVNode2.$elm$ = BUILD11.svg ? doc.createElementNS(
       isSvgMode ? SVG_NS : HTML_NS,
-      !useNativeShadowDom && BUILD10.slotRelocation && newVNode2.$flags$ & 2 /* isSlotFallback */ ? "slot-fb" : newVNode2.$tag$
+      !useNativeShadowDom && BUILD11.slotRelocation && newVNode2.$flags$ & 2 /* isSlotFallback */ ? "slot-fb" : newVNode2.$tag$
     ) : doc.createElement(
-      !useNativeShadowDom && BUILD10.slotRelocation && newVNode2.$flags$ & 2 /* isSlotFallback */ ? "slot-fb" : newVNode2.$tag$
+      !useNativeShadowDom && BUILD11.slotRelocation && newVNode2.$flags$ & 2 /* isSlotFallback */ ? "slot-fb" : newVNode2.$tag$
     );
-    if (BUILD10.svg && isSvgMode && newVNode2.$tag$ === "foreignObject") {
+    if (BUILD11.svg && isSvgMode && newVNode2.$tag$ === "foreignObject") {
       isSvgMode = false;
     }
-    if (BUILD10.vdomAttribute) {
+    if (BUILD11.vdomAttribute) {
       updateElement(null, newVNode2, isSvgMode);
     }
-    const rootNode = elm.getRootNode();
-    const isElementWithinShadowRoot = !rootNode.querySelector("body");
-    if (!isElementWithinShadowRoot && BUILD10.scoped && isDef(scopeId) && elm["s-si"] !== scopeId) {
+    if (BUILD11.scoped && isDef(scopeId) && elm["s-si"] !== scopeId) {
       elm.classList.add(elm["s-si"] = scopeId);
     }
-    if (BUILD10.scoped) {
-      updateElementScopeIds(elm, parentElm);
-    }
     if (newVNode2.$children$) {
       for (i2 = 0; i2 < newVNode2.$children$.length; ++i2) {
-        childNode = createElm(oldParentVNode, newVNode2, i2, elm);
+        childNode = createElm(oldParentVNode, newVNode2, i2);
         if (childNode) {
           elm.appendChild(childNode);
         }
       }
     }
-    if (BUILD10.svg) {
+    if (BUILD11.svg) {
       if (newVNode2.$tag$ === "svg") {
         isSvgMode = false;
       } else if (elm.tagName === "foreignObject") {
@@ -697,7 +840,7 @@ var createElm = (oldParentVNode, newParentVNode, childIndex, parentElm) => {
     }
   }
   elm["s-hn"] = hostTagName;
-  if (BUILD10.slotRelocation) {
+  if (BUILD11.slotRelocation) {
     if (newVNode2.$flags$ & (2 /* isSlotFallback */ | 1 /* isSlotReference */)) {
       elm["s-sr"] = true;
       elm["s-cr"] = contentRef;
@@ -705,12 +848,15 @@ var createElm = (oldParentVNode, newParentVNode, childIndex, parentElm) => {
       elm["s-rf"] = (_a = newVNode2.$attrs$) == null ? void 0 : _a.ref;
       oldVNode = oldParentVNode && oldParentVNode.$children$ && oldParentVNode.$children$[childIndex];
       if (oldVNode && oldVNode.$tag$ === newVNode2.$tag$ && oldParentVNode.$elm$) {
-        if (BUILD10.experimentalSlotFixes) {
+        if (BUILD11.experimentalSlotFixes) {
           relocateToHostRoot(oldParentVNode.$elm$);
         } else {
           putBackInOriginalLocation(oldParentVNode.$elm$, false);
         }
       }
+      if (BUILD11.scoped) {
+        addRemoveSlotScopedClass(contentRef, elm, newParentVNode.$elm$, oldParentVNode == null ? void 0 : oldParentVNode.$elm$);
+      }
     }
   }
   return elm;
@@ -738,7 +884,7 @@ var relocateToHostRoot = (parentElm) => {
 var putBackInOriginalLocation = (parentElm, recursive) => {
   plt.$flags$ |= 1 /* isTmpDisconnected */;
   const oldSlotChildNodes = Array.from(parentElm.__childNodes || parentElm.childNodes);
-  if (parentElm["s-sr"] && BUILD10.experimentalSlotFixes) {
+  if (parentElm["s-sr"] && BUILD11.experimentalSlotFixes) {
     let node = parentElm;
     while (node = node.nextSibling) {
       if (node && node["s-sn"] === parentElm["s-sn"] && node["s-sh"] === hostTagName) {
@@ -749,7 +895,7 @@ var putBackInOriginalLocation = (parentElm, recursive) => {
   for (let i2 = oldSlotChildNodes.length - 1; i2 >= 0; i2--) {
     const childNode = oldSlotChildNodes[i2];
     if (childNode["s-hn"] !== hostTagName && childNode["s-ol"]) {
-      insertBefore(parentReferenceNode(childNode), childNode, referenceNode(childNode));
+      insertBefore(referenceNode(childNode).parentNode, childNode, referenceNode(childNode));
       childNode["s-ol"].remove();
       childNode["s-ol"] = void 0;
       childNode["s-sh"] = void 0;
@@ -762,17 +908,17 @@ var putBackInOriginalLocation = (parentElm, recursive) => {
   plt.$flags$ &= ~1 /* isTmpDisconnected */;
 };
 var addVnodes = (parentElm, before, parentVNode, vnodes, startIdx, endIdx) => {
-  let containerElm = BUILD10.slotRelocation && parentElm["s-cr"] && parentElm["s-cr"].parentNode || parentElm;
+  let containerElm = BUILD11.slotRelocation && parentElm["s-cr"] && parentElm["s-cr"].parentNode || parentElm;
   let childNode;
-  if (BUILD10.shadowDom && containerElm.shadowRoot && containerElm.tagName === hostTagName) {
+  if (BUILD11.shadowDom && containerElm.shadowRoot && containerElm.tagName === hostTagName) {
     containerElm = containerElm.shadowRoot;
   }
   for (; startIdx <= endIdx; ++startIdx) {
     if (vnodes[startIdx]) {
-      childNode = createElm(null, parentVNode, startIdx, parentElm);
+      childNode = createElm(null, parentVNode, startIdx);
       if (childNode) {
         vnodes[startIdx].$elm$ = childNode;
-        insertBefore(containerElm, childNode, BUILD10.slotRelocation ? referenceNode(before) : before);
+        insertBefore(containerElm, childNode, BUILD11.slotRelocation ? referenceNode(before) : before);
       }
     }
   }
@@ -784,7 +930,7 @@ var removeVnodes = (vnodes, startIdx, endIdx) => {
       const elm = vnode.$elm$;
       nullifyVNodeRefs(vnode);
       if (elm) {
-        if (BUILD10.slotRelocation) {
+        if (BUILD11.slotRelocation) {
           checkSlotFallbackVisibility = true;
           if (elm["s-ol"]) {
             elm["s-ol"].remove();
@@ -828,7 +974,7 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
       oldEndVnode = oldCh[--oldEndIdx];
       newEndVnode = newCh[--newEndIdx];
     } else if (isSameVnode(oldStartVnode, newEndVnode, isInitialRender)) {
-      if (BUILD10.slotRelocation && (oldStartVnode.$tag$ === "slot" || newEndVnode.$tag$ === "slot")) {
+      if (BUILD11.slotRelocation && (oldStartVnode.$tag$ === "slot" || newEndVnode.$tag$ === "slot")) {
         putBackInOriginalLocation(oldStartVnode.$elm$.parentNode, false);
       }
       patch(oldStartVnode, newEndVnode, isInitialRender);
@@ -836,7 +982,7 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
       oldStartVnode = oldCh[++oldStartIdx];
       newEndVnode = newCh[--newEndIdx];
     } else if (isSameVnode(oldEndVnode, newStartVnode, isInitialRender)) {
-      if (BUILD10.slotRelocation && (oldStartVnode.$tag$ === "slot" || newEndVnode.$tag$ === "slot")) {
+      if (BUILD11.slotRelocation && (oldStartVnode.$tag$ === "slot" || newEndVnode.$tag$ === "slot")) {
         putBackInOriginalLocation(oldEndVnode.$elm$.parentNode, false);
       }
       patch(oldEndVnode, newStartVnode, isInitialRender);
@@ -845,7 +991,7 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
       newStartVnode = newCh[++newStartIdx];
     } else {
       idxInOld = -1;
-      if (BUILD10.vdomKey) {
+      if (BUILD11.vdomKey) {
         for (i2 = oldStartIdx; i2 <= oldEndIdx; ++i2) {
           if (oldCh[i2] && oldCh[i2].$key$ !== null && oldCh[i2].$key$ === newStartVnode.$key$) {
             idxInOld = i2;
@@ -853,10 +999,10 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
           }
         }
       }
-      if (BUILD10.vdomKey && idxInOld >= 0) {
+      if (BUILD11.vdomKey && idxInOld >= 0) {
         elmToMove = oldCh[idxInOld];
         if (elmToMove.$tag$ !== newStartVnode.$tag$) {
-          node = createElm(oldCh && oldCh[newStartIdx], newVNode2, idxInOld, parentElm);
+          node = createElm(oldCh && oldCh[newStartIdx], newVNode2, idxInOld);
         } else {
           patch(elmToMove, newStartVnode, isInitialRender);
           oldCh[idxInOld] = void 0;
@@ -864,12 +1010,16 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
         }
         newStartVnode = newCh[++newStartIdx];
       } else {
-        node = createElm(oldCh && oldCh[newStartIdx], newVNode2, newStartIdx, parentElm);
+        node = createElm(oldCh && oldCh[newStartIdx], newVNode2, newStartIdx);
         newStartVnode = newCh[++newStartIdx];
       }
       if (node) {
-        if (BUILD10.slotRelocation) {
-          insertBefore(parentReferenceNode(oldStartVnode.$elm$), node, referenceNode(oldStartVnode.$elm$));
+        if (BUILD11.slotRelocation) {
+          insertBefore(
+            referenceNode(oldStartVnode.$elm$).parentNode,
+            node,
+            referenceNode(oldStartVnode.$elm$)
+          );
         } else {
           insertBefore(oldStartVnode.$elm$.parentNode, node, oldStartVnode.$elm$);
         }
@@ -885,35 +1035,26 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
       newStartIdx,
       newEndIdx
     );
-  } else if (BUILD10.updatable && newStartIdx > newEndIdx) {
+  } else if (BUILD11.updatable && newStartIdx > newEndIdx) {
     removeVnodes(oldCh, oldStartIdx, oldEndIdx);
   }
 };
 var isSameVnode = (leftVNode, rightVNode, isInitialRender = false) => {
   if (leftVNode.$tag$ === rightVNode.$tag$) {
-    if (BUILD10.slotRelocation && leftVNode.$tag$ === "slot") {
-      if (
-        // The component gets hydrated and no VDOM has been initialized.
-        // Here the comparison can't happen as $name$ property is not set for `leftNode`.
-        "$nodeId$" in leftVNode && isInitialRender && // `leftNode` is not from type HTMLComment which would cause many
-        // hydration comments to be removed
-        leftVNode.$elm$.nodeType !== 8
-      ) {
-        return false;
-      }
+    if (BUILD11.slotRelocation && leftVNode.$tag$ === "slot") {
       return leftVNode.$name$ === rightVNode.$name$;
     }
-    if (BUILD10.vdomKey && !isInitialRender) {
+    if (BUILD11.vdomKey && !isInitialRender) {
       return leftVNode.$key$ === rightVNode.$key$;
     }
+    if (isInitialRender && !leftVNode.$key$ && rightVNode.$key$) {
+      leftVNode.$key$ = rightVNode.$key$;
+    }
     return true;
   }
   return false;
 };
-var referenceNode = (node) => {
-  return node && node["s-ol"] || node;
-};
-var parentReferenceNode = (node) => (node["s-ol"] ? node["s-ol"] : node).parentNode;
+var referenceNode = (node) => node && node["s-ol"] || node;
 var patch = (oldVNode, newVNode2, isInitialRender = false) => {
   const elm = newVNode2.$elm$ = oldVNode.$elm$;
   const oldChildren = oldVNode.$children$;
@@ -921,13 +1062,13 @@ var patch = (oldVNode, newVNode2, isInitialRender = false) => {
   const tag = newVNode2.$tag$;
   const text = newVNode2.$text$;
   let defaultHolder;
-  if (!BUILD10.vdomText || text === null) {
-    if (BUILD10.svg) {
+  if (!BUILD11.vdomText || text === null) {
+    if (BUILD11.svg) {
       isSvgMode = tag === "svg" ? true : tag === "foreignObject" ? false : isSvgMode;
     }
-    if (BUILD10.vdomAttribute || BUILD10.reflect) {
-      if (BUILD10.slot && tag === "slot" && !useNativeShadowDom) {
-        if (BUILD10.experimentalSlotFixes && oldVNode.$name$ !== newVNode2.$name$) {
+    if (BUILD11.vdomAttribute || BUILD11.reflect) {
+      if (BUILD11.slot && tag === "slot" && !useNativeShadowDom) {
+        if (BUILD11.experimentalSlotFixes && oldVNode.$name$ !== newVNode2.$name$) {
           newVNode2.$elm$["s-sn"] = newVNode2.$name$ || "";
           relocateToHostRoot(newVNode2.$elm$.parentElement);
         }
@@ -935,55 +1076,28 @@ var patch = (oldVNode, newVNode2, isInitialRender = false) => {
         updateElement(oldVNode, newVNode2, isSvgMode);
       }
     }
-    if (BUILD10.updatable && oldChildren !== null && newChildren !== null) {
+    if (BUILD11.updatable && oldChildren !== null && newChildren !== null) {
       updateChildren(elm, oldChildren, newVNode2, newChildren, isInitialRender);
     } else if (newChildren !== null) {
-      if (BUILD10.updatable && BUILD10.vdomText && oldVNode.$text$ !== null) {
+      if (BUILD11.updatable && BUILD11.vdomText && oldVNode.$text$ !== null) {
         elm.textContent = "";
       }
       addVnodes(elm, null, newVNode2, newChildren, 0, newChildren.length - 1);
     } else if (
       // don't do this on initial render as it can cause non-hydrated content to be removed
-      !isInitialRender && BUILD10.updatable && oldChildren !== null
+      !isInitialRender && BUILD11.updatable && oldChildren !== null
     ) {
       removeVnodes(oldChildren, 0, oldChildren.length - 1);
     }
-    if (BUILD10.svg && isSvgMode && tag === "svg") {
+    if (BUILD11.svg && isSvgMode && tag === "svg") {
       isSvgMode = false;
     }
-  } else if (BUILD10.vdomText && BUILD10.slotRelocation && (defaultHolder = elm["s-cr"])) {
+  } else if (BUILD11.vdomText && BUILD11.slotRelocation && (defaultHolder = elm["s-cr"])) {
     defaultHolder.parentNode.textContent = text;
-  } else if (BUILD10.vdomText && oldVNode.$text$ !== text) {
+  } else if (BUILD11.vdomText && oldVNode.$text$ !== text) {
     elm.data = text;
   }
 };
-var updateFallbackSlotVisibility = (elm) => {
-  const childNodes = elm.__childNodes || elm.childNodes;
-  for (const childNode of childNodes) {
-    if (childNode.nodeType === 1 /* ElementNode */) {
-      if (childNode["s-sr"]) {
-        const slotName = childNode["s-sn"];
-        childNode.hidden = false;
-        for (const siblingNode of childNodes) {
-          if (siblingNode !== childNode) {
-            if (siblingNode["s-hn"] !== childNode["s-hn"] || slotName !== "") {
-              if (siblingNode.nodeType === 1 /* ElementNode */ && (slotName === siblingNode.getAttribute("slot") || slotName === siblingNode["s-sn"]) || siblingNode.nodeType === 3 /* TextNode */ && slotName === siblingNode["s-sn"]) {
-                childNode.hidden = true;
-                break;
-              }
-            } else if (slotName === siblingNode["s-sn"]) {
-              if (siblingNode.nodeType === 1 /* ElementNode */ || siblingNode.nodeType === 3 /* TextNode */ && siblingNode.textContent.trim() !== "") {
-                childNode.hidden = true;
-                break;
-              }
-            }
-          }
-        }
-      }
-      updateFallbackSlotVisibility(childNode);
-    }
-  }
-};
 var relocateNodes = [];
 var markSlotContentForRelocation = (elm) => {
   let node;
@@ -996,7 +1110,7 @@ var markSlotContentForRelocation = (elm) => {
       const slotName = childNode["s-sn"];
       for (j = hostContentNodes.length - 1; j >= 0; j--) {
         node = hostContentNodes[j];
-        if (!node["s-cn"] && !node["s-nr"] && node["s-hn"] !== childNode["s-hn"] && (!BUILD10.experimentalSlotFixes || !node["s-sh"] || node["s-sh"] !== childNode["s-hn"])) {
+        if (!node["s-cn"] && !node["s-nr"] && node["s-hn"] !== childNode["s-hn"] && (!BUILD11.experimentalSlotFixes || !node["s-sh"] || node["s-sh"] !== childNode["s-hn"])) {
           if (isNodeLocatedInSlot(node, slotName)) {
             let relocateNodeData = relocateNodes.find((r) => r.$nodeToRelocate$ === node);
             checkSlotFallbackVisibility = true;
@@ -1034,60 +1148,40 @@ var markSlotContentForRelocation = (elm) => {
     }
   }
 };
-var isNodeLocatedInSlot = (nodeToRelocate, slotName) => {
-  if (nodeToRelocate.nodeType === 1 /* ElementNode */) {
-    if (nodeToRelocate.getAttribute("slot") === null && slotName === "") {
-      return true;
-    }
-    if (nodeToRelocate.getAttribute("slot") === slotName) {
-      return true;
-    }
-    return false;
-  }
-  if (nodeToRelocate["s-sn"] === slotName) {
-    return true;
-  }
-  return slotName === "";
-};
 var nullifyVNodeRefs = (vNode) => {
-  if (BUILD10.vdomRef) {
+  if (BUILD11.vdomRef) {
     vNode.$attrs$ && vNode.$attrs$.ref && vNode.$attrs$.ref(null);
     vNode.$children$ && vNode.$children$.map(nullifyVNodeRefs);
   }
 };
 var insertBefore = (parent, newNode, reference) => {
-  const inserted = parent == null ? void 0 : parent.insertBefore(newNode, reference);
-  if (BUILD10.scoped) {
-    updateElementScopeIds(newNode, parent);
+  if (BUILD11.scoped && typeof newNode["s-sn"] === "string" && !!newNode["s-sr"] && !!newNode["s-cr"]) {
+    addRemoveSlotScopedClass(newNode["s-cr"], newNode, parent, newNode.parentElement);
   }
+  const inserted = parent == null ? void 0 : parent.insertBefore(newNode, reference);
   return inserted;
 };
-var findScopeIds = (element) => {
-  const scopeIds = [];
-  if (element) {
-    scopeIds.push(
-      ...element["s-scs"] || [],
-      element["s-si"],
-      element["s-sc"],
-      ...findScopeIds(element.parentElement)
-    );
-  }
-  return scopeIds;
-};
-var updateElementScopeIds = (element, parent, iterateChildNodes = false) => {
+function addRemoveSlotScopedClass(reference, slotNode, newParent, oldParent) {
   var _a;
-  if (element && parent && element.nodeType === 1 /* ElementNode */) {
-    const scopeIds = new Set(findScopeIds(parent).filter(Boolean));
-    if (scopeIds.size) {
-      (_a = element.classList) == null ? void 0 : _a.add(...element["s-scs"] = Array.from(scopeIds));
-      if (element["s-ol"] || iterateChildNodes) {
-        for (const childNode of Array.from(element.__childNodes || element.childNodes)) {
-          updateElementScopeIds(childNode, element, true);
+  let scopeId2;
+  if (reference && typeof slotNode["s-sn"] === "string" && !!slotNode["s-sr"] && reference.parentNode && reference.parentNode["s-sc"] && (scopeId2 = slotNode["s-si"] || reference.parentNode["s-sc"])) {
+    const scopeName = slotNode["s-sn"];
+    const hostName = slotNode["s-hn"];
+    (_a = newParent.classList) == null ? void 0 : _a.add(scopeId2 + "-s");
+    if (oldParent && oldParent.classList.contains(scopeId2 + "-s")) {
+      let child = (oldParent.__childNodes || oldParent.childNodes)[0];
+      let found = false;
+      while (child) {
+        if (child["s-sn"] !== scopeName && child["s-hn"] === hostName && !!child["s-sr"]) {
+          found = true;
+          break;
         }
+        child = child.nextSibling;
       }
+      if (!found) oldParent.classList.remove(scopeId2 + "-s");
     }
   }
-};
+}
 var renderVdom = (hostRef, renderFnResults, isInitialLoad = false) => {
   var _a, _b, _c, _d, _e;
   const hostElm = hostRef.$hostElement$;
@@ -1095,7 +1189,7 @@ var renderVdom = (hostRef, renderFnResults, isInitialLoad = false) => {
   const oldVNode = hostRef.$vnode$ || newVNode(null, null);
   const rootVnode = isHost(renderFnResults) ? renderFnResults : h(null, null, renderFnResults);
   hostTagName = hostElm.tagName;
-  if (BUILD10.isDev && Array.isArray(renderFnResults) && renderFnResults.some(isHost)) {
+  if (BUILD11.isDev && Array.isArray(renderFnResults) && renderFnResults.some(isHost)) {
     throw new Error(`The <Host> must be the single root component.
 Looks like the render() function of "${hostTagName.toLowerCase()}" is returning an array that contains the <Host>.
 
@@ -1109,7 +1203,7 @@ render() {
 }
   `);
   }
-  if (BUILD10.reflect && cmpMeta.$attrsToReflect$) {
+  if (BUILD11.reflect && cmpMeta.$attrsToReflect$) {
     rootVnode.$attrs$ = rootVnode.$attrs$ || {};
     cmpMeta.$attrsToReflect$.map(
       ([propName, attribute]) => rootVnode.$attrs$[attribute] = hostElm[propName]
@@ -1125,24 +1219,24 @@ render() {
   rootVnode.$tag$ = null;
   rootVnode.$flags$ |= 4 /* isHost */;
   hostRef.$vnode$ = rootVnode;
-  rootVnode.$elm$ = oldVNode.$elm$ = BUILD10.shadowDom ? hostElm.shadowRoot || hostElm : hostElm;
-  if (BUILD10.scoped || BUILD10.shadowDom) {
+  rootVnode.$elm$ = oldVNode.$elm$ = BUILD11.shadowDom ? hostElm.shadowRoot || hostElm : hostElm;
+  if (BUILD11.scoped || BUILD11.shadowDom) {
     scopeId = hostElm["s-sc"];
   }
   useNativeShadowDom = supportsShadow && (cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) !== 0;
-  if (BUILD10.slotRelocation) {
+  if (BUILD11.slotRelocation) {
     contentRef = hostElm["s-cr"];
     checkSlotFallbackVisibility = false;
   }
   patch(oldVNode, rootVnode, isInitialLoad);
-  if (BUILD10.slotRelocation) {
+  if (BUILD11.slotRelocation) {
     plt.$flags$ |= 1 /* isTmpDisconnected */;
     if (checkSlotRelocate) {
       markSlotContentForRelocation(rootVnode.$elm$);
       for (const relocateData of relocateNodes) {
         const nodeToRelocate = relocateData.$nodeToRelocate$;
         if (!nodeToRelocate["s-ol"]) {
-          const orgLocationNode = BUILD10.isDebug || BUILD10.hydrateServerSide ? originalLocationDebugNode(nodeToRelocate) : doc.createTextNode("");
+          const orgLocationNode = BUILD11.isDebug || BUILD11.hydrateServerSide ? originalLocationDebugNode(nodeToRelocate) : doc.createTextNode("");
           orgLocationNode["s-nr"] = nodeToRelocate;
           insertBefore(nodeToRelocate.parentNode, nodeToRelocate["s-ol"] = orgLocationNode, nodeToRelocate);
         }
@@ -1153,7 +1247,7 @@ render() {
         if (slotRefNode) {
           const parentNodeRef = slotRefNode.parentNode;
           let insertBeforeNode = slotRefNode.nextSibling;
-          if (!BUILD10.experimentalSlotFixes || insertBeforeNode && insertBeforeNode.nodeType === 1 /* ElementNode */) {
+          if (!BUILD11.hydrateServerSide && (!BUILD11.experimentalSlotFixes || insertBeforeNode && insertBeforeNode.nodeType === 1 /* ElementNode */)) {
             let orgLocationNode = (_a = nodeToRelocate["s-ol"]) == null ? void 0 : _a.previousSibling;
             while (orgLocationNode) {
               let refNode = (_b = orgLocationNode["s-nr"]) != null ? _b : null;
@@ -1172,11 +1266,11 @@ render() {
           }
           if (!insertBeforeNode && parentNodeRef !== nodeToRelocate.parentNode || nodeToRelocate.nextSibling !== insertBeforeNode) {
             if (nodeToRelocate !== insertBeforeNode) {
-              if (!BUILD10.experimentalSlotFixes && !nodeToRelocate["s-hn"] && nodeToRelocate["s-ol"]) {
+              if (!BUILD11.experimentalSlotFixes && !nodeToRelocate["s-hn"] && nodeToRelocate["s-ol"]) {
                 nodeToRelocate["s-hn"] = nodeToRelocate["s-ol"].parentNode.nodeName;
               }
               insertBefore(parentNodeRef, nodeToRelocate, insertBeforeNode);
-              if (nodeToRelocate.nodeType === 1 /* ElementNode */) {
+              if (nodeToRelocate.nodeType === 1 /* ElementNode */ && nodeToRelocate.tagName !== "SLOT-FB") {
                 nodeToRelocate.hidden = (_c = nodeToRelocate["s-ih"]) != null ? _c : false;
               }
             }
@@ -1198,7 +1292,7 @@ render() {
     plt.$flags$ &= ~1 /* isTmpDisconnected */;
     relocateNodes.length = 0;
   }
-  if (BUILD10.experimentalScopedSlotChanges && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+  if (BUILD11.experimentalScopedSlotChanges && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
     const children = rootVnode.$elm$.__childNodes || rootVnode.$elm$.childNodes;
     for (const childNode of children) {
       if (childNode["s-hn"] !== hostTagName && !childNode["s-sh"]) {
@@ -1235,9 +1329,9 @@ var patchCloneNode = (HostElementPrototype) => {
   const orgCloneNode = HostElementPrototype.cloneNode;
   HostElementPrototype.cloneNode = function(deep) {
     const srcNode = this;
-    const isShadowDom = BUILD11.shadowDom ? srcNode.shadowRoot && supportsShadow : false;
+    const isShadowDom = BUILD12.shadowDom ? srcNode.shadowRoot && supportsShadow : false;
     const clonedNode = orgCloneNode.call(srcNode, isShadowDom ? deep : false);
-    if (BUILD11.slot && !isShadowDom && deep) {
+    if (BUILD12.slot && !isShadowDom && deep) {
       let i2 = 0;
       let slotted, nonRindoNode;
       const rindoPrivates = [
@@ -1262,7 +1356,7 @@ var patchCloneNode = (HostElementPrototype) => {
         slotted = childNodes[i2]["s-nr"];
         nonRindoNode = rindoPrivates.every((privateField) => !childNodes[i2][privateField]);
         if (slotted) {
-          if (BUILD11.appendChildSlotFix && clonedNode.__appendChild) {
+          if (BUILD12.appendChildSlotFix && clonedNode.__appendChild) {
             clonedNode.__appendChild(slotted.cloneNode(true));
           } else {
             clonedNode.appendChild(slotted.cloneNode(true));
@@ -1280,7 +1374,7 @@ var patchSlotAppendChild = (HostElementPrototype) => {
   HostElementPrototype.__appendChild = HostElementPrototype.appendChild;
   HostElementPrototype.appendChild = function(newChild) {
     const slotName = newChild["s-sn"] = getSlotName(newChild);
-    const slotNode = getHostSlotNode(this.__childNodes || this.childNodes, slotName, this.tagName);
+    const slotNode = getHostSlotNodes(this.__childNodes || this.childNodes, this.tagName, slotName)[0];
     if (slotNode) {
       addSlotRelocateNode(newChild, slotNode);
       const slotChildNodes = getHostSlotChildNodes(slotNode, slotName);
@@ -1297,7 +1391,7 @@ var patchSlotRemoveChild = (ElementPrototype) => {
   ElementPrototype.removeChild = function(toRemove) {
     if (toRemove && typeof toRemove["s-sn"] !== "undefined") {
       const childNodes = this.__childNodes || this.childNodes;
-      const slotNode = getHostSlotNode(childNodes, toRemove["s-sn"], this.tagName);
+      const slotNode = getHostSlotNodes(childNodes, this.tagName, toRemove["s-sn"]);
       if (slotNode && toRemove.isConnected) {
         toRemove.remove();
         updateFallbackSlotVisibility(this);
@@ -1316,7 +1410,7 @@ var patchSlotPrepend = (HostElementPrototype) => {
       }
       const slotName = newChild["s-sn"] = getSlotName(newChild);
       const childNodes = this.__childNodes || this.childNodes;
-      const slotNode = getHostSlotNode(childNodes, slotName, this.tagName);
+      const slotNode = getHostSlotNodes(childNodes, this.tagName, slotName)[0];
       if (slotNode) {
         addSlotRelocateNode(newChild, slotNode, true);
         const slotChildNodes = getHostSlotChildNodes(slotNode, slotName);
@@ -1383,11 +1477,7 @@ var patchSlotInsertAdjacentElement = (HostElementPrototype) => {
   };
 };
 var patchTextContent = (hostElementPrototype) => {
-  let descriptor = globalThis.Node && Object.getOwnPropertyDescriptor(Node.prototype, "textContent");
-  if (!descriptor) {
-    descriptor = Object.getOwnPropertyDescriptor(hostElementPrototype, "textContent");
-  }
-  if (descriptor) Object.defineProperty(hostElementPrototype, "__textContent", descriptor);
+  patchHostOriginalAccessor("textContent", hostElementPrototype);
   Object.defineProperty(hostElementPrototype, "textContent", {
     get: function() {
       let text = "";
@@ -1411,16 +1501,7 @@ var patchChildSlotNodes = (elm) => {
       return this[n];
     }
   }
-  let childNodesFn = globalThis.Node && Object.getOwnPropertyDescriptor(Node.prototype, "childNodes");
-  if (!childNodesFn) {
-    childNodesFn = Object.getOwnPropertyDescriptor(elm, "childNodes");
-  }
-  if (childNodesFn) Object.defineProperty(elm, "__childNodes", childNodesFn);
-  let childrenFn = Object.getOwnPropertyDescriptor(Element.prototype, "children");
-  if (!childrenFn) {
-    childrenFn = Object.getOwnPropertyDescriptor(elm, "children");
-  }
-  if (childrenFn) Object.defineProperty(elm, "__children", childrenFn);
+  patchHostOriginalAccessor("children", elm);
   Object.defineProperty(elm, "children", {
     get() {
       return this.childNodes.filter((n) => n.nodeType === 1);
@@ -1431,7 +1512,19 @@ var patchChildSlotNodes = (elm) => {
       return this.children.length;
     }
   });
-  if (!childNodesFn) return;
+  patchHostOriginalAccessor("firstChild", elm);
+  Object.defineProperty(elm, "firstChild", {
+    get() {
+      return this.childNodes[0];
+    }
+  });
+  patchHostOriginalAccessor("lastChild", elm);
+  Object.defineProperty(elm, "lastChild", {
+    get() {
+      return this.childNodes[this.childNodes.length - 1];
+    }
+  });
+  patchHostOriginalAccessor("childNodes", elm);
   Object.defineProperty(elm, "childNodes", {
     get() {
       var _a, _b;
@@ -1445,77 +1538,102 @@ var patchChildSlotNodes = (elm) => {
     }
   });
 };
-var addSlotRelocateNode = (newChild, slotNode, prepend, position) => {
-  let slottedNodeLocation;
-  if (newChild["s-ol"] && newChild["s-ol"].isConnected) {
-    slottedNodeLocation = newChild["s-ol"];
-  } else {
-    slottedNodeLocation = document.createTextNode("");
-    slottedNodeLocation["s-nr"] = newChild;
+var patchNextPrev = (node) => {
+  if (!node || node.__nextSibling || !globalThis.Node) return;
+  patchNextSibling(node);
+  patchPreviousSibling(node);
+  if (node.nodeType === Node.ELEMENT_NODE) {
+    patchNextElementSibling(node);
+    patchPreviousElementSibling(node);
   }
-  if (!slotNode["s-cr"] || !slotNode["s-cr"].parentNode) return;
-  const parent = slotNode["s-cr"].parentNode;
-  const appendMethod = prepend ? parent.__prepend || parent.prepend : parent.__appendChild || parent.appendChild;
-  if (typeof position !== "undefined") {
-    if (BUILD11.hydrateClientSide) {
-      slottedNodeLocation["s-oo"] = position;
-      const childNodes = parent.__childNodes || parent.childNodes;
-      const slotRelocateNodes = [slottedNodeLocation];
-      childNodes.forEach((n) => {
-        if (n["s-nr"]) slotRelocateNodes.push(n);
-      });
-      slotRelocateNodes.sort((a, b) => {
-        if (!a["s-oo"] || a["s-oo"] < b["s-oo"]) return -1;
-        else if (!b["s-oo"] || b["s-oo"] < a["s-oo"]) return 1;
-        return 0;
-      });
-      slotRelocateNodes.forEach((n) => appendMethod.call(parent, n));
+};
+var patchNextSibling = (node) => {
+  if (!node || node.__nextSibling) return;
+  patchHostOriginalAccessor("nextSibling", node);
+  Object.defineProperty(node, "nextSibling", {
+    get: function() {
+      var _a;
+      const parentNodes = (_a = this["s-ol"]) == null ? void 0 : _a.parentNode.childNodes;
+      const index = parentNodes == null ? void 0 : parentNodes.indexOf(this);
+      if (parentNodes && index > -1) {
+        return parentNodes[index + 1];
+      }
+      return this.__nextSibling;
     }
-  } else {
-    appendMethod.call(parent, slottedNodeLocation);
-  }
-  newChild["s-ol"] = slottedNodeLocation;
-  newChild["s-sh"] = slotNode["s-hn"];
+  });
 };
-var getSlottedChildNodes = (childNodes) => {
-  const result = [];
-  for (let i2 = 0; i2 < childNodes.length; i2++) {
-    const slottedNode = childNodes[i2]["s-nr"];
-    if (slottedNode && slottedNode.isConnected) {
-      result.push(slottedNode);
+var patchNextElementSibling = (element) => {
+  if (!element || element.__nextElementSibling) return;
+  patchHostOriginalAccessor("nextElementSibling", element);
+  Object.defineProperty(element, "nextElementSibling", {
+    get: function() {
+      var _a;
+      const parentEles = (_a = this["s-ol"]) == null ? void 0 : _a.parentNode.children;
+      const index = parentEles == null ? void 0 : parentEles.indexOf(this);
+      if (parentEles && index > -1) {
+        return parentEles[index + 1];
+      }
+      return this.__nextElementSibling;
     }
-  }
-  return result;
+  });
 };
-var getSlotName = (node) => node["s-sn"] || node.nodeType === 1 && node.getAttribute("slot") || "";
-var getHostSlotNode = (childNodes, slotName, hostName) => {
-  let i2 = 0;
-  let childNode;
-  for (; i2 < childNodes.length; i2++) {
-    childNode = childNodes[i2];
-    if (childNode["s-sr"] && childNode["s-sn"] === slotName && childNode["s-hn"] === hostName) {
-      return childNode;
+var patchPreviousSibling = (node) => {
+  if (!node || node.__previousSibling) return;
+  patchHostOriginalAccessor("previousSibling", node);
+  Object.defineProperty(node, "previousSibling", {
+    get: function() {
+      var _a;
+      const parentNodes = (_a = this["s-ol"]) == null ? void 0 : _a.parentNode.childNodes;
+      const index = parentNodes == null ? void 0 : parentNodes.indexOf(this);
+      if (parentNodes && index > -1) {
+        return parentNodes[index - 1];
+      }
+      return this.__previousSibling;
     }
-    childNode = getHostSlotNode(childNode.childNodes, slotName, hostName);
-    if (childNode) {
-      return childNode;
+  });
+};
+var patchPreviousElementSibling = (element) => {
+  if (!element || element.__previousElementSibling) return;
+  patchHostOriginalAccessor("previousElementSibling", element);
+  Object.defineProperty(element, "previousElementSibling", {
+    get: function() {
+      var _a;
+      const parentNodes = (_a = this["s-ol"]) == null ? void 0 : _a.parentNode.children;
+      const index = parentNodes == null ? void 0 : parentNodes.indexOf(this);
+      if (parentNodes && index > -1) {
+        return parentNodes[index - 1];
+      }
+      return this.__previousElementSibling;
     }
-  }
-  return null;
+  });
 };
-var getHostSlotChildNodes = (n, slotName) => {
-  const childNodes = [n];
-  while ((n = n.nextSibling) && n["s-sn"] === slotName) {
-    childNodes.push(n);
+var validElementPatches = ["children", "nextElementSibling", "previousElementSibling"];
+var validNodesPatches = [
+  "childNodes",
+  "firstChild",
+  "lastChild",
+  "nextSibling",
+  "previousSibling",
+  "textContent"
+];
+function patchHostOriginalAccessor(accessorName, node) {
+  let accessor;
+  if (validElementPatches.includes(accessorName)) {
+    accessor = Object.getOwnPropertyDescriptor(Element.prototype, accessorName);
+  } else if (validNodesPatches.includes(accessorName)) {
+    accessor = Object.getOwnPropertyDescriptor(Node.prototype, accessorName);
   }
-  return childNodes;
-};
+  if (!accessor) {
+    accessor = Object.getOwnPropertyDescriptor(node, accessorName);
+  }
+  if (accessor) Object.defineProperty(node, "__" + accessorName, accessor);
+}
 
 // src/runtime/profile.ts
-import { BUILD as BUILD12 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD13 } from "@rindo/core/internal/app-data";
 var i = 0;
 var createTime = (fnName, tagName = "") => {
-  if (BUILD12.profile && performance.mark) {
+  if (BUILD13.profile && performance.mark) {
     const key = `st:${fnName}:${tagName}:${i++}`;
     performance.mark(key);
     return () => performance.measure(`[Rindo] ${fnName}() <${tagName}>`, key);
@@ -1526,7 +1644,7 @@ var createTime = (fnName, tagName = "") => {
   }
 };
 var uniqueTime = (key, measureText) => {
-  if (BUILD12.profile && performance.mark) {
+  if (BUILD13.profile && performance.mark) {
     if (performance.getEntriesByName(key, "mark").length === 0) {
       performance.mark(key);
     }
@@ -1584,7 +1702,7 @@ var inspect = (ref) => {
   };
 };
 var installDevTools = () => {
-  if (BUILD12.devTools) {
+  if (BUILD13.devTools) {
     const rindo = win.rindo = win.rindo || {};
     const originalInspect = rindo.inspect;
     rindo.inspect = (ref) => {
@@ -1604,9 +1722,19 @@ var initializeClientHydrate = (hostElm, tagName, hostId, hostRef) => {
   const childRenderNodes = [];
   const slotNodes = [];
   const slottedNodes = [];
-  const shadowRootNodes = BUILD13.shadowDom && shadowRoot ? [] : null;
+  const shadowRootNodes = BUILD14.shadowDom && shadowRoot ? [] : null;
   const vnode = newVNode(tagName, null);
   vnode.$elm$ = hostElm;
+  let scopeId2;
+  if (BUILD14.scoped) {
+    const cmpMeta = hostRef.$cmpMeta$;
+    if (cmpMeta && cmpMeta.$flags$ & 10 /* needsScopedEncapsulation */ && hostElm["s-sc"]) {
+      scopeId2 = hostElm["s-sc"];
+      hostElm.classList.add(scopeId2 + "-h");
+    } else if (hostElm["s-sc"]) {
+      delete hostElm["s-sc"];
+    }
+  }
   if (!plt.$orgLocNodes$) {
     initializeDocumentHydrate(doc.body, plt.$orgLocNodes$ = /* @__PURE__ */ new Map());
   }
@@ -1636,6 +1764,18 @@ var initializeClientHydrate = (hostElm, tagName, hostId, hostRef) => {
         node["s-cr"] = hostElm["s-cr"];
       }
     }
+    if (childRenderNode.$tag$ === "slot") {
+      if (childRenderNode.$children$) {
+        childRenderNode.$flags$ |= 2 /* isSlotFallback */;
+        if (!childRenderNode.$elm$.childNodes.length) {
+          childRenderNode.$children$.forEach((c) => {
+            childRenderNode.$elm$.appendChild(c.$elm$);
+          });
+        }
+      } else {
+        childRenderNode.$flags$ |= 1 /* isSlotReference */;
+      }
+    }
     if (orgLocationNode && orgLocationNode.isConnected) {
       if (shadowRoot && orgLocationNode["s-en"] === "") {
         orgLocationNode.parentNode.insertBefore(node, orgLocationNode.nextSibling);
@@ -1648,8 +1788,8 @@ var initializeClientHydrate = (hostElm, tagName, hostId, hostRef) => {
     plt.$orgLocNodes$.delete(orgLocationId);
   }
   const hosts = [];
-  let snIndex = 0;
   const snLen = slottedNodes.length;
+  let snIndex = 0;
   let slotGroup;
   let snGroupIdx;
   let snGroupLen;
@@ -1671,17 +1811,24 @@ var initializeClientHydrate = (hostElm, tagName, hostId, hostRef) => {
         if (!slottedItem.slot["s-cr"] && hostEle.shadowRoot) {
           slottedItem.slot["s-cr"] = hostEle;
         } else {
-          const hostChildren = hostEle.__childNodes || hostEle.childNodes;
-          slottedItem.slot["s-cr"] = hostChildren[0];
+          slottedItem.slot["s-cr"] = (hostEle.__childNodes || hostEle.childNodes)[0];
         }
         addSlotRelocateNode(slottedItem.node, slottedItem.slot, false, slottedItem.node["s-oo"]);
+        if (BUILD14.experimentalSlotFixes) {
+          patchNextPrev(slottedItem.node);
+        }
       }
       if (hostEle.shadowRoot && slottedItem.node.parentElement !== hostEle) {
         hostEle.appendChild(slottedItem.node);
       }
     }
   }
-  if (BUILD13.shadowDom && shadowRoot) {
+  if (BUILD14.scoped && scopeId2 && slotNodes.length) {
+    slotNodes.forEach((slot) => {
+      slot.$elm$.parentElement.classList.add(scopeId2 + "-s");
+    });
+  }
+  if (BUILD14.shadowDom && shadowRoot) {
     let rnIdex = 0;
     const rnLen = shadowRootNodes.length;
     for (rnIdex; rnIdex < rnLen; rnIdex++) {
@@ -1715,15 +1862,19 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
           $index$: childIdSplt[3],
           $tag$: node.tagName.toLowerCase(),
           $elm$: node,
-          // If we don't add the initial classes to the VNode, the first `vdom-render.ts` reconciliation will fail:
-          // client side changes before componentDidLoad will be ignored, `set-accessor.ts` will just take the element's initial classes
-          $attrs$: { class: node.className }
+          // If we don't add the initial classes to the VNode, the first `vdom-render.ts` patch
+          // won't try to reconcile them. Classes set on the node will be blown away.
+          $attrs$: { class: node.className || "" }
         });
         childRenderNodes.push(childVNode);
         node.removeAttribute(HYDRATE_CHILD_ID);
         if (!parentVNode.$children$) {
           parentVNode.$children$ = [];
         }
+        if (BUILD14.scoped && scopeId2) {
+          node["s-si"] = scopeId2;
+          childVNode.$attrs$.class += " " + scopeId2;
+        }
         const slotName = childVNode.$elm$.getAttribute("s-sn");
         if (typeof slotName === "string") {
           if (childVNode.$tag$ === "slot-fb") {
@@ -1738,6 +1889,9 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
               shadowRootNodes,
               slottedNodes
             );
+            if (BUILD14.scoped && scopeId2) {
+              node.classList.add(scopeId2);
+            }
           }
           childVNode.$elm$["s-sn"] = slotName;
           childVNode.$elm$.removeAttribute("s-sn");
@@ -1745,7 +1899,6 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
         if (childVNode.$index$ !== void 0) {
           parentVNode.$children$[childVNode.$index$] = childVNode;
         }
-        if (scopeId2) node["s-si"] = scopeId2;
         parentVNode = childVNode;
         if (shadowRootNodes && childVNode.$depth$ === "0") {
           shadowRootNodes[childVNode.$index$] = childVNode.$elm$;
@@ -1820,8 +1973,7 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
         }
       } else if (childVNode.$hostId$ === hostId) {
         if (childNodeType === SLOT_NODE_ID) {
-          childVNode.$tag$ = "slot";
-          const slotName = node["s-sn"] = childVNode.$name$ = childIdSplt[5] || "";
+          const slotName = node["s-sn"] = childIdSplt[5] || "";
           addSlot(
             slotName,
             childIdSplt[2],
@@ -1834,9 +1986,9 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
             slottedNodes
           );
         } else if (childNodeType === CONTENT_REF_ID) {
-          if (BUILD13.shadowDom && shadowRootNodes) {
+          if (BUILD14.shadowDom && shadowRootNodes) {
             node.remove();
-          } else if (BUILD13.slotRelocation) {
+          } else if (BUILD14.slotRelocation) {
             hostElm["s-cr"] = node;
             node["s-cn"] = true;
           }
@@ -1895,8 +2047,10 @@ var createSimpleVNode = (vnode) => {
 };
 function addSlot(slotName, slotId, childVNode, node, parentVNode, childRenderNodes, slotNodes, shadowRootNodes, slottedNodes) {
   node["s-sr"] = true;
+  childVNode.$name$ = slotName || null;
+  childVNode.$tag$ = "slot";
   const parentNodeId = (parentVNode == null ? void 0 : parentVNode.$elm$) ? parentVNode.$elm$["s-id"] || parentVNode.$elm$.getAttribute("s-id") : "";
-  if (BUILD13.shadowDom && shadowRootNodes) {
+  if (BUILD14.shadowDom && shadowRootNodes) {
     const slot = childVNode.$elm$ = doc.createElement(childVNode.$tag$);
     if (childVNode.$name$) {
       childVNode.$elm$.setAttribute("name", slotName);
@@ -1937,7 +2091,7 @@ var addSlottedNodes = (slottedNodes, slotNodeId, slotName, slotNode, hostId) =>
 };
 
 // src/runtime/initialize-component.ts
-import { BUILD as BUILD21 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD22 } from "@rindo/core/internal/app-data";
 
 // src/runtime/mode.ts
 var computeMode = (elm) => modeResolutionChain.map((h2) => h2(elm)).find((m) => !!m);
@@ -1945,22 +2099,22 @@ var setMode = (handler) => modeResolutionChain.push(handler);
 var getMode = (ref) => getHostRef(ref).$modeName$;
 
 // src/runtime/proxy-component.ts
-import { BUILD as BUILD20 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD21 } from "@rindo/core/internal/app-data";
 
 // src/runtime/set-value.ts
-import { BUILD as BUILD19 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD20 } from "@rindo/core/internal/app-data";
 
 // src/runtime/parse-property-value.ts
-import { BUILD as BUILD14 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD15 } from "@rindo/core/internal/app-data";
 var parsePropertyValue = (propValue, propType) => {
   if (propValue != null && !isComplexType(propValue)) {
-    if (BUILD14.propBoolean && propType & 4 /* Boolean */) {
+    if (BUILD15.propBoolean && propType & 4 /* Boolean */) {
       return propValue === "false" ? false : propValue === "" || !!propValue;
     }
-    if (BUILD14.propNumber && propType & 2 /* Number */) {
+    if (BUILD15.propNumber && propType & 2 /* Number */) {
       return parseFloat(propValue);
     }
-    if (BUILD14.propString && propType & 1 /* String */) {
+    if (BUILD15.propString && propType & 1 /* String */) {
       return String(propValue);
     }
     return propValue;
@@ -1969,21 +2123,21 @@ var parsePropertyValue = (propValue, propType) => {
 };
 
 // src/runtime/update-component.ts
-import { BUILD as BUILD18, NAMESPACE } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD19, NAMESPACE } from "@rindo/core/internal/app-data";
 
 // src/runtime/event-emitter.ts
-import { BUILD as BUILD16 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD17 } from "@rindo/core/internal/app-data";
 
 // src/runtime/element.ts
-import { BUILD as BUILD15 } from "@rindo/core/internal/app-data";
-var getElement = (ref) => BUILD15.lazyLoad ? getHostRef(ref).$hostElement$ : ref;
+import { BUILD as BUILD16 } from "@rindo/core/internal/app-data";
+var getElement = (ref) => BUILD16.lazyLoad ? getHostRef(ref).$hostElement$ : ref;
 
 // src/runtime/event-emitter.ts
 var createEvent = (ref, name, flags) => {
   const elm = getElement(ref);
   return {
     emit: (detail) => {
-      if (BUILD16.isDev && !elm.isConnected) {
+      if (BUILD17.isDev && !elm.isConnected) {
         consoleDevWarn(`The "${name}" event was emitted, but the dispatcher node is no longer connected to the dom.`);
       }
       return emitEvent(elm, name, {
@@ -2002,7 +2156,7 @@ var emitEvent = (elm, name, opts) => {
 };
 
 // src/runtime/styles.ts
-import { BUILD as BUILD17 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD18 } from "@rindo/core/internal/app-data";
 var rootAppliedStyles = /* @__PURE__ */ new WeakMap();
 var registerStyle = (scopeId2, cssText, allowCS) => {
   let style = styles.get(scopeId2);
@@ -2022,7 +2176,7 @@ var addStyle = (styleContainerNode, cmpMeta, mode) => {
   var _a;
   const scopeId2 = getScopeId(cmpMeta, mode);
   const style = styles.get(scopeId2);
-  if (!BUILD17.attachStyles) {
+  if (!BUILD18.attachStyles) {
     return scopeId2;
   }
   styleContainerNode = styleContainerNode.nodeType === 11 /* DocumentFragment */ ? styleContainerNode : doc;
@@ -2035,16 +2189,16 @@ var addStyle = (styleContainerNode, cmpMeta, mode) => {
         rootAppliedStyles.set(styleContainerNode, appliedStyles = /* @__PURE__ */ new Set());
       }
       if (!appliedStyles.has(scopeId2)) {
-        if (BUILD17.hydrateClientSide && styleContainerNode.host && (styleElm = styleContainerNode.querySelector(`[${HYDRATED_STYLE_ID}="${scopeId2}"]`))) {
+        if (BUILD18.hydrateClientSide && styleContainerNode.host && (styleElm = styleContainerNode.querySelector(`[${HYDRATED_STYLE_ID}="${scopeId2}"]`))) {
           styleElm.innerHTML = style;
         } else {
-          styleElm = doc.createElement("style");
+          styleElm = document.querySelector(`[${HYDRATED_STYLE_ID}="${scopeId2}"]`) || doc.createElement("style");
           styleElm.innerHTML = style;
           const nonce = (_a = plt.$nonce$) != null ? _a : queryNonceMetaTagContent(doc);
           if (nonce != null) {
             styleElm.setAttribute("nonce", nonce);
           }
-          if ((BUILD17.hydrateServerSide || BUILD17.hotModuleReplacement) && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+          if ((BUILD18.hydrateServerSide || BUILD18.hotModuleReplacement) && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
             styleElm.setAttribute(HYDRATED_STYLE_ID, scopeId2);
           }
           if (!(cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */)) {
@@ -2080,7 +2234,7 @@ var addStyle = (styleContainerNode, cmpMeta, mode) => {
           appliedStyles.add(scopeId2);
         }
       }
-    } else if (BUILD17.constructableCSS && !styleContainerNode.adoptedStyleSheets.includes(style)) {
+    } else if (BUILD18.constructableCSS && !styleContainerNode.adoptedStyleSheets.includes(style)) {
       styleContainerNode.adoptedStyleSheets = [...styleContainerNode.adoptedStyleSheets, style];
     }
   }
@@ -2092,43 +2246,40 @@ var attachStyles = (hostRef) => {
   const flags = cmpMeta.$flags$;
   const endAttachStyles = createTime("attachStyles", cmpMeta.$tagName$);
   const scopeId2 = addStyle(
-    BUILD17.shadowDom && supportsShadow && elm.shadowRoot ? elm.shadowRoot : elm.getRootNode(),
+    BUILD18.shadowDom && supportsShadow && elm.shadowRoot ? elm.shadowRoot : elm.getRootNode(),
     cmpMeta,
     hostRef.$modeName$
   );
-  if ((BUILD17.shadowDom || BUILD17.scoped) && BUILD17.cssAnnotations && flags & 10 /* needsScopedEncapsulation */ && flags & 2 /* scopedCssEncapsulation */) {
+  if ((BUILD18.shadowDom || BUILD18.scoped) && BUILD18.cssAnnotations && flags & 10 /* needsScopedEncapsulation */ && flags & 2 /* scopedCssEncapsulation */) {
     elm["s-sc"] = scopeId2;
     elm.classList.add(scopeId2 + "-h");
-    if (BUILD17.scoped && flags & 2 /* scopedCssEncapsulation */) {
-      elm.classList.add(scopeId2 + "-s");
-    }
   }
   endAttachStyles();
 };
-var getScopeId = (cmp, mode) => "sc-" + (BUILD17.mode && mode && cmp.$flags$ & 32 /* hasMode */ ? cmp.$tagName$ + "-" + mode : cmp.$tagName$);
+var getScopeId = (cmp, mode) => "sc-" + (BUILD18.mode && mode && cmp.$flags$ & 32 /* hasMode */ ? cmp.$tagName$ + "-" + mode : cmp.$tagName$);
 
 // src/runtime/update-component.ts
 var attachToAncestor = (hostRef, ancestorComponent) => {
-  if (BUILD18.asyncLoading && ancestorComponent && !hostRef.$onRenderResolve$ && ancestorComponent["s-p"]) {
+  if (BUILD19.asyncLoading && ancestorComponent && !hostRef.$onRenderResolve$ && ancestorComponent["s-p"]) {
     ancestorComponent["s-p"].push(new Promise((r) => hostRef.$onRenderResolve$ = r));
   }
 };
 var scheduleUpdate = (hostRef, isInitialLoad) => {
-  if (BUILD18.taskQueue && BUILD18.updatable) {
+  if (BUILD19.taskQueue && BUILD19.updatable) {
     hostRef.$flags$ |= 16 /* isQueuedForUpdate */;
   }
-  if (BUILD18.asyncLoading && hostRef.$flags$ & 4 /* isWaitingForChildren */) {
+  if (BUILD19.asyncLoading && hostRef.$flags$ & 4 /* isWaitingForChildren */) {
     hostRef.$flags$ |= 512 /* needsRerender */;
     return;
   }
   attachToAncestor(hostRef, hostRef.$ancestorComponent$);
   const dispatch = () => dispatchHooks(hostRef, isInitialLoad);
-  return BUILD18.taskQueue ? writeTask(dispatch) : dispatch();
+  return BUILD19.taskQueue ? writeTask(dispatch) : dispatch();
 };
 var dispatchHooks = (hostRef, isInitialLoad) => {
   const elm = hostRef.$hostElement$;
   const endSchedule = createTime("scheduleUpdate", hostRef.$cmpMeta$.$tagName$);
-  const instance = BUILD18.lazyLoad ? hostRef.$lazyInstance$ : elm;
+  const instance = BUILD19.lazyLoad ? hostRef.$lazyInstance$ : elm;
   if (!instance) {
     throw new Error(
       `Can't render component <${elm.tagName.toLowerCase()} /> with invalid Rindo runtime! Make sure this imported component is compiled with a \`externalRuntime: true\` flag. For more information, please refer to https://rindojs.web.app/docs/custom-elements#externalruntime`
@@ -2136,7 +2287,7 @@ var dispatchHooks = (hostRef, isInitialLoad) => {
   }
   let maybePromise;
   if (isInitialLoad) {
-    if (BUILD18.lazyLoad && BUILD18.hostListener) {
+    if (BUILD19.lazyLoad && BUILD19.hostListener) {
       hostRef.$flags$ |= 256 /* isListenReady */;
       if (hostRef.$queuedListeners$) {
         hostRef.$queuedListeners$.map(([methodName, event]) => safeCall(instance, methodName, event));
@@ -2144,17 +2295,17 @@ var dispatchHooks = (hostRef, isInitialLoad) => {
       }
     }
     emitLifecycleEvent(elm, "componentWillLoad");
-    if (BUILD18.cmpWillLoad) {
+    if (BUILD19.cmpWillLoad) {
       maybePromise = safeCall(instance, "componentWillLoad");
     }
   } else {
     emitLifecycleEvent(elm, "componentWillUpdate");
-    if (BUILD18.cmpWillUpdate) {
+    if (BUILD19.cmpWillUpdate) {
       maybePromise = safeCall(instance, "componentWillUpdate");
     }
   }
   emitLifecycleEvent(elm, "componentWillRender");
-  if (BUILD18.cmpWillRender) {
+  if (BUILD19.cmpWillRender) {
     maybePromise = enqueue(maybePromise, () => safeCall(instance, "componentWillRender"));
   }
   endSchedule();
@@ -2170,23 +2321,23 @@ var updateComponent = async (hostRef, instance, isInitialLoad) => {
   const elm = hostRef.$hostElement$;
   const endUpdate = createTime("update", hostRef.$cmpMeta$.$tagName$);
   const rc = elm["s-rc"];
-  if (BUILD18.style && isInitialLoad) {
+  if (BUILD19.style && isInitialLoad) {
     attachStyles(hostRef);
   }
   const endRender = createTime("render", hostRef.$cmpMeta$.$tagName$);
-  if (BUILD18.isDev) {
+  if (BUILD19.isDev) {
     hostRef.$flags$ |= 1024 /* devOnRender */;
   }
-  if (BUILD18.hydrateServerSide) {
+  if (BUILD19.hydrateServerSide) {
     await callRender(hostRef, instance, elm, isInitialLoad);
   } else {
     callRender(hostRef, instance, elm, isInitialLoad);
   }
-  if (BUILD18.isDev) {
+  if (BUILD19.isDev) {
     hostRef.$renderCount$ = hostRef.$renderCount$ === void 0 ? 1 : hostRef.$renderCount$ + 1;
     hostRef.$flags$ &= ~1024 /* devOnRender */;
   }
-  if (BUILD18.hydrateServerSide) {
+  if (BUILD19.hydrateServerSide) {
     try {
       serverSideConnected(elm);
       if (isInitialLoad) {
@@ -2200,13 +2351,13 @@ var updateComponent = async (hostRef, instance, isInitialLoad) => {
       consoleError(e, elm);
     }
   }
-  if (BUILD18.asyncLoading && rc) {
+  if (BUILD19.asyncLoading && rc) {
     rc.map((cb) => cb());
     elm["s-rc"] = void 0;
   }
   endRender();
   endUpdate();
-  if (BUILD18.asyncLoading) {
+  if (BUILD19.asyncLoading) {
     const childrenPromises = (_a = elm["s-p"]) != null ? _a : [];
     const postUpdate = () => postUpdateComponent(hostRef);
     if (childrenPromises.length === 0) {
@@ -2222,10 +2373,10 @@ var updateComponent = async (hostRef, instance, isInitialLoad) => {
 };
 var renderingRef = null;
 var callRender = (hostRef, instance, elm, isInitialLoad) => {
-  const allRenderFn = BUILD18.allRenderFn ? true : false;
-  const lazyLoad = BUILD18.lazyLoad ? true : false;
-  const taskQueue = BUILD18.taskQueue ? true : false;
-  const updatable = BUILD18.updatable ? true : false;
+  const allRenderFn = BUILD19.allRenderFn ? true : false;
+  const lazyLoad = BUILD19.lazyLoad ? true : false;
+  const taskQueue = BUILD19.taskQueue ? true : false;
+  const updatable = BUILD19.updatable ? true : false;
   try {
     renderingRef = instance;
     instance = allRenderFn ? instance.render() : instance.render && instance.render();
@@ -2235,9 +2386,9 @@ var callRender = (hostRef, instance, elm, isInitialLoad) => {
     if (updatable || lazyLoad) {
       hostRef.$flags$ |= 2 /* hasRendered */;
     }
-    if (BUILD18.hasRenderFn || BUILD18.reflect) {
-      if (BUILD18.vdomRender || BUILD18.reflect) {
-        if (BUILD18.hydrateServerSide) {
+    if (BUILD19.hasRenderFn || BUILD19.reflect) {
+      if (BUILD19.vdomRender || BUILD19.reflect) {
+        if (BUILD19.hydrateServerSide) {
           return Promise.resolve(instance).then((value) => renderVdom(hostRef, value, isInitialLoad));
         } else {
           renderVdom(hostRef, instance, isInitialLoad);
@@ -2262,57 +2413,57 @@ var postUpdateComponent = (hostRef) => {
   const tagName = hostRef.$cmpMeta$.$tagName$;
   const elm = hostRef.$hostElement$;
   const endPostUpdate = createTime("postUpdate", tagName);
-  const instance = BUILD18.lazyLoad ? hostRef.$lazyInstance$ : elm;
+  const instance = BUILD19.lazyLoad ? hostRef.$lazyInstance$ : elm;
   const ancestorComponent = hostRef.$ancestorComponent$;
-  if (BUILD18.cmpDidRender) {
-    if (BUILD18.isDev) {
+  if (BUILD19.cmpDidRender) {
+    if (BUILD19.isDev) {
       hostRef.$flags$ |= 1024 /* devOnRender */;
     }
     safeCall(instance, "componentDidRender");
-    if (BUILD18.isDev) {
+    if (BUILD19.isDev) {
       hostRef.$flags$ &= ~1024 /* devOnRender */;
     }
   }
   emitLifecycleEvent(elm, "componentDidRender");
   if (!(hostRef.$flags$ & 64 /* hasLoadedComponent */)) {
     hostRef.$flags$ |= 64 /* hasLoadedComponent */;
-    if (BUILD18.asyncLoading && BUILD18.cssAnnotations) {
+    if (BUILD19.asyncLoading && BUILD19.cssAnnotations) {
       addHydratedFlag(elm);
     }
-    if (BUILD18.cmpDidLoad) {
-      if (BUILD18.isDev) {
+    if (BUILD19.cmpDidLoad) {
+      if (BUILD19.isDev) {
         hostRef.$flags$ |= 2048 /* devOnDidLoad */;
       }
       safeCall(instance, "componentDidLoad");
-      if (BUILD18.isDev) {
+      if (BUILD19.isDev) {
         hostRef.$flags$ &= ~2048 /* devOnDidLoad */;
       }
     }
     emitLifecycleEvent(elm, "componentDidLoad");
     endPostUpdate();
-    if (BUILD18.asyncLoading) {
+    if (BUILD19.asyncLoading) {
       hostRef.$onReadyResolve$(elm);
       if (!ancestorComponent) {
         appDidLoad(tagName);
       }
     }
   } else {
-    if (BUILD18.cmpDidUpdate) {
-      if (BUILD18.isDev) {
+    if (BUILD19.cmpDidUpdate) {
+      if (BUILD19.isDev) {
         hostRef.$flags$ |= 1024 /* devOnRender */;
       }
       safeCall(instance, "componentDidUpdate");
-      if (BUILD18.isDev) {
+      if (BUILD19.isDev) {
         hostRef.$flags$ &= ~1024 /* devOnRender */;
       }
     }
     emitLifecycleEvent(elm, "componentDidUpdate");
     endPostUpdate();
   }
-  if (BUILD18.method && BUILD18.lazyLoad) {
+  if (BUILD19.method && BUILD19.lazyLoad) {
     hostRef.$onInstanceResolve$(elm);
   }
-  if (BUILD18.asyncLoading) {
+  if (BUILD19.asyncLoading) {
     if (hostRef.$onRenderResolve$) {
       hostRef.$onRenderResolve$();
       hostRef.$onRenderResolve$ = void 0;
@@ -2324,7 +2475,7 @@ var postUpdateComponent = (hostRef) => {
   }
 };
 var forceUpdate = (ref) => {
-  if (BUILD18.updatable && (Build.isBrowser || Build.isTesting)) {
+  if (BUILD19.updatable && (Build.isBrowser || Build.isTesting)) {
     const hostRef = getHostRef(ref);
     const isConnected = hostRef.$hostElement$.isConnected;
     if (isConnected && (hostRef.$flags$ & (2 /* hasRendered */ | 16 /* isQueuedForUpdate */)) === 2 /* hasRendered */) {
@@ -2335,14 +2486,14 @@ var forceUpdate = (ref) => {
   return false;
 };
 var appDidLoad = (who) => {
-  if (BUILD18.cssAnnotations) {
+  if (BUILD19.cssAnnotations) {
     addHydratedFlag(doc.documentElement);
   }
-  if (BUILD18.asyncQueue) {
+  if (BUILD19.asyncQueue) {
     plt.$flags$ |= 2 /* appLoaded */;
   }
   nextTick(() => emitEvent(win, "appload", { detail: { namespace: NAMESPACE } }));
-  if (BUILD18.profile && performance.measure) {
+  if (BUILD19.profile && performance.measure) {
     performance.measure(`[Rindo] ${NAMESPACE} initial load (by ${who})`, "st:app:start");
   }
 };
@@ -2357,7 +2508,7 @@ var safeCall = (instance, method, arg) => {
   return void 0;
 };
 var emitLifecycleEvent = (elm, lifecycleName) => {
-  if (BUILD18.lifecycleDOMEvents) {
+  if (BUILD19.lifecycleDOMEvents) {
     emitEvent(elm, "rindo_" + lifecycleName, {
       bubbles: true,
       composed: true,
@@ -2369,7 +2520,7 @@ var emitLifecycleEvent = (elm, lifecycleName) => {
 };
 var addHydratedFlag = (elm) => {
   var _a, _b;
-  return BUILD18.hydratedClass ? elm.classList.add((_a = BUILD18.hydratedSelectorName) != null ? _a : "hydrated") : BUILD18.hydratedAttribute ? elm.setAttribute((_b = BUILD18.hydratedSelectorName) != null ? _b : "hydrated", "") : void 0;
+  return BUILD19.hydratedClass ? elm.classList.add((_a = BUILD19.hydratedSelectorName) != null ? _a : "hydrated") : BUILD19.hydratedAttribute ? elm.setAttribute((_b = BUILD19.hydratedSelectorName) != null ? _b : "hydrated", "") : void 0;
 };
 var serverSideConnected = (elm) => {
   const children = elm.children;
@@ -2388,21 +2539,21 @@ var serverSideConnected = (elm) => {
 var getValue = (ref, propName) => getHostRef(ref).$instanceValues$.get(propName);
 var setValue = (ref, propName, newVal, cmpMeta) => {
   const hostRef = getHostRef(ref);
-  if (BUILD19.lazyLoad && !hostRef) {
+  if (BUILD20.lazyLoad && !hostRef) {
     throw new Error(
       `Couldn't find host element for "${cmpMeta.$tagName$}" as it is unknown to this Rindo runtime. This usually happens when integrating a 3rd party Rindo component with another Rindo component or application.`
     );
   }
-  const elm = BUILD19.lazyLoad ? hostRef.$hostElement$ : ref;
+  const elm = BUILD20.lazyLoad ? hostRef.$hostElement$ : ref;
   const oldVal = hostRef.$instanceValues$.get(propName);
   const flags = hostRef.$flags$;
-  const instance = BUILD19.lazyLoad ? hostRef.$lazyInstance$ : elm;
+  const instance = BUILD20.lazyLoad ? hostRef.$lazyInstance$ : elm;
   newVal = parsePropertyValue(newVal, cmpMeta.$members$[propName][0]);
   const areBothNaN = Number.isNaN(oldVal) && Number.isNaN(newVal);
   const didValueChange = newVal !== oldVal && !areBothNaN;
-  if ((!BUILD19.lazyLoad || !(flags & 8 /* isConstructingInstance */) || oldVal === void 0) && didValueChange) {
+  if ((!BUILD20.lazyLoad || !(flags & 8 /* isConstructingInstance */) || oldVal === void 0) && didValueChange) {
     hostRef.$instanceValues$.set(propName, newVal);
-    if (BUILD19.isDev) {
+    if (BUILD20.isDev) {
       if (hostRef.$flags$ & 1024 /* devOnRender */) {
         consoleDevWarn(
           `The state/prop "${propName}" changed during rendering. This can potentially lead to infinite-loops and other bugs.`,
@@ -2425,8 +2576,8 @@ var setValue = (ref, propName, newVal, cmpMeta) => {
         );
       }
     }
-    if (!BUILD19.lazyLoad || instance) {
-      if (BUILD19.watchCallback && cmpMeta.$watchers$ && flags & 128 /* isWatchReady */) {
+    if (!BUILD20.lazyLoad || instance) {
+      if (BUILD20.watchCallback && cmpMeta.$watchers$ && flags & 128 /* isWatchReady */) {
         const watchMethods = cmpMeta.$watchers$[propName];
         if (watchMethods) {
           watchMethods.map((watchMethodName) => {
@@ -2438,8 +2589,8 @@ var setValue = (ref, propName, newVal, cmpMeta) => {
           });
         }
       }
-      if (BUILD19.updatable && (flags & (2 /* hasRendered */ | 16 /* isQueuedForUpdate */)) === 2 /* hasRendered */) {
-        if (BUILD19.cmpShouldUpdate && instance.componentShouldUpdate) {
+      if (BUILD20.updatable && (flags & (2 /* hasRendered */ | 16 /* isQueuedForUpdate */)) === 2 /* hasRendered */) {
+        if (BUILD20.cmpShouldUpdate && instance.componentShouldUpdate) {
           if (instance.componentShouldUpdate(newVal, oldVal, propName) === false) {
             return;
           }
@@ -2454,40 +2605,40 @@ var setValue = (ref, propName, newVal, cmpMeta) => {
 var proxyComponent = (Cstr, cmpMeta, flags) => {
   var _a, _b;
   const prototype = Cstr.prototype;
-  if (BUILD20.formAssociated && cmpMeta.$flags$ & 64 /* formAssociated */ && flags & 1 /* isElementConstructor */) {
+  if (BUILD21.formAssociated && cmpMeta.$flags$ & 64 /* formAssociated */ && flags & 1 /* isElementConstructor */) {
     FORM_ASSOCIATED_CUSTOM_ELEMENT_CALLBACKS.forEach((cbName) => {
       const originalFormAssociatedCallback = prototype[cbName];
       Object.defineProperty(prototype, cbName, {
         value(...args) {
           const hostRef = getHostRef(this);
-          const instance = BUILD20.lazyLoad ? hostRef.$lazyInstance$ : this;
+          const instance = BUILD21.lazyLoad ? hostRef.$lazyInstance$ : this;
           if (!instance) {
             hostRef.$onReadyPromise$.then((asyncInstance) => {
               const cb = asyncInstance[cbName];
               typeof cb === "function" && cb.call(asyncInstance, ...args);
             });
           } else {
-            const cb = BUILD20.lazyLoad ? instance[cbName] : originalFormAssociatedCallback;
+            const cb = BUILD21.lazyLoad ? instance[cbName] : originalFormAssociatedCallback;
             typeof cb === "function" && cb.call(instance, ...args);
           }
         }
       });
     });
   }
-  if (BUILD20.member && cmpMeta.$members$ || BUILD20.watchCallback && (cmpMeta.$watchers$ || Cstr.watchers)) {
-    if (BUILD20.watchCallback && Cstr.watchers && !cmpMeta.$watchers$) {
+  if (BUILD21.member && cmpMeta.$members$ || BUILD21.watchCallback && (cmpMeta.$watchers$ || Cstr.watchers)) {
+    if (BUILD21.watchCallback && Cstr.watchers && !cmpMeta.$watchers$) {
       cmpMeta.$watchers$ = Cstr.watchers;
     }
     const members = Object.entries((_a = cmpMeta.$members$) != null ? _a : {});
     members.map(([memberName, [memberFlags]]) => {
-      if ((BUILD20.prop || BUILD20.state) && (memberFlags & 31 /* Prop */ || (!BUILD20.lazyLoad || flags & 2 /* proxyState */) && memberFlags & 32 /* State */)) {
+      if ((BUILD21.prop || BUILD21.state) && (memberFlags & 31 /* Prop */ || (!BUILD21.lazyLoad || flags & 2 /* proxyState */) && memberFlags & 32 /* State */)) {
         if ((memberFlags & 2048 /* Getter */) === 0) {
           Object.defineProperty(prototype, memberName, {
             get() {
               return getValue(this, memberName);
             },
             set(newValue) {
-              if (BUILD20.isDev) {
+              if (BUILD21.isDev) {
                 const ref = getHostRef(this);
                 if (
                   // we are proxying the instance (not element)
@@ -2508,11 +2659,11 @@ More information: https://rindojs.web.app/docs/properties#prop-mutability`
             enumerable: true
           });
         } else if (flags & 1 /* isElementConstructor */ && memberFlags & 2048 /* Getter */) {
-          if (BUILD20.lazyLoad) {
+          if (BUILD21.lazyLoad) {
             Object.defineProperty(prototype, memberName, {
               get() {
                 const ref = getHostRef(this);
-                const instance = BUILD20.lazyLoad && ref ? ref.$lazyInstance$ : prototype;
+                const instance = BUILD21.lazyLoad && ref ? ref.$lazyInstance$ : prototype;
                 if (!instance) return;
                 return instance[memberName];
               },
@@ -2552,7 +2703,7 @@ More information: https://rindojs.web.app/docs/properties#prop-mutability`
             });
           }
         }
-      } else if (BUILD20.lazyLoad && BUILD20.method && flags & 1 /* isElementConstructor */ && memberFlags & 64 /* Method */) {
+      } else if (BUILD21.lazyLoad && BUILD21.method && flags & 1 /* isElementConstructor */ && memberFlags & 64 /* Method */) {
         Object.defineProperty(prototype, memberName, {
           value(...args) {
             var _a2;
@@ -2565,13 +2716,13 @@ More information: https://rindojs.web.app/docs/properties#prop-mutability`
         });
       }
     });
-    if (BUILD20.observeAttribute && (!BUILD20.lazyLoad || flags & 1 /* isElementConstructor */)) {
+    if (BUILD21.observeAttribute && (!BUILD21.lazyLoad || flags & 1 /* isElementConstructor */)) {
       const attrNameToPropName = /* @__PURE__ */ new Map();
       prototype.attributeChangedCallback = function(attrName, oldValue, newValue) {
         plt.jmp(() => {
           var _a2;
           const propName = attrNameToPropName.get(attrName);
-          if (this.hasOwnProperty(propName)) {
+          if (this.hasOwnProperty(propName) && BUILD21.lazyLoad) {
             newValue = this[propName];
             delete this[propName];
           } else if (prototype.hasOwnProperty(propName) && typeof this[propName] === "number" && // cast type to number to avoid TS compiler issues
@@ -2581,8 +2732,8 @@ More information: https://rindojs.web.app/docs/properties#prop-mutability`
             const hostRef = getHostRef(this);
             const flags2 = hostRef == null ? void 0 : hostRef.$flags$;
             if (flags2 && !(flags2 & 8 /* isConstructingInstance */) && flags2 & 128 /* isWatchReady */ && newValue !== oldValue) {
-              const elm = BUILD20.lazyLoad ? hostRef.$hostElement$ : this;
-              const instance = BUILD20.lazyLoad ? hostRef.$lazyInstance$ : elm;
+              const elm = BUILD21.lazyLoad ? hostRef.$hostElement$ : this;
+              const instance = BUILD21.lazyLoad ? hostRef.$lazyInstance$ : elm;
               const entry = (_a2 = cmpMeta.$watchers$) == null ? void 0 : _a2[attrName];
               entry == null ? void 0 : entry.forEach((callbackName) => {
                 if (instance[callbackName] != null) {
@@ -2605,7 +2756,7 @@ More information: https://rindojs.web.app/docs/properties#prop-mutability`
             var _a2;
             const attrName = m[1] || propName;
             attrNameToPropName.set(attrName, propName);
-            if (BUILD20.reflect && m[0] & 512 /* ReflectAttr */) {
+            if (BUILD21.reflect && m[0] & 512 /* ReflectAttr */) {
               (_a2 = cmpMeta.$attrsToReflect$) == null ? void 0 : _a2.push([propName, attrName]);
             }
             return attrName;
@@ -2623,7 +2774,7 @@ var initializeComponent = async (elm, hostRef, cmpMeta, hmrVersionId) => {
   if ((hostRef.$flags$ & 32 /* hasInitializedComponent */) === 0) {
     hostRef.$flags$ |= 32 /* hasInitializedComponent */;
     const bundleId = cmpMeta.$lazyBundleId$;
-    if ((BUILD21.lazyLoad || BUILD21.hydrateClientSide) && bundleId) {
+    if ((BUILD22.lazyLoad || BUILD22.hydrateClientSide) && bundleId) {
       const CstrImport = loadModule(cmpMeta, hostRef, hmrVersionId);
       if (CstrImport && "then" in CstrImport) {
         const endLoad = uniqueTime(
@@ -2638,15 +2789,15 @@ var initializeComponent = async (elm, hostRef, cmpMeta, hmrVersionId) => {
       if (!Cstr) {
         throw new Error(`Constructor for "${cmpMeta.$tagName$}#${hostRef.$modeName$}" was not found`);
       }
-      if (BUILD21.member && !Cstr.isProxied) {
-        if (BUILD21.watchCallback) {
+      if (BUILD22.member && !Cstr.isProxied) {
+        if (BUILD22.watchCallback) {
           cmpMeta.$watchers$ = Cstr.watchers;
         }
         proxyComponent(Cstr, cmpMeta, 2 /* proxyState */);
         Cstr.isProxied = true;
       }
       const endNewInstance = createTime("createInstance", cmpMeta.$tagName$);
-      if (BUILD21.member) {
+      if (BUILD22.member) {
         hostRef.$flags$ |= 8 /* isConstructingInstance */;
       }
       try {
@@ -2654,10 +2805,10 @@ var initializeComponent = async (elm, hostRef, cmpMeta, hmrVersionId) => {
       } catch (e) {
         consoleError(e);
       }
-      if (BUILD21.member) {
+      if (BUILD22.member) {
         hostRef.$flags$ &= ~8 /* isConstructingInstance */;
       }
-      if (BUILD21.watchCallback) {
+      if (BUILD22.watchCallback) {
         hostRef.$flags$ |= 128 /* isWatchReady */;
       }
       endNewInstance();
@@ -2667,24 +2818,24 @@ var initializeComponent = async (elm, hostRef, cmpMeta, hmrVersionId) => {
       const cmpTag = elm.localName;
       customElements.whenDefined(cmpTag).then(() => hostRef.$flags$ |= 128 /* isWatchReady */);
     }
-    if (BUILD21.style && Cstr && Cstr.style) {
+    if (BUILD22.style && Cstr && Cstr.style) {
       let style;
       if (typeof Cstr.style === "string") {
         style = Cstr.style;
-      } else if (BUILD21.mode && typeof Cstr.style !== "string") {
+      } else if (BUILD22.mode && typeof Cstr.style !== "string") {
         hostRef.$modeName$ = computeMode(elm);
         if (hostRef.$modeName$) {
           style = Cstr.style[hostRef.$modeName$];
         }
-        if (BUILD21.hydrateServerSide && hostRef.$modeName$) {
+        if (BUILD22.hydrateServerSide && hostRef.$modeName$) {
           elm.setAttribute("s-mode", hostRef.$modeName$);
         }
       }
       const scopeId2 = getScopeId(cmpMeta, hostRef.$modeName$);
       if (!styles.has(scopeId2)) {
         const endRegisterStyles = createTime("registerStyles", cmpMeta.$tagName$);
-        if (!BUILD21.hydrateServerSide && BUILD21.shadowDom && // TODO(RINDO-854): Remove code related to legacy shadowDomShim field
-        BUILD21.shadowDomShim && cmpMeta.$flags$ & 8 /* needsShadowDomShim */) {
+        if (!BUILD22.hydrateServerSide && BUILD22.shadowDom && // TODO(RINDO-854): Remove code related to legacy shadowDomShim field
+        BUILD22.shadowDomShim && cmpMeta.$flags$ & 8 /* needsShadowDomShim */) {
           style = await import("./shadow-css.js").then((m) => m.scopeCss(style, scopeId2));
         }
         registerStyle(scopeId2, style, !!(cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */));
@@ -2694,14 +2845,14 @@ var initializeComponent = async (elm, hostRef, cmpMeta, hmrVersionId) => {
   }
   const ancestorComponent = hostRef.$ancestorComponent$;
   const schedule = () => scheduleUpdate(hostRef, true);
-  if (BUILD21.asyncLoading && ancestorComponent && ancestorComponent["s-rc"]) {
+  if (BUILD22.asyncLoading && ancestorComponent && ancestorComponent["s-rc"]) {
     ancestorComponent["s-rc"].push(schedule);
   } else {
     schedule();
   }
 };
 var fireConnectedCallback = (instance) => {
-  if (BUILD21.lazyLoad && BUILD21.connectedCallback) {
+  if (BUILD22.lazyLoad && BUILD22.connectedCallback) {
     safeCall(instance, "connectedCallback");
   }
 };
@@ -2712,41 +2863,41 @@ var connectedCallback = (elm) => {
     const hostRef = getHostRef(elm);
     const cmpMeta = hostRef.$cmpMeta$;
     const endConnected = createTime("connectedCallback", cmpMeta.$tagName$);
-    if (BUILD22.hostListenerTargetParent) {
+    if (BUILD23.hostListenerTargetParent) {
       addHostEventListeners(elm, hostRef, cmpMeta.$listeners$, true);
     }
     if (!(hostRef.$flags$ & 1 /* hasConnected */)) {
       hostRef.$flags$ |= 1 /* hasConnected */;
       let hostId;
-      if (BUILD22.hydrateClientSide) {
+      if (BUILD23.hydrateClientSide) {
         hostId = elm.getAttribute(HYDRATE_ID);
         if (hostId) {
-          if (BUILD22.shadowDom && supportsShadow && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
-            const scopeId2 = BUILD22.mode ? addStyle(elm.shadowRoot, cmpMeta, elm.getAttribute("s-mode")) : addStyle(elm.shadowRoot, cmpMeta);
+          if (BUILD23.shadowDom && supportsShadow && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
+            const scopeId2 = BUILD23.mode ? addStyle(elm.shadowRoot, cmpMeta, elm.getAttribute("s-mode")) : addStyle(elm.shadowRoot, cmpMeta);
             elm.classList.remove(scopeId2 + "-h", scopeId2 + "-s");
-          } else if (BUILD22.scoped && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
-            const scopeId2 = getScopeId(cmpMeta, BUILD22.mode ? elm.getAttribute("s-mode") : void 0);
+          } else if (BUILD23.scoped && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+            const scopeId2 = getScopeId(cmpMeta, BUILD23.mode ? elm.getAttribute("s-mode") : void 0);
             elm["s-sc"] = scopeId2;
           }
           initializeClientHydrate(elm, cmpMeta.$tagName$, hostId, hostRef);
         }
       }
-      if (BUILD22.slotRelocation && !hostId) {
-        if (BUILD22.hydrateServerSide || (BUILD22.slot || BUILD22.shadowDom) && // TODO(RINDO-854): Remove code related to legacy shadowDomShim field
+      if (BUILD23.slotRelocation && !hostId) {
+        if (BUILD23.hydrateServerSide || (BUILD23.slot || BUILD23.shadowDom) && // TODO(RINDO-854): Remove code related to legacy shadowDomShim field
         cmpMeta.$flags$ & (4 /* hasSlotRelocation */ | 8 /* needsShadowDomShim */)) {
           setContentReference(elm);
         }
       }
-      if (BUILD22.asyncLoading) {
+      if (BUILD23.asyncLoading) {
         let ancestorComponent = elm;
         while (ancestorComponent = ancestorComponent.parentNode || ancestorComponent.host) {
-          if (BUILD22.hydrateClientSide && ancestorComponent.nodeType === 1 /* ElementNode */ && ancestorComponent.hasAttribute("s-id") && ancestorComponent["s-p"] || ancestorComponent["s-p"]) {
+          if (BUILD23.hydrateClientSide && ancestorComponent.nodeType === 1 /* ElementNode */ && ancestorComponent.hasAttribute("s-id") && ancestorComponent["s-p"] || ancestorComponent["s-p"]) {
             attachToAncestor(hostRef, hostRef.$ancestorComponent$ = ancestorComponent);
             break;
           }
         }
       }
-      if (BUILD22.prop && !BUILD22.hydrateServerSide && cmpMeta.$members$) {
+      if (BUILD23.prop && !BUILD23.hydrateServerSide && cmpMeta.$members$) {
         Object.entries(cmpMeta.$members$).map(([memberName, [memberFlags]]) => {
           if (memberFlags & 31 /* Prop */ && elm.hasOwnProperty(memberName)) {
             const value = elm[memberName];
@@ -2755,7 +2906,7 @@ var connectedCallback = (elm) => {
           }
         });
       }
-      if (BUILD22.initializeNextTick) {
+      if (BUILD23.initializeNextTick) {
         nextTick(() => initializeComponent(elm, hostRef, cmpMeta));
       } else {
         initializeComponent(elm, hostRef, cmpMeta);
@@ -2773,32 +2924,32 @@ var connectedCallback = (elm) => {
 };
 var setContentReference = (elm) => {
   const contentRefElm = elm["s-cr"] = doc.createComment(
-    BUILD22.isDebug ? `content-ref (host=${elm.localName})` : ""
+    BUILD23.isDebug ? `content-ref (host=${elm.localName})` : ""
   );
   contentRefElm["s-cn"] = true;
   insertBefore(elm, contentRefElm, elm.firstChild);
 };
 
 // src/runtime/disconnected-callback.ts
-import { BUILD as BUILD23 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD24 } from "@rindo/core/internal/app-data";
 var disconnectInstance = (instance) => {
-  if (BUILD23.lazyLoad && BUILD23.disconnectedCallback) {
+  if (BUILD24.lazyLoad && BUILD24.disconnectedCallback) {
     safeCall(instance, "disconnectedCallback");
   }
-  if (BUILD23.cmpDidUnload) {
+  if (BUILD24.cmpDidUnload) {
     safeCall(instance, "componentDidUnload");
   }
 };
 var disconnectedCallback = async (elm) => {
   if ((plt.$flags$ & 1 /* isTmpDisconnected */) === 0) {
     const hostRef = getHostRef(elm);
-    if (BUILD23.hostListener) {
+    if (BUILD24.hostListener) {
       if (hostRef.$rmListeners$) {
         hostRef.$rmListeners$.map((rmListener) => rmListener());
         hostRef.$rmListeners$ = void 0;
       }
     }
-    if (!BUILD23.lazyLoad) {
+    if (!BUILD24.lazyLoad) {
       disconnectInstance(elm);
     } else if (hostRef == null ? void 0 : hostRef.$lazyInstance$) {
       disconnectInstance(hostRef.$lazyInstance$);
@@ -2806,6 +2957,12 @@ var disconnectedCallback = async (elm) => {
       hostRef.$onReadyPromise$.then(() => disconnectInstance(hostRef.$lazyInstance$));
     }
   }
+  if (rootAppliedStyles.has(elm)) {
+    rootAppliedStyles.delete(elm);
+  }
+  if (elm.shadowRoot && rootAppliedStyles.has(elm.shadowRoot)) {
+    rootAppliedStyles.delete(elm.shadowRoot);
+  }
 };
 
 // src/runtime/bootstrap-custom-element.ts
@@ -2817,36 +2974,36 @@ var proxyCustomElement = (Cstr, compactMeta) => {
     $flags$: compactMeta[0],
     $tagName$: compactMeta[1]
   };
-  if (BUILD24.member) {
+  if (BUILD25.member) {
     cmpMeta.$members$ = compactMeta[2];
   }
-  if (BUILD24.hostListener) {
+  if (BUILD25.hostListener) {
     cmpMeta.$listeners$ = compactMeta[3];
   }
-  if (BUILD24.watchCallback) {
+  if (BUILD25.watchCallback) {
     cmpMeta.$watchers$ = Cstr.$watchers$;
   }
-  if (BUILD24.reflect) {
+  if (BUILD25.reflect) {
     cmpMeta.$attrsToReflect$ = [];
   }
-  if (BUILD24.shadowDom && !supportsShadow && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
+  if (BUILD25.shadowDom && !supportsShadow && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
     cmpMeta.$flags$ |= 8 /* needsShadowDomShim */;
   }
-  if (BUILD24.experimentalSlotFixes) {
-    if (BUILD24.scoped && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+  if (BUILD25.experimentalSlotFixes) {
+    if (BUILD25.scoped && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
       patchPseudoShadowDom(Cstr.prototype);
     }
   } else {
-    if (BUILD24.slotChildNodesFix) {
+    if (BUILD25.slotChildNodesFix) {
       patchChildSlotNodes(Cstr.prototype);
     }
-    if (BUILD24.cloneNodeFix) {
+    if (BUILD25.cloneNodeFix) {
       patchCloneNode(Cstr.prototype);
     }
-    if (BUILD24.appendChildSlotFix) {
+    if (BUILD25.appendChildSlotFix) {
       patchSlotAppendChild(Cstr.prototype);
     }
-    if (BUILD24.scopedSlotTextContentFix && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+    if (BUILD25.scopedSlotTextContentFix && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
       patchTextContent(Cstr.prototype);
     }
   }
@@ -2864,20 +3021,30 @@ var proxyCustomElement = (Cstr, compactMeta) => {
         this.__hasHostListenerAttached = true;
       }
       connectedCallback(this);
-      if (BUILD24.connectedCallback && originalConnectedCallback) {
+      if (BUILD25.connectedCallback && originalConnectedCallback) {
         originalConnectedCallback.call(this);
       }
     },
     disconnectedCallback() {
       disconnectedCallback(this);
-      if (BUILD24.disconnectedCallback && originalDisconnectedCallback) {
+      if (BUILD25.disconnectedCallback && originalDisconnectedCallback) {
         originalDisconnectedCallback.call(this);
       }
+      plt.raf(() => {
+        var _a;
+        const hostRef = getHostRef(this);
+        if (((_a = hostRef == null ? void 0 : hostRef.$vnode$) == null ? void 0 : _a.$elm$) instanceof Node && !hostRef.$vnode$.$elm$.isConnected) {
+          delete hostRef.$vnode$;
+        }
+        if (this instanceof Node && !this.isConnected) {
+          deleteHostRef(this);
+        }
+      });
     },
     __attachShadow() {
       if (supportsShadow) {
         if (!this.shadowRoot) {
-          if (BUILD24.shadowDelegatesFocus) {
+          if (BUILD25.shadowDelegatesFocus) {
             this.attachShadow({
               mode: "open",
               delegatesFocus: !!(cmpMeta.$flags$ & 16 /* shadowDelegatesFocus */)
@@ -2901,7 +3068,7 @@ var proxyCustomElement = (Cstr, compactMeta) => {
   return proxyComponent(Cstr, cmpMeta, 1 /* isElementConstructor */ | 2 /* proxyState */);
 };
 var forceModeUpdate = (elm) => {
-  if (BUILD24.style && BUILD24.mode && !BUILD24.lazyLoad) {
+  if (BUILD25.style && BUILD25.mode && !BUILD25.lazyLoad) {
     const mode = computeMode(elm);
     const hostRef = getHostRef(elm);
     if (hostRef.$modeName$ !== mode) {
@@ -2924,7 +3091,7 @@ var forceModeUpdate = (elm) => {
 };
 
 // src/runtime/bootstrap-lazy.ts
-import { BUILD as BUILD25 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD26 } from "@rindo/core/internal/app-data";
 
 // src/runtime/hmr-component.ts
 var hmrStart = (hostElement, cmpMeta, hmrVersionId) => {
@@ -2936,7 +3103,7 @@ var hmrStart = (hostElement, cmpMeta, hmrVersionId) => {
 // src/runtime/bootstrap-lazy.ts
 var bootstrapLazy = (lazyBundles, options = {}) => {
   var _a;
-  if (BUILD25.profile && performance.mark) {
+  if (BUILD26.profile && performance.mark) {
     performance.mark("st:app:start");
   }
   installDevTools();
@@ -2952,12 +3119,12 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
   let isBootstrapping = true;
   Object.assign(plt, options);
   plt.$resourcesUrl$ = new URL(options.resourcesUrl || "./", doc.baseURI).href;
-  if (BUILD25.asyncQueue) {
+  if (BUILD26.asyncQueue) {
     if (options.syncQueue) {
       plt.$flags$ |= 4 /* queueSync */;
     }
   }
-  if (BUILD25.hydrateClientSide) {
+  if (BUILD26.hydrateClientSide) {
     plt.$flags$ |= 2 /* appLoaded */;
   }
   let hasSlotRelocation = false;
@@ -2973,22 +3140,22 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
       if (cmpMeta.$flags$ & 4 /* hasSlotRelocation */) {
         hasSlotRelocation = true;
       }
-      if (BUILD25.member) {
+      if (BUILD26.member) {
         cmpMeta.$members$ = compactMeta[2];
       }
-      if (BUILD25.hostListener) {
+      if (BUILD26.hostListener) {
         cmpMeta.$listeners$ = compactMeta[3];
       }
-      if (BUILD25.reflect) {
+      if (BUILD26.reflect) {
         cmpMeta.$attrsToReflect$ = [];
       }
-      if (BUILD25.watchCallback) {
+      if (BUILD26.watchCallback) {
         cmpMeta.$watchers$ = (_a2 = compactMeta[4]) != null ? _a2 : {};
       }
-      if (BUILD25.shadowDom && !supportsShadow && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
+      if (BUILD26.shadowDom && !supportsShadow && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
         cmpMeta.$flags$ |= 8 /* needsShadowDomShim */;
       }
-      const tagName = BUILD25.transformTagName && options.transformTagName ? options.transformTagName(cmpMeta.$tagName$) : cmpMeta.$tagName$;
+      const tagName = BUILD26.transformTagName && options.transformTagName ? options.transformTagName(cmpMeta.$tagName$) : cmpMeta.$tagName$;
       const HostElement = class extends HTMLElement {
         // RindoLazyHost
         constructor(self) {
@@ -2996,10 +3163,10 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
           this.hasRegisteredEventListeners = false;
           self = this;
           registerHost(self, cmpMeta);
-          if (BUILD25.shadowDom && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
+          if (BUILD26.shadowDom && cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) {
             if (supportsShadow) {
               if (!self.shadowRoot) {
-                if (BUILD25.shadowDelegatesFocus) {
+                if (BUILD26.shadowDelegatesFocus) {
                   self.attachShadow({
                     mode: "open",
                     delegatesFocus: !!(cmpMeta.$flags$ & 16 /* shadowDelegatesFocus */)
@@ -3014,7 +3181,7 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
                   );
                 }
               }
-            } else if (!BUILD25.hydrateServerSide && !("shadowRoot" in self)) {
+            } else if (!BUILD26.hydrateServerSide && !("shadowRoot" in self)) {
               self.shadowRoot = self;
             }
           }
@@ -3037,33 +3204,40 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
         }
         disconnectedCallback() {
           plt.jmp(() => disconnectedCallback(this));
+          plt.raf(() => {
+            var _a3;
+            const hostRef = getHostRef(this);
+            if (((_a3 = hostRef == null ? void 0 : hostRef.$vnode$) == null ? void 0 : _a3.$elm$) instanceof Node && !hostRef.$vnode$.$elm$.isConnected) {
+              delete hostRef.$vnode$.$elm$;
+            }
+          });
         }
         componentOnReady() {
           return getHostRef(this).$onReadyPromise$;
         }
       };
-      if (BUILD25.experimentalSlotFixes) {
-        if (BUILD25.scoped && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+      if (BUILD26.experimentalSlotFixes) {
+        if (BUILD26.scoped && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
           patchPseudoShadowDom(HostElement.prototype);
         }
       } else {
-        if (BUILD25.slotChildNodesFix) {
+        if (BUILD26.slotChildNodesFix) {
           patchChildSlotNodes(HostElement.prototype);
         }
-        if (BUILD25.cloneNodeFix) {
+        if (BUILD26.cloneNodeFix) {
           patchCloneNode(HostElement.prototype);
         }
-        if (BUILD25.appendChildSlotFix) {
+        if (BUILD26.appendChildSlotFix) {
           patchSlotAppendChild(HostElement.prototype);
         }
-        if (BUILD25.scopedSlotTextContentFix && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
+        if (BUILD26.scopedSlotTextContentFix && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
           patchTextContent(HostElement.prototype);
         }
       }
-      if (BUILD25.formAssociated && cmpMeta.$flags$ & 64 /* formAssociated */) {
+      if (BUILD26.formAssociated && cmpMeta.$flags$ & 64 /* formAssociated */) {
         HostElement.formAssociated = true;
       }
-      if (BUILD25.hotModuleReplacement) {
+      if (BUILD26.hotModuleReplacement) {
         HostElement.prototype["s-hmr"] = function(hmrVersionId) {
           hmrStart(this, cmpMeta, hmrVersionId);
         };
@@ -3082,7 +3256,7 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
     if (hasSlotRelocation) {
       dataStyles.textContent += SLOT_FB_CSS;
     }
-    if (BUILD25.invisiblePrehydration && (BUILD25.hydratedClass || BUILD25.hydratedAttribute)) {
+    if (BUILD26.invisiblePrehydration && (BUILD26.hydratedClass || BUILD26.hydratedAttribute)) {
       dataStyles.textContent += cmpTags.sort() + HYDRATED_CSS;
     }
     if (dataStyles.innerHTML.length) {
@@ -3098,7 +3272,7 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
   if (deferredConnectedCallbacks.length) {
     deferredConnectedCallbacks.map((host) => host.connectedCallback());
   } else {
-    if (BUILD25.profile) {
+    if (BUILD26.profile) {
       plt.jmp(() => appLoadFallback = setTimeout(appDidLoad, 30, "timeout"));
     } else {
       plt.jmp(() => appLoadFallback = setTimeout(appDidLoad, 30));
@@ -3111,10 +3285,10 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
 var Fragment = (_, children) => children;
 
 // src/runtime/host-listener.ts
-import { BUILD as BUILD26 } from "@rindo/core/internal/app-data";
+import { BUILD as BUILD27 } from "@rindo/core/internal/app-data";
 var addHostEventListeners = (elm, hostRef, listeners, attachParentListeners) => {
-  if (BUILD26.hostListener && listeners) {
-    if (BUILD26.hostListenerTargetParent) {
+  if (BUILD27.hostListener && listeners) {
+    if (BUILD27.hostListenerTargetParent) {
       if (attachParentListeners) {
         listeners = listeners.filter(([flags]) => flags & 32 /* TargetParent */);
       } else {
@@ -3122,7 +3296,7 @@ var addHostEventListeners = (elm, hostRef, listeners, attachParentListeners) =>
       }
     }
     listeners.map(([flags, name, method]) => {
-      const target = BUILD26.hostListenerTarget ? getHostListenerTarget(elm, flags) : elm;
+      const target = BUILD27.hostListenerTarget ? getHostListenerTarget(elm, flags) : elm;
       const handler = hostListenerProxy(hostRef, method);
       const opts = hostListenerOpts(flags);
       plt.ael(target, name, handler, opts);
@@ -3133,7 +3307,7 @@ var addHostEventListeners = (elm, hostRef, listeners, attachParentListeners) =>
 var hostListenerProxy = (hostRef, methodName) => (ev) => {
   var _a;
   try {
-    if (BUILD26.lazyLoad) {
+    if (BUILD27.lazyLoad) {
       if (hostRef.$flags$ & 256 /* isListenReady */) {
         (_a = hostRef.$lazyInstance$) == null ? void 0 : _a[methodName](ev);
       } else {
@@ -3147,10 +3321,10 @@ var hostListenerProxy = (hostRef, methodName) => (ev) => {
   }
 };
 var getHostListenerTarget = (elm, flags) => {
-  if (BUILD26.hostListenerTargetDocument && flags & 4 /* TargetDocument */) return doc;
-  if (BUILD26.hostListenerTargetWindow && flags & 8 /* TargetWindow */) return win;
-  if (BUILD26.hostListenerTargetBody && flags & 16 /* TargetBody */) return doc.body;
-  if (BUILD26.hostListenerTargetParent && flags & 32 /* TargetParent */ && elm.parentElement)
+  if (BUILD27.hostListenerTargetDocument && flags & 4 /* TargetDocument */) return doc;
+  if (BUILD27.hostListenerTargetWindow && flags & 8 /* TargetWindow */) return win;
+  if (BUILD27.hostListenerTargetBody && flags & 16 /* TargetBody */) return doc.body;
+  if (BUILD27.hostListenerTargetParent && flags & 32 /* TargetParent */ && elm.parentElement)
     return elm.parentElement;
   return elm;
 };
@@ -3310,7 +3484,7 @@ var insertChildVNodeAnnotations = (doc2, vnodeChild, cmpData, hostId, depth, ind
   }
 };
 export {
-  BUILD27 as BUILD,
+  BUILD28 as BUILD,
   Build,
   Env,
   Fragment,
@@ -3329,6 +3503,7 @@ export {
   consoleError,
   createEvent,
   defineCustomElement,
+  deleteHostRef,
   disconnectedCallback,
   doc,
   forceModeUpdate,