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
80 changes: 51 additions & 29 deletions src/features/ootd/ui/OotdTagEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ const OotdTagEditor = ({
}, [isPending]);
const [addedItems, setAddedItems] = useState<OotdItem[]>([]); // 새로 등록한 아이템
const [analyzedItems, setAnalyzedItems] = useState<Record<string, OotdItem[]>>({});
const [analyzedCategory, setAnalyzedCategory] = useState<Record<string, string | null>>({});
const [sheetHeight, setSheetHeight] = useState(RESULT_SHEET_DEFAULT_H);
// 태그된 아이템 객체 보관 — 추천 목록이 갱신돼도 활성 박스 아이템이 목록에서 사라지지 않게
const [tagged, setTagged] = useState<Record<string, OotdItem>>({});
Expand Down Expand Up @@ -149,7 +150,14 @@ const OotdTagEditor = ({
const tagCount = boxes.filter((b) => b.itemId).length; // 아이템 부착된 박스 = 완성 태그

const activeMatched = activeBoxId ? analyzedItems[activeBoxId] : undefined;
const baseItems = activeMatched ?? recommended;
const activeCategory = activeBoxId ? analyzedCategory[activeBoxId] : undefined;
const baseItems = useMemo(() => {
if (activeMatched) return activeMatched;
if (activeCategory !== undefined) {
return recommended.filter((item) => item.categoryName === activeCategory);
}
return recommended;
}, [activeMatched, activeCategory, recommended]);
const items = useMemo(() => [...addedItems, ...baseItems], [addedItems, baseItems]);

const itemLabel = (id?: string) => {
Expand Down Expand Up @@ -189,40 +197,49 @@ const OotdTagEditor = ({
boxesRef.current = boxes;
}, [boxes]);

const analysisSeqRef = useRef<Record<string, number>>({});

const runAnalysis = async (boxId: string, bbox: Bbox) => {
if (ootdId == null) return;
const seq = (analysisSeqRef.current[boxId] ?? 0) + 1;
analysisSeqRef.current[boxId] = seq;
const isStale = () => analysisSeqRef.current[boxId] !== seq;
try {
const res = await analyzeTagArea(ootdId, { bbox });
if (isStale()) return;
setAnalyzedItems((prev) => {
if (!(boxId in prev)) return prev;
const next = { ...prev };
delete next[boxId];
return next;
});
if (res.matchedItemIds.length === 0) {
// 특정 아이템은 못 맞췄을 때: AI가 카테고리를 알아냈으면 그 카테고리 아이템을 앞에 두되,
// 나머지 보유 아이템도 모두 보여줘서 사용자가 다른 아이템도 고를 수 있게 한다.
const scoped = res.categorySmall
? recommended.filter((item) => item.categoryName === res.categorySmall)
: [];
const scopedIds = new Set(scoped.map((it) => it.id));
const rest = recommended.filter((it) => !scopedIds.has(it.id));
const merged = [...scoped, ...rest];
if (merged.length === 0) {
setAnalyzedItems((prev) => {
if (!(boxId in prev)) return prev;
const next = { ...prev };
delete next[boxId];
return next;
});
} else {
setAnalyzedItems((prev) => ({ ...prev, [boxId]: merged }));
}
setAnalyzedCategory((prev) => ({ ...prev, [boxId]: res.categorySmall }));
return;
}
setAnalyzedCategory((prev) => {
if (!(boxId in prev)) return prev;
const next = { ...prev };
delete next[boxId];
return next;
});
const details = await Promise.all(res.matchedItemIds.map((id) => getItemDetail(id)));
if (isStale()) return;
setAnalyzedItems((prev) => ({ ...prev, [boxId]: details.map(toOotdItemFromDetail) }));
} catch {
if (isStale()) return;
setAnalyzedItems((prev) => {
if (!(boxId in prev)) return prev;
const next = { ...prev };
delete next[boxId];
return next;
});
setAnalyzedCategory((prev) => {
if (!(boxId in prev)) return prev;
const next = { ...prev };
delete next[boxId];
return next;
});
}
};

Expand Down Expand Up @@ -265,6 +282,9 @@ const OotdTagEditor = ({
});
setActiveBoxId(nextId);
setShowBoxUi(false); // 말풍선을 통한 활성화라 박스 테두리는 안 띄운다
if (nextId && !(nextId in analyzedItems) && !(nextId in analyzedCategory)) {
scheduleAnalysis(nextId);
}
};

// 이미지 빈 곳 탭 → 그 위치에 박스 생성 + 활성화 + 분석 API 호출
Expand Down Expand Up @@ -347,11 +367,11 @@ const OotdTagEditor = ({
<img src={photo} data-tag-area="true" alt="촬영한 사진" className="block w-full" />
)}

{/* 태그 박스 보기/숨기기 토글 */}
{/* 태그 말풍선 보기/숨기기 토글 */}
<button
type="button"
onClick={() => setShowBox((v) => !v)}
aria-label={showBox ? '태그 박스 숨기기' : '태그 박스 보기'}
aria-label={showBox ? '태그 말풍선 숨기기' : '태그 말풍선 보기'}
className="absolute top-4 right-4 z-30 flex size-10 items-center justify-center rounded-full bg-black/60"
>
{showBox ? (
Expand All @@ -361,21 +381,23 @@ const OotdTagEditor = ({
)}
</button>

{/* 박스들: 표시 중일 때만. 활성 박스만 테두리+스포트라이트+이동/리사이즈 */}
{showBox &&
boxes.map((b) => (
{boxes.map((b) => {
const isActive = activeBoxId === b.id;
const showFrame = isActive && showBoxUi;
return (
<TagBBox
key={b.id}
bbox={b.bbox}
label={b.label ?? ''}
active={activeBoxId === b.id}
showFrame={activeBoxId === b.id && showBoxUi}
label={showBox || showFrame ? (b.label ?? '') : ''}
active={isActive}
showFrame={showFrame}
variant={b.touched ? 'black' : untouchedVariant}
onActivate={() => activateBox(activeBoxId === b.id ? null : b.id)}
onActivate={() => activateBox(isActive ? null : b.id)}
onChange={(bb) => updateBox(b.id, bb)}
onSettle={() => scheduleAnalysis(b.id)}
/>
))}
);
})}
</div>

{/* 분석 결과 바텀시트 (활성 박스 기준) */}
Expand Down
8 changes: 4 additions & 4 deletions src/features/search/ui/OotdResultGrid.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useNavigate } from 'react-router-dom';
import useIsWideLayout from '@/shared/hooks/useIsWideLayout';
import { resolveImageUrl } from '@/shared/lib/resolveImageUrl';
import { saveRecentOotd } from '../api/searchApi';
import type { SearchOotdResponse } from '../api/types';
Expand All @@ -11,8 +12,6 @@ export interface OotdResultGridProps {
onLoadMore: () => void;
}

const COLUMN_COUNT = 2;

const splitIntoColumns = (items: SearchOotdResponse[], columnCount: number) => {
const columns: SearchOotdResponse[][] = Array.from({ length: columnCount }, () => []);
items.forEach((item, index) => columns[index % columnCount].push(item));
Expand All @@ -24,7 +23,8 @@ const splitIntoColumns = (items: SearchOotdResponse[], columnCount: number) => {
const OotdResultGrid = ({ items, hasNext, loading, onLoadMore }: OotdResultGridProps) => {
const navigate = useNavigate();
const sentinelRef = useInfiniteScrollSentinel(hasNext, onLoadMore);
const columns = splitIntoColumns(items, COLUMN_COUNT);
const isWideLayout = useIsWideLayout();
const columns = splitIntoColumns(items, isWideLayout ? 3 : 2);

const handleClick = (id: number) => {
saveRecentOotd(id);
Expand All @@ -33,7 +33,7 @@ const OotdResultGrid = ({ items, hasNext, loading, onLoadMore }: OotdResultGridP

return (
<>
<div className="grid grid-cols-2 gap-2">
<div className="grid grid-cols-2 gap-2 md:grid-cols-3">
{columns.map((column, columnIndex) => (
<div key={columnIndex} className="flex flex-col gap-2">
{column.map((item) => (
Expand Down
8 changes: 4 additions & 4 deletions src/features/search/ui/SearchOotdResultGrid.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { useNavigate } from 'react-router-dom';
import useIsWideLayout from '@/shared/hooks/useIsWideLayout';
import { saveRecentOotd } from '../api/searchApi';
import type { SearchOotdResponse } from '../api/types';
import { useInfiniteScrollSentinel } from '../lib/useInfiniteScrollSentinel';
import SearchOotdCard from './SearchOotdCard';

const COLUMN_COUNT = 2;

const splitIntoColumns = <T,>(items: T[], columnCount: number) => {
const columns: T[][] = Array.from({ length: columnCount }, () => []);
items.forEach((item, index) => columns[index % columnCount].push(item));
Expand Down Expand Up @@ -37,7 +36,8 @@ const SearchOotdResultGrid = ({
}: SearchOotdResultGridProps) => {
const navigate = useNavigate();
const sentinelRef = useInfiniteScrollSentinel(hasNext, onLoadMore);
const columns = splitIntoColumns(items, COLUMN_COUNT);
const isWideLayout = useIsWideLayout();
const columns = splitIntoColumns(items, isWideLayout ? 3 : 2);

const handleClick = (id: number) => {
saveRecentOotd(id);
Expand All @@ -46,7 +46,7 @@ const SearchOotdResultGrid = ({

return (
<>
<div className="grid grid-cols-2 gap-2">
<div className="grid grid-cols-2 gap-2 md:grid-cols-3">
{columns.map((column, columnIndex) => (
<div key={columnIndex} className="flex flex-col gap-2">
{column.map((item) => (
Expand Down
4 changes: 2 additions & 2 deletions src/pages/camera/component/TagBBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ type Props = {

type Corner = 'nw' | 'ne' | 'sw' | 'se';

const MIN_W = 0.2; // 박스 최소 가로(이미지 가로 대비 비율)
const MIN_H = 0.15; // 박스 최소 세로(이미지 세로 대비 비율)
const MIN_W = 0.08; // 박스 최소 가로(이미지 가로 대비 비율)
const MIN_H = 0.06; // 박스 최소 세로(이미지 세로 대비 비율)
const clamp = (v: number, min: number, max: number) => Math.min(Math.max(v, min), max);

// 이미지 위 태그: 말풍선은 항상 표시, 누르면 활성화되어 박스(+스포트라이트)가 뜨고
Expand Down
4 changes: 4 additions & 0 deletions src/pages/camera/component/TagResultSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ const TagResultSheet = ({
</div>
))}
</div>
) : filtered.length === 0 ? (
<div className="flex flex-col items-center justify-center py-10 text-center">
<p className="text-body-2 text-text-secondary">유사한 아이템이 없습니다.</p>
</div>
) : (
<div className="flex flex-col gap-2">
{filtered.map((item) => (
Expand Down
6 changes: 5 additions & 1 deletion src/pages/ootd/OotdDetailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,11 @@ const OotdDetailPage = () => {
onConfirm={handleDiscardConfirm}
/>

{isSaving && <TagLoading title="게시물 수정 중입니다!!!" />}
{isSaving && (
<div className="bg-bg-white fixed inset-0 z-50 overflow-hidden">
<TagLoading title="게시물을 수정하고 있어요!" />
</div>
)}

<Toast message={toastMessage} onClose={hideToast} />
</div>
Expand Down
7 changes: 4 additions & 3 deletions src/pages/ootd/components/ViewHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { ChevronLeft, Menu } from 'lucide-react';
import { Menu } from 'lucide-react';
import { leftArrow } from '@/shared/assets';

export interface ViewHeaderProps {
onBack: () => void;
onMoreClick: () => void;
}

const ViewHeader = ({ onBack, onMoreClick }: ViewHeaderProps) => (
<div className="bg-bg-white sticky top-0 z-30 flex items-center justify-between px-4 py-3">
<div className="bg-bg-white sticky top-0 z-30 flex items-center justify-between py-3">
<button type="button" onClick={onBack} aria-label="뒤로가기">
<ChevronLeft size={24} className="text-text-primary" />
<img src={leftArrow} alt="" className="size-5" />
</button>
<button type="button" onClick={onMoreClick} aria-label="더보기">
<Menu size={22} className="text-text-primary" />
Expand Down
Loading