pb-sxp-ui 1.0.48 → 1.0.50

package/dist/index.js

@@ -466,20 +466,20 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }, [bffDataSource]);
     // 获取推荐视频数据
     const getRecommendVideos = useCallback((query) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         query = {
-            maxSize,
-            defaultSize: (_a = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _a !== void 0 ? _a : defaultSize,
+            maxSize: (_a = query === null || query === void 0 ? void 0 : query.maxSize) !== null && _a !== void 0 ? _a : maxSize,
+            defaultSize: (_b = query === null || query === void 0 ? void 0 : query.defaultSize) !== null && _b !== void 0 ? _b : defaultSize,
             'itemFilter.itemId': query === null || query === void 0 ? void 0 : query['itemFilter.itemId'],
             'itemFilter.itemType': query === null || query === void 0 ? void 0 : query['itemFilter.itemType'],
             hashTag: query === null || query === void 0 ? void 0 : query.hashTag,
             traceInfo: query === null || query === void 0 ? void 0 : query.traceInfo
         };
         if (utmVal) {
-            const val = (_d = (_c = (_b = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _b === void 0 ? void 0 : _b.filter((val) => {
+            const val = (_e = (_d = (_c = utmVal === null || utmVal === void 0 ? void 0 : utmVal.split('&')) === null || _c === void 0 ? void 0 : _c.filter((val) => {
                 const key = val.split('=')[0];
                 return UTM_KEYS.includes(key);
-            })) === null || _c === void 0 ? void 0 : _c.join('&')) !== null && _d !== void 0 ? _d : '';
+            })) === null || _d === void 0 ? void 0 : _d.join('&')) !== null && _e !== void 0 ? _e : '';
             query = Object.assign(Object.assign({}, query), { channel: decodeURIComponent(val) });
         }
         const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/recommend/list', { method: 'GET', query }));
@@ -491,7 +491,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
         return result === null || result === void 0 ? void 0 : result.data;
     }), [bffFetch, utmVal, maxSize, defaultSize]);
     const loadVideos = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
+        var _f, _g;
         if (rtcList.length <= 0) {
             return;
         }
@@ -500,8 +500,8 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             'itemFilter.itemId': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId,
             'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType
         });
-        setRtcList(rtcList.concat((_e = data === null || data === void 0 ? void 0 : data.recList) !== null && _e !== void 0 ? _e : []));
-        setCacheRtcList(cacheRtcList.concat((_f = data === null || data === void 0 ? void 0 : data.recList) !== null && _f !== void 0 ? _f : []));
+        setRtcList(rtcList.concat((_f = data === null || data === void 0 ? void 0 : data.recList) !== null && _f !== void 0 ? _f : []));
+        setCacheRtcList(cacheRtcList.concat((_g = data === null || data === void 0 ? void 0 : data.recList) !== null && _g !== void 0 ? _g : []));
     }), [getRecommendVideos, rtcList, waterFallData, cacheRtcList]);
     const bffEventReport = useCallback(({ userInfo, eventInfo }) => {
         // 关闭 BFF 事件上报
@@ -545,12 +545,12 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
     }), [bffFetch]);
     // 获取 Tag
     const bffGetTagList = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _g, _h;
+        var _h, _j;
         if (!utmVal)
             return;
         try {
             const result = yield (bffFetch === null || bffFetch === void 0 ? void 0 : bffFetch('/tag/list', { method: 'GET', query: { channel: utmVal } }));
-            setTagList((_h = (_g = result === null || result === void 0 ? void 0 : result.data) === null || _g === void 0 ? void 0 : _g.tags) !== null && _h !== void 0 ? _h : []);
+            setTagList((_j = (_h = result === null || result === void 0 ? void 0 : result.data) === null || _h === void 0 ? void 0 : _h.tags) !== null && _j !== void 0 ? _j : []);
         }
         catch (e) {
             console.log('e', e);
@@ -11707,7 +11707,8 @@ function WaterfallList(_a) {
                 hashTag: waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.hashTag,
                 'itemFilter.itemId': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemId,
                 'itemFilter.itemType': waterFallData === null || waterFallData === void 0 ? void 0 : waterFallData.itemType,
-                defaultSize: hashTagSize
+                defaultSize: hashTagSize,
+                maxSize: hashTagSize
             }).then((res) => {
                 var _a, _b;
                 setData(res);
@@ -12118,10 +12119,13 @@ const VideoWidget$2 = ({ rec, index, height, data, muted, activeIndex, videoPost
     }, [bffEventReport, data, index, isFirstPlay, videoRef]);
     const handLoadeddata = useCallback(() => {
         var _a;
-        if (!videoRef || isBgColor || firstFrameSrc)
+        if (!videoRef || firstFrameSrc || !blur)
             return;
         const videoDomRef = document.getElementById('player-container-id_html5_api');
-        if (((_a = rec === null || rec === void 0 ? void 0 : rec.video) === null || _a === void 0 ? void 0 : _a.cover) || !canvasRef || !videoDomRef || !canvasRef.current)
+        if (!videoDomRef)
+            return;
+        videoDomRef.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)
             return;
         const setFrameImg = () => {
             const video = videoDomRef;
@@ -12138,7 +12142,7 @@ const VideoWidget$2 = ({ rec, index, height, data, muted, activeIndex, videoPost
         setTimeout(() => {
             setFrameImg();
         }, 500);
-    }, [videoRef, isBgColor, rec, firstFrameSrc]);
+    }, [videoRef, isBgColor, rec, firstFrameSrc, blur]);
     const handleLoadedmetadata = useCallback(() => {
         if (!videoRef)
             return;
@@ -12631,47 +12635,11 @@ const Nudge = ({ nudge }) => {
         React.createElement("p", { style: Object.assign({}, nudge === null || nudge === void 0 ? void 0 : nudge.textStyle) }, (_g = nudge === null || nudge === void 0 ? void 0 : nudge.content) !== null && _g !== void 0 ? _g : '')))));
 };
 
-const DEFAULT_TAG = 'FOR U';
-const Tagbar = ({ tagList = [], setActiveIndex }) => {
-    const [selectTag, setSelectTag] = useState(DEFAULT_TAG);
-    const { getRecommendVideos, setRtcList, setCacheRtcList, setCacheActiveIndex, setLoading, swiperRef } = useSxpDataSource();
-    const realTagList = useMemo(() => {
-        return [DEFAULT_TAG, ...tagList];
-    }, [tagList]);
-    const handleSelectTag = (tag) => () => {
-        if (tag === selectTag)
-            return;
-        let hashTag;
-        if (tag !== DEFAULT_TAG) {
-            hashTag = tag;
-        }
-        setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
-        getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos({ hashTag }).then((res) => {
-            var _a, _b, _c, _d;
-            setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList((_a = res === null || res === void 0 ? void 0 : res.recList) !== null && _a !== void 0 ? _a : []);
-            setCacheRtcList === null || setCacheRtcList === void 0 ? void 0 : setCacheRtcList((_b = res === null || res === void 0 ? void 0 : res.recList) !== null && _b !== void 0 ? _b : []);
-            setActiveIndex === null || setActiveIndex === void 0 ? void 0 : setActiveIndex(0);
-            setCacheActiveIndex === null || setCacheActiveIndex === void 0 ? void 0 : setCacheActiveIndex(0);
-            (_d = (_c = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _c === void 0 ? void 0 : _c.swiper) === null || _d === void 0 ? void 0 : _d.slideTo(0);
-        }).finally(() => {
-            setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-        });
-        setSelectTag(tag);
-    };
-    if (tagList.length <= 0)
-        return null;
-    return (React.createElement("div", { className: 'clc-sxp-tagbar' },
-        React.createElement("ul", { className: 'clc-sxp-tagbar-list', style: { margin: 'auto', gap: 24 } }, realTagList.map((tag) => {
-            return (React.createElement("li", { className: `clc-sxp-tagbar-list-item ${tag === selectTag ? 'clc-sxp-tagbar-list-item-active' : ''}`, key: tag, onClick: handleSelectTag(tag) }, tag));
-        }))));
-};
-var Tagbar$1 = memo(Tagbar);
-
 /*
  * @Author: binruan@chatlabs.com
  * @Date: 2024-01-15 19:03:09
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-04-29 16:55:16
+ * @LastEditTime: 2024-04-30 16:16:05
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
  *
  */
@@ -12845,9 +12813,9 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.logoUrl) && (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowLogo)) {
             minusHeight += 45;
         }
-        if (tagList.length > 0) {
-            minusHeight += 45;
-        }
+        // if (tagList.length > 0) {
+        //   minusHeight += 45;
+        // }
         return containerHeight - minusHeight;
     }, [globalConfig, containerHeight, tagList]);
     const renderLogo = useMemo(() => {
@@ -13071,7 +13039,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 setOpenHashtag === null || setOpenHashtag === void 0 ? void 0 : setOpenHashtag(true);
             } })),
         renderLogo,
-        React.createElement(Tagbar$1, { tagList: tagList, setActiveIndex: setActiveIndex }),
         isShowFingerTip ? React.createElement(FingerSwipeTip, { imageUrl: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.swipeTipIcon }) : null,
         React.createElement(Swiper, { ref: swiperRef, onSlideChange: () => {
                 swiperRef.current.swiper.allowTouchMove = false;
@@ -13132,6 +13099,42 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             React.createElement("div", { id: 'player-container-id-copy' }))));
 };
 
+const DEFAULT_TAG = 'FOR U';
+const Tagbar = ({ tagList = [], setActiveIndex }) => {
+    const [selectTag, setSelectTag] = useState(DEFAULT_TAG);
+    const { getRecommendVideos, setRtcList, setCacheRtcList, setCacheActiveIndex, setLoading, swiperRef } = useSxpDataSource();
+    const realTagList = useMemo(() => {
+        return [DEFAULT_TAG, ...tagList];
+    }, [tagList]);
+    const handleSelectTag = (tag) => () => {
+        if (tag === selectTag)
+            return;
+        let hashTag;
+        if (tag !== DEFAULT_TAG) {
+            hashTag = tag;
+        }
+        setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
+        getRecommendVideos === null || getRecommendVideos === void 0 ? void 0 : getRecommendVideos({ hashTag }).then((res) => {
+            var _a, _b, _c, _d;
+            setRtcList === null || setRtcList === void 0 ? void 0 : setRtcList((_a = res === null || res === void 0 ? void 0 : res.recList) !== null && _a !== void 0 ? _a : []);
+            setCacheRtcList === null || setCacheRtcList === void 0 ? void 0 : setCacheRtcList((_b = res === null || res === void 0 ? void 0 : res.recList) !== null && _b !== void 0 ? _b : []);
+            setActiveIndex === null || setActiveIndex === void 0 ? void 0 : setActiveIndex(0);
+            setCacheActiveIndex === null || setCacheActiveIndex === void 0 ? void 0 : setCacheActiveIndex(0);
+            (_d = (_c = swiperRef === null || swiperRef === void 0 ? void 0 : swiperRef.current) === null || _c === void 0 ? void 0 : _c.swiper) === null || _d === void 0 ? void 0 : _d.slideTo(0);
+        }).finally(() => {
+            setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
+        });
+        setSelectTag(tag);
+    };
+    if (tagList.length <= 0)
+        return null;
+    return (React.createElement("div", { className: 'clc-sxp-tagbar' },
+        React.createElement("ul", { className: 'clc-sxp-tagbar-list', style: { margin: 'auto', gap: 24 } }, realTagList.map((tag) => {
+            return (React.createElement("li", { className: `clc-sxp-tagbar-list-item ${tag === selectTag ? 'clc-sxp-tagbar-list-item-active' : ''}`, key: tag, onClick: handleSelectTag(tag) }, tag));
+        }))));
+};
+var Tagbar$1 = memo(Tagbar);
+
 const PictureGroup = ({ imgUrls, width, height, imgUrlsPostConfig, rec, index }) => {
     return (React.createElement(Swiper, { defaultValue: 0, direction: 'horizontal', modules: [Pagination, Autoplay], pagination: { clickable: true, bulletActiveClass: 'swipe-item-active-bullet' }, height: height, style: { width }, loop: true, autoplay: false }, imgUrls === null || imgUrls === void 0 ? void 0 : imgUrls.map((url) => {
         return (React.createElement(SwiperSlide, { key: url },