antd-mobile 5.38.1 → 5.39.0

package/2x/bundle/style.css

@@ -2490,7 +2490,6 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   --z-index: var(--adm-floating-panel-z-index, 900);
   position: fixed;
   z-index: var(--z-index);
-  bottom: 0;
   left: 0;
   width: 100vw;
   display: flex;
@@ -2512,7 +2511,6 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   content: "";
   display: block;
   position: absolute;
-  bottom: -100vh;
   height: 100vh;
   width: 100vw;
   background: var(--adm-color-background);
@@ -2546,6 +2544,22 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   background: var(--adm-color-background);
 }
 
+.adm-floating-panel-top {
+  top: 0;
+}
+
+.adm-floating-panel-top:after {
+  top: -100vh;
+}
+
+.adm-floating-panel-bottom {
+  bottom: 0;
+}
+
+.adm-floating-panel-bottom:after {
+  bottom: -100vh;
+}
+
 .adm-form {
   --border-inner: solid 2px var(--adm-border-color);
   --border-top: solid 2px var(--adm-border-color);

package/2x/cjs/components/calendar-picker/calendar-picker.d.ts

@@ -27,9 +27,9 @@ export declare const CalendarPicker: React.ForwardRefExoticComponent<(({
     title?: React.ReactNode;
     confirmText?: string | undefined;
     weekStartsOn?: "Monday" | "Sunday" | undefined;
-    renderTop?: ((date: Date) => React.ReactNode) | undefined;
-    renderDate?: ((date: Date) => React.ReactNode) | undefined;
-    renderBottom?: ((date: Date) => React.ReactNode) | undefined;
+    renderTop?: false | import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
+    renderDate?: import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
+    renderBottom?: false | import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
     allowClear?: boolean | undefined;
     max?: Date | undefined;
     min?: Date | undefined;
@@ -61,9 +61,9 @@ export declare const CalendarPicker: React.ForwardRefExoticComponent<(({
     title?: React.ReactNode;
     confirmText?: string | undefined;
     weekStartsOn?: "Monday" | "Sunday" | undefined;
-    renderTop?: ((date: Date) => React.ReactNode) | undefined;
-    renderDate?: ((date: Date) => React.ReactNode) | undefined;
-    renderBottom?: ((date: Date) => React.ReactNode) | undefined;
+    renderTop?: false | import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
+    renderDate?: import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
+    renderBottom?: false | import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
     allowClear?: boolean | undefined;
     max?: Date | undefined;
     min?: Date | undefined;
@@ -95,9 +95,9 @@ export declare const CalendarPicker: React.ForwardRefExoticComponent<(({
     title?: React.ReactNode;
     confirmText?: string | undefined;
     weekStartsOn?: "Monday" | "Sunday" | undefined;
-    renderTop?: ((date: Date) => React.ReactNode) | undefined;
-    renderDate?: ((date: Date) => React.ReactNode) | undefined;
-    renderBottom?: ((date: Date) => React.ReactNode) | undefined;
+    renderTop?: false | import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
+    renderDate?: import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
+    renderBottom?: false | import("../calendar-picker-view/calendar-picker-view").CalendarPickerViewColumRender | undefined;
     allowClear?: boolean | undefined;
     max?: Date | undefined;
     min?: Date | undefined;

package/2x/cjs/components/calendar-picker-view/calendar-picker-view.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { DateRange, Page } from './convert';
 export declare const Context: React.Context<{
@@ -9,13 +9,14 @@ export declare type CalendarPickerViewRef = {
     jumpToToday: () => void;
     getDateRange: () => DateRange;
 };
+export declare type CalendarPickerViewColumRender = (date: Date) => ReactNode;
 export declare type CalendarPickerViewProps = {
     title?: React.ReactNode | false;
     confirmText?: string;
     weekStartsOn?: 'Monday' | 'Sunday';
-    renderTop?: (date: Date) => React.ReactNode;
-    renderDate?: (date: Date) => React.ReactNode;
-    renderBottom?: (date: Date) => React.ReactNode;
+    renderTop?: CalendarPickerViewColumRender | false;
+    renderDate?: CalendarPickerViewColumRender;
+    renderBottom?: CalendarPickerViewColumRender | false;
     allowClear?: boolean;
     max?: Date;
     min?: Date;

package/2x/cjs/components/calendar-picker-view/calendar-picker-view.js

@@ -145,7 +145,6 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
       })), _react.default.createElement("div", {
         className: `${classPrefix}-cells`
       }, presetEmptyCells, Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
-        var _a;
         const d = monthIterator.date(index + 1);
         let isSelect = false;
         let isBegin = false;
@@ -165,21 +164,33 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
         const disabled = props.shouldDisableDate ? props.shouldDisableDate(d.toDate()) : maxDay && d.isAfter(maxDay, 'day') || minDay && d.isBefore(minDay, 'day');
         const renderTop = () => {
           var _a;
+          if (props.renderTop === false) return null;
+          const contentWrapper = content => _react.default.createElement("div", {
+            className: `${classPrefix}-cell-top`
+          }, content);
           const top = (_a = props.renderTop) === null || _a === void 0 ? void 0 : _a.call(props, d.toDate());
           if (top) {
-            return top;
+            return contentWrapper(top);
           }
           if (props.selectionMode === 'range') {
             if (isBegin) {
-              return locale.Calendar.start;
+              return contentWrapper(locale.Calendar.start);
             }
             if (isEnd) {
-              return locale.Calendar.end;
+              return contentWrapper(locale.Calendar.end);
             }
           }
           if (d.isSame(today, 'day') && !isSelect) {
-            return locale.Calendar.today;
+            return contentWrapper(locale.Calendar.today);
           }
+          return contentWrapper(null);
+        };
+        const renderBottom = () => {
+          var _a;
+          if (props.renderBottom === false) return null;
+          return _react.default.createElement("div", {
+            className: `${classPrefix}-cell-bottom`
+          }, (_a = props.renderBottom) === null || _a === void 0 ? void 0 : _a.call(props, d.toDate()));
         };
         return _react.default.createElement("div", {
           key: d.valueOf(),
@@ -229,13 +240,9 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
               }
             }
           }
-        }, _react.default.createElement("div", {
-          className: `${classPrefix}-cell-top`
-        }, renderTop()), _react.default.createElement("div", {
+        }, renderTop(), _react.default.createElement("div", {
           className: `${classPrefix}-cell-date`
-        }, props.renderDate ? props.renderDate(d.toDate()) : d.date()), _react.default.createElement("div", {
-          className: `${classPrefix}-cell-bottom`
-        }, (_a = props.renderBottom) === null || _a === void 0 ? void 0 : _a.call(props, d.toDate())));
+        }, props.renderDate ? props.renderDate(d.toDate()) : d.date()), renderBottom());
       }))));
       monthIterator = monthIterator.add(1, 'month');
     }

package/2x/cjs/components/date-picker/date-picker-week-utils.js

@@ -7,9 +7,9 @@ exports.convertDateToStringArray = convertDateToStringArray;
 exports.convertStringArrayToDate = convertStringArrayToDate;
 exports.generateDatePickerColumns = generateDatePickerColumns;
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isLeapYear = _interopRequireDefault(require("dayjs/plugin/isLeapYear"));
 var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _isoWeeksInYear = _interopRequireDefault(require("dayjs/plugin/isoWeeksInYear"));
-var _isLeapYear = _interopRequireDefault(require("dayjs/plugin/isLeapYear"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_isoWeek.default);
 _dayjs.default.extend(_isoWeeksInYear.default);
@@ -93,6 +93,6 @@ function convertStringArrayToDate(value) {
   const yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
   const weekString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
   const weekdayString = (_c = value[2]) !== null && _c !== void 0 ? _c : '1';
-  const day = (0, _dayjs.default)().year(parseInt(yearString)).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
+  const day = (0, _dayjs.default)(`${parseInt(yearString)}-01-01`).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
   return day.toDate();
 }

package/2x/cjs/components/ellipsis/useMeasure.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = useMeasure;
 var _rcUtil = require("rc-util");
 var _react = _interopRequireDefault(require("react"));
+var _reactDom = require("react-dom");
 var _runes = _interopRequireDefault(require("runes2"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ELLIPSIS_TEXT = '...';
@@ -26,8 +27,11 @@ function useMeasure(containerRef, content, rows, direction, expanded, expandNode
   const fullMeasureRef = _react.default.useRef(null);
   const midMeasureRef = _react.default.useRef(null);
   const startMeasure = (0, _rcUtil.useEvent)(() => {
-    setStatus(1 /* PREPARE */);
-    setWalkingIndexes([0, direction === 'middle' ? Math.ceil(contentChars.length / 2) : contentChars.length]);
+    // use batch update to avoid async update trigger 2 render
+    (0, _reactDom.unstable_batchedUpdates)(() => {
+      setStatus(1 /* PREPARE */);
+      setWalkingIndexes([0, direction === 'middle' ? Math.ceil(contentChars.length / 2) : contentChars.length]);
+    });
   });
   // Initialize
   _react.default.useLayoutEffect(() => {
@@ -39,7 +43,7 @@ function useMeasure(containerRef, content, rows, direction, expanded, expandNode
     if (status === 1 /* PREPARE */) {
       const fullMeasureHeight = ((_a = fullMeasureRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0;
       const singleRowMeasureHeight = ((_b = singleRowMeasureRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight) || 0;
-      const rowMeasureHeight = singleRowMeasureHeight * rows;
+      const rowMeasureHeight = singleRowMeasureHeight * (rows + 0.5);
       if (fullMeasureHeight <= rowMeasureHeight) {
         setStatus(100 /* STABLE_NO_ELLIPSIS */);
       } else {

package/2x/cjs/components/floating-panel/floating-panel.css

@@ -4,7 +4,6 @@
   --z-index: var(--adm-floating-panel-z-index, 900);
   position: fixed;
   z-index: var(--z-index);
-  bottom: 0;
   left: 0;
   width: 100vw;
   display: flex;
@@ -26,7 +25,6 @@
   content: '';
   display: block;
   position: absolute;
-  bottom: -100vh;
   height: 100vh;
   width: 100vw;
   background: var(--adm-color-background);
@@ -58,4 +56,20 @@
   flex: 1;
   overflow-y: scroll;
   background: var(--adm-color-background);
+}
+
+.adm-floating-panel-top {
+  top: 0;
+}
+
+.adm-floating-panel-top::after {
+  top: -100vh;
+}
+
+.adm-floating-panel-bottom {
+  bottom: 0;
+}
+
+.adm-floating-panel-bottom::after {
+  bottom: -100vh;
 }

package/2x/cjs/components/floating-panel/floating-panel.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { ReactNode } from 'react';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type FloatingPanelRef = {
     setHeight: (height: number, options?: {
@@ -11,12 +11,14 @@ export declare type FloatingPanelProps = {
     children: ReactNode;
     onHeightChange?: (height: number, animating: boolean) => void;
     handleDraggingOfContent?: boolean;
+    placement?: 'bottom' | 'top';
 } & NativeProps<'--border-radius' | '--z-index' | '--header-height'>;
 export declare const FloatingPanel: React.ForwardRefExoticComponent<{
     anchors: number[];
     children: ReactNode;
     onHeightChange?: ((height: number, animating: boolean) => void) | undefined;
     handleDraggingOfContent?: boolean | undefined;
+    placement?: "bottom" | "top" | undefined;
 } & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--z-index" | "--border-radius" | "--header-height", string>>) | undefined;

package/2x/cjs/components/floating-panel/floating-panel.js

@@ -4,43 +4,47 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FloatingPanel = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _nativeProps = require("../../utils/native-props");
-var _react2 = require("@use-gesture/react");
 var _web = require("@react-spring/web");
-var _supportsPassive = require("../../utils/supports-passive");
+var _react = require("@use-gesture/react");
+var _ahooks = require("ahooks");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react2 = _interopRequireWildcard(require("react"));
+var _nativeProps = require("../../utils/native-props");
 var _nearest = require("../../utils/nearest");
-var _withDefaultProps = require("../../utils/with-default-props");
+var _supportsPassive = require("../../utils/supports-passive");
 var _useLockScroll = require("../../utils/use-lock-scroll");
-var _ahooks = require("ahooks");
+var _withDefaultProps = require("../../utils/with-default-props");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = 'adm-floating-panel';
 const defaultProps = {
   handleDraggingOfContent: true
 };
-const FloatingPanel = (0, _react.forwardRef)((p, ref) => {
+const FloatingPanel = (0, _react2.forwardRef)((p, ref) => {
   var _a, _b;
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const {
-    anchors
+    anchors,
+    placement = 'bottom'
   } = props;
   const maxHeight = (_a = anchors[anchors.length - 1]) !== null && _a !== void 0 ? _a : window.innerHeight;
-  const possibles = anchors.map(x => -x);
-  const elementRef = (0, _react.useRef)(null);
-  const headerRef = (0, _react.useRef)(null);
-  const contentRef = (0, _react.useRef)(null);
-  const [pulling, setPulling] = (0, _react.useState)(false);
-  const pullingRef = (0, _react.useRef)(false);
+  const isBottomPlacement = placement !== 'top';
+  const possibles = isBottomPlacement ? anchors.map(x => -x) : anchors;
+  const elementRef = (0, _react2.useRef)(null);
+  const headerRef = (0, _react2.useRef)(null);
+  const contentRef = (0, _react2.useRef)(null);
+  const [pulling, setPulling] = (0, _react2.useState)(false);
+  const pullingRef = (0, _react2.useRef)(false);
   const bounds = {
-    top: possibles[possibles.length - 1],
-    bottom: possibles[0]
+    top: Math.min(...possibles),
+    bottom: Math.max(...possibles)
   };
   const onHeightChange = (0, _ahooks.useMemoizedFn)((_b = props.onHeightChange) !== null && _b !== void 0 ? _b : () => {});
   const [{
     y
   }, api] = (0, _web.useSpring)(() => ({
-    y: bounds.bottom,
+    y: isBottomPlacement ? bounds.bottom : bounds.top,
     config: {
       tension: 300
     },
@@ -48,7 +52,7 @@ const FloatingPanel = (0, _react.forwardRef)((p, ref) => {
       onHeightChange(-result.value.y, y.isAnimating);
     }
   }));
-  (0, _react2.useDrag)(state => {
+  (0, _react.useDrag)(state => {
     const [, offsetY] = state.offset;
     if (state.first) {
       const target = state.event.target;
@@ -100,7 +104,7 @@ const FloatingPanel = (0, _react.forwardRef)((p, ref) => {
       passive: false
     } : undefined
   });
-  (0, _react.useImperativeHandle)(ref, () => ({
+  (0, _react2.useImperativeHandle)(ref, () => ({
     setHeight: (height, options) => {
       api.start({
         y: -height,
@@ -109,26 +113,35 @@ const FloatingPanel = (0, _react.forwardRef)((p, ref) => {
     }
   }), [api]);
   (0, _useLockScroll.useLockScroll)(elementRef, true);
-  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement(_web.animated.div, {
+  const HeaderNode = _react2.default.createElement("div", {
+    className: `${classPrefix}-header`,
+    ref: headerRef
+  }, _react2.default.createElement("div", {
+    className: `${classPrefix}-bar`
+  }));
+  return (0, _nativeProps.withNativeProps)(props, _react2.default.createElement(_web.animated.div, {
     ref: elementRef,
-    className: classPrefix,
+    className: (0, _classnames.default)(classPrefix, `${classPrefix}-${placement}`),
     style: {
       height: Math.round(maxHeight),
-      translateY: y.to(y => `calc(100% + (${Math.round(y)}px))`)
+      translateY: y.to(y => {
+        if (isBottomPlacement) {
+          return `calc(100% + (${Math.round(y)}px))`;
+        }
+        if (placement === 'top') {
+          return `calc(-100% + (${Math.round(y)}px))`;
+        }
+        return y;
+      })
     }
-  }, _react.default.createElement("div", {
+  }, _react2.default.createElement("div", {
     className: `${classPrefix}-mask`,
     style: {
       display: pulling ? 'block' : 'none'
     }
-  }), _react.default.createElement("div", {
-    className: `${classPrefix}-header`,
-    ref: headerRef
-  }, _react.default.createElement("div", {
-    className: `${classPrefix}-bar`
-  })), _react.default.createElement("div", {
+  }), isBottomPlacement && HeaderNode, _react2.default.createElement("div", {
     className: `${classPrefix}-content`,
     ref: contentRef
-  }, props.children)));
+  }, props.children), placement === 'top' && HeaderNode));
 });
 exports.FloatingPanel = FloatingPanel;

package/2x/cjs/components/image-uploader/image-uploader.d.ts

@@ -1,8 +1,8 @@
+import type { CSSProperties, InputHTMLAttributes, ReactElement, ReactNode } from 'react';
 import React from 'react';
-import type { ReactNode, InputHTMLAttributes, ReactElement } from 'react';
 import { NativeProps } from '../../utils/native-props';
-import type { ImageProps } from '../image';
 import { GridProps } from '../grid';
+import type { ImageProps } from '../image';
 export declare type TaskStatus = 'pending' | 'fail' | 'success';
 export interface ImageUploadItem {
     key?: string | number;
@@ -71,7 +71,7 @@ export declare const ImageUploader: React.ForwardRefExoticComponent<{
     renderItem?: ((originNode: ReactElement, file: ImageUploadItem, fileList: ImageUploadItem[]) => ReactNode) | undefined;
 } & {
     className?: string | undefined;
-    style?: (React.CSSProperties & Partial<Record<"--gap" | "--gap-vertical" | "--gap-horizontal" | "--cell-size", string>>) | undefined;
+    style?: (CSSProperties & Partial<Record<"--gap" | "--gap-vertical" | "--gap-horizontal" | "--cell-size", string>>) | undefined;
     tabIndex?: number | undefined;
 } & React.AriaAttributes & React.RefAttributes<ImageUploaderRef>>;
 export {};

package/2x/cjs/components/image-uploader/image-uploader.js

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ImageUploader = void 0;
 var _tslib = require("tslib");
-var _react = _interopRequireWildcard(require("react"));
-var _antdMobileIcons = require("antd-mobile-icons");
-var _withDefaultProps = require("../../utils/with-default-props");
-var _imageViewer = _interopRequireDefault(require("../image-viewer"));
-var _previewItem = _interopRequireDefault(require("./preview-item"));
-var _usePropsValue = require("../../utils/use-props-value");
 var _ahooks = require("ahooks");
-var _space = _interopRequireDefault(require("../space"));
-var _nativeProps = require("../../utils/native-props");
+var _antdMobileIcons = require("antd-mobile-icons");
+var _react = _interopRequireWildcard(require("react"));
 var _measureCssLength = require("../../utils/measure-css-length");
+var _nativeProps = require("../../utils/native-props");
+var _usePropsValue = require("../../utils/use-props-value");
+var _withDefaultProps = require("../../utils/with-default-props");
 var _configProvider = require("../config-provider");
 var _grid = _interopRequireDefault(require("../grid"));
+var _imageViewer = _interopRequireDefault(require("../image-viewer"));
+var _space = _interopRequireDefault(require("../space"));
+var _previewItem = _interopRequireDefault(require("./preview-item"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -153,10 +153,10 @@ const ImageUploader = (0, _react.forwardRef)((p, ref) => {
               return task;
             });
           });
-          throw e;
+          console.error(e);
         }
-      }))).catch(error => console.error(error));
-      setValue(prev => prev.concat(newVal));
+      })));
+      setValue(prev => prev.concat(newVal).filter(Boolean));
     });
   }
   const imageViewerHandlerRef = (0, _react.useRef)(null);

package/2x/cjs/components/image-viewer/image-viewer.d.ts

@@ -1,15 +1,18 @@
-import React from 'react';
 import type { FC, ReactNode } from 'react';
+import React from 'react';
 import { GetContainer } from '../../utils/render-to-container';
 import { SlidesRef } from './slides';
 export declare type ImageViewerProps = {
-    image?: string;
+    image: string;
     maxZoom?: number | 'auto';
     getContainer?: GetContainer;
     visible?: boolean;
     onClose?: () => void;
     afterClose?: () => void;
     renderFooter?: (image: string) => ReactNode;
+    imageRender?: (image: string, { index }: {
+        index: number;
+    }) => ReactNode;
     classNames?: {
         mask?: string;
         body?: string;
@@ -17,15 +20,21 @@ export declare type ImageViewerProps = {
 };
 export declare const ImageViewer: FC<ImageViewerProps>;
 export declare type MultiImageViewerRef = SlidesRef;
-export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image' | 'renderFooter'> & {
+export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image' | 'renderFooter' | 'imageRender'> & {
     images?: string[];
     defaultIndex?: number;
     onIndexChange?: (index: number) => void;
     renderFooter?: (image: string, index: number) => ReactNode;
+    imageRender?: (image: string, { index }: {
+        index: number;
+    }) => ReactNode;
 };
-export declare const MultiImageViewer: React.ForwardRefExoticComponent<Omit<ImageViewerProps, "image" | "renderFooter"> & {
+export declare const MultiImageViewer: React.ForwardRefExoticComponent<Omit<ImageViewerProps, "image" | "imageRender" | "renderFooter"> & {
     images?: string[] | undefined;
     defaultIndex?: number | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
     renderFooter?: ((image: string, index: number) => ReactNode) | undefined;
+    imageRender?: ((image: string, { index }: {
+        index: number;
+    }) => ReactNode) | undefined;
 } & React.RefAttributes<SlidesRef>>;

package/2x/cjs/components/image-viewer/image-viewer.js

@@ -4,17 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MultiImageViewer = exports.ImageViewer = void 0;
+var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
-var _withDefaultProps = require("../../utils/with-default-props");
 var _renderToContainer = require("../../utils/render-to-container");
+var _withDefaultProps = require("../../utils/with-default-props");
 var _mask = _interopRequireDefault(require("../mask"));
 var _safeArea = _interopRequireDefault(require("../safe-area"));
 var _slide = require("./slide");
 var _slides = require("./slides");
-var _classnames = _interopRequireDefault(require("classnames"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-image-viewer`;
 const defaultProps = {
   maxZoom: 3,
@@ -33,10 +33,11 @@ const ImageViewer = p => {
     className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
   }, _react.default.createElement("div", {
     className: (0, _classnames.default)(`${classPrefix}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
-  }, props.image && _react.default.createElement(_slide.Slide, {
+  }, (props.image || typeof props.imageRender === 'function') && _react.default.createElement(_slide.Slide, {
     image: props.image,
     onTap: props.onClose,
-    maxZoom: props.maxZoom
+    maxZoom: props.maxZoom,
+    imageRender: props.imageRender
   })), props.image && _react.default.createElement("div", {
     className: `${classPrefix}-footer`
   }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.image), _react.default.createElement(_safeArea.default, {
@@ -81,7 +82,8 @@ const MultiImageViewer = (0, _react.forwardRef)((p, ref) => {
     onIndexChange: onSlideChange,
     images: props.images,
     onTap: props.onClose,
-    maxZoom: props.maxZoom
+    maxZoom: props.maxZoom,
+    imageRender: props.imageRender
   })), props.images && _react.default.createElement("div", {
     className: `${classPrefix}-footer`
   }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.images[index], index), _react.default.createElement(_safeArea.default, {

package/2x/cjs/components/image-viewer/index.d.ts

@@ -3,11 +3,14 @@ import { showMultiImageViewer, showImageViewer, clearImageViewer } from './metho
 export type { ImageViewerProps, MultiImageViewerProps, MultiImageViewerRef, } from './image-viewer';
 export type { ImageViewerShowHandler } from './methods';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
-    Multi: import("react").ForwardRefExoticComponent<Omit<import("./image-viewer").ImageViewerProps, "image" | "renderFooter"> & {
+    Multi: import("react").ForwardRefExoticComponent<Omit<import("./image-viewer").ImageViewerProps, "image" | "imageRender" | "renderFooter"> & {
         images?: string[] | undefined;
         defaultIndex?: number | undefined;
         onIndexChange?: ((index: number) => void) | undefined;
         renderFooter?: ((image: string, index: number) => import("react").ReactNode) | undefined;
+        imageRender?: ((image: string, { index }: {
+            index: number;
+        }) => import("react").ReactNode) | undefined;
     } & import("react").RefAttributes<import("./slides").SlidesRef>> & {
         show: typeof showMultiImageViewer;
     };

package/2x/cjs/components/image-viewer/slide.d.ts

@@ -1,10 +1,14 @@
-import type { FC, MutableRefObject } from 'react';
+import type { FC, MutableRefObject, ReactNode } from 'react';
 declare type Props = {
     image: string;
     maxZoom: number | 'auto';
     onTap?: () => void;
     onZoomChange?: (zoom: number) => void;
     dragLockRef?: MutableRefObject<boolean>;
+    imageRender?: (image: string, { index }: {
+        index: number;
+    }) => ReactNode;
+    index?: number;
 };
 export declare const Slide: FC<Props>;
 export {};

package/2x/cjs/components/image-viewer/slide.js

@@ -4,20 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Slide = void 0;
-var _react = _interopRequireWildcard(require("react"));
 var _web = require("@react-spring/web");
 var _ahooks = require("ahooks");
-var _rubberband = require("../../utils/rubberband");
-var _useDragAndPinch = require("../../utils/use-drag-and-pinch");
+var _react = _interopRequireWildcard(require("react"));
 var _bound = require("../../utils/bound");
 var mat = _interopRequireWildcard(require("../../utils/matrix"));
+var _rubberband = require("../../utils/rubberband");
+var _useDragAndPinch = require("../../utils/use-drag-and-pinch");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const classPrefix = `adm-image-viewer`;
 const Slide = props => {
   const {
     dragLockRef,
-    maxZoom
+    maxZoom,
+    imageRender,
+    index
   } = props;
   const initialMartix = (0, _react.useRef)([]);
   const controlRef = (0, _react.useRef)(null);
@@ -227,6 +229,9 @@ const Slide = props => {
       }
     }
   });
+  const customRendering = typeof imageRender === 'function' && imageRender(props.image, {
+    index
+  });
   return _react.default.createElement("div", {
     className: `${classPrefix}-slide`
   }, _react.default.createElement("div", {
@@ -237,7 +242,7 @@ const Slide = props => {
     style: {
       matrix
     }
-  }, _react.default.createElement("img", {
+  }, customRendering ? customRendering : _react.default.createElement("img", {
     ref: imgRef,
     src: props.image,
     draggable: false,