@arco-design/mobile-react 2.30.7 → 2.30.9

package/esm/_helpers/render.js

@@ -1,13 +1,17 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { render as copyRender } from './react-dom';
-export var ReactDOMRender = function ReactDOMRender(app, container, context) {
+export var renderRootCache = {};
+export var ReactDOMRender = function ReactDOMRender(app, container, context, rootCacheId, // root id in cache
+root // use root in cache
+) {
   var _this = this;
 
   this.root = void 0;
   this.app = void 0;
   this.container = void 0;
   this.context = void 0;
+  this.rootCacheId = void 0;
 
   this.render = function (props) {
     var CustomApp = _this.app;
@@ -23,14 +27,30 @@ export var ReactDOMRender = function ReactDOMRender(app, container, context) {
     }
   };
 
+  this.setRootCache = function () {
+    if (_this.rootCacheId) {
+      renderRootCache[_this.rootCacheId] = _this.root;
+    }
+  };
+
+  this.clearRootCache = function () {
+    if (_this.rootCacheId) {
+      delete renderRootCache[_this.rootCacheId];
+    }
+  };
+
   this.unmount = function () {
     var _this$root;
 
     (_this$root = _this.root) == null ? void 0 : _this$root._unmount();
     _this.root = undefined;
+
+    _this.clearRootCache();
   };
 
   this.app = app;
   this.container = container;
   this.context = context;
+  this.rootCacheId = rootCacheId;
+  this.root = root;
 };

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

@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, forwardRef, useImperativeHandle, useCallback } from 'react';
 import ResizeObserver from 'resize-observer-polyfill';
 import { getLineHeight, wrapTextChildNodesWithSpan } from '../utils/dom';
+import { useLatestRef } from '../../_helpers';
 var JsEllipsis = /*#__PURE__*/forwardRef(function (props, ref) {
   var prefixCls = props.prefixCls,
       text = props.text,
@@ -20,10 +21,11 @@ var JsEllipsis = /*#__PURE__*/forwardRef(function (props, ref) {
   var domRef = useRef(null);
   var textRef = useRef(null);
   var ellipsisRef = useRef(null);
+  var ellipsisValueRef = useLatestRef(ellipsis);
   var lineHeightRef = useRef(0);
   var setCurLineHeight = useCallback(function () {
     if (domRef.current) {
-      lineHeightRef.current = getLineHeight(domRef.current);
+      lineHeightRef.current = Math.round(getLineHeight(domRef.current));
     }
   }, []);
   useEffect(function () {
@@ -149,7 +151,7 @@ var JsEllipsis = /*#__PURE__*/forwardRef(function (props, ref) {
       textRef.current.innerText = text;
     }
 
-    if (!ellipsis) {
+    if (!ellipsisValueRef.current) {
       return;
     }
 

package/esm/image/style/index.less

@@ -1,11 +1,11 @@
-@import "../../../style/mixin.less";
+@import '../../../style/mixin.less';
 
 .@{prefix}-image {
     display: inline-block;
     position: relative;
 
     &.preview {
-        transition: all .3s ease-in-out;
+        transition: all 0.3s ease-in-out;
 
         .image-container,
         .image-loading-container .image-loading,
@@ -109,7 +109,6 @@
     }
 
     .image-error-container {
-
         .image-retry-load {
             position: absolute;
             top: 0;
@@ -127,7 +126,6 @@
     }
 
     .image-loading-container {
-
         .image-loading {
             position: absolute;
             top: 0;

package/esm/image-preview/methods.js

@@ -3,9 +3,7 @@ import { appendElementById, removeElement } from '@arco-design/mobile-utils';
 import { ReactDOMRender } from '../_helpers/render';
 export function open(Component) {
   return function (config, context) {
-    var baseProps = _extends({
-      unmountOnExit: true
-    }, config || {}, {
+    var baseProps = _extends({}, config || {}, {
       close: function close() {}
     }); // 不同的key用不同的容器挂载
     // @en Different keys are mounted in different containers
@@ -42,10 +40,7 @@ export function open(Component) {
 
     dynamicProps.onClose = function () {
       baseProps.onClose && baseProps.onClose();
-
-      if (baseProps.unmountOnExit) {
-        removeElement(div);
-      }
+      removeElement(div);
     };
 
     dynamicProps.openIndex = -1;

package/esm/masking/methods.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { appendElementById, removeElement, nextTick } from '@arco-design/mobile-utils';
-import { ReactDOMRender } from '../_helpers/render';
+import { ReactDOMRender, renderRootCache } from '../_helpers/render';
 export function getOpenMethod(Component, containerId, normalize) {
   if (normalize === void 0) {
     normalize = function normalize(config) {
@@ -18,14 +18,14 @@ export function getOpenMethod(Component, containerId, normalize) {
 
 
     var id = "_" + (containerId || 'ARCO_MASKING') + "_DIV_" + (config.key || '') + "_";
-
-    var _appendElementById = appendElementById(id, baseProps.getContainer),
-        div = _appendElementById.child;
-
+    var existedDiv = baseProps.unmountOnExit ? null : document.getElementById(id);
+    var div = existedDiv || appendElementById(id, baseProps.getContainer).child;
     var leaving = false;
 
-    var _ReactDOMRender = new ReactDOMRender(Component, div, context),
-        render = _ReactDOMRender.render;
+    var _ReactDOMRender = new ReactDOMRender(Component, div, context, id, existedDiv ? renderRootCache[id] : undefined),
+        render = _ReactDOMRender.render,
+        unmount = _ReactDOMRender.unmount,
+        setRootCache = _ReactDOMRender.setRootCache;
 
     var dynamicProps = _extends({}, baseProps, {
       getContainer: function getContainer() {
@@ -50,11 +50,17 @@ export function getOpenMethod(Component, containerId, normalize) {
       baseProps.onClose && baseProps.onClose(scene);
 
       if (baseProps.unmountOnExit) {
+        unmount();
         removeElement(div);
       }
     };
 
     render(dynamicProps);
+
+    if (!baseProps.unmountOnExit) {
+      setRootCache();
+    }
+
     nextTick(function () {
       if (leaving) return;
       dynamicProps.visible = true;

package/esm/skeleton/type.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { BaseProps, SimpleBaseProps } from '../_helpers';
+export type { BaseProps, SimpleBaseProps };
 export interface SkeletonProps extends SimpleBaseProps {
     /**
      * 是否显示标题占位图

package/esm/swipe-load/index.js

@@ -56,7 +56,8 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var _useContext = useContext(GlobalContext),
       _useContext$locale = _useContext.locale,
-      locale = _useContext$locale === void 0 ? defaultLocale : _useContext$locale;
+      locale = _useContext$locale === void 0 ? defaultLocale : _useContext$locale,
+      useRtl = _useContext.useRtl;
 
   var _useState = useState(disabled),
       disableState = _useState[0],
@@ -138,16 +139,20 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
       // 判断元素是否属于滚动元素 先置为1 之后变成0表示非滚动容器
       // @en Determine whether the element belongs to a scrolling element. Set it to 1 and then change to 0 to indicate a non-scrolling container
       if (!scrollContainer.scrollLeft) {
-        scrollContainer.scrollLeft = 1;
+        scrollContainer.scrollLeft = useRtl ? -1 : 1;
       }
 
       endX = e.touches[0].clientX || 0;
       var diff = endX - startX;
       offsetRef.current = diff;
-      var labelDiff = fingerDisToLabelDis(Math.abs(diff), damping); // 滑动到最左侧，处理回弹效果
+      var labelDiff = fingerDisToLabelDis(Math.abs(diff), damping); // 判断是否是滚动到列表开始方向，ltr模式下是向左滚动，rtl模式下是向右滚动
+
+      var isScrollToLeft = useRtl ? diff < 0 : diff > 0; // 判断是否是滚动到列表结束方向，ltr模式下是向右滚动，rtl模式下是向左滚动
+
+      var isScrollToRight = useRtl ? diff > 0 : diff < 0; // 滑动到最左侧，处理回弹效果
       // @en Swipe to the far left to handle the rebound effect
 
-      if (diff > 0 && scrollContainer.scrollLeft <= 1 && bounceWhenBumpBoundary) {
+      if (isScrollToLeft && Math.abs(scrollContainer.scrollLeft) <= 1 && bounceWhenBumpBoundary) {
         e.stopPropagation();
         e.cancelBubble && e.preventDefault();
         bouncingRef.current = true;
@@ -165,14 +170,14 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
       // @en Swipe left to the end and the 'more' label is loaded. Judging by scrollLeft, the scroll container reaches the edge and the non-scroll container does not judge
 
 
-      if (diff < 0 && (scrollContainer.scrollLeft + scrollContainer.clientWidth >= scrollContainer.scrollWidth - 1 || !scrollContainer.scrollLeft) && !ifToRightRef.current) {
+      if (isScrollToRight && (Math.abs(scrollContainer.scrollLeft) + scrollContainer.clientWidth >= scrollContainer.scrollWidth - 1 || !scrollContainer.scrollLeft) && !ifToRightRef.current) {
         showLoadMoreRef.current = true;
         loadingCurrent.style.display = 'flex';
       } // 继续滑动露出标签
       // @en Continue swiping to reveal labels
 
 
-      if (showLoadMoreRef.current && diff < 0) {
+      if (showLoadMoreRef.current && isScrollToRight) {
         // 此时禁止list原生滚动
         // @en Disable list native scrolling at this time
         e.stopPropagation();
@@ -192,22 +197,22 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
 
         setStyleWithVendor(loadingCurrent, {
           transition: 'none',
-          transform: "translateX(-" + labelRightMargin + "px) translateZ(0)"
+          transform: useRtl ? "translateX(" + labelRightMargin + "px) translateZ(0)" : "translateX(-" + labelRightMargin + "px) translateZ(0)"
         });
         setStyleWithVendor(scrollContainer, {
           transition: 'none',
-          transform: "translateX(-" + listRightMargin + "px) translateZ(0)"
+          transform: useRtl ? "translateX(" + listRightMargin + "px) translateZ(0)" : "translateX(-" + listRightMargin + "px) translateZ(0)"
         });
       }
 
-      if (diff > 0 && scrollContainer.scrollLeft + scrollContainer.clientWidth <= scrollContainer.scrollWidth - 1) {
+      if (isScrollToLeft && Math.abs(scrollContainer.scrollLeft) + scrollContainer.clientWidth <= scrollContainer.scrollWidth - 1) {
         showLoadMoreRef.current = false;
         loadingCurrent.style.display = 'none';
       } // 针对ios惯性滚动处理
       // @en Handling inertial scrolling for ios
 
 
-      if (diff < 0 && scrollContainer.scrollLeft + scrollContainer.clientWidth <= scrollContainer.scrollWidth - 1) {
+      if (isScrollToRight && Math.abs(scrollContainer.scrollLeft) + scrollContainer.clientWidth <= scrollContainer.scrollWidth - 1) {
         ifToRightRef.current = false;
       } else {
         ifToRightRef.current = true;
@@ -252,7 +257,7 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
       // @em Swipe left,  labels are all displayed
 
 
-      if (labelDiff >= minConfirmOffset && (scrollContainer.scrollLeft + scrollContainer.clientWidth >= scrollContainer.scrollWidth - 1 || !scrollContainer.scrollLeft) && showLoadMoreRef.current) {
+      if (labelDiff >= minConfirmOffset && (Math.abs(scrollContainer.scrollLeft) + scrollContainer.clientWidth >= scrollContainer.scrollWidth - 1 || !scrollContainer.scrollLeft) && showLoadMoreRef.current) {
         onConfirm(); // 安卓机型返回动画优化
         // @en Return animation optimization on Android
 
@@ -280,6 +285,8 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   });
   return /*#__PURE__*/React.createElement(ContextLayout, null, function (_ref) {
+    var _ref2, _ref3;
+
     var prefixCls = _ref.prefixCls;
     return /*#__PURE__*/React.createElement("div", {
       className: prefixCls + "-swipe-load " + className,
@@ -290,19 +297,17 @@ var SwipeLoad = /*#__PURE__*/forwardRef(function (props, ref) {
     }, children), renderLabel ? /*#__PURE__*/React.createElement("div", {
       className: cls(prefixCls + "-custom-loading-area"),
       ref: loadingRef,
-      style: {
-        position: 'absolute',
-        right: initPos + "px"
-      }
+      style: (_ref2 = {
+        position: 'absolute'
+      }, _ref2[useRtl ? 'left' : 'right'] = initPos + "px", _ref2)
     }, renderLabel.length ? renderLabel(labelOffsetState) : renderLabel()) : /*#__PURE__*/React.createElement("div", {
       className: cls(prefixCls + "-loading-area"),
       ref: loadingRef,
-      style: {
+      style: (_ref3 = {
         width: circleSize + "px",
         height: circleSize + "px",
-        position: 'absolute',
-        right: "-" + circleSize + "px"
-      }
+        position: 'absolute'
+      }, _ref3[useRtl ? 'left' : 'right'] = "-" + circleSize + "px", _ref3)
     }, /*#__PURE__*/React.createElement("div", {
       className: cls(prefixCls + "-loading-label"),
       ref: loadingLabelRef

package/esm/swipe-load/style/css/index.css

@@ -519,6 +519,10 @@
   color:  #1d2129 ;
   font-size:  0.24rem ;
 }
+[dir="rtl"] .arco-swipe-load .arco-loading-area .arco-loading-label {
+  margin-left: initial;
+  margin-right:  0.4rem ;
+}
 /***************************************************
  *                                                 *
  *               Arco Theme Style                  *

package/esm/swipe-load/style/index.less

@@ -20,7 +20,7 @@
         .use-var(border-radius, swipe-load-label-border-radius);
 
         .@{prefix}-loading-label {
-            .use-var(margin-left, swipe-load-label-text-margin-left);
+            .use-var-with-rtl(margin-left, swipe-load-label-text-margin-left);
             .use-var(width, swipe-load-label-text-width);
             .use-var(color, swipe-load-label-text-color);
             .use-var(font-size, swipe-load-label-text-font-size);

package/esm/tabs/index.js

@@ -440,11 +440,12 @@ var Tabs = /*#__PURE__*/forwardRef(function (props, ref) {
     changeFromRef.current = changeFrom || '';
     setCellTrans(true);
     setInnerIndex(newIndex);
-    setDistance(0);
 
     if (newIndex !== activeIndexRef.current) {
       onChange && onChange(tabs[newIndex], newIndex, changeFrom);
     }
+
+    setDistance(0);
   }
 
   return /*#__PURE__*/React.createElement(ContextLayout, null, function (_ref) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arco-design/mobile-react",
-    "version": "2.30.7",
+    "version": "2.30.9",
     "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.17.7",
+        "@arco-design/mobile-utils": "2.17.9",
         "@arco-design/transformable": "^1.0.0",
         "lodash.throttle": "^4.1.1",
         "resize-observer-polyfill": "^1.5.1"
@@ -49,5 +49,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "18760da2a4de19dc44e69e5999cd9577a69af30e"
+    "gitHead": "6831c908713b02b4f7738c793ea4118e17f03458"
 }

package/umd/_helpers/render.d.ts

@@ -1,12 +1,17 @@
 import { FunctionComponent } from 'react';
 import { RootType } from './react-dom';
 import { GlobalContextParams } from '../context-provider';
+export declare const renderRootCache: Record<string, RootType | undefined>;
 export declare class ReactDOMRender {
     root: RootType | undefined;
     app: FunctionComponent;
     container: Element | DocumentFragment;
     context: GlobalContextParams | undefined;
-    constructor(app: FunctionComponent, container: Element | DocumentFragment, context?: GlobalContextParams);
+    rootCacheId: string | undefined;
+    constructor(app: FunctionComponent, container: Element | DocumentFragment, context?: GlobalContextParams, rootCacheId?: string, // root id in cache
+    root?: RootType);
     render: (props: any) => void;
+    setRootCache: () => void;
+    clearRootCache: () => void;
     unmount: () => void;
 }

package/umd/_helpers/render.js

@@ -16,17 +16,22 @@
   var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
   _exports.__esModule = true;
-  _exports.ReactDOMRender = void 0;
+  _exports.renderRootCache = _exports.ReactDOMRender = void 0;
   _extends2 = _interopRequireDefault(_extends2);
   _react = _interopRequireDefault(_react);
+  var renderRootCache = {};
+  _exports.renderRootCache = renderRootCache;
 
-  var ReactDOMRender = function ReactDOMRender(app, container, context) {
+  var ReactDOMRender = function ReactDOMRender(app, container, context, rootCacheId, // root id in cache
+  root // use root in cache
+  ) {
     var _this = this;
 
     this.root = void 0;
     this.app = void 0;
     this.container = void 0;
     this.context = void 0;
+    this.rootCacheId = void 0;
 
     this.render = function (props) {
       var CustomApp = _this.app;
@@ -41,16 +46,32 @@
       }
     };
 
+    this.setRootCache = function () {
+      if (_this.rootCacheId) {
+        renderRootCache[_this.rootCacheId] = _this.root;
+      }
+    };
+
+    this.clearRootCache = function () {
+      if (_this.rootCacheId) {
+        delete renderRootCache[_this.rootCacheId];
+      }
+    };
+
     this.unmount = function () {
       var _this$root;
 
       (_this$root = _this.root) == null ? void 0 : _this$root._unmount();
       _this.root = undefined;
+
+      _this.clearRootCache();
     };
 
     this.app = app;
     this.container = container;
     this.context = context;
+    this.rootCacheId = rootCacheId;
+    this.root = root;
   };
 
   _exports.ReactDOMRender = ReactDOMRender;

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

@@ -1,16 +1,16 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "react", "resize-observer-polyfill", "../utils/dom"], factory);
+    define(["exports", "react", "resize-observer-polyfill", "../utils/dom", "../../_helpers"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("react"), require("resize-observer-polyfill"), require("../utils/dom"));
+    factory(exports, require("react"), require("resize-observer-polyfill"), require("../utils/dom"), require("../../_helpers"));
   } else {
     var mod = {
       exports: {}
     };
-    factory(mod.exports, global.react, global.resizeObserverPolyfill, global.dom);
+    factory(mod.exports, global.react, global.resizeObserverPolyfill, global.dom, global._helpers);
     global.jsEllipsis = mod.exports;
   }
-})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _react, _resizeObserverPolyfill, _dom) {
+})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _react, _resizeObserverPolyfill, _dom, _helpers) {
   "use strict";
 
   var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -43,10 +43,11 @@
     var domRef = (0, _react.useRef)(null);
     var textRef = (0, _react.useRef)(null);
     var ellipsisRef = (0, _react.useRef)(null);
+    var ellipsisValueRef = (0, _helpers.useLatestRef)(ellipsis);
     var lineHeightRef = (0, _react.useRef)(0);
     var setCurLineHeight = (0, _react.useCallback)(function () {
       if (domRef.current) {
-        lineHeightRef.current = (0, _dom.getLineHeight)(domRef.current);
+        lineHeightRef.current = Math.round((0, _dom.getLineHeight)(domRef.current));
       }
     }, []);
     (0, _react.useEffect)(function () {
@@ -172,7 +173,7 @@
         textRef.current.innerText = text;
       }
 
-      if (!ellipsis) {
+      if (!ellipsisValueRef.current) {
         return;
       }
 

package/umd/image/style/index.less

@@ -1,11 +1,11 @@
-@import "../../../style/mixin.less";
+@import '../../../style/mixin.less';
 
 .@{prefix}-image {
     display: inline-block;
     position: relative;
 
     &.preview {
-        transition: all .3s ease-in-out;
+        transition: all 0.3s ease-in-out;
 
         .image-container,
         .image-loading-container .image-loading,
@@ -109,7 +109,6 @@
     }
 
     .image-error-container {
-
         .image-retry-load {
             position: absolute;
             top: 0;
@@ -127,7 +126,6 @@
     }
 
     .image-loading-container {
-
         .image-loading {
             position: absolute;
             top: 0;

package/umd/image-preview/methods.js

@@ -21,9 +21,7 @@
 
   function open(Component) {
     return function (config, context) {
-      var baseProps = (0, _extends2.default)({
-        unmountOnExit: true
-      }, config || {}, {
+      var baseProps = (0, _extends2.default)({}, config || {}, {
         close: function close() {}
       }); // 不同的key用不同的容器挂载
       // @en Different keys are mounted in different containers
@@ -59,10 +57,7 @@
 
       dynamicProps.onClose = function () {
         baseProps.onClose && baseProps.onClose();
-
-        if (baseProps.unmountOnExit) {
-          (0, _mobileUtils.removeElement)(div);
-        }
+        (0, _mobileUtils.removeElement)(div);
       };
 
       dynamicProps.openIndex = -1;

package/umd/masking/methods.js

@@ -36,14 +36,14 @@
       }); // 不同的key用不同的容器挂载
 
       var id = "_" + (containerId || 'ARCO_MASKING') + "_DIV_" + (config.key || '') + "_";
-
-      var _appendElementById = (0, _mobileUtils.appendElementById)(id, baseProps.getContainer),
-          div = _appendElementById.child;
-
+      var existedDiv = baseProps.unmountOnExit ? null : document.getElementById(id);
+      var div = existedDiv || (0, _mobileUtils.appendElementById)(id, baseProps.getContainer).child;
       var leaving = false;
 
-      var _ReactDOMRender = new _render.ReactDOMRender(Component, div, context),
-          render = _ReactDOMRender.render;
+      var _ReactDOMRender = new _render.ReactDOMRender(Component, div, context, id, existedDiv ? _render.renderRootCache[id] : undefined),
+          render = _ReactDOMRender.render,
+          unmount = _ReactDOMRender.unmount,
+          setRootCache = _ReactDOMRender.setRootCache;
 
       var dynamicProps = (0, _extends2.default)({}, baseProps, {
         getContainer: function getContainer() {
@@ -68,11 +68,17 @@
         baseProps.onClose && baseProps.onClose(scene);
 
         if (baseProps.unmountOnExit) {
+          unmount();
           (0, _mobileUtils.removeElement)(div);
         }
       };
 
       render(dynamicProps);
+
+      if (!baseProps.unmountOnExit) {
+        setRootCache();
+      }
+
       (0, _mobileUtils.nextTick)(function () {
         if (leaving) return;
         dynamicProps.visible = true;

package/umd/skeleton/type.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { BaseProps, SimpleBaseProps } from '../_helpers';
+export type { BaseProps, SimpleBaseProps };
 export interface SkeletonProps extends SimpleBaseProps {
     /**
      * 是否显示标题占位图