fix(hydration): scope slot boundary restoration to slot-owned close markers

edison1105 · edison1105 · commit 95799117d206 · 2026-04-13T09:45:08.000+08:00
diff --git a/packages/runtime-vapor/src/fragment.ts b/packages/runtime-vapor/src/fragment.ts
@@ -527,15 +527,6 @@ export class DynamicFragment extends VaporFragment {
   }
 }
 
-export let currentSlotEndAnchor: Node | null = null
-function setCurrentSlotEndAnchor(end: Node | null): Node | null {
-  try {
-    return currentSlotEndAnchor
-  } finally {
-    currentSlotEndAnchor = end
-  }
-}
-
 function isReusableDynamicFragmentAnchor(
   node: Comment,
   anchorLabel: string,
@@ -549,6 +540,15 @@ function isReusableDynamicFragmentAnchor(
   )
 }
 
+export let currentSlotEndAnchor: Node | null = null
+function setCurrentSlotEndAnchor(end: Node | null): Node | null {
+  try {
+    return currentSlotEndAnchor
+  } finally {
+    currentSlotEndAnchor = end
+  }
+}
+
 // Tracks slot fallback hydration that falls through an inner empty fragment,
 // e.g.
 // - `<slot><template v-if="false" /></slot>`
@@ -578,13 +578,15 @@ export class SlotFragment extends DynamicFragment {
   ): void {
     let prevEndAnchor: Node | null = null
     let pushedEndAnchor = false
+    let exitHydrationBoundary: (() => void) | undefined
     if (isHydrating) {
       locateHydrationNode()
       if (isComment(currentHydrationNode!, '[')) {
         const endAnchor = locateEndAnchor(currentHydrationNode)
         setCurrentHydrationNode(currentHydrationNode.nextSibling)
         prevEndAnchor = setCurrentSlotEndAnchor(endAnchor)
         pushedEndAnchor = true
+        exitHydrationBoundary = enterHydrationBoundary(endAnchor)
       }
     }
 
@@ -627,6 +629,7 @@ export class SlotFragment extends DynamicFragment {
       if (isHydrating && pushedEndAnchor) {
         setCurrentSlotEndAnchor(prevEndAnchor)
       }
+      exitHydrationBoundary && exitHydrationBoundary()
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -527,15 +527,6 @@ export class DynamicFragment extends VaporFragment {`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`
`530`		`-export let currentSlotEndAnchor: Node \| null = null`
`531`		`-function setCurrentSlotEndAnchor(end: Node \| null): Node \| null {`
`532`		`- try {`
`533`		`- return currentSlotEndAnchor`
`534`		`- } finally {`
`535`		`- currentSlotEndAnchor = end`
`536`		`- }`
`537`		`-}`
`538`		`-`
`539`	`530`	`function isReusableDynamicFragmentAnchor(`
`540`	`531`	`node: Comment,`
`541`	`532`	`anchorLabel: string,`
`@@ -549,6 +540,15 @@ function isReusableDynamicFragmentAnchor(`
`549`	`540`	`)`
`550`	`541`	`}`
`551`	`542`
	`543`	`+export let currentSlotEndAnchor: Node \| null = null`
	`544`	`+function setCurrentSlotEndAnchor(end: Node \| null): Node \| null {`
	`545`	`+ try {`
	`546`	`+ return currentSlotEndAnchor`
	`547`	`+ } finally {`
	`548`	`+ currentSlotEndAnchor = end`
	`549`	`+ }`
	`550`	`+}`
	`551`	`+`
`552`	`552`	`// Tracks slot fallback hydration that falls through an inner empty fragment,`
`553`	`553`	`// e.g.`
`554`	`554`	// - `<slot><template v-if="false" /></slot>`
`@@ -578,13 +578,15 @@ export class SlotFragment extends DynamicFragment {`
`578`	`578`	`): void {`
`579`	`579`	`let prevEndAnchor: Node \| null = null`
`580`	`580`	`let pushedEndAnchor = false`
	`581`	`+ let exitHydrationBoundary: (() => void) \| undefined`
`581`	`582`	`if (isHydrating) {`
`582`	`583`	`locateHydrationNode()`
`583`	`584`	`if (isComment(currentHydrationNode!, '[')) {`
`584`	`585`	`const endAnchor = locateEndAnchor(currentHydrationNode)`
`585`	`586`	`setCurrentHydrationNode(currentHydrationNode.nextSibling)`
`586`	`587`	`prevEndAnchor = setCurrentSlotEndAnchor(endAnchor)`
`587`	`588`	`pushedEndAnchor = true`
	`589`	`+ exitHydrationBoundary = enterHydrationBoundary(endAnchor)`
`588`	`590`	`}`
`589`	`591`	`}`
`590`	`592`
`@@ -627,6 +629,7 @@ export class SlotFragment extends DynamicFragment {`
`627`	`629`	`if (isHydrating && pushedEndAnchor) {`
`628`	`630`	`setCurrentSlotEndAnchor(prevEndAnchor)`
`629`	`631`	`}`
	`632`	`+ exitHydrationBoundary && exitHydrationBoundary()`
`630`	`633`	`}`
`631`	`634`	`}`
`632`	`635`	`}`