pb-sxp-ui 1.7.1 → 1.7.2

package/lib/core/context/SxpDataSourceProvider.d.ts

@@ -67,10 +67,8 @@ export interface ISxpDataSourceContext {
     videoRef?: any;
     setVideoRef?: React.Dispatch<React.SetStateAction<any>>;
     bffFbReport?: (body: {
-        eventName: string;
-        actionSource?: string;
-        eventSourceUrl?: string;
-        externalId?: string;
+        eventName: 'PageView' | 'ProductView' | 'ViewContent';
+        product?: any;
     }) => Promise<any> | undefined | boolean;
     curTime?: any;
     h5EnterLink?: () => void;

package/lib/core/context/SxpDataSourceProvider.js

@@ -192,23 +192,65 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             type: 'beacon'
         });
     }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
-    const bffFbReport = (0, react_1.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;
+    const bffFbReport = (0, react_1.useCallback)(({ eventName, product }) => {
+        var _a, _b, _c, _d;
         if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
-        const fakeUserId = (0, localStore_1.storeAndLoadFeUserId)();
+        let jsonParams = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _a === void 0 ? void 0 : _a[eventName];
         const urlParams = new URLSearchParams(window.location.search);
-        const fbclid = urlParams.get('fbclid');
+        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: (0, localStore_1.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: (0, tool_1.getCookie)('_fbp') ? `fb.2.${new Date().getTime()}.${(0, tool_1.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) {
+                                        delete obj[key];
+                                        console.error('An error occurred:', error === null || error === void 0 ? void 0 : error.message);
+                                    }
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        getEventParams(jsonParams);
         return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/fb/events', {
             method: 'POST',
-            body: {
-                eventName,
-                actionSource,
-                eventSourceUrl,
-                userData: Object.assign(Object.assign(Object.assign({ externalId: fakeUserId }, (fbclid && { fbc: `fb.2.${new Date().getTime()}.${fbclid}` })), ((0, tool_1.getCookie)('_fbp') && { fbp: `fb.2.${new Date().getTime()}.${(0, tool_1.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 : '' })
-            },
+            body: jsonParams,
             type: 'beacon'
         });
     }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);

package/lib/materials/sxp/popup/CommodityDetail/index.d.ts

@@ -52,6 +52,7 @@ export interface ICommodityDetailProps {
     };
     isTel?: boolean;
     iframeBgColor?: string;
+    isActive?: boolean;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailProps>;
 export default _default;

package/lib/materials/sxp/popup/CommodityDetail/index.js

@@ -16,7 +16,7 @@ const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/compone
 const materials_1 = require("../../../../core/utils/materials");
 const CommodityDetail = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
-    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = tslib_1.__rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
+    var { content, style, bgImg, onClick, schema, isDefault, bottom_image, tipText, isPost, viewTime, rec, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor, isActive = true } = _a, props = tslib_1.__rest(_a, ["content", "style", "bgImg", "onClick", "schema", "isDefault", "bottom_image", "tipText", "isPost", "viewTime", "rec", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor", "isActive"]);
     const { sxpParameter, popupDetailData, isPreview, bffFbReport, popupCurTimeRef, checkCommodityIndexRef, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
     const curTimeRef = (0, react_1.useRef)(null);
@@ -46,12 +46,17 @@ const CommodityDetail = (_a) => {
         }
     };
     (0, react_1.useEffect)(() => {
-        if (!isPost) {
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView'
-            });
-        }
-    }, [isPost, bffFbReport]);
+        if (!isActive)
+            return;
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'ProductView',
+            product
+        });
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'PageView',
+            product
+        });
+    }, [isActive, bffFbReport]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
             curTimeRef.current = new Date();

package/lib/materials/sxp/popup/CommodityDetailDiro/index.d.ts

@@ -14,6 +14,7 @@ export interface ICommodityDetailDiroProps {
     isPost?: boolean;
     bottom_image?: string;
     index?: number;
+    isActive?: boolean;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroProps>;
 export default _default;

package/lib/materials/sxp/popup/CommodityDetailDiro/index.js

@@ -12,7 +12,7 @@ const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/FormatImage"));
 const CommodityDetailDiro = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, index } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "index"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, index, isActive = true } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "index", "isActive"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
     const { sxpParameter } = (0, hooks_1.useSxpDataSource)();
     const { popupDetailData, bffEventReport, isPreview, swiperRef, bffFbReport } = (0, hooks_1.useSxpDataSource)();
@@ -38,14 +38,21 @@ const CommodityDetailDiro = (_a) => {
         }
     };
     (0, react_1.useEffect)(() => {
-        if (!isPost) {
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView'
-            });
-        }
-    }, [isPost, bffFbReport]);
+        if (!isActive)
+            return;
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'ProductView',
+            product
+        });
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'PageView',
+            product
+        });
+    }, [isActive, bffFbReport]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
+            if (!isActive)
+                return;
             curTimeRef.current = new Date();
         };
         initTime();
@@ -53,7 +60,7 @@ const CommodityDetailDiro = (_a) => {
         return () => {
             window.removeEventListener('pageshow', initTime);
         };
-    }, []);
+    }, [isActive]);
     const priceText = (0, react_1.useMemo)(() => {
         var _a, _b, _c, _d, _e;
         if ((product === null || product === void 0 ? void 0 : product.currency) && (product === null || product === void 0 ? void 0 : product.price)) {

package/lib/materials/sxp/popup/CommodityDetailDiroNew/index.d.ts

@@ -52,6 +52,7 @@ export interface ICommodityDetailDiroNewProps {
     };
     isTel?: boolean;
     iframeBgColor?: string;
+    isActive?: boolean;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroNewProps>;
 export default _default;

package/lib/materials/sxp/popup/CommodityDetailDiroNew/index.js

@@ -16,7 +16,7 @@ const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/compone
 const materials_1 = require("../../../../core/utils/materials");
 const CommodityDetailDiroNew = (_a) => {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle, index, commodityGroup, popupBg, iframeIcon, commodityImgRatio, isTel, iframeBgColor, isActive = true } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor", "isActive"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
     const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb, productView } = (0, useEventReport_1.useEventReport)();
@@ -50,14 +50,21 @@ const CommodityDetailDiroNew = (_a) => {
         }
     };
     (0, react_1.useEffect)(() => {
-        if (!isPost) {
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ProductView'
-            });
-        }
-    }, [isPost, bffFbReport]);
+        if (!isActive)
+            return;
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'ProductView',
+            product
+        });
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'PageView',
+            product
+        });
+    }, [isActive, bffFbReport]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
+            if (!isActive)
+                return;
             curTimeRef.current = new Date();
         };
         initTime();
@@ -65,7 +72,7 @@ const CommodityDetailDiroNew = (_a) => {
         return () => {
             window.removeEventListener('pageshow', initTime);
         };
-    }, []);
+    }, [isActive]);
     const priceText = (0, materials_1.getPriceText)({
         product,
         enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,

package/lib/materials/sxp/popup/CommodityList/index.js

@@ -13,7 +13,7 @@ const materials_1 = require("../../../../core/utils/materials");
 const CommodityList = (_a) => {
     var _b, _c, _d;
     var { style, isDefault, rec, viewTime, isPost, bottom_image, commodityStyles, buttonStyle, translateY = 0, commodityPicture, isExternalLink, onClick } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "commodityStyles", "buttonStyle", "translateY", "commodityPicture", "isExternalLink", "onClick"]);
-    const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig } = (0, hooks_1.useSxpDataSource)();
+    const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const { jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const { popup } = (0, hooks_1.useEditor)();
     const recData = isPost ? rec : popupDetailData;
@@ -43,6 +43,11 @@ const CommodityList = (_a) => {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
     }, popup === null || popup === void 0 ? void 0 : popup.duration);
+    (0, react_1.useEffect)(() => {
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'PageView'
+        });
+    }, []);
     return (react_1.default.createElement("div", { className: (0, css_1.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_1.default.createElement(react_1.default.Fragment, null, recData && !(item === null || item === void 0 ? void 0 : item.bindCta) ? null : (react_1.default.createElement("div", Object.assign({ key: index }, props, { className: (0, css_1.css)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pb-sxp-ui",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "React enterprise-class UI components",
   "main": "dist/index.cjs",
   "module": "dist/index.js",