pb-sxp-ui 1.19.16 → 1.19.18

package/dist/index.css

@@ -63,11 +63,7 @@ a:active {
   color: #000;
   outline: none;
 }
-
-:root {
-  --safe-area-inset-bottom: constant(safe-area-inset-bottom);
-  --safe-area-inset-bottom: env(safe-area-inset-bottom);
-}
+
 .pb-appoint-form {
   position: relative;
   height: 100%;
@@ -1073,10 +1069,7 @@ a:active {
           flex: 1;
   height: 100vh;
   overflow-y: auto;
-  padding-top: 18px;
-  padding-left: 18px;
-  padding-right: 18px;
-  padding-bottom: calc(18px + var(--safe-area-inset-bottom, 0px));
+  padding: 18px;
 }
 .waterfallFlow__title {
   text-align: center;
@@ -1555,7 +1548,6 @@ a:active {
   top: 0;
   left: 0;
   right: 0;
-  bottom: var(--safe-area-inset-bottom, 0px);
   width: 100%;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
@@ -2467,7 +2459,7 @@ button.swiper-pagination-bullet {
   left: 0;
   top: 0;
   right: 0;
-  bottom: var(--safe-area-inset-bottom, 0px);
+  bottom: 0;
   z-index: 100;
   -webkit-box-orient: vertical;
   -webkit-box-direction: normal;

package/dist/index.js

@@ -18979,98 +18979,64 @@ const NavBack = ({ data, minusHeight, tagHeight, onClick }) => {
 var NavBack$1 = memo(NavBack);
 
 const useVisibleHeight = () => {
-    var _a, _b;
     const [visibleHeight, setVisibleHeight] = useState(0);
-    const getDvhInPx = () => {
-        const detector = document.createElement('div');
-        detector.style.position = 'fixed';
-        detector.style.bottom = `${getHeightWithSafeArea()}px`;
-        detector.style.left = '0';
-        detector.style.height = '100dvh';
-        detector.style.visibility = 'hidden';
-        detector.style.zIndex = '-1';
-        document.body.appendChild(detector);
-        const dvhInPx = detector.clientHeight;
-        document.body.removeChild(detector);
-        return dvhInPx;
-    };
-    const getVhInPx = () => {
-        const detector = document.createElement('div');
-        detector.style.position = 'fixed';
-        detector.style.bottom = `${getHeightWithSafeArea()}px`;
-        detector.style.left = '0';
-        detector.style.height = '100vh';
-        detector.style.visibility = 'hidden';
-        detector.style.zIndex = '-1';
-        document.body.appendChild(detector);
-        const dvhInPx = detector.clientHeight;
-        document.body.removeChild(detector);
-        return dvhInPx;
-    };
-    const getFillAvailableInPx = () => {
-        const detector = document.createElement('div');
-        detector.style.position = 'fixed';
-        detector.style.bottom = `${getHeightWithSafeArea()}px`;
-        detector.style.left = '0';
-        detector.style.height = '-webkit-fill-available';
-        detector.style.visibility = 'hidden';
-        detector.style.zIndex = '-1';
-        document.body.appendChild(detector);
-        const dvhInPx = detector.clientHeight;
-        document.body.removeChild(detector);
-        return dvhInPx;
-    };
-    const getHeightWithSafeArea = () => {
-        const root = document.documentElement;
-        const value = getComputedStyle(root).getPropertyValue('--safe-area-inset-bottom');
-        // 处理可能的值（可能是 '0px', '34px' 等）
-        const numericValue = parseInt(value) || 0;
-        return numericValue;
-    };
-    const dvhToPx = (dvh) => {
-        return Math.round((dvh / 100) * document.documentElement.clientHeight);
-    };
-    const systemInfo = {
-        visualViewport: (_a = window.visualViewport) === null || _a === void 0 ? void 0 : _a.height,
-        innerHeight: window.innerHeight,
-        clientHeight: document.documentElement.clientHeight,
-        screenHeight: window.screen.height,
-        bodyHeight: (_b = document === null || document === void 0 ? void 0 : document.body) === null || _b === void 0 ? void 0 : _b.clientHeight,
-        agent: navigator.userAgent,
-        version: '1.19.16',
-        safeArea: getHeightWithSafeArea(),
-        dvh: dvhToPx(100),
-        dvhInPx: getDvhInPx(),
-        vhInPx: getVhInPx(),
-        fillAvailableInPx: getFillAvailableInPx()
+    const getVisibleContentHeight = () => {
+        // 方法优先级：
+        // 1. visualViewport.height (最准确)
+        // 2. window.innerHeight (次之)
+        // 3. document.documentElement.clientHeight (fallback)
+        if (typeof window === 'undefined')
+            return 0;
+        let height = window.innerHeight;
+        // 优先使用 visualViewport
+        if (window.visualViewport) {
+            height = window.visualViewport.height;
+        }
+        // 验证高度合理性
+        if (height <= 0 || height > window.screen.height) {
+            height = window.innerHeight;
+        }
+        // 最终 fallback
+        if (height <= 0) {
+            height = document.documentElement.clientHeight;
+        }
+        return height;
     };
-    console.log(systemInfo, 'fundebug-init--------------------->systemInfo');
-    if ('fundebug' in window) {
-        window === null || window === void 0 ? void 0 : window.fundebug.notify('Collect_Info', 'init', { metaData: { systemInfo, otherInfo: {} } });
-    }
     const updateHeight = useCallback(() => {
-        var _a, _b, _c;
-        const systemInfo = {
-            visualViewport: (_a = window.visualViewport) === null || _a === void 0 ? void 0 : _a.height,
-            innerHeight: window.innerHeight,
-            clientHeight: document.documentElement.clientHeight,
-            screenHeight: window.screen.height,
-            bodyHeight: (_b = document === null || document === void 0 ? void 0 : document.body) === null || _b === void 0 ? void 0 : _b.clientHeight,
-            agent: navigator.userAgent,
-            version: '1.19.15',
-            safeArea: getHeightWithSafeArea(),
-            dvh: dvhToPx(100),
-            dvhInPx: getDvhInPx(),
-            vhInPx: getVhInPx(),
-            fillAvailableInPx: getFillAvailableInPx()
-        };
-        console.log(systemInfo, 'fundebug-resize--------------------->systemInfo');
+        var _a;
+        const visibleHeight = getVisibleContentHeight();
+        const screenHeight = (_a = window.screen) === null || _a === void 0 ? void 0 : _a.height;
+        const ua = navigator.userAgent;
+        // Instagram 检测
+        const isInstagram = /Instagram/i.test(ua);
+        // Facebook 检测
+        const isFacebook = /FBAV|FBAN|FBSN/i.test(ua);
+        // 安全检查
+        if (!screenHeight || visibleHeight <= 0 || (!isInstagram && !isFacebook)) {
+            setVisibleHeight(visibleHeight);
+            return;
+        }
+        const ratio = visibleHeight / screenHeight;
+        const threshold = 0.9;
+        const h = screenHeight >= 900 ? screenHeight * 0.8 : screenHeight * 0.79;
+        // 当内容高度占屏幕高度90%以上时，使用按比例计算的高度
+        // 否则使用实际内容高度
+        const finalHeight = Math.round(ratio >= threshold ? h : visibleHeight);
         if ('fundebug' in window) {
+            const systemInfo = {
+                ratio,
+                h,
+                finalHeight,
+                visibleHeight,
+                screenHeight,
+                isInstagram,
+                isFacebook,
+                ua
+            };
             window === null || window === void 0 ? void 0 : window.fundebug.notify('Collect_Info', 'resize', { metaData: { systemInfo, otherInfo: {} } });
         }
-        const height = ((_c = document === null || document === void 0 ? void 0 : document.documentElement) === null || _c === void 0 ? void 0 : _c.clientHeight) || (window === null || window === void 0 ? void 0 : window.innerHeight);
-        setVisibleHeight(height);
-    }, [getHeightWithSafeArea, dvhToPx, getDvhInPx, getVhInPx, getFillAvailableInPx]);
+        setVisibleHeight(finalHeight);
+    }, [getVisibleContentHeight]);
     useEffect(() => {
         // 初始计算
         updateHeight();
@@ -19088,8 +19054,6 @@ const useVisibleHeight = () => {
         if ('virtualKeyboard' in navigator) {
             navigator.virtualKeyboard.addEventListener('geometrychange', updateHeight);
         }
-        // 定期检查（应对某些特殊情况）
-        const interval = setInterval(updateHeight, 1000);
         return () => {
             events.forEach((event) => {
                 window.removeEventListener(event, updateHeight);
@@ -19101,7 +19065,6 @@ const useVisibleHeight = () => {
             if ('virtualKeyboard' in navigator) {
                 navigator.virtualKeyboard.removeEventListener('geometrychange', updateHeight);
             }
-            clearInterval(interval);
         };
     }, [updateHeight]);
     return visibleHeight;
@@ -19115,7 +19078,7 @@ const useVisibleHeight = () => {
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\index.tsx
  *
  */
-const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema, hashTagStyle, hashTagRightMargin, tagList = [], defaultData }) => {
+const SxpPageRender = ({ globalConfig, descStyle, containerHeight, 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');
@@ -19304,29 +19267,10 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         }
         return minusHeight;
     }, [globalConfig]);
-    const getHeightWithSafeArea = () => {
-        const root = document.documentElement;
-        const value = getComputedStyle(root).getPropertyValue('--safe-area-inset-bottom');
-        // 处理可能的值（可能是 '0px', '34px' 等）
-        const numericValue = parseInt(value) || 0;
-        return numericValue;
-    };
-    const getDvhInPx = () => {
-        const detector = document.createElement('div');
-        detector.style.position = 'fixed';
-        detector.style.bottom = `${getHeightWithSafeArea()}px`;
-        detector.style.left = '0';
-        detector.style.height = '100dvh';
-        detector.style.visibility = 'hidden';
-        detector.style.zIndex = '-1';
-        document.body.appendChild(detector);
-        const dvhInPx = detector.clientHeight;
-        document.body.removeChild(detector);
-        return dvhInPx;
-    };
     const height = useMemo(() => {
-        return getDvhInPx() - minusHeight - tagHeight - getHeightWithSafeArea();
-    }, [minusHeight, visibleHeight, tagHeight, getHeightWithSafeArea, containerHeight, getDvhInPx]);
+        const h = containerHeight || visibleHeight;
+        return h - minusHeight - tagHeight;
+    }, [containerHeight, visibleHeight, minusHeight, tagHeight]);
     const visList = useMemo(() => {
         var _a;
         const list = activeIndex === 0 && !waterFallData && !isEditor && !isDiyH5
@@ -19467,9 +19411,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconYPosit) === 'top') {
             top += minusHeight;
         }
-        if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconFixed) && (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconYPosit) !== 'top') {
-            top += getHeightWithSafeArea();
-        }
         if (rec === null || rec === void 0 ? void 0 : rec.video) {
             return (React.createElement(LikeButton$1, { key: rec.position, activeIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIcon, unActicveIcon: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.unlikeIcon, active: rec.isCollected, recData: rec, className: 'clc-sxp-like-button', style: {
                     position: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.likeIconFixed) ? 'fixed' : 'absolute',
@@ -19704,9 +19645,6 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconYPosit) === 'top') {
             top += minusHeight;
         }
-        if ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconFixed) && (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconYPosit) !== 'top') {
-            top += getHeightWithSafeArea();
-        }
         return (((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowMute) === undefined || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowMute) === true) && (React.createElement(ToggleButton$1, { style: {
                 position: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconFixed) ? 'fixed' : 'absolute',
                 visibility: ((_c = (_b = visList === null || visList === void 0 ? void 0 : visList[activeIndex]) === null || _b === void 0 ? void 0 : _b.video) === null || _c === void 0 ? void 0 : _c.url) ? 'visible' : 'hidden',
@@ -19747,7 +19685,7 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         isReload,
         renderToggleButton
     ]);
-    return (React.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container' },
+    return (React.createElement("div", { id: 'sxp-render', className: 'clc-sxp-container', style: { height } },
         (data === null || data === void 0 ? void 0 : data.length) < 1 && loading ? (React.createElement("div", { style: { height, width: containerWidth, display: 'flex', justifyContent: 'center', alignItems: 'center' } },
             React.createElement("img", { width: 64, height: 64, src: loadingImage, alt: 'loading...', style: { objectFit: 'contain' } }))) : (React.createElement("div", { style: Object.assign({}, ((globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset) && { textUnderlineOffset: `${globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.textUnderlineOffset}px` })) },
             waterFallData && (React.createElement(Navbar$1, { icon: img, styles: { background: 'rgba(0,0,0,.3)', color: '#fff', top: `${minusHeight}px` }, textStyle: Object.assign(Object.assign({}, (_e = (_d = (_c = (_b = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.textStyles) === null || _e === void 0 ? void 0 : _e.hashTagTitle), { color: '#fff' }), onClose: () => {
@@ -19809,10 +19747,10 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
                 renderToggleButton(!!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.muteIconFixed))),
             React.createElement(WaterFall$1, Object.assign({}, (_u = (_t = (_s = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.hashTag) === null || _s === void 0 ? void 0 : _s[0]) === null || _t === void 0 ? void 0 : _t.item) === null || _u === void 0 ? void 0 : _u.props)),
             React.createElement(ConsentPopup, { resolver: resolver, globalConfig: globalConfig }),
-            openMultiPosts && (React.createElement(MultiPosts$2, Object.assign({}, (_x = (_w = (_v = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _v === void 0 ? void 0 : _v[0]) === null || _w === void 0 ? void 0 : _w.item) === null || _x === void 0 ? void 0 : _x.props, (_0 = (_z = (_y = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _y === void 0 ? void 0 : _y[0]) === null || _z === void 0 ? void 0 : _z.item) === null || _0 === void 0 ? void 0 : _0.event, { style: { position: 'fixed', top: 0, left: 0, right: 0, bottom: 'var(--safe-area-inset-bottom,0px)' } }))))),
+            openMultiPosts && (React.createElement(MultiPosts$2, Object.assign({}, (_x = (_w = (_v = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _v === void 0 ? void 0 : _v[0]) === null || _w === void 0 ? void 0 : _w.item) === null || _x === void 0 ? void 0 : _x.props, (_0 = (_z = (_y = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.multiPosts) === null || _y === void 0 ? void 0 : _y[0]) === null || _z === void 0 ? void 0 : _z.item) === null || _0 === void 0 ? void 0 : _0.event, { style: { position: 'fixed', top: 0, left: 0, right: 0 } }))))),
         (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.enableCookieSetting) && (React.createElement("div", { style: {
                 position: 'fixed',
-                bottom: 'var(--safe-area-inset-bottom,0px)',
+                bottom: 0,
                 left: 0,
                 right: 0,
                 width: '100%',