pb-sxp-ui 1.7.1 → 1.7.2

package/es/core/components/SxpPageRender/Modal/index.js

@@ -1,5 +1,5 @@
 import { debounce } from 'lodash';
-import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import * as ReactDOM from 'react-dom';
 import { useEditor, useSxpDataSource } from '../../../../core/hooks';
 const closeIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII=';
@@ -15,7 +15,7 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
     const [isShow, setIsShow] = useState(false);
     const modalEleRef = useRef(null);
     const { globalConfig, popupDetailData } = useSxpDataSource();
-    const { schema: _schema } = useEditor();
+    const { schema: _schema, popup: _popup } = useEditor();
     const [scrollTop, setScrollTop] = useState(15);
     useEffect(() => {
         const parentNode = document.getElementById('sxp-render');
@@ -53,6 +53,9 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
             }, popup === null || popup === void 0 ? void 0 : popup.duration);
         }
     }, [isOpen, popup]);
+    const child = useCallback(() => {
+        return children;
+    }, [_popup]);
     if (!modalEleRef.current)
         return null;
     const handleClose = debounce(() => {
@@ -135,6 +138,6 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
                         var _a;
                         setScrollTop(15 - ((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.scrollTop));
                     }
-                })), children)))))), modalEleRef.current);
+                })), child())))))), modalEleRef.current);
 };
 export default memo(Modal);

package/es/core/components/SxpPageRender/VideoWidget/index.js

@@ -240,17 +240,18 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         };
     }, [isActive]);
     useEffect(() => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || !isLoadFinish)
             return;
         if (isActive) {
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ViewContent'
+                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
             });
-            (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
+            (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
         }
         else {
-            (_b = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _b === void 0 ? void 0 : _b.pause();
+            (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.pause();
         }
     }, [isActive, isLoadFinish, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
     useEffect(() => {
@@ -269,9 +270,11 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         if (!isActive)
             return;
         const onShow = () => {
+            var _a, _b;
             handleClickVideo('start')();
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ViewContent'
+                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');

package/es/core/components/SxpPageRender/WaterFall/index.js

@@ -9,7 +9,7 @@ import { useSxpDataSource } from '../../../../core/hooks';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 const WaterFall = (props) => {
     var _a;
-    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag } = useSxpDataSource();
+    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
     const { backMainFeed } = useEventReport();
     const ref = useRef(null);
     const modalEleRef = useRef(null);
@@ -78,8 +78,11 @@ const WaterFall = (props) => {
     useEffect(() => {
         if (openHashtag) {
             setViewTime(new Date());
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView'
+            });
         }
-    }, [openHashtag]);
+    }, [openHashtag, bffFbReport]);
     useEffect(() => {
         const initTime = () => {
             setViewTime(new Date());

package/es/core/components/SxpPageRender/index.d.ts

@@ -65,6 +65,7 @@ export interface ISxpPageRenderProps {
             yPosit: string;
             y: number;
         };
+        converApi?: any;
     };
     descStyle?: CSSProperties;
     tipText?: {

package/es/core/components/SxpPageRender/index.js

@@ -48,9 +48,6 @@ 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(() => {
@@ -59,11 +56,8 @@ 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, bffFbReport, h5EnterLink]);
+    }, [data.length, h5EnterLink]);
     useEffect(() => {
         var _a;
         if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)
@@ -229,7 +223,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = withBindDataSource(t);
                 const defaulSetting = (_b = t === null || t === void 0 ? void 0 : t.extend) === null || _b === void 0 ? void 0 : _b.defaulSetting;
-                return (React.createElement(Component, Object.assign({ key: `${index}${idx}`, textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.textStyle), bindDatas: (_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.bindDatas) !== null && _e !== void 0 ? _e : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.props, { event: ((_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.style), { height: '100%', overflow: 'auto' }), index: index })));
+                return (React.createElement(Component, Object.assign({ key: `${index}${idx}`, textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.textStyle), bindDatas: (_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.bindDatas) !== null && _e !== void 0 ? _e : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.props, { event: ((_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.style), { height: '100%', overflow: 'auto' }), index: index, isActive: activeIndex === index })));
             });
         }
         return null;
@@ -365,7 +359,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -407,12 +401,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             handleReportViewImageEnd(item);
         }
         handleReportProductView(item);
-        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'
-            });
-        }
         viewTime.current = new Date();
     };
     const handleReportProductView = (item) => {
@@ -431,7 +419,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     }, [openHashtag, data, activeIndex]);
     const handleViewImageStartEvent = (activeIndex) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         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)) {
             const startTime = Date.now();
@@ -450,7 +438,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 }
             });
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ViewContent'
+                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
             });
         }
     };

package/es/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/es/core/context/SxpDataSourceProvider.js

@@ -189,23 +189,65 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             type: 'beacon'
         });
     }, [bffFetch, curReqInfo, enableReportEvent, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);
-    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;
+    const bffFbReport = useCallback(({ eventName, product }) => {
+        var _a, _b, _c, _d;
         if (!enableReportEvent || !enabledMetaConversionApi || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
             return;
         }
-        const fakeUserId = 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: 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) {
+                                        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}` })), (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 : '' })
-            },
+            body: jsonParams,
             type: 'beacon'
         });
     }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview]);

package/es/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/es/materials/sxp/popup/CommodityDetail/index.js

@@ -14,7 +14,7 @@ import CommodityGroup from '../../template/components/CommodityGroup';
 import { getPriceText } from '../../../../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 = __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 = __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 } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
     const curTimeRef = useRef(null);
@@ -44,12 +44,17 @@ const CommodityDetail = (_a) => {
         }
     };
     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]);
     useEffect(() => {
         const initTime = () => {
             curTimeRef.current = new Date();

package/es/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/es/materials/sxp/popup/CommodityDetailDiro/index.js

@@ -10,7 +10,7 @@ import { useEventReport } from '../../../../core/hooks/useEventReport';
 import FormatImage from '../../../../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 = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "index"]);
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, index, isActive = true } = _a, props = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "index", "isActive"]);
     const [spread, setSpread] = useState(true);
     const { sxpParameter } = useSxpDataSource();
     const { popupDetailData, bffEventReport, isPreview, swiperRef, bffFbReport } = useSxpDataSource();
@@ -36,14 +36,21 @@ const CommodityDetailDiro = (_a) => {
         }
     };
     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]);
     useEffect(() => {
         const initTime = () => {
+            if (!isActive)
+                return;
             curTimeRef.current = new Date();
         };
         initTime();
@@ -51,7 +58,7 @@ const CommodityDetailDiro = (_a) => {
         return () => {
             window.removeEventListener('pageshow', initTime);
         };
-    }, []);
+    }, [isActive]);
     const priceText = 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/es/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/es/materials/sxp/popup/CommodityDetailDiroNew/index.js

@@ -14,7 +14,7 @@ import CommodityGroup from '../../template/components/CommodityGroup';
 import { getPriceText } from '../../../../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 = __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 = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle", "index", "commodityGroup", "popupBg", "iframeIcon", "commodityImgRatio", "isTel", "iframeBgColor", "isActive"]);
     const [spread, setSpread] = useState(true);
     const { sxpParameter, popupCurTimeRef, popupDetailData, isPreview, bffFbReport, checkCommodityIndexRef, globalConfig } = useSxpDataSource();
     const { jumpToWeb, productView } = useEventReport();
@@ -48,14 +48,21 @@ const CommodityDetailDiroNew = (_a) => {
         }
     };
     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]);
     useEffect(() => {
         const initTime = () => {
+            if (!isActive)
+                return;
             curTimeRef.current = new Date();
         };
         initTime();
@@ -63,7 +70,7 @@ const CommodityDetailDiroNew = (_a) => {
         return () => {
             window.removeEventListener('pageshow', initTime);
         };
-    }, []);
+    }, [isActive]);
     const priceText = getPriceText({
         product,
         enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,

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

@@ -1,6 +1,6 @@
 import { __rest } from "tslib";
 import { css } from '@emotion/css';
-import React, { memo, useCallback } from 'react';
+import React, { memo, useCallback, useEffect } from 'react';
 import { useEditor, useSxpDataSource } from '../../../../core/hooks';
 import './index.less';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
@@ -11,7 +11,7 @@ import { getPriceText } from '../../../../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 = __rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "commodityStyles", "buttonStyle", "translateY", "commodityPicture", "isExternalLink", "onClick"]);
-    const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig } = useSxpDataSource();
+    const { sxpParameter, popupDetailData, setPopupDetailData, ctaEvent, globalConfig, bffFbReport } = useSxpDataSource();
     const { jumpToWeb } = useEventReport();
     const { popup } = useEditor();
     const recData = isPost ? rec : popupDetailData;
@@ -41,6 +41,11 @@ const CommodityList = (_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({

package/lib/core/components/SxpPageRender/Modal/index.js

@@ -18,7 +18,7 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
     const [isShow, setIsShow] = (0, react_1.useState)(false);
     const modalEleRef = (0, react_1.useRef)(null);
     const { globalConfig, popupDetailData } = (0, hooks_1.useSxpDataSource)();
-    const { schema: _schema } = (0, hooks_1.useEditor)();
+    const { schema: _schema, popup: _popup } = (0, hooks_1.useEditor)();
     const [scrollTop, setScrollTop] = (0, react_1.useState)(15);
     (0, react_1.useEffect)(() => {
         const parentNode = document.getElementById('sxp-render');
@@ -56,6 +56,9 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
             }, popup === null || popup === void 0 ? void 0 : popup.duration);
         }
     }, [isOpen, popup]);
+    const child = (0, react_1.useCallback)(() => {
+        return children;
+    }, [_popup]);
     if (!modalEleRef.current)
         return null;
     const handleClose = (0, lodash_1.debounce)(() => {
@@ -138,6 +141,6 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
                         var _a;
                         setScrollTop(15 - ((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.scrollTop));
                     }
-                })), children)))))), modalEleRef.current);
+                })), child())))))), modalEleRef.current);
 };
 exports.default = (0, react_1.memo)(Modal);

package/lib/core/components/SxpPageRender/VideoWidget/index.js

@@ -243,17 +243,18 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         };
     }, [isActive]);
     (0, react_1.useEffect)(() => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || !isLoadFinish)
             return;
         if (isActive) {
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ViewContent'
+                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
             });
-            (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
+            (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
         }
         else {
-            (_b = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _b === void 0 ? void 0 : _b.pause();
+            (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.pause();
         }
     }, [isActive, isLoadFinish, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
     (0, react_1.useEffect)(() => {
@@ -272,9 +273,11 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         if (!isActive)
             return;
         const onShow = () => {
+            var _a, _b;
             handleClickVideo('start')();
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ViewContent'
+                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');

package/lib/core/components/SxpPageRender/WaterFall/index.js

@@ -12,7 +12,7 @@ const hooks_1 = require("../../../../core/hooks");
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterFall = (props) => {
     var _a;
-    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag } = (0, hooks_1.useSxpDataSource)();
+    const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed } = (0, useEventReport_1.useEventReport)();
     const ref = (0, react_1.useRef)(null);
     const modalEleRef = (0, react_1.useRef)(null);
@@ -81,8 +81,11 @@ const WaterFall = (props) => {
     (0, react_1.useEffect)(() => {
         if (openHashtag) {
             setViewTime(new Date());
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'PageView'
+            });
         }
-    }, [openHashtag]);
+    }, [openHashtag, bffFbReport]);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
             setViewTime(new Date());

package/lib/core/components/SxpPageRender/index.d.ts

@@ -65,6 +65,7 @@ export interface ISxpPageRenderProps {
             yPosit: string;
             y: number;
         };
+        converApi?: any;
     };
     descStyle?: CSSProperties;
     tipText?: {

package/lib/core/components/SxpPageRender/index.js

@@ -51,9 +51,6 @@ 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 = (0, react_1.useCallback)(() => {
@@ -62,11 +59,8 @@ 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, bffFbReport, h5EnterLink]);
+    }, [data.length, h5EnterLink]);
     (0, react_1.useEffect)(() => {
         var _a;
         if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)
@@ -232,7 +226,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = (0, withBindDataSource_1.default)(t);
                 const defaulSetting = (_b = t === null || t === void 0 ? void 0 : t.extend) === null || _b === void 0 ? void 0 : _b.defaulSetting;
-                return (react_1.default.createElement(Component, Object.assign({ key: `${index}${idx}`, textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.textStyle), bindDatas: (_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.bindDatas) !== null && _e !== void 0 ? _e : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.props, { event: ((_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.style), { height: '100%', overflow: 'auto' }), index: index })));
+                return (react_1.default.createElement(Component, Object.assign({ key: `${index}${idx}`, textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.textStyle), bindDatas: (_e = (_d = value === null || value === void 0 ? void 0 : value.item) === null || _d === void 0 ? void 0 : _d.bindDatas) !== null && _e !== void 0 ? _e : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.props, { event: ((_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.style), { height: '100%', overflow: 'auto' }), index: index, isActive: activeIndex === index })));
             });
         }
         return null;
@@ -368,7 +362,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const item = data[swiper.previousIndex];
         if (!item)
             return;
@@ -410,12 +404,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             handleReportViewImageEnd(item);
         }
         handleReportProductView(item);
-        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'
-            });
-        }
         viewTime.current = new Date();
     };
     const handleReportProductView = (item) => {
@@ -434,7 +422,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     }, [openHashtag, data, activeIndex]);
     const handleViewImageStartEvent = (activeIndex) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         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)) {
             const startTime = Date.now();
@@ -453,7 +441,12 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 }
             });
             bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ViewContent'
+                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
             });
         }
     };