fix: ensure template ref cleanup passes null and deletes WeakMap entry

Author: edison1105

packages/runtime-vapor/__tests__/dom/templateRef.spec.ts

@@ -182,7 +182,7 @@ describe('api: template ref', () => {
     expect(fn.mock.calls[0][0]).toBe(host.children[0])
     toggle.value = false
     await nextTick()
-    expect(fn.mock.calls[1][0]).toBe(undefined)
+    expect(fn.mock.calls[1][0]).toBe(null)
   })
 
   test('useTemplateRef mount', () => {

packages/runtime-vapor/src/apiTemplateRef.ts

@@ -25,19 +25,6 @@ import {
 } from '@vue/shared'
 import { DynamicFragment, isFragment } from './fragment'
 
-// track cleanup functions to prevent duplicate onScopeDispose registrations
-const refCleanups = new WeakMap<RefEl, { fn: () => void }>()
-
-// ensure only register onScopeDispose once per element
-function ensureCleanup(el: RefEl): { fn: () => void } {
-  let cleanupRef = refCleanups.get(el)
-  if (!cleanupRef) {
-    refCleanups.set(el, (cleanupRef = { fn: NOOP }))
-    onScopeDispose(() => cleanupRef!.fn())
-  }
-  return cleanupRef
-}
-
 export type NodeRef =
   | string
   | Ref
@@ -52,6 +39,20 @@ export type setRefFn = (
   refKey?: string,
 ) => NodeRef | undefined
 
+const refCleanups = new WeakMap<RefEl, { fn: () => void }>()
+
+function ensureCleanup(el: RefEl): { fn: () => void } {
+  let cleanupRef = refCleanups.get(el)
+  if (!cleanupRef) {
+    refCleanups.set(el, (cleanupRef = { fn: NOOP }))
+    onScopeDispose(() => {
+      cleanupRef!.fn()
+      refCleanups.delete(el)
+    })
+  }
+  return cleanupRef
+}
+
 export function createTemplateRefSetter(): setRefFn {
   const instance = currentInstance as VaporComponentInstance
   return (...args) => setRef(instance, ...args)
@@ -108,15 +109,15 @@ export function setRef(
   }
 
   if (isFunction(ref)) {
-    const invokeRefSetter = (value?: Element | Record<string, any>) => {
+    const invokeRefSetter = (value?: Element | Record<string, any> | null) => {
       callWithErrorHandling(ref, currentInstance, ErrorCodes.FUNCTION_REF, [
         value,
         refs,
       ])
     }
 
     invokeRefSetter(refValue)
-    ensureCleanup(el).fn = () => invokeRefSetter()
+    ensureCleanup(el).fn = () => invokeRefSetter(null)
   } else {
     const _isString = isString(ref)
     const _isRef = isRef(ref)