pb-sxp-ui 1.7.0 → 1.7.1

package/dist/pb-ui.js

@@ -812,64 +812,23 @@
                 type: 'beacon'
             });
         }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
-        const bffFbReport = React.useCallback(({ eventName, product }) => {
-            var _a, _b, _c, _d;
+        const bffFbReport = React.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]);
@@ -9398,14 +9357,9 @@
         React.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]);
         React.useEffect(() => {
             const initTime = () => {
@@ -10284,12 +10238,7 @@
         React.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]);
@@ -10914,7 +10863,7 @@ Made in Italy` })));
     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;
@@ -10944,11 +10893,6 @@ Made in Italy` })));
                 onClick === null || onClick === void 0 ? void 0 : onClick();
             }
         }, popup === null || popup === void 0 ? void 0 : popup.duration);
-        React.useEffect(() => {
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'PageView'
-            });
-        }, []);
         return (React.createElement("div", { className: css.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.css({
@@ -14466,22 +14410,17 @@ Made in Italy` })));
      * @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();
         React.useRef(null);
         const modalEleRef = React.useRef(null);
         const [viewTime, setViewTime] = React.useState();
-        React.useEffect(() => {
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'PageView'
-            });
-        }, []);
         React.useEffect(() => {
             const parentNode = document.getElementById('sxp-render');
             const node = document.getElementById('water-fall');
@@ -15856,18 +15795,17 @@ Made in Italy` })));
             };
         }, [isActive]);
         React.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]);
         /*
@@ -15889,11 +15827,9 @@ 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
+                    eventName: 'ViewContent'
                 });
             };
             const onHide = handleClickVideo('pause');
@@ -16380,7 +16316,7 @@ Made in Italy` })));
      * @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
      *
      */
@@ -16410,6 +16346,9 @@ Made in Italy` })));
             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 = React.useCallback(() => {
@@ -16418,8 +16357,11 @@ Made in Italy` })));
             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]);
         React.useEffect(() => {
             var _a;
             if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)
@@ -16724,7 +16666,7 @@ Made in Italy` })));
             }
         };
         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;
@@ -16771,8 +16713,7 @@ Made in Italy` })));
             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();
@@ -16793,7 +16734,7 @@ Made in Italy` })));
             }
         }, [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)) {
@@ -16813,8 +16754,7 @@ Made in Italy` })));
                     }
                 });
                 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'
                 });
             }
         };