diff --git a/apps/timo-web/components/timer/TimerExtendModalPanel.tsx b/apps/timo-web/components/timer/TimerExtendModalPanel.tsx index 348957a6..7420cbb4 100644 --- a/apps/timo-web/components/timer/TimerExtendModalPanel.tsx +++ b/apps/timo-web/components/timer/TimerExtendModalPanel.tsx @@ -1,7 +1,9 @@ -import { Modal } from "@repo/timo-design-system/ui"; +import { Modal, ModalButton } from "@repo/timo-design-system/ui"; import { cn } from "@repo/timo-design-system/utils"; import { useTranslations } from "next-intl"; +import { extendTimerBodyExtendMinutesMax } from "@/api/generated/endpoints/timer/timer.zod"; + export type ExtendTimePreset = 10 | 30 | 60 | "custom"; type ExtendPresetLabelKey = @@ -18,8 +20,6 @@ const PRESET_OPTIONS: { { preset: 60, labelKey: "presetOneHour" }, ]; -const MAX_CUSTOM_MINUTES = 720; - const CHIP_FOCUS_BORDER_CLASS = "border-2 border-transparent focus-visible:border-timo-blue-300 outline-none"; @@ -31,6 +31,8 @@ export interface TimerExtendModalPanelProps { onClose: () => void; onSubmit: () => void; canSubmit: boolean; + /** 이전에 노출되던 팝업(End 모달)으로 돌아갈 수 있는 경우에만 true — 이 경우 닫기 버튼이 모달 자체를 닫지 않고 onClose에서 이전 단계로 전환한다 */ + canGoBack: boolean; } export const TimerExtendModalPanel = ({ @@ -41,6 +43,7 @@ export const TimerExtendModalPanel = ({ onClose, onSubmit, canSubmit, + canGoBack, }: TimerExtendModalPanelProps) => { const t = useTranslations("Focus.extendModal"); const isCustomSelected = selectedPreset === "custom"; @@ -79,7 +82,12 @@ export const TimerExtendModalPanel = ({ const clamped = digitsOnly === "" ? "" - : String(Math.min(Number(digitsOnly), MAX_CUSTOM_MINUTES)); + : String( + Math.min( + Number(digitsOnly), + extendTimerBodyExtendMinutesMax, + ), + ); onCustomMinutesChange(clamped); }} @@ -106,9 +114,19 @@ export const TimerExtendModalPanel = ({
- - {t("closeButton")} - + {canGoBack ? ( + + {t("closeButton")} + + ) : ( + + {t("closeButton")} + + )} { setSelectedPreset(null); @@ -71,6 +72,7 @@ export const TimerSessionControls = forwardRef< if (minutes > 0) onExtend(minutes); resetExtendSelection(); + setIsFromEndModal(false); }; const canSubmitExtend = @@ -85,6 +87,7 @@ export const TimerSessionControls = forwardRef< onOpenEndModal={() => setStep(isRunning ? "stop" : "end")} onOpenExtendModal={() => { resetExtendSelection(); + setIsFromEndModal(false); setStep("extend"); }} /> @@ -100,6 +103,7 @@ export const TimerSessionControls = forwardRef< { resetExtendSelection(); + setIsFromEndModal(true); setStep("extend"); }} onComplete={() => setStep("complete")} @@ -120,9 +124,16 @@ export const TimerSessionControls = forwardRef< if (preset !== "custom") setCustomMinutes(""); }} onCustomMinutesChange={setCustomMinutes} - onClose={resetExtendSelection} + onClose={() => { + resetExtendSelection(); + if (isFromEndModal) { + setIsFromEndModal(false); + setStep("end"); + } + }} onSubmit={handleSubmitExtend} canSubmit={canSubmitExtend} + canGoBack={isFromEndModal} /> )} {step === "complete" && ( diff --git a/apps/timo-web/messages/ko.json b/apps/timo-web/messages/ko.json index 5eda8446..68e3cd22 100644 --- a/apps/timo-web/messages/ko.json +++ b/apps/timo-web/messages/ko.json @@ -198,8 +198,9 @@ "title": "지금 멈출까요?", "description": "지금까지 수행한 {minutes}이 타임박스에 기록됩니다.", "continueButton": "계속 진행", - "switchButton": "전환하기" + "switchButton": "완료하기" }, + "completeModal": { "title": "태스크가 완료되었어요!", "defaultFeedback": "이번 작업을 완료했어요. 수고하셨어요!",