pb-sxp-ui 1.12.0 → 1.12.1

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

@@ -21,7 +21,7 @@ const SxpPageCore = ({ data, maxSize = 10, defaultSize = 10, hashTagSize = 20, l
         React.createElement(SxpDataSourceProvider, { 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 })),
+                    React.createElement(SxpPageRender, Object.assign({ defaultData: data }, (_a = pageData === null || pageData === void 0 ? void 0 : pageData.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf, { tagList: tagList, data: rtcList, resolver: RESOLVER })),
                     React.createElement(Popup, null)));
             } })));
 };

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

@@ -110,6 +110,7 @@ export interface ISxpPageRenderProps {
     hashTagStyle?: CSSProperties;
     licenseUrl?: string;
     hashTagRightMargin: number;
+    defaultData?: any;
 }
 declare const SxpPageRender: FC<ISxpPageRenderProps>;
 export default SxpPageRender;

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

@@ -15,6 +15,7 @@ import WaterFall from './WaterFall';
 import Nudge from './Nudge';
 import SXP_EVENT_BUS, { SXP_EVENT_TYPE } from '../../../core/utils/event';
 import { useEditor, useSxpDataSource } from '../../../core/hooks';
+import { refreshFeSessionId } from '../../../core/utils/sessionStore';
 import './index.less';
 import { useEventReport } from '../../../core/hooks/useEventReport';
 import withBindDataSource from '../../../core/hoc/withBindDataSource';
@@ -25,7 +26,7 @@ import ConsentPopup from './ConsentPopup';
 import MultiPosts from '../../../materials/sxp/MultiPosts';
 import { useEditorDataProvider } from '../../../core/context/EditorDataProvider';
 import NavBack from './NavBack';
-const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, hashTagRightMargin, tagList = [], licenseUrl }) => {
+const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, hashTagRightMargin, tagList = [], defaultData }) => {
     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');
@@ -55,12 +56,17 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     }, [data === null || data === void 0 ? void 0 : data.length]);
     const handleH5EnterLink = useCallback(() => {
+        var _a, _b, _c;
+        const defaultGlobalConfig = (_b = (_a = defaultData === null || defaultData === void 0 ? void 0 : defaultData.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
+        if (!((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable)) {
+            refreshFeSessionId();
+        }
         h5EnterLink === null || h5EnterLink === void 0 ? void 0 : h5EnterLink();
         if (data.length > 0) {
             const now = new Date();
             viewTime.current = now;
         }
-    }, [data.length, h5EnterLink]);
+    }, [data.length, h5EnterLink, defaultData]);
     useEffect(() => {
         var _a;
         if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)

package/es/core/context/SxpDataSourceProvider.js

@@ -376,7 +376,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = useCallback(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         const queryString = location.search.slice(1);
         const params = qs.parse(queryString.replace(/\+/g, '%2B'));
         for (const key in params) {
@@ -384,10 +384,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         }
         const getVal = (key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ''; };
         const time = new Date();
-        const defaultGlobalConfig = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
-        if (!((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable) || !(curTime === null || curTime === void 0 ? void 0 : curTime.current)) {
-            curTime.current = time;
-        }
+        curTime.current = time;
         bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
             eventInfo: {
                 eventSubject: 'h5LinkEnterFeed',
@@ -399,12 +396,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_e = (_d = window === null || window === void 0 ? void 0 : window.location) === null || _d === void 0 ? void 0 : _d.href) !== null && _e !== void 0 ? _e : '',
+                enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
                 clSource: getVal('cl_source')
             },
             reportLayId: false
         });
-    }, [bffEventReport, data, curTime]);
+    }, [bffEventReport]);
     useEffect(() => {
         if (!isShowConsent)
             h5EnterLink();

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

@@ -24,7 +24,7 @@ const SxpPageCore = ({ data, maxSize = 10, defaultSize = 10, hashTagSize = 20, l
         react_1.default.createElement(SxpDataSourceProvider_1.default, { 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_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(SxpPageRender_1.default, 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 })),
+                    react_1.default.createElement(SxpPageRender_1.default, Object.assign({ defaultData: data }, (_a = pageData === null || pageData === void 0 ? void 0 : pageData.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf, { tagList: tagList, data: rtcList, resolver: RESOLVER })),
                     react_1.default.createElement(Popup_1.default, null)));
             } })));
 };

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

@@ -110,6 +110,7 @@ export interface ISxpPageRenderProps {
     hashTagStyle?: CSSProperties;
     licenseUrl?: string;
     hashTagRightMargin: number;
+    defaultData?: any;
 }
 declare const SxpPageRender: FC<ISxpPageRenderProps>;
 export default SxpPageRender;

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

@@ -18,6 +18,7 @@ const WaterFall_1 = tslib_1.__importDefault(require("./WaterFall"));
 const Nudge_1 = tslib_1.__importDefault(require("./Nudge"));
 const event_1 = tslib_1.__importStar(require("../../../core/utils/event"));
 const hooks_1 = require("../../../core/hooks");
+const sessionStore_1 = require("../../../core/utils/sessionStore");
 require("./index.less");
 const useEventReport_1 = require("../../../core/hooks/useEventReport");
 const withBindDataSource_1 = tslib_1.__importDefault(require("../../../core/hoc/withBindDataSource"));
@@ -28,7 +29,7 @@ const ConsentPopup_1 = tslib_1.__importDefault(require("./ConsentPopup"));
 const MultiPosts_1 = tslib_1.__importDefault(require("../../../materials/sxp/MultiPosts"));
 const EditorDataProvider_1 = require("../../../core/context/EditorDataProvider");
 const NavBack_1 = tslib_1.__importDefault(require("./NavBack"));
-const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, hashTagRightMargin, tagList = [], licenseUrl }) => {
+const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, hashTagRightMargin, tagList = [], defaultData }) => {
     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 = (0, useIconLink_1.useIconLink)('/pb_static/5beaaa5ce7f3477b99db3838619cc471.png');
     const unmutedIcon = (0, useIconLink_1.useIconLink)('/pb_static/fea8668a8a894e4aa3a86bcc775e895e.png');
@@ -58,12 +59,17 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
     }, [data === null || data === void 0 ? void 0 : data.length]);
     const handleH5EnterLink = (0, react_1.useCallback)(() => {
+        var _a, _b, _c;
+        const defaultGlobalConfig = (_b = (_a = defaultData === null || defaultData === void 0 ? void 0 : defaultData.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
+        if (!((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable)) {
+            (0, sessionStore_1.refreshFeSessionId)();
+        }
         h5EnterLink === null || h5EnterLink === void 0 ? void 0 : h5EnterLink();
         if (data.length > 0) {
             const now = new Date();
             viewTime.current = now;
         }
-    }, [data.length, h5EnterLink]);
+    }, [data.length, h5EnterLink, defaultData]);
     (0, react_1.useEffect)(() => {
         var _a;
         if (!ctaType || (ctaType === null || ctaType === void 0 ? void 0 : ctaType.length) < 1)

package/lib/core/context/SxpDataSourceProvider.js

@@ -379,7 +379,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         });
     }, [bffEventReport, isFromHashtag]);
     const h5EnterLink = (0, react_1.useCallback)(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         const queryString = location.search.slice(1);
         const params = qs_1.default.parse(queryString.replace(/\+/g, '%2B'));
         for (const key in params) {
@@ -387,10 +387,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         }
         const getVal = (key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ''; };
         const time = new Date();
-        const defaultGlobalConfig = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.sxpPageConf) === null || _b === void 0 ? void 0 : _b.globalConfig;
-        if (!((_c = defaultGlobalConfig === null || defaultGlobalConfig === void 0 ? void 0 : defaultGlobalConfig.session) === null || _c === void 0 ? void 0 : _c.enable) || !(curTime === null || curTime === void 0 ? void 0 : curTime.current)) {
-            curTime.current = time;
-        }
+        curTime.current = time;
         bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
             eventInfo: {
                 eventSubject: 'h5LinkEnterFeed',
@@ -402,12 +399,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                 utmContent: getVal('utm_content'),
                 enterTime: Math.floor(time / 1000) + '',
                 requestId: null,
-                enterUrl: (_e = (_d = window === null || window === void 0 ? void 0 : window.location) === null || _d === void 0 ? void 0 : _d.href) !== null && _e !== void 0 ? _e : '',
+                enterUrl: (_b = (_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : '',
                 clSource: getVal('cl_source')
             },
             reportLayId: false
         });
-    }, [bffEventReport, data, curTime]);
+    }, [bffEventReport]);
     (0, react_1.useEffect)(() => {
         if (!isShowConsent)
             h5EnterLink();

package/package.json

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