From 60a5124f0a7b8c93786ef194586d880713eaba71 Mon Sep 17 00:00:00 2001
From: hun <skyyy5347@naver.com>
Date: Thu, 12 Feb 2026 22:37:22 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B9=88=20=EC=A1=B0=ED=95=A9=EC=9D=98?=
 =?UTF-8?q?=20+,=20=EC=9E=90=EC=84=B8=ED=9E=88=EB=B3=B4=EA=B8=B0=20+=20?=
 =?UTF-8?q?=EB=A5=BC=20=EB=88=8C=EB=A0=80=EB=8B=A4=EA=B0=80=20=EB=8B=A4?=
 =?UTF-8?q?=EC=8B=9C=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EB=A1=9C=20=EB=9D=BC=EC=9A=B0=ED=8C=85=ED=95=A0=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EA=B8=B0=EC=A1=B4=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyPage/CombinationDetailView.tsx          |  3 +++
 src/components/MyPage/CombinationList.tsx     |  3 +++
 .../MyPage/EmptyCombinationCard.tsx           |  1 +
 src/pages/my/MyPage.tsx                       | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/src/components/MyPage/CombinationDetailView.tsx b/src/components/MyPage/CombinationDetailView.tsx
index d74668f..3e1b3a2 100644
--- a/src/components/MyPage/CombinationDetailView.tsx
+++ b/src/components/MyPage/CombinationDetailView.tsx
@@ -44,6 +44,7 @@ interface CombinationDetailViewProps {
   onSelectAll: (deviceIds: number[]) => void;
   onSelectDevice: (deviceId: number) => void;
   onTrashClick: () => void;
+  onSaveScrollBeforeNavigate: () => void;
 }
 
 const CombinationDetailView = ({
@@ -61,6 +62,7 @@ const CombinationDetailView = ({
   onSelectAll,
   onSelectDevice,
   onTrashClick,
+  onSaveScrollBeforeNavigate,
 }: CombinationDetailViewProps) => {
   const navigate = useNavigate();
   const [hoveredStarComboId, setHoveredStarComboId] = useState<number | null>(null);
@@ -194,6 +196,7 @@ const CombinationDetailView = ({
           <button
             onClick={(e) => {
               e.stopPropagation();
+              onSaveScrollBeforeNavigate();
               navigate('/devices');
             }}
             className="cursor-pointer hover:opacity-80"
diff --git a/src/components/MyPage/CombinationList.tsx b/src/components/MyPage/CombinationList.tsx
index a410e38..34015ff 100644
--- a/src/components/MyPage/CombinationList.tsx
+++ b/src/components/MyPage/CombinationList.tsx
@@ -36,6 +36,7 @@ interface CombinationListProps {
   handleBackToNormal: () => void;
   handleTogglePin: (e: React.MouseEvent, comboId: number) => void;
   handleTrashClick: () => void;
+  handleSaveScrollBeforeNavigate: () => void;
 }
 
 const CombinationList = ({
@@ -60,6 +61,7 @@ const CombinationList = ({
   handleBackToNormal,
   handleTogglePin,
   handleTrashClick,
+  handleSaveScrollBeforeNavigate,
 }: CombinationListProps) => {
   // Lazy Loading: 초기 12개, 더 보기 클릭 시 12개씩 추가
   const INITIAL_DISPLAY_COUNT = 12;
@@ -219,6 +221,7 @@ const CombinationList = ({
                   onSelectAll={deviceSelection.handleSelectAll}
                   onSelectDevice={deviceSelection.handleSelectDevice}
                   onTrashClick={handleTrashClick}
+                  onSaveScrollBeforeNavigate={handleSaveScrollBeforeNavigate}
                 />
               ) : (
                 /* 일반 모드 */
diff --git a/src/components/MyPage/EmptyCombinationCard.tsx b/src/components/MyPage/EmptyCombinationCard.tsx
index 0344214..7790666 100644
--- a/src/components/MyPage/EmptyCombinationCard.tsx
+++ b/src/components/MyPage/EmptyCombinationCard.tsx
@@ -134,6 +134,7 @@ const EmptyCombinationCard = ({
         <button
           onClick={(e) => {
             e.stopPropagation();
+            sessionStorage.setItem('mypage-scroll', window.scrollY.toString());
             navigate('/devices');
           }}
           className="cursor-pointer hover:opacity-80"
diff --git a/src/pages/my/MyPage.tsx b/src/pages/my/MyPage.tsx
index b01b4eb..e183dae 100644
--- a/src/pages/my/MyPage.tsx
+++ b/src/pages/my/MyPage.tsx
@@ -86,6 +86,19 @@ const MyPage = () => {
     return () => mediaQuery.removeEventListener('change', handleChange);
   }, []);
 
+  // 페이지 마운트 시 sessionStorage에서 스크롤 위치 복원
+  useEffect(() => {
+    const savedScroll = sessionStorage.getItem('mypage-scroll');
+    if (savedScroll) {
+      const scrollPosition = parseInt(savedScroll, 10);
+      // 약간의 지연을 두어 DOM이 완전히 렌더링된 후 스크롤
+      setTimeout(() => {
+        window.scrollTo(0, scrollPosition);
+      }, 0);
+      sessionStorage.removeItem('mypage-scroll');
+    }
+  }, []);
+
   // 드롭다운 외부 클릭 시 닫기
   const handleClickOutside = useCallback(() => setOpenMenuIndex(null), []);
   useClickOutside(menuRef, handleClickOutside);
@@ -208,6 +221,11 @@ const MyPage = () => {
     window.scrollTo({ top: 0, behavior: 'smooth' });
   }, []);
 
+  // 자세히보기에서 + 버튼 클릭 시: 이미 저장된 스크롤 위치를 sessionStorage에 저장
+  const handleSaveScrollBeforeNavigate = useCallback(() => {
+    sessionStorage.setItem('mypage-scroll', savedScrollPosition.toString());
+  }, [savedScrollPosition]);
+
   return (
     <div className={`min-h-screen bg-white relative ${isAtBottom ? 'bg-effect-fade-bottom' : ''}`}>
       <GNB />
@@ -270,6 +288,7 @@ const MyPage = () => {
             handleBackToNormal={handleBackToNormal}
             handleTogglePin={handleTogglePin}
             handleTrashClick={handleTrashClick}
+            handleSaveScrollBeforeNavigate={handleSaveScrollBeforeNavigate}
           />
 
           {/* Top Button */}