pb-sxp-ui 1.15.21 → 1.15.22-alpha.2

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

@@ -5,13 +5,13 @@ const react_1 = tslib_1.__importStar(require("react"));
 const react_2 = require("swiper/react");
 const useIconLink_1 = require("../useIconLink");
 const FormatImage_1 = tslib_1.__importDefault(require("../FormatImage"));
-const hooks_1 = require("../../../../core/hooks");
-const event_1 = tslib_1.__importStar(require("../../../../core/utils/event"));
 const loading_gif_1 = tslib_1.__importDefault(require("./loading.gif"));
 const VideoPlayer_1 = require("./VideoPlayer");
-const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostConfig, videoPlayIcon }) => {
+const hooks_1 = require("../../../../core/hooks");
+const event_1 = tslib_1.__importStar(require("../../../../core/utils/event"));
+const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted, activeIndex, videoPostConfig, videoPlayIcon, loopPlay, swiperRef }, ref) => {
     const [isPauseVideo, setIsPauseVideo] = (0, react_1.useState)(false);
-    const { bffEventReport, sxpParameter, waterFallData, openHashtag, bffFbReport } = (0, hooks_1.useSxpDataSource)();
+    const { bffEventReport, sxpParameter, waterFallData, openHashtag, bffFbReport, isDiyH5 } = (0, hooks_1.useSxpDataSource)();
     const videoStartTime = (0, react_1.useRef)(0);
     const [isLoadFinish, setIsLoadFinish] = (0, react_1.useState)(false);
     const { isActive } = (0, react_2.useSwiperSlide)();
@@ -25,6 +25,18 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
     const initTimeRef = (0, react_1.useRef)();
     const loadedTimeRef = (0, react_1.useRef)();
     const isFirstPlayRef = (0, react_1.useRef)(true);
+    const loopPlayRef = (0, react_1.useRef)(loopPlay);
+    const scene = rec.video.scene;
+    (0, react_1.useImperativeHandle)(ref, () => {
+        return {
+            setLoopPlay(v) {
+                loopPlayRef.current = v;
+            }
+        };
+    });
+    (0, react_1.useEffect)(() => {
+        loopPlayRef.current = loopPlay;
+    }, [loopPlay]);
     const blur = (0, react_1.useMemo)(() => {
         return (videoPostConfig === null || videoPostConfig === void 0 ? void 0 : videoPostConfig.mode) === '2';
     }, [videoPostConfig]);
@@ -112,12 +124,15 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
     const handleLoadedmetadata = (0, react_1.useCallback)(() => {
         if (!videoRef.current)
             return;
+        if (isDiyH5) {
+            videoRef.current.currentTime = scene === null || scene === void 0 ? void 0 : scene.startTime;
+        }
         loadedTimeRef.current = new Date();
         handleStartPlay();
         handLoadeddata();
     }, [videoRef.current, handLoadeddata, handleStartPlay]);
     const handleClickVideo = (0, react_1.useCallback)((type) => () => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (!videoRef.current)
             return;
         if (!isLoadFinish)
@@ -138,10 +153,13 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
                 break;
             default:
                 if (isPause) {
-                    (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.play();
+                    if (isDiyH5 && Math.round((_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.currentTime) >= (scene === null || scene === void 0 ? void 0 : scene.endTime)) {
+                        videoRef.current.currentTime = scene === null || scene === void 0 ? void 0 : scene.startTime;
+                    }
+                    (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.play();
                 }
                 else {
-                    (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.pause();
+                    (_f = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _f === void 0 ? void 0 : _f.pause();
                 }
                 setIsPauseVideo(!isPause);
                 break;
@@ -178,8 +196,27 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
     const handleWaiting = (0, react_1.useCallback)(() => {
         setWaiting(true);
     }, []);
+    const handleTimeUpload = () => {
+        if (!videoRef.current || !isDiyH5)
+            return;
+        setTimeout(() => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            if (Math.round((_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.currentTime) >= ((_b = scene === null || scene === void 0 ? void 0 : scene.endTime) !== null && _b !== void 0 ? _b : 0)) {
+                (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.pause();
+                if (!loopPlayRef.current)
+                    return;
+                if (index === (data === null || data === void 0 ? void 0 : data.length) - 1) {
+                    (_e = (_d = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _d === void 0 ? void 0 : _d.swiper) === null || _e === void 0 ? void 0 : _e.slideTo(0);
+                }
+                else {
+                    const i = (_g = (_f = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _f === void 0 ? void 0 : _f.swiper) === null || _g === void 0 ? void 0 : _g.activeIndex;
+                    (_j = (_h = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _h === void 0 ? void 0 : _h.swiper) === null || _j === void 0 ? void 0 : _j.slideTo(i + 1);
+                }
+            }
+        });
+    };
     (0, react_1.useEffect)(() => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (!isActive)
             return;
         const videoSrc = rec === null || rec === void 0 ? void 0 : rec.video.url;
@@ -200,6 +237,7 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
             hls === null || hls === void 0 ? void 0 : hls.attachMedia(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current);
             hls === null || hls === void 0 ? void 0 : hls.on(Hls.Events.MANIFEST_PARSED, function () {
                 var _a;
+                videoRef.current.currentTime = scene === null || scene === void 0 ? void 0 : scene.startTime;
                 (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
             });
         }
@@ -216,8 +254,9 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.addEventListener('ended', handlePlay);
         (_j = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _j === void 0 ? void 0 : _j.addEventListener('canplay', handlePlay);
         (_k = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _k === void 0 ? void 0 : _k.addEventListener('waiting', handleWaiting);
+        (_l = videoRef.current) === null || _l === void 0 ? void 0 : _l.addEventListener('timeupdate', handleTimeUpload);
         return () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const isPause = (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.paused;
             if (!isPause)
                 handlePause();
@@ -232,6 +271,7 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
             (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.removeEventListener('ended', handlePlay);
             (_j = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _j === void 0 ? void 0 : _j.removeEventListener('canplay', handlePlay);
             (_k = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _k === void 0 ? void 0 : _k.removeEventListener('waiting', handleWaiting);
+            (_l = videoRef.current) === null || _l === void 0 ? void 0 : _l.removeEventListener('timeupdate', handleTimeUpload);
         };
     }, [isActive]);
     (0, react_1.useEffect)(() => {
@@ -349,6 +389,6 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex, videoPostCo
         react_1.default.createElement("div", { className: 'n-full-screen', ref: videoEleRef, id: videoId, style: { width: '100%', height: '100%' } }),
         renderPoster,
         renderLoading,
-        isPauseVideo && react_1.default.createElement(FormatImage_1.default, { className: 'clc-pb-video-pause', src: videoPlayIcon !== null && videoPlayIcon !== void 0 ? videoPlayIcon : PAUSE_ICON, alt: 'pause' })))));
-};
+        isPauseVideo && (react_1.default.createElement(FormatImage_1.default, { className: 'clc-pb-video-pause', src: videoPlayIcon !== null && videoPlayIcon !== void 0 ? videoPlayIcon : PAUSE_ICON, alt: 'pause' }))))));
+});
 exports.default = (0, react_1.memo)(VideoWidget);

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

@@ -67,7 +67,6 @@ export interface ISxpPageRenderProps {
             y: number;
         };
         converApi?: any;
-        pixel?: any;
         consentPopup?: any;
         multiPosts?: any;
         playbook?: 'paid media' | 'organic menu';

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

@@ -44,7 +44,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     const [isReload, setIsReload] = (0, react_1.useState)(new Date().getTime());
     const skipLinkRef = (0, react_1.useRef)(false);
     const [pageNum, setPageNum] = (0, react_1.useState)(2);
-    const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, isNoMoreData, channel, refreshFeSession } = (0, hooks_1.useSxpDataSource)();
+    const videoWidgetRef = (0, react_1.useRef)(null);
+    const { loadVideos, bffEventReport, loading, setPopupDetailData, ctaEvent, swiperRef, waterFallData, setOpenHashtag, appDomain, openHashtag, loadingImage, isFromHashtag, popupDetailData, bffFbReport, curTime, h5EnterLink, isShowConsent, selectTag, isPreview, isEditor, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, isNoMoreData, channel, refreshFeSession, isDiyH5 } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed, productView, jumpToWeb } = (0, useEventReport_1.useEventReport)();
     const isShowFingerTip = (0, react_1.useMemo)(() => {
         return data.length > 0 && !loading && ((0, localStore_1.getFeUserState)() || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableSwiperTip));
@@ -179,6 +180,8 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         refreshFeSession
     ]);
     const handleSessionExpire = (0, react_1.useCallback)((0, lodash_1.debounce)(() => {
+        var _a;
+        (_a = videoWidgetRef.current) === null || _a === void 0 ? void 0 : _a.setLoopPlay(false);
         refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(false, handleSessionCompleted);
     }, 1000), [handleSessionCompleted, refreshFeSession]);
     (0, react_1.useEffect)(() => {
@@ -253,7 +256,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             return (react_1.default.createElement(MultiPosts_1.default, Object.assign({ recData: data === null || data === void 0 ? void 0 : data[1] }, (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props, (_f = (_e = (_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.item) === null || _f === void 0 ? void 0 : _f.event)));
         }
         if ((_g = rec === null || rec === void 0 ? void 0 : rec.video) === null || _g === void 0 ? void 0 : _g.url) {
-            return (react_1.default.createElement(VideoWidget_1.default, { 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 }));
+            return (react_1.default.createElement(VideoWidget_1.default, Object.assign({ key: isReload }, (activeIndex === index && { ref: videoWidgetRef }), { 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, loopPlay: true, swiperRef: swiperRef })));
         }
         if ((_h = rec === null || rec === void 0 ? void 0 : rec.video) === null || _h === void 0 ? void 0 : _h.imgUrls) {
             return (react_1.default.createElement(PictureGroup_1.default, { 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 }));
@@ -597,7 +600,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 if (openHashtag)
                     return;
                 handleScrollEvent(swiper);
-                if (waterFallData || isEditor)
+                if (waterFallData || isEditor || isDiyH5)
                     return;
                 if ((swiper === null || swiper === void 0 ? void 0 : swiper.activeIndex) + 1 >= (data === null || data === void 0 ? void 0 : data.length)) {
                     if (!isLoadMore) {

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

@@ -47,6 +47,24 @@ export type ProductInfoType = {
     cover?: string;
     remark?: string;
 };
+export interface IScene {
+    blueprintStep: number;
+    endTime: number;
+    itemId: string;
+    mediaFileNo: string;
+    mediaUrl: string;
+    position: number;
+    postId: string;
+    sceneId: string;
+    sceneInfo: string;
+    sceneTag: string;
+    startTime: number;
+    traceInfo: string;
+    cover: string;
+    bindProducts?: any[];
+    title?: string;
+}
+export type ScenesType = IScene[];
 export type VideoInfoType = {
     bindCtaId: string;
     bindProductId: string;
@@ -65,6 +83,7 @@ export type VideoInfoType = {
     bindProduct: ProductInfoType;
     bindCta: CTAInfoType;
     hashTags: string[];
+    scene: IScene;
 };
 export type RecommendVideoResultType = {
     recList: Array<RecItemType>;

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

@@ -72,7 +72,7 @@ export interface ISxpDataSourceContext {
     bffFbReport?: (body: {
         eventName: 'PageView' | 'ProductView' | 'ViewContent';
         product?: any;
-    }) => void;
+    }) => Promise<any> | undefined | boolean;
     curTime?: any;
     h5EnterLink?: () => void;
     themeTag?: any;
@@ -92,6 +92,7 @@ export interface ISxpDataSourceContext {
     refreshFeSession?: (enableReSid?: boolean, event?: (fk: string) => void) => void;
     getAccount?: () => Promise<any>;
     accountSonsent?: (v: boolean) => Promise<boolean>;
+    isDiyH5?: boolean;
 }
 export declare const SxpDataSourceContext: React.Context<ISxpDataSourceContext>;
 export interface SxpDataSourceProviderProps {
@@ -133,6 +134,7 @@ export interface SxpDataSourceProviderProps {
     channelQueryList?: any[];
     data?: PageData;
     dataList?: PageData[];
+    isDiyH5?: boolean;
     onUpdateSchema?: (d: PageData['data']) => void;
     onUpdateChannel?: (d: string) => void;
 }

package/lib/core/context/SxpDataSourceProvider.js

@@ -20,7 +20,7 @@ var DataSourceType;
     DataSourceType[DataSourceType["BFF"] = 5] = "BFF";
 })(DataSourceType || (DataSourceType = {}));
 exports.DEFAULT_TAG = 'FOR U';
-const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent = true, maxSize, defaultSize, isPreview = false, sxpParameter, appDomain, hashTagSize, loadingImage, isOpenHashTag = false, enabledMetaConversionApi = false, consentHeight, consentWidth, isOpenConsent = false, isEditor = false, utmParameter, channelQueryList, data, dataList, onUpdateSchema, onUpdateChannel }) => {
+const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent = true, maxSize, defaultSize, isPreview = false, sxpParameter, appDomain, hashTagSize, loadingImage, isOpenHashTag = false, enabledMetaConversionApi = false, consentHeight, consentWidth, isOpenConsent = false, isEditor = false, utmParameter, channelQueryList, data, dataList, isDiyH5, onUpdateSchema, onUpdateChannel }) => {
     var _a, _b, _c, _d, _e;
     const [rtcList, setRtcList] = (0, react_1.useState)([]);
     const [tagList, setTagList] = (0, react_1.useState)([]);
@@ -108,7 +108,6 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return ((_a = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _a === void 0 ? void 0 : _a['x-app-id']) + (0, localStore_1.storeAndLoadFeUserId)();
     }, [bffDataSource]);
     const bffFetch = (0, react_1.useCallback)((path, options) => {
-        var _a, _b;
         if (!bffDataSource)
             return;
         const url = bffDataSource.url;
@@ -116,33 +115,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             const queryString = qs_1.default.stringify(options.query);
             path = `${path}?${queryString}`;
         }
-        let isTikTokChannel = false;
-        const params = {};
-        const queryString = location.search.slice(1);
-        (_a = (0, tool_1.splitUrlParams)(queryString)) === null || _a === void 0 ? void 0 : _a.forEach((val) => {
-            const key = val.split('=')[0];
-            const value = val.split('=')[1];
-            params[key] = value;
-        });
-        const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
-        if (cl_source &&
-            ((_b = [
-                '40A-SPRK--DRESS_EYEWEAR-',
-                '41A-SPRK--MADRAGUE-',
-                '42A-SPRK--MOOD-',
-                '43A-SPRK--SUMMER-',
-                '44A-SPRK--DRESS_EYEWEAR-',
-                '45A-SPRK--MADRAGUE-',
-                '46A-SPRK--MOOD-',
-                '47A-SPRK--SUMMER-',
-                '48A-SPRK--DRESS_EYEWEAR-',
-                '49A-SPRK--MADRAGUE-',
-                '50A-SPRK--MOOD-',
-                '51A-SPRK--SUMMER-'
-            ]) === null || _b === void 0 ? void 0 : _b.includes(cl_source))) {
-            isTikTokChannel = true;
-        }
-        if (options.type === 'beacon' && navigator.sendBeacon && !isTikTokChannel) {
+        if (options.type === 'beacon' && navigator.sendBeacon) {
             return navigator.sendBeacon(`${url}/api/${path}`, new Blob([
                 JSON.stringify({
                     body: btoa(encodeURIComponent(JSON.stringify(Object.assign(Object.assign(Object.assign({}, options.body), bffDataSource.headers), { 'x-user-id': fakeUserId }))))
@@ -152,11 +125,11 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             }));
         }
         return window
-            .fetch(`${url}/api/${path}`, Object.assign({ headers: Object.assign({ 'Content-Type': 'application/json', 'x-user-id': fakeUserId }, bffDataSource.headers), method: options.method, body: isTikTokChannel
-                ? JSON.stringify({
-                    body: btoa(encodeURIComponent(JSON.stringify(Object.assign(Object.assign(Object.assign({}, options.body), bffDataSource.headers), { 'x-user-id': fakeUserId }))))
-                })
-                : JSON.stringify(options.body) }, (isTikTokChannel && { keepalive: true })))
+            .fetch(`${url}/api/${path}`, {
+            headers: Object.assign({ 'Content-Type': 'application/json', 'x-user-id': fakeUserId }, bffDataSource.headers),
+            method: options.method,
+            body: JSON.stringify(options.body)
+        })
             .then((res) => res.json())
             .catch((err) => Promise.reject(err));
     }, [bffDataSource, fakeUserId]);
@@ -179,7 +152,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }, [bffDataSource]);
     const getRecommendVideos = (0, react_1.useCallback)((query) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        query = Object.assign({ maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize, defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize, hashTag: query === null || query === void 0 ? void 0 : query.hashTag, traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo, themeTag: query === null || query === void 0 ? void 0 : query.themeTag, pageNum: query === null || query === void 0 ? void 0 : query.pageNum, contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter, productFilter: query === null || query === void 0 ? void 0 : query.productFilter }, (chatlabsId && { chatlabsId }));
+        query = Object.assign(Object.assign({ maxSize: (_f = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _f !== void 0 ? _f : maxSize, defaultSize: (_g = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _g !== void 0 ? _g : defaultSize, hashTag: query === null || query === void 0 ? void 0 : query.hashTag, traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo, themeTag: query === null || query === void 0 ? void 0 : query.themeTag, pageNum: query === null || query === void 0 ? void 0 : query.pageNum, contentFilter: query === null || query === void 0 ? void 0 : query.contentFilter, productFilter: query === null || query === void 0 ? void 0 : query.productFilter }, (chatlabsId && { chatlabsId })), (isDiyH5 && { type: 'story' }));
         if (channel) {
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(channel) });
         }
@@ -228,7 +201,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         if (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview) {
             query = Object.assign(Object.assign({}, query), { directPage: true, level: 1, pageNum: (_o = query === null || query === void 0 ? void 0 : query.pageNum) !== null && _o !== void 0 ? _o : 1 });
         }
-        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', { method: 'POST', body: query }));
+        const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/list', {
+            method: 'POST',
+            body: query
+        }));
         if (!(result === null || result === void 0 ? void 0 : result.success)) {
             return undefined;
         }
@@ -288,7 +264,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         const sessionID = (0, sessionStore_1.storeAndLoadFeSessionId)();
         const params = {};
         const queryString = location.search.slice(1);
-        (_a = (0, tool_1.splitUrlParams)(queryString)) === null || _a === void 0 ? void 0 : _a.map((val) => {
+        (_a = (0, tool_1.splitUrlParams)(queryString)) === null || _a === void 0 ? void 0 : _a.forEach((val) => {
             const key = val.split('=')[0];
             const value = val.split('=')[1];
             params[key] = value;
@@ -318,17 +294,23 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         playbookType,
         bffDataSource
     ]);
-    const getEventParamsByJson = (0, react_1.useCallback)((json, product) => {
-        var _a, _b, _c;
-        const jsonParams = (0, lodash_1.cloneDeep)(json);
+    const bffFbReport = (0, react_1.useCallback)(({ eventName, product }) => {
+        var _a, _b, _c, _d, _e, _f, _g;
+        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;
+        }
+        const jsonParams = (0, lodash_1.cloneDeep)((_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: (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href,
+            event_source_url: (_c = window === null || window === void 0 ? void 0 : window.location) === null || _c === void 0 ? void 0 : _c.href,
             external_id: fakeUserId,
-            client_user_agent: (_c = (_b = window === null || window === void 0 ? void 0 : window.navigator) === null || _b === void 0 ? void 0 : _b.userAgent) !== null && _c !== void 0 ? _c : '',
+            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: (0, tool_1.getCookie)('_fbp') ? `${(0, tool_1.getCookie)('_fbp')}` : '',
+            fbp: (0, tool_1.getCookie)('_fbp') ? `fb.2.${new Date().getTime()}.${(0, tool_1.getCookie)('_fbp')}` : '',
             time: Math.floor(Date.now() / 1000)
         };
         const regex = /\{\{(.*?)\}\}/g;
@@ -340,7 +322,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             }
             else {
                 for (const key in obj) {
-                    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                    if (obj.hasOwnProperty(key)) {
                         const value = obj === null || obj === void 0 ? void 0 : obj[key];
                         if (typeof value === 'object') {
                             getEventParams(value);
@@ -377,59 +359,28 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             }
         };
         getEventParams(jsonParams);
-        return jsonParams;
-    }, [fakeUserId]);
-    const bffFbReport = (0, react_1.useCallback)(({ eventName, product }) => {
-        var _a, _b, _c, _d;
-        if (!enableReportEvent || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview)) {
-            return;
-        }
-        const pixelEventParamsJson = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.pixel) === null || _a === void 0 ? void 0 : _a[eventName];
-        if ((pixelEventParamsJson === null || pixelEventParamsJson === void 0 ? void 0 : pixelEventParamsJson.event_name) && typeof (window === null || window === void 0 ? void 0 : window.fbq) === 'function') {
-            function updateQueryStringParameter(uri, key, value) {
-                const re = new RegExp('([?&])' + key + '=.*?(&|$)', 'i');
-                const separator = uri.indexOf('?') !== -1 ? '&' : '?';
-                if (uri.match(re)) {
-                    return uri.replace(re, '$1' + key + '=' + value + '$2');
-                }
-                else {
-                    return uri + separator + key + '=' + value;
-                }
-            }
-            if (eventName === 'PageView' && (pixelEventParamsJson === null || pixelEventParamsJson === void 0 ? void 0 : pixelEventParamsJson.event_name) === 'PageView') {
-                const currentUrl = window.location.href;
-                const newUrl = updateQueryStringParameter(currentUrl, 'timestamp', Date.now());
-                history.pushState({ path: newUrl }, '', newUrl);
-            }
-            else {
-                const body = getEventParamsByJson(pixelEventParamsJson);
-                window === null || window === void 0 ? void 0 : window.fbq('track', pixelEventParamsJson === null || pixelEventParamsJson === void 0 ? void 0 : pixelEventParamsJson.event_name, body);
-                if (eventName === 'PageView' && typeof (window === null || window === void 0 ? void 0 : window.gtag) === 'function') {
-                    window === null || window === void 0 ? void 0 : window.gtag('event', 'page_view');
-                }
-            }
-        }
-        else if (eventName === 'PageView' && typeof (window === null || window === void 0 ? void 0 : window.gtag) === 'function') {
-            window === null || window === void 0 ? void 0 : window.gtag('event', 'page_view');
-        }
-        const converApiEventParamsJson = (_b = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.converApi) === null || _b === void 0 ? void 0 : _b[eventName];
-        if (enabledMetaConversionApi && converApiEventParamsJson) {
-            const body = getEventParamsByJson(converApiEventParamsJson, product);
-            const params = {};
-            const queryString = location.search.slice(1);
-            (_c = (0, tool_1.splitUrlParams)(queryString)) === null || _c === void 0 ? void 0 : _c.forEach((val) => {
-                const key = val.split('=')[0];
-                const value = val.split('=')[1];
-                params[key] = value;
-            });
-            const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
-            bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/fb/${(_d = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _d === void 0 ? void 0 : _d['x-app-id']}/${eventName}${cl_source ? `/${decodeURIComponent(cl_source)}` : ''}`, {
-                method: 'POST',
-                body,
-                type: 'beacon'
-            });
-        }
-    }, [bffFetch, enableReportEvent, enabledMetaConversionApi, globalConfig, bffDataSource, getEventParamsByJson]);
+        const params = {};
+        const queryString = location.search.slice(1);
+        (_f = (0, tool_1.splitUrlParams)(queryString)) === null || _f === void 0 ? void 0 : _f.map((val) => {
+            const key = val.split('=')[0];
+            const value = val.split('=')[1];
+            params[key] = value;
+        });
+        const cl_source = params === null || params === void 0 ? void 0 : params.cl_source;
+        return bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch(`v2/fb/${(_g = bffDataSource === null || bffDataSource === void 0 ? void 0 : bffDataSource.headers) === null || _g === void 0 ? void 0 : _g['x-app-id']}/${eventName}${cl_source ? `/${decodeURIComponent(cl_source)}` : ''}`, {
+            method: 'POST',
+            body: jsonParams,
+            type: 'beacon'
+        });
+    }, [
+        bffFetch,
+        enableReportEvent,
+        enabledMetaConversionApi,
+        globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enablePreview,
+        globalConfig,
+        fakeUserId,
+        bffDataSource
+    ]);
     const bffMutateLike = (0, react_1.useCallback)((body) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('v1/recommend/like', { method: 'POST', body }));
         return res === null || res === void 0 ? void 0 : res.success;
@@ -677,7 +628,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             multiPostTimeRef,
             refreshFeSession,
             getAccount,
-            accountSonsent
+            accountSonsent,
+            isDiyH5
         } }, isShowConsent ? (react_1.default.createElement(Consent_1.default, Object.assign({}, (_e = (_d = (_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.item) === null || _e === void 0 ? void 0 : _e.props))) : (render({
         rtcList,
         mutateLike: bffMutateLike,

package/lib/index.d.ts

@@ -4,6 +4,7 @@ export * as core from './core';
 export * as materials from './materials';
 export { default as SxpPageRender } from './core/components/SxpPageRender';
 export { default as DiyPortalPreview } from './core/components/DiyPortalPreview';
+export { default as DiyStoryPreview } from './core/components/DiyStoryPreview';
 export { default as Modal } from './core/components/SxpPageRender/Modal';
 export { default as SxpDataSourceProvider } from './core/context/SxpDataSourceProvider';
 export { default as SxpPageCore } from './core/components/SxpPageCore';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useEditorDataProvider = exports.EditorDataProvider = exports.SxpPageCore = exports.SxpDataSourceProvider = exports.Modal = exports.DiyPortalPreview = exports.SxpPageRender = exports.materials = exports.core = void 0;
+exports.useEditorDataProvider = exports.EditorDataProvider = exports.SxpPageCore = exports.SxpDataSourceProvider = exports.Modal = exports.DiyStoryPreview = exports.DiyPortalPreview = exports.SxpPageRender = exports.materials = exports.core = void 0;
 const tslib_1 = require("tslib");
 const Pagebuilder_1 = require("./core/Pagebuilder");
 require("./index.css");
@@ -10,6 +10,8 @@ var SxpPageRender_1 = require("./core/components/SxpPageRender");
 Object.defineProperty(exports, "SxpPageRender", { enumerable: true, get: function () { return tslib_1.__importDefault(SxpPageRender_1).default; } });
 var DiyPortalPreview_1 = require("./core/components/DiyPortalPreview");
 Object.defineProperty(exports, "DiyPortalPreview", { enumerable: true, get: function () { return tslib_1.__importDefault(DiyPortalPreview_1).default; } });
+var DiyStoryPreview_1 = require("./core/components/DiyStoryPreview");
+Object.defineProperty(exports, "DiyStoryPreview", { enumerable: true, get: function () { return tslib_1.__importDefault(DiyStoryPreview_1).default; } });
 var Modal_1 = require("./core/components/SxpPageRender/Modal");
 Object.defineProperty(exports, "Modal", { enumerable: true, get: function () { return tslib_1.__importDefault(Modal_1).default; } });
 var SxpDataSourceProvider_1 = require("./core/context/SxpDataSourceProvider");

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const css_1 = require("@emotion/css");
 const react_1 = tslib_1.__importStar(require("react"));
-const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
 const hooks_1 = require("../../../../core/hooks");
 require("./index.less");
 const modules_1 = require("swiper/modules");
@@ -13,6 +12,7 @@ const Modal_1 = tslib_1.__importDefault(require("../../../../core/components/Sxp
 const ExpandableText_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/ExpandableText"));
 const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/FormatImage"));
 const tool_1 = require("../../../../core/utils/tool");
+const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
 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;
@@ -69,7 +69,7 @@ const CommodityDetail = (_a) => {
         };
     }, []);
     const priceText = (0, materials_1.getPriceText)({
-        product,
+        product: product,
         enableFormattedPrice: (_t = commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price) === null || _t === void 0 ? void 0 : _t.enableFormattedPrice,
         globalConfig,
         style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const css_1 = require("@emotion/css");
 const react_1 = tslib_1.__importStar(require("react"));
-const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
 const hooks_1 = require("../../../../core/hooks");
 require("./index.less");
 const modules_1 = require("swiper/modules");
@@ -13,6 +12,7 @@ const ExpandableText_1 = tslib_1.__importDefault(require("../../../../core/compo
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const FormatImage_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/FormatImage"));
 const tool_1 = require("../../../../core/utils/tool");
+const CommodityGroup_1 = tslib_1.__importDefault(require("../../template/components/CommodityGroup"));
 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;

package/package.json

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