@@ -37,36 +37,31 @@ const FormRenderer = ({
3737 const registeredFields = useRef ( { } ) ;
3838 const focusDecorator = useRef ( createFocusDecorator ( ) ) ;
3939 const validatorMapperMerged = useMemo ( ( ) => {
40- return { ...defaultValidatorMapper , ...validatorMapper }
40+ return { ...defaultValidatorMapper , ...validatorMapper } ;
4141 } , [ 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 ] ) ;
5044
5145 const handleSubmitCallback = useCallback (
5246 ( values , formApi , ...args ) => {
5347 return ! isFunc ( onSubmit ) ? undefined : onSubmit ( values , { ...formApi , fileInputs } , ...args ) ;
54- } ,
48+ } ,
5549 [ onSubmit , fileInputs ]
5650 ) ;
5751
5852 const handleCancelCallback = useCallback (
5953 ( getState ) => {
6054 return ( ...args ) => onCancel ( getState ( ) . values , ...args ) ;
61- } ,
55+ } ,
6256 [ onCancel ]
6357 ) ;
6458
6559 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+ } ,
7065 [ onReset ]
7166 ) ;
7267
@@ -75,7 +70,7 @@ const FormRenderer = ({
7570 // eslint-disable-next-line no-console
7671 console . error ( ...args ) ;
7772 return ! isFunc ( onError ) ? void 0 : onError ( ...args ) ;
78- } ,
73+ } ,
7974 [ onError ]
8075 ) ;
8176
@@ -88,36 +83,28 @@ const FormRenderer = ({
8883 } , [ ] ) ;
8984
9085 const setRegisteredFields = useCallback ( ( fn ) => {
91- return registeredFields . current = fn ( { ...registeredFields . current } ) ;
86+ return ( registeredFields . current = fn ( { ...registeredFields . current } ) ) ;
9287 } , [ ] ) ;
9388
9489 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 } ) ) ;
9891 } , [ ] ) ;
9992
10093 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 ) ) ;
10495 } , [ ] ) ;
10596
10697 const internalGetRegisteredFields = useCallback ( ( ) => {
10798 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 ) , [ ] ) ;
112100 } , [ ] ) ;
113101
114102 try {
115103 const validatorTypes = Object . keys ( validatorMapperMerged ) ;
116104 const actionTypes = actionMapper ? Object . keys ( actionMapper ) : [ ] ;
117105
118106 defaultSchemaValidator ( schema , componentMapper , validatorTypes , actionTypes , schemaValidatorMapper ) ;
119- }
120- catch ( error ) {
107+ } catch ( error ) {
121108 handleErrorCallback ( 'schema-error' , error ) ;
122109 return < SchemaErrorComponent name = { error . name } message = { error . message } /> ;
123110 }
@@ -160,11 +147,9 @@ const FormRenderer = ({
160147 } ,
161148 } }
162149 >
163-
164150 { FormTemplate && < FormTemplate formFields = { formFields } schema = { schema } { ...FormTemplateProps } /> }
165151
166152 { isFunc ( children ) ? children ( { formFields, schema } ) : children }
167-
168153 </ RendererContext . Provider >
169154 ) }
170155 { ...props }
0 commit comments