@arco-design/mobile-react 2.29.4 → 2.29.6

package/esm/image/index.d.ts

@@ -60,22 +60,22 @@ export interface ImageProps {
      *  */
     bordered?: boolean;
     /**
-     * 自定义展示加载中内容，staticLabel=false时有效
+     * 自定义展示加载中内容
      * @en Custom display loading content, valid when staticLabel=false
      *  */
     loadingArea?: ReactNode;
     /**
-     * 自定义展示加载失败内容，staticLabel=false时有效
+     * 自定义展示加载失败内容
      * @en Custom display failed to load content, valid when staticLabel=false
      *  */
     errorArea?: ReactNode;
     /**
-     * 是否展示图片加载中提示，staticLabel=false时有效
+     * 是否展示图片加载中提示
      * @en Whether to display the image loading prompt, valid when staticLabel=false
      *  */
     showLoading?: boolean;
     /**
-     * 是否展示图片加载失败提示，staticLabel=false时有效
+     * 是否展示图片加载失败提示
      * @en Whether to display the image loading failure prompt, valid when staticLabel=false
      *  */
     showError?: boolean;
@@ -145,17 +145,17 @@ export interface ImageProps {
      * 图片加载完毕时触发的回调
      * @en Callback when the image is loaded
      * */
-    onLoad?: (e: Event, image: HTMLImageElement) => void;
+    onLoad?: (e: Event | null, image: HTMLImageElement) => void;
     /**
      * 图片加载失败时触发的回调，如果有自动重试则在重试最终失败后触发
      * @en Callback when the image fails to load, triggered after the retry finally fails if there is an automatic retry
      */
-    onError?: (e: string | Event) => void;
+    onError?: (e: string | Event | null) => void;
     /**
      * 图片加载失败时自动重试触发的回调
      * @en Callback triggered by automatic retry when image loading fails
      */
-    onAutoRetry?: (e: string | Event) => void;
+    onAutoRetry?: (e: string | Event | null) => void;
 }
 export interface ImageRef {
     /**

package/esm/image/index.js

@@ -14,30 +14,6 @@ import { useSystem, useWindowSize, getStyleWithVendor, useMountedState } from '.
  * @name_en Image
  */
 export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
-  var system = useSystem();
-
-  var _useWindowSize = useWindowSize(),
-      windowWidth = _useWindowSize.windowWidth,
-      windowHeight = _useWindowSize.windowHeight;
-
-  var _useMountedState = useMountedState('init'),
-      imageStatus = _useMountedState[0],
-      setImageStatus = _useMountedState[1];
-
-  var _useMountedState2 = useMountedState(''),
-      wrapClass = _useMountedState2[0],
-      setWrapClass = _useMountedState2[1];
-
-  var _useMountedState3 = useMountedState(false),
-      staticRetrying = _useMountedState3[0],
-      setStaticRetrying = _useMountedState3[1];
-
-  var imageRef = useRef(null);
-  var imageDomRef = useRef(null);
-  var wrapRef = useRef(null);
-  var retryCountRef = useRef(0);
-  var loadingImageRef = useRef(null);
-  var hasLoadedRef = useRef(false);
   var style = props.style,
       className = props.className,
       status = props.status,
@@ -74,9 +50,33 @@ export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
       nativeProps = _props$nativeProps === void 0 ? {} : _props$nativeProps,
       onChange = props.onChange,
       onClick = props.onClick,
-      _onLoad = props.onLoad,
+      onLoad = props.onLoad,
       onError = props.onError,
       onAutoRetry = props.onAutoRetry;
+  var system = useSystem();
+
+  var _useWindowSize = useWindowSize(),
+      windowWidth = _useWindowSize.windowWidth,
+      windowHeight = _useWindowSize.windowHeight;
+
+  var _useMountedState = useMountedState(staticLabel && showLoading ? 'loading' : 'init'),
+      imageStatus = _useMountedState[0],
+      setImageStatus = _useMountedState[1];
+
+  var _useMountedState2 = useMountedState(''),
+      wrapClass = _useMountedState2[0],
+      setWrapClass = _useMountedState2[1];
+
+  var _useMountedState3 = useMountedState(false),
+      staticRetrying = _useMountedState3[0],
+      setStaticRetrying = _useMountedState3[1];
+
+  var imageRef = useRef(null);
+  var imageDomRef = useRef(null);
+  var wrapRef = useRef(null);
+  var retryCountRef = useRef(0);
+  var loadingImageRef = useRef(null);
+  var hasLoadedRef = useRef(false);
   var isPreview = Boolean(fit.indexOf('preview') >= 0);
   var actualBoxWidth = boxWidth || windowWidth;
   var actualBoxHeight = boxHeight || windowHeight;
@@ -112,6 +112,21 @@ export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
     retryCountRef.current = 0;
     loadImage();
   }, [attrs, width, height, showImage, staticLabel]);
+  useEffect(function () {
+    var _imageDomRef$current;
+
+    // 当使用img标签时，onLoad可能加载完成前已经执行完，此时手动触发一次
+    // @en When using the img tag, onLoad may have been executed before loading is complete, and it needs to be triggered manually
+    if (staticLabel && !hasLoadedRef.current && (_imageDomRef$current = imageDomRef.current) != null && _imageDomRef$current.complete) {
+      // 图片有宽高认为正常加载，否则认为加载错误
+      // @en If the image has width and height, it is considered to be loaded normally, otherwise it is considered to be a loading error
+      if (imageDomRef.current.naturalWidth || imageDomRef.current.naturalHeight) {
+        handleImageLoaded(null, imageDomRef.current);
+      } else {
+        handleStaticImageError(null);
+      }
+    }
+  }, [staticLabel]);
 
   function changeStatus(newStatus) {
     setImageStatus(newStatus);
@@ -132,6 +147,43 @@ export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }
 
+  function handleImageLoaded(evt, image) {
+    hasLoadedRef.current = true;
+    changeStatus('loaded');
+    var _image$width = image.width,
+        imageWidth = _image$width === void 0 ? 0 : _image$width,
+        _image$height = image.height,
+        imageHeight = _image$height === void 0 ? 0 : _image$height;
+    var extraClass = '';
+
+    if (isPreview) {
+      var scale = imageWidth / imageHeight;
+      var windowScale = actualBoxWidth / actualBoxHeight;
+
+      if (fit === 'preview-y') {
+        if (scale < windowScale) {
+          image.style.width = actualBoxWidth + "px";
+          image.style.height = actualBoxWidth / scale + "px";
+          extraClass = 'preview-overflow-y';
+        } else {
+          extraClass = 'preview-fit-contain-y';
+        }
+      } else if (fit === 'preview-x') {
+        if (scale > windowScale) {
+          image.style.width = actualBoxHeight * scale + "px";
+          image.style.height = actualBoxHeight + "px";
+          extraClass = 'preview-overflow-x';
+        } else {
+          extraClass = 'preview-fit-contain-x';
+        }
+      }
+    }
+
+    extraClass && image.classList.add(extraClass);
+    setWrapClass(extraClass ? extraClass + "-container" : '');
+    onLoad && onLoad(evt, image);
+  }
+
   function loadImage(isFromRetry) {
     // 如果在加载图片前发现上一个图片还没加载完，则抛弃上一个图片的加载
     // @en Abort last image before starting loading new image
@@ -157,41 +209,8 @@ export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
     image.onload = function (evt) {
       loadingImageRef.current = null;
       imageDomRef.current = image;
-      hasLoadedRef.current = true;
-      changeStatus('loaded');
-      var _image$width = image.width,
-          imageWidth = _image$width === void 0 ? 0 : _image$width,
-          _image$height = image.height,
-          imageHeight = _image$height === void 0 ? 0 : _image$height;
-      var extraClass = '';
-
-      if (isPreview) {
-        var scale = imageWidth / imageHeight;
-        var windowScale = actualBoxWidth / actualBoxHeight;
-
-        if (fit === 'preview-y') {
-          if (scale < windowScale) {
-            image.style.width = actualBoxWidth + "px";
-            image.style.height = actualBoxWidth / scale + "px";
-            extraClass = 'preview-overflow-y';
-          } else {
-            extraClass = 'preview-fit-contain-y';
-          }
-        } else if (fit === 'preview-x') {
-          if (scale > windowScale) {
-            image.style.width = actualBoxHeight * scale + "px";
-            image.style.height = actualBoxHeight + "px";
-            extraClass = 'preview-overflow-x';
-          } else {
-            extraClass = 'preview-fit-contain-x';
-          }
-        }
-      }
-
-      extraClass && image.classList.add(extraClass);
-      setWrapClass(extraClass ? extraClass + "-container" : '');
+      handleImageLoaded(evt, image);
       replaceChild(image);
-      _onLoad && _onLoad(evt, image);
     };
 
     image.onerror = function (evt) {
@@ -217,9 +236,10 @@ export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
   }
 
   function handleStaticImageError(e) {
-    var evt = e.nativeEvent;
+    var evt = e ? e.nativeEvent : null;
 
     if (retryCountRef.current >= retryTime) {
+      changeStatus('error');
       onError && onError(evt);
     } else {
       retryCountRef.current += 1;
@@ -284,7 +304,7 @@ export var BaseImage = /*#__PURE__*/forwardRef(function (props, ref) {
     }, staticLabel && showImage && !staticRetrying ? /*#__PURE__*/React.createElement("img", _extends({}, nativeProps, attrs, {
       ref: imageDomRef,
       onLoad: function onLoad(e) {
-        return _onLoad && _onLoad(e.nativeEvent, imageDomRef.current);
+        return handleImageLoaded(e.nativeEvent, imageDomRef.current);
       },
       onError: handleStaticImageError
     })) : null), showLoading && validStatus === 'loading' ? /*#__PURE__*/React.createElement("div", {

package/esm/image-picker/index.js

@@ -7,6 +7,7 @@ import { IconClose } from '../icon';
 import Image from '../image';
 import Grid from '../grid';
 import AddIcon from './add-icon';
+import { useLatestRef } from '../_helpers';
 export * from './type';
 var ImagePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$className = props.className,
@@ -52,7 +53,7 @@ var ImagePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       onDeleteClick = props.onDeleteClick;
   var domRef = useRef(null);
   var fileRef = useRef(null);
-  var cacheRef = useRef([]);
+  var cacheRef = useLatestRef(images);
   useImperativeHandle(ref, function () {
     return {
       dom: domRef.current
@@ -119,7 +120,7 @@ var ImagePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           file: files[index]
         };
       });
-      cacheRef.current = [].concat(images, res);
+      cacheRef.current = [].concat(cacheRef.current, res);
       onChange([].concat(cacheRef.current)); // 执行upload
 
       if (typeof upload === 'function') {
@@ -132,15 +133,21 @@ var ImagePicker = /*#__PURE__*/forwardRef(function (props, ref) {
               var file = _ref2.file;
               return file === _file;
             });
-            cacheRef.current[index] = _extends({}, cacheRef.current[index], data, {
-              status: undefined
-            });
+
+            if (index !== -1) {
+              cacheRef.current[index] = _extends({}, cacheRef.current[index], data, {
+                status: undefined
+              });
+            }
           }).catch(function () {
             var index = cacheRef.current.findIndex(function (_ref3) {
               var file = _ref3.file;
               return file === _file;
             });
-            cacheRef.current[index].status = 'error';
+
+            if (index !== -1) {
+              cacheRef.current[index].status = 'error';
+            }
           }).finally(function () {
             onChange([].concat(cacheRef.current));
           });

package/esm/image-preview/index.d.ts

@@ -274,9 +274,9 @@ declare const _default: React.ForwardRefExoticComponent<ImagePreviewProps & Reac
      * @param {ImagePreviewProps} config configuration
      * @returns {{ close: () => void; update: (newConfig: ImagePreviewProps) => void; }}
      */
-    open: (config: Pick<import("../context-provider").WithGlobalContext<ImagePreviewProps & React.RefAttributes<ImagePreviewRef>>, "style" | "ref" | "key" | "context" | "className" | "swipeable" | "lazyloadCount" | "onChange" | "onAfterChange" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "loadingArea" | "onClose" | "fit" | "errorArea" | "showLoading" | "showError" | "retryTime" | "staticLabel" | "animateDurationSlide" | "loop" | "renderIndicator" | "indicatorPos" | "showIndicator" | "hideSingleIndicator" | "spaceBetween" | "percentToChange" | "distanceToChange" | "speedToChange" | "extra" | "images" | "openIndex" | "displayDuration" | "replaceFallbackWhenLoaded" | "noselect" | "scrollBezier" | "swipeToClose" | "getMinScale" | "getMaxScale" | "getDoubleClickScale" | "getThumbBounds" | "onImageClick" | "onImageDoubleClick" | "onImageLongTap">, context?: import("../context-provider").GlobalContextParams | undefined) => {
+    open: (config: Pick<import("../context-provider").WithGlobalContext<ImagePreviewProps & React.RefAttributes<ImagePreviewRef>>, "style" | "ref" | "key" | "context" | "className" | "swipeable" | "lazyloadCount" | "onChange" | "onAfterChange" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "onClose" | "fit" | "loadingArea" | "errorArea" | "showLoading" | "showError" | "retryTime" | "staticLabel" | "animateDurationSlide" | "loop" | "renderIndicator" | "indicatorPos" | "showIndicator" | "hideSingleIndicator" | "spaceBetween" | "percentToChange" | "distanceToChange" | "speedToChange" | "extra" | "images" | "openIndex" | "displayDuration" | "replaceFallbackWhenLoaded" | "noselect" | "scrollBezier" | "swipeToClose" | "getMinScale" | "getMaxScale" | "getDoubleClickScale" | "getThumbBounds" | "onImageClick" | "onImageDoubleClick" | "onImageLongTap">, context?: import("../context-provider").GlobalContextParams | undefined) => {
         close: () => void;
-        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<ImagePreviewProps & React.RefAttributes<ImagePreviewRef>>, "style" | "ref" | "key" | "context" | "className" | "swipeable" | "lazyloadCount" | "onChange" | "onAfterChange" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "loadingArea" | "onClose" | "fit" | "errorArea" | "showLoading" | "showError" | "retryTime" | "staticLabel" | "animateDurationSlide" | "loop" | "renderIndicator" | "indicatorPos" | "showIndicator" | "hideSingleIndicator" | "spaceBetween" | "percentToChange" | "distanceToChange" | "speedToChange" | "extra" | "images" | "openIndex" | "displayDuration" | "replaceFallbackWhenLoaded" | "noselect" | "scrollBezier" | "swipeToClose" | "getMinScale" | "getMaxScale" | "getDoubleClickScale" | "getThumbBounds" | "onImageClick" | "onImageDoubleClick" | "onImageLongTap">) => void;
+        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<ImagePreviewProps & React.RefAttributes<ImagePreviewRef>>, "style" | "ref" | "key" | "context" | "className" | "swipeable" | "lazyloadCount" | "onChange" | "onAfterChange" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "onClose" | "fit" | "loadingArea" | "errorArea" | "showLoading" | "showError" | "retryTime" | "staticLabel" | "animateDurationSlide" | "loop" | "renderIndicator" | "indicatorPos" | "showIndicator" | "hideSingleIndicator" | "spaceBetween" | "percentToChange" | "distanceToChange" | "speedToChange" | "extra" | "images" | "openIndex" | "displayDuration" | "replaceFallbackWhenLoaded" | "noselect" | "scrollBezier" | "swipeToClose" | "getMinScale" | "getMaxScale" | "getDoubleClickScale" | "getThumbBounds" | "onImageClick" | "onImageDoubleClick" | "onImageLongTap">) => void;
     };
 };
 /**

package/esm/image-preview/index.js

@@ -624,9 +624,11 @@ var ImagePreview = /*#__PURE__*/forwardRef(function (props, ref) {
 
 
   function setImagesStatusByIndex(index, data) {
-    var newStatus = imagesStatusRef.current.slice();
-    newStatus[index] = _extends({}, newStatus[index] || {}, data);
-    setImagesStatus(newStatus);
+    setImagesStatus(function (current) {
+      var newStatus = current.slice();
+      newStatus[index] = _extends({}, newStatus[index] || {}, data);
+      return newStatus;
+    });
   }
   /**
    * 缩略图放大过渡动画设置
@@ -812,7 +814,9 @@ var ImagePreview = /*#__PURE__*/forwardRef(function (props, ref) {
       return renderIndicator(currentIndex, total, lastIndex);
     }
 
-    return openLoaded ? /*#__PURE__*/React.createElement(Portal, null, /*#__PURE__*/React.createElement("div", {
+    return openLoaded ? /*#__PURE__*/React.createElement(Portal, {
+      getContainer: getContainer
+    }, /*#__PURE__*/React.createElement("div", {
       className: "image-preview-indicator"
     }, currentIndex + 1, "/", total)) : null;
   } // ios在重设style时图片会消失一下造成闪动，因此在底下垫一张图
@@ -850,7 +854,9 @@ var ImagePreview = /*#__PURE__*/forwardRef(function (props, ref) {
   function renderLoadingArea(index) {
     // loadingArea提出来，放到过渡图上层
     // @en The loadingArea is extracted and placed on the upper layer of the transition image
-    return index === openIndex ? /*#__PURE__*/React.createElement(Portal, null, /*#__PURE__*/React.createElement("div", {
+    return index === openIndex ? /*#__PURE__*/React.createElement(Portal, {
+      getContainer: getContainer
+    }, /*#__PURE__*/React.createElement("div", {
       className: "image-preview-loading-area"
     }, loadingArea || /*#__PURE__*/React.createElement(Loading, {
       type: "circle",

package/esm/image-preview/methods.d.ts

@@ -5,6 +5,7 @@ export interface OpenBaseProps {
     close: (e: any) => void;
     openIndex: number;
     images: any[];
+    getContainer?: () => HTMLElement;
 }
 export declare function open<P extends OpenBaseProps>(Component: React.FunctionComponent<P>): (config: Pick<P, Exclude<keyof P, "close">>, context?: GlobalContextParams | undefined) => {
     close: () => void;

package/esm/image-preview/methods.js

@@ -7,9 +7,7 @@ export function open(Component) {
       unmountOnExit: true
     }, config || {}, {
       close: function close() {}
-    });
-
-    var dynamicProps = _extends({}, baseProps); // 不同的key用不同的容器挂载
+    }); // 不同的key用不同的容器挂载
     // @en Different keys are mounted in different containers
 
 
@@ -23,6 +21,12 @@ export function open(Component) {
     var _ReactDOMRender = new ReactDOMRender(Component, div, context),
         render = _ReactDOMRender.render;
 
+    var dynamicProps = _extends({}, baseProps, {
+      getContainer: function getContainer() {
+        return div;
+      }
+    });
+
     function update(newConfig) {
       dynamicProps = _extends({}, dynamicProps, newConfig || {});
       render(dynamicProps);

package/esm/index.d.ts

@@ -1,12 +1,13 @@
 export { default as Tabs } from './tabs';
 export { default as Sticky } from './sticky';
-export { default as LoadMore } from './load-more';
-export { default as Cell } from './cell';
+export { default as Portal } from './portal';
+export { default as Toast } from './toast';
 export { default as ActionSheet } from './action-sheet';
 export { default as Avatar } from './avatar';
 export { default as Badge } from './badge';
 export { default as Button } from './button';
 export { default as Carousel } from './carousel';
+export { default as Cell } from './cell';
 export { default as Checkbox } from './checkbox';
 export { default as CircleProgress } from './circle-progress';
 export { default as Collapse } from './collapse';
@@ -26,6 +27,7 @@ export { default as ImagePreview } from './image-preview';
 export { default as IndexBar } from './index-bar';
 export { default as Input } from './input';
 export { default as Keyboard } from './keyboard';
+export { default as LoadMore } from './load-more';
 export { default as Loading } from './loading';
 export { default as Masking } from './masking';
 export { default as NavBar } from './nav-bar';
@@ -37,14 +39,13 @@ export { default as PickerView } from './picker-view';
 export { default as Popover } from './popover';
 export { default as Popup } from './popup';
 export { default as PopupSwiper } from './popup-swiper';
-export { default as Portal } from './portal';
 export { default as Progress } from './progress';
 export { default as PullRefresh } from './pull-refresh';
 export { default as Radio } from './radio';
 export { default as Rate } from './rate';
 export { default as SearchBar } from './search-bar';
-export { default as Skeleton } from './skeleton';
 export { default as ShowMonitor } from './show-monitor';
+export { default as Skeleton } from './skeleton';
 export { default as Slider } from './slider';
 export { default as Stepper } from './stepper';
 export { default as Steps } from './steps';
@@ -54,5 +55,4 @@ export { default as Switch } from './switch';
 export { default as TabBar } from './tab-bar';
 export { default as Tag } from './tag';
 export { default as Textarea } from './textarea';
-export { default as Toast } from './toast';
 export { default as Transition } from './transition';

package/esm/index.js

@@ -1,12 +1,13 @@
 export { default as Tabs } from './tabs';
 export { default as Sticky } from './sticky';
-export { default as LoadMore } from './load-more';
-export { default as Cell } from './cell';
+export { default as Portal } from './portal';
+export { default as Toast } from './toast';
 export { default as ActionSheet } from './action-sheet';
 export { default as Avatar } from './avatar';
 export { default as Badge } from './badge';
 export { default as Button } from './button';
 export { default as Carousel } from './carousel';
+export { default as Cell } from './cell';
 export { default as Checkbox } from './checkbox';
 export { default as CircleProgress } from './circle-progress';
 export { default as Collapse } from './collapse';
@@ -26,6 +27,7 @@ export { default as ImagePreview } from './image-preview';
 export { default as IndexBar } from './index-bar';
 export { default as Input } from './input';
 export { default as Keyboard } from './keyboard';
+export { default as LoadMore } from './load-more';
 export { default as Loading } from './loading';
 export { default as Masking } from './masking';
 export { default as NavBar } from './nav-bar';
@@ -37,14 +39,13 @@ export { default as PickerView } from './picker-view';
 export { default as Popover } from './popover';
 export { default as Popup } from './popup';
 export { default as PopupSwiper } from './popup-swiper';
-export { default as Portal } from './portal';
 export { default as Progress } from './progress';
 export { default as PullRefresh } from './pull-refresh';
 export { default as Radio } from './radio';
 export { default as Rate } from './rate';
 export { default as SearchBar } from './search-bar';
-export { default as Skeleton } from './skeleton';
 export { default as ShowMonitor } from './show-monitor';
+export { default as Skeleton } from './skeleton';
 export { default as Slider } from './slider';
 export { default as Stepper } from './stepper';
 export { default as Steps } from './steps';
@@ -54,5 +55,4 @@ export { default as Switch } from './switch';
 export { default as TabBar } from './tab-bar';
 export { default as Tag } from './tag';
 export { default as Textarea } from './textarea';
-export { default as Toast } from './toast';
 export { default as Transition } from './transition';

package/esm/load-more/index.d.ts

@@ -108,8 +108,8 @@ export interface LoadMoreProps {
      */
     getDataAtFirst?: boolean;
     /**
-     * 当 getDataAtFirst === false 且数据不满一屏时是否触发一次请求，trigger=scroll时有效
-     * @en Whether to trigger a request when getDataAtFirst === false and the data is not full of one screen, valid when trigger=scroll
+     * 当 getDataAtFirst 值为 false 且数据不满一屏时是否触发一次请求，trigger=scroll时有效
+     * @en Whether to trigger a request when getDataAtFirst equals false and the data is not full of one screen, valid when trigger=scroll
      * @default false
      */
     getDataWhenNoScrollAtFirst?: boolean;
@@ -140,6 +140,11 @@ export interface LoadMoreRef {
      * @en Change component state manually
      */
     changeStatus: (status: LoadMoreStatus, scene?: string) => void;
+    /**
+     * 判断是否滚动到底部并手动触发数据获取
+     * @en Determine whether to scroll to the bottom and manually trigger data acquisition
+     */
+    getDataWithEndReachCheck: () => void;
 }
 /**
  * 上拉加载组件，支持`scroll`和`click`两种触发加载方式，支持滚动监听。支持受控与不受控两种形式。<br>如果引入组件后发现仅触发了初始的`getData`，请确认是否在`getData`方法内没有调用`callback`移除 loading 状态，且未设置`blockWhenLoading`属性为 false。

package/esm/load-more/index.js

@@ -132,10 +132,18 @@ var LoadMore = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     };
   }, [trigger, disabled, getScrollContainer, handleContainerScroll, throttle]);
+
+  var getDataWithEndReachCheck = function getDataWithEndReachCheck() {
+    if (checkNeedTrigger(0, threshold)) {
+      triggerGetData('pageEnd');
+    }
+  };
+
   useImperativeHandle(ref, function () {
     return {
       dom: domRef.current,
-      changeStatus: changeStatus
+      changeStatus: changeStatus,
+      getDataWithEndReachCheck: getDataWithEndReachCheck
     };
   }, [changeStatus]);
 

package/esm/masking/index.d.ts

@@ -205,11 +205,11 @@ declare const _default: React.ForwardRefExoticComponent<MaskingProps & React.Ref
      * @param {MaskingProps} config Configuration
      * @returns {{ close: () => void; update: (newConfig: MaskingProps) => void; }}
      */
-    open: (config: Pick<import("../context-provider").WithGlobalContext<MaskingProps & React.RefAttributes<MaskingRef>>, "children" | "ref" | "key" | "context" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "contentAtCenter" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "initialBodyOverflow" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove"> & {
+    open: (config: Pick<import("../context-provider").WithGlobalContext<MaskingProps & React.RefAttributes<MaskingRef>>, "children" | "ref" | "key" | "context" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "initialBodyOverflow" | "contentAtCenter" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove"> & {
         key?: string | undefined;
     }, context?: import("../context-provider").GlobalContextParams | undefined) => {
         close: () => void;
-        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<MaskingProps & React.RefAttributes<MaskingRef>>, "children" | "ref" | "key" | "context" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "contentAtCenter" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "initialBodyOverflow" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove"> & {
+        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<MaskingProps & React.RefAttributes<MaskingRef>>, "children" | "ref" | "key" | "context" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "initialBodyOverflow" | "contentAtCenter" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove"> & {
             key?: string | undefined;
         }) => void;
     };

package/esm/masking/methods.js

@@ -14,9 +14,7 @@ export function getOpenMethod(Component, containerId, normalize) {
     }, normalize(config), {
       visible: false,
       close: function close() {}
-    });
-
-    var dynamicProps = _extends({}, baseProps); // 不同的key用不同的容器挂载
+    }); // 不同的key用不同的容器挂载
 
 
     var id = "_" + (containerId || 'ARCO_MASKING') + "_DIV_" + (config.key || '') + "_";
@@ -29,6 +27,12 @@ export function getOpenMethod(Component, containerId, normalize) {
     var _ReactDOMRender = new ReactDOMRender(Component, div, context),
         render = _ReactDOMRender.render;
 
+    var dynamicProps = _extends({}, baseProps, {
+      getContainer: function getContainer() {
+        return div;
+      }
+    });
+
     function update(newConfig) {
       dynamicProps = _extends({}, dynamicProps, normalize(newConfig));
       render(dynamicProps);

package/esm/popup/index.d.ts

@@ -66,11 +66,11 @@ declare const _default: React.ForwardRefExoticComponent<PopupProps & React.RefAt
      * @param {PopupProps} config Configuration
      * @returns {{ close: () => void; update: (newConfig: PopupProps) => void; }}
      */
-    open: (config: Pick<import("../context-provider").WithGlobalContext<PopupProps & React.RefAttributes<PopupRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "initialBodyOverflow" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset"> & {
+    open: (config: Pick<import("../context-provider").WithGlobalContext<PopupProps & React.RefAttributes<PopupRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "initialBodyOverflow" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset"> & {
         key?: string | undefined;
     }, context?: import("../context-provider").GlobalContextParams | undefined) => {
         close: () => void;
-        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<PopupProps & React.RefAttributes<PopupRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "initialBodyOverflow" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset"> & {
+        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<PopupProps & React.RefAttributes<PopupRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchMove" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "initialBodyOverflow" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset"> & {
             key?: string | undefined;
         }) => void;
     };

package/esm/popup-swiper/index.d.ts

@@ -63,10 +63,7 @@ export declare function methodsGenerator<P extends OpenBaseProps>(Comp: React.Fu
         close: () => void;
         update: (newConfig: Pick<P, Exclude<keyof P, "visible" | "close">> & {
             key?: string | undefined;
-        }) => void; /**
-         * 内容面板 touchstart 事件，返回true时表示阻止本组件内部处理事件
-         * @en The touchstart callback of content panel. When it returns true, it means that the event is prevented from being processed inside the component
-         */
+        }) => void;
     };
 };
 declare const _default: React.ForwardRefExoticComponent<PopupSwiperProps & React.RefAttributes<PopupSwiperRef>> & {
@@ -76,16 +73,13 @@ declare const _default: React.ForwardRefExoticComponent<PopupSwiperProps & React
      * @param {string | PopupSwiperProps} config Configuration
      * @returns {{ close: () => void; update: (newConfig: PopupSwiperProps) => void; }}
      */
-    open: (config: Pick<import("../context-provider").WithGlobalContext<PopupSwiperProps & React.RefAttributes<PopupSwiperRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "initialBodyOverflow" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset" | "percentToClose" | "distanceToClose" | "speedToClose" | "allowSwipeDirections" | "exitDirection"> & {
+    open: (config: Pick<import("../context-provider").WithGlobalContext<PopupSwiperProps & React.RefAttributes<PopupSwiperRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "initialBodyOverflow" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset" | "percentToClose" | "distanceToClose" | "speedToClose" | "allowSwipeDirections" | "exitDirection"> & {
         key?: string | undefined;
     }, context?: import("../context-provider").GlobalContextParams | undefined) => {
         close: () => void;
-        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<PopupSwiperProps & React.RefAttributes<PopupSwiperRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "initialBodyOverflow" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset" | "percentToClose" | "distanceToClose" | "speedToClose" | "allowSwipeDirections" | "exitDirection"> & {
+        update: (newConfig: Pick<import("../context-provider").WithGlobalContext<PopupSwiperProps & React.RefAttributes<PopupSwiperRef>>, "direction" | "children" | "ref" | "key" | "context" | "translateZ" | "className" | "getScrollContainer" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "getContainer" | "mountOnEnter" | "unmountOnExit" | "onClose" | "initialBodyOverflow" | "maskClass" | "maskStyle" | "contentClass" | "contentStyle" | "maskTransitionType" | "contentTransitionType" | "maskTransitionTimeout" | "contentTransitionTimeout" | "maskClosable" | "animatingClosable" | "orientationDirection" | "preventBodyScroll" | "gestureOutOfControl" | "onOpen" | "onMaskClick" | "onPreventTouchMove" | "needBottomOffset" | "percentToClose" | "distanceToClose" | "speedToClose" | "allowSwipeDirections" | "exitDirection"> & {
             key?: string | undefined;
-        }) => void; /**
-         * 内容面板 touchstart 事件，返回true时表示阻止本组件内部处理事件
-         * @en The touchstart callback of content panel. When it returns true, it means that the event is prevented from being processed inside the component
-         */
+        }) => void;
     };
 };
 /**