@vue/compat 3.6.0-beta.8 → 3.6.0-beta.9

package/dist/vue-compat.d.ts

@@ -268,8 +268,8 @@ type UnwrapRef<T> = T extends ShallowRef<infer V, unknown> ? V : T extends Ref<i
 type UnwrapRefSimple<T> = T extends Builtin | Ref | RefUnwrapBailTypes[keyof RefUnwrapBailTypes] | {
   [RawSymbol]?: true;
 } ? T : T extends Map<infer K, infer V> ? Map<K, UnwrapRefSimple<V>> & UnwrapRef<Omit<T, keyof Map<any, any>>> : T extends WeakMap<infer K, infer V> ? WeakMap<K, UnwrapRefSimple<V>> & UnwrapRef<Omit<T, keyof WeakMap<any, any>>> : T extends Set<infer V> ? Set<UnwrapRefSimple<V>> & UnwrapRef<Omit<T, keyof Set<any>>> : T extends WeakSet<infer V> ? WeakSet<UnwrapRefSimple<V>> & UnwrapRef<Omit<T, keyof WeakSet<any>>> : T extends ReadonlyArray<any> ? { [K in keyof T]: UnwrapRefSimple<T[K]> } : T extends object & {
-  [ShallowReactiveMarker]?: never;
-} ? { [P in keyof T]: P extends symbol ? T[P] : UnwrapRef<T[P]> } : T;
+  [ShallowReactiveMarker]: never;
+} ? T : T extends object ? { [P in keyof T]: P extends symbol ? T[P] : UnwrapRef<T[P]> } : T;
 //#endregion
 //#region packages/reactivity/src/watch.d.ts
 type WatchCallback<V = any, OV = any> = (value: V, oldValue: OV, onCleanup: OnCleanup) => any;
@@ -564,6 +564,10 @@ interface SuspenseProps {
   onResolve?: () => void;
   onPending?: () => void;
   onFallback?: () => void;
+  /**
+  * Switch to fallback content if it takes longer than `timeout` milliseconds to render the new default content.
+  * A `timeout` value of `0` will cause the fallback content to be displayed immediately when default content is replaced.
+  */
   timeout?: string | number;
   /**
   * Allow suspense to be captured by parent suspense
@@ -597,6 +601,7 @@ interface SuspenseBoundary {
   container: RendererElement;
   hiddenContainer: RendererElement;
   activeBranch: VNode | null;
+  isFallbackMountPending: boolean;
   pendingBranch: VNode | null;
   deps: number;
   pendingId: number;
@@ -22159,7 +22164,7 @@ declare namespace DataType {
   type SingleAnimationTimeline = "auto" | "none" | (string & {});
   type SingleTransition<TTime> = EasingFunction | TTime | "all" | "allow-discrete" | "none" | "normal" | (string & {});
   type StepEasingFunction = "step-end" | "step-start" | (string & {});
-  type SystemCexport olor = "AccentColor" | "AccentColorText" | "ActiveText" | "ButtonBorder" | "ButtonFace" | "ButtonText" | "Canvas" | "CanvasText" | "Field" | "FieldText" | "GrayText" | "Highlight" | "HighlightText" | "LinkText" | "Mark" | "MarkText" | "SelectedItem" | "SelectedItemText" | "VisitedText";
+  type SystemColor = "AccentColor" | "AccentColorText" | "ActiveText" | "ButtonBorder" | "ButtonFace" | "ButtonText" | "Canvas" | "CanvasText" | "Field" | "FieldText" | "GrayText" | "Highlight" | "HighlightText" | "LinkText" | "Mark" | "MarkText" | "SelectedItem" | "SelectedItemText" | "VisitedText";
   type SystemFamilyName = "caption" | "icon" | "menu" | "message-box" | "small-caption" | "status-bar";
   type TextEdge = "cap" | "ex" | "ideographic" | "ideographic-ink" | "text" | (string & {});
   type TimelineRangeName = "contain" | "cover" | "entry" | "entry-crossing" | "exit" | "exit-crossing";
@@ -22218,6 +22223,6 @@ declare module "@vue/runtime-core" {
 }
 //#endregion
 //#region temp/packages/vue-compat/src/index.d.ts
-declare const Vue: CompatVue;
+export declare const Vue: CompatVue;
 //#endregion
 export { Vue as default };

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-beta.8
+  * @vue/compat v3.6.0-beta.9
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -1817,16 +1817,16 @@ function toRefs(object) {
 	return ret;
 }
 var ObjectRefImpl = class {
-	constructor(_object, _key, _defaultValue) {
+	constructor(_object, key, _defaultValue) {
 		this._object = _object;
-		this._key = _key;
 		this._defaultValue = _defaultValue;
 		this["__v_isRef"] = true;
 		this._value = void 0;
+		this._key = isSymbol(key) ? key : String(key);
 		this._raw = /* @__PURE__ */ toRaw(_object);
 		let shallow = true;
 		let obj = _object;
-		if (!isArray(_object) || !isIntegerKey(String(_key))) do
+		if (!isArray(_object) || isSymbol(this._key) || !isIntegerKey(this._key)) do
 			shallow = !/* @__PURE__ */ isProxy(obj) || /* @__PURE__ */ isShallow(obj);
 		while (shallow && (obj = obj["__v_raw"]));
 		this._shallow = shallow;
@@ -2736,6 +2736,13 @@ function checkRecursiveUpdates(seen, fn) {
 //#endregion
 //#region packages/runtime-core/src/hmr.ts
 let isHmrUpdating = false;
+const setHmrUpdating = (v) => {
+	try {
+		return isHmrUpdating;
+	} finally {
+		isHmrUpdating = v;
+	}
+};
 const hmrDirtyComponents = /* @__PURE__ */ new Map();
 const hmrDirtyComponentsMode = /* @__PURE__ */ new Map();
 getGlobalThis().__VUE_HMR_RUNTIME__ = {
@@ -3593,25 +3600,26 @@ const TeleportImpl = {
 				mount(container, mainAnchor);
 				updateCssVars(n2, true);
 			}
-			if (isTeleportDeferred(n2.props)) {
+			if (isTeleportDeferred(n2.props) || parentSuspense && parentSuspense.pendingBranch) {
 				n2.el.__isMounted = false;
 				queuePostRenderEffect(() => {
+					if (n2.el.__isMounted !== false) return;
 					mountToTarget();
 					delete n2.el.__isMounted;
 				}, void 0, parentSuspense);
 			} else mountToTarget();
 		} else {
-			if (isTeleportDeferred(n2.props) && n1.el.__isMounted === false) {
-				queuePostRenderEffect(() => {
-					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
-				}, void 0, parentSuspense);
-				return;
-			}
 			n2.el = n1.el;
 			n2.targetStart = n1.targetStart;
 			const mainAnchor = n2.anchor = n1.anchor;
 			const target = n2.target = n1.target;
 			const targetAnchor = n2.targetAnchor = n1.targetAnchor;
+			if (n1.el.__isMounted === false) {
+				queuePostRenderEffect(() => {
+					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
+				}, void 0, parentSuspense);
+				return;
+			}
 			const wasDisabled = isTeleportDisabled(n1.props);
 			const currentContainer = wasDisabled ? container : target;
 			const currentAnchor = wasDisabled ? mainAnchor : targetAnchor;
@@ -3633,11 +3641,9 @@ const TeleportImpl = {
 		}
 	},
 	remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
-		const { shapeFlag, children, anchor, targetStart, targetAnchor, target, props } = vnode;
-		if (target) {
-			hostRemove(targetStart);
-			hostRemove(targetAnchor);
-		}
+		const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
+		if (targetStart) hostRemove(targetStart);
+		if (targetAnchor) hostRemove(targetAnchor);
 		doRemove && hostRemove(anchor);
 		if (shapeFlag & 16) {
 			const shouldRemove = doRemove || !isTeleportDisabled(props);
@@ -3897,7 +3903,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			callHook(hook, [el]);
 		},
 		enter(el) {
-			if (isLeaving()) return;
+			if (!isHmrUpdating && isLeaving()) return;
 			let hook = onEnter;
 			let afterHook = onAfterEnter;
 			let cancelHook = onEnterCancelled;
@@ -6276,7 +6282,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
 		if (options.el) return vm.$mount(options.el);
 		else return vm;
 	}
-	Vue.version = `2.6.14-compat:3.6.0-beta.8`;
+	Vue.version = `2.6.14-compat:3.6.0-beta.9`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -7088,15 +7094,19 @@ function hasPropValueChanged(nextProps, prevProps, key) {
 	if (key === "style" && isObject(nextProp) && isObject(prevProp)) return !looseEqual(nextProp, prevProp);
 	return nextProp !== prevProp;
 }
-function updateHOCHostEl({ vnode, parent }, el) {
+function updateHOCHostEl({ vnode, parent, suspense }, el) {
 	while (parent && !parent.vapor) {
 		const root = parent.subTree;
-		if (root.suspense && root.suspense.activeBranch === vnode) root.el = vnode.el;
+		if (root.suspense && root.suspense.activeBranch === vnode) {
+			root.suspense.vnode.el = root.el = el;
+			vnode = root;
+		}
 		if (root === vnode) {
 			(vnode = parent.vnode).el = el;
 			parent = parent.parent;
 		} else break;
 	}
+	if (suspense && suspense.activeBranch === vnode) suspense.vnode.el = el;
 }
 //#endregion
 //#region packages/runtime-core/src/compat/props.ts
@@ -7705,10 +7715,19 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (dirs) invokeDirectiveHook(vnode, null, parentComponent, "beforeMount");
 		if (transition) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense);
 		else hostInsert(el, container, anchor);
-		if ((vnodeHook = props && props.onVnodeMounted) || dirs) queuePostRenderEffect(() => {
-			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-			dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
-		}, void 0, parentSuspense);
+		if ((vnodeHook = props && props.onVnodeMounted) || dirs) {
+			const isHmr = isHmrUpdating;
+			queuePostRenderEffect(() => {
+				let prev;
+				prev = setHmrUpdating(isHmr);
+				try {
+					vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+					dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+				} finally {
+					setHmrUpdating(prev);
+				}
+			}, void 0, parentSuspense);
+		}
 	};
 	const setScopeId = (el, vnode, scopeId, slotScopeIds, parentComponent) => {
 		if (scopeId) hostSetScopeId(el, scopeId);
@@ -8191,7 +8210,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
-		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex } = vnode;
+		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex, memo } = vnode;
 		if (patchFlag === -2) optimized = false;
 		if (ref != null) {
 			const prevSub = setActiveSub();
@@ -8229,9 +8248,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 			}
 			if (doRemove) remove(vnode);
 		}
-		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs) queuePostRenderEffect(() => {
+		const shouldInvalidateMemo = memo != null && cacheIndex == null;
+		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs || shouldInvalidateMemo) queuePostRenderEffect(() => {
 			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
 			shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+			if (shouldInvalidateMemo) vnode.el = null;
 		}, void 0, parentSuspense);
 	};
 	const remove = (vnode) => {
@@ -8586,6 +8607,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 		pendingId: suspenseId++,
 		timeout: typeof timeout === "number" ? timeout : -1,
 		activeBranch: null,
+		isFallbackMountPending: false,
 		pendingBranch: null,
 		isInFallback: !isHydrating,
 		isHydrating,
@@ -8606,13 +8628,14 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 						if (isInFallback && vnode.ssFallback) vnode.ssFallback.el = null;
 					}
 				};
-				if (activeBranch) {
+				if (activeBranch && !suspense.isFallbackMountPending) {
 					if (parentNode(activeBranch.el) === container) anchor = next(activeBranch);
 					unmount(activeBranch, parentComponent, suspense, true);
 					if (!delayEnter && isInFallback && vnode.ssFallback) queuePostRenderEffect(() => vnode.ssFallback.el = null, void 0, suspense);
 				}
 				if (!delayEnter) move(pendingBranch, container, anchor, 0, parentComponent);
 			}
+			suspense.isFallbackMountPending = false;
 			setActiveBranch(suspense, pendingBranch);
 			suspense.pendingBranch = null;
 			suspense.isInFallback = false;
@@ -8642,12 +8665,16 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			triggerEvent(vnode, "onFallback");
 			const anchor = next(activeBranch);
 			const mountFallback = () => {
+				suspense.isFallbackMountPending = false;
 				if (!suspense.isInFallback) return;
 				patch(null, fallbackVNode, container, anchor, parentComponent, null, namespace, slotScopeIds, optimized);
 				setActiveBranch(suspense, fallbackVNode);
 			};
 			const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
-			if (delayEnter) activeBranch.transition.afterLeave = mountFallback;
+			if (delayEnter) {
+				suspense.isFallbackMountPending = true;
+				activeBranch.transition.afterLeave = mountFallback;
+			}
 			suspense.isInFallback = true;
 			unmount(activeBranch, parentComponent, null, true);
 			if (!delayEnter) mountFallback();
@@ -9092,6 +9119,7 @@ function mergeProps(...args) {
 			const existing = ret[key];
 			const incoming = toMerge[key];
 			if (incoming && existing !== incoming && !(isArray(existing) && existing.includes(incoming))) ret[key] = existing ? [].concat(existing, incoming) : incoming;
+			else if (incoming == null && existing == null && !isModelListener(key)) ret[key] = incoming;
 		} else if (key !== "") ret[key] = toMerge[key];
 	}
 	return ret;
@@ -9672,7 +9700,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.8";
+const version = "3.6.0-beta.9";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -10938,7 +10966,8 @@ const vModelTextUpdate = (el, oldValue, value, trim, number, lazy) => {
 	const elValue = (number || el.type === "number") && !/^0\d/.test(el.value) ? looseToNumber(el.value) : el.value;
 	const newValue = value == null ? "" : value;
 	if (elValue === newValue) return;
-	if (document.activeElement === el && el.type !== "range") {
+	const rootNode = el.getRootNode();
+	if ((rootNode instanceof Document || rootNode instanceof ShadowRoot) && rootNode.activeElement === el && el.type !== "range") {
 		if (lazy && value === oldValue) return;
 		if (trim && el.value.trim() === newValue) return;
 	}
@@ -15374,7 +15403,7 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 						`)`
 					]),
 					createCompoundExpression([
-						`if (_cached`,
+						`if (_cached && _cached.el`,
 						...keyExp ? [` && _cached.key === `, keyExp] : [],
 						` && ${context.helperString(IS_MEMO_SAME)}(_cached, _memo)) return _cached`
 					]),

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-beta.8
+  * @vue/compat v3.6.0-beta.9
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -1635,16 +1635,16 @@ function toRefs(object) {
 	return ret;
 }
 var ObjectRefImpl = class {
-	constructor(_object, _key, _defaultValue) {
+	constructor(_object, key, _defaultValue) {
 		this._object = _object;
-		this._key = _key;
 		this._defaultValue = _defaultValue;
 		this["__v_isRef"] = true;
 		this._value = void 0;
+		this._key = isSymbol(key) ? key : String(key);
 		this._raw = /* @__PURE__ */ toRaw(_object);
 		let shallow = true;
 		let obj = _object;
-		if (!isArray(_object) || !isIntegerKey(String(_key))) do
+		if (!isArray(_object) || isSymbol(this._key) || !isIntegerKey(this._key)) do
 			shallow = !/* @__PURE__ */ isProxy(obj) || /* @__PURE__ */ isShallow(obj);
 		while (shallow && (obj = obj["__v_raw"]));
 		this._shallow = shallow;
@@ -2862,25 +2862,26 @@ const TeleportImpl = {
 				mount(container, mainAnchor);
 				updateCssVars(n2, true);
 			}
-			if (isTeleportDeferred(n2.props)) {
+			if (isTeleportDeferred(n2.props) || parentSuspense && parentSuspense.pendingBranch) {
 				n2.el.__isMounted = false;
 				queuePostRenderEffect(() => {
+					if (n2.el.__isMounted !== false) return;
 					mountToTarget();
 					delete n2.el.__isMounted;
 				}, void 0, parentSuspense);
 			} else mountToTarget();
 		} else {
-			if (isTeleportDeferred(n2.props) && n1.el.__isMounted === false) {
-				queuePostRenderEffect(() => {
-					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
-				}, void 0, parentSuspense);
-				return;
-			}
 			n2.el = n1.el;
 			n2.targetStart = n1.targetStart;
 			const mainAnchor = n2.anchor = n1.anchor;
 			const target = n2.target = n1.target;
 			const targetAnchor = n2.targetAnchor = n1.targetAnchor;
+			if (n1.el.__isMounted === false) {
+				queuePostRenderEffect(() => {
+					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
+				}, void 0, parentSuspense);
+				return;
+			}
 			const wasDisabled = isTeleportDisabled(n1.props);
 			const currentContainer = wasDisabled ? container : target;
 			const currentAnchor = wasDisabled ? mainAnchor : targetAnchor;
@@ -2901,11 +2902,9 @@ const TeleportImpl = {
 		}
 	},
 	remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
-		const { shapeFlag, children, anchor, targetStart, targetAnchor, target, props } = vnode;
-		if (target) {
-			hostRemove(targetStart);
-			hostRemove(targetAnchor);
-		}
+		const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
+		if (targetStart) hostRemove(targetStart);
+		if (targetAnchor) hostRemove(targetAnchor);
 		doRemove && hostRemove(anchor);
 		if (shapeFlag & 16) {
 			const shouldRemove = doRemove || !isTeleportDisabled(props);
@@ -5204,7 +5203,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
 		if (options.el) return vm.$mount(options.el);
 		else return vm;
 	}
-	Vue.version = `2.6.14-compat:3.6.0-beta.8`;
+	Vue.version = `2.6.14-compat:3.6.0-beta.9`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -5862,15 +5861,19 @@ function hasPropValueChanged(nextProps, prevProps, key) {
 	if (key === "style" && isObject(nextProp) && isObject(prevProp)) return !looseEqual(nextProp, prevProp);
 	return nextProp !== prevProp;
 }
-function updateHOCHostEl({ vnode, parent }, el) {
+function updateHOCHostEl({ vnode, parent, suspense }, el) {
 	while (parent && !parent.vapor) {
 		const root = parent.subTree;
-		if (root.suspense && root.suspense.activeBranch === vnode) root.el = vnode.el;
+		if (root.suspense && root.suspense.activeBranch === vnode) {
+			root.suspense.vnode.el = root.el = el;
+			vnode = root;
+		}
 		if (root === vnode) {
 			(vnode = parent.vnode).el = el;
 			parent = parent.parent;
 		} else break;
 	}
+	if (suspense && suspense.activeBranch === vnode) suspense.vnode.el = el;
 }
 //#endregion
 //#region packages/runtime-core/src/compat/props.ts
@@ -6301,8 +6304,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (transition) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense);
 		else hostInsert(el, container, anchor);
 		if ((vnodeHook = props && props.onVnodeMounted) || dirs) queuePostRenderEffect(() => {
-			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-			dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+			try {
+				vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+				dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+			} finally {}
 		}, void 0, parentSuspense);
 	};
 	const setScopeId = (el, vnode, scopeId, slotScopeIds, parentComponent) => {
@@ -6738,7 +6743,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
-		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex } = vnode;
+		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex, memo } = vnode;
 		if (patchFlag === -2) optimized = false;
 		if (ref != null) {
 			const prevSub = setActiveSub();
@@ -6776,9 +6781,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 			}
 			if (doRemove) remove(vnode);
 		}
-		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs) queuePostRenderEffect(() => {
+		const shouldInvalidateMemo = memo != null && cacheIndex == null;
+		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs || shouldInvalidateMemo) queuePostRenderEffect(() => {
 			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
 			shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+			if (shouldInvalidateMemo) vnode.el = null;
 		}, void 0, parentSuspense);
 	};
 	const remove = (vnode) => {
@@ -7110,6 +7117,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 		pendingId: suspenseId++,
 		timeout: typeof timeout === "number" ? timeout : -1,
 		activeBranch: null,
+		isFallbackMountPending: false,
 		pendingBranch: null,
 		isInFallback: !isHydrating,
 		isHydrating,
@@ -7128,13 +7136,14 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 						if (isInFallback && vnode.ssFallback) vnode.ssFallback.el = null;
 					}
 				};
-				if (activeBranch) {
+				if (activeBranch && !suspense.isFallbackMountPending) {
 					if (parentNode(activeBranch.el) === container) anchor = next(activeBranch);
 					unmount(activeBranch, parentComponent, suspense, true);
 					if (!delayEnter && isInFallback && vnode.ssFallback) queuePostRenderEffect(() => vnode.ssFallback.el = null, void 0, suspense);
 				}
 				if (!delayEnter) move(pendingBranch, container, anchor, 0, parentComponent);
 			}
+			suspense.isFallbackMountPending = false;
 			setActiveBranch(suspense, pendingBranch);
 			suspense.pendingBranch = null;
 			suspense.isInFallback = false;
@@ -7164,12 +7173,16 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			triggerEvent(vnode, "onFallback");
 			const anchor = next(activeBranch);
 			const mountFallback = () => {
+				suspense.isFallbackMountPending = false;
 				if (!suspense.isInFallback) return;
 				patch(null, fallbackVNode, container, anchor, parentComponent, null, namespace, slotScopeIds, optimized);
 				setActiveBranch(suspense, fallbackVNode);
 			};
 			const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
-			if (delayEnter) activeBranch.transition.afterLeave = mountFallback;
+			if (delayEnter) {
+				suspense.isFallbackMountPending = true;
+				activeBranch.transition.afterLeave = mountFallback;
+			}
 			suspense.isInFallback = true;
 			unmount(activeBranch, parentComponent, null, true);
 			if (!delayEnter) mountFallback();
@@ -7579,6 +7592,7 @@ function mergeProps(...args) {
 			const existing = ret[key];
 			const incoming = toMerge[key];
 			if (incoming && existing !== incoming && !(isArray(existing) && existing.includes(incoming))) ret[key] = existing ? [].concat(existing, incoming) : incoming;
+			else if (incoming == null && existing == null && !isModelListener(key)) ret[key] = incoming;
 		} else if (key !== "") ret[key] = toMerge[key];
 	}
 	return ret;
@@ -7913,7 +7927,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.8";
+const version = "3.6.0-beta.9";
 const warn = NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -9120,7 +9134,8 @@ const vModelTextUpdate = (el, oldValue, value, trim, number, lazy) => {
 	const elValue = (number || el.type === "number") && !/^0\d/.test(el.value) ? looseToNumber(el.value) : el.value;
 	const newValue = value == null ? "" : value;
 	if (elValue === newValue) return;
-	if (document.activeElement === el && el.type !== "range") {
+	const rootNode = el.getRootNode();
+	if ((rootNode instanceof Document || rootNode instanceof ShadowRoot) && rootNode.activeElement === el && el.type !== "range") {
 		if (lazy && value === oldValue) return;
 		if (trim && el.value.trim() === newValue) return;
 	}
@@ -13418,7 +13433,7 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 						`)`
 					]),
 					createCompoundExpression([
-						`if (_cached`,
+						`if (_cached && _cached.el`,
 						...keyExp ? [` && _cached.key === `, keyExp] : [],
 						` && ${context.helperString(IS_MEMO_SAME)}(_cached, _memo)) return _cached`
 					]),