Vue/vue
1
0
Fork 0
mirror of https://github.com/vuejs/vue.git synced 2024-11-21 20:28:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(template-ref): preserve ref removal behavior in non-composition-api usage

Browse Source 
close #12554
This commit is contained in:
Evan You 2022-06-20 12:42:32 +08:00
parent 0fabda7a3b
commit 2533a360a8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/vdom/modules/template-ref.ts
View File

@ -33,6 +33,7 @@ export function registerRef(vnode: VNodeWithData, isRemoval?: boolean) {
const vm = vnode.context
const refValue = vnode.componentInstance || vnode.elm
const value = isRemoval ? null : refValue
const $refsValue = isRemoval ? undefined : refValue
if (isFunction(ref)) {
invokeWithErrorHandling(ref, vm, [value], vm, `template ref function`)
@ -67,14 +68,14 @@ export function registerRef(vnode: VNodeWithData, isRemoval?: boolean) {
if (isRemoval && refs[ref] !== refValue) {
return
}
refs[ref] = value
refs[ref] = $refsValue
setSetupRef(vm, ref, value)
} else if (_isRef) {
if (isRemoval && ref.value !== refValue) {
return
}
ref.value = value
if (setupRefKey) refs[setupRefKey] = value
if (setupRefKey) refs[setupRefKey] = $refsValue
} else if (__DEV__) {
warn(`Invalid template ref type: ${typeof ref}`)
}

4
test/unit/features/template-ref.spec.ts
View File

@ -58,7 +58,7 @@ describe('ref', () => {
expect(vm.$refs.foo).toBe(vm.$el)
vm.value = 'bar'
waitForUpdate(() => {
expect(vm.$refs.foo).toBe(null)
expect(vm.$refs.foo).toBe(undefined)
expect(vm.$refs.bar).toBe(vm.$el)
}).then(done)
})
@ -101,7 +101,7 @@ describe('ref', () => {
vm.test = ''
})
.then(() => {
expect(vm.$refs.test).toBe(null)
expect(vm.$refs.test).toBe(undefined)
})
.then(done)
})