pb-sxp-ui 1.15.40 → 1.15.42

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

@@ -78,6 +78,26 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
             return;
         (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
     }, [videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
+    const handleEnd = () => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!videoRef.current)
+            return;
+        if (isDiyH5) {
+            (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.pause();
+            if (!loopPlayRef.current)
+                return;
+            if (index === (data === null || data === void 0 ? void 0 : data.length) - 1) {
+                (_c = (_b = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _b === void 0 ? void 0 : _b.swiper) === null || _c === void 0 ? void 0 : _c.slideTo(0);
+            }
+            else {
+                const i = (_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.activeIndex;
+                (_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.slideTo(i + 1);
+            }
+        }
+        else {
+            (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.play();
+        }
+    };
     const PAUSE_ICON = (0, useIconLink_1.useIconLink)('/pb_static/06f28a2025c74c1cb49be6767316d827.png');
     const handlePlaying = (0, react_1.useCallback)(() => {
         if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current))
@@ -102,11 +122,6 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
             isFirstPlayRef.current = false;
         }
     }), [bffEventReport, data, index, isFirstPlayRef, videoRef === null || videoRef === void 0 ? void 0 : videoRef.current]);
-    const setCurrentTimeByStartTime = (0, react_1.useCallback)(() => {
-        if (isDiyH5) {
-            videoRef.current.currentTime = scene === null || scene === void 0 ? void 0 : scene.startTime;
-        }
-    }, []);
     const handLoadeddata = (0, react_1.useCallback)(() => {
         if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || firstFrameSrc || !blur)
             return;
@@ -131,13 +146,12 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
     const handleLoadedmetadata = (0, react_1.useCallback)(() => {
         if (!videoRef.current)
             return;
-        setCurrentTimeByStartTime();
         loadedTimeRef.current = new Date();
         handleStartPlay();
         handLoadeddata();
     }, [videoRef.current, handLoadeddata, handleStartPlay]);
     const handleClickVideo = (0, react_1.useCallback)((type) => () => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         if (!videoRef.current)
             return;
         if (!isLoadFinish)
@@ -158,13 +172,10 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
                 break;
             default:
                 if (isPause) {
-                    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();
+                    (_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.play();
                 }
                 else {
-                    (_f = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _f === void 0 ? void 0 : _f.pause();
+                    (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.pause();
                 }
                 setIsPauseVideo(!isPause);
                 break;
@@ -202,27 +213,8 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
     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, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         if (!isActive)
             return;
         const videoSrc = videoUrl;
@@ -243,7 +235,6 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
             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;
-                setCurrentTimeByStartTime();
                 (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
             });
         }
@@ -257,12 +248,11 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
         (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.addEventListener('play', handleStartPlay);
         (_f = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _f === void 0 ? void 0 : _f.addEventListener('playing', handlePlaying);
         (_g = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _g === void 0 ? void 0 : _g.addEventListener('pause', handlePause);
-        (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.addEventListener('ended', handlePlay);
+        (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.addEventListener('ended', handleEnd);
         (_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, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             const isPause = (_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.paused;
             if (!isPause)
                 handlePause();
@@ -274,10 +264,9 @@ const VideoWidget = (0, react_1.forwardRef)(({ rec, index, height, data, muted,
             (_e = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _e === void 0 ? void 0 : _e.removeEventListener('play', handleStartPlay);
             (_f = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _f === void 0 ? void 0 : _f.removeEventListener('playing', handlePlaying);
             (_g = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _g === void 0 ? void 0 : _g.removeEventListener('pause', handlePause);
-            (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.removeEventListener('ended', handlePlay);
+            (_h = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _h === void 0 ? void 0 : _h.removeEventListener('ended', handleEnd);
             (_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)(() => {

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

@@ -45,6 +45,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
     const skipLinkRef = (0, react_1.useRef)(false);
     const [pageNum, setPageNum] = (0, react_1.useState)(2);
     const videoWidgetRef = (0, react_1.useRef)(null);
+    const pictureGroupRef = (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)(() => {
@@ -180,8 +181,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         refreshFeSession
     ]);
     const handleSessionExpire = (0, react_1.useCallback)((0, lodash_1.debounce)(() => {
-        var _a;
+        var _a, _b;
         (_a = videoWidgetRef.current) === null || _a === void 0 ? void 0 : _a.setLoopPlay(false);
+        (_b = pictureGroupRef.current) === null || _b === void 0 ? void 0 : _b.setLoopPlay(false);
         refreshFeSession === null || refreshFeSession === void 0 ? void 0 : refreshFeSession(false, handleSessionCompleted);
     }, 1000), [handleSessionCompleted, refreshFeSession]);
     (0, react_1.useEffect)(() => {
@@ -259,7 +261,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             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 }));
+            return (react_1.default.createElement(PictureGroup_1.default, Object.assign({ data: data }, (activeIndex === index && { ref: pictureGroupRef }), { 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, swiperRef: swiperRef })));
         }
         if (rec.product && Array.isArray(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) && ((_j = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _j === void 0 ? void 0 : _j.length) > 0) {
             return (_k = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _k === void 0 ? void 0 : _k.map((value, idx) => {

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

@@ -54,7 +54,8 @@ const CommodityDetail = (0, create_1.createMaterial)(_1.default, {
                 height: 45,
                 fontWeight: 'bold',
                 textAlign: 'center',
-                color: 'rgba(255, 255, 255, 0.9)'
+                color: 'rgba(255, 255, 255, 0.9)',
+                textTransform: 'unset'
             },
             commodityImgRatio: {
                 w: 1,

package/lib/materials/sxp/popup/CommodityDetail/settingRender.d.ts

@@ -166,10 +166,21 @@ declare const _default: ({
 } | {
     title: string;
     child: ({
+        label: string;
+        type: string;
+        name: string[];
+        options: {
+            label: string;
+            value: string;
+        }[];
+        initialValue?: undefined;
+        child?: undefined;
+    } | {
         type: string;
         label: string;
         name: string[];
         initialValue: string;
+        options?: undefined;
         child?: undefined;
     } | {
         type: string;
@@ -186,11 +197,13 @@ declare const _default: ({
             max: number;
         })[];
         name?: undefined;
+        options?: undefined;
         initialValue?: undefined;
     } | {
         type: string;
         name: string[];
         label?: undefined;
+        options?: undefined;
         initialValue?: undefined;
         child?: undefined;
     } | {
@@ -202,6 +215,7 @@ declare const _default: ({
             bottomText: string;
         }[];
         name?: undefined;
+        options?: undefined;
         initialValue?: undefined;
     } | {
         type: string;
@@ -218,11 +232,13 @@ declare const _default: ({
             initialValue?: undefined;
         })[];
         name?: undefined;
+        options?: undefined;
         initialValue?: undefined;
     } | {
         label: string;
         type: string;
         name: string[];
+        options?: undefined;
         initialValue?: undefined;
         child?: undefined;
     })[];

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

@@ -246,6 +246,25 @@ exports.default = [
     {
         title: '购买按钮样式',
         child: [
+            {
+                label: '英文大小写',
+                type: 'Select',
+                name: ['props', 'buttonStyle', 'textTransform'],
+                options: [
+                    {
+                        label: '默认',
+                        value: 'unset'
+                    },
+                    {
+                        label: '小写',
+                        value: 'lowercase'
+                    },
+                    {
+                        label: '大写',
+                        value: 'uppercase'
+                    }
+                ]
+            },
             {
                 type: 'Color',
                 label: '背景色',

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

@@ -54,7 +54,8 @@ const CommodityDetailDiroNew = (0, create_1.createMaterial)(_1.default, {
                 color: '#fff',
                 borderRadius: 25,
                 marginTop: 16,
-                marginBottom: 16
+                marginBottom: 16,
+                textTransform: 'unset'
             },
             commodityImgRatio: {
                 w: 1,

package/lib/materials/sxp/popup/CommodityDetailDiroNew/settingRender.d.ts

@@ -153,10 +153,21 @@ declare const _default: ({
 } | {
     title: string;
     child: ({
+        label: string;
+        type: string;
+        name: string[];
+        options: {
+            label: string;
+            value: string;
+        }[];
+        initialValue?: undefined;
+        child?: undefined;
+    } | {
         type: string;
         label: string;
         name: string[];
         initialValue: string;
+        options?: undefined;
         child?: undefined;
     } | {
         type: string;
@@ -173,11 +184,13 @@ declare const _default: ({
             max: number;
         })[];
         name?: undefined;
+        options?: undefined;
         initialValue?: undefined;
     } | {
         type: string;
         name: string[];
         label?: undefined;
+        options?: undefined;
         initialValue?: undefined;
         child?: undefined;
     } | {
@@ -189,6 +202,7 @@ declare const _default: ({
             bottomText: string;
         }[];
         name?: undefined;
+        options?: undefined;
         initialValue?: undefined;
     } | {
         type: string;
@@ -205,11 +219,13 @@ declare const _default: ({
             initialValue?: undefined;
         })[];
         name?: undefined;
+        options?: undefined;
         initialValue?: undefined;
     } | {
         label: string;
         type: string;
         name: string[];
+        options?: undefined;
         initialValue?: undefined;
         child?: undefined;
     })[];

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

@@ -229,6 +229,25 @@ exports.default = [
     {
         title: '购买按钮样式',
         child: [
+            {
+                label: '英文大小写',
+                type: 'Select',
+                name: ['props', 'buttonStyle', 'textTransform'],
+                options: [
+                    {
+                        label: '默认',
+                        value: 'unset'
+                    },
+                    {
+                        label: '小写',
+                        value: 'lowercase'
+                    },
+                    {
+                        label: '大写',
+                        value: 'uppercase'
+                    }
+                ]
+            },
             {
                 type: 'Color',
                 label: '背景色',

package/package.json

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