Skip to content

Commit

Permalink
fix : 병합 문제 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
dlsxody1 committed Dec 8, 2023
1 parent d9bd5bf commit 18050e2
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 29 deletions.
25 changes: 23 additions & 2 deletions src/app/search/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
addressesState,
pathResultState,
remainPathState,
searchState,
} from '@/recoil/search';
import Input from '@/components/search/Input';
import ResultCards from '@/components/search/Card/ResultCards';
Expand All @@ -23,6 +24,7 @@ export default function SearchPage() {
const [inputType, setInputType] = useState('departure');
const resetAddresses = useResetRecoilState(addressesState);
const [remainPath, setRemainPath] = useRecoilState(remainPathState);
const [search, setSearch] = useRecoilState(searchState);

useEffect(() => {
if (
Expand All @@ -45,10 +47,24 @@ export default function SearchPage() {
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [pathResult.arrival.address, pathResult.departure.address]);

const changeSearchValue = () => {
setSearch({ arrival: search.departure, departure: search.arrival });
};

const deleteSearchValue = () => {
setSearch({ ...search, departure: '' });
};

return (
<Wrap>
<Header>
<Image src={icExchange} alt={'출발지, 도착지 교환'} />
<Image
src={icExchange}
alt={'출발지, 도착지 교환'}
onClick={() => changeSearchValue()}
style={{ cursor: 'pointer' }}
/>
<div>
<InputWrap>
<Input
Expand All @@ -60,7 +76,12 @@ export default function SearchPage() {
<Input inputType="arrival" onClick={() => setInputType('arrival')} />
</div>
<ResetBox>
<Image src={icX} alt={'출발지 삭제 버튼'} />
<Image
src={icX}
alt={'출발지 삭제 버튼'}
onClick={() => deleteSearchValue()}
style={{ cursor: 'pointer' }}
/>
</ResetBox>
</Header>
<ButtonWrap>
Expand Down
60 changes: 35 additions & 25 deletions src/components/search/Card/RouteCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,46 @@
import styled from 'styled-components';
import icX from 'public/assets/icons/ic_x_sm.png';
import Image from 'next/image';
import { useRecoilValue, useSetRecoilState } from 'recoil';
import { pathResultState, remainPathState } from '@/recoil/search';
import { useRecoilState, useSetRecoilState } from 'recoil';
import { pathResultState, remainPathSelector } from '@/recoil/search';
import { useMounted } from '@/hooks/useMounted';
import { v4 as uuidv4 } from 'uuid';
import { IPathPropsWithoutKey } from '@/type/search';
import { MouseEvent } from 'react';

const RouteCard = () => {
const { isMounted } = useMounted();
const remainPath = useRecoilValue(remainPathState);
const [remainPath, setRemainPath] = useRecoilState(remainPathSelector);
const pathResult = useSetRecoilState(pathResultState);
const showResult = ({ arrival, departure }: IPathPropsWithoutKey) => {
pathResult({
arrival: {
location: arrival.location,
address: arrival.address,
x: arrival.x,
y: arrival.y,
},
departure: {
location: departure.location,
address: departure.address,
x: departure.x,
y: departure.y,
},
});
};
const removePath = (id: string, e: MouseEvent<HTMLImageElement>) => {
e.stopPropagation();
setRemainPath(remainPath.filter((path) => path.id !== id));
};

return (
<>
{isMounted &&
remainPath?.map(({ arrival, departure }) => {
const uniqueKey = uuidv4();
const showResult = () => {
pathResult({
arrival: {
location: arrival.location,
address: arrival.address,
x: arrival.x,
y: arrival.y,
},
departure: {
location: departure.location,
address: departure.address,
x: departure.x,
y: departure.y,
},
});
};

remainPath?.map(({ id, arrival, departure }) => {
return (
<Container key={uniqueKey} onClick={() => showResult()}>
<Container
key={id}
onClick={() => showResult({ arrival, departure })}
>
<Wrap>
<Course>
<p>
Expand All @@ -46,7 +52,11 @@ const RouteCard = () => {
<span>도착지</span> {arrival.location}
</p>
</Course>
<Image src={icX} alt="저장된 경로 삭제" />
<Image
src={icX}
alt="저장된 경로 삭제"
onClick={(e) => removePath(id, e)}
/>
</Wrap>
</Container>
);
Expand Down
23 changes: 22 additions & 1 deletion src/recoil/search.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { IAddressProps, IPathProps } from '@/type/search';
import { atom } from 'recoil';
import { DefaultValue, atom, selector, RecoilEnv } from 'recoil';
import { v4 as uuidv4 } from 'uuid';
import { recoilPersist } from 'recoil-persist';

//Next.js 개발 환경에서 Recoil을 사용하면 파일이 변경되어 다시 빌드되는 과정에서 atom으로 만든 state가 재선언된다.
//재선언되는 과정에서 이미 key로 선언된 값을 key로 사용해서 문제가 발생하기 때문에
// 해결하기 위해 Env 추가
RecoilEnv.RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED = false;
const { persistAtom } = recoilPersist();

export const searchState = atom({
Expand Down Expand Up @@ -39,3 +44,19 @@ export const remainPathState = atom<IPathProps[]>({
default: [],
effects_UNSTABLE: [persistAtom],
});

export const remainPathSelector = selector({
key: 'remainPathSelector',
get: ({ get }) => {
const remainPath = get(remainPathState);
return remainPath.map((path) => ({ id: uuidv4(), ...path }));
},
set: ({ set }, newValue) => {
if (!(newValue instanceof DefaultValue)) {
set(
remainPathState,
newValue.map(({ id, ...path }) => path)
);
}
},
});
11 changes: 10 additions & 1 deletion src/type/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ export interface IQueryProps {
route: IPathResultProps[];
}

export interface IPlaceCard extends Location {
export interface IPlaceCard {
location: string;
address: string;
x: number;
y: number;
type: string;
}

Expand All @@ -61,3 +65,8 @@ export interface IPathProps {
arrival: Location;
departure: Location;
}

export interface IPathPropsWithoutKey {
departure: Location;
arrival: Location;
}

0 comments on commit 18050e2

Please sign in to comment.