[shoptime-6105] Home / Live / Shop Now 상품 진입 후 이전버튼으로 Home으로 돌아갈 경우 포커싱 사라짐

com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx

@@ -437,20 +437,19 @@ export default function RandomUnit({
 
   // 비디오 클릭
   const videoClick = useCallback(() => {
-    const lastFocusedTargetId = getContainerId(Spotlight.getCurrent());
     const currentSpot = Spotlight.getCurrent();
-    if (lastFocusedTargetId) {
+    const currentSpotlightId = currentSpot?.getAttribute("data-spotlight-id") || spotlightId;
+
     dispatch(
       updateHomeInfo({
         name: panel_names.HOME_PANEL,
         panelInfo: {
-            lastFocusedTargetId,
+          lastFocusedTargetId: currentSpotlightId,
           focusedContainerId: TEMPLATE_CODE_CONF.TOP,
-            currentSpot: currentSpot?.getAttribute("data-spotlight-id"),
+          currentSpot: currentSpotlightId,
         },
       })
     );
-    }
 
     dispatch(
       startVideoPlayer({
@@ -484,6 +483,7 @@ export default function RandomUnit({
     randomDataRef,
     sendBannerLog,
     onBlur,
+    dispatch,
   ]);
 
   // 투데이즈 딜 가격 정보

com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx

@@ -131,6 +131,8 @@ const HomePanel = ({ isOnTop }) => {
   const isInitialRender = useRef(true);
   const verticalPagenatorRef = useRef(null);
   const currentSentMenuRef = useRef(null);
+  const lastRestoredIdRef = useRef(null);
+  const prevIsOnTopRef = useRef(isOnTop);
 
   useEffect(() => {
     if (nowMenu === "Home/Top") {
@@ -562,14 +564,21 @@ const HomePanel = ({ isOnTop }) => {
   }, [dispatch]);
 
   useEffect(() => {
+    const justCameBack = !prevIsOnTopRef.current && isOnTop;
+
     if (
-      isOnTop &&
+      justCameBack &&
       panelInfo?.lastFocusedTargetId &&
-      !panelInfo?.focusedContainerId
+      panelInfo.lastFocusedTargetId !== lastRestoredIdRef.current
     ) {
+      lastRestoredIdRef.current = panelInfo.lastFocusedTargetId;
+      setTimeout(() => {
         Spotlight.focus(panelInfo.lastFocusedTargetId);
+      }, 150);
     }
-  }, [isOnTop, panelInfo?.lastFocusedTargetId, panelInfo?.focusedContainerId]);
+
+    prevIsOnTopRef.current = isOnTop;
+  }, [isOnTop, panelInfo?.lastFocusedTargetId]);
 
   useEffect(() => {
     return () => {