@arco-design/mobile-react 2.29.5 → 2.29.6

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.29.6](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.29.5...@arco-design/mobile-react@2.29.6) (2023-10-09)
+
+
+### Bug Fixes
+
+* `Image` support loading & error area when using "staticLabel" ([#181](https://github.com/arco-design/arco-design-mobile/issues/181)) ([552a37d](https://github.com/arco-design/arco-design-mobile/commit/552a37d5a29cbbbe84107c0ba7cddeb1c685f2be))
+* `Tabs` duplicate scrolling when "activeTab" is controlled in scroll mode ([7632138](https://github.com/arco-design/arco-design-mobile/commit/7632138f8d1164d8be6b55f5a65cc543b3b22684))
+* incorrectly mounted elements when calling masking components using methods ([5740648](https://github.com/arco-design/arco-design-mobile/commit/5740648160fb6ff6d97a40da71c28d16034b4346))
+
+
+
+
+
 ## [2.29.5](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.29.4...@arco-design/mobile-react@2.29.5) (2023-10-07)
 
 

package/README.en-US.md

@@ -59,8 +59,8 @@ React & ReactDOM: **<a href="https://reactjs.org/docs/cdn-links.html" target="_b
 React Transition Group: **<a href="https://reactcommunity.org/react-transition-group/" target="_blank">Click here</a>**
 
 ```
-<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.4/dist/style.min.css">
-<script src="https://unpkg.com/@arco-design/mobile-react@2.29.4/dist/index.min.js"></script>
+<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.5/dist/style.min.css">
+<script src="https://unpkg.com/@arco-design/mobile-react@2.29.5/dist/index.min.js"></script>
 ```
 
 ## Full import

package/README.md

@@ -59,8 +59,8 @@ React & ReactDOM： **<a href="https://reactjs.org/docs/cdn-links.html" target="
 React Transition Group： **<a href="https://reactcommunity.org/react-transition-group/" target="_blank">戳这里获取</a>**
 
 ```
-<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.4/dist/style.min.css">
-<script src="https://unpkg.com/@arco-design/mobile-react@2.29.4/dist/index.min.js"></script>
+<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.5/dist/style.min.css">
+<script src="https://unpkg.com/@arco-design/mobile-react@2.29.5/dist/index.min.js"></script>
 ```
 
 ## 引入全部

package/cjs/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/cjs/image/index.js

@@ -30,30 +30,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @name_en Image
  */
 var BaseImage = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var system = (0, _helpers.useSystem)();
-
-  var _useWindowSize = (0, _helpers.useWindowSize)(),
-      windowWidth = _useWindowSize.windowWidth,
-      windowHeight = _useWindowSize.windowHeight;
-
-  var _useMountedState = (0, _helpers.useMountedState)('init'),
-      imageStatus = _useMountedState[0],
-      setImageStatus = _useMountedState[1];
-
-  var _useMountedState2 = (0, _helpers.useMountedState)(''),
-      wrapClass = _useMountedState2[0],
-      setWrapClass = _useMountedState2[1];
-
-  var _useMountedState3 = (0, _helpers.useMountedState)(false),
-      staticRetrying = _useMountedState3[0],
-      setStaticRetrying = _useMountedState3[1];
-
-  var imageRef = (0, _react.useRef)(null);
-  var imageDomRef = (0, _react.useRef)(null);
-  var wrapRef = (0, _react.useRef)(null);
-  var retryCountRef = (0, _react.useRef)(0);
-  var loadingImageRef = (0, _react.useRef)(null);
-  var hasLoadedRef = (0, _react.useRef)(false);
   var style = props.style,
       className = props.className,
       status = props.status,
@@ -90,9 +66,33 @@ var BaseImage = /*#__PURE__*/(0, _react.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 = (0, _helpers.useSystem)();
+
+  var _useWindowSize = (0, _helpers.useWindowSize)(),
+      windowWidth = _useWindowSize.windowWidth,
+      windowHeight = _useWindowSize.windowHeight;
+
+  var _useMountedState = (0, _helpers.useMountedState)(staticLabel && showLoading ? 'loading' : 'init'),
+      imageStatus = _useMountedState[0],
+      setImageStatus = _useMountedState[1];
+
+  var _useMountedState2 = (0, _helpers.useMountedState)(''),
+      wrapClass = _useMountedState2[0],
+      setWrapClass = _useMountedState2[1];
+
+  var _useMountedState3 = (0, _helpers.useMountedState)(false),
+      staticRetrying = _useMountedState3[0],
+      setStaticRetrying = _useMountedState3[1];
+
+  var imageRef = (0, _react.useRef)(null);
+  var imageDomRef = (0, _react.useRef)(null);
+  var wrapRef = (0, _react.useRef)(null);
+  var retryCountRef = (0, _react.useRef)(0);
+  var loadingImageRef = (0, _react.useRef)(null);
+  var hasLoadedRef = (0, _react.useRef)(false);
   var isPreview = Boolean(fit.indexOf('preview') >= 0);
   var actualBoxWidth = boxWidth || windowWidth;
   var actualBoxHeight = boxHeight || windowHeight;
@@ -128,6 +128,21 @@ var BaseImage = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     retryCountRef.current = 0;
     loadImage();
   }, [attrs, width, height, showImage, staticLabel]);
+  (0, _react.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);
@@ -148,6 +163,43 @@ var BaseImage = /*#__PURE__*/(0, _react.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
@@ -173,41 +225,8 @@ var BaseImage = /*#__PURE__*/(0, _react.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) {
@@ -233,9 +252,10 @@ var BaseImage = /*#__PURE__*/(0, _react.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;
@@ -300,7 +320,7 @@ var BaseImage = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }, staticLabel && showImage && !staticRetrying ? /*#__PURE__*/_react.default.createElement("img", (0, _extends2.default)({}, 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.default.createElement("div", {

package/cjs/image-preview/index.js

@@ -849,7 +849,9 @@ var ImagePreview = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return renderIndicator(currentIndex, total, lastIndex);
     }
 
-    return openLoaded ? /*#__PURE__*/_react.default.createElement(_portal.default, null, /*#__PURE__*/_react.default.createElement("div", {
+    return openLoaded ? /*#__PURE__*/_react.default.createElement(_portal.default, {
+      getContainer: getContainer
+    }, /*#__PURE__*/_react.default.createElement("div", {
       className: "image-preview-indicator"
     }, currentIndex + 1, "/", total)) : null;
   } // ios在重设style时图片会消失一下造成闪动，因此在底下垫一张图
@@ -887,7 +889,9 @@ var ImagePreview = /*#__PURE__*/(0, _react.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.default.createElement(_portal.default, null, /*#__PURE__*/_react.default.createElement("div", {
+    return index === openIndex ? /*#__PURE__*/_react.default.createElement(_portal.default, {
+      getContainer: getContainer
+    }, /*#__PURE__*/_react.default.createElement("div", {
       className: "image-preview-loading-area"
     }, loadingArea || /*#__PURE__*/_react.default.createElement(_loading.default, {
       type: "circle",

package/cjs/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/cjs/image-preview/methods.js

@@ -17,8 +17,7 @@ function open(Component) {
       unmountOnExit: true
     }, config || {}, {
       close: function close() {}
-    });
-    var dynamicProps = (0, _extends2.default)({}, baseProps); // 不同的key用不同的容器挂载
+    }); // 不同的key用不同的容器挂载
     // @en Different keys are mounted in different containers
 
     var id = "_ARCO_IMAGE_PREVIEW_DIV_" + (baseProps.key || '') + "_";
@@ -31,6 +30,12 @@ function open(Component) {
     var _ReactDOMRender = new _render.ReactDOMRender(Component, div, context),
         render = _ReactDOMRender.render;
 
+    var dynamicProps = (0, _extends2.default)({}, baseProps, {
+      getContainer: function getContainer() {
+        return div;
+      }
+    });
+
     function update(newConfig) {
       dynamicProps = (0, _extends2.default)({}, dynamicProps, newConfig || {});
       render(dynamicProps);

package/cjs/masking/methods.js

@@ -25,8 +25,7 @@ function getOpenMethod(Component, containerId, normalize) {
     }, normalize(config), {
       visible: false,
       close: function close() {}
-    });
-    var dynamicProps = (0, _extends2.default)({}, baseProps); // 不同的key用不同的容器挂载
+    }); // 不同的key用不同的容器挂载
 
     var id = "_" + (containerId || 'ARCO_MASKING') + "_DIV_" + (config.key || '') + "_";
 
@@ -38,6 +37,12 @@ function getOpenMethod(Component, containerId, normalize) {
     var _ReactDOMRender = new _render.ReactDOMRender(Component, div, context),
         render = _ReactDOMRender.render;
 
+    var dynamicProps = (0, _extends2.default)({}, baseProps, {
+      getContainer: function getContainer() {
+        return div;
+      }
+    });
+
     function update(newConfig) {
       dynamicProps = (0, _extends2.default)({}, dynamicProps, normalize(newConfig));
       render(dynamicProps);

package/cjs/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>> & {
@@ -82,10 +79,7 @@ declare const _default: React.ForwardRefExoticComponent<PopupSwiperProps & React
         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" | "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;
     };
 };
 /**

package/cjs/tabs/index.js

@@ -255,7 +255,10 @@ var Tabs = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     // 利用受控手动更改index时，给cell line加上动画
     // @en Animate the cell line when changeing the index
     setCellTrans(true);
-    changeFromRef.current = 'manual';
+
+    if (!changeFromRef.current) {
+      changeFromRef.current = 'manual';
+    }
   }, [activeTab]);
   (0, _helpers.useUpdateEffect)(function () {
     onDistanceChange && onDistanceChange(distance, wrapWidth, activeIndex);