@@ -37,36 +37,31 @@ const FormRenderer = ({
37
37
const registeredFields = useRef ( { } ) ;
38
38
const focusDecorator = useRef ( createFocusDecorator ( ) ) ;
39
39
const validatorMapperMerged = useMemo ( ( ) => {
40
- return { ...defaultValidatorMapper , ...validatorMapper }
40
+ return { ...defaultValidatorMapper , ...validatorMapper } ;
41
41
} , [ validatorMapper ] ) ;
42
- const mutatorsMerged = useMemo (
43
- ( ) => ( { ...arrayMutators , ...mutators } ) ,
44
- [ mutators ]
45
- ) ;
46
- const decoratorsMerged = useMemo (
47
- ( ) => ( [ focusDecorator . current , ...( Array . isArray ( decorators ) ? decorators : [ ] ) ] ) ,
48
- [ decorators ]
49
- ) ;
42
+ const mutatorsMerged = useMemo ( ( ) => ( { ...arrayMutators , ...mutators } ) , [ mutators ] ) ;
43
+ const decoratorsMerged = useMemo ( ( ) => [ focusDecorator . current , ...( Array . isArray ( decorators ) ? decorators : [ ] ) ] , [ decorators ] ) ;
50
44
51
45
const handleSubmitCallback = useCallback (
52
46
( values , formApi , ...args ) => {
53
47
return ! isFunc ( onSubmit ) ? undefined : onSubmit ( values , { ...formApi , fileInputs } , ...args ) ;
54
- } ,
48
+ } ,
55
49
[ onSubmit , fileInputs ]
56
50
) ;
57
51
58
52
const handleCancelCallback = useCallback (
59
53
( getState ) => {
60
54
return ( ...args ) => onCancel ( getState ( ) . values , ...args ) ;
61
- } ,
55
+ } ,
62
56
[ onCancel ]
63
57
) ;
64
58
65
59
const handleResetCallback = useCallback (
66
- ( reset ) => ( ...args ) => {
67
- reset ( ) ;
68
- return ! isFunc ( onReset ) ? void 0 : onReset ( ...args ) ;
69
- } ,
60
+ ( reset ) =>
61
+ ( ...args ) => {
62
+ reset ( ) ;
63
+ return ! isFunc ( onReset ) ? void 0 : onReset ( ...args ) ;
64
+ } ,
70
65
[ onReset ]
71
66
) ;
72
67
@@ -75,7 +70,7 @@ const FormRenderer = ({
75
70
// eslint-disable-next-line no-console
76
71
console . error ( ...args ) ;
77
72
return ! isFunc ( onError ) ? void 0 : onError ( ...args ) ;
78
- } ,
73
+ } ,
79
74
[ onError ]
80
75
) ;
81
76
@@ -88,36 +83,28 @@ const FormRenderer = ({
88
83
} , [ ] ) ;
89
84
90
85
const setRegisteredFields = useCallback ( ( fn ) => {
91
- return registeredFields . current = fn ( { ...registeredFields . current } ) ;
86
+ return ( registeredFields . current = fn ( { ...registeredFields . current } ) ) ;
92
87
} , [ ] ) ;
93
88
94
89
const internalRegisterField = useCallback ( ( name ) => {
95
- setRegisteredFields ( ( prev ) => (
96
- prev [ name ] ? { ...prev , [ name ] : prev [ name ] + 1 } : { ...prev , [ name ] : 1 } )
97
- ) ;
90
+ setRegisteredFields ( ( prev ) => ( prev [ name ] ? { ...prev , [ name ] : prev [ name ] + 1 } : { ...prev , [ name ] : 1 } ) ) ;
98
91
} , [ ] ) ;
99
92
100
93
const internalUnRegisterField = useCallback ( ( name ) => {
101
- setRegisteredFields ( ( { [ name ] : currentField , ...prev } ) => (
102
- currentField && currentField > 1 ? { [ name ] : currentField - 1 , ...prev } : prev
103
- ) ) ;
94
+ setRegisteredFields ( ( { [ name ] : currentField , ...prev } ) => ( currentField && currentField > 1 ? { [ name ] : currentField - 1 , ...prev } : prev ) ) ;
104
95
} , [ ] ) ;
105
96
106
97
const internalGetRegisteredFields = useCallback ( ( ) => {
107
98
const fields = registeredFields . current ;
108
- return Object . entries ( fields ) . reduce (
109
- ( acc , [ name , value ] ) => value > 0 ? [ ...acc , name ] : acc ,
110
- [ ]
111
- ) ;
99
+ return Object . entries ( fields ) . reduce ( ( acc , [ name , value ] ) => ( value > 0 ? [ ...acc , name ] : acc ) , [ ] ) ;
112
100
} , [ ] ) ;
113
101
114
102
try {
115
103
const validatorTypes = Object . keys ( validatorMapperMerged ) ;
116
104
const actionTypes = actionMapper ? Object . keys ( actionMapper ) : [ ] ;
117
105
118
106
defaultSchemaValidator ( schema , componentMapper , validatorTypes , actionTypes , schemaValidatorMapper ) ;
119
- }
120
- catch ( error ) {
107
+ } catch ( error ) {
121
108
handleErrorCallback ( 'schema-error' , error ) ;
122
109
return < SchemaErrorComponent name = { error . name } message = { error . message } /> ;
123
110
}
@@ -160,11 +147,9 @@ const FormRenderer = ({
160
147
} ,
161
148
} }
162
149
>
163
-
164
150
{ FormTemplate && < FormTemplate formFields = { formFields } schema = { schema } { ...FormTemplateProps } /> }
165
151
166
152
{ isFunc ( children ) ? children ( { formFields, schema } ) : children }
167
-
168
153
</ RendererContext . Provider >
169
154
) }
170
155
{ ...props }
0 commit comments