@@ -136,9 +136,9 @@ const withFormExtended = (config?:FormConfig) => <T extends Constructor<Connecta
136136 }
137137
138138 // Set touched and handleValidate if needed
139- setTouched = ( name : string ) : void => {
139+ setTouched = ( name : string , validate = false ) : void => {
140140 this . _touched = set ( this . _touched , name , true )
141- if ( this . _validateOnBlur ) {
141+ if ( validate ) {
142142 this . handleValidate ( )
143143 }
144144 }
@@ -147,15 +147,15 @@ const withFormExtended = (config?:FormConfig) => <T extends Constructor<Connecta
147147 handleBlur = ( event : Event | CustomEvent ) : void => {
148148 const eventTarget = getEventTarget ( event )
149149 if ( eventTarget ) {
150- this . setTouched ( eventTarget . name || eventTarget . id ) ;
150+ this . setTouched ( eventTarget . name || eventTarget . id , this . _validateOnBlur ) ;
151151 }
152152 }
153153
154154 // Set the value for the given name.
155155 // Triggers optional validation when validate is true.
156156 setValue = ( name : string , value :InputValue , validate = false ) : void => {
157157 this . _values = set ( cloneDeep ( this . values ) , name , value )
158- if ( validate && this . _validateOnChange ) {
158+ if ( validate ) {
159159 this . handleValidate ( )
160160 }
161161 }
@@ -165,7 +165,7 @@ const withFormExtended = (config?:FormConfig) => <T extends Constructor<Connecta
165165 const eventTarget = getEventTarget ( event )
166166 if ( eventTarget ) {
167167 const value = getValueFromEventTarget ( eventTarget )
168- this . setValue ( eventTarget . name || eventTarget . id , value , true )
168+ this . setValue ( eventTarget . name || eventTarget . id , value , this . _validateOnChange )
169169 }
170170 }
171171
0 commit comments