Skip to content
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.

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

refactor: use react hook form for base item form #1529

Merged
merged 1 commit into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions src/components/item/edit/EditModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,7 @@ const EditModal = ({ item, onClose, open }: Props): JSX.Element => {
case ItemType.ETHERPAD:
case ItemType.H5P:
default:
return (
<BaseItemForm
updatedProperties={updatedItem}
setChanges={setChanges}
item={item}
/>
);
return <BaseItemForm setChanges={setChanges} item={item} />;
}
};

Expand Down
75 changes: 57 additions & 18 deletions src/components/item/form/BaseItemForm.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,69 @@
import { useEffect } from 'react';
import { useForm } from 'react-hook-form';

import { Box } from '@mui/material';

import { DescriptionPlacementType, DiscriminatedItem } from '@graasp/sdk';

import { FOLDER_FORM_DESCRIPTION_ID } from '../../../config/selectors';
import type { EditModalContentPropType } from '../edit/EditModal';
import DescriptionForm from './DescriptionForm';
import NameForm from './NameForm';

type Inputs = {
name: string;
description: string;
descriptionPlacement: DescriptionPlacementType;
};

const BaseItemForm = ({
item,
updatedProperties,
setChanges,
}: EditModalContentPropType): JSX.Element => (
<Box overflow="auto">
<NameForm
setChanges={setChanges}
name={updatedProperties?.name ?? item?.name}
required
/>

<Box sx={{ mt: 2 }}>
<DescriptionForm
id={FOLDER_FORM_DESCRIPTION_ID}
description={updatedProperties?.description ?? item?.description ?? ''}
setChanges={setChanges}
/>
}: {
item?: DiscriminatedItem;
setChanges: (payload: Partial<DiscriminatedItem>) => void;
}): JSX.Element => {
const { register, watch, setValue } = useForm<Inputs>();

const name = watch('name');
const descriptionPlacement = watch('descriptionPlacement');
const description = watch('description');

// synchronize upper state after async local state change
useEffect(() => {
setChanges({
name,
description,
settings: { descriptionPlacement },
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [description, descriptionPlacement, name]);

return (
<Box overflow="auto">
<NameForm nameForm={register('name', { value: item?.name })} required />

<Box sx={{ mt: 2 }}>
<DescriptionForm
id={FOLDER_FORM_DESCRIPTION_ID}
description={description ?? item?.description}
descriptionPlacement={
descriptionPlacement ?? item?.settings?.descriptionPlacement
}
setChanges={(v) => {
if (v.description) {
setValue('description', v.description);
}
if (v.settings?.descriptionPlacement) {
setValue(
'descriptionPlacement',
v.settings?.descriptionPlacement,
);
}
}}
/>
</Box>
</Box>
</Box>
);
);
};

export default BaseItemForm;
4 changes: 3 additions & 1 deletion src/components/item/form/FolderForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ const FolderForm = ({
}
}}
showPlacement={false}
descriptionPlacement={item?.settings?.descriptionPlacement}
descriptionPlacement={
descriptionPlacement ?? item?.settings?.descriptionPlacement
}
/>
</Stack>
);
Expand Down