From 9dfe215eebb1152a57b61b87ceed97d9e991e1ee Mon Sep 17 00:00:00 2001
From: shiluo34 <chenchangyu@bilibili.com>
Date: Wed, 24 Aug 2022 16:26:34 +0800
Subject: [PATCH 1/3] + feat(types): add  type  in ReservedProps

---
 types/jsx.d.ts             | 3 ++-
 types/test/v3/tsx-test.tsx | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/jsx.d.ts b/types/jsx.d.ts
index 85c9c1df23d..4325c0dc14e 100644
--- a/types/jsx.d.ts
+++ b/types/jsx.d.ts
@@ -24,6 +24,7 @@
 //      Sebastian Silbermann <https://github.com/eps1lon>
 
 import * as CSS from 'csstype'
+import { Ref } from './v3-generated' 
 
 export interface CSSProperties
   extends CSS.Properties<string | number>,
@@ -1302,7 +1303,7 @@ type EventHandlers<E> = {
 
 type ReservedProps = {
   key?: string | number | symbol
-  ref?: VNodeData['ref']
+  ref?: VNodeData['ref'] | Ref
   /**
    * @deprecated Old named slot syntax has been deprecated, use the new syntax
    * instead: `<template v-slot:name>`
diff --git a/types/test/v3/tsx-test.tsx b/types/test/v3/tsx-test.tsx
index 16a767acc5a..be79cb122c9 100644
--- a/types/test/v3/tsx-test.tsx
+++ b/types/test/v3/tsx-test.tsx
@@ -1,4 +1,4 @@
-import { VNode, defineComponent } from '../../index'
+import { VNode, defineComponent, ref } from '../../index'
 import { expectType } from '../utils'
 
 expectType<VNode>(<div />)
@@ -22,6 +22,10 @@ expectError(<div foo="bar" />)
 expectType<JSX.Element>(<div key="foo" />)
 expectType<JSX.Element>(<div ref="bar" />)
 
+// allow Ref type type on arbitrary element
+const fooRef = ref<HTMLElement>()
+expectType<JSX.Element>(<div ref={fooRef} />)
+
 expectType<JSX.Element>(
   <input
     onInput={e => {

From ba0b00add685f64fa1097212ef1beb630b671c84 Mon Sep 17 00:00:00 2001
From: shiluo34 <chenchangyu@bilibili.com>
Date: Thu, 29 Sep 2022 17:04:01 +0800
Subject: [PATCH 2/3] + update: fix funciton refs type error in tsx

---
 types/jsx.d.ts             |  2 +-
 types/test/v3/tsx-test.tsx |  1 +
 types/vnode.d.ts           | 12 +++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/types/jsx.d.ts b/types/jsx.d.ts
index 4325c0dc14e..0adef99898d 100644
--- a/types/jsx.d.ts
+++ b/types/jsx.d.ts
@@ -1303,7 +1303,7 @@ type EventHandlers<E> = {
 
 type ReservedProps = {
   key?: string | number | symbol
-  ref?: VNodeData['ref'] | Ref
+  ref?: VNodeData['ref']
   /**
    * @deprecated Old named slot syntax has been deprecated, use the new syntax
    * instead: `<template v-slot:name>`
diff --git a/types/test/v3/tsx-test.tsx b/types/test/v3/tsx-test.tsx
index be79cb122c9..286c16997a0 100644
--- a/types/test/v3/tsx-test.tsx
+++ b/types/test/v3/tsx-test.tsx
@@ -25,6 +25,7 @@ expectType<JSX.Element>(<div ref="bar" />)
 // allow Ref type type on arbitrary element
 const fooRef = ref<HTMLElement>()
 expectType<JSX.Element>(<div ref={fooRef} />)
+expectType<JSX.Element>(<div ref={(el) => {fooRef.value = el as HTMLElement}} />)
 
 expectType<JSX.Element>(
   <input
diff --git a/types/vnode.d.ts b/types/vnode.d.ts
index 7a543f0a39b..29bdb398c1c 100644
--- a/types/vnode.d.ts
+++ b/types/vnode.d.ts
@@ -1,5 +1,7 @@
 import { Vue } from './vue'
 import { DirectiveFunction, DirectiveOptions } from './options'
+import { Ref } from './v3-generated'
+import { ComponentPublicInstance } from './v3-component-public-instance'
 
 /**
  * For extending allowed non-declared props on components in TSX
@@ -65,11 +67,19 @@ export interface VNodeComponentOptions {
   tag?: string
 }
 
+export type VNodeRef =
+  | string
+  | Ref
+  | ((
+      ref: Element | ComponentPublicInstance | null,
+      refs: Record<string, any>
+    ) => void)
+
 export interface VNodeData {
   key?: string | number
   slot?: string
   scopedSlots?: { [key: string]: ScopedSlot | undefined }
-  ref?: string
+  ref?: VNodeRef
   refInFor?: boolean
   tag?: string
   staticClass?: string

From 790a97e27891f73e49879b95b28fc2072f00264e Mon Sep 17 00:00:00 2001
From: shiluo34 <chenchangyu@bilibili.com>
Date: Thu, 29 Sep 2022 17:20:33 +0800
Subject: [PATCH 3/3] + update: remove unused quote

---
 types/jsx.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/jsx.d.ts b/types/jsx.d.ts
index 0adef99898d..85c9c1df23d 100644
--- a/types/jsx.d.ts
+++ b/types/jsx.d.ts
@@ -24,7 +24,6 @@
 //      Sebastian Silbermann <https://github.com/eps1lon>
 
 import * as CSS from 'csstype'
-import { Ref } from './v3-generated' 
 
 export interface CSSProperties
   extends CSS.Properties<string | number>,