Feat/matching importatnt #55
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| "use client"; | ||
| import { ArrowUpToLine } from "lucide-react"; | ||
| import React from "react"; | ||
| import { createPortal } from "react-dom"; | ||
| import { | ||
| Drawer, | ||
| DrawerClose, | ||
|
|
@@ -11,56 +12,315 @@ import { | |
| } from "@/components/ui/drawer"; | ||
| import { ImportantOption } from "@/lib/types/matching"; | ||
| import { cn } from "@/lib/utils"; | ||
| import MatchingOptionCard from "./MatchingOptionCard"; | ||
|
|
||
| interface ImportantOptionDrawerProps { | ||
| trigger: React.ReactNode; | ||
| onSelect: (option: ImportantOption | null) => void; | ||
| selectedOption?: ImportantOption | null; | ||
| selections?: Record<ImportantOption, string>; | ||
| } | ||
|
|
||
| const OPTIONS: { label: string; value: ImportantOption }[] = [ | ||
| { label: "MBTI", value: "MBTI" }, | ||
| { label: "관심사", value: "HOBBY" }, | ||
| { label: "나이", value: "AGE" }, | ||
| { label: "연락빈도", value: "CONTACT" }, | ||
| ]; | ||
|
|
||
| function TypingText({ | ||
| text, | ||
| speed = 30, | ||
| onComplete, | ||
| }: { | ||
| text: string; | ||
| speed?: number; | ||
| onComplete?: () => void; | ||
| }) { | ||
| const [displayedText, setDisplayedText] = React.useState(""); | ||
|
|
||
| React.useEffect(() => { | ||
| setDisplayedText(""); | ||
| let i = 0; | ||
| const timer = setInterval(() => { | ||
| setDisplayedText(text.slice(0, i + 1)); | ||
| i++; | ||
| if (i >= text.length) { | ||
| clearInterval(timer); | ||
| onComplete?.(); | ||
| } | ||
| }, speed); | ||
| return () => clearInterval(timer); | ||
| }, [text, speed, onComplete]); | ||
|
|
||
| return <>{displayedText}</>; | ||
| } | ||
|
Comment on lines
+31
to
57
Contributor
There was a problem hiding this comment. TypingText 컴포넌트는 범용적으로 재사용될 가능성이 높은 UI 컴포넌트입니다. 현재 파일의 크기가 200줄을 초과하고 있으므로, 관심사 분리와 재사용성 향상을 위해 이 컴포넌트를 별도의 파일(예: References
|
||
|
|
||
| export default function ImportantOptionDrawer({ | ||
| trigger, | ||
| onSelect, | ||
| selectedOption, | ||
| selections = { | ||
| MBTI: "", | ||
| AGE: "", | ||
| HOBBY: "", | ||
| CONTACT: "", | ||
| }, | ||
| }: ImportantOptionDrawerProps) { | ||
| const [dragState, setDragState] = React.useState<{ | ||
| option: ImportantOption | null; | ||
| x: number; | ||
| y: number; | ||
| width: number; | ||
| height: number; | ||
| offsetX: number; | ||
| offsetY: number; | ||
| isOverZone: boolean; | ||
| }>({ | ||
| option: null, | ||
| x: 0, | ||
| y: 0, | ||
| width: 0, | ||
| height: 0, | ||
| offsetX: 0, | ||
| offsetY: 0, | ||
| isOverZone: false, | ||
| }); | ||
| const [typingStep, setTypingStep] = React.useState(0); | ||
| const isMounted = React.useRef(false); | ||
|
|
||
| const dropZoneRef = React.useRef<HTMLDivElement>(null); | ||
| const dropZoneRectRef = React.useRef<DOMRect | null>(null); | ||
|
|
||
| const selectedItem = OPTIONS.find((opt) => opt.value === selectedOption); | ||
| const remainingOptions = OPTIONS.filter( | ||
| (opt) => opt.value !== selectedOption, | ||
| ); | ||
|
|
||
| React.useEffect(() => { | ||
| if (selectedOption) { | ||
| if (!isMounted.current) { | ||
| setTypingStep(2); // 이미 선택된 상태로 진입 시 완성된 상태로 시작 | ||
| } else { | ||
| setTypingStep(1); // 드롭 등으로 새롭게 선택된 경우 애니메이션 시작 | ||
| } | ||
| } else { | ||
| setTypingStep(0); | ||
| } | ||
| isMounted.current = true; | ||
| }, [selectedOption]); | ||
|
|
||
| const handleStep1Complete = React.useCallback(() => { | ||
| setTypingStep(2); | ||
| }, []); | ||
|
|
||
| const handlePointerMove = (e: React.PointerEvent) => { | ||
| if (!dragState.option) return; | ||
|
|
||
| const x = e.clientX; | ||
| const y = e.clientY; | ||
|
|
||
| let isOverZone = false; | ||
| const rect = dropZoneRectRef.current; | ||
| if (rect) { | ||
| isOverZone = | ||
| x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom; | ||
| } | ||
|
|
||
| setDragState((prev) => ({ ...prev, x, y, isOverZone })); | ||
| }; | ||
|
|
||
| const handlePointerUp = (e: React.PointerEvent) => { | ||
| if (!dragState.option) return; | ||
|
|
||
| if (dragState.isOverZone) { | ||
| onSelect(dragState.option); | ||
| } | ||
|
|
||
| setDragState({ | ||
| option: null, | ||
| x: 0, | ||
| y: 0, | ||
| width: 0, | ||
| height: 0, | ||
| offsetX: 0, | ||
| offsetY: 0, | ||
| isOverZone: false, | ||
| }); | ||
| (e.currentTarget as HTMLElement).releasePointerCapture(e.pointerId); | ||
| }; | ||
|
|
||
| const handlePointerDown = (e: React.PointerEvent, value: ImportantOption) => { | ||
| const selection = selections[value]; | ||
| if (!selection || selection === "" || selection === "선택 전") { | ||
| alert( | ||
| `${OPTIONS.find((o) => o.value === value)?.label} 옵션을 먼저 선택해 주세요!`, | ||
| ); | ||
| return; | ||
| } | ||
|
|
||
| const rect = (e.currentTarget as HTMLElement).getBoundingClientRect(); | ||
| const offsetX = e.clientX - rect.left; | ||
| const offsetY = e.clientY - rect.top; | ||
|
|
||
| // 드롭 존 위치 미리 계산 (Reflow 방지) | ||
| if (dropZoneRef.current) { | ||
| dropZoneRectRef.current = dropZoneRef.current.getBoundingClientRect(); | ||
| } | ||
|
|
||
| setDragState({ | ||
| option: value, | ||
| x: e.clientX, | ||
| y: e.clientY, | ||
| width: rect.width, | ||
| height: rect.height, | ||
| offsetX, | ||
| offsetY, | ||
| isOverZone: false, | ||
| }); | ||
| (e.currentTarget as HTMLElement).setPointerCapture(e.pointerId); | ||
| }; | ||
|
|
||
| return ( | ||
| <Drawer> | ||
| <DrawerTrigger asChild>{trigger}</DrawerTrigger> | ||
| <DrawerContent | ||
| className="h-[782px] pb-16 outline-none" | ||
| showHandle={false} | ||
| > | ||
| <div className="relative flex h-full flex-col px-6 select-none"> | ||
| <DrawerHeader className="gap-4 px-0 pt-6 pb-0"> | ||
| <div className="relative flex items-center justify-between"> | ||
| <div className="w-[40px]" /> | ||
| <DrawerTitle className="typo-16-700 text-color-text-black flex-1 text-center"> | ||
| 중요한 옵션 선택 | ||
| </DrawerTitle> | ||
| <DrawerClose className="typo-16-500 text-color-text-caption3 w-[40px] text-right"> | ||
| 닫기 | ||
| </DrawerClose> | ||
| </div> | ||
| <p className="typo-14-500 text-color-text-caption3 text-center"> | ||
| 가장 중요하게 생각하는 옵션을 하나 선택하세요. | ||
| <br /> | ||
| 선택한 조건을 반드시 만족하는 사람만 추천해 줄 거에요! | ||
| </p> | ||
| </DrawerHeader> | ||
|
|
||
| <div className="scrollbar-hide flex-1 touch-pan-y overflow-y-auto px-0 pb-4"> | ||
| <div | ||
| ref={dropZoneRef} | ||
| className={cn( | ||
| "relative mt-6 mb-6 flex h-[166px] flex-col items-center rounded-2xl transition-all duration-200", | ||
| !selectedOption ? "justify-center" : "justify-start pt-3", | ||
| dragState.isOverZone ? "bg-black/10" : "bg-transparent", | ||
| )} | ||
| > | ||
| {!selectedOption ? ( | ||
| <div className="pointer-events-none flex flex-col items-center gap-[12px]"> | ||
| <ArrowUpToLine | ||
| className="text-color-text-disabled h-6 w-6" | ||
| strokeWidth={2} | ||
| /> | ||
| <span className="typo-14-500 text-color-text-disabled text-center"> | ||
| 중요한 옵션인 버튼을 끌어올려 보세요! | ||
| </span> | ||
| </div> | ||
| ) : ( | ||
| <div className="relative flex w-full flex-col items-end gap-1 pt-3"> | ||
| {typingStep >= 1 && ( | ||
| <div className="bg-button-primary flex items-center justify-center rounded-t-[16px] rounded-br-[8px] rounded-bl-[16px] px-3 py-[12px] shadow-[0px_4px_16px_rgba(0,0,0,0.12)]"> | ||
| <span className="typo-14-500 text-right text-white"> | ||
| <TypingText | ||
| key={selectedOption} | ||
| text="Comatching AI 야, 이 옵션은 꼭 지켜줘!" | ||
| onComplete={handleStep1Complete} | ||
| /> | ||
| </span> | ||
| </div> | ||
| )} | ||
| {typingStep >= 2 && ( | ||
| <div className="bg-button-primary mt-1 flex w-full items-center justify-center rounded-l-[16px] rounded-tr-[8px] rounded-br-[16px] px-4 py-[15px] shadow-[5px_5px_5px_rgba(0,0,0,0.25),0px_5px_20px_rgba(0,0,0,0.12)]"> | ||
| <span className="typo-18-600 w-full text-right text-white"> | ||
| <TypingText | ||
| key={selectedOption} | ||
| text={`${selectedItem?.label}는 ${selections[selectedOption]} 이면 좋겠어!`} | ||
| /> | ||
| </span> | ||
| </div> | ||
| )} | ||
| {typingStep >= 2 && ( | ||
| <button | ||
| onClick={() => onSelect(null)} | ||
| className="animate-in fade-in bg-color-gray-100 typo-12-700 text-color-text-caption2 mx-auto mt-4 flex h-[26px] items-center justify-center rounded-[99px] px-3 py-[6px] transition-colors duration-500 active:bg-gray-300" | ||
| > | ||
| 선택 취소 | ||
| </button> | ||
| )} | ||
| </div> | ||
| )} | ||
| </div> | ||
|
|
||
| <div className="flex flex-col gap-2"> | ||
| {remainingOptions.map((option) => ( | ||
| <MatchingOptionCard | ||
| key={option.value} | ||
| label={option.label} | ||
| value={option.value} | ||
| isSelected={false} | ||
| selectionLabel={selections[option.value]} | ||
| onPointerDown={handlePointerDown} | ||
| onPointerMove={handlePointerMove} | ||
| onPointerUp={handlePointerUp} | ||
| onClick={onSelect} | ||
| /> | ||
| ))} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="touch-pan-y"> | ||
| <DrawerClose asChild> | ||
| <button className="bg-color-main-900 typo-20-700 flex h-[48px] w-full items-center justify-center rounded-[16px] border-[0.8px] border-white/30 text-white transition-transform active:scale-[0.98]"> | ||
| NEXT | ||
| </button> | ||
| </DrawerClose> | ||
| </div> | ||
|
|
||
| {/* Ghost Element (Dragging) */} | ||
| {dragState.option && | ||
| typeof document !== "undefined" && | ||
| createPortal( | ||
| <div | ||
| className="pointer-events-none fixed z-[9999]" | ||
| style={{ | ||
| left: dragState.x - dragState.offsetX, | ||
| top: dragState.y - dragState.offsetY, | ||
| transform: "scale(1.05)", | ||
| width: `${dragState.width}px`, | ||
| }} | ||
| > | ||
| <div | ||
| className="border-color-brand-primary-flame flex w-full flex-col items-start justify-center gap-1 rounded-lg border-2 bg-white px-[17px] opacity-95 shadow-[0px_10px_30px_rgba(0,0,0,0.25)]" | ||
| style={{ height: `${dragState.height}px` }} | ||
| > | ||
| <div className="flex w-full items-center justify-between"> | ||
| <div className="flex items-end gap-2"> | ||
| <span className="typo-20-700 text-color-text-black"> | ||
| { | ||
| OPTIONS.find((o) => o.value === dragState.option) | ||
| ?.label | ||
| } | ||
| </span> | ||
| </div> | ||
| <div className="flex flex-col gap-[2px]"> | ||
| <div className="bg-color-gray-200 h-[2px] w-4 rounded-[1px]" /> | ||
| <div className="bg-color-gray-200 h-[2px] w-4 rounded-[1px]" /> | ||
| <div className="bg-color-gray-200 h-[2px] w-4 rounded-[1px]" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div>, | ||
| document.body, | ||
| )} | ||
| </div> | ||
| </DrawerContent> | ||
| </Drawer> | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.