From 9d8cafc0a9ef1d1f695344cd9af6f4040863b05c Mon Sep 17 00:00:00 2001 From: optrader Date: Tue, 16 Dec 2025 14:29:22 +0900 Subject: [PATCH] [251216] fix: TrendingNowPanel PlayerPanel Bg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ๐Ÿ• ์ปค๋ฐ‹ ์‹œ๊ฐ„: 2025. 12. 16. 14:29:22 ๐Ÿ“Š ๋ณ€๊ฒฝ ํ†ต๊ณ„: โ€ข ์ด ํŒŒ์ผ: 2๊ฐœ โ€ข ์ถ”๊ฐ€: +14์ค„ โ€ข ์‚ญ์ œ: -3์ค„ ๐Ÿ“ ์ˆ˜์ •๋œ ํŒŒ์ผ: ~ com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx ~ com.twin.app.shoptime/src/views/TrendingNowPanel/TrendingNowPanel.jsx --- .../src/views/PlayerPanel/PlayerPanel.jsx | 13 ++++++++++++- .../src/views/TrendingNowPanel/TrendingNowPanel.jsx | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx index a4f9e4c9..8b08dd64 100644 --- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx +++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx @@ -1312,10 +1312,21 @@ const PlayerPanel = ({ isTabActivated, panelInfo, isOnTop, spotlightId, ...props // ์ตœ์ƒ๋‹จ ํŒจ๋„์ด DetailPanel์ด๊ณ  PlayerPanel์—์„œ ์ง„์ž…ํ–ˆ๋Š”์ง€ ํ™•์ธ const isTopPanelDetailFromPlayer = useMemo(() => { - const result = + let result = topPanel?.name === panel_names.DETAIL_PANEL && topPanel?.panelInfo?.launchedFromPlayer === true; + // MediaPanel์ด ์ตœ์ƒ๋‹จ์— ์žˆ๊ณ  ๊ทธ ์•„๋ž˜๊ฐ€ DetailPanel์ธ ๊ฒฝ์šฐ๋„ ์ฒดํฌ + if (!result && topPanel?.name === panel_names.MEDIA_PANEL) { + const prevPanel = panels[panels.length - 2]; + if ( + prevPanel?.name === panel_names.DETAIL_PANEL && + prevPanel?.panelInfo?.launchedFromPlayer === true + ) { + result = true; + } + } + // ๐Ÿ” DetailPanel ์ƒํƒœ ๋ณ€ํ™” ๋กœ๊น… if (result) { dlog('๐ŸŽฌ [PlayerPanel] DetailPanel is now on top (from Player)', { diff --git a/com.twin.app.shoptime/src/views/TrendingNowPanel/TrendingNowPanel.jsx b/com.twin.app.shoptime/src/views/TrendingNowPanel/TrendingNowPanel.jsx index a00a2bbe..7c66443e 100644 --- a/com.twin.app.shoptime/src/views/TrendingNowPanel/TrendingNowPanel.jsx +++ b/com.twin.app.shoptime/src/views/TrendingNowPanel/TrendingNowPanel.jsx @@ -291,7 +291,7 @@ const TrendingNowPanel = ({ panelInfo, spotlightId, isOnTop, ...rest }) => { return (
- {selectedIndex >= 1 && showButton && ( + {isOnTop && selectedIndex >= 1 && showButton && ( { - {topInfos && + {isOnTop && topInfos && topInfos?.length > 0 && selectedIndex !== topInfos?.length - 1 && showButton && (