@askrjs/askr 0.0.41 → 0.0.42

package/dist/benchmark.js

@@ -10,8 +10,8 @@ import { BenchmarkTable } from "./bench/components/benchmark-table.js";
 installRendererBridge();
 const benchmarkMetadata = {
 	packageName: "@askrjs/askr",
-	packageVersion: "0.0.41",
-	buildLabel: "0.0.41-local"
+	packageVersion: "0.0.42",
+	buildLabel: "0.0.42-local"
 };
 function getBenchmarkMetadata() {
 	return { ...benchmarkMetadata };

package/dist/renderer/dom.js

@@ -1221,6 +1221,7 @@ function resolveNestedComponentResult(result, snapshot, parentInstance) {
 		const nestedSnapshot = getVNodeContextFrame(currentResult) ?? activeSnapshot;
 		const nestedInstance = createComponentInstance(nextComponentInstanceId(), currentResult.type, currentResult.props ?? {}, null);
 		nestedInstance.isRoot = isRouteRootComponentVNode(currentResult);
+		nestedInstance.parentInstance = parentInstance;
 		nestedInstance.portalScope = parentInstance?.portalScope ?? nestedInstance.portalScope;
 		inheritComponentCleanupStrict(nestedInstance);
 		if (nestedSnapshot) nestedInstance.ownerFrame = nestedSnapshot;
@@ -1233,11 +1234,12 @@ function resolveNestedComponentResult(result, snapshot, parentInstance) {
 	}
 	return currentResult;
 }
-function resolveHostNestedComponentResult(host, retainedInstance, result, snapshot) {
+function resolveHostNestedComponentResult(host, retainedInstance, result, snapshot, retainedHostInstances) {
 	let currentResult = result;
 	let activeSnapshot = snapshot;
 	let depth = 0;
 	const retainedInstances = new Set([retainedInstance]);
+	if (retainedHostInstances) for (const instance of retainedHostInstances) retainedInstances.add(instance);
 	const createdInstances = [];
 	while (_isDOMElement(currentResult) && typeof currentResult.type === "function" && depth < 16) {
 		const nestedSnapshot = getVNodeContextFrame(currentResult) ?? activeSnapshot;
@@ -1248,6 +1250,7 @@ function resolveHostNestedComponentResult(host, retainedInstance, result, snapsh
 		}
 		setVNodeComponentInstance(currentResult, nestedInstance);
 		nestedInstance.isRoot = isRouteRootComponentVNode(currentResult);
+		nestedInstance.parentInstance = retainedInstance;
 		nestedInstance.portalScope = retainedInstance.portalScope ?? nestedInstance.portalScope;
 		inheritComponentCleanupStrict(nestedInstance);
 		nestedInstance.props = (currentResult.props ?? {}) || {};
@@ -1262,7 +1265,9 @@ function resolveHostNestedComponentResult(host, retainedInstance, result, snapsh
 	}
 	const previousInstances = host.__ASKR_INSTANCES ?? [];
 	for (const instance of previousInstances) if (!retainedInstances.has(instance)) cleanupComponent(instance);
-	host.__ASKR_INSTANCES = previousInstances.filter((instance) => retainedInstances.has(instance));
+	const nextHostInstances = previousInstances.filter((instance) => retainedInstances.has(instance));
+	for (const instance of retainedInstances) if (instance.target === host && !nextHostInstances.includes(instance)) nextHostInstances.push(instance);
+	host.__ASKR_INSTANCES = nextHostInstances;
 	host.__ASKR_INSTANCE = host.__ASKR_INSTANCES[0] ?? retainedInstance;
 	for (const instance of createdInstances) mountInstanceInline(instance, host);
 	return currentResult;
@@ -1276,6 +1281,7 @@ function resolveWrapperHostResult(host, result, snapshot) {
 		const nestedInstance = findHostInstanceByType(host, currentResult.type);
 		if (!nestedInstance) break;
 		nestedInstance.props = (currentResult.props ?? {}) || {};
+		nestedInstance.parentInstance = getCurrentInstance();
 		nestedInstance.isRoot = isRouteRootComponentVNode(currentResult);
 		nestedInstance.portalScope = getCurrentInstance()?.portalScope ?? nestedInstance.portalScope;
 		inheritComponentCleanupStrict(nestedInstance);
@@ -1301,7 +1307,7 @@ function normalizeComponentChildren(result) {
 	}
 	return [result];
 }
-function syncComponentElement(currentDom, node, type, props, parentNamespace, forceChildrenUpdate = false) {
+function syncComponentElement(currentDom, node, type, props, parentNamespace, forceChildrenUpdate = false, retainedHostInstances) {
 	const existingHost = currentDom instanceof Element ? currentDom : null;
 	const existingInstance = existingHost ? findHostInstanceByType(existingHost, type) : null;
 	if (!existingHost) return null;
@@ -1326,7 +1332,7 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 			warnUnusedStateReads(hydrationInstance);
 			return existingHost;
 		}
-		const resolvedResult = resolveHostNestedComponentResult(existingHost, hydrationInstance, scopedResult, snapshot ?? null);
+		const resolvedResult = resolveHostNestedComponentResult(existingHost, hydrationInstance, scopedResult, snapshot ?? null, retainedHostInstances);
 		if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, resolvedResult.type)) {
 			withContext(snapshot, () => {
 				updateElementFromVnode(existingHost, inheritComponentKey(resolvedResult, node), true, forceChildrenUpdate || hydrationInstance.mounted === false);
@@ -1368,7 +1374,7 @@ function syncComponentElement(currentDom, node, type, props, parentNamespace, fo
 		warnUnusedStateReads(existingInstance);
 		return existingHost;
 	}
-	const resolvedResult = resolveHostNestedComponentResult(existingHost, existingInstance, scopedResult, snapshot ?? null);
+	const resolvedResult = resolveHostNestedComponentResult(existingHost, existingInstance, scopedResult, snapshot ?? null, retainedHostInstances);
 	if (_isDOMElement(resolvedResult) && typeof resolvedResult.type === "string" && tagNamesEqualIgnoreCase(existingHost.tagName, resolvedResult.type)) {
 		withContext(snapshot, () => {
 			updateElementFromVnode(existingHost, inheritComponentKey(resolvedResult, node), true, forceChildrenUpdate || existingInstance.mounted === false);
@@ -1403,6 +1409,7 @@ function createComponentElement(node, type, props, parentNamespace) {
 		setVNodeComponentInstance(node, childInstance);
 	}
 	childInstance.portalScope = getCurrentInstance()?.portalScope ?? childInstance.portalScope;
+	childInstance.parentInstance = getCurrentInstance();
 	childInstance.props = props || {};
 	childInstance.isRoot = isRouteRootComponentVNode(node);
 	inheritComponentCleanupStrict(childInstance);