antd-mobile 5.10.4 → 5.11.0

package/2x/es/components/button/button.js

@@ -1,32 +1,56 @@
-import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import { __awaiter } from "tslib";
+import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import classNames from 'classnames';
 import DotLoading from '../dot-loading';
 import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
+import { isPromise } from '../../utils/validate';
 const classPrefix = `adm-button`;
 const defaultProps = {
   color: 'default',
   fill: 'solid',
   block: false,
   loading: false,
+  loadingIcon: React.createElement(DotLoading, {
+    color: 'currentColor'
+  }),
   type: 'button',
   shape: 'default',
   size: 'middle'
 };
 export const Button = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
-  const disabled = props.disabled || props.loading;
+  const [innerLoading, setInnerLoading] = useState(false);
   const nativeButtonRef = useRef(null);
+  const loading = props.loading === 'auto' ? innerLoading : props.loading;
+  const disabled = props.disabled || loading;
   useImperativeHandle(ref, () => ({
     get nativeElement() {
       return nativeButtonRef.current;
     }
 
   }));
+
+  const handleClick = e => __awaiter(void 0, void 0, void 0, function* () {
+    if (!props.onClick) return;
+    const promise = props.onClick(e);
+
+    if (isPromise(promise)) {
+      try {
+        setInnerLoading(true);
+        yield promise;
+        setInnerLoading(false);
+      } catch (e) {
+        setInnerLoading(false);
+        throw e;
+      }
+    }
+  });
+
   return withNativeProps(props, React.createElement("button", {
     ref: nativeButtonRef,
     type: props.type,
-    onClick: props.onClick,
+    onClick: handleClick,
     className: classNames(classPrefix, props.color ? `${classPrefix}-${props.color}` : null, {
       [`${classPrefix}-block`]: props.block,
       [`${classPrefix}-disabled`]: disabled,
@@ -35,12 +59,10 @@ export const Button = forwardRef((p, ref) => {
       [`${classPrefix}-mini`]: props.size === 'mini',
       [`${classPrefix}-small`]: props.size === 'small',
       [`${classPrefix}-large`]: props.size === 'large',
-      [`${classPrefix}-loading`]: props.loading
+      [`${classPrefix}-loading`]: loading
     }, `${classPrefix}-shape-${props.shape}`),
     disabled: disabled
-  }, props.loading ? React.createElement("div", {
+  }, loading ? React.createElement("div", {
     className: `${classPrefix}-loading-wrapper`
-  }, React.createElement(DotLoading, {
-    color: 'currentColor'
-  }), props.loadingText) : props.children));
+  }, props.loadingIcon, props.loadingText) : props.children));
 });

package/2x/es/components/calendar/calendar.css

@@ -59,11 +59,11 @@
   color: var(--adm-color-primary);
 }
 
-.adm-calendar-cell.adm-calendar-cell-out {
+.adm-calendar-cell.adm-calendar-cell-disabled {
   color: var(--adm-color-light);
 }
 
-.adm-calendar-cell.adm-calendar-cell-out .adm-calendar-cell-bottom {
+.adm-calendar-cell.adm-calendar-cell-disabled .adm-calendar-cell-bottom {
   color: var(--adm-color-light);
 }
 

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

@@ -13,6 +13,8 @@ export declare type CalendarProps = {
     weekStartsOn?: 'Monday' | 'Sunday';
     renderLabel?: (date: Date) => string | null | undefined;
     allowClear?: boolean;
+    max?: Date;
+    min?: Date;
 } & ({
     selectionMode?: undefined;
     value?: undefined;

package/2x/es/components/calendar/calendar.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useState, useImperativeHandle } from 'react';
+import React, { forwardRef, useState, useImperativeHandle, useMemo } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import dayjs from 'dayjs';
 import classNames from 'classnames';
@@ -94,6 +94,8 @@ export const Calendar = forwardRef((p, ref) => {
       setCurrent(current.add(1, 'year'));
     }
   }, React.createElement(ArrowLeftDouble, null)));
+  const maxDay = useMemo(() => props.max && dayjs(props.max), [props.max]);
+  const minDay = useMemo(() => props.min && dayjs(props.min), [props.min]);
 
   function renderCells() {
     var _a;
@@ -119,9 +121,10 @@ export const Calendar = forwardRef((p, ref) => {
       }
 
       const inThisMonth = d.month() === current.month();
+      const disabled = !inThisMonth || maxDay && d.isAfter(maxDay, 'day') || minDay && d.isBefore(minDay, 'day');
       cells.push(React.createElement("div", {
         key: d.valueOf(),
-        className: classNames(`${classPrefix}-cell`, inThisMonth ? `${classPrefix}-cell-in` : `${classPrefix}-cell-out`, inThisMonth && {
+        className: classNames(`${classPrefix}-cell`, disabled && `${classPrefix}-cell-disabled`, inThisMonth && {
           [`${classPrefix}-cell-today`]: d.isSame(today, 'day'),
           [`${classPrefix}-cell-selected`]: isSelect,
           [`${classPrefix}-cell-selected-begin`]: isBegin,
@@ -129,6 +132,7 @@ export const Calendar = forwardRef((p, ref) => {
         }),
         onClick: () => {
           if (!props.selectionMode) return;
+          if (disabled) return;
           const date = d.toDate();
 
           if (!inThisMonth) {

package/2x/es/components/date-picker/date-picker.js

@@ -47,6 +47,7 @@ export const DatePicker = p => {
     value: pickerValue,
     onCancel: props.onCancel,
     onClose: props.onClose,
+    closeOnMaskClick: props.closeOnMaskClick,
     visible: props.visible,
     confirmText: props.confirmText,
     cancelText: props.cancelText,

package/2x/es/components/dialog/dialog-action-button.js

@@ -1,5 +1,4 @@
-import { __awaiter } from "tslib";
-import React, { useState } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import Button from '../button';
 import { withNativeProps } from '../../utils/native-props';
@@ -7,26 +6,9 @@ export const DialogActionButton = props => {
   const {
     action
   } = props;
-  const [loading, setLoading] = useState(false);
-
-  function handleClick() {
-    return __awaiter(this, void 0, void 0, function* () {
-      setLoading(true);
-
-      try {
-        const promise = props.onAction();
-        yield promise;
-        setLoading(false);
-      } catch (e) {
-        setLoading(false);
-        throw e;
-      }
-    });
-  }
-
   return withNativeProps(props.action, React.createElement(Button, {
     key: action.key,
-    onClick: handleClick,
+    onClick: props.onAction,
     className: classNames('adm-dialog-button', {
       'adm-dialog-button-bold': action.bold
     }),
@@ -34,7 +16,7 @@ export const DialogActionButton = props => {
     shape: 'rectangular',
     block: true,
     color: action.danger ? 'danger' : 'primary',
-    loading: loading,
+    loading: 'auto',
     disabled: action.disabled
   }, action.text));
 };

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

@@ -37,7 +37,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
       tension: 300
     },
     onChange: result => {
-      onHeightChange(result.value.y, y.isAnimating);
+      onHeightChange(-result.value.y, y.isAnimating);
     }
   }));
   useDrag(state => {

package/2x/es/components/form/context.d.ts

@@ -6,6 +6,7 @@ export declare type FormContextType = {
     hasFeedback: boolean;
     layout: FormLayout;
     requiredMarkStyle: 'asterisk' | 'text-required' | 'text-optional';
+    disabled: boolean;
 };
 export declare const defaultFormContext: FormContextType;
 export declare const FormContext: React.Context<FormContextType>;

package/2x/es/components/form/context.js

@@ -3,7 +3,8 @@ export const defaultFormContext = {
   name: undefined,
   hasFeedback: true,
   layout: 'vertical',
-  requiredMarkStyle: 'asterisk'
+  requiredMarkStyle: 'asterisk',
+  disabled: false
 };
 export const FormContext = React.createContext(defaultFormContext);
 export const NoStyleItemContext = React.createContext(null);

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

@@ -66,7 +66,7 @@
 
 .adm-form-item.adm-form-item-horizontal.adm-list-item {
   --align-items: stretch;
-  --prefix-width: 6em;
+  --prefix-width: 6.8em;
 }
 
 .adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {

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

@@ -18,6 +18,8 @@ const MemoInput = React.memo(({
 }) => children, (prev, next) => prev.value === next.value && prev.update === next.update);
 
 const FormItemLayout = props => {
+  var _a;
+
   const {
     className,
     style,
@@ -25,7 +27,6 @@ const FormItemLayout = props => {
     label,
     help,
     required,
-    disabled,
     children,
     htmlFor,
     hidden,
@@ -38,6 +39,7 @@ const FormItemLayout = props => {
   } = useConfig();
   const hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   const layout = props.layout || context.layout;
+  const disabled = (_a = props.disabled) !== null && _a !== void 0 ? _a : context.disabled;
 
   const requiredMark = (() => {
     const {

package/2x/es/components/form/form.d.ts

@@ -3,15 +3,12 @@ import { NativeProps } from '../../utils/native-props';
 import { ListProps } from '../list';
 import type { FormProps as RcFormProps, FormInstance as RCFormInstance } from 'rc-field-form';
 import { FormContextType } from './context';
-import type { FormLayout } from '.';
 export declare type FormInstance = Pick<RCFormInstance, 'getFieldValue' | 'getFieldsValue' | 'getFieldError' | 'getFieldsError' | 'isFieldTouched' | 'isFieldsTouched' | 'resetFields' | 'setFields' | 'setFieldsValue' | 'submit' | 'validateFields'>;
 export declare type FormProps = Pick<RcFormProps, 'form' | 'initialValues' | 'name' | 'preserve' | 'validateMessages' | 'validateTrigger' | 'onFieldsChange' | 'onFinish' | 'onFinishFailed' | 'onValuesChange' | 'children'> & NativeProps<'--border-inner' | '--border-top' | '--border-bottom'> & Partial<FormContextType> & {
     footer?: ReactNode;
-    layout?: FormLayout;
     mode?: ListProps['mode'];
 };
 export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<FormContextType> & {
     footer?: ReactNode;
-    layout?: FormLayout | undefined;
     mode?: ListProps['mode'];
 } & React.RefAttributes<FormInstance>>;

package/2x/es/components/form/form.js

@@ -23,9 +23,10 @@ export const Form = forwardRef((p, ref) => {
     layout,
     footer,
     mode,
+    disabled,
     requiredMarkStyle
   } = props,
-        formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "requiredMarkStyle"]);
+        formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "disabled", "requiredMarkStyle"]);
 
   const {
     locale
@@ -76,7 +77,8 @@ export const Form = forwardRef((p, ref) => {
       name: formProps.name,
       hasFeedback,
       layout,
-      requiredMarkStyle
+      requiredMarkStyle,
+      disabled: disabled
     }
   }, lists), footer && React.createElement("div", {
     className: `${classPrefix}-footer`

package/2x/es/components/form/index.css

@@ -92,7 +92,7 @@
 
 .adm-form-item.adm-form-item-horizontal.adm-list-item {
   --align-items: stretch;
-  --prefix-width: 6em;
+  --prefix-width: 6.8em;
 }
 
 .adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {

package/2x/es/components/form/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import './index.less';
-import { useForm } from 'rc-field-form';
+import { useWatch, useForm } from 'rc-field-form';
 export declare type FormLayout = 'vertical' | 'horizontal';
 export type { FormProps, FormInstance } from './form';
 export type { FormItemProps } from './form-item';
@@ -9,7 +9,6 @@ export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/in
 export type { FormArrayField, FormArrayOperation, FormArrayProps, } from './form-array';
 declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & import("../../utils/native-props").NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
-    layout?: FormLayout | undefined;
     mode?: "default" | "card" | undefined;
 } & import("react").RefAttributes<import("./form").FormInstance>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
@@ -19,5 +18,6 @@ declare const _default: import("react").ForwardRefExoticComponent<Pick<import("r
     }>;
     Array: import("react").FC<import("./form-array").FormArrayProps>;
     useForm: typeof useForm;
+    useWatch: typeof useWatch;
 };
 export default _default;

package/2x/es/components/form/index.js

@@ -3,7 +3,7 @@ import { Form } from './form';
 import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
 import { FormItem } from './form-item';
 import { Header } from './header';
-import { useForm } from 'rc-field-form';
+import { useWatch, useForm } from 'rc-field-form';
 import { FormSubscribe } from './form-subscribe';
 import { FormArray } from './form-array';
 export default attachPropertiesToComponent(Form, {
@@ -11,5 +11,6 @@ export default attachPropertiesToComponent(Form, {
   Subscribe: FormSubscribe,
   Header,
   Array: FormArray,
-  useForm
+  useForm,
+  useWatch
 });

package/2x/es/components/index-bar/panel.d.ts

@@ -4,5 +4,6 @@ export declare type IndexBarPanelProps = {
     index: string;
     title?: ReactNode;
     brief?: ReactNode;
+    children?: ReactNode;
 } & NativeProps;
 export declare const Panel: FC<IndexBarPanelProps>;

package/2x/es/components/input/input.css

@@ -68,6 +68,10 @@
   display: none;
 }
 
+.adm-input-element:disabled {
+  opacity: 1;
+}
+
 .adm-input-element[type='date'],
 .adm-input-element[type='time'],
 .adm-input-element[type='datetime-local'] {

package/2x/es/components/input/input.d.ts

@@ -9,6 +9,7 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     disabled?: boolean;
     readOnly?: boolean;
     clearable?: boolean;
+    onlyShowClearWhenFocus?: boolean;
     onClear?: () => void;
     id?: string;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
@@ -30,6 +31,7 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProp
     disabled?: boolean | undefined;
     readOnly?: boolean | undefined;
     clearable?: boolean | undefined;
+    onlyShowClearWhenFocus?: boolean | undefined;
     onClear?: (() => void) | undefined;
     id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;

package/2x/es/components/input/input.js

@@ -8,7 +8,8 @@ import { useIsomorphicLayoutEffect } from 'ahooks';
 import { bound } from '../../utils/bound';
 const classPrefix = `adm-input`;
 const defaultProps = {
-  defaultValue: ''
+  defaultValue: '',
+  onlyShowClearWhenFocus: true
 };
 export const Input = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
@@ -70,6 +71,16 @@ export const Input = forwardRef((p, ref) => {
     }
   }
 
+  const shouldShowClear = (() => {
+    if (!props.clearable || !value || props.readOnly) return false;
+
+    if (props.onlyShowClearWhenFocus) {
+      return hasFocus;
+    } else {
+      return true;
+    }
+  })();
+
   return withNativeProps(props, React.createElement("div", {
     className: classNames(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
   }, React.createElement("input", {
@@ -112,7 +123,7 @@ export const Input = forwardRef((p, ref) => {
     onCompositionStart: props.onCompositionStart,
     onCompositionEnd: props.onCompositionEnd,
     onClick: props.onClick
-  }), props.clearable && !!value && !props.readOnly && hasFocus && React.createElement("div", {
+  }), shouldShowClear && React.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();

package/2x/es/components/modal/modal-action-button.js

@@ -1,5 +1,4 @@
-import { __awaiter } from "tslib";
-import React, { useState } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import Button from '../button';
 import { withNativeProps } from '../../utils/native-props';
@@ -7,26 +6,9 @@ export const ModalActionButton = props => {
   const {
     action
   } = props;
-  const [loading, setLoading] = useState(false);
-
-  function handleClick() {
-    return __awaiter(this, void 0, void 0, function* () {
-      setLoading(true);
-
-      try {
-        const promise = props.onAction();
-        yield promise;
-        setLoading(false);
-      } catch (e) {
-        setLoading(false);
-        throw e;
-      }
-    });
-  }
-
   return withNativeProps(props.action, React.createElement(Button, {
     key: action.key,
-    onClick: handleClick,
+    onClick: props.onAction,
     className: classNames('adm-modal-button', {
       'adm-modal-button-primary': props.action.primary
     }),
@@ -34,7 +16,7 @@ export const ModalActionButton = props => {
     size: props.action.primary ? 'large' : 'middle',
     block: true,
     color: action.danger ? 'danger' : 'primary',
-    loading: loading,
+    loading: 'auto',
     disabled: action.disabled
   }, action.text));
 };

package/2x/es/components/search-bar/search-bar.d.ts

@@ -8,6 +8,7 @@ export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'on
     maxLength?: number;
     placeholder?: string;
     clearable?: boolean;
+    onlyShowClearWhenFocus?: boolean;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean);
     cancelText?: string;
     icon?: ReactNode;
@@ -22,6 +23,7 @@ export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps,
     maxLength?: number | undefined;
     placeholder?: string | undefined;
     clearable?: boolean | undefined;
+    onlyShowClearWhenFocus?: boolean | undefined;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean) | undefined;
     cancelText?: string | undefined;
     icon?: ReactNode;

package/2x/es/components/search-bar/search-bar.js

@@ -10,6 +10,7 @@ import { useConfig } from '../config-provider';
 const classPrefix = `adm-search-bar`;
 const defaultProps = {
   clearable: true,
+  onlyShowClearWhenFocus: false,
   showCancelButton: false,
   defaultValue: '',
   clearOnCancel: true,
@@ -101,6 +102,7 @@ export const SearchBar = forwardRef((p, ref) => {
     maxLength: props.maxLength,
     placeholder: props.placeholder,
     clearable: props.clearable,
+    onlyShowClearWhenFocus: props.onlyShowClearWhenFocus,
     onFocus: e => {
       var _a;
 

package/2x/es/components/swiper/index.d.ts

@@ -1,22 +1,7 @@
 /// <reference types="react" />
 import './swiper.less';
 export type { SwiperProps, SwiperRef } from './swiper';
-declare const _default: import("react").ForwardRefExoticComponent<{
-    defaultIndex?: number | undefined;
-    allowTouchMove?: boolean | undefined;
-    autoplay?: boolean | undefined;
-    autoplayInterval?: number | undefined;
-    loop?: boolean | undefined;
-    direction?: "vertical" | "horizontal" | undefined;
-    onIndexChange?: ((index: number) => void) | undefined;
-    indicatorProps?: Pick<import("../page-indicator").PageIndicatorProps, "style" | "className" | "color"> | undefined;
-    indicator?: ((total: number, current: number) => import("react").ReactNode) | undefined;
-    slideSize?: number | undefined;
-    trackOffset?: number | undefined;
-    stuckAtBoundary?: boolean | undefined;
-    rubberband?: boolean | undefined;
-    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
-} & import("../../utils/native-props").NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
+declare const _default: import("react").ForwardRefExoticComponent<import("react").RefAttributes<unknown>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
         children?: import("react").ReactNode;

package/2x/es/components/swiper/swiper.d.ts

@@ -22,19 +22,4 @@ export declare type SwiperProps = {
     rubberband?: boolean;
     children?: ReactElement | ReactElement[];
 } & NativeProps<'--height' | '--width' | '--border-radius' | '--track-padding'>;
-export declare const Swiper: React.ForwardRefExoticComponent<{
-    defaultIndex?: number | undefined;
-    allowTouchMove?: boolean | undefined;
-    autoplay?: boolean | undefined;
-    autoplayInterval?: number | undefined;
-    loop?: boolean | undefined;
-    direction?: "vertical" | "horizontal" | undefined;
-    onIndexChange?: ((index: number) => void) | undefined;
-    indicatorProps?: Pick<PageIndicatorProps, "style" | "className" | "color"> | undefined;
-    indicator?: ((total: number, current: number) => ReactNode) | undefined;
-    slideSize?: number | undefined;
-    trackOffset?: number | undefined;
-    stuckAtBoundary?: boolean | undefined;
-    rubberband?: boolean | undefined;
-    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
-} & NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & React.RefAttributes<SwiperRef>>;
+export declare const Swiper: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;

package/2x/es/global/index.js

@@ -2,5 +2,7 @@ import "./global.css";
 import { canUseDom } from '../utils/can-use-dom';
 
 if (canUseDom) {
+  // Make sure the `:active` CSS selector of `button` and `a` take effect
+  // See: https://stackoverflow.com/questions/3885018/active-pseudo-class-doesnt-work-in-mobile-safari
   document.addEventListener('touchstart', () => {}, true);
 }

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.10.4",
+  "version": "5.11.0",
   "dependencies": {
     "@floating-ui/dom": "^0.4.2",
     "@react-spring/web": "^9.4.4",
@@ -16,7 +16,7 @@
     "classnames": "^2.3.1",
     "dayjs": "^1.11.0",
     "lodash": "^4.17.21",
-    "rc-field-form": "^1.24.0",
+    "rc-field-form": "^1.26.2",
     "react-is": "^17.0.2",
     "staged-components": "^1.1.2",
     "tslib": "^2.3.1"