pb-sxp-ui 1.7.3 → 1.7.4

package/dist/pb-ui.js

@@ -823,17 +823,20 @@
             });
         }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
         const bffFbReport = React.useCallback(({ eventName, product }) => {
-            var _a, _b, _c, _d;
-            if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
+            var _a, _b, _c, _d, _e;
+            if (!enableReportEvent ||
+                !enabledMetaConversionApi ||
+                (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) ||
+                !((_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName])) {
                 return;
             }
-            let jsonParams = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName];
+            let jsonParams = JSON.parse(JSON.stringify((_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName]));
             const urlParams = new URLSearchParams(window.location.search);
             const fbclid = urlParams === null || urlParams === void 0 ? void 0 : urlParams.get('fbclid');
             const fix_par = {
-                event_source_url: (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href,
+                event_source_url: (_c = window === null || window === void 0 ? void 0 : window.location) === null || _c === void 0 ? void 0 : _c.href,
                 external_id: storeAndLoadFeUserId(),
-                client_user_agent: (_d = (_c = window === null || window === void 0 ? void 0 : window.navigator) === null || _c === void 0 ? void 0 : _c.userAgent) !== null && _d !== void 0 ? _d : '',
+                client_user_agent: (_e = (_d = window === null || window === void 0 ? void 0 : window.navigator) === null || _d === void 0 ? void 0 : _d.userAgent) !== null && _e !== void 0 ? _e : '',
                 fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
                 fbp: getCookie('_fbp') ? `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` : '',
                 time: new Date().getTime()
@@ -858,7 +861,7 @@
                                     matches.forEach((match) => {
                                         const prop = match.substring(2, match.length - 2);
                                         try {
-                                            const replaceValue = new Function('fix_par', 'product', `return ${prop}`)(fix_par, product);
+                                            let replaceValue = new Function('fix_par', 'product', `return ${prop}`)(fix_par, product);
                                             if (replaceValue) {
                                                 obj[key] = replaceValue;
                                             }
@@ -15900,7 +15903,7 @@ Made in Italy` })));
             };
         }, [isActive]);
         React.useEffect(() => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || !isLoadFinish)
                 return;
             if (isActive) {
@@ -15908,10 +15911,14 @@ Made in Italy` })));
                     eventName: 'ViewContent',
                     product: (_b = (_a = data === null || data === void 0 ? void 0 : data[index]) === null || _a === void 0 ? void 0 : _a.video) === null || _b === void 0 ? void 0 : _b.bindProduct
                 });
-                (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
+                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                    eventName: 'PageView',
+                    product: (_d = (_c = data === null || data === void 0 ? void 0 : data[index]) === null || _c === void 0 ? void 0 : _c.video) === null || _d === void 0 ? void 0 : _d.bindProduct
+                });
+                (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.play();
             }
             else {
-                (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.pause();
+                (_f = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _f === void 0 ? void 0 : _f.pause();
             }
         }, [isActive, isLoadFinish, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
         /*
@@ -15933,12 +15940,7 @@ Made in Italy` })));
             if (!isActive)
                 return;
             const onShow = () => {
-                var _a, _b;
                 handleClickVideo('start')();
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ViewContent',
-                    product: (_b = (_a = data === null || data === void 0 ? void 0 : data[index]) === null || _a === void 0 ? void 0 : _a.video) === null || _b === void 0 ? void 0 : _b.bindProduct
-                });
             };
             const onHide = handleClickVideo('pause');
             SXP_EVENT_BUS.on(SXP_EVENT_TYPE.PAGE_DID_SHOW, onShow);
@@ -16109,7 +16111,7 @@ Made in Italy` })));
                 }, onLoad: onShowFirstImage }))));
     };
 
-    const PictureGroup$2 = ({ imgUrls, width, height, rec, index, onReportViewImageEnd, onViewImageStartEvent, imgUrlsPostConfig }) => {
+    const PictureGroup$2 = ({ imgUrls, width, height, rec, index, onViewImageEndEvent, onViewImageStartEvent, imgUrlsPostConfig }) => {
         var _a, _b;
         const ref = React.useRef();
         const { isActive } = useSwiperSlide();
@@ -16121,16 +16123,16 @@ Made in Italy` })));
             if (isLoad && isActive) {
                 (ref === null || ref === void 0 ? void 0 : ref.current) && ref.current.swiper.autoplay.start();
                 if (openHashtag) {
-                    onReportViewImageEnd(rec);
+                    onViewImageEndEvent(rec);
                 }
                 else {
-                    onViewImageStartEvent(index, imgInfo);
+                    onViewImageStartEvent(index, imgInfo, true);
                 }
             }
             else {
                 (ref === null || ref === void 0 ? void 0 : ref.current) && ref.current.swiper.autoplay.stop();
             }
-        }, [rec, isActive, onReportViewImageEnd, openHashtag, index, onViewImageStartEvent, isLoad, imgInfo]);
+        }, [rec, isActive, onViewImageEndEvent, openHashtag, index, onViewImageStartEvent, isLoad, imgInfo]);
         const showFirstImageFn = React.useCallback((e) => __awaiter(void 0, void 0, void 0, function* () {
             if (!isLoad) {
                 const contentSize = yield getResFileSizeFromSrc(e.src);
@@ -16146,7 +16148,7 @@ Made in Italy` })));
         // }
         React.useEffect(() => {
             const onShow = () => onViewImageStartEvent(index, imgInfo);
-            const onHide = () => onReportViewImageEnd(rec);
+            const onHide = () => onViewImageEndEvent(rec);
             SXP_EVENT_BUS.on(SXP_EVENT_TYPE.PAGE_DID_SHOW, onShow);
             SXP_EVENT_BUS.on(SXP_EVENT_TYPE.PAGE_DID_HIDE, onHide);
             return () => {
@@ -16292,7 +16294,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2023-12-26 16:11:34
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-25 10:36:59
+     * @LastEditTime: 2024-10-29 14:07:29
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\RenderCard.tsx
      *
      */
@@ -16439,7 +16441,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-10-25 15:41:58
+     * @LastEditTime: 2024-10-28 16:36:22
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -16509,7 +16511,6 @@ Made in Italy` })));
                     // 移动端h5直接杀掉浏览器或宿主app时不会触发，pc端直接杀掉标签页时能触发
                     if (repCond) {
                         SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_HIDE, item);
-                        // handleReportViewImageEnd(item);
                         handleReportProductView(item);
                     }
                     let fromKName = '';
@@ -16554,7 +16555,6 @@ Made in Italy` })));
                     // 页面可见时触发，注意页面初始化时不会触发
                     handleH5EnterLink();
                     if (repCond) {
-                        // handleViewImageStartEvent(activeIndex);
                         SXP_EVENT_BUS.emit(SXP_EVENT_TYPE.PAGE_DID_SHOW, item);
                         backMainFeed('external', selectTag);
                     }
@@ -16639,7 +16639,7 @@ Made in Italy` })));
                 return (React.createElement(VideoWidget$3, { key: isReload, rec: rec, index: index, muted: isMuted, data: data, height: height, activeIndex: activeIndex, videoPostConfig: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.videoPost, videoPlayIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.videoPlayIcon }));
             }
             if ((_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.imgUrls) {
-                return (React.createElement(PictureGroup$3, { key: rec === null || rec === void 0 ? void 0 : rec.video.itemId, imgUrls: rec === null || rec === void 0 ? void 0 : rec.video.imgUrls, width: containerWidth, height: height, rec: rec, index: index, onReportViewImageEnd: handleReportViewImageEnd, onViewImageStartEvent: handleViewImageStartEvent, imgUrlsPostConfig: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.imgUrlsPost }));
+                return (React.createElement(PictureGroup$3, { key: rec === null || rec === void 0 ? void 0 : rec.video.itemId, imgUrls: rec === null || rec === void 0 ? void 0 : rec.video.imgUrls, width: containerWidth, height: height, rec: rec, index: index, onViewImageEndEvent: handleViewImageStartEnd, onViewImageStartEvent: handleViewImageStartEvent, imgUrlsPostConfig: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.imgUrlsPost }));
             }
             if (rec.product && Array.isArray(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) && ((_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _c === void 0 ? void 0 : _c.length) > 0) {
                 return (_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _d === void 0 ? void 0 : _d.map((value, idx) => {
@@ -16713,7 +16713,7 @@ Made in Italy` })));
             if (!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowLike) || !visible)
                 return;
             let top = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconY) !== null && _a !== void 0 ? _a : 400;
-            if (waterFallData && top < 40) {
+            if (waterFallData && top < 40 && globalConfig.likeIconYPosit === 'top') {
                 top += 40;
             }
             if (rec === null || rec === void 0 ? void 0 : rec.video) {
@@ -16725,7 +16725,7 @@ Made in Italy` })));
             }
             return null;
         }, [globalConfig, waterFallData]);
-        const handleReportViewImageEnd = (item) => {
+        const handleViewImageStartEnd = (item) => {
             var _a, _b, _c, _d, _e, _f;
             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)) {
                 const endTime = Date.now();
@@ -16808,7 +16808,7 @@ Made in Italy` })));
                     }
                 });
                 //  如果上一个商品是图片集，需上报 浏览图片集结结束 事件
-                handleReportViewImageEnd(item);
+                handleViewImageStartEnd(item);
                 handleSlideSkip(item, swiper.previousIndex);
             }
             else {
@@ -16825,7 +16825,7 @@ Made in Italy` })));
                     }
                 });
                 //  如果上一个商品是图片集，需上报 浏览图片集结结束 事件
-                handleReportViewImageEnd(item);
+                handleViewImageStartEnd(item);
             }
             // 商品浏览事件
             handleReportProductView(item);
@@ -16846,7 +16846,7 @@ Made in Italy` })));
                 viewTime.current = new Date();
             }
         }, [openHashtag, data, activeIndex]);
-        const handleViewImageStartEvent = (activeIndex, imgInfo) => {
+        const handleViewImageStartEvent = (activeIndex, imgInfo, enableCapi) => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             const item = data[activeIndex];
             // 如果是图片集则上报事件
@@ -16868,29 +16868,35 @@ Made in Italy` })));
                         loadTime: imgInfo === null || imgInfo === void 0 ? void 0 : imgInfo.loadTime
                     }
                 });
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'ViewContent',
-                    product: (_g = item === null || item === void 0 ? void 0 : item.video) === null || _g === void 0 ? void 0 : _g.bindProduct
-                });
-                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                    eventName: 'PageView',
-                    product: (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.bindProduct
-                });
+                if (enableCapi) {
+                    bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                        eventName: 'ViewContent',
+                        product: (_g = item === null || item === void 0 ? void 0 : item.video) === null || _g === void 0 ? void 0 : _g.bindProduct
+                    });
+                    bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                        eventName: 'PageView',
+                        product: (_h = item === null || item === void 0 ? void 0 : item.video) === null || _h === void 0 ? void 0 : _h.bindProduct
+                    });
+                }
             }
         };
         const renderToggleButton = React.useCallback((visible) => {
             var _a, _b, _c, _d, _e, _f;
             if (!visible)
                 return;
+            let top = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconY) !== null && _a !== void 0 ? _a : 23;
+            if (waterFallData && top < 40 && (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconYPosit) === 'top') {
+                top += 40;
+            }
             return (((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowMute) === undefined || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowMute) === true) && (React.createElement(ToggleButton$1, { style: {
                     position: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconFixed) ? 'fixed' : 'absolute',
-                    visibility: ((_b = (_a = visList === null || visList === void 0 ? void 0 : visList[activeIndex]) === null || _a === void 0 ? void 0 : _a.video) === null || _b === void 0 ? void 0 : _b.url) ? 'visible' : 'hidden',
+                    visibility: ((_c = (_b = visList === null || visList === void 0 ? void 0 : visList[activeIndex]) === null || _b === void 0 ? void 0 : _b.video) === null || _c === void 0 ? void 0 : _c.url) ? 'visible' : 'hidden',
                     zIndex: 999,
                     transform: 'translate3d(0px,0px,0px)',
-                    [(_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconXPosit) !== null && _c !== void 0 ? _c : 'right']: (_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconX) !== null && _d !== void 0 ? _d : 0,
-                    [(_e = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconYPosit) !== null && _e !== void 0 ? _e : 'bottom']: (_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconY) !== null && _f !== void 0 ? _f : 23
+                    [(_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconXPosit) !== null && _d !== void 0 ? _d : 'right']: (_e = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconX) !== null && _e !== void 0 ? _e : 0,
+                    [(_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconYPosit) !== null && _f !== void 0 ? _f : 'bottom']: top
                 }, defaultValue: isMuted, activeIcon: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unMuteIcon) ? globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unMuteIcon : mutedIcon, unactiveIcon: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIcon) ? globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIcon : unmutedIcon, onChange: setIsMuted })));
-        }, [globalConfig, visList, activeIndex, isMuted]);
+        }, [globalConfig, visList, activeIndex, isMuted, waterFallData]);
         const renderView = React.useMemo(() => {
             if (loading) {
                 return (React.createElement("div", { style: { height, width: containerWidth, display: 'flex', justifyContent: 'center', alignItems: 'center' } },
@@ -16923,7 +16929,7 @@ Made in Italy` })));
             renderToggleButton
         ]);
         return (React.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container', style: Object.assign({}, ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset) && { textUnderlineOffset: `${globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset}px` })) },
-            waterFallData && (React.createElement(Navbar$1, { icon: img, styles: { background: 'rgba(0,0,0,.3)', color: '#fff' }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
+            waterFallData && (React.createElement(Navbar$1, { icon: img, styles: { background: 'rgba(0,0,0,.3)', color: '#fff', top: `${minusHeight}px` }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
                     const isEq = lodash.isEqual(rtcList, cacheRtcList);
                     if (!isEq && cacheRtcList && (cacheRtcList === null || cacheRtcList === void 0 ? void 0 : cacheRtcList.length)) {
                         setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList(cacheRtcList);