root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge 74ba484173 into bb4ae25793

This commit is contained in:
zhiyuanzmj 2025-06-26 16:10:58 +08:00 committed by GitHub
parent bb4ae25793 74ba484173
commit a1b9357862
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/runtime-vapor/src/dom/hydration.ts
View File

@ -2,7 +2,6 @@ import { warn } from '@vue/runtime-dom'
import { import {
insertionAnchor, insertionAnchor,
insertionParent, insertionParent,
resetInsertionState,
setInsertionState, setInsertionState,
} from '../insertionState' } from '../insertionState'
import { child, next } from './node' import { child, next } from './node'
@ -27,7 +26,7 @@ export function withHydration(container: ParentNode, fn: () => void): void {
isHydrating = true isHydrating = true
setInsertionState(container, 0) setInsertionState(container, 0)
const res = fn() const res = fn()
resetInsertionState() setInsertionState()
currentHydrationNode = null currentHydrationNode = null
isHydrating = false isHydrating = false
return res return res
@ -124,6 +123,6 @@ function locateHydrationNodeImpl() {
warn('Hydration mismatch in ', insertionParent) warn('Hydration mismatch in ', insertionParent)
} }
resetInsertionState() setInsertionState()
currentHydrationNode = node currentHydrationNode = node
} }

14
packages/runtime-vapor/src/insertionState.ts
View File

@ -5,12 +5,16 @@ export let insertionAnchor: Node | 0 | undefined
* This function is called before a block type that requires insertion * This function is called before a block type that requires insertion
* (component, slot outlet, if, for) is created. The state is used for actual * (component, slot outlet, if, for) is created. The state is used for actual
* insertion on client-side render, and used for node adoption during hydration. * insertion on client-side render, and used for node adoption during hydration.
*
* @returns A function that restores the previous insertion state when called.
*/ */
export function setInsertionState(parent: ParentNode, anchor?: Node | 0): void { export function setInsertionState(parent?: ParentNode, anchor?: Node | 0) {
const prevParent = insertionParent
const prevAnchor = insertionAnchor
insertionParent = parent insertionParent = parent
insertionAnchor = anchor insertionAnchor = anchor
} return (): void => {
insertionParent = prevParent
export function resetInsertionState(): void { insertionAnchor = prevAnchor
insertionParent = insertionAnchor = undefined }
} }