From 02a09f5be2bc11657414672727aa5e2ec8efda0a Mon Sep 17 00:00:00 2001
From: "opacity@t-win.kr" <opacity@t-win.kr>
Date: Mon, 3 Nov 2025 10:44:44 +0900
Subject: [PATCH] =?UTF-8?q?SHOPTIME-5890=20popular=20show=20=EC=A7=84?=
 =?UTF-8?q?=EC=9E=85=20=ED=9B=84=20=EC=9D=B4=EC=A0=84=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?home=20=EC=A7=84=EC=9E=85=EC=8B=9C=20=ED=8F=AC=EC=BB=A4?=
 =?UTF-8?q?=EC=8A=A4=20=EC=83=81=EC=9D=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/HomePanel/HomePanel.jsx             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx b/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx
index 220d6de7..242fc7fd 100644
--- a/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx
+++ b/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx
@@ -40,7 +40,6 @@ import TPanel from "../../components/TPanel/TPanel";
 import TPopUp from "../../components/TPopUp/TPopUp";
 import TVerticalPagenator from "../../components/TVerticalPagenator/TVerticalPagenator";
 import useDebugKey from "../../hooks/useDebugKey";
-import usePrevious from "../../hooks/usePrevious";
 import {
   ACTIVE_POPUP,
   LOG_CONTEXT_NAME,
@@ -164,8 +163,6 @@ const HomePanel = ({ isOnTop }) => {
 
   const cbChangePageRef = useRef(null);
 
-  const focusedContainerIdRef = usePrevious(focusedContainerId);
-
   const loadingComplete = useSelector((state) => state.common?.loadingComplete);
 
   const onCancel = useCallback(() => {
@@ -565,10 +562,14 @@ const HomePanel = ({ isOnTop }) => {
   }, [dispatch]);
 
   useEffect(() => {
-    if (isOnTop && panelInfo?.lastFocusedTargetId) {
+    if (
+      isOnTop &&
+      panelInfo?.lastFocusedTargetId &&
+      !panelInfo?.focusedContainerId
+    ) {
       Spotlight.focus(panelInfo.lastFocusedTargetId);
     }
-  }, [isOnTop]);
+  }, [isOnTop, panelInfo?.lastFocusedTargetId, panelInfo?.focusedContainerId]);
 
   useEffect(() => {
     return () => {
@@ -595,12 +596,12 @@ const HomePanel = ({ isOnTop }) => {
             currentSpot: currentSpot,
             currentCatCd: targetSpotlightCatcd,
             currentCateName: targetSpotlightCateNm,
-            focusedContainerId: focusedContainerIdRef.current,
+            focusedContainerId: focusedContainerId,
           },
         })
       );
     };
-  }, [dispatch]);
+  }, [dispatch, focusedContainerId]);
 
   const handleArrowClick = useCallback(() => {
     if (verticalPagenatorRef.current) {