antd-mobile 5.42.0-alpha.1 → 5.42.0

package/2x/bundle/antd-mobile.cjs.development.js

@@ -21904,17 +21904,18 @@ const defaultProps$z = {
   visible: false
 };
 const ImageViewer$1 = (p) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = mergeProps(defaultProps$z, p);
   const node = React$3.createElement(Mask, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: "thick",
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, React$3.createElement("div", {
-    className: classNames(`${classPrefix$I}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: classNames(`${classPrefix$I}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, (props.image || typeof props.imageRender === "function") && React$3.createElement(Slide, {
     image: props.image,
     onTap: props.onClose,
@@ -21922,7 +21923,7 @@ const ImageViewer$1 = (p) => {
     imageRender: props.imageRender
   })), props.image && React$3.createElement("div", {
     className: `${classPrefix$I}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.image), React$3.createElement(SafeArea, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.image), React$3.createElement(SafeArea, {
     position: "bottom"
   })));
   return renderToContainer(props.getContainer, node);
@@ -21931,7 +21932,7 @@ const multiDefaultProps = Object.assign(Object.assign({}, defaultProps$z), {
   defaultIndex: 0
 });
 const MultiImageViewer = React$3.forwardRef((p, ref2) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = mergeProps(multiDefaultProps, p);
   const [index2, setIndex] = React$3.useState(props.defaultIndex);
   const slidesRef = React$3.useRef(null);
@@ -21951,13 +21952,14 @@ const MultiImageViewer = React$3.forwardRef((p, ref2) => {
   }, [props.onIndexChange, index2]);
   const node = React$3.createElement(Mask, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: "thick",
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, React$3.createElement("div", {
-    className: classNames(`${classPrefix$I}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: classNames(`${classPrefix$I}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, props.images && React$3.createElement(Slides, {
     ref: slidesRef,
     defaultIndex: index2,
@@ -21968,7 +21970,7 @@ const MultiImageViewer = React$3.forwardRef((p, ref2) => {
     imageRender: props.imageRender
   })), props.images && React$3.createElement("div", {
     className: `${classPrefix$I}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.images[index2], index2), React$3.createElement(SafeArea, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.images[index2], index2), React$3.createElement(SafeArea, {
     position: "bottom"
   })));
   return renderToContainer(props.getContainer, node);
@@ -22167,6 +22169,7 @@ const ImageUploader = React$3.forwardRef((p, ref2) => {
   function getFinalTasks(tasks2) {
     return props.showFailed ? tasks2 : tasks2.filter((task) => task.status !== "fail");
   }
+  const finalTasks = getFinalTasks(tasks);
   function onChange(e2) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -22188,7 +22191,7 @@ const ImageUploader = React$3.forwardRef((p, ref2) => {
         return;
       }
       if (maxCount > 0) {
-        const exceed = value.length + files.length - maxCount;
+        const exceed = value.length + files.length + finalTasks.length - maxCount;
         if (exceed > 0) {
           files = files.slice(0, files.length - exceed);
           (_a = props.onCountExceed) === null || _a === void 0 ? void 0 : _a.call(props, exceed);
@@ -22247,7 +22250,6 @@ const ImageUploader = React$3.forwardRef((p, ref2) => {
     var _a;
     (_a = imageViewerHandlerRef.current) === null || _a === void 0 ? void 0 : _a.close();
   });
-  const finalTasks = getFinalTasks(tasks);
   const showUpload = props.showUpload && (maxCount === 0 || value.length + finalTasks.length < maxCount);
   const renderImages = () => {
     return value.map((fileItem, index2) => {
@@ -27737,6 +27739,7 @@ const VirtualInput = React$3.forwardRef((props, ref2) => {
       (_b = (_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.onMove) === null || _b === void 0 ? void 0 : _b.call(_a, value.length);
     }
     (_c = mergedProps.onClick) === null || _c === void 0 ? void 0 : _c.call(mergedProps, e2);
+    setFocus();
   };
   const changeCaretPosition = (index2) => (e2) => {
     var _a, _b, _c;
@@ -27810,7 +27813,7 @@ const VirtualInput = React$3.forwardRef((props, ref2) => {
     className: `${classPrefix$2}-content`,
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
-    "aria-label": value || mergedProps.placeholder,
+    "aria-label": value ? void 0 : mergedProps.placeholder,
     role: "textbox",
     tabIndex: mergedProps.disabled ? void 0 : 0,
     // note: 这里增加 onFocus 有两个目的：