diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerTabContents/TabContents/LiveChannelContents.jsx b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerTabContents/TabContents/LiveChannelContents.jsx index 51734216..5168f882 100644 --- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerTabContents/TabContents/LiveChannelContents.jsx +++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerTabContents/TabContents/LiveChannelContents.jsx @@ -4,16 +4,22 @@ import { useDispatch } from 'react-redux'; import Spotlight from '@enact/spotlight'; +import { sendLogTotalRecommend } from '../../../../actions/logActions'; // <<<<<<< HEAD import { updatePanel } from '../../../../actions/panelActions'; import TVirtualGridList from '../../../../components/TVirtualGridList/TVirtualGridList'; -import { LOG_CONTEXT_NAME, LOG_MENU, LOG_MESSAGE_ID, panel_names } from '../../../../utils/Config'; +import { + LOG_CONTEXT_NAME, + LOG_MENU, + LOG_MESSAGE_ID, + panel_names, +} from '../../../../utils/Config'; import { $L } from '../../../../utils/helperMethods'; import PlayerItemCard, { TYPES } from '../../PlayerItemCard/PlayerItemCard'; import ListEmptyContents from '../TabContents/ListEmptyContents/ListEmptyContents'; import css from './LiveChannelContents.module.less'; import cssV2 from './LiveChannelContents.v2.module.less'; -import { sendLogTotalRecommend } from '../../../../actions/logActions'; + // ======= // import { updatePanel } from "../../../../actions/panelActions"; // import TVirtualGridList from "../../../../components/TVirtualGridList/TVirtualGridList"; @@ -40,7 +46,7 @@ export default function LiveChannelContents({ handleItemFocus, tabTitle, panelInfo, -// <<<<<<< HEAD + // <<<<<<< HEAD direction = 'vertical', version = 1, isFilteredByPatnr19, @@ -49,13 +55,13 @@ export default function LiveChannelContents({ const isClickBlocked = useRef(false); const blockTimeoutRef = useRef(null); -// ======= -// isFilteredByPatnr19, -// }) { -// const dispatch = useDispatch(); -// const isClickBlocked = useRef(false); + // ======= + // isFilteredByPatnr19, + // }) { + // const dispatch = useDispatch(); + // const isClickBlocked = useRef(false); const scrollToRef = useRef(null); -// >>>>>>> gitlab/develop + // >>>>>>> gitlab/develop const handleFocus = useCallback( () => () => { if (handleItemFocus) { @@ -181,15 +187,24 @@ export default function LiveChannelContents({ startDt={strtDt} endDt={endDt} currentTime={currentTime} -// <<<<<<< HEAD + currentVideoVisible={currentVideoShowId === liveInfos[index].showId} + // <<<<<<< HEAD version={version} -// ======= -// currentVideoVisible={currentVideoShowId === liveInfos[index].showId} -// >>>>>>> gitlab/develop + // ======= + // currentVideoVisible={currentVideoShowId === liveInfos[index].showId} + // >>>>>>> gitlab/develop /> ); }, - [liveInfos, currentTime, currentVideoShowId, isClickBlocked, dispatch, handleFocus, version] + [ + liveInfos, + currentTime, + currentVideoShowId, + isClickBlocked, + dispatch, + handleFocus, + version, + ] ); const containerClass = version === 2 ? cssV2.container : css.container;