Repository navigation
feat(route): 웹 동선보기 장소 이동 네비게이션 추가 #241
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,87 @@ | ||
| // @vitest-environment jsdom | ||
| import { act } from "react"; | ||
| import { createRoot, type Root } from "react-dom/client"; | ||
| import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; | ||
| import { afterEach, beforeEach, expect, it, vi } from "vitest"; | ||
|
|
||
| import type { PlanPlace } from "@/lib/plan/types"; | ||
| import { scheduleItemsQueryKey } from "@/lib/query-keys"; | ||
| import { PLAN_MAP_FOCUS_NO_LOCATION_MESSAGE, usePlanMapFocusStore } from "@/stores/plan-map-focus-store"; | ||
|
|
||
| import { PlanRouteStepper } from "./PlanRouteStepper"; | ||
|
|
||
| const state = vi.hoisted(() => ({ select: vi.fn(), toast: vi.fn() })); | ||
| vi.mock("@/hooks/useRooms", () => ({ useRoomSchedules: () => ({ isSuccess: true }) })); | ||
| vi.mock("@/contexts/SelectedPlaceContext", () => ({ useSelectedPlace: () => ({ setSelectedPlace: state.select }) })); | ||
| vi.mock("sonner", () => ({ toast: { info: state.toast } })); | ||
|
|
||
| Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true }); | ||
| const places: PlanPlace[] = [ | ||
| { id: "a", title: "A", itemId: 1, googlePlaceId: "ga", location: { lat: 1, lng: 1 } }, | ||
| { id: "b", title: "B", itemId: 2, googlePlaceId: "gb", location: { lat: 2, lng: 2 } }, | ||
| { id: "c", title: "C", itemId: 3, googlePlaceId: "gc" }, | ||
| ]; | ||
| let host: HTMLDivElement; | ||
| let root: Root; | ||
| const group = () => host.querySelector<HTMLElement>('[role="group"][aria-label="장소 이동"]'); | ||
| const button = (label: string) => group()!.querySelector<HTMLButtonElement>(`button[aria-label="${label}"]`)!; | ||
| const position = () => group()!.querySelector("p > span[aria-hidden]")!.textContent; | ||
| function focusItem(itemId: number) { | ||
| usePlanMapFocusStore.setState({ | ||
| focus: { roomId: "room", scheduleId: 10, itemId, googlePlaceId: null, location: null, source: "card", seq: 1 }, | ||
| }); | ||
| } | ||
|
|
||
| beforeEach(async () => { | ||
| state.select.mockReset(); | ||
| state.toast.mockReset(); | ||
| const queryClient = new QueryClient(); | ||
| queryClient.setQueryData(scheduleItemsQueryKey("room", 10), places); | ||
| host = document.createElement("div"); | ||
| document.body.append(host); | ||
| root = createRoot(host); | ||
| usePlanMapFocusStore.setState({ focus: null }); | ||
| await act(async () => | ||
| root.render( | ||
| <QueryClientProvider client={queryClient}> | ||
| <PlanRouteStepper roomId="room" /> | ||
| </QueryClientProvider>, | ||
| ), | ||
| ); | ||
| }); | ||
| afterEach(async () => { | ||
| await act(async () => root.unmount()); | ||
| host.remove(); | ||
| }); | ||
|
|
||
| it("is hidden until a place of the itinerary is focused", () => { | ||
| expect(group()).toBeNull(); | ||
| }); | ||
|
|
||
| it("shows the order within the day and disables the edge buttons", async () => { | ||
| await act(async () => focusItem(1)); | ||
| expect(position()).toBe("1/3"); | ||
| expect(button("이전 장소").disabled).toBe(true); | ||
| expect(button("다음 장소").disabled).toBe(false); | ||
| await act(async () => focusItem(3)); | ||
| expect(position()).toBe("3/3"); | ||
| expect(button("다음 장소").disabled).toBe(true); | ||
| }); | ||
|
|
||
| it("moves the focus like a card click without opening the detail and asks the list to reveal it", async () => { | ||
| await act(async () => focusItem(1)); | ||
| await act(async () => button("다음 장소").click()); | ||
| expect(usePlanMapFocusStore.getState().focus).toMatchObject({ | ||
| roomId: "room", scheduleId: 10, itemId: 2, googlePlaceId: "gb", location: { lat: 2, lng: 2 }, source: "stepper", | ||
| }); | ||
| expect(state.select).toHaveBeenCalledWith(null); | ||
| expect(position()).toBe("2/3"); | ||
| expect(state.toast).not.toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it("keeps places without a location in the order and tells the user the map cannot move", async () => { | ||
| await act(async () => focusItem(2)); | ||
| await act(async () => button("다음 장소").click()); | ||
| expect(usePlanMapFocusStore.getState().focus).toMatchObject({ itemId: 3, location: null, source: "stepper" }); | ||
| expect(state.toast).toHaveBeenCalledWith(PLAN_MAP_FOCUS_NO_LOCATION_MESSAGE); | ||
| }); |
This file contains hidden or 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,95 @@ | ||
| "use client"; | ||
|
|
||
| import { useQuery, useQueryClient } from "@tanstack/react-query"; | ||
| import { toast } from "sonner"; | ||
|
|
||
| import { ChevronLeftIcon } from "@/assets/icons"; | ||
| import { useSelectedPlace } from "@/contexts/SelectedPlaceContext"; | ||
| import { useRoomSchedules } from "@/hooks/useRooms"; | ||
| import { readSchedulePlanPlacesFromCache } from "@/lib/plan/scheduleItemPlaces"; | ||
| import { scheduleItemsQueryKey } from "@/lib/query-keys"; | ||
| import { | ||
| PLAN_MAP_FOCUS_NO_LOCATION_MESSAGE, | ||
| planPlaceFocusTarget, | ||
| usePlanMapFocusStore, | ||
| } from "@/stores/plan-map-focus-store"; | ||
|
|
||
| /** 좌우 버튼 — 누를 수 있는 영역이 숫자와 구분되도록 올리거나 누르면 둥근 배경을 깐다. 높이는 테두리 안쪽을 채운다 */ | ||
| const STEP_BUTTON_CLASS = | ||
| "flex h-full w-12 items-center justify-center rounded-full text-primary transition-colors enabled:cursor-pointer enabled:hover:bg-fill enabled:active:bg-fill-strong disabled:text-icon-disabled focus-visible:outline-2 focus-visible:outline-offset-[-2px] focus-visible:outline-primary"; | ||
|
|
||
| /** | ||
| * 웹 동선보기 장소 이동 — 일정에서 고른 장소의 일차 안에서 이전·다음 장소로 넘긴다(Figma 6035:865). | ||
| * 넘기면 카드를 누른 것처럼 카드·번호 핀 강조와 지도 중심을 바꾸고 상세는 열지 않는다. 일정 목록은 그 카드로 스크롤한다. | ||
| * 순서는 카드·번호 핀과 같은 일차 장소 순서다. | ||
| */ | ||
| export function PlanRouteStepper({ roomId }: Readonly<{ roomId: string | null }>) { | ||
| const rid = typeof roomId === "string" ? roomId.trim() : ""; | ||
| const queryClient = useQueryClient(); | ||
| const { isSuccess: schedulesHydrated } = useRoomSchedules(rid || null); | ||
| const { setSelectedPlace } = useSelectedPlace(); | ||
| const focus = usePlanMapFocusStore((s) => (s.focus && s.focus.roomId === rid ? s.focus : null)); | ||
|
Check warning on line 31 in src/components/map/PlanRouteStepper.tsx
|
||
| const focusPlace = usePlanMapFocusStore((s) => s.focusPlace); | ||
| const scheduleId = focus?.scheduleId ?? null; | ||
|
|
||
| // 지도 경로(`PlanItineraryMapRoutes`)와 같은 일정 항목 캐시를 읽는다 — 따로 조회하지 않는다 | ||
| const { data: places = [] } = useQuery({ | ||
| queryKey: scheduleItemsQueryKey(rid || null, scheduleId), | ||
| queryFn: () => (scheduleId === null ? [] : readSchedulePlanPlacesFromCache(queryClient, rid, scheduleId)), | ||
| enabled: rid.length > 0 && scheduleId !== null && schedulesHydrated, | ||
| staleTime: Infinity, | ||
| refetchOnMount: false, | ||
| refetchOnWindowFocus: false, | ||
| }); | ||
|
|
||
| const index = focus ? places.findIndex((place) => place.itemId === focus.itemId) : -1; | ||
| if (scheduleId === null || index < 0) return null; | ||
|
|
||
| const current = index + 1; | ||
| const total = places.length; | ||
| const moveTo = (nextIndex: number) => { | ||
| const place = places[nextIndex]; | ||
| const target = place ? planPlaceFocusTarget(place, rid, scheduleId, "stepper") : null; | ||
| if (!target) return; | ||
| setSelectedPlace(null); | ||
| focusPlace(target); | ||
|
Comment on lines
+54
to
+55
Member
There was a problem hiding this comment. [P2] 접힌 일차를 펼친 뒤 대상 카드로 이동해 주세요 장소가 두 곳 이상인 일차에서 카드를 선택하고 해당 일차를 접은 뒤 ‘다음 장소’를 누르면, 지도와 순서만 바뀌고 대상 카드는 보이지 않습니다. 일차 접기는 선택 상태를 유지하므로 스테퍼는 계속 사용할 수 있지만, 접힌 일차의 지도 핀 선택에도 같은 한계가 기존부터 있었지만, 이번에 추가한 스테퍼 역시 이 상태에서 동작하면서 약속한 카드 표시·스크롤을 수행하지 못합니다. 스테퍼 이동 시 대상 일차가 접혀 있으면 먼저 펼치고, 카드가 표시된 뒤 스크롤되도록 처리해 주세요. |
||
| if (!target.location) toast.info(PLAN_MAP_FOCUS_NO_LOCATION_MESSAGE); | ||
| }; | ||
|
|
||
| return ( | ||
| <div | ||
| role="group" | ||
| aria-label="장소 이동" | ||
| className="pointer-events-auto flex h-11 items-center gap-1 rounded-full border border-border bg-fill-elevate shadow-[0_2px_10px_rgba(0,0,0,0.1)]" | ||
| > | ||
|
Check warning on line 64 in src/components/map/PlanRouteStepper.tsx
|
||
| <button | ||
| type="button" | ||
| aria-label="이전 장소" | ||
| disabled={index === 0} | ||
| onClick={() => moveTo(index - 1)} | ||
| className={STEP_BUTTON_CLASS} | ||
| > | ||
| <ChevronLeftIcon size={20} /> | ||
| </button> | ||
| <p aria-live="polite" className="whitespace-nowrap text-text tabular-nums"> | ||
| <span aria-hidden className="flex items-center gap-1"> | ||
| <span className="text-label-l-emphasis">{current}</span> | ||
| <span className="text-label-m-regular">/</span> | ||
| <span className="text-label-l-emphasis">{total}</span> | ||
| </span> | ||
| <span className="sr-only"> | ||
| 전체 {total}곳 중 {current}번째 장소 | ||
| </span> | ||
| </p> | ||
| <button | ||
| type="button" | ||
| aria-label="다음 장소" | ||
| disabled={index === total - 1} | ||
| onClick={() => moveTo(index + 1)} | ||
| className={STEP_BUTTON_CLASS} | ||
| > | ||
| <ChevronLeftIcon size={20} className="rotate-180" /> | ||
| </button> | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
[P2] 재검색 버튼과 스테퍼의 위치를 분리해 주세요
카테고리 검색을 완료한 뒤 검색 중심에서 충분히 떨어진 일정 카드를 선택하면 두 버튼이 함께 표시됩니다.
PlanPlaceCard의setSelectedPlace(null); focusPlace(target);는 상세만 닫고 카테고리와discoverSnapshot을 유지합니다. 이후 지도 중심이 이동하면usePlacesSearchHereVisible의 재검색 조건이 성립합니다.이때 스테퍼는 하단 중앙의
bottom-6 z-[16]에 놓이는데,SearchHereFloatingButton.tsx:17도 같은 하단 중앙에bottom-6 left-1/2 z-[17]로 표시됩니다. 더 높은 재검색 버튼이 순서 표시와 겹치는 조작 영역을 가려, 장소 이동을 누르려다 검색이 실행될 수 있습니다. 두 기능이 함께 활성화되어도 표시·클릭 영역이 겹치지 않도록 배치해 주세요.