Skip to content

feat/wrap form with FormProvider #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rvieceli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat/wrap form with FormProvider #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions packages/chakra-admin/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ export default {
typescript({
useTsconfigDeclarationDir: true,
transformers: [
service => ({
before: [ keysTransformer(service.getProgram()) ],
after: []
})
]
(service) => ({
before: [keysTransformer(service.getProgram())],
after: [],
}),
],
}),
yalcPublish()
yalcPublish(),
],
external: ['react-hook-form'],
}
78 changes: 40 additions & 38 deletions packages/chakra-admin/src/components/forms/BaseForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback } from 'react'
import { chakra, ChakraProps, Box } from '@chakra-ui/react'
import { useForm } from 'react-hook-form'
import { FormProvider, useForm } from 'react-hook-form'
import { deepMap } from '../../core/details/deep-map'
import { UseCreateResult } from '../../core/details/useCreate'
import { UseEditResult } from '../../core/details/useEdit'
Expand Down Expand Up @@ -56,9 +56,10 @@ export const BaseForm: FC<BaseFormProps> = ({
)

return (
<chakra.form onSubmit={handleSubmit(onSubmit)}>
<chakra.div mb={renderingInModal ? '76px' : 0}>
{/* {deepMap(children, (child: any, index) => {
<FormProvider {...methods}>
<chakra.form onSubmit={handleSubmit(onSubmit)}>
<chakra.div mb={renderingInModal ? '76px' : 0}>
{/* {deepMap(children, (child: any, index) => {
const isLayout =
child?.type?.displayName &&
Object.keys(CALayoutComponents).includes(child?.type?.displayName)
Expand Down Expand Up @@ -111,41 +112,42 @@ export const BaseForm: FC<BaseFormProps> = ({
// : child
}
})} */}
<TreeRenderer
children={children}
propsOverride={{
...filterChakraProps(rest),
setValue: methods.setValue,
register: methods.register,
unregister: methods.unregister,
control: methods.control,
resource,
}}
/>
</chakra.div>

<Box
zIndex="1"
position={renderingInModal ? 'fixed' : 'relative'}
bottom="0px"
w="100%"
right="0px"
boxShadow={renderingInModal ? 'main' : 'none'}
bg={renderingInModal ? 'white' : 'transparent'}
p={renderingInModal ? 4 : 0}
>
<chakra.div display="flex" justifyContent="end" marginBottom={renderingInModal ? 0 : 5}>
<CancelButton />
<SubmitButton
disabled={mutationResult?.loading}
isLoading={mutationResult?.loading}
type="submit"
bg="gray.700"
_hover={{ bg: 'gray.500' }}
ml={5}
<TreeRenderer
children={children}
propsOverride={{
...filterChakraProps(rest),
setValue: methods.setValue,
register: methods.register,
unregister: methods.unregister,
control: methods.control,
resource,
}}
/>
</chakra.div>
</Box>
</chakra.form>

<Box
zIndex="1"
position={renderingInModal ? 'fixed' : 'relative'}
bottom="0px"
w="100%"
right="0px"
boxShadow={renderingInModal ? 'main' : 'none'}
bg={renderingInModal ? 'white' : 'transparent'}
p={renderingInModal ? 4 : 0}
>
<chakra.div display="flex" justifyContent="end" marginBottom={renderingInModal ? 0 : 5}>
<CancelButton />
<SubmitButton
disabled={mutationResult?.loading}
isLoading={mutationResult?.loading}
type="submit"
bg="gray.700"
_hover={{ bg: 'gray.500' }}
ml={5}
/>
</chakra.div>
</Box>
</chakra.form>
</FormProvider>
)
}