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

팀원추천 페이지 버그 수정 #210

Merged
merged 3 commits into from
Jun 24, 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
2 changes: 1 addition & 1 deletion src/components/atoms/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export const Select: React.FC<SelectProps> & {
<SelectContainer className={className} ref={containerRef} width={width}>
<input type="text" readOnly value={value} style={{ display: 'none' }} {...props} />
<SelectButton error={error} value={value} onClick={() => setOpened((prev) => !prev)}>
{label ?? placeholder}
{(value && label) ?? placeholder}
<ArrowIcon icon="arrowDown" size={12} $isError={error} $isOpened={isOpened} />
<OptionList position={optionsPosition} hidden={!isOpened} ref={optionsRef}>
{children}
Expand Down
24 changes: 17 additions & 7 deletions src/components/organisms/TeamRecommend/RecommendFilterBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,25 @@ const dibsFilter = [
interface RecommendFilterBlockProps {
options: RecommendUserQueryOptions;
setOptions: Dispatch<SetStateAction<RecommendUserQueryOptions>>;
trigger: (options: RecommendUserQueryOptions) => void;
}

export const RecommendFilterBlock = ({ options, setOptions }: RecommendFilterBlockProps) => {
export const RecommendFilterBlock = ({
options,
setOptions,
trigger,
}: RecommendFilterBlockProps) => {
const { data: positionList } = usePositionsQuery();
const { data: regions } = useRegionsQuery();

const handleDibsClick = useCallback(
(dibsValue: boolean) => () => {
setOptions((opts) => ({ ...opts, liked: dibsValue }));
trigger({ ...options, liked: dibsValue });
},
[setOptions, options, trigger]
);

const handlePositionClick = useCallback(
(positionId: Position['id']) => {
return () => {
Expand All @@ -106,7 +119,7 @@ export const RecommendFilterBlock = ({ options, setOptions }: RecommendFilterBlo
size="typo4"
weight="bold"
selected={options.liked === dibs.value}
onClick={() => setOptions((opts) => ({ ...opts, liked: dibs.value }))}
onClick={handleDibsClick(dibs.value)}
>
{dibs.label}
</DibsBlock>
Expand All @@ -116,11 +129,7 @@ export const RecommendFilterBlock = ({ options, setOptions }: RecommendFilterBlo
variant={'outlined'}
height={'40'}
color={'primary'}
onClick={() =>
setOptions({
liked: false,
})
}
onClick={() => setOptions((opts) => ({ liked: opts.liked }))}
>
필터 초기화
</InitFilterButton>
Expand Down Expand Up @@ -149,6 +158,7 @@ export const RecommendFilterBlock = ({ options, setOptions }: RecommendFilterBlo
backgroundStatus: e.target.value as UserBackgroundStatus,
}))
}
placeholder="선택하세요"
/>
</Filter>
<Filter title="프로젝트 경험 수" titleWidth={220}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/templates/TeamRecommend/RecommendFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const RecommendFilter = ({ defaultOptions, trigger }: RecommendFilterProp
팀원 추천
</Button>
</StyledFlexBlock>
<RecommendFilterBlock options={options} setOptions={setOptions} />
<RecommendFilterBlock options={options} setOptions={setOptions} trigger={trigger} />
</StyledSection>
);
};
Loading