Skip to content

YH-1926: refactor TopicForm component with FormField #1293

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

Merged
PerelomaDenis merged 3 commits into from
Jun 29, 2026
Merged

YH-1926: refactor TopicForm component with FormField #1293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a4043b
YH-1926: refactor TopicForm component with FormField
AdamTsurov Jun 15, 2026
1ea2612
Merge branch 'develop' into feature/YH-1926
AdamTsurov Jun 18, 2026
fe1f6f9
Merge branch 'develop' into feature/YH-1926
PerelomaDenis Jun 29, 2026
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
20 changes: 8 additions & 12 deletions src/entities/topic/ui/TopicForm/TopicForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ export const TopicForm = ({ isEdit }: TopicFormProps) => {
{isEdit ? t(Topics.EDIT_PAGE_TITLE) : t(Topics.CREATE_PAGE_TITLE)}
</Text>
<Flex direction="column" gap="60">
<Flex gap="120" className={styles['skill-input']}>
<Flex className={styles['text-wrapper']} direction="column" gap="8">
<Text variant="body4">{t(Topics.TITLE_FULL)}</Text>
<Text variant="body2">{t(Topics.TITLE_LABEL)}</Text>
</Flex>
<FormField label={t(Topics.TITLE_FULL)} description={t(Topics.TITLE_LABEL)}>
<FormControl name="title" control={control} className={styles['input-form']}>
{(register, hasError) => (
<Input
Expand All @@ -45,7 +41,7 @@ export const TopicForm = ({ isEdit }: TopicFormProps) => {
/>
)}
</FormControl>
</Flex>
</FormField>
<FormField label={t(Marketplace.SKILLS_SHORT)} description={t(Marketplace.SKILLS_LABEL)}>
<FormControl name="skillId" control={control}>
{({ onChange, value }) => {
Expand All @@ -62,11 +58,11 @@ export const TopicForm = ({ isEdit }: TopicFormProps) => {
}}
</FormControl>
</FormField>
<Flex direction="column" gap="20">
<Flex direction="column" gap="8">
<Text variant="body4">{t(Topics.DESCRIPTION_FULL)}</Text>
<Text variant="body2">{t(Topics.DESCRIPTION_LABEL)}</Text>
</Flex>
<FormField
label={t(Topics.DESCRIPTION_FULL)}
description={t(Topics.DESCRIPTION_LABEL)}
direction="column"
>
<FormControl name="description" control={control} className={styles['input-form']}>
{(register, hasError) => (
<TextArea
Expand All @@ -77,7 +73,7 @@ export const TopicForm = ({ isEdit }: TopicFormProps) => {
/>
)}
</FormControl>
</Flex>
</FormField>
</Flex>
</Flex>
);
Expand Down
Loading