Skip to content
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
9 changes: 7 additions & 2 deletions src/components/Dropdown/ArrowDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,17 @@ const ArrowDropdown = ({
<div
ref={dropdownRef}
onClick={(e) => e.stopPropagation()}
style={{ boxShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.15)' }}
style={{
boxShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.15)',
maxHeight: 'calc(2.9rem * 5 + 4.9rem)',
overflowY: 'auto',
}}
className={`absolute z-30 top-0 left-0 flex flex-col w-[27.4rem]
border border-gray-400 bg-white rounded-[0.4rem] ${className ?? ''}`}
>
<div
className={`flex border-b border-gray-200 justify-between items-center py-[0.4rem] ps-[1.2rem] pe-[0.8rem]`}
className={`flex border-b border-gray-200 rounded-[0.4rem] justify-between
items-center py-[0.4rem] ps-[1.2rem] pe-[0.8rem]`}
>
<span className={`font-xsmall-r text-gray-600 me-[0.4rem]`}>{defaultValue}</span>
<img src={IcDownArrow} alt={defaultValue} />
Expand Down
6 changes: 5 additions & 1 deletion src/components/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ const Dropdown = ({
return (
<div
ref={dropdownRef}
style={{ boxShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.15)' }}
style={{
boxShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.15)',
maxHeight: 'calc(2.9rem * 5 + 4.9rem)',
overflowY: 'auto',
}}
className={`absolute z-30 top-0 flex flex-col w-auto min-w-[11.6rem] max-w-[27.4rem]
border border-gray-400 bg-white rounded-[0.4rem] ${className}`}
>
Expand Down
6 changes: 5 additions & 1 deletion src/components/Dropdown/MultiSelectDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ const MultiSelectDropdown = ({
<div
ref={dropdownRef}
onClick={(e) => e.stopPropagation()}
style={{ boxShadow: '0px 4px 12px 0px rgba(0,0,0,0.15)' }}
style={{
boxShadow: '0px 4px 12px 0px rgba(0,0,0,0.15)',
maxHeight: 'calc(2.7rem * 5 + 4.8rem)', // 옵션 5개 + 헤더 높이(있으면)
overflowY: 'auto',
}}
className={`absolute z-30 top-0 flex flex-col w-auto min-w-[11.6rem] max-w-[27.4rem]
border border-gray-400 bg-white rounded-[0.4rem] ${className ?? ''}`}
>
Expand Down
2 changes: 1 addition & 1 deletion src/constants/regex.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const TEAM_NAME_REGEX = /^[A-Za-z가-힣]{4,10}$/;
export const TEAM_NAME_REGEX = /^[A-Za-z가-힣\s]{4,10}$/;
1 change: 1 addition & 0 deletions src/pages/setting/SettingMember.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const SettingMember = () => {
.slice(1)
.map((member, index) => (
<MemberItem
className={`py-[1.2rem]`}
key={index}
profileImageUrl={member.profileImageUrl}
name={member.name}
Expand Down
24 changes: 16 additions & 8 deletions src/pages/setting/components/modal/TeamCreateModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,22 @@ const TeamCreateModal = (props: TeamCreateModalProps) => {
<h2 className={`text-gray-600 font-title-sub-b`}>팀원 초대</h2>
<img src={IcX} alt={'닫기'} onClick={props.onClick} />
</div>
<input
className={`text-start w-full border border-gray-300 px-[1.2rem] py-[0.7rem]
font-body-r text-gray-400 placeholder:text-gray-400 rounded-[0.6rem] focus:outline-none`}
type={'text'}
placeholder={'팀 이름을 입력하세요'}
value={teamName}
onChange={(e) => setTeamName(e.target.value)}
/>
<div className={`flex flex-col`}>
<input
className={`text-start w-full border px-[1.2rem] py-[0.7rem]
font-body-r text-gray-400 placeholder:text-gray-400 rounded-[0.6rem] focus:outline-none
${!isNameValid && teamName ? 'border-error-400' : 'border-gray-300'}`}
type={'text'}
placeholder={'팀 이름을 입력하세요'}
value={teamName}
onChange={(e) => setTeamName(e.target.value)}
/>
{!isNameValid && teamName && (
<span className="text-error-400 font-xsmall-r mt-[0.6rem]">
팀 이름은 4~10자, 한글/영문/띄어쓰기로 입력해주세요.
</span>
)}
</div>
<p className={`font-body-r mt-[0.8rem]`}>팀원 추가</p>
</section>

Expand Down