pb-sxp-ui 1.10.7 → 1.10.8

package/dist/index.js

@@ -849,7 +849,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             };
         }
         const sessionID = storeAndLoadFeSessionId();
-        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), eventInfo), (getDevice$1() && { sxpDevice: getDevice$1() })), (getSystem() && { sxpSystem: getSystem() })), (getBrowserInfo() && { sxpBrowser: getBrowserInfo() })), (layoutVariantId && reportLayId && { layoutVariantId })), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' }));
+        const ef = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ sessionID, rtc: curReqInfo.rtc, requestId: curReqInfo.requestId }, { playbookType }), (layoutVariantId && reportLayId && { layoutVariantId })), eventInfo), (getDevice$1() && { sxpDevice: getDevice$1() })), (getSystem() && { sxpSystem: getSystem() })), (getBrowserInfo() && { sxpBrowser: getBrowserInfo() })), ((eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) && channel && { position: Number(eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.position) + 1 + '' }));
         const realUserInfo = Object.entries(userInfo).map(([k, v]) => ({ name: k, value: v }));
         const realEventInfo = Object.entries(ef)
             .map(([k, v]) => v && { name: k, value: v })
@@ -1073,23 +1073,10 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
                     const item = list === null || list === void 0 ? void 0 : list[0];
                     const traceInfo = ((_k = item === null || item === void 0 ? void 0 : item.video) === null || _k === void 0 ? void 0 : _k.traceInfo) || ((_l = item === null || item === void 0 ? void 0 : item.product) === null || _l === void 0 ? void 0 : _l.traceInfo) || '';
                     bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-                        eventInfo: {
-                            eventSubject: 'multiPostClick',
-                            eventDescription: 'multiPostClick',
-                            traceInfo,
-                            branchfeed: channel
-                        }
+                        eventInfo: Object.assign({ eventSubject: 'multiPostClick', eventDescription: 'multiPostClick', traceInfo, branchfeed: channel }, (layId && { layoutVariantId: layId }))
                     });
                     bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-                        eventInfo: {
-                            eventSubject: 'endMultiPost',
-                            eventDescription: 'endMultiPost',
-                            contentFormat: 'image',
-                            position: '0',
-                            traceInfo,
-                            nextStep: 'multipostClick',
-                            timeOnSite: Math.floor((new Date() - (multiPostTimeRef === null || multiPostTimeRef === void 0 ? void 0 : multiPostTimeRef.current)) / 1000) + ''
-                        }
+                        eventInfo: Object.assign({ eventSubject: 'endMultiPost', eventDescription: 'endMultiPost', contentFormat: 'image', position: '0', traceInfo, nextStep: 'multipostClick', timeOnSite: Math.floor((new Date() - (multiPostTimeRef === null || multiPostTimeRef === void 0 ? void 0 : multiPostTimeRef.current)) / 1000) + '' }, (layId && { layoutVariantId: layId }))
                     });
                 }
             }
@@ -14913,7 +14900,7 @@ const WaterfallFlowItem$1 = (props) => {
     const imgLoad = useCallback((img) => {
         setTimeout(() => {
             var _a;
-            const height = (_a = pictRef === null || pictRef === void 0 ? void 0 : pictRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight;
+            const height = (img === null || img === void 0 ? void 0 : img.clientHeight) || ((_a = pictRef === null || pictRef === void 0 ? void 0 : pictRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight);
             // 加56是因为下方文字部分高度为56，可以自己设置
             sizeChange(height + 56 + space, index);
         }, 0);
@@ -15403,7 +15390,7 @@ function WaterfallList(_a) {
  * @Author: binruan@chatlabs.com
  * @Date: 2024-01-10 10:58:24
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-10-23 16:58:01
+ * @LastEditTime: 2024-12-09 11:18:32
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\WaterFall\index.tsx
  *
  */
@@ -15411,7 +15398,6 @@ const WaterFall = (props) => {
     var _a;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
     const { backMainFeed } = useEventReport();
-    useRef(null);
     const modalEleRef = useRef(null);
     const [viewTime, setViewTime] = useState();
     useEffect(() => {
@@ -15428,20 +15414,12 @@ const WaterFall = (props) => {
     }, []);
     const handleClose = () => {
         var _a, _b;
-        // const isEq = isEqual(rtcList, cacheRtcList);
-        // if (!isEq && cacheRtcList && cacheRtcList?.length) {
-        //   setRtcList?.(cacheRtcList);
-        // }
         backMainFeed('branch', selectTag, undefined, waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag);
         reportTagsView();
         setWaterFallData === null || setWaterFallData === void 0 ? void 0 : setWaterFallData(undefined);
         setIsFromHashtag === null || setIsFromHashtag === void 0 ? void 0 : setIsFromHashtag(false);
-        // setTimeout(() => {
-        // if (!isEq) {
         (_b = (_a = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _a === void 0 ? void 0 : _a.swiper) === null || _b === void 0 ? void 0 : _b.slideTo(cacheActiveIndex, 0, false);
-        // }
         setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(false);
-        // }, 0);
     };
     const [recData, setRecData] = useState();
     useEffect(() => {
@@ -15506,7 +15484,7 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         React.createElement(Navbar$1, { icon: img$4, styles: { top: '32px' }, textStyle: (_a = props === null || props === void 0 ? void 0 : props.textStyles) === null || _a === void 0 ? void 0 : _a.hashTagTitle, onClose: handleClose }),
-        (props === null || props === void 0 ? void 0 : props.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(WaterfallList, Object.assign({ reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList$1, Object.assign({ reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        (props === null || props === void 0 ? void 0 : props.openFixedSize) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList$1, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 var WaterFall$1 = memo(WaterFall);