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

This commit is contained in:
yonghyon
2024-10-08 17:07:49 +09:00

View File

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