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

폼 관련 리팩토링 #503

Merged
merged 3 commits into from
Jan 13, 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
65 changes: 65 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,25 @@
"react-draggable-bottom-sheet": "^1.14.0",
"react-error-boundary": "^4.0.11",
"react-hook-form": "^7.47.0",
"react-kakao-maps-sdk": "^1.1.24",
"react-hot-toast": "^2.4.1",
"react-kakao-maps-sdk": "^1.1.24",
"react-router-dom": "^6.17.0",
"sockjs-client": "^1.6.1",
"stompjs": "^2.3.3",
"zustand": "^4.4.6"
},
"devDependencies": {
"@types/daum-postcode": "^2.0.2",
"@types/sockjs-client": "^1.5.4",
"@types/stompjs": "^2.3.8",
"@tanstack/react-query-devtools": "^5.1.0",
"@hookform/devtools": "^4.3.1",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.0.0",
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
"@types/daum-postcode": "^2.0.2",
"@types/event-source-polyfill": "^1.0.4",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/sockjs-client": "^1.5.4",
"@types/stompjs": "^2.3.8",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vitejs/plugin-react": "^4.0.3",
Expand Down
5 changes: 3 additions & 2 deletions src/pages/CreateCrewPage/CreateCrewPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { FormProvider } from 'react-hook-form';

import { DevTool } from '@hookform/devtools';

import { MAX_MEMBER_COUNT_LIST } from '@pages/CreateCrewPage/constants/createCrewOptions';
import { CREATE_CREW_STRINGS } from '@pages/CreateCrewPage/constants/createCrewOptions';

Expand Down Expand Up @@ -43,7 +45,6 @@ export const CreateCrewPage = () => {
} = useCreateCrewPage();

const {
maxMemberCount,
selectedLocation,
selectedLocations,
isOpenMaxMemberCountModal,
Expand Down Expand Up @@ -78,7 +79,6 @@ export const CreateCrewPage = () => {
isContainModal={true}
isModalOpen={isOpenMaxMemberCountModal}
closeModal={toggleMaxMemberCountModal}
value={maxMemberCount}
onClick={toggleMaxMemberCountModal}
>
<VirtualScroll
Expand Down Expand Up @@ -144,6 +144,7 @@ export const CreateCrewPage = () => {
<StyledEmptyContainer />
</StyledCreateForm>
</FormProvider>
<DevTool control={methods.control} />
</PageWrapper>
</PageLayout>
);
Expand Down
8 changes: 3 additions & 5 deletions src/pages/CreateCrewPage/hooks/useCreateCrewPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ export const useCreateCrewPage = () => {
const { mutate } = useCrewMutation();

const methods = useForm();
const { handleSubmit } = methods;
const { handleSubmit, setValue } = methods;

const [maxMemberCount, setMaxMemberCount] = useState<string>('');
const [selectedLocation, setSelectedLocation] = useState<string[]>();
const [isOpenMaxMemberCountModal, setIsOpenMaxMemberCountModal] =
useState(false);
Expand All @@ -58,12 +57,12 @@ export const useCreateCrewPage = () => {
};

const handleMaxMemberCount = (maxMemberCount: string) => {
isOpenMaxMemberCountModal || setMaxMemberCount(maxMemberCount);
isOpenMaxMemberCountModal || setValue('maxMemberCount', maxMemberCount);
};

const onSubmit = handleSubmit((data: FieldValues) => {
const addressDepth2 = selectedLocation![0];
const { name, content } = data;
const { name, content, maxMemberCount } = data;
const crewData: PostCrewRequest = {
name,
content,
Expand Down Expand Up @@ -92,7 +91,6 @@ export const useCreateCrewPage = () => {

return {
state: {
maxMemberCount,
selectedLocation,
selectedLocations,
isOpenMaxMemberCountModal,
Expand Down
18 changes: 5 additions & 13 deletions src/pages/CreateGamePage/CreateGamePage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { FormProvider } from 'react-hook-form';

import { DevTool } from '@hookform/devtools';

import {
CREATE_GAME_STRINGS,
MAX_MEMBER_COUNT_LIST,
Expand Down Expand Up @@ -43,7 +45,7 @@ export const CreateGamePage = () => {
toggleMatchDateModal,
toggleStartTimeModal,
togglePlayTimeModal,
setPlayDate,
handlePlayDate,
setPositions,
handleMaxMemberCount,
handlePlayStartTimeHours,
Expand All @@ -54,12 +56,6 @@ export const CreateGamePage = () => {
const { entryRef, showHeaderTitle } = useHeaderTitle<HTMLDivElement>();

const {
maxMemberCount,
playDate,
playStartTimeHours,
playStartTimeMinutes,
playTimeMinutes,
mainAddress,
isGuestCountModalOpen,
isMatchDateModalOpen,
isStartTimeModalOpen,
Expand All @@ -85,7 +81,6 @@ export const CreateGamePage = () => {
isContainModal={true}
name="maxMemberCount"
onClick={toggleGuestCountModal}
value={maxMemberCount}
isModalOpen={isGuestCountModalOpen}
closeModal={toggleGuestCountModal}
register={methods.register}
Expand All @@ -102,20 +97,18 @@ export const CreateGamePage = () => {
isContainModal={true}
name="playDate"
onClick={toggleMatchDateModal}
value={playDate}
isModalOpen={isMatchDateModalOpen}
closeModal={toggleMatchDateModal}
register={methods.register}
>
<CalendarComponent setDate={setPlayDate} />
<CalendarComponent setDate={handlePlayDate} />
</ConditionalFormInput>
<ConditionalFormInput
label={CREATE_GAME_STRINGS.START_TIME}
readOnly={true}
isContainModal={true}
name="playStartTime"
onClick={toggleStartTimeModal}
value={`${playStartTimeHours}:${playStartTimeMinutes}`}
isModalOpen={isStartTimeModalOpen}
closeModal={toggleStartTimeModal}
register={methods.register}
Expand All @@ -140,7 +133,6 @@ export const CreateGamePage = () => {
isContainModal={true}
name="playTimeMinutes"
onClick={togglePlayTimeModal}
value={playTimeMinutes}
isModalOpen={isPlayTimeModalOpen}
closeModal={togglePlayTimeModal}
register={methods.register}
Expand All @@ -163,7 +155,6 @@ export const CreateGamePage = () => {
readOnly={true}
name="mainAddress"
onClick={handleAddressSelect}
value={mainAddress}
register={methods.register}
/>
<ConditionalFormInput
Expand Down Expand Up @@ -201,6 +192,7 @@ export const CreateGamePage = () => {
<StyledEmptyContainer />
</StyledCreateForm>
</FormProvider>
<DevTool control={methods.control} />
</PageWrapper>
</PageLayout>
);
Expand Down
57 changes: 35 additions & 22 deletions src/pages/CreateGamePage/hooks/useCreateGamePage.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from 'react';
import { useEffect, useState } from 'react';
import { FieldValues, useForm } from 'react-hook-form';
import toast from 'react-hot-toast';
import { useNavigate } from 'react-router-dom';
Expand Down Expand Up @@ -29,15 +29,9 @@ export const useCreateGamePage = () => {
const navigate = useNavigate();

const methods = useForm();
const { handleSubmit } = methods;

const [maxMemberCount, setMaxMemberCount] = useState<string>('');
const [playDate, setPlayDate] = useState<string>('');
const [playStartTimeHours, setPlayStartTimeHours] = useState<string>('');
const [playStartTimeMinutes, setPlayStartTimeMinutes] = useState<string>('');
const [playTimeMinutes, setPlayTimeMinutes] = useState<string>('');
const { handleSubmit, setValue, getValues } = methods;
const [positions, setPositions] = useState<Position[]>([]);
const [mainAddress, setMainAddress] = useState<string>('');

const [isGuestCountModalOpen, setIsGuestCountModalOpen] =
useState<boolean>(false);
const [isMatchDateModalOpen, setIsMatchDateModalOpen] =
Expand All @@ -48,25 +42,30 @@ export const useCreateGamePage = () => {
useState<boolean>(false);

const handleMaxMemberCount = (maxMemberCount: string) => {
isGuestCountModalOpen || setMaxMemberCount(maxMemberCount);
isGuestCountModalOpen || setValue('maxMemberCount', maxMemberCount);
};

const handlePlayStartTimeHours = (playStartTimeHours: string) => {
isStartTimeModalOpen || setPlayStartTimeHours(playStartTimeHours);
isStartTimeModalOpen || setValue('playStartTimeHours', playStartTimeHours);
};

const handlePlayStartTimeMinutes = (playStartTimeMinutes: string) => {
isStartTimeModalOpen || setPlayStartTimeMinutes(playStartTimeMinutes);
isStartTimeModalOpen ||
setValue('playStartTimeMinutes', playStartTimeMinutes);
};

const handlePlayTimeMinutes = (playTimeMinutes: string) => {
isPlayTimeModalOpen || setPlayTimeMinutes(playTimeMinutes);
isPlayTimeModalOpen || setValue('playTimeMinutes', playTimeMinutes);
};

const handlePlayDate = (playDate: string) => {
setValue('playDate', playDate);
};

const handleAddressSelect = () => {
new daum.Postcode({
oncomplete: ({ address }: { address: string }) => {
setMainAddress(address);
setValue('mainAddress', address);
},
}).open();
};
Expand All @@ -87,8 +86,28 @@ export const useCreateGamePage = () => {
setIsPlayTimeModalOpen((prev) => !prev);
};

useEffect(() => {
isStartTimeModalOpen ||
setValue(
'playStartTime',
`${getValues('playStartTimeHours')}:${getValues(
'playStartTimeMinutes'
)}`
);
}, [getValues, setValue, isStartTimeModalOpen]);

const onSubmit = handleSubmit((data: FieldValues) => {
const { detailAddress, cost, content } = data;
const {
detailAddress,
cost,
content,
maxMemberCount,
playDate,
playStartTimeHours,
playStartTimeMinutes,
mainAddress,
playTimeMinutes,
} = data;
const gameData: PostGameRequest = {
maxMemberCount: parseInt(maxMemberCount),
playDate,
Expand Down Expand Up @@ -123,12 +142,6 @@ export const useCreateGamePage = () => {

return {
state: {
maxMemberCount,
playDate,
playStartTimeHours,
playStartTimeMinutes,
playTimeMinutes,
mainAddress,
isGuestCountModalOpen,
isMatchDateModalOpen,
isStartTimeModalOpen,
Expand All @@ -141,11 +154,11 @@ export const useCreateGamePage = () => {
toggleMatchDateModal,
toggleStartTimeModal,
togglePlayTimeModal,
setPlayDate,
setPositions,
handleMaxMemberCount,
handlePlayStartTimeHours,
handlePlayStartTimeMinutes,
handlePlayTimeMinutes,
handlePlayDate,
};
};
Loading