@arco-design/mobile-react 2.36.0 → 2.36.1

package/esm/ellipsis/components/js-ellipsis.js

@@ -68,9 +68,11 @@ var JsEllipsis = /*#__PURE__*/forwardRef(function (props, ref) {
         currentText += temp;
         l = m;
       }
-    } // Remove the exclude char at the end of the content.
+    } // Remove the last character if it is orphaned high-surrogate characters (indicative of incomplete emoji).
 
 
+    currentText = currentText.replace(/[\uD800-\uDBFF]+$/, ''); // Remove the exclude char at the end of the content.
+
     while (endExcludes && endExcludes.includes(currentText[currentText.length - 1])) {
       currentText = currentText.slice(0, -1);
     } // Callback after reflow.

package/esm/popover/hooks/usePosition.js

@@ -223,20 +223,38 @@ export var usePosition = function usePosition(props, popoverRef, childRef, wrapp
 
 
     if (verticalAuto) {
-      var popoverTop = childRect.bottom - (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
-      var popoverBottom = childRect.top + (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0); // 顶部安全距离不够，调整到底部
-      // @en The top safety distance is not enough, adjust to the bottom
-
-      if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+      var setToBottom = function setToBottom() {
         newConfig.top = verticalOffset + childRect.height;
         newConfig.bottom = null;
         onAdjustDirection('bottom');
-      } else if (directionState.indexOf('bottom') !== -1 && popoverBottom + bottomOffset > window.innerHeight) {
-        // 底部安全距离不够，调整到顶部
-        // @en The bottom safety distance is not enough, adjust to the top
+      };
+
+      var setToTop = function setToTop() {
         newConfig.top = null;
         newConfig.bottom = verticalOffset + childRect.height;
         onAdjustDirection('top');
+      }; // 判断上下空间是否都不足以展示气泡内容
+      // @en Determine whether there is insufficient space both above and below to display content
+
+
+      var isPopoverTooTall = window.innerHeight - topOffset - bottomOffset < 2 * (newConfig.height || 0) + 2 * verticalOffset + childRect.height;
+
+      if (isPopoverTooTall) {
+        var spaceAbove = childRect.top;
+        var spaceBelow = window.innerHeight - childRect.bottom;
+        spaceAbove > spaceBelow ? setToTop() : setToBottom();
+      } else {
+        var popoverTop = childRect.bottom - (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
+        var popoverBottom = childRect.top + (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0); // 顶部安全距离不够，调整到底部
+        // @en The top safety distance is not enough, adjust to the bottom
+
+        if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+          setToBottom();
+        } else if ( // 底部安全距离不够，调整到顶部
+        // @en The bottom safety distance is not enough, adjust to the top
+        directionState.indexOf('bottom') !== -1 && popoverBottom + bottomOffset > window.innerHeight) {
+          setToTop();
+        }
       }
     } // 挂载在全局的气泡需要计算相对屏幕的位置
     // @en Bubble mounted in the global needs to calculate the position relative to the screen

package/esnext/ellipsis/components/js-ellipsis.js

@@ -49,6 +49,8 @@ const JsEllipsis = forwardRef((props, ref) => {
                 l = m;
             }
         }
+        // Remove the last character if it is orphaned high-surrogate characters (indicative of incomplete emoji).
+        currentText = currentText.replace(/[\uD800-\uDBFF]+$/, '');
         // Remove the exclude char at the end of the content.
         while (endExcludes && endExcludes.includes(currentText[currentText.length - 1])) {
             currentText = currentText.slice(0, -1);

package/esnext/popover/hooks/usePosition.js

@@ -161,24 +161,44 @@ export const usePosition = (props, popoverRef, childRef, wrapperRef) => {
         // 垂直方向安全距离调整
         // @en Vertical safety distance adjustment
         if (verticalAuto) {
-            const popoverTop = childRect.bottom -
-                (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
-            const popoverBottom = childRect.top +
-                (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0);
-            // 顶部安全距离不够，调整到底部
-            // @en The top safety distance is not enough, adjust to the bottom
-            if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+            const setToBottom = () => {
                 newConfig.top = verticalOffset + childRect.height;
                 newConfig.bottom = null;
                 onAdjustDirection('bottom');
-            }
-            else if (directionState.indexOf('bottom') !== -1 &&
-                popoverBottom + bottomOffset > window.innerHeight) {
-                // 底部安全距离不够，调整到顶部
-                // @en The bottom safety distance is not enough, adjust to the top
+            };
+            const setToTop = () => {
                 newConfig.top = null;
                 newConfig.bottom = verticalOffset + childRect.height;
                 onAdjustDirection('top');
+            };
+            // 判断上下空间是否都不足以展示气泡内容
+            // @en Determine whether there is insufficient space both above and below to display content
+            const isPopoverTooTall = window.innerHeight - topOffset - bottomOffset <
+                2 * (newConfig.height || 0) + 2 * verticalOffset + childRect.height;
+            if (isPopoverTooTall) {
+                const spaceAbove = childRect.top;
+                const spaceBelow = window.innerHeight - childRect.bottom;
+                spaceAbove > spaceBelow ? setToTop() : setToBottom();
+            }
+            else {
+                const popoverTop = childRect.bottom -
+                    (newConfig.bottom && newConfig.height
+                        ? newConfig.bottom + newConfig.height
+                        : 0);
+                const popoverBottom = childRect.top +
+                    (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0);
+                // 顶部安全距离不够，调整到底部
+                // @en The top safety distance is not enough, adjust to the bottom
+                if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+                    setToBottom();
+                }
+                else if (
+                // 底部安全距离不够，调整到顶部
+                // @en The bottom safety distance is not enough, adjust to the top
+                directionState.indexOf('bottom') !== -1 &&
+                    popoverBottom + bottomOffset > window.innerHeight) {
+                    setToTop();
+                }
             }
         }
         // 挂载在全局的气泡需要计算相对屏幕的位置

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arco-design/mobile-react",
-    "version": "2.36.0",
+    "version": "2.36.1",
     "description": "",
     "main": "cjs/index.js",
     "module": "esm/index.js",
@@ -15,7 +15,7 @@
     "author": "taoyiyue@bytedance.com",
     "license": "ISC",
     "dependencies": {
-        "@arco-design/mobile-utils": "2.21.0",
+        "@arco-design/mobile-utils": "2.21.1",
         "@arco-design/transformable": "^1.0.0",
         "@babel/runtime": "^7",
         "lodash.throttle": "^4.1.1",
@@ -47,5 +47,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e61b011d31905626ef7082a4a29faf2a03db93cf"
+    "gitHead": "b7c3cd986250450f6433c906cf68bd550883fc7c"
 }

package/umd/ellipsis/components/js-ellipsis.js

@@ -90,9 +90,11 @@
           currentText += temp;
           l = m;
         }
-      } // Remove the exclude char at the end of the content.
+      } // Remove the last character if it is orphaned high-surrogate characters (indicative of incomplete emoji).
 
 
+      currentText = currentText.replace(/[\uD800-\uDBFF]+$/, ''); // Remove the exclude char at the end of the content.
+
       while (endExcludes && endExcludes.includes(currentText[currentText.length - 1])) {
         currentText = currentText.slice(0, -1);
       } // Callback after reflow.

package/umd/popover/hooks/usePosition.js

@@ -239,20 +239,38 @@
 
 
       if (verticalAuto) {
-        var popoverTop = childRect.bottom - (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
-        var popoverBottom = childRect.top + (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0); // 顶部安全距离不够，调整到底部
-        // @en The top safety distance is not enough, adjust to the bottom
-
-        if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+        var setToBottom = function setToBottom() {
           newConfig.top = verticalOffset + childRect.height;
           newConfig.bottom = null;
           onAdjustDirection('bottom');
-        } else if (directionState.indexOf('bottom') !== -1 && popoverBottom + bottomOffset > window.innerHeight) {
-          // 底部安全距离不够，调整到顶部
-          // @en The bottom safety distance is not enough, adjust to the top
+        };
+
+        var setToTop = function setToTop() {
           newConfig.top = null;
           newConfig.bottom = verticalOffset + childRect.height;
           onAdjustDirection('top');
+        }; // 判断上下空间是否都不足以展示气泡内容
+        // @en Determine whether there is insufficient space both above and below to display content
+
+
+        var isPopoverTooTall = window.innerHeight - topOffset - bottomOffset < 2 * (newConfig.height || 0) + 2 * verticalOffset + childRect.height;
+
+        if (isPopoverTooTall) {
+          var spaceAbove = childRect.top;
+          var spaceBelow = window.innerHeight - childRect.bottom;
+          spaceAbove > spaceBelow ? setToTop() : setToBottom();
+        } else {
+          var popoverTop = childRect.bottom - (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
+          var popoverBottom = childRect.top + (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0); // 顶部安全距离不够，调整到底部
+          // @en The top safety distance is not enough, adjust to the bottom
+
+          if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+            setToBottom();
+          } else if ( // 底部安全距离不够，调整到顶部
+          // @en The bottom safety distance is not enough, adjust to the top
+          directionState.indexOf('bottom') !== -1 && popoverBottom + bottomOffset > window.innerHeight) {
+            setToTop();
+          }
         }
       } // 挂载在全局的气泡需要计算相对屏幕的位置
       // @en Bubble mounted in the global needs to calculate the position relative to the screen