From 38fad5ffe22b2b34e08fa9ff899645f667ff8778 Mon Sep 17 00:00:00 2001
From: optrader <optrader8@gmail.com>
Date: Thu, 11 Dec 2025 15:21:59 +0900
Subject: [PATCH] [251211] fix: FeaturedBrandsPanel TopImageBanner Focus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🕐 커밋 시간: 2025. 12. 11. 15:21:58

📊 변경 통계:
  • 총 파일: 1개
  • 추가: +55줄
  • 삭제: -17줄

📝 수정된 파일:
  ~ com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx

🔧 주요 변경 내용:
  • 소규모 기능 개선
---
 .../FeaturedBrandsPanel.jsx                   | 70 ++++++++++++++-----
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx
index 0a7de3e5..c6c9fa05 100644
--- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx
+++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx
@@ -11,6 +11,7 @@ import { useDispatch, useSelector } from "react-redux";
 
 import { Job } from "@enact/core/util";
 import Spotlight from "@enact/spotlight";
+import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDecorator";
 
 import { types } from "../../actions/actionTypes";
 import {
@@ -110,6 +111,17 @@ const DISPATCH_MAP = Object.freeze({
 
 const TOP_MARGIN = 36;
 
+// 🆕 [251211] NBCU(patnrId=21) 전용 통합 Container
+// Banner + Category + BestSeller를 같은 Spotlight 계층 내에서 관리
+const NbcuIntegratedContainer = SpotlightContainerDecorator(
+  {
+    spotlightDirection: 'vertical',
+    enterTo: 'last-focused',
+    preserveld: true,
+  },
+  'div'
+);
+
 const hasTemplateCodeWithValue = (array, value) =>
   array?.some((obj) => obj?.shptmBrndOptTpCd === value) ?? false;
 
@@ -1096,23 +1108,49 @@ const FeaturedBrandsPanel = ({ isOnTop, panelInfo, spotlightId }) => {
             />
           )}
 
-          {brandInfo && (brandTopImgInfo || (selectedPatnrId === 21 && brandTopBannerInfo)) && (
-            <Banner
-              brandInfo={brandInfo}
-              brandTopImgInfo={brandTopImgInfo}
-              brandTopBannerInfo={brandTopBannerInfo}
-              panelPatnrId={panelInfo?.patnrId}
-              selectedPatnrId={selectedPatnrId}
-            />
-          )}
+          {/* 🆕 [251211] patnrId=21일 때: Banner + Category + BestSeller를 통합 Container로 관리 */}
+          {(selectedPatnrId === 21 || selectedPatnrId === "21") ? (
+            <NbcuIntegratedContainer className={css.nbcuIntegratedContainer}>
+              {brandInfo && (brandTopImgInfo || brandTopBannerInfo) && (
+                <Banner
+                  brandInfo={brandInfo}
+                  brandTopImgInfo={brandTopImgInfo}
+                  brandTopBannerInfo={brandTopBannerInfo}
+                  panelPatnrId={panelInfo?.patnrId}
+                  selectedPatnrId={selectedPatnrId}
+                />
+              )}
 
-          {sortedBrandLayoutInfo && (
-            <div
-              className={css.orderableFlexContainer}
-              ref={orderableFlexContainerRef}
-            >
-              {renderPageItem()}
-            </div>
+              {sortedBrandLayoutInfo && (
+                <div
+                  className={css.orderableFlexContainer}
+                  ref={orderableFlexContainerRef}
+                >
+                  {renderPageItem()}
+                </div>
+              )}
+            </NbcuIntegratedContainer>
+          ) : (
+            <>
+              {brandInfo && (brandTopImgInfo || (selectedPatnrId === 21 && brandTopBannerInfo)) && (
+                <Banner
+                  brandInfo={brandInfo}
+                  brandTopImgInfo={brandTopImgInfo}
+                  brandTopBannerInfo={brandTopBannerInfo}
+                  panelPatnrId={panelInfo?.patnrId}
+                  selectedPatnrId={selectedPatnrId}
+                />
+              )}
+
+              {sortedBrandLayoutInfo && (
+                <div
+                  className={css.orderableFlexContainer}
+                  ref={orderableFlexContainerRef}
+                >
+                  {renderPageItem()}
+                </div>
+              )}
+            </>
           )}
 
           {displayTopButton && (