🔥 remove Ref type

SnowingFox · SnowingFox · commit 42d2be83e19b · 2022-10-18T21:06:11.000+08:00
diff --git a/packages/core/src/logic/creatFormControl.ts b/packages/core/src/logic/creatFormControl.ts
@@ -1,4 +1,3 @@
-import type { Ref } from 'vue'
 import { nextTick, reactive, ref, unref } from 'vue'
 import type { Field, FieldElement, FieldValues, Fields } from '../types/filed'
 import type {
@@ -109,7 +108,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>
   }
 
   const _getFieldDom = (name: FieldsKey) => {
-    return _getFieldProp(name, 'el') as Ref<FieldElement> | undefined
+    return _getFieldProp(name, 'el') as FieldElement | undefined
   }
 
   const _getDirtyFields = () => {
@@ -305,7 +304,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>
     _setFormStateError(fieldName, error)
 
     if (config.shouldFocusError) {
-      handleValidateError(error, true, _getFieldDom(fieldName)?.value)
+      handleValidateError(error, true, _getFieldDom(fieldName))
     }
   }
 
@@ -345,7 +344,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>
   }
 
   const setFocus: UseFormSetFocus<TFieldValues> = name => nextTick(() => {
-    const el = unref(_getFieldDom(name))
+    const el = _getFieldDom(name)
 
     if (el) {
       el.focus()
@@ -403,7 +402,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>
     }
 
     function addEventListenerToElement() {
-      if (!isFieldElement(field.el.value)) {
+      if (!isFieldElement(field.el)) {
         if (_fields[fieldName].isUnregistered) {
           return
         }
@@ -431,8 +430,8 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>
     }
 
     return {
-      value: field.inputValue.value,
       ref: field.el,
+      value: field.inputValue.value,
       onInput: async (e: InputEvent) => {
         if (_fields[fieldName].isUnregistered) {
           return
diff --git a/packages/core/src/types/filed.ts b/packages/core/src/types/filed.ts
@@ -8,7 +8,7 @@ export type FieldElement = HTMLInputElement| HTMLSelectElement | HTMLTextAreaEle
 
 export interface Field {
   inputValue: Ref
-  el: Ref<FieldElement>
+  el: FieldElement
   rule: RegisterOptions
   isDirty: boolean
   isUnregistered: boolean

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import type { Ref } from 'vue'`
`2`	`1`	`import { nextTick, reactive, ref, unref } from 'vue'`
`3`	`2`	`import type { Field, FieldElement, FieldValues, Fields } from '../types/filed'`
`4`	`3`	`import type {`
`@@ -109,7 +108,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`const _getFieldDom = (name: FieldsKey) => {`
`112`		`- return _getFieldProp(name, 'el') as Ref<FieldElement> \| undefined`
	`111`	`+ return _getFieldProp(name, 'el') as FieldElement \| undefined`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`const _getDirtyFields = () => {`
`@@ -305,7 +304,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>`
`305`	`304`	`_setFormStateError(fieldName, error)`
`306`	`305`
`307`	`306`	`if (config.shouldFocusError) {`
`308`		`- handleValidateError(error, true, _getFieldDom(fieldName)?.value)`
	`307`	`+ handleValidateError(error, true, _getFieldDom(fieldName))`
`309`	`308`	`}`
`310`	`309`	`}`
`311`	`310`
`@@ -345,7 +344,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>`
`345`	`344`	`}`
`346`	`345`
`347`	`346`	`const setFocus: UseFormSetFocus<TFieldValues> = name => nextTick(() => {`
`348`		`- const el = unref(_getFieldDom(name))`
	`347`	`+ const el = _getFieldDom(name)`
`349`	`348`
`350`	`349`	`if (el) {`
`351`	`350`	`el.focus()`
`@@ -403,7 +402,7 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>`
`403`	`402`	`}`
`404`	`403`
`405`	`404`	`function addEventListenerToElement() {`
`406`		`- if (!isFieldElement(field.el.value)) {`
	`405`	`+ if (!isFieldElement(field.el)) {`
`407`	`406`	`if (_fields[fieldName].isUnregistered) {`
`408`	`407`	`return`
`409`	`408`	`}`
`@@ -431,8 +430,8 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>`
`431`	`430`	`}`
`432`	`431`
`433`	`432`	`return {`
`434`		`- value: field.inputValue.value,`
`435`	`433`	`ref: field.el,`
	`434`	`+ value: field.inputValue.value,`
`436`	`435`	`onInput: async (e: InputEvent) => {`
`437`	`436`	`if (_fields[fieldName].isUnregistered) {`
`438`	`437`	`return`