@@ -402,29 +402,27 @@ export function creatFormControl<TFieldValues extends FieldValues = FieldValues>
402402}
403403
404404function addEventListenerToElement ( ) {
405- if ( ! isFieldElement ( field . el ) ) {
406- if ( _fields [ fieldName ] . isUnregistered ) {
407- return
408- }
409- const el = getFormEl ( field . el )
410- _setFields ( fieldName , { ..._fields [ fieldName ] , el} )
405+ if ( isFieldElement ( field . el ) || _fields [ fieldName ] . isUnregistered ) {
406+ return
407+ }
408+ const el = getFormEl ( field . el )
409+ _setFields ( fieldName , { ..._fields [ fieldName ] , el} )
411410
412- if ( isRadioOrCheckboxInput ( el ) ) {
413- set ( _defaultValues , fieldName as string , ! ! defaultVal )
414- }
415- set ( _defaultValues , fieldName as string , defaultVal )
411+ if ( isRadioOrCheckboxInput ( el ) ) {
412+ set ( _defaultValues , fieldName as string , ! ! defaultVal )
413+ }
414+ set ( _defaultValues , fieldName as string , defaultVal )
416415
417- // bind validate mode
418- if ( isFieldElement ( el ) ) {
419- if ( validationModeBeforeSubmit . isOnBlur ) {
420- el . addEventListener ( 'blur' , async ( ) => {
421- await _onChange ( fieldName )
422- } )
423- } else if ( validationModeBeforeSubmit . isOnTouch ) {
424- el . addEventListener ( 'click' , async ( ) => {
425- await _onChange ( fieldName )
426- } )
427- }
416+ // bind validate mode
417+ if ( isFieldElement ( el ) ) {
418+ if ( validationModeBeforeSubmit . isOnBlur ) {
419+ el . addEventListener ( 'blur' , async ( ) => {
420+ await _onChange ( fieldName )
421+ } )
422+ } else if ( validationModeBeforeSubmit . isOnTouch ) {
423+ el . addEventListener ( 'click' , async ( ) => {
424+ await _onChange ( fieldName )
425+ } )
428426}
429427}
430428}