pb-sxp-ui 1.20.67 → 1.20.69

package/dist/index.cjs

@@ -12754,7 +12754,7 @@ const CommodityDetailDiroNew$1 = (_a) => {
     var { style, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, iframeBgColor, isActive = true } = _a, props = __rest(_a, ["style", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "iframeBgColor", "isActive"]);
     const { sxpParameter, popupCurTimeRef, popupDetailData, setPopupDetailData, isPreview, bffFbReport, checkCommodityIndexRef, globalConfig, ctaEvent } = useSxpDataSource();
     useEditor();
-    const { productView } = useEventReport();
+    const { productView, jumpToWeb } = useEventReport();
     const [showModal, setShowModal] = React.useState(false);
     const curTimeRef = React.useRef(null);
     const [show3DModal, setShow3DModal] = React.useState(false);
@@ -12777,21 +12777,20 @@ const CommodityDetailDiroNew$1 = (_a) => {
     }
     // 是否为 SKU 层绑定（variantId 和 variantOption 同时存在时）
     const isSkuLevel = !!(product === null || product === void 0 ? void 0 : product.variantId) && !!(product === null || product === void 0 ? void 0 : product.variantOption);
-    const handleOpenAddToCart = (variantId) => {
-        ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({ eventSubject: 'clickCta', eventDescription: 'User clicked the CTA' }, data, product, position);
-        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-            eventName: 'ClickCTA',
-            product: product ? [product] : undefined,
-            contentType: 'product',
-            data,
-            position,
-            cta_text: cta === null || cta === void 0 ? void 0 : cta.enTitle,
-            cta_action_type: 'open_internal_popup',
-            target_content_id: product === null || product === void 0 ? void 0 : product.itemId,
-            target_url: product === null || product === void 0 ? void 0 : product.link
-        });
-        if (!isPost) {
-            productView(data, product, cta, viewTime || curTimeRef.current, position);
+    const handleOpenAddToCart = (variantId, isUserClick = false) => {
+        if (isUserClick) {
+            ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({ eventSubject: 'clickCta', eventDescription: 'User clicked the CTA' }, data, product, position);
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'ClickCTA',
+                product: product ? [product] : undefined,
+                contentType: 'product',
+                data,
+                position,
+                cta_text: cta === null || cta === void 0 ? void 0 : cta.enTitle,
+                cta_action_type: 'open_internal_popup',
+                target_content_id: product === null || product === void 0 ? void 0 : product.itemId,
+                target_url: product === null || product === void 0 ? void 0 : product.link
+            });
         }
         ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({ eventSubject: 'clickShopifyPopup', eventDescription: 'User clicked to open Shopify popup' }, data, product, position);
         setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, data), { video: Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.video), { bindProduct: product }), index: position }));
@@ -12815,12 +12814,13 @@ const CommodityDetailDiroNew$1 = (_a) => {
             });
             productView(data, product, cta, viewTime || curTimeRef.current, position);
             if (product === null || product === void 0 ? void 0 : product.link) {
+                jumpToWeb(e, data, product, cta, position);
                 window.location.href = window.getJointUtmLink(product.link);
             }
             return;
         }
         // SKU 层绑定：直接传入 variantId 预选该 SKU
-        handleOpenAddToCart(isSkuLevel ? product === null || product === void 0 ? void 0 : product.variantId : undefined);
+        handleOpenAddToCart(isSkuLevel ? product === null || product === void 0 ? void 0 : product.variantId : undefined, true);
     };
     // popup 模式下，若为 SKU 层绑定，直接自动打开加购弹窗
     React.useEffect(() => {
@@ -13107,7 +13107,14 @@ Made in Italy` })));
                         marginTop: '50px',
                         border: 'none'
                     } }))),
-        showAddToCart && (React.createElement(Modal$1, { visible: showAddToCart, padding: 0, isFullScreen: false, onClose: () => setShowAddToCart(false) },
+        showAddToCart && (React.createElement(Modal$1, { visible: showAddToCart, padding: 0, isFullScreen: false, onClose: () => {
+                setShowAddToCart(false);
+                // SKU 场景：关闭加购弹窗时直接回到 feed，不再停留在商品弹窗
+                if (addToCartVariantId && typeof window !== 'undefined' && window.sxpPopup) {
+                    window.sxpPopup('');
+                    setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
+                }
+            } },
             React.createElement(AddToCartPopup$1, { isActive: true, defaultVariantId: addToCartVariantId })))));
 };
 var CommodityDetailDiroNewComponent = React.memo(CommodityDetailDiroNew$1);
@@ -23323,6 +23330,7 @@ const VideoWidget$4 = React.forwardRef(({ rec, index, height, data, muted, activ
     const initTimeRef = React.useRef();
     const loadedTimeRef = React.useRef();
     const isFirstPlayRef = React.useRef(true);
+    const lastPlayReportTimeRef = React.useRef(0);
     const loopPlayRef = React.useRef(loopPlay);
     const scene = rec.video.scene;
     const videoUrl = (scene === null || scene === void 0 ? void 0 : scene.mediaUrl) || ((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.url);
@@ -23401,6 +23409,9 @@ const VideoWidget$4 = React.forwardRef(({ rec, index, height, data, muted, activ
             return;
         setIsPauseVideo(false);
         const item = data[index];
+        const now = Date.now();
+        if (now - lastPlayReportTimeRef.current < 500)
+            return;
         if (item && ((_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.duration)) {
             videoStartTime.current = ((_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.currentTime) || 0;
             const videoDuration = ((_f = (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.duration) !== null && _f !== void 0 ? _f : 0).toFixed(2);
@@ -23409,6 +23420,7 @@ const VideoWidget$4 = React.forwardRef(({ rec, index, height, data, muted, activ
             bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
                 eventInfo: Object.assign({ eventSubject: 'playVideo', eventDescription: 'User played the video', contentId: (_k = (_j = item === null || item === void 0 ? void 0 : item.video) === null || _j === void 0 ? void 0 : _j.itemId) !== null && _k !== void 0 ? _k : '', sceneId: (_o = (_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.scene) === null || _m === void 0 ? void 0 : _m.sceneId) !== null && _o !== void 0 ? _o : '', contentName: (_q = (_p = item === null || item === void 0 ? void 0 : item.video) === null || _p === void 0 ? void 0 : _p.title) !== null && _q !== void 0 ? _q : '', playType, startTime: videoCurrentTime, videoDuration, contentTags: JSON.stringify((_s = (_r = item === null || item === void 0 ? void 0 : item.video) === null || _r === void 0 ? void 0 : _r.tags) !== null && _s !== void 0 ? _s : []), position: index + '', contentFormat: 'video', traceInfo: (_t = item === null || item === void 0 ? void 0 : item.video) === null || _t === void 0 ? void 0 : _t.traceInfo }, ((isFirstPlayRef === null || isFirstPlayRef === void 0 ? void 0 : isFirstPlayRef.current) && { loadTime: (loadedTimeRef === null || loadedTimeRef === void 0 ? void 0 : loadedTimeRef.current) - (initTimeRef === null || initTimeRef === void 0 ? void 0 : initTimeRef.current) + '' }))
             });
+            lastPlayReportTimeRef.current = Date.now();
             isFirstPlayRef.current = false;
         }
     }), [bffEventReport, data, index, isFirstPlayRef, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
@@ -23437,9 +23449,8 @@ const VideoWidget$4 = React.forwardRef(({ rec, index, height, data, muted, activ
         if (!videoRef.current)
             return;
         loadedTimeRef.current = new Date();
-        handleStartPlay();
         handLoadeddata();
-    }, [videoRef.current, handLoadeddata, handleStartPlay]);
+    }, [videoRef.current, handLoadeddata]);
     const handleClickVideo = React.useCallback((type) => () => {
         var _a, _b, _c, _d, _e;
         if (!videoRef.current)
@@ -24694,13 +24705,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight, containerWidt
         viewTime.current = new Date();
     };
     const handleReportProductView = (item, position) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (!((_a = item === null || item === void 0 ? void 0 : item.video) === null || _a === void 0 ? void 0 : _a.url) && !((_b = item === null || item === void 0 ? void 0 : item.video) === null || _b === void 0 ? void 0 : _b.imgUrls) && (item === null || item === void 0 ? void 0 : item.product)) {
-            // Shopify 加购模式下，点击 Shop Now 打开购物车不上报 productView，只有跳外链才上报
-            const isEnableAddToCart = (_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _c === void 0 ? void 0 : _c.some((v) => { var _a, _b; return (_b = (_a = v === null || v === void 0 ? void 0 : v.item) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.enableAddToCart; });
-            if (isEnableAddToCart)
-                return;
-            productView(item, item.product, (_d = item === null || item === void 0 ? void 0 : item.product) === null || _d === void 0 ? void 0 : _d.bindCta, viewTime.current, position !== null && position !== void 0 ? position : activeIndex);
+            productView(item, item.product, (_c = item === null || item === void 0 ? void 0 : item.product) === null || _c === void 0 ? void 0 : _c.bindCta, viewTime.current, position !== null && position !== void 0 ? position : activeIndex);
         }
     };
     React.useEffect(() => {
@@ -25829,12 +25836,12 @@ const Popup = () => {
         };
     }, []);
     React.useEffect(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (popup && (popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') {
             popupCurTimeRef.current = new Date();
             setVisible(popup);
             const currentValue = (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.sxpPageConf) === null || _a === void 0 ? void 0 : _a.globalConfig) === null || _b === void 0 ? void 0 : _b.popupList) === null || _c === void 0 ? void 0 : _c.find((item) => (item === null || item === void 0 ? void 0 : item.id) === (popup === null || popup === void 0 ? void 0 : popup.id));
-            const isAddToCart = ((_d = currentValue === null || currentValue === void 0 ? void 0 : currentValue.item) === null || _d === void 0 ? void 0 : _d.type) === 'AddToCart';
+            const isAddToCart = ((_d = currentValue === null || currentValue === void 0 ? void 0 : currentValue.item) === null || _d === void 0 ? void 0 : _d.type) === 'AddToCart' || ((_e = currentValue === null || currentValue === void 0 ? void 0 : currentValue.item) === null || _e === void 0 ? void 0 : _e.type) === 'AddToCartPopup';
             isAddToCartPopupRef.current = isAddToCart;
             if (!isAddToCart) {
                 // 记录非加购弹窗（商品弹窗等），供加购弹窗关闭后恢复
@@ -25842,7 +25849,8 @@ const Popup = () => {
             }
         }
         else if ((popup === null || popup === void 0 ? void 0 : popup.id) === '') {
-            // popup 被清空时，同步重置标记
+            // popup 被清空时，同步 visible 状态以便 Modal 正确关闭，避免白屏且关不掉
+            setVisible(Object.assign(Object.assign({}, popup), { id: '' }));
             isAddToCartPopupRef.current = false;
         }
     }, [popup, schema]);
@@ -25861,11 +25869,16 @@ const Popup = () => {
         }
     }, [popup, schema]);
     const handleClose = () => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        if (!popup ||
-            (popup === null || popup === void 0 ? void 0 : popup.id) === '' ||
-            !visible ||
-            new Date() - popupCurTimeRef.current < ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0)) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        // popup 已被清空时（如 CommodityDetailDiroNew SKU 场景直接调用 sxpPopup('')），确保能关闭 Modal，避免白屏关不掉
+        if ((popup === null || popup === void 0 ? void 0 : popup.id) === '') {
+            setVisible({ id: '' });
+            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
+            checkCommodityIndexRef.current = -1;
+            prevCommodityPopupRef.current = null;
+            return;
+        }
+        if (!popup || !visible || new Date() - popupCurTimeRef.current < ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0)) {
             return;
         }
         setVisible(Object.assign(Object.assign({}, popup), { id: '' }));
@@ -25886,11 +25899,14 @@ const Popup = () => {
             }
         }
         // 加购弹窗关闭时，判断是否需要恢复商品弹窗
-        if (((_u = value === null || value === void 0 ? void 0 : value.item) === null || _u === void 0 ? void 0 : _u.type) === 'AddToCart') {
+        if (((_u = value === null || value === void 0 ? void 0 : value.item) === null || _u === void 0 ? void 0 : _u.type) === 'AddToCart' || ((_v = value === null || value === void 0 ? void 0 : value.item) === null || _v === void 0 ? void 0 : _v.type) === 'AddToCartPopup') {
             const prevPopup = prevCommodityPopupRef.current;
             prevCommodityPopupRef.current = null;
             isAddToCartPopupRef.current = false;
-            if (prevPopup === null || prevPopup === void 0 ? void 0 : prevPopup.id) {
+            // SKU 场景：加购弹窗带有 _defaultVariantId 表示从 SKU CTA 直接进入（CommodityDetail 注入），关闭后不应恢复商品弹窗
+            const popupData = popupDetailData;
+            const isSkuFlow = !!(popupData === null || popupData === void 0 ? void 0 : popupData._defaultVariantId);
+            if ((prevPopup === null || prevPopup === void 0 ? void 0 : prevPopup.id) && !isSkuFlow) {
                 // SPU 场景：加购弹窗之前有商品弹窗，关闭后恢复商品弹窗
                 const { id: commodityId } = prevPopup, commodityAni = __rest(prevPopup, ["id"]);
                 setTimeout(() => {
@@ -25898,7 +25914,7 @@ const Popup = () => {
                 }, popup === null || popup === void 0 ? void 0 : popup.duration);
                 return;
             }
-            // SKU 场景：之前没有商品弹窗，直接回到 feed
+            // SKU 场景：直接回到 feed，不恢复商品弹窗
         }
         setTimeout(() => {
             window === null || window === void 0 ? void 0 : window.sxpPopup('');