Skip to content

fix: 조합에 기기가 없을 경우에도 조합명 수정되도록 수정 #173

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.

Sign up for GitHub

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

Merged
H-un1 merged 1 commit into from
Feb 12, 2026
Merged

fix: 조합에 기기가 없을 경우에도 조합명 수정되도록 수정 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/components/MyPage/CombinationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,15 @@ const CombinationList = ({
createdAt={combination.createdAt}
isPinned={combination.isPinned}
index={index}
isEditing={combinationEdit.editingComboId === combination.comboId}
editingName={combinationEdit.editingCombinationName}
nameError={combinationEdit.comboNameError}
onTogglePin={handleTogglePin}
onNameChange={combinationEdit.handleComboNameChange}
onNameBlur={(name) => {
const error = combinationEdit.validateComboName(name);
combinationEdit.setComboNameError(error);
}}
/>
)}
</>
Expand Down
129 changes: 94 additions & 35 deletions src/components/MyPage/EmptyCombinationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ interface EmptyCombinationCardProps {
createdAt: string;
isPinned: boolean;
index: number;
isEditing: boolean;
editingName: string;
nameError: string | null;
onTogglePin: (e: React.MouseEvent, comboId: number) => void;
onNameChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
onNameBlur: (name: string) => void;
}

const EmptyCombinationCard = ({
Expand All @@ -21,7 +26,12 @@ const EmptyCombinationCard = ({
createdAt,
isPinned,
index,
isEditing,
editingName,
nameError,
onTogglePin,
onNameChange,
onNameBlur,
}: EmptyCombinationCardProps) => {
const navigate = useNavigate();
const [hoveredStarComboId, setHoveredStarComboId] = useState<number | null>(null);
Expand All @@ -30,44 +40,93 @@ const EmptyCombinationCard = ({
<div className="px-36 pt-24 pb-36">
{/* 조합 정보 (생성일 포함) */}
<div className="flex flex-col gap-24 pl-20 py-24">
{/* 조합 번호 + 생성일 + 조합명 */}
<div className="flex flex-col gap-8">
<div className="flex items-center gap-16">
<p className="font-body-4-r text-gray-400">조합{index + 1}</p>
<p className="font-body-4-r text-gray-400">생성일: {formatDate(createdAt)}</p>
</div>
<div className="flex items-center gap-8">
<p className="font-body-1-sm text-black">{comboName}</p>
{isPinned ? (
<StarIcon
onClick={(e) => onTogglePin(e, comboId)}
className={`!w-22 !h-22 -mt-3 cursor-pointer transition-opacity ${
hoveredStarComboId === comboId ? 'opacity-80' : ''
{isEditing ? (
/* 수정 모드: 인풋박스 + 별 아이콘 + 에러 메시지 */
<div className="flex flex-col gap-8">
<div className="flex items-center gap-8 min-h-48">
<input
type="text"
value={editingName}
onChange={onNameChange}
onClick={(e) => e.stopPropagation()}
onBlur={() => onNameBlur(editingName)}
maxLength={20}
className={`h-52 px-12 rounded-button font-body-1-sm text-gray-300 focus:outline-none ${
nameError ? 'border-2 border-warning' : 'border border-blue-600'
}`}
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
autoFocus
/>
) : (
<>
{hoveredStarComboId === comboId ? (
<StarHoverIcon
onClick={(e) => onTogglePin(e, comboId)}
className="!w-22 !h-22 -mt-3 cursor-pointer"
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
) : (
<StarXIcon
onClick={(e) => onTogglePin(e, comboId)}
className="!w-22 !h-22 -mt-3 cursor-pointer"
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
)}
</>
)}
{isPinned ? (
<StarIcon
onClick={(e) => onTogglePin(e, comboId)}
className={`!w-22 !h-22 -mt-2 cursor-pointer transition-opacity ${
hoveredStarComboId === comboId ? 'opacity-80' : ''
}`}
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
) : (
<>
{hoveredStarComboId === comboId ? (
<StarHoverIcon
onClick={(e) => onTogglePin(e, comboId)}
className="!w-22 !h-22 -mt-2 cursor-pointer"
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
) : (
<StarXIcon
onClick={(e) => onTogglePin(e, comboId)}
className="!w-22 !h-22 -mt-2 cursor-pointer"
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
)}
</>
)}
</div>
{nameError && <p className="pl-12 font-body-4-r text-warning">{nameError}</p>}
</div>
) : (
/* 일반 모드: 조합 번호 + 생성일 + 조합명 */
<div className="flex flex-col gap-8">
<div className="flex items-center gap-16">
<p className="font-body-4-r text-gray-400">조합{index + 1}</p>
<p className="font-body-4-r text-gray-400">생성일: {formatDate(createdAt)}</p>
</div>
<div className="flex items-center gap-8">
<p className="font-body-1-sm text-black">{comboName}</p>
{isPinned ? (
<StarIcon
onClick={(e) => onTogglePin(e, comboId)}
className={`!w-22 !h-22 -mt-3 cursor-pointer transition-opacity ${
hoveredStarComboId === comboId ? 'opacity-80' : ''
}`}
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
) : (
<>
{hoveredStarComboId === comboId ? (
<StarHoverIcon
onClick={(e) => onTogglePin(e, comboId)}
className="!w-22 !h-22 -mt-3 cursor-pointer"
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
) : (
<StarXIcon
onClick={(e) => onTogglePin(e, comboId)}
className="!w-22 !h-22 -mt-3 cursor-pointer"
onMouseEnter={() => setHoveredStarComboId(comboId)}
onMouseLeave={() => setHoveredStarComboId(null)}
/>
)}
</>
)}
</div>
</div>
</div>
)}
</div>

{/* 빈 조합: 기기 추가 버튼 */}
Expand Down