[251123] Merge: develop_si base로 develop을 merge함

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

@@ -23,6 +23,7 @@ import {
   getHomeLayout,
   getHomeMainContents,
   updateHomeInfo,
+// <<<<<<< HEAD
 } from '../../actions/homeActions';
 import { sendLogGNB, sendLogTotalRecommend } from '../../actions/logActions';
 import { getSubCategory, getTop20Show } from '../../actions/mainActions';
@@ -67,6 +68,20 @@ const BACKGROUND_IMAGES = {
 };
 // [COMMENTED OUT] useVideoMove 관련 코드 주석 처리 - 향후 사용 검토 필요
 // import { useVideoMove } from '../../hooks/useVideoTransition/useVideoMove';
+// =======
+// } from "../../actions/homeActions";
+// import { sendLogGNB, sendLogTotalRecommend } from "../../actions/logActions";
+// import { getSubCategory, getTop20Show } from "../../actions/mainActions";
+// import { getHomeOnSaleInfo } from "../../actions/onSaleActions";
+// import { finishVideoPreview } from "../../actions/playActions";
+// import { getBestSeller } from "../../actions/productActions";
+// import TBody from "../../components/TBody/TBody";
+// import TButton, { TYPES } from "../../components/TButton/TButton";
+// import TPanel from "../../components/TPanel/TPanel";
+// import TPopUp from "../../components/TPopUp/TPopUp";
+// import TVerticalPagenator from "../../components/TVerticalPagenator/TVerticalPagenator";
+// import useDebugKey from "../../hooks/useDebugKey";
+// >>>>>>> gitlab/develop
 import {
   ACTIVE_POPUP,
   LOG_CONTEXT_NAME,
@@ -186,6 +201,9 @@ const HomePanel = ({ isOnTop, showGradientBackground = false }) => {
   const isInitialRender = useRef(true);
   const verticalPagenatorRef = useRef(null);
   const currentSentMenuRef = useRef(null);
+  const lastRestoredIdRef = useRef(null);
+  const focusedContainerIdRef = useRef(null);
+  const prevIsOnTopRef = useRef(isOnTop);
 
   // ✅ [251119] DetailPanelBackground 이미지 프리로딩
   // HomePanel 마운트 시 백그라운드로 모든 파트너사 배경 이미지를 미리 로드하여
@@ -250,8 +268,6 @@ const HomePanel = ({ isOnTop, showGradientBackground = false }) => {
   const expandIntervalRef = useRef(null); // 최상단에서의 interval
   const expandAttemptRef = useRef(0); // 복구 시도 횟수
 
-  const focusedContainerIdRef = usePrevious(focusedContainerId);
-
   const loadingComplete = useSelector((state) => state.common?.loadingComplete);
   const isVideoTransitionLocked = useSelector((state) => state.home.videoTransitionLocked);
 
@@ -757,6 +773,7 @@ const HomePanel = ({ isOnTop, showGradientBackground = false }) => {
   // 비디오가 재생이 아니면 videoPlayIntentRef의 bannerId로 비디오 재생
   // [251116] isHomeOnTop인 경우에는 비디오가 항상 재생되어야 함
   useEffect(() => {
+// <<<<<<< HEAD
     // console.log('[HomeActive] useEffect 실행 - isOnTop:', isOnTop);
     // console.log('[HomeActive] videoPlayIntentRef.current:', videoPlayIntentRef.current);
     // console.log(
@@ -973,6 +990,23 @@ const HomePanel = ({ isOnTop, showGradientBackground = false }) => {
       }
     }
   }, [detailPanelClosed, isOnTop, bannerDataList, dispatch]);
+// =======
+//     const justCameBack = !prevIsOnTopRef.current && isOnTop;
+
+//     if (
+//       justCameBack &&
+//       panelInfo?.lastFocusedTargetId &&
+//       panelInfo.lastFocusedTargetId !== lastRestoredIdRef.current
+//     ) {
+//       lastRestoredIdRef.current = panelInfo.lastFocusedTargetId;
+//       setTimeout(() => {
+//         Spotlight.focus(panelInfo.lastFocusedTargetId);
+//       }, 150);
+//     }
+
+//     prevIsOnTopRef.current = isOnTop;
+//   }, [isOnTop, panelInfo?.lastFocusedTargetId]);
+// >>>>>>> gitlab/develop
 
   useEffect(() => {
     return () => {
@@ -997,13 +1031,17 @@ const HomePanel = ({ isOnTop, showGradientBackground = false }) => {
             currentSpot: currentSpot,
             currentCatCd: targetSpotlightCatcd,
             currentCateName: targetSpotlightCateNm,
+// <<<<<<< HEAD
             focusedContainerId: focusedContainerIdRef.current,
             lastFocusedTargetId: lastFocusedTargetRef.current || panelInfo.lastFocusedTargetId,
+// =======
+//             focusedContainerId: focusedContainerId,
+// >>>>>>> gitlab/develop
           },
         })
       );
     };
-  }, [dispatch]);
+  }, [dispatch, focusedContainerId]);
 
   const handleArrowClick = useCallback(() => {
     if (verticalPagenatorRef.current) {