antd-mobile 5.0.0-rc.24 → 5.0.0-rc.28

package/cjs/components/text-area/text-area.js

@@ -13,6 +13,8 @@ var _usePropsValue = require("../../utils/use-props-value");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _devLog = require("../../utils/dev-log");
+
 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; }
@@ -31,7 +33,14 @@ const TextArea = (0, _react.forwardRef)((p, ref) => {
     showCount,
     maxLength
   } = props;
-  const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
+  const [value, setValue] = (0, _usePropsValue.usePropsValue)(Object.assign(Object.assign({}, props), {
+    value: props.value === null ? '' : props.value
+  }));
+
+  if (props.value === null) {
+    (0, _devLog.devError)('TextArea', '`value` prop on `TextArea` should not be `null`. Consider using an empty string to clear the component.');
+  }
+
   const nativeTextAreaRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(ref, () => ({
     clear: () => {
@@ -89,6 +98,7 @@ const TextArea = (0, _react.forwardRef)((p, ref) => {
     className: `${classPrefix}-element`,
     rows: props.rows,
     value: value,
+    placeholder: props.placeholder,
     onChange: e => {
       let v = e.target.value;
 

package/cjs/components/virtual-input/virtual-input.js

@@ -17,6 +17,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _antdMobileIcons = require("antd-mobile-icons");
 
+var _ahooks = require("ahooks");
+
 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); }
@@ -47,7 +49,7 @@ const VirtualInput = (0, _react.forwardRef)((p, ref) => {
     content.scrollLeft = content.clientWidth;
   }
 
-  (0, _react.useLayoutEffect)(() => {
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     scrollToEnd();
   }, [value]);
   (0, _react.useEffect)(() => {

package/cjs/utils/get-scroll-parent.js

@@ -12,7 +12,7 @@ const defaultRoot = _canUseDom.canUseDom ? window : undefined;
 
 function isElement(node) {
   const ELEMENT_NODE_TYPE = 1;
-  return node.tagName !== 'HTML' && node.tagName !== 'BODY' && node.nodeType === ELEMENT_NODE_TYPE;
+  return node.nodeType === ELEMENT_NODE_TYPE;
 } // https://github.com/youzan/vant/issues/3823
 
 

package/cjs/utils/is-dev.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isDev = void 0;
-const isDev = process.env.NODE_ENV === 'development';
+const isDev = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
 exports.isDev = isDev;

package/cjs/utils/use-ref-state.js

@@ -10,7 +10,7 @@ var _react = require("react");
 function useRefState(initialState) {
   const [state, setState] = (0, _react.useState)(initialState);
   const ref = (0, _react.useRef)(state);
-  (0, _react.useLayoutEffect)(() => {
+  (0, _react.useEffect)(() => {
     ref.current = state;
   }, [state]);
   return [state, setState, ref];

package/cjs/utils/use-resize-effect.js

@@ -5,13 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useResizeEffect = useResizeEffect;
 
-var _react = require("react");
-
 var _ahooks = require("ahooks");
 
 function useResizeEffect(effect, targetRef) {
   const fn = (0, _ahooks.useMemoizedFn)(effect);
-  (0, _react.useLayoutEffect)(() => {
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     const target = targetRef.current;
     if (!target) return;
 

package/cjs/utils/use-tab-list-scroll.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useTabListScroll = void 0;
 
-var _react = require("react");
-
 var _web = require("@react-spring/web");
 
 var _useMutationEffect = require("./use-mutation-effect");
@@ -49,7 +47,7 @@ const useTabListScroll = (targetRef, activeIndex) => {
     });
   }
 
-  (0, _react.useLayoutEffect)(() => {
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     animate(true);
   }, []);
   (0, _ahooks.useUpdateLayoutEffect)(() => {

package/es/components/button/button.css

@@ -12,9 +12,9 @@
   display: inline-block;
   box-sizing: border-box;
   height: auto;
-  padding: 8px 12px;
+  padding: 7px 12px;
   margin: 0;
-  font-size: 15px;
+  font-size: 17px;
   line-height: 1.4;
   text-align: center;
   border: var(--border-width) var(--border-style) var(--border-color);

package/es/components/calendar/calendar.d.ts

@@ -3,6 +3,7 @@ import { NativeProps } from '../../utils/native-props';
 export declare type CalendarProps = {
     weekStartsOn?: 'Monday' | 'Sunday';
     renderLabel?: (date: Date) => string | null | undefined;
+    onPageChange?: (year: number, month: number) => void;
 } & ({
     selectionMode?: undefined;
     value?: undefined;

package/es/components/calendar/calendar.js

@@ -1,4 +1,4 @@
-import React, { useLayoutEffect, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import dayjs from 'dayjs';
 import classNames from 'classnames';
@@ -7,6 +7,7 @@ import { ArrowLeft } from './arrow-left';
 import { ArrowLeftDouble } from './arrow-left-double';
 import { useConfig } from '../config-provider';
 import isoWeek from 'dayjs/plugin/isoWeek';
+import { useIsomorphicLayoutEffect, useUpdateEffect } from 'ahooks';
 dayjs.extend(isoWeek);
 const classPrefix = 'adm-calendar';
 const defaultProps = {
@@ -26,6 +27,11 @@ export const Calendar = p => {
   }
 
   const [current, setCurrent] = useState(() => dayjs().date(1));
+  useUpdateEffect(() => {
+    var _a;
+
+    (_a = props.onPageChange) === null || _a === void 0 ? void 0 : _a.call(props, current.year(), current.month() + 1);
+  }, [current]);
   const header = React.createElement("div", {
     className: `${classPrefix}-header`
   }, React.createElement("a", {
@@ -65,7 +71,7 @@ export const Calendar = p => {
   }, [props.selectionMode, props.value, props.defaultValue]);
   const [begin, setBegin] = useState(null);
   const [end, setEnd] = useState(null);
-  useLayoutEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     setBegin(dateRange[0] ? dayjs(dateRange[0]) : null);
     setEnd(dateRange[1] ? dayjs(dateRange[1]) : null);
   }, [dateRange[0], dateRange[1]]);

package/es/components/checkbox/checkbox.js

@@ -7,6 +7,7 @@ import { mergeProps } from '../../utils/with-default-props';
 import { devWarning } from '../../utils/dev-log';
 import { CheckIcon } from './check-icon';
 import { IndeterminateIcon } from './indeterminate-icon';
+import { isDev } from '../../utils/is-dev';
 const classPrefix = `adm-checkbox`;
 const defaultProps = {
   defaultChecked: false,
@@ -21,23 +22,21 @@ export const Checkbox = p => {
     onChange: props.onChange
   });
   let disabled = props.disabled;
-
-  const usageWarning = () => {
-    if (p.checked !== undefined) {
-      devWarning('Checkbox', 'When used with `Checkbox.Group`, the `checked` prop of `Checkbox` will not work if `value` prop of `Checkbox` is not undefined.');
-    }
-
-    if (p.defaultChecked !== undefined) {
-      devWarning('Checkbox', 'When used with `Checkbox.Group`, the `defaultChecked` prop of `Checkbox` will not work if `value` prop of `Checkbox` is not undefined.');
-    }
-  };
-
   const {
     value
   } = props;
 
   if (groupContext && value !== undefined) {
-    usageWarning();
+    if (isDev) {
+      if (p.checked !== undefined) {
+        devWarning('Checkbox', 'When used within `Checkbox.Group`, the `checked` prop of `Checkbox` will not work.');
+      }
+
+      if (p.defaultChecked !== undefined) {
+        devWarning('Checkbox', 'When used within `Checkbox.Group`, the `defaultChecked` prop of `Checkbox` will not work.');
+      }
+    }
+
     checked = groupContext.value.includes(value);
 
     setChecked = checked => {

package/es/components/date-picker/date-picker.d.ts

@@ -2,7 +2,7 @@ import { FC, ReactNode } from 'react';
 import type { PickerProps } from '../picker';
 import { NativeProps } from '../../utils/native-props';
 import type { Precision, DatePickerFilter } from './date-picker-utils';
-export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' | 'visible' | 'confirmText' | 'cancelText' | 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'title' | 'stopPropagation' | 'style'> & {
+export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' | 'closeOnMaskClick' | 'visible' | 'confirmText' | 'cancelText' | 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'title' | 'stopPropagation' | 'style'> & {
     value?: Date | null;
     defaultValue?: Date | null;
     onSelect?: (value: Date) => void;

package/es/components/dialog/dialog.css

@@ -31,6 +31,9 @@
 .adm-dialog-main > .adm-dialog-image-container {
   flex: auto;
 }
+.adm-dialog-main > .adm-dialog-image-container + .adm-dialog-body {
+  padding-top: 12px;
+}
 .adm-dialog-main .adm-dialog-body {
   padding: 20px 12px;
 }

package/es/components/dropdown/dropdown.css

@@ -43,9 +43,6 @@
 .adm-dropdown-item-highlight {
   color: var(--adm-color-primary);
 }
-.adm-dropdown-item-active {
-  color: var(--adm-color-primary);
-}
 .adm-dropdown-item-active .adm-dropdown-item-title:after {
   margin-top: -1px;
   transform: rotate(135deg);

package/es/components/dropdown/item.js

@@ -6,9 +6,11 @@ import { DownFill } from 'antd-mobile-icons';
 const classPrefix = `adm-dropdown-item`;
 
 const Item = props => {
+  var _a;
+
   const cls = classNames(classPrefix, {
     [`${classPrefix}-active`]: props.active,
-    [`${classPrefix}-highlight`]: props.highlight
+    [`${classPrefix}-highlight`]: (_a = props.highlight) !== null && _a !== void 0 ? _a : props.active
   });
   return withNativeProps(props, React.createElement("div", {
     className: cls,

package/es/components/ellipsis/ellipsis.js

@@ -1,7 +1,8 @@
-import React, { useLayoutEffect, useRef, useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
 import { useResizeEffect } from '../../utils/use-resize-effect';
+import { useIsomorphicLayoutEffect } from 'ahooks';
 const classPrefix = `adm-ellipsis`;
 const defaultProps = {
   direction: 'end',
@@ -113,7 +114,7 @@ export const Ellipsis = p => {
   }
 
   useResizeEffect(calcEllipsised, rootRef);
-  useLayoutEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     calcEllipsised();
   }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
   const expandActionElement = exceeded && props.expandText ? React.createElement("a", {

package/es/components/empty/empty.css

@@ -9,7 +9,7 @@
   display: flex;
   justify-content: center;
 }
-.adm-empty-image-container-image {
+.adm-empty-image-container .adm-empty-image {
   width: 64px;
 }
 .adm-empty-description {

package/es/components/floating-bubble/floating-bubble.css

@@ -15,6 +15,7 @@
   width: 100vw;
   height: 100vh;
   padding: var(--edge-distance);
+  box-sizing: border-box;
   pointer-events: none;
 }
 .adm-floating-bubble-boundary {

package/es/components/floating-panel/floating-panel.d.ts

@@ -1,17 +1,19 @@
 import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
-export declare type FloatingPanelProps = {
-    anchors: number[];
-    children: ReactNode;
-    onHeightChange?: (height: number, animating: boolean) => void;
-} & NativeProps<'--border-radius' | '--z-index'>;
 export declare type FloatingPanelRef = {
     setHeight: (height: number, options?: {
         immediate?: boolean;
     }) => void;
 };
+export declare type FloatingPanelProps = {
+    anchors: number[];
+    children: ReactNode;
+    onHeightChange?: (height: number, animating: boolean) => void;
+    handleDraggingOfContent?: boolean;
+} & NativeProps<'--border-radius' | '--z-index'>;
 export declare const FloatingPanel: React.ForwardRefExoticComponent<{
     anchors: number[];
     children: ReactNode;
     onHeightChange?: ((height: number, animating: boolean) => void) | undefined;
+    handleDraggingOfContent?: boolean | undefined;
 } & NativeProps<"--z-index" | "--border-radius"> & React.RefAttributes<FloatingPanelRef>>;

package/es/components/floating-panel/floating-panel.js

@@ -4,9 +4,15 @@ import { useDrag } from '@use-gesture/react';
 import { useSpring, animated } from '@react-spring/web';
 import { supportsPassive } from '../../utils/supports-passive';
 import { nearest } from '../../utils/nearest';
-export const FloatingPanel = forwardRef((props, ref) => {
+import { mergeProps } from '../../utils/with-default-props';
+import { useLockScroll } from '../../utils/use-lock-scroll';
+const defaultProps = {
+  handleDraggingOfContent: true
+};
+export const FloatingPanel = forwardRef((p, ref) => {
   var _a;
 
+  const props = mergeProps(defaultProps, p);
   const {
     anchors
   } = props;
@@ -44,6 +50,7 @@ export const FloatingPanel = forwardRef((props, ref) => {
       if (header === target || (header === null || header === void 0 ? void 0 : header.contains(target))) {
         pullingRef.current = true;
       } else {
+        if (!props.handleDraggingOfContent) return;
         const reachedTop = y.goal <= bounds.top;
         const content = contentRef.current;
         if (!content) return;
@@ -101,6 +108,7 @@ export const FloatingPanel = forwardRef((props, ref) => {
       });
     }
   }), [api]);
+  useLockScroll(elementRef, true);
   return withNativeProps(props, React.createElement(animated.div, {
     ref: elementRef,
     className: 'adm-floating-panel',

package/es/components/form/form-item.css

@@ -7,6 +7,7 @@
   line-height: 1.5;
   box-sizing: border-box;
   position: relative;
+  color: #666666;
 }
 .adm-form-item-label-required {
   position: absolute;
@@ -16,23 +17,28 @@
   color: var(--adm-color-danger);
   user-select: none;
 }
+.adm-form-item-label-help {
+  margin-left: 4px;
+}
 .adm-form-item-footer {
   color: var(--adm-color-danger);
+  margin-top: 4px;
 }
 .adm-form-item.adm-form-item-hidden {
   display: none;
 }
-.adm-form-vertical .adm-form-item-label {
-  font-size: 15px;
-  margin-bottom: 4px;
-}
-.adm-form-vertical .adm-form-item-footer {
-  margin-top: 4px;
+.adm-form-item.adm-form-item-horizontal.adm-list-item {
+  --align-items: stretch;
+  --prefix-width: 6em;
 }
-.adm-form-horizontal .adm-list-item-content-prefix {
+.adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {
   padding-top: 12px;
   padding-bottom: 12px;
 }
-.adm-form-item-label {
-  color: #666666;
+.adm-form-item.adm-form-item-horizontal .adm-list-item-content-extra {
+  align-self: center;
+}
+.adm-form-item.adm-form-item-vertical .adm-form-item-label {
+  font-size: 15px;
+  margin-bottom: 4px;
 }

package/es/components/form/form-item.d.ts

@@ -7,7 +7,7 @@ import type { FormLayout } from './index';
 declare type RenderChildren<Values = any> = (form: FormInstance<Values>) => React.ReactNode;
 declare type ChildrenType<Values = any> = RenderChildren<Values> | React.ReactNode;
 declare type RcFieldProps = Omit<FieldProps, 'children'>;
-export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePropName' | 'name' | 'rules' | 'messageVariables' | 'trigger' | 'validateTrigger' | 'shouldUpdate'> & Pick<ListItemProps, 'style' | 'onClick' | 'extra' | 'arrow'> & {
+export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePropName' | 'name' | 'rules' | 'messageVariables' | 'trigger' | 'validateTrigger' | 'shouldUpdate' | 'initialValue'> & Pick<ListItemProps, 'style' | 'onClick' | 'extra' | 'arrow' | 'description'> & {
     label?: React.ReactNode;
     help?: React.ReactNode;
     hasFeedback?: boolean;

package/es/components/form/form-item.js

@@ -7,6 +7,8 @@ import { devWarning } from '../../utils/dev-log';
 import { FormContext, NoStyleItemContext } from './context';
 import { toArray } from './utils';
 import List from '../list';
+import Popover from '../popover';
+import { QuestionCircleOutline } from 'antd-mobile-icons';
 const NAME_SPLIT = '__SPLIT__';
 const classPrefix = `adm-form-item`;
 const MemoInput = React.memo(({
@@ -26,7 +28,8 @@ const FormItemLayout = props => {
     htmlFor,
     hidden,
     errors,
-    arrow
+    arrow,
+    description
   } = props;
   const context = useContext(FormContext);
   const hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
@@ -39,17 +42,21 @@ const FormItemLayout = props => {
     className: `${classPrefix}-label-required`
   }, "*"), help && React.createElement("span", {
     className: `${classPrefix}-label-help`
-  }, help)) : null;
-  const descriptionElement = feedback && React.createElement("div", {
+  }, React.createElement(Popover, {
+    content: help,
+    mode: 'dark',
+    trigger: 'click'
+  }, React.createElement(QuestionCircleOutline, null)))) : null;
+  const descriptionElement = feedback || description ? React.createElement(React.Fragment, null, description, React.createElement("div", {
     className: `${classPrefix}-footer`
-  }, feedback);
+  }, feedback)) : null;
   return React.createElement(List.Item, {
     style: style,
     title: layout === 'vertical' && labelElement,
     prefix: layout === 'horizontal' && labelElement,
     extra: extra,
     description: descriptionElement,
-    className: classNames(classPrefix, className, {
+    className: classNames(classPrefix, className, `${classPrefix}-${layout}`, {
       [`${classPrefix}-hidden`]: hidden
     }),
     disabled: disabled,
@@ -73,6 +80,7 @@ export const FormItem = props => {
     noStyle,
     hidden,
     layout,
+    description,
     // Field 相关
     disabled,
     rules,
@@ -85,7 +93,7 @@ export const FormItem = props => {
     dependencies,
     arrow
   } = props,
-        fieldProps = __rest(props, ["className", "style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "arrow"]);
+        fieldProps = __rest(props, ["className", "style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "arrow"]);
 
   const {
     validateTrigger: contextValidateTrigger
@@ -134,6 +142,7 @@ export const FormItem = props => {
       label: label,
       extra: extra,
       help: help,
+      description: description,
       required: isRequired,
       disabled: disabled,
       hasFeedback: hasFeedback,

package/es/components/form/form.css

@@ -2,13 +2,6 @@
   --padding-left: 16px;
   --padding-right: 12px;
 }
-.adm-form-horizontal .adm-list.adm-list {
-  --prefix-width: 6em;
-  --align-items: stretch;
-}
-.adm-form-horizontal .adm-list.adm-list .adm-list-item-content-extra {
-  align-self: center;
-}
 .adm-form .adm-form-footer {
   padding: 20px 12px;
 }

package/es/components/form/form.js

@@ -51,7 +51,7 @@ export const Form = forwardRef((p, ref) => {
   });
   collect();
   return React.createElement(RcForm, Object.assign({
-    className: classNames(classPrefix, `${classPrefix}-${layout}`, className),
+    className: classNames(classPrefix, className),
     style: style,
     ref: ref
   }, formProps), React.createElement(FormContext.Provider, {

package/es/components/form/index.css

@@ -2,13 +2,6 @@
   --padding-left: 16px;
   --padding-right: 12px;
 }
-.adm-form-horizontal .adm-list.adm-list {
-  --prefix-width: 6em;
-  --align-items: stretch;
-}
-.adm-form-horizontal .adm-list.adm-list .adm-list-item-content-extra {
-  align-self: center;
-}
 .adm-form .adm-form-footer {
   padding: 20px 12px;
 }
@@ -21,6 +14,7 @@
   line-height: 1.5;
   box-sizing: border-box;
   position: relative;
+  color: #666666;
 }
 .adm-form-item-label-required {
   position: absolute;
@@ -30,23 +24,28 @@
   color: var(--adm-color-danger);
   user-select: none;
 }
+.adm-form-item-label-help {
+  margin-left: 4px;
+}
 .adm-form-item-footer {
   color: var(--adm-color-danger);
+  margin-top: 4px;
 }
 .adm-form-item.adm-form-item-hidden {
   display: none;
 }
-.adm-form-vertical .adm-form-item-label {
-  font-size: 15px;
-  margin-bottom: 4px;
-}
-.adm-form-vertical .adm-form-item-footer {
-  margin-top: 4px;
+.adm-form-item.adm-form-item-horizontal.adm-list-item {
+  --align-items: stretch;
+  --prefix-width: 6em;
 }
-.adm-form-horizontal .adm-list-item-content-prefix {
+.adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {
   padding-top: 12px;
   padding-bottom: 12px;
 }
-.adm-form-item-label {
-  color: #666666;
+.adm-form-item.adm-form-item-horizontal .adm-list-item-content-extra {
+  align-self: center;
+}
+.adm-form-item.adm-form-item-vertical .adm-form-item-label {
+  font-size: 15px;
+  margin-bottom: 4px;
 }

package/es/components/image-uploader/image-uploader.d.ts

@@ -19,7 +19,7 @@ export declare type ImageUploaderProps = {
     showUpload?: boolean;
     deletable?: boolean;
     capture?: InputHTMLAttributes<unknown>['capture'];
-    onPreview?: (index: number) => void;
+    onPreview?: (index: number, item: ImageUploadItem) => void;
     beforeUpload?: (file: File[]) => Promise<File[]> | File[];
     upload: (file: File) => Promise<ImageUploadItem>;
     onDelete?: (item: ImageUploadItem) => boolean | Promise<boolean> | void;

package/es/components/image-uploader/image-uploader.js

@@ -1,11 +1,11 @@
 import { __awaiter } from "tslib";
-import React, { useLayoutEffect, useRef, useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { AddOutline } from 'antd-mobile-icons';
 import { mergeProps } from '../../utils/with-default-props';
 import ImageViewer from '../image-viewer';
 import PreviewItem from './preview-item';
 import { usePropsValue } from '../../utils/use-props-value';
-import { useMemoizedFn, useUnmount } from 'ahooks';
+import { useIsomorphicLayoutEffect, useMemoizedFn, useUnmount } from 'ahooks';
 import Space from '../space';
 import { withNativeProps } from '../../utils/native-props';
 const classPrefix = `adm-image-uploader`;
@@ -26,7 +26,7 @@ export const ImageUploader = p => {
     setValue(updater(value));
   });
   const [tasks, setTasks] = useState([]);
-  useLayoutEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     setTasks(prev => prev.filter(task => {
       if (task.url === undefined) return true;
       return !value.some(fileItem => fileItem.url === task.url);
@@ -144,7 +144,7 @@ export const ImageUploader = p => {
           previewImage(index);
         }
 
-        onPreview && onPreview(index);
+        onPreview && onPreview(index, fileItem);
       },
       onDelete: () => __awaiter(void 0, void 0, void 0, function* () {
         var _c;

package/es/components/image-viewer/image-viewer.css

@@ -10,6 +10,7 @@
   position: relative;
   z-index: 1;
   cursor: grab;
+  touch-action: none;
 }
 .adm-image-viewer-slides-inner {
   height: 100%;
@@ -32,6 +33,7 @@
   width: 100%;
   height: 100%;
   cursor: grab;
+  touch-action: none;
 }
 .adm-image-viewer-image-wrapper {
   width: 100%;