-
Notifications
You must be signed in to change notification settings - Fork 1
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
feat: <Picker> 구현 #14
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
37499e4
fix: semanticColor 이름 오류 수정
HyunsDev f2a9e7f
feat: useDOMRef 훅 추가
HyunsDev 2c3d70b
feat: useUncontrolledValue 훅 추가
HyunsDev e6df2b7
feat: <Picker> 컴포넌트 추가
HyunsDev 3333b30
style: import { styled } 로 교체
HyunsDev 7b7f754
fix: useEffect dependency 오류 해결
HyunsDev b4f3643
Merge branch 'develop' into feat/picker
HyunsDev 78a1a51
style: 린트 적용
HyunsDev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,132 @@ | ||
import { useState } from 'react'; | ||
|
||
import { Meta, StoryObj } from '@storybook/react'; | ||
|
||
import { Picker } from './Picker'; | ||
|
||
import { PickerColumn } from '.'; | ||
|
||
const meta: Meta<typeof Picker> = { | ||
title: 'Atoms/Picker', | ||
component: Picker, | ||
parameters: { | ||
layout: 'centered', | ||
}, | ||
}; | ||
|
||
export default meta; | ||
type Story = StoryObj<typeof Picker>; | ||
|
||
const options = [ | ||
{ | ||
label: '2022', | ||
value: 'v2022', | ||
}, | ||
{ | ||
label: '2023', | ||
value: 'v2023', | ||
}, | ||
{ | ||
label: '2024', | ||
value: 'v2024', | ||
}, | ||
{ | ||
label: '2025', | ||
value: 'v2025', | ||
}, | ||
{ | ||
label: '2026', | ||
value: 'v2026', | ||
}, | ||
{ | ||
label: '2027', | ||
value: 'v2027', | ||
}, | ||
{ | ||
label: '2028', | ||
value: 'v2028', | ||
}, | ||
{ | ||
label: '2029', | ||
value: 'v2029', | ||
}, | ||
{ | ||
label: '2030', | ||
value: 'v2030', | ||
}, | ||
]; | ||
|
||
const Example = () => { | ||
const [value, setValue] = useState('v2022'); | ||
const [value2, setValue2] = useState('v2022'); | ||
const [value3, setValue3] = useState('v2022'); | ||
|
||
return ( | ||
<Picker> | ||
<PickerColumn options={options} value={value} onChange={(e) => setValue(e.target.value)} /> | ||
<PickerColumn options={options} value={value2} onChange={(e) => setValue2(e.target.value)} /> | ||
<PickerColumn options={options} value={value3} onChange={(e) => setValue3(e.target.value)} /> | ||
</Picker> | ||
); | ||
}; | ||
|
||
export const Primary: Story = { | ||
render: Example, | ||
}; | ||
|
||
const DateExample = () => { | ||
const [amPm, setAmPm] = useState('am'); | ||
const [hour, setHour] = useState(''); | ||
const [minute, setMinute] = useState(''); | ||
|
||
const amPms = [ | ||
{ | ||
label: '오전', | ||
value: 'am', | ||
}, | ||
{ | ||
label: '오후', | ||
value: 'pm', | ||
}, | ||
]; | ||
|
||
const hours = Array.from({ length: 12 }, (_, i) => { | ||
const value = i + 1; | ||
return { | ||
label: `${value}`, | ||
value: `${value}`, | ||
}; | ||
}); | ||
|
||
const minutes = Array.from({ length: 12 }, (_, i) => { | ||
const value = `${i * 5}`.padStart(2, '0'); | ||
return { | ||
label: `${value}`, | ||
value: `${value}`, | ||
}; | ||
}); | ||
|
||
return ( | ||
<Picker> | ||
<PickerColumn options={amPms} value={amPm} onChange={(e) => setAmPm(e.target.value)} /> | ||
<PickerColumn options={hours} value={hour} onChange={(e) => setHour(e.target.value)} /> | ||
<PickerColumn options={minutes} value={minute} onChange={(e) => setMinute(e.target.value)} /> | ||
</Picker> | ||
); | ||
}; | ||
|
||
export const Date: Story = { | ||
render: DateExample, | ||
}; | ||
|
||
export const WithBackground: Story = { | ||
render: () => ( | ||
<div style={{ background: '#f0f0f0', width: '500px' }}> | ||
<Picker> | ||
<PickerColumn options={options} value={'v2022'} onChange={() => {}} /> | ||
<PickerColumn options={options} value={'v2022'} onChange={() => {}} /> | ||
<PickerColumn options={options} value={'v2022'} onChange={() => {}} /> | ||
</Picker> | ||
</div> | ||
), | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
import { styled } from 'styled-components'; | ||
|
||
export const StyledPicker = styled.div` | ||
position: relative; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
height: 224px; // 32px * 7 | ||
overflow: hidden; | ||
padding: 16px 0px; | ||
|
||
&::before { | ||
height: 96px; | ||
width: 100%; | ||
content: ''; | ||
position: absolute; | ||
top: 0px; | ||
left: 0; | ||
background-color: ${({ theme }) => theme.color.dimThickBright}; | ||
border-bottom: 1px solid ${({ theme }) => theme.color.borderNormal}; | ||
|
||
user-select: none; | ||
pointer-events: none; | ||
} | ||
|
||
&::after { | ||
height: 96px; | ||
width: 100%; | ||
content: ''; | ||
position: absolute; | ||
bottom: 0px; | ||
left: 0; | ||
background-color: ${({ theme }) => theme.color.dimThickBright}; | ||
border-top: 1px solid ${({ theme }) => theme.color.borderNormal}; | ||
|
||
user-select: none; | ||
pointer-events: none; | ||
} | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import { forwardRef } from 'react'; | ||
|
||
import { StyledPicker } from './Picker.style'; | ||
import { PickerProps } from './Picker.type'; | ||
|
||
export const Picker = forwardRef<HTMLDivElement, PickerProps>(({ children, ...props }, ref) => { | ||
return ( | ||
<StyledPicker ref={ref} {...props}> | ||
{children} | ||
</StyledPicker> | ||
); | ||
}); | ||
Picker.displayName = 'Picker'; | ||
HyunsDev marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import React from 'react'; | ||
|
||
export interface PickerProps extends React.ComponentPropsWithRef<'div'> {} | ||
|
||
export type PickerColumnOption = { | ||
value: string; | ||
label: string; | ||
}; | ||
export type PickerColumnProps = { | ||
options: PickerColumnOption[]; | ||
value: string; | ||
} & Omit<React.SelectHTMLAttributes<HTMLSelectElement>, 'children'>; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import { styled } from 'styled-components'; | ||
|
||
export const StyledPickerColumnContainer = styled.div` | ||
width: fit-content; | ||
height: 224px; | ||
padding: 96px 0; | ||
display: flex; | ||
flex-direction: column; | ||
overflow: auto; | ||
scrollbar-width: 0px; | ||
&::-webkit-scrollbar { | ||
display: none; | ||
} | ||
`; | ||
|
||
export const StyledPickerColumnOption = styled.div` | ||
flex: 1; | ||
height: 32px; | ||
min-height: 32px; | ||
padding: 4px 20px; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
font-size: 15px; | ||
cursor: pointer; | ||
user-select: none; | ||
color: ${({ theme }) => theme.color.textPrimary}; | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
import { forwardRef, useEffect, useRef, useState } from 'react'; | ||
|
||
import { useDOMRef } from '@/hooks/useDOMRef/useDOMRef'; | ||
|
||
import { PickerColumnOption, PickerColumnProps } from './Picker.type'; | ||
import { StyledPickerColumnContainer, StyledPickerColumnOption } from './PickerColumn.style'; | ||
|
||
export const PickerColumn = forwardRef<HTMLSelectElement, PickerColumnProps>( | ||
({ options, value, ...props }, ref) => { | ||
const domRef = useDOMRef(ref); | ||
|
||
const containerRef = useRef<HTMLDivElement>(null); | ||
const optionRefs = useRef<Record<(typeof options)[number]['value'], HTMLDivElement>>({}); | ||
|
||
useEffect(() => { | ||
const option = options.find((o) => o.value === value); | ||
if (!option) return; | ||
containerRef.current!.scrollTop = optionRefs.current[option.value].offsetTop - 96; | ||
}, [value, options]); | ||
|
||
const change = (option: PickerColumnOption) => { | ||
domRef.current!.value = option.value; | ||
domRef.current!.dispatchEvent( | ||
new Event('change', { | ||
bubbles: true, | ||
cancelable: true, | ||
}) | ||
); | ||
containerRef.current!.scrollTop = options.findIndex((o) => o.value === option.value) * 32; | ||
}; | ||
|
||
const [isIgnoreScroll, setIgnoreScroll] = useState(false); | ||
const ignoreChangeTimer = useRef<NodeJS.Timeout>(); | ||
|
||
const changeByPosition = () => { | ||
const top = containerRef.current!.scrollTop; | ||
const option = options[Math.round(top / 32)]; | ||
change(option); | ||
}; | ||
|
||
// 모바일 터치 지원 | ||
const onTouchStart = () => { | ||
HyunsDev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
setIgnoreScroll(true); | ||
}; | ||
const onTouchEnd = () => { | ||
setIgnoreScroll(false); | ||
setTimeout(() => changeByPosition(), 0); | ||
}; | ||
|
||
// PC 드래그 스크롤 | ||
const isMouseDown = useRef(false); | ||
const isDragging = useRef(false); | ||
const firstPosY = useRef<number>(); | ||
const firstMouseY = useRef<number>(); | ||
const isIgnoreClickAfterDrag = useRef(false); // 드래그 종료(mouseUp)과 클릭(click)이 중복 동작하는 것을 방지 | ||
|
||
const onMouseDown = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => { | ||
setIgnoreScroll(true); | ||
isDragging.current = false; | ||
isMouseDown.current = true; | ||
firstPosY.current = containerRef.current!.scrollTop; | ||
firstMouseY.current = e.clientY; | ||
}; | ||
|
||
useEffect(() => { | ||
if (!containerRef.current) return; | ||
|
||
const onMouseMove = (e: MouseEvent) => { | ||
if (!isMouseDown.current) return; | ||
const diff = e.clientY - firstMouseY.current!; | ||
containerRef.current!.scrollTop = firstPosY.current! - diff; | ||
|
||
if (Math.abs(diff) > 5) { | ||
isDragging.current = true; | ||
isIgnoreClickAfterDrag.current = true; | ||
} | ||
}; | ||
|
||
const onMouseUpOrLeave = () => { | ||
if (!isMouseDown.current) return; | ||
isMouseDown.current = false; | ||
setIgnoreScroll(false); | ||
|
||
if (!isDragging.current) return; | ||
setTimeout(() => { | ||
changeByPosition(); | ||
}, 0); | ||
}; | ||
|
||
window.addEventListener('mousemove', onMouseMove); | ||
window.addEventListener('mouseup', onMouseUpOrLeave); | ||
window.addEventListener('mouseleave', onMouseUpOrLeave); | ||
return () => { | ||
window.removeEventListener('mousemove', onMouseMove); | ||
window.removeEventListener('mouseup', onMouseUpOrLeave); | ||
window.removeEventListener('mouseleave', onMouseUpOrLeave); | ||
}; | ||
}, []); | ||
|
||
const onScroll = () => { | ||
clearTimeout(ignoreChangeTimer.current!); | ||
ignoreChangeTimer.current = setTimeout(() => { | ||
if (isIgnoreScroll) return; | ||
changeByPosition(); | ||
}, 100); | ||
HyunsDev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
|
||
const optionClick = (option: PickerColumnOption) => { | ||
if (isIgnoreScroll) return; | ||
if (isIgnoreClickAfterDrag.current) { | ||
isIgnoreClickAfterDrag.current = false; | ||
return; | ||
} | ||
change(option); | ||
}; | ||
|
||
return ( | ||
<> | ||
<StyledPickerColumnContainer | ||
ref={containerRef} | ||
onScroll={onScroll} | ||
onTouchStart={onTouchStart} | ||
onTouchEnd={onTouchEnd} | ||
onTouchCancel={onTouchEnd} | ||
onMouseDown={onMouseDown} | ||
style={{ | ||
scrollBehavior: isIgnoreScroll ? 'auto' : 'smooth', | ||
}} | ||
> | ||
{options.map((option) => { | ||
return ( | ||
<StyledPickerColumnOption | ||
key={option.value} | ||
ref={(el) => (optionRefs.current[option.value] = el as HTMLDivElement)} | ||
onClick={() => optionClick(option)} | ||
> | ||
{option.label} | ||
</StyledPickerColumnOption> | ||
); | ||
})} | ||
</StyledPickerColumnContainer> | ||
<select | ||
ref={domRef} | ||
style={{ | ||
display: 'none', | ||
}} | ||
value={value} | ||
{...props} | ||
> | ||
{options.map((option) => { | ||
return ( | ||
<option key={option.value} value={option.value}> | ||
{option.label} | ||
</option> | ||
); | ||
})} | ||
</select> | ||
</> | ||
); | ||
} | ||
); | ||
PickerColumn.displayName = 'PickerColumn'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export { PickerColumn } from './PickerColumn'; | ||
export type { PickerColumnProps } from './Picker.type'; | ||
|
||
export { Picker } from './Picker'; | ||
export type { PickerProps } from './Picker.type'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Picker 한 개당 최대 3개의 PickerColumn을 가질 수 있다는 제한 사항이 있어서 갯수 제한을 설정해주시면 더 좋을 것 같아요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 부분은 디자인적으로만 고려해도 충분할 것 같고, 추후 확장 가능성을 위해 의도적으로 추가하지 않았어요.
갯수 제한을 걸려면 context로 컴포넌트의 수를 센 다음에 3개 초과면 오류를 던저야 하는데, 이 정도의 오버헤드를 감수하면서 개발 단에서 제한을 추가할 필요는 없을 것 같습니다.