optrader/shoptime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitlab.t-win.kr:ifheone/shoptime into develop

Browse Source
This commit is contained in:
yonghyon
2024-10-08 17:07:49 +09:00
parent cb023c31a6 67fdc5f9b1
commit a1faf3f02f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.jsx
View File

@@ -192,10 +192,13 @@ export default function DetailPanel({ panelInfo, isOnTop, spotlightId }) {
}; };
const onClick = useCallback( const onClick = useCallback(
(ev) => { (isCancelClick) => (ev) => {
dispatch(finishVideoPreview()); dispatch(finishVideoPreview());
dispatch(popPanel(panel_names.DETAIL_PANEL)); dispatch(popPanel(panel_names.DETAIL_PANEL));
if (isCancelClick) {
ev.stopPropagation(); ev.stopPropagation();
}
}, },
[dispatch] [dispatch]
); );
@@ -387,7 +390,7 @@ export default function DetailPanel({ panelInfo, isOnTop, spotlightId }) {
<TPanel <TPanel
isTabActivated={false} isTabActivated={false}
className={css.detailPanelWrap} className={css.detailPanelWrap}
handleCancel={onClick} handleCancel={onClick(true)}
spotlightId={spotlightId} spotlightId={spotlightId}
> >
<THeader <THeader
@@ -398,7 +401,7 @@ export default function DetailPanel({ panelInfo, isOnTop, spotlightId }) {
(panelInfo?.type === "theme" && themeData?.themeInfo[0]?.curationNm) (panelInfo?.type === "theme" && themeData?.themeInfo[0]?.curationNm)
} }
onBackButton onBackButton
onClick={onClick} onClick={onClick(false)}
spotlightDisabled={isLoading} spotlightDisabled={isLoading}
onSpotlightUp={onSpotlightUpTButton} onSpotlightUp={onSpotlightUpTButton}
onSpotlightLeft={onSpotlightUpTButton} onSpotlightLeft={onSpotlightUpTButton}