fix(a11y): #301+#302 모달 접근성 + race condition + 필터 상태 동기화
CRITICAL — 모달 접근성: - frontend/src/lib/hooks/useModalA11y.ts 신규 (useEscapeKey, useFocusTrap, useBodyScrollLock) - BottomSheet: role='dialog' / aria-modal / aria-label / ESC 닫기 / focus trap - FilterSheet: role='dialog' / aria-modal / aria-labelledby / ESC 닫기 / focus trap, 닫기 버튼 aria-label MAJOR — race condition (#301): - RestaurantDetail useEffect에 cancelled 플래그 추가 → restaurant.id 변경 시 이전 fetch 결과 폐기 MAJOR — 필터 상태 동기화 (#302): - page.tsx에 exitSearchMode 헬퍼 추가 - 검색 모드(isSearchResult=true)에서 cuisine/price/country/city/district 변경 시 자동으로 검색 모드 해제 + 원본 restaurants 재로드 후속 분리: #319(BottomSheet 매직넘버/UX), #320(필터 정밀도/접근성/테스트) Refs: #301 #302
This commit is contained in:
@@ -13,9 +13,10 @@ import RestaurantDetail from "@/components/RestaurantDetail";
|
|||||||
import MyReviewsList from "@/components/MyReviewsList";
|
import MyReviewsList from "@/components/MyReviewsList";
|
||||||
import BottomSheet from "@/components/BottomSheet";
|
import BottomSheet from "@/components/BottomSheet";
|
||||||
import FilterSheet, { FilterOption } from "@/components/FilterSheet";
|
import FilterSheet, { FilterOption } from "@/components/FilterSheet";
|
||||||
import { getCuisineIcon, getTablerCuisineIcon } from "@/lib/cuisine-icons";
|
import { getCuisineIcon, getPhosphorCuisineIcon } from "@/lib/cuisine-icons";
|
||||||
import Icon from "@/components/Icon";
|
import Icon from "@/components/Icon";
|
||||||
import * as TablerIcons from "@tabler/icons-react";
|
import FoodIcon from "@/components/FoodIcon";
|
||||||
|
import * as PhosphorIcons from "@phosphor-icons/react";
|
||||||
|
|
||||||
function useDragScroll() {
|
function useDragScroll() {
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
@@ -73,16 +74,24 @@ function matchCuisineFilter(cuisineType: string | null, filter: string): boolean
|
|||||||
|
|
||||||
const PRICE_GROUPS: { label: string; test: (p: string) => boolean }[] = [
|
const PRICE_GROUPS: { label: string; test: (p: string) => boolean }[] = [
|
||||||
{
|
{
|
||||||
label: "저렴 (~1만원)",
|
label: "저렴 (~5천원)",
|
||||||
test: (p) => /저렴|가성비|착한|만원 이하|[3-9]천원|^\d[,.]?\d*천원/.test(p) || /^[1]만원대$/.test(p) || /^[5-9],?\d{3}원/.test(p),
|
test: (p) => /저렴|착한|[3-5]천원대?$|^\d천원$/.test(p),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "가성비 (5천~1만원)",
|
||||||
|
test: (p) => /가성비|만원 이하|[6-9]천원|^1만원대$|^[5-9],?\d{3}원/.test(p),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "보통 (1~3만원)",
|
label: "보통 (1~3만원)",
|
||||||
test: (p) => /[1-2]만원대|1-[23]만|인당 [12]\d?,?\d*원|1[2-9],?\d{3}원|2[0-9],?\d{3}원/.test(p),
|
test: (p) => /[1-2]만원대|1-[23]만|인당 [12]\d?,?\d*원|1[2-9],?\d{3}원|2[0-9],?\d{3}원/.test(p),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "고가 (3만원~)",
|
label: "프리미엄 (3~5만원)",
|
||||||
test: (p) => /[3-9]만원|고가|높은|묵직|살벌|10만원|5만원|4만원|6만원/.test(p),
|
test: (p) => /[3-4]만원대?|3-[45]만|인당 [34]\d?,?\d*원|3[0-9],?\d{3}원|4[0-9],?\d{3}원/.test(p),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "럭셔리 (5만원~)",
|
||||||
|
test: (p) => /[5-9]만원|고가|10만원|[1-9]\d만원|인당 [5-9]\d?,?\d*원|5[0-9],?\d{3}원|[6-9][0-9],?\d{3}원/.test(p),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -304,16 +313,18 @@ export default function Home() {
|
|||||||
api.recordVisit().then(() => api.getVisits().then(setVisits)).catch(console.error);
|
api.recordVisit().then(() => api.getVisits().then(setVisits)).catch(console.error);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
// Load all restaurants on mount
|
// Load restaurants on mount and when channel filter changes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setIsSearchResult(false);
|
setIsSearchResult(false);
|
||||||
|
const params: { limit: number; channel?: string } = { limit: 500 };
|
||||||
|
if (channelFilter) params.channel = channelFilter;
|
||||||
api
|
api
|
||||||
.getRestaurants({ limit: 500 })
|
.getRestaurants(params)
|
||||||
.then(setRestaurants)
|
.then(setRestaurants)
|
||||||
.catch(console.error)
|
.catch(console.error)
|
||||||
.finally(() => setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
}, []);
|
}, [channelFilter]);
|
||||||
|
|
||||||
// Auto-select region from user's geolocation (once)
|
// Auto-select region from user's geolocation (once)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -393,7 +404,16 @@ export default function Home() {
|
|||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// 검색결과 모드에서 필터 변경 시 검색 결과가 무시되는 결함(#302) 해결.
|
||||||
|
// 검색 모드 플래그를 풀고 원본 restaurants를 다시 로드한다.
|
||||||
|
const exitSearchMode = useCallback(() => {
|
||||||
|
setIsSearchResult(false);
|
||||||
|
setResetCount((c) => c + 1);
|
||||||
|
api.getRestaurants({ limit: 500 }).then(setRestaurants).catch(() => {});
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleCountryChange = useCallback((country: string) => {
|
const handleCountryChange = useCallback((country: string) => {
|
||||||
|
if (isSearchResult) exitSearchMode();
|
||||||
setCountryFilter(country);
|
setCountryFilter(country);
|
||||||
setCityFilter("");
|
setCityFilter("");
|
||||||
setDistrictFilter("");
|
setDistrictFilter("");
|
||||||
@@ -404,9 +424,10 @@ export default function Home() {
|
|||||||
return p && p.country === country;
|
return p && p.country === country;
|
||||||
});
|
});
|
||||||
setRegionFlyTo(computeFlyTo(matched));
|
setRegionFlyTo(computeFlyTo(matched));
|
||||||
}, [restaurants]);
|
}, [restaurants, isSearchResult, exitSearchMode]);
|
||||||
|
|
||||||
const handleCityChange = useCallback((city: string) => {
|
const handleCityChange = useCallback((city: string) => {
|
||||||
|
if (isSearchResult) exitSearchMode();
|
||||||
setCityFilter(city);
|
setCityFilter(city);
|
||||||
setDistrictFilter("");
|
setDistrictFilter("");
|
||||||
if (!city) {
|
if (!city) {
|
||||||
@@ -423,9 +444,10 @@ export default function Home() {
|
|||||||
return p && p.country === countryFilter && p.city === city;
|
return p && p.country === countryFilter && p.city === city;
|
||||||
});
|
});
|
||||||
setRegionFlyTo(computeFlyTo(matched));
|
setRegionFlyTo(computeFlyTo(matched));
|
||||||
}, [restaurants, countryFilter]);
|
}, [restaurants, countryFilter, isSearchResult, exitSearchMode]);
|
||||||
|
|
||||||
const handleDistrictChange = useCallback((district: string) => {
|
const handleDistrictChange = useCallback((district: string) => {
|
||||||
|
if (isSearchResult) exitSearchMode();
|
||||||
setDistrictFilter(district);
|
setDistrictFilter(district);
|
||||||
if (!district) {
|
if (!district) {
|
||||||
const matched = restaurants.filter((r) => {
|
const matched = restaurants.filter((r) => {
|
||||||
@@ -440,7 +462,7 @@ export default function Home() {
|
|||||||
return p && p.country === countryFilter && p.city === cityFilter && p.district === district;
|
return p && p.country === countryFilter && p.city === cityFilter && p.district === district;
|
||||||
});
|
});
|
||||||
setRegionFlyTo(computeFlyTo(matched));
|
setRegionFlyTo(computeFlyTo(matched));
|
||||||
}, [restaurants, countryFilter, cityFilter]);
|
}, [restaurants, countryFilter, cityFilter, isSearchResult, exitSearchMode]);
|
||||||
|
|
||||||
const handleReset = useCallback(() => {
|
const handleReset = useCallback(() => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -789,10 +811,10 @@ export default function Home() {
|
|||||||
{(cuisineFilter || priceFilter) && (
|
{(cuisineFilter || priceFilter) && (
|
||||||
<button
|
<button
|
||||||
onClick={() => { setCuisineFilter(""); setPriceFilter(""); }}
|
onClick={() => { setCuisineFilter(""); setPriceFilter(""); }}
|
||||||
className="text-gray-400 hover:text-brand-500 transition-colors"
|
className="p-1.5 -mr-1 text-gray-400 hover:text-brand-500 transition-colors touch-manipulation"
|
||||||
title="음식 필터 초기화"
|
title="음식 필터 초기화"
|
||||||
>
|
>
|
||||||
<Icon name="close" size={12} />
|
<Icon name="close" size={14} />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -848,10 +870,10 @@ export default function Home() {
|
|||||||
{countryFilter && (
|
{countryFilter && (
|
||||||
<button
|
<button
|
||||||
onClick={() => { setCountryFilter(""); setCityFilter(""); setDistrictFilter(""); setRegionFlyTo(null); }}
|
onClick={() => { setCountryFilter(""); setCityFilter(""); setDistrictFilter(""); setRegionFlyTo(null); }}
|
||||||
className="text-gray-400 hover:text-brand-500 transition-colors"
|
className="p-1.5 -mr-1 text-gray-400 hover:text-brand-500 transition-colors touch-manipulation"
|
||||||
title="지역 필터 초기화"
|
title="지역 필터 초기화"
|
||||||
>
|
>
|
||||||
<Icon name="close" size={12} />
|
<Icon name="close" size={14} />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -867,9 +889,9 @@ export default function Home() {
|
|||||||
setDistrictFilter("");
|
setDistrictFilter("");
|
||||||
setRegionFlyTo(null);
|
setRegionFlyTo(null);
|
||||||
}}
|
}}
|
||||||
className="flex items-center gap-1 rounded-lg px-2 py-1 bg-gray-50 dark:bg-gray-800/50 text-gray-500 dark:text-gray-400 hover:text-brand-500 transition-colors"
|
className="flex items-center gap-1 rounded-lg px-2.5 py-1.5 bg-gray-50 dark:bg-gray-800/50 text-gray-500 dark:text-gray-400 hover:text-brand-500 transition-colors touch-manipulation"
|
||||||
>
|
>
|
||||||
<Icon name="close" size={12} />
|
<Icon name="close" size={14} />
|
||||||
<span>전체보기</span>
|
<span>전체보기</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
@@ -999,10 +1021,10 @@ export default function Home() {
|
|||||||
<div ref={dg.ref} onMouseDown={dg.onMouseDown} onMouseMove={dg.onMouseMove} onMouseUp={dg.onMouseUp} onMouseLeave={dg.onMouseLeave} onClickCapture={dg.onClickCapture} style={dg.style} className="flex gap-2 overflow-x-auto scrollbar-hide -mx-1 px-1 pb-1 select-none">
|
<div ref={dg.ref} onMouseDown={dg.onMouseDown} onMouseMove={dg.onMouseMove} onMouseUp={dg.onMouseUp} onMouseLeave={dg.onMouseLeave} onClickCapture={dg.onClickCapture} style={dg.style} className="flex gap-2 overflow-x-auto scrollbar-hide -mx-1 px-1 pb-1 select-none">
|
||||||
{(() => {
|
{(() => {
|
||||||
const allCards = [
|
const allCards = [
|
||||||
{ label: "전체", value: "", icon: "Bowl" },
|
{ label: "전체", value: "", icon: "ForkKnife" },
|
||||||
...CUISINE_TAXONOMY.flatMap((g) => [
|
...CUISINE_TAXONOMY.flatMap((g) => [
|
||||||
{ label: g.category, value: g.category, icon: getTablerCuisineIcon(g.category) },
|
{ label: g.category, value: g.category, icon: getPhosphorCuisineIcon(g.category) },
|
||||||
...g.items.map((item) => ({ label: item, value: `${g.category}|${item}`, icon: getTablerCuisineIcon(`${g.category}|${item}`) })),
|
...g.items.map((item) => ({ label: item, value: `${g.category}|${item}`, icon: getPhosphorCuisineIcon(`${g.category}|${item}`) })),
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
return allCards.map((card) => {
|
return allCards.map((card) => {
|
||||||
@@ -1012,7 +1034,7 @@ export default function Home() {
|
|||||||
: isCategory
|
: isCategory
|
||||||
? cuisineFilter === card.value || cuisineFilter.startsWith(card.value + "|")
|
? cuisineFilter === card.value || cuisineFilter.startsWith(card.value + "|")
|
||||||
: cuisineFilter === card.value;
|
: cuisineFilter === card.value;
|
||||||
const TablerIcon = (TablerIcons as unknown as Record<string, React.ComponentType<{ size?: number; stroke?: number; className?: string }>>)[`Icon${card.icon}`] || TablerIcons.IconBowl;
|
const PhIcon = (PhosphorIcons as unknown as Record<string, React.ComponentType<{ size?: number; weight?: string; className?: string }>>)[card.icon] || PhosphorIcons.ForkKnife;
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
key={card.value || "__all__"}
|
key={card.value || "__all__"}
|
||||||
@@ -1029,7 +1051,11 @@ export default function Home() {
|
|||||||
: "bg-white border border-gray-100 text-gray-500"
|
: "bg-white border border-gray-100 text-gray-500"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<TablerIcon size={22} stroke={1.5} className={selected ? "text-white" : isCategory ? "text-brand-500" : "text-gray-400"} />
|
{card.icon.startsWith("food:") ? (
|
||||||
|
<FoodIcon name={card.icon.slice(5)} size={22} className={selected ? "text-white" : isCategory ? "text-brand-500" : "text-gray-400"} />
|
||||||
|
) : (
|
||||||
|
<PhIcon size={22} className={selected ? "text-white" : isCategory ? "text-brand-500" : "text-gray-400"} />
|
||||||
|
)}
|
||||||
<span className={`text-[11px] whitespace-nowrap ${isCategory ? "font-semibold" : "font-medium"}`}>{card.label}</span>
|
<span className={`text-[11px] whitespace-nowrap ${isCategory ? "font-semibold" : "font-medium"}`}>{card.label}</span>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
@@ -1459,7 +1485,7 @@ export default function Home() {
|
|||||||
title="음식 장르"
|
title="음식 장르"
|
||||||
options={cuisineOptions}
|
options={cuisineOptions}
|
||||||
value={cuisineFilter}
|
value={cuisineFilter}
|
||||||
onChange={(v) => { setCuisineFilter(v); if (v) setBoundsFilterOn(false); }}
|
onChange={(v) => { if (isSearchResult) exitSearchMode(); setCuisineFilter(v); if (v) setBoundsFilterOn(false); }}
|
||||||
/>
|
/>
|
||||||
<FilterSheet
|
<FilterSheet
|
||||||
open={openSheet === "price"}
|
open={openSheet === "price"}
|
||||||
@@ -1467,7 +1493,7 @@ export default function Home() {
|
|||||||
title="가격대"
|
title="가격대"
|
||||||
options={priceOptions}
|
options={priceOptions}
|
||||||
value={priceFilter}
|
value={priceFilter}
|
||||||
onChange={(v) => { setPriceFilter(v); if (v) setBoundsFilterOn(false); }}
|
onChange={(v) => { if (isSearchResult) exitSearchMode(); setPriceFilter(v); if (v) setBoundsFilterOn(false); }}
|
||||||
/>
|
/>
|
||||||
<FilterSheet
|
<FilterSheet
|
||||||
open={openSheet === "country"}
|
open={openSheet === "country"}
|
||||||
|
|||||||
@@ -1,23 +1,28 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
|
import { useEscapeKey, useFocusTrap } from "@/lib/hooks/useModalA11y";
|
||||||
|
|
||||||
interface BottomSheetProps {
|
interface BottomSheetProps {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
|
ariaLabel?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SNAP_POINTS = { PEEK: 0.4, HALF: 0.55, FULL: 0.92 };
|
const SNAP_POINTS = { PEEK: 0.4, HALF: 0.55, FULL: 0.92 };
|
||||||
const VELOCITY_THRESHOLD = 0.5;
|
const VELOCITY_THRESHOLD = 0.5;
|
||||||
|
|
||||||
export default function BottomSheet({ open, onClose, children }: BottomSheetProps) {
|
export default function BottomSheet({ open, onClose, children, ariaLabel = "상세 정보" }: BottomSheetProps) {
|
||||||
const sheetRef = useRef<HTMLDivElement>(null);
|
const sheetRef = useRef<HTMLDivElement>(null);
|
||||||
const contentRef = useRef<HTMLDivElement>(null);
|
const contentRef = useRef<HTMLDivElement>(null);
|
||||||
const [height, setHeight] = useState(SNAP_POINTS.PEEK);
|
const [height, setHeight] = useState(SNAP_POINTS.PEEK);
|
||||||
const [dragging, setDragging] = useState(false);
|
const [dragging, setDragging] = useState(false);
|
||||||
const dragState = useRef({ startY: 0, startH: 0, lastY: 0, lastTime: 0 });
|
const dragState = useRef({ startY: 0, startH: 0, lastY: 0, lastTime: 0 });
|
||||||
|
|
||||||
|
useEscapeKey(open, onClose);
|
||||||
|
useFocusTrap(open, sheetRef);
|
||||||
|
|
||||||
// Reset to peek when opened
|
// Reset to peek when opened
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (open) setHeight(SNAP_POINTS.PEEK);
|
if (open) setHeight(SNAP_POINTS.PEEK);
|
||||||
@@ -89,6 +94,10 @@ export default function BottomSheet({ open, onClose, children }: BottomSheetProp
|
|||||||
{/* Sheet */}
|
{/* Sheet */}
|
||||||
<div
|
<div
|
||||||
ref={sheetRef}
|
ref={sheetRef}
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
tabIndex={-1}
|
||||||
className="fixed bottom-0 left-0 right-0 z-50 md:hidden flex flex-col bg-surface/85 backdrop-blur-xl rounded-t-2xl shadow-2xl"
|
className="fixed bottom-0 left-0 right-0 z-50 md:hidden flex flex-col bg-surface/85 backdrop-blur-xl rounded-t-2xl shadow-2xl"
|
||||||
style={{
|
style={{
|
||||||
height: `${height * 100}vh`,
|
height: `${height * 100}vh`,
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useEffect, useRef } from "react";
|
import { useRef } from "react";
|
||||||
import Icon from "@/components/Icon";
|
import Icon from "@/components/Icon";
|
||||||
|
import { useEscapeKey, useFocusTrap, useBodyScrollLock } from "@/lib/hooks/useModalA11y";
|
||||||
|
|
||||||
export interface FilterOption {
|
export interface FilterOption {
|
||||||
label: string;
|
label: string;
|
||||||
@@ -20,12 +21,11 @@ interface FilterSheetProps {
|
|||||||
|
|
||||||
export default function FilterSheet({ open, onClose, title, options, value, onChange }: FilterSheetProps) {
|
export default function FilterSheet({ open, onClose, title, options, value, onChange }: FilterSheetProps) {
|
||||||
const sheetRef = useRef<HTMLDivElement>(null);
|
const sheetRef = useRef<HTMLDivElement>(null);
|
||||||
|
const titleId = "filter-sheet-title";
|
||||||
|
|
||||||
useEffect(() => {
|
useBodyScrollLock(open);
|
||||||
if (!open) return;
|
useEscapeKey(open, onClose);
|
||||||
document.body.style.overflow = "hidden";
|
useFocusTrap(open, sheetRef);
|
||||||
return () => { document.body.style.overflow = ""; };
|
|
||||||
}, [open]);
|
|
||||||
|
|
||||||
// Group options by group field
|
// Group options by group field
|
||||||
const grouped = options.reduce<Record<string, FilterOption[]>>((acc, opt) => {
|
const grouped = options.reduce<Record<string, FilterOption[]>>((acc, opt) => {
|
||||||
@@ -54,6 +54,10 @@ export default function FilterSheet({ open, onClose, title, options, value, onCh
|
|||||||
{/* Sheet */}
|
{/* Sheet */}
|
||||||
<div
|
<div
|
||||||
ref={sheetRef}
|
ref={sheetRef}
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
aria-labelledby={titleId}
|
||||||
|
tabIndex={-1}
|
||||||
className="fixed bottom-0 left-0 right-0 z-[61] md:hidden bg-surface rounded-t-2xl shadow-2xl max-h-[70vh] flex flex-col animate-slide-up"
|
className="fixed bottom-0 left-0 right-0 z-[61] md:hidden bg-surface rounded-t-2xl shadow-2xl max-h-[70vh] flex flex-col animate-slide-up"
|
||||||
>
|
>
|
||||||
{/* Handle */}
|
{/* Handle */}
|
||||||
@@ -63,8 +67,8 @@ export default function FilterSheet({ open, onClose, title, options, value, onCh
|
|||||||
|
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div className="flex items-center justify-between px-4 py-2 border-b border-gray-100 dark:border-gray-800 shrink-0">
|
<div className="flex items-center justify-between px-4 py-2 border-b border-gray-100 dark:border-gray-800 shrink-0">
|
||||||
<h3 className="font-bold text-base text-gray-900 dark:text-gray-100">{title}</h3>
|
<h3 id={titleId} className="font-bold text-base text-gray-900 dark:text-gray-100">{title}</h3>
|
||||||
<button onClick={onClose} className="p-1 text-gray-400 hover:text-gray-600">
|
<button onClick={onClose} aria-label="필터 닫기" className="p-2 -mr-1 text-gray-400 hover:text-gray-600">
|
||||||
<Icon name="close" size={20} />
|
<Icon name="close" size={20} />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -23,19 +23,20 @@ export default function RestaurantDetail({
|
|||||||
const [favLoading, setFavLoading] = useState(false);
|
const [favLoading, setFavLoading] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
api
|
api
|
||||||
.getRestaurantVideos(restaurant.id)
|
.getRestaurantVideos(restaurant.id)
|
||||||
.then(setVideos)
|
.then((v) => { if (!cancelled) setVideos(v); })
|
||||||
.catch(() => setVideos([]))
|
.catch(() => { if (!cancelled) setVideos([]); })
|
||||||
.finally(() => setLoading(false));
|
.finally(() => { if (!cancelled) setLoading(false); });
|
||||||
|
|
||||||
// Load favorite status if logged in
|
|
||||||
if (getToken()) {
|
if (getToken()) {
|
||||||
api.getFavoriteStatus(restaurant.id)
|
api.getFavoriteStatus(restaurant.id)
|
||||||
.then((r) => setFavorited(r.favorited))
|
.then((r) => { if (!cancelled) setFavorited(r.favorited); })
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
}
|
}
|
||||||
|
return () => { cancelled = true; };
|
||||||
}, [restaurant.id]);
|
}, [restaurant.id]);
|
||||||
|
|
||||||
const handleToggleFavorite = async () => {
|
const handleToggleFavorite = async () => {
|
||||||
@@ -57,12 +58,12 @@ export default function RestaurantDetail({
|
|||||||
<button
|
<button
|
||||||
onClick={handleToggleFavorite}
|
onClick={handleToggleFavorite}
|
||||||
disabled={favLoading}
|
disabled={favLoading}
|
||||||
className={`text-xl leading-none transition-colors ${
|
className={`p-1.5 -m-1.5 transition-colors touch-manipulation ${
|
||||||
favorited ? "text-rose-500" : "text-gray-300 dark:text-gray-600 hover:text-rose-400"
|
favorited ? "text-rose-500" : "text-gray-300 dark:text-gray-600 hover:text-rose-400"
|
||||||
}`}
|
}`}
|
||||||
title={favorited ? "찜 해제" : "찜하기"}
|
title={favorited ? "찜 해제" : "찜하기"}
|
||||||
>
|
>
|
||||||
<Icon name="favorite" size={20} filled={favorited} />
|
<Icon name="favorite" size={22} filled={favorited} />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{restaurant.business_status === "CLOSED_PERMANENTLY" && (
|
{restaurant.business_status === "CLOSED_PERMANENTLY" && (
|
||||||
@@ -218,7 +219,7 @@ export default function RestaurantDetail({
|
|||||||
<Icon name="play_circle" size={16} filled className="flex-shrink-0" />
|
<Icon name="play_circle" size={16} filled className="flex-shrink-0" />
|
||||||
{v.title}
|
{v.title}
|
||||||
</a>
|
</a>
|
||||||
{v.foods_mentioned.length > 0 && (
|
{v.foods_mentioned?.length > 0 && (
|
||||||
<div className="flex flex-wrap gap-1 mt-2">
|
<div className="flex flex-wrap gap-1 mt-2">
|
||||||
{v.foods_mentioned.map((f, i) => (
|
{v.foods_mentioned.map((f, i) => (
|
||||||
<span
|
<span
|
||||||
@@ -235,7 +236,7 @@ export default function RestaurantDetail({
|
|||||||
{v.evaluation.text}
|
{v.evaluation.text}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
{v.guests.length > 0 && (
|
{v.guests?.length > 0 && (
|
||||||
<p className="mt-1 text-xs text-gray-500 dark:text-gray-400">
|
<p className="mt-1 text-xs text-gray-500 dark:text-gray-400">
|
||||||
게스트: {v.guests.join(", ")}
|
게스트: {v.guests.join(", ")}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
74
frontend/src/lib/hooks/useModalA11y.ts
Normal file
74
frontend/src/lib/hooks/useModalA11y.ts
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
import { useEffect } from "react";
|
||||||
|
|
||||||
|
export function useEscapeKey(active: boolean, onEscape: () => void) {
|
||||||
|
useEffect(() => {
|
||||||
|
if (!active) return;
|
||||||
|
const handler = (e: KeyboardEvent) => {
|
||||||
|
if (e.key === "Escape") {
|
||||||
|
e.stopPropagation();
|
||||||
|
onEscape();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
document.addEventListener("keydown", handler);
|
||||||
|
return () => document.removeEventListener("keydown", handler);
|
||||||
|
}, [active, onEscape]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const FOCUSABLE = [
|
||||||
|
"a[href]",
|
||||||
|
"button:not([disabled])",
|
||||||
|
"input:not([disabled])",
|
||||||
|
"select:not([disabled])",
|
||||||
|
"textarea:not([disabled])",
|
||||||
|
'[tabindex]:not([tabindex="-1"])',
|
||||||
|
].join(",");
|
||||||
|
|
||||||
|
export function useFocusTrap<T extends HTMLElement>(active: boolean, containerRef: React.RefObject<T | null>) {
|
||||||
|
useEffect(() => {
|
||||||
|
if (!active) return;
|
||||||
|
const node = containerRef.current;
|
||||||
|
if (!node) return;
|
||||||
|
const previouslyFocused = document.activeElement as HTMLElement | null;
|
||||||
|
const focusables = () => Array.from(node.querySelectorAll<HTMLElement>(FOCUSABLE));
|
||||||
|
const first = focusables()[0];
|
||||||
|
first?.focus();
|
||||||
|
const handler = (e: KeyboardEvent) => {
|
||||||
|
if (e.key !== "Tab") return;
|
||||||
|
const list = focusables();
|
||||||
|
if (list.length === 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const head = list[0];
|
||||||
|
const tail = list[list.length - 1];
|
||||||
|
const current = document.activeElement as HTMLElement | null;
|
||||||
|
if (e.shiftKey) {
|
||||||
|
if (current === head || !node.contains(current)) {
|
||||||
|
e.preventDefault();
|
||||||
|
tail.focus();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (current === tail) {
|
||||||
|
e.preventDefault();
|
||||||
|
head.focus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
document.addEventListener("keydown", handler);
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener("keydown", handler);
|
||||||
|
previouslyFocused?.focus();
|
||||||
|
};
|
||||||
|
}, [active, containerRef]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useBodyScrollLock(active: boolean) {
|
||||||
|
useEffect(() => {
|
||||||
|
if (!active) return;
|
||||||
|
const prev = document.body.style.overflow;
|
||||||
|
document.body.style.overflow = "hidden";
|
||||||
|
return () => {
|
||||||
|
document.body.style.overflow = prev;
|
||||||
|
};
|
||||||
|
}, [active]);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user