@@ -32,47 +32,38 @@ export default function useFieldState({
32
32
}
33
33
} , [ ] ) ;
34
34
35
- const validateField = useCallback (
36
- ( valueToValidate = value ) => {
35
+ const validateField = useCallback ( ( valueToValidate = value ) => {
36
+ const [ _isValid , _failingValidatorIndex ] = Presenter . validate ( valueToValidate , validate ) ;
37
37
38
- const [ _isValid , _failingValidatorIndex ] = Presenter . validate ( valueToValidate , validate ) ;
38
+ setIsValid ( _isValid ) ;
39
+ setFailingValidatorIndex ( _failingValidatorIndex ) ;
40
+ } ,
41
+ [ value , validate ] ) ;
39
42
40
- setIsValid ( _isValid ) ;
41
- setFailingValidatorIndex ( _failingValidatorIndex ) ;
42
- } ,
43
- [ value , validate ]
44
- ) ;
43
+ const onFocus = useCallback ( ( ... args : any ) => {
44
+ setIsFocused ( true ) ;
45
+ _ . invoke ( props , 'onFocus' , ... args ) ;
46
+ } ,
47
+ [ props . onFocus ] ) ;
45
48
46
- const onFocus = useCallback (
47
- ( ...args : any ) => {
48
- setIsFocused ( true ) ;
49
- _ . invoke ( props , 'onFocus' , ...args ) ;
50
- } ,
51
- [ props . onFocus ]
52
- ) ;
53
-
54
- const onBlur = useCallback (
55
- ( ...args : any ) => {
56
- setIsFocused ( false ) ;
57
- _ . invoke ( props , 'onBlur' , ...args ) ;
58
- if ( validateOnBlur ) {
59
- validateField ( ) ;
60
- }
61
- } ,
62
- [ props . onBlur , validateOnBlur , validateField ]
63
- ) ;
49
+ const onBlur = useCallback ( ( ...args : any ) => {
50
+ setIsFocused ( false ) ;
51
+ _ . invoke ( props , 'onBlur' , ...args ) ;
52
+ if ( validateOnBlur ) {
53
+ validateField ( ) ;
54
+ }
55
+ } ,
56
+ [ props . onBlur , validateOnBlur , validateField ] ) ;
64
57
65
- const onChangeText = useCallback (
66
- ( text ) => {
67
- setValue ( text ) ;
68
- _ . invoke ( props , 'onChangeText' , text ) ;
58
+ const onChangeText = useCallback ( text => {
59
+ setValue ( text ) ;
60
+ _ . invoke ( props , 'onChangeText' , text ) ;
69
61
70
- if ( validateOnChange ) {
71
- validateField ( text ) ;
72
- }
73
- } ,
74
- [ props . onChangeText , validateOnChange , validateField ]
75
- ) ;
62
+ if ( validateOnChange ) {
63
+ validateField ( text ) ;
64
+ }
65
+ } ,
66
+ [ props . onChangeText , validateOnChange , validateField ] ) ;
76
67
77
68
const fieldState = useMemo ( ( ) => {
78
69
return { value, hasValue : ! _ . isEmpty ( value ) , isValid, isFocused, failingValidatorIndex} ;
0 commit comments