[251123] Merge: PlayerPanel,VideoPlayer,RandomUnit detail_v3버전으로 overwrite

This commit is contained in:
2025-11-23 18:54:54 +09:00
parent c5f57492a6
commit c3395c205a
2 changed files with 1 additions and 26 deletions

View File

@@ -575,8 +575,8 @@ export default function RandomUnit({
// 비디오 클릭 // 비디오 클릭
const videoClick = useCallback(() => { const videoClick = useCallback(() => {
const lastFocusedTargetId = getContainerId(Spotlight.getCurrent());
const currentSpot = Spotlight.getCurrent(); const currentSpot = Spotlight.getCurrent();
// <<<<<<< HEAD
if (lastFocusedTargetId) { if (lastFocusedTargetId) {
dispatch( dispatch(
updateHomeInfo({ updateHomeInfo({
@@ -589,20 +589,6 @@ export default function RandomUnit({
}) })
); );
} }
// =======
// const currentSpotlightId = currentSpot?.getAttribute("data-spotlight-id") || spotlightId;
// dispatch(
// updateHomeInfo({
// name: panel_names.HOME_PANEL,
// panelInfo: {
// lastFocusedTargetId: currentSpotlightId,
// focusedContainerId: TEMPLATE_CODE_CONF.TOP,
// currentSpot: currentSpotlightId,
// },
// })
// );
// >>>>>>> gitlab/develop
// ✅ modal=true → modal=false로 전환 (또는 초기 로드 시 modal=false) // ✅ modal=true → modal=false로 전환 (또는 초기 로드 시 modal=false)
// playActions의 shouldSkipVideoPlayback이 modal 상태를 확인하므로 // playActions의 shouldSkipVideoPlayback이 modal 상태를 확인하므로
@@ -645,13 +631,9 @@ export default function RandomUnit({
randomDataRef, randomDataRef,
sendBannerLog, sendBannerLog,
onBlur, onBlur,
// <<<<<<< HEAD
playerPanelInfo?.modal, playerPanelInfo?.modal,
dispatch, dispatch,
handleStartVideo, handleStartVideo,
// =======
// dispatch,
// >>>>>>> gitlab/develop
]); ]);
// 투데이즈 딜 가격 정보 // 투데이즈 딜 가격 정보

View File

@@ -28,16 +28,9 @@ import {
getMainCategoryShowDetail, getMainCategoryShowDetail,
getMainLiveShow, getMainLiveShow,
getMainLiveShowNowProduct, getMainLiveShowNowProduct,
// <<<<<<< HEAD
} from '../../actions/mainActions'; } from '../../actions/mainActions';
import * as PanelActions from '../../actions/panelActions'; import * as PanelActions from '../../actions/panelActions';
import { updatePanel } from '../../actions/panelActions'; import { updatePanel } from '../../actions/panelActions';
// =======
// } from "../../actions/mainActions";
// import { getBrandLiveChannelInfo } from "../../actions/brandActions";
// import * as PanelActions from "../../actions/panelActions";
// import { updatePanel } from "../../actions/panelActions";
// >>>>>>> gitlab/develop
import { import {
CLEAR_PLAYER_INFO, CLEAR_PLAYER_INFO,
getChatLog, getChatLog,