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

package/dist/pb-ui.js

@@ -17677,6 +17677,7 @@ Made in Italy` })));
     })();
 
     const VideoWidget$4 = React.forwardRef(({ rec, index, height, data, muted, activeIndex, videoPostConfig, videoPlayIcon, loopPlay, swiperRef }, ref) => {
+        var _a, _b, _c, _d, _e;
         const [isPauseVideo, setIsPauseVideo] = React.useState(false);
         const { bffEventReport, sxpParameter, waterFallData, openHashtag, bffFbReport, isDiyH5 } = useSxpDataSource();
         const videoStartTime = React.useRef(0);
@@ -17694,6 +17695,11 @@ Made in Italy` })));
         const isFirstPlayRef = React.useRef(true);
         const loopPlayRef = React.useRef(loopPlay);
         const scene = rec.video.scene;
+        const videoUrl = (scene === null || scene === void 0 ? void 0 : scene.mediaUrl) || ((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.url);
+        const videoCover = (scene === null || scene === void 0 ? void 0 : scene.mediaUrl) ? scene === null || scene === void 0 ? void 0 : scene.cover : (_b = rec === null || rec === void 0 ? void 0 : rec.video) === null || _b === void 0 ? void 0 : _b.cover;
+        const videoPoster = (scene === null || scene === void 0 ? void 0 : scene.mediaUrl)
+            ? (_c = scene === null || scene === void 0 ? void 0 : scene.cover) !== null && _c !== void 0 ? _c : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.placeholder_image
+            : (_e = (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.cover) !== null && _e !== void 0 ? _e : sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.placeholder_image;
         React.useImperativeHandle(ref, () => {
             return {
                 setLoopPlay(v) {
@@ -17714,8 +17720,7 @@ Made in Italy` })));
                 : 'translateY(-50%)';
         }, [videoPostConfig]);
         const blurBgSrc = React.useMemo(() => {
-            var _a;
-            return ((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.cover) || firstFrameSrc;
+            return videoCover || firstFrameSrc;
         }, [firstFrameSrc, rec]);
         const blurStyle = React.useMemo(() => {
             return blur
@@ -17750,28 +17755,27 @@ Made in Italy` })));
             setIsLoadFinish(true);
         }, []);
         const handleStartPlay = React.useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+            var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current))
                 return;
             setIsPauseVideo(false);
             const item = data[index];
-            if (item && ((_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.duration)) {
-                videoStartTime.current = ((_b = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _b === void 0 ? void 0 : _b.currentTime) || 0;
-                const videoDuration = ((_d = (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.duration) !== null && _d !== void 0 ? _d : 0).toFixed(2);
-                const videoCurrentTime = ((_f = (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.currentTime) !== null && _f !== void 0 ? _f : 0).toFixed(2);
+            if (item && ((_f = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _f === void 0 ? void 0 : _f.duration)) {
+                videoStartTime.current = ((_g = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _g === void 0 ? void 0 : _g.currentTime) || 0;
+                const videoDuration = ((_j = (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.duration) !== null && _j !== void 0 ? _j : 0).toFixed(2);
+                const videoCurrentTime = ((_l = (_k = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _k === void 0 ? void 0 : _k.currentTime) !== null && _l !== void 0 ? _l : 0).toFixed(2);
                 const playType = (isFirstPlayRef === null || isFirstPlayRef === void 0 ? void 0 : isFirstPlayRef.current) ? '0' : '1';
                 bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-                    eventInfo: Object.assign({ eventSubject: 'playVideo', eventDescription: 'User played the video', contentId: (_h = (_g = item === null || item === void 0 ? void 0 : item.video) === null || _g === void 0 ? void 0 : _g.itemId) !== null && _h !== void 0 ? _h : '', contentName: (_k = (_j = item === null || item === void 0 ? void 0 : item.video) === null || _j === void 0 ? void 0 : _j.title) !== null && _k !== void 0 ? _k : '', playType, startTime: videoCurrentTime, videoDuration, contentTags: JSON.stringify((_m = (_l = item === null || item === void 0 ? void 0 : item.video) === null || _l === void 0 ? void 0 : _l.tags) !== null && _m !== void 0 ? _m : []), position: index + '', contentFormat: 'video', traceInfo: (_o = item === null || item === void 0 ? void 0 : item.video) === null || _o === void 0 ? void 0 : _o.traceInfo }, ((isFirstPlayRef === null || isFirstPlayRef === void 0 ? void 0 : isFirstPlayRef.current) && { loadTime: (loadedTimeRef === null || loadedTimeRef === void 0 ? void 0 : loadedTimeRef.current) - (initTimeRef === null || initTimeRef === void 0 ? void 0 : initTimeRef.current) + '' }))
+                    eventInfo: Object.assign({ eventSubject: 'playVideo', eventDescription: 'User played the video', contentId: (_o = (_m = item === null || item === void 0 ? void 0 : item.video) === null || _m === void 0 ? void 0 : _m.itemId) !== null && _o !== void 0 ? _o : '', contentName: (_q = (_p = item === null || item === void 0 ? void 0 : item.video) === null || _p === void 0 ? void 0 : _p.title) !== null && _q !== void 0 ? _q : '', playType, startTime: videoCurrentTime, videoDuration, contentTags: JSON.stringify((_s = (_r = item === null || item === void 0 ? void 0 : item.video) === null || _r === void 0 ? void 0 : _r.tags) !== null && _s !== void 0 ? _s : []), position: index + '', contentFormat: 'video', traceInfo: (_t = item === null || item === void 0 ? void 0 : item.video) === null || _t === void 0 ? void 0 : _t.traceInfo }, ((isFirstPlayRef === null || isFirstPlayRef === void 0 ? void 0 : isFirstPlayRef.current) && { loadTime: (loadedTimeRef === null || loadedTimeRef === void 0 ? void 0 : loadedTimeRef.current) - (initTimeRef === null || initTimeRef === void 0 ? void 0 : initTimeRef.current) + '' }))
                 });
                 isFirstPlayRef.current = false;
             }
         }), [bffEventReport, data, index, isFirstPlayRef, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
         const handLoadeddata = React.useCallback(() => {
-            var _a;
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || firstFrameSrc || !blur)
                 return;
             videoRef.current.style.objectFit = 'contain';
-            if (((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.cover) || !canvasRef || !canvasRef.current || isBgColor)
+            if (videoCover || !canvasRef || !canvasRef.current || isBgColor)
                 return;
             const setFrameImg = () => {
                 const canvas = canvasRef === null || canvasRef === void 0 ? void 0 : canvasRef.current;
@@ -17838,6 +17842,7 @@ Made in Italy` })));
                 return;
             if (activeIndex !== index)
                 return;
+            setIsPauseVideo(true);
             const item = data[index];
             const videoDuration = ((_b = (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.duration) !== null && _b !== void 0 ? _b : 0).toFixed(2);
             const videoCurrentTime = ((_d = (_c = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _c === void 0 ? void 0 : _c.currentTime) !== null && _d !== void 0 ? _d : 0).toFixed(2);
@@ -17886,7 +17891,7 @@ Made in Italy` })));
             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;
+            const videoSrc = videoUrl;
             if (!videoSrc)
                 return;
             const videoPlayerWrapperNode = document.querySelector(`#${videoId}`);
@@ -17990,7 +17995,7 @@ Made in Italy` })));
             };
         }, [handleClickVideo, isActive]);
         const renderPoster = React.useMemo(() => {
-            if (!(sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.placeholder_image) || isLoadFinish) {
+            if (!videoPoster || isLoadFinish) {
                 return null;
             }
             return (React.createElement("img", { style: {
@@ -18000,8 +18005,8 @@ Made in Italy` })));
                     width: '100%',
                     height: '100%',
                     objectFit: 'cover'
-                }, src: sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.placeholder_image, alt: 'placeholder image' }));
-        }, [isLoadFinish, sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.placeholder_image]);
+                }, src: videoPoster, alt: 'placeholder image' }));
+        }, [isLoadFinish]);
         const renderLoading = React.useMemo(() => {
             if (!waiting || !isLoadFinish)
                 return;
@@ -18021,8 +18026,7 @@ Made in Italy` })));
             if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current))
                 return;
             const handleBeforeUnload = () => {
-                var _a;
-                if (activeIndex === index && ((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.url) && (videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) && !isPauseVideo) {
+                if (activeIndex === index && videoUrl && (videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) && !isPauseVideo) {
                     handleClickVideo('pause')();
                 }
             };
@@ -18523,7 +18527,7 @@ Made in Italy` })));
      * @Author: binruan@chatlabs.com
      * @Date: 2024-03-20 10:27:31
      * @LastEditors: binruan@chatlabs.com
-     * @LastEditTime: 2025-05-06 18:19:21
+     * @LastEditTime: 2025-05-07 13:33:18
      * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
      *
      */
@@ -18718,7 +18722,7 @@ Made in Italy` })));
         }, [minusHeight, containerHeight, tagHeight]);
         const visList = React.useMemo(() => {
             var _a;
-            const list = activeIndex === 0 && !waterFallData && !isEditor
+            const list = activeIndex === 0 && !waterFallData && !isEditor && !isDiyH5
                 ? [(_a = data === null || data === void 0 ? void 0 : data[0]) !== null && _a !== void 0 ? _a : null]
                 : data === null || data === void 0 ? void 0 : data.map((item, index) => {
                     if (activeIndex === index || index - 1 === activeIndex || index + 1 === activeIndex) {
@@ -18730,8 +18734,8 @@ Made in Italy` })));
                 });
             if (!(list === null || list === void 0 ? void 0 : list.length))
                 return [];
-            return !waterFallData && !isNoMoreData ? list.concat([{ loading: true }]) : list;
-        }, [data, activeIndex, waterFallData, isEditor, isNoMoreData]);
+            return !waterFallData && !isNoMoreData && !isDiyH5 ? list.concat([{ loading: true }]) : list;
+        }, [data, activeIndex, waterFallData, isEditor, isNoMoreData, isDiyH5]);
         const renderLogo = React.useMemo(() => {
             var _a, _b, _c, _d;
             if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.logoUrl) && (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowLogo)) {