pb-sxp-ui 1.10.0 → 1.10.2

package/dist/pb-ui.js

@@ -646,9 +646,8 @@
         DataSourceType[DataSourceType["BFF"] = 5] = "BFF";
     })(DataSourceType || (DataSourceType = {}));
     const 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 }) => {
+    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 }) => {
         var _a, _b, _c, _d, _e;
-        const { channel } = useEditor();
         const [rtcList, setRtcList] = React.useState([]);
         const [tagList, setTagList] = React.useState([]);
         const [loading, setLoading] = React.useState(false);
@@ -674,11 +673,16 @@
         const [pageData, setPageData] = React.useState(data);
         const [showConsent, setShowConsent] = React.useState(false);
         const [layoutVariantId, setLayoutVariantId] = React.useState();
+        const [channel, setChannel] = React.useState();
         const isShowConsent = React.useMemo(() => {
             var _a, _b, _c, _d;
             return (((((_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.consent) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.privacy_necessity) && !isAgreePolicy && !isEditor) || isOpenConsent) &&
                 showConsent);
         }, [isAgreePolicy, globalConfig, isOpenConsent, isEditor, showConsent]);
+        const updateChannel = React.useCallback((d) => {
+            onUpdateChannel === null || onUpdateChannel === void 0 ? void 0 : onUpdateChannel(d);
+            setChannel(d);
+        }, []);
         const getFilterRecList = React.useCallback((data) => {
             var _a;
             const recList = data === null || data === void 0 ? void 0 : data.recList;
@@ -1009,7 +1013,7 @@
                 h5EnterLink();
         }, [isShowConsent]);
         React.useEffect(() => {
-            if (isShowConsent)
+            if (isShowConsent || isPreview)
                 return;
             setLoading(true);
             let layId;
@@ -1119,7 +1123,9 @@
                 popupCurTimeRef,
                 checkCommodityIndexRef,
                 isEditor,
-                isNoMoreData
+                isNoMoreData,
+                updateChannel,
+                channel
             } }, isShowConsent ? (React.createElement(Consent$4, 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,
@@ -1249,7 +1255,6 @@
     });
     const EditorCore = React.forwardRef(({ children, resolver, isSsr, schema, enableDataSource = true, utmVal }, ref) => {
         const [currentNode, setCurrentNode] = React.useState(null);
-        const [channel, setChannel] = React.useState();
         const [_schema, setSchema] = React.useState(schema || {
             pointData: [item],
             dataSource: [],
@@ -1270,9 +1275,6 @@
         const [undoStack, setUndoStack] = React.useState([[item]]);
         const [redoStack, setRedoStack] = React.useState([]);
         const [popup, setPopup] = React.useState(popupInit);
-        const channelParams = React.useMemo(() => {
-            return channel || utmVal;
-        }, [channel, utmVal]);
         typeof window !== 'undefined' &&
             (window.sxpPopup = (type, aniType) => {
                 setPopup(Object.assign(Object.assign(Object.assign({}, popupInit), { id: type }), aniType));
@@ -1281,10 +1283,10 @@
             (window.getJointUtmLink = (url) => {
                 setSlideSkipState();
                 if ((url === null || url === void 0 ? void 0 : url.indexOf('?')) !== -1) {
-                    return url + (channelParams ? '&' + channelParams : '');
+                    return url + (utmVal ? '&' + utmVal : '');
                 }
                 else {
-                    return url + (channelParams ? '?' + channelParams : '');
+                    return url + (utmVal ? '?' + utmVal : '');
                 }
             });
         // 切换页面类型，清空操作栈
@@ -1352,9 +1354,7 @@
                 setUndoStack,
                 getCurPageConf,
                 popup,
-                setPopup,
-                channel,
-                setChannel
+                setPopup
             } },
             React.createElement(DataSourceProvider$1, { isSsr: isSsr, enable: enableDataSource }, children)));
     });
@@ -16812,9 +16812,8 @@ Made in Italy` })));
     const MultiPosts$1 = (_a) => {
         var _b, _c;
         var { bgImgUrl, style, recData } = _a, props = __rest(_a, ["bgImgUrl", "style", "recData"]);
-        const { setChannel } = useEditor();
-        const { bffEventReport, curTime } = useSxpDataSource();
-        const { isActive } = useSwiperSlide();
+        const { bffEventReport, curTime, updateChannel } = useSxpDataSource();
+        const { isActive } = useSwiperSlide() || {};
         const initRef = React.useRef(false);
         const viewTime = React.useRef();
         const traceinfo = (_c = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.traceInfo) !== null && _c !== void 0 ? _c : '';
@@ -16843,7 +16842,7 @@ Made in Italy` })));
             });
             if ((v === null || v === void 0 ? void 0 : v.linkType) === 'recommendFlow') {
                 endMultiPost('multipostClick');
-                setChannel === null || setChannel === void 0 ? void 0 : setChannel(value);
+                updateChannel === null || updateChannel === void 0 ? void 0 : updateChannel(value);
                 curTime.current = new Date();
             }
             else {
@@ -17929,7 +17928,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-20 10:27:31
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-11-27 11:52:24
+     * @LastEditTime: 2024-11-27 17:08:59
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -17937,7 +17936,7 @@ Made in Italy` })));
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         const mutedIcon = useIconLink('/pb_static/5beaaa5ce7f3477b99db3838619cc471.png');
         const unmutedIcon = useIconLink('/pb_static/fea8668a8a894e4aa3a86bcc775e895e.png');
-        const { schema, channel } = useEditor();
+        const { schema } = useEditor();
         const { openMultiPosts } = useEditorDataProvider();
         const [activeIndex, setActiveIndex] = React.useState(0);
         const viewImageStartTime = React.useRef(0);
@@ -17948,7 +17947,7 @@ Made in Italy` })));
         const [isReload, setIsReload] = React.useState(new Date().getTime());
         const skipLinkRef = React.useRef(false);
         const [pageNum, setPageNum] = React.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 } = useSxpDataSource();
+        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 } = useSxpDataSource();
         const { backMainFeed, productView, jumpToWeb } = useEventReport();
         const isShowFingerTip = React.useMemo(() => {
             return data.length > 0 && !loading && (getFeUserState() || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableSwiperTip));
@@ -18442,8 +18441,8 @@ Made in Italy` })));
             React.createElement(Tagbar$1, { tagList: tagList, setActiveIndex: setActiveIndex, style: {
                     top: minusHeight
                 } }),
-            ((_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.backButton) === null || _f === void 0 ? void 0 : _f.enable) && !channel && (React.createElement(NavBack$1, { data: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.backButton, minusHeight: minusHeight, tagHeight: tagHeight, onClick: () => history === null || history === void 0 ? void 0 : history.back() })),
-            ((_l = (_k = (_j = (_h = (_g = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.item) === null || _j === void 0 ? void 0 : _j.props) === null || _k === void 0 ? void 0 : _k.backButton) === null || _l === void 0 ? void 0 : _l.enable) && channel && (React.createElement(NavBack$1, { data: (_q = (_p = (_o = (_m = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _m === void 0 ? void 0 : _m[0]) === null || _o === void 0 ? void 0 : _o.item) === null || _p === void 0 ? void 0 : _p.props) === null || _q === void 0 ? void 0 : _q.backButton, minusHeight: minusHeight, tagHeight: tagHeight, onClick: () => {
+            ((_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.backButton) === null || _f === void 0 ? void 0 : _f.enable) && !channel && !openMultiPosts && (React.createElement(NavBack$1, { data: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.backButton, minusHeight: minusHeight, tagHeight: tagHeight, onClick: () => history === null || history === void 0 ? void 0 : history.back() })),
+            ((((_l = (_k = (_j = (_h = (_g = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.item) === null || _j === void 0 ? void 0 : _j.props) === null || _k === void 0 ? void 0 : _k.backButton) === null || _l === void 0 ? void 0 : _l.enable) && channel) || openMultiPosts) && (React.createElement(NavBack$1, { data: (_q = (_p = (_o = (_m = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _m === void 0 ? void 0 : _m[0]) === null || _o === void 0 ? void 0 : _o.item) === null || _p === void 0 ? void 0 : _p.props) === null || _q === void 0 ? void 0 : _q.backButton, minusHeight: minusHeight, tagHeight: tagHeight, onClick: () => {
                     var _a, _b, _c;
                     bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
                         eventInfo: {
@@ -18953,7 +18952,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-01-15 19:03:09
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2024-09-30 14:37:13
+     * @LastEditTime: 2024-11-27 16:58:32
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageCore\index.tsx
      *
      */
@@ -18977,8 +18976,9 @@ Made in Italy` })));
             return searchParams;
         }, []);
         const [_schema, setSchema] = React.useState(data === null || data === void 0 ? void 0 : data.data);
-        return (React.createElement(EditorCore, { resolver: RESOLVER, enableDataSource: false, schema: _schema, utmVal: utmVal },
-            React.createElement(SxpDataSourceProvider$1, { utmVal: utmVal, dataSources: data === null || data === void 0 ? void 0 : data.data_sources, sxpParameter: data === null || data === void 0 ? void 0 : data.sxp_parameter, maxSize: (_b = (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.personalized_recommend) !== null && _b !== void 0 ? _b : maxSize, defaultSize: (_d = (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.default_recommend) !== null && _d !== void 0 ? _d : defaultSize, hashTagSize: (_f = (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size) !== null && _f !== void 0 ? _f : hashTagSize, loadingImage: loadingImage, appDomain: appDomain, enabledMetaConversionApi: enabledMetaConversionApi, utmParameter: data === null || data === void 0 ? void 0 : data.utm_parameter, data: data, dataList: dataList, onUpdateSchema: (d) => setSchema(d), render: ({ rtcList, tagList, pageData }) => {
+        const [channel, setChannel] = React.useState();
+        return (React.createElement(EditorCore, { resolver: RESOLVER, enableDataSource: false, schema: _schema, utmVal: channel || utmVal },
+            React.createElement(SxpDataSourceProvider$1, { utmVal: utmVal, dataSources: data === null || data === void 0 ? void 0 : data.data_sources, sxpParameter: data === null || data === void 0 ? void 0 : data.sxp_parameter, maxSize: (_b = (_a = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _a === void 0 ? void 0 : _a.personalized_recommend) !== null && _b !== void 0 ? _b : maxSize, defaultSize: (_d = (_c = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _c === void 0 ? void 0 : _c.default_recommend) !== null && _d !== void 0 ? _d : defaultSize, hashTagSize: (_f = (_e = data === null || data === void 0 ? void 0 : data.sxp_parameter) === null || _e === void 0 ? void 0 : _e.hash_tag_size) !== null && _f !== void 0 ? _f : hashTagSize, loadingImage: loadingImage, appDomain: appDomain, enabledMetaConversionApi: enabledMetaConversionApi, utmParameter: data === null || data === void 0 ? void 0 : data.utm_parameter, data: data, dataList: dataList, onUpdateSchema: (d) => setSchema(d), onUpdateChannel: (d) => setChannel(d), render: ({ rtcList, tagList, pageData }) => {
                     var _a;
                     return (React.createElement(React.Fragment, null,
                         React.createElement(SxpPageRender, Object.assign({}, (_a = pageData === null || pageData === void 0 ? void 0 : pageData.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf, { tagList: tagList, data: rtcList, resolver: RESOLVER })),