pb-sxp-ui 1.7.0 → 1.7.1

package/dist/index.css

@@ -574,6 +574,7 @@
   width: -webkit-fill-available;
   padding: 0;
   border: none;
+  display: block;
 }
 .commondityDiroNew-swiper-clickable-left {
   padding-left: 17px !important ;

package/dist/index.js

@@ -797,64 +797,23 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             type: 'beacon'
         });
     }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
-    const bffFbReport = useCallback(({ eventName, product }) => {
-        var _a, _b, _c, _d;
+    const bffFbReport = useCallback((_a) => {
+        var _b, _c, _d;
+        var { eventName, actionSource = 'website', eventSourceUrl = (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.href, externalId } = _a;
         if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
-        let jsonParams = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName];
+        const fakeUserId = storeAndLoadFeUserId();
         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,
-            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 : '',
-            fbc: fbclid ? `fb.2.${new Date().getTime()}.${fbclid}` : '',
-            fbp: getCookie('_fbp') ? `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` : '',
-            time: new Date().getTime()
-        };
-        const regex = /\{\{(.*?)\}\}/g;
-        const getEventParams = (obj) => {
-            if (!obj)
-                return;
-            if (obj instanceof Array) {
-                obj === null || obj === void 0 ? void 0 : obj.map((item) => getEventParams(item));
-            }
-            else {
-                for (const key in obj) {
-                    if (obj.hasOwnProperty(key)) {
-                        const value = obj === null || obj === void 0 ? void 0 : obj[key];
-                        if (typeof value === 'object') {
-                            getEventParams(value);
-                        }
-                        else if (typeof value === 'string') {
-                            const matches = value === null || value === void 0 ? void 0 : value.match(regex);
-                            if (matches) {
-                                matches.forEach((match) => {
-                                    const prop = match.substring(2, match.length - 2);
-                                    try {
-                                        const replaceValue = new Function('fix_par', 'product', `return ${prop}`)(fix_par, product);
-                                        if (replaceValue) {
-                                            obj[key] = replaceValue;
-                                        }
-                                        else {
-                                            delete obj[key];
-                                        }
-                                    }
-                                    catch (error) {
-                                        console.error('An error occurred:', error === null || error === void 0 ? void 0 : error.message);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        };
-        getEventParams(jsonParams);
+        const fbclid = urlParams.get('fbclid');
         return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
             method: 'POST',
-            body: jsonParams,
+            body: {
+                eventName,
+                actionSource,
+                eventSourceUrl,
+                userData: Object.assign(Object.assign(Object.assign({ externalId: fakeUserId }, (fbclid && { fbc: `fb.2.${new Date().getTime()}.${fbclid}` })), (getCookie('_fbp') && { fbp: `fb.2.${new Date().getTime()}.${getCookie('_fbp')}` })), { clientUserAgent: (_d = (_c = window === null || window === void 0 ? void 0 : window.navigator) === null || _c === void 0 ? void 0 : _c.userAgent) !== null && _d !== void 0 ? _d : '' })
+            },
             type: 'beacon'
         });
     }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
@@ -9383,14 +9342,9 @@ const CommodityDetail$1 = (_a) => {
     useEffect(() => {
         if (!isPost) {
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView',
-                product
+                eventName: 'ProductView'
             });
         }
-        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-            eventName: 'PageView',
-            product
-        });
     }, [isPost, bffFbReport]);
     useEffect(() => {
         const initTime = () => {
@@ -10269,12 +10223,7 @@ const CommodityDetailDiroNew$1 = (_a) => {
     useEffect(() => {
         if (!isPost) {
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView',
-                product
-            });
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'PageView',
-                product
+                eventName: 'ProductView'
             });
         }
     }, [isPost, bffFbReport]);
@@ -10899,7 +10848,7 @@ var Img$1 = memo(Img);
 const CommodityList$1 = (_a) => {
     var _b, _c, _d;
     var { style, isDefault, rec, viewTime, isPost, bottom_image, commodityStyles, buttonStyle, translateY = 0, commodityPicture, isExternalLink, onClick } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "commodityStyles", "buttonStyle", "translateY", "commodityPicture", "isExternalLink", "onClick"]);
-    const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig, bffFbReport } = useSxpDataSource();
+    const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig } = useSxpDataSource();
     const { jumpToWeb } = useEventReport();
     const { popup } = useEditor();
     const recData = isPost ? rec : popupDetailData;
@@ -10929,11 +10878,6 @@ const CommodityList$1 = (_a) => {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
     }, popup === null || popup === void 0 ? void 0 : popup.duration);
-    useEffect(() => {
-        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-            eventName: 'PageView'
-        });
-    }, []);
     return (React.createElement("div", { className: css(Object.assign(Object.assign({}, style), { display: 'flex', flexDirection: 'column', gap: '10px', padding: '0 20px', marginTop: '50px', boxSizing: 'border-box' })) }, product === null || product === void 0 ? void 0 : product.map((item, index) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return (React.createElement(React.Fragment, null, recData && !(item === null || item === void 0 ? void 0 : item.bindCta) ? null : (React.createElement("div", Object.assign({ key: index }, props, { className: css({
@@ -14451,22 +14395,17 @@ function WaterfallList(_a) {
  * @Author: binruan@chatlabs.com
  * @Date: 2024-01-10 10:58:24
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-10-18 18:59:47
+ * @LastEditTime: 2024-10-11 13:43:22
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\WaterFall\index.tsx
  *
  */
 const WaterFall = (props) => {
     var _a;
-    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
+    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag } = useSxpDataSource();
     const { backMainFeed } = useEventReport();
     useRef(null);
     const modalEleRef = useRef(null);
     const [viewTime, setViewTime] = useState();
-    useEffect(() => {
-        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-            eventName: 'PageView'
-        });
-    }, []);
     useEffect(() => {
         const parentNode = document.getElementById('sxp-render');
         const node = document.getElementById('water-fall');
@@ -15841,18 +15780,17 @@ const VideoWidget$2 = ({ rec, index, height, data, muted, activeIndex, videoPost
         };
     }, [isActive]);
     useEffect(() => {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || !isLoadFinish)
             return;
         if (isActive) {
             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
+                eventName: 'ViewContent'
             });
-            (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
+            (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
         }
         else {
-            (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.pause();
+            (_b = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _b === void 0 ? void 0 : _b.pause();
         }
     }, [isActive, isLoadFinish, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
     /*
@@ -15874,11 +15812,9 @@ const VideoWidget$2 = ({ rec, index, height, data, muted, activeIndex, videoPost
         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
+                eventName: 'ViewContent'
             });
         };
         const onHide = handleClickVideo('pause');
@@ -16365,7 +16301,7 @@ var Tagbar$1 = memo(Tagbar);
  * @Author: binruan@chatlabs.com
  * @Date: 2024-01-15 19:03:09
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-10-18 18:54:40
+ * @LastEditTime: 2024-10-17 17:16:42
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
  *
  */
@@ -16395,6 +16331,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
             const now = new Date();
             viewTime.current = now;
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView'
+            });
         }
     }, [data === null || data === void 0 ? void 0 : data.length]);
     const handleH5EnterLink = useCallback(() => {
@@ -16403,8 +16342,11 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         if (data.length > 0) {
             const now = new Date();
             viewTime.current = now;
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView'
+            });
         }
-    }, [data.length, h5EnterLink]);
+    }, [data.length, bffFbReport, h5EnterLink]);
     useEffect(() => {
         var _a;
         if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)
@@ -16709,7 +16651,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     };
     const handleScrollEvent = (swiper) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -16756,8 +16698,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         const curItem = data[swiper.activeIndex];
         if (!((_r = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _r === void 0 ? void 0 : _r.url) && !((_s = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _s === void 0 ? void 0 : _s.imgUrls) && (curItem === null || curItem === void 0 ? void 0 : curItem.product)) {
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView',
-                product: (_t = curItem === null || curItem === void 0 ? void 0 : curItem.video) === null || _t === void 0 ? void 0 : _t.bindProduct
+                eventName: 'ProductView'
             });
         }
         viewTime.current = new Date();
@@ -16778,7 +16719,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     }, [openHashtag, data, activeIndex]);
     const handleViewImageStartEvent = (activeIndex) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const item = data[activeIndex];
         // 如果是图片集则上报事件
         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)) {
@@ -16798,8 +16739,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 }
             });
             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
+                eventName: 'ViewContent'
             });
         }
     };