antd-mobile 5.5.1 → 5.7.0

package/2x/es/components/action-sheet/action-sheet.js

@@ -1,11 +1,11 @@
-import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import classNames from 'classnames';
 import Popup from '../popup';
 import Button from '../button';
-import { renderToBody } from '../../utils/render-to-body';
 import SafeArea from '../safe-area';
+import { renderImperatively } from '../../utils/render-imperatively';
 const classPrefix = `adm-action-sheet`;
 const defaultProps = {
   visible: false,
@@ -29,7 +29,8 @@ export const ActionSheet = p => {
       }
     },
     afterClose: props.afterClose,
-    className: `${classPrefix}-popup`,
+    className: classNames(`${classPrefix}-popup`, props.popupClassName),
+    style: props.popupStyle,
     getContainer: props.getContainer
   }, withNativeProps(props, React.createElement("div", {
     className: classPrefix
@@ -83,42 +84,5 @@ export const ActionSheet = p => {
   }))));
 };
 export function showActionSheet(props) {
-  const Wrapper = forwardRef((_, ref) => {
-    const [visible, setVisible] = useState(false);
-    useEffect(() => {
-      setVisible(true);
-    }, []);
-
-    function handleClose() {
-      var _a;
-
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      setVisible(false);
-    }
-
-    useImperativeHandle(ref, () => ({
-      close: handleClose
-    }));
-    return React.createElement(ActionSheet, Object.assign({}, props, {
-      visible: visible,
-      onClose: handleClose,
-      afterClose: () => {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  const ref = createRef();
-  const unmount = renderToBody(React.createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: () => {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
+  return renderImperatively(React.createElement(ActionSheet, Object.assign({}, props)));
 }

package/2x/es/components/action-sheet/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import './action-sheet.less';
 import { showActionSheet } from './action-sheet';
-export type { Action, ActionSheetProps, ActionSheetRef } from './action-sheet';
+export type { Action, ActionSheetProps, ActionSheetShowHandler, } from './action-sheet';
 declare const _default: import("react").FC<import("./action-sheet").ActionSheetProps> & {
     show: typeof showActionSheet;
 };

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

@@ -11,7 +11,7 @@ export const Badge = props => {
   } = props;
   const isDot = content === dot;
   const badgeCls = classNames(classPrefix, !!children && `${classPrefix}-fixed`, isDot && `${classPrefix}-dot`, props.bordered && `${classPrefix}-bordered`);
-  const element = content ? withNativeProps(props, React.createElement("div", {
+  const element = content || content === 0 ? withNativeProps(props, React.createElement("div", {
     className: badgeCls,
     style: {
       '--color': color

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

@@ -9,9 +9,10 @@ export declare type CalenderRef = {
     jumpToToday: () => void;
 };
 export declare type CalendarProps = {
+    onPageChange?: (year: number, month: number) => void;
     weekStartsOn?: 'Monday' | 'Sunday';
     renderLabel?: (date: Date) => string | null | undefined;
-    onPageChange?: (year: number, month: number) => void;
+    allowClear?: boolean;
 } & ({
     selectionMode?: undefined;
     value?: undefined;
@@ -21,12 +22,12 @@ export declare type CalendarProps = {
     selectionMode: 'single';
     value?: Date | null;
     defaultValue?: Date | null;
-    onChange?: (val: Date) => void;
+    onChange?: (val: Date | null) => void;
 } | {
     selectionMode: 'range';
     value?: [Date, Date] | null;
     defaultValue?: [Date, Date] | null;
-    onChange?: (val: [Date, Date]) => void;
+    onChange?: (val: [Date, Date] | null) => void;
 }) & NativeProps;
 export declare const Calendar: React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<CalenderRef>>;
 export {};

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

@@ -1,4 +1,4 @@
-import React, { forwardRef, useMemo, useState, useImperativeHandle } from 'react';
+import React, { forwardRef, useState, useImperativeHandle } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import dayjs from 'dayjs';
 import classNames from 'classnames';
@@ -7,11 +7,15 @@ 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';
+import { useUpdateEffect } from 'ahooks';
+import { usePropsValue } from '../../utils/use-props-value';
+import { convertValueToRange } from './convert';
 dayjs.extend(isoWeek);
 const classPrefix = 'adm-calendar';
 const defaultProps = {
-  weekStartsOn: 'Sunday'
+  weekStartsOn: 'Sunday',
+  defaultValue: null,
+  allowClear: true
 };
 export const Calendar = forwardRef((p, ref) => {
   const today = dayjs();
@@ -26,29 +30,21 @@ export const Calendar = forwardRef((p, ref) => {
     if (item) markItems.unshift(item);
   }
 
-  const dateRange = useMemo(() => {
-    var _a, _b, _c, _d;
+  const [dateRange, setDateRange] = usePropsValue({
+    value: props.value === undefined ? undefined : convertValueToRange(props.selectionMode, props.value),
+    defaultValue: convertValueToRange(props.selectionMode, props.defaultValue),
+    onChange: v => {
+      var _a, _b;
 
-    if (props.selectionMode === 'single') {
-      const value = (_b = (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null;
-      return [value, value];
-    } else if (props.selectionMode === 'range') {
-      return (_d = (_c = props.value) !== null && _c !== void 0 ? _c : props.defaultValue) !== null && _d !== void 0 ? _d : [null, null];
-    } else {
-      return [null, null];
+      if (props.selectionMode === 'single') {
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v ? v[0] : null);
+      } else if (props.selectionMode === 'range') {
+        (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, v);
+      }
     }
-  }, [props.selectionMode, props.value, props.defaultValue]);
-  const [begin, setBegin] = useState(null);
-  const [end, setEnd] = useState(null);
-  useIsomorphicLayoutEffect(() => {
-    setBegin(dateRange[0] ? dayjs(dateRange[0]) : null);
-    setEnd(dateRange[1] ? dayjs(dateRange[1]) : null);
-  }, [dateRange[0], dateRange[1]]);
-  const [current, setCurrent] = useState(() => {
-    var _a;
-
-    return dayjs((_a = dateRange[0]) !== null && _a !== void 0 ? _a : today).date(1);
   });
+  const [intermediate, setIntermediate] = useState(false);
+  const [current, setCurrent] = useState(() => dayjs(dateRange ? dateRange[0] : today).date(1));
   useUpdateEffect(() => {
     var _a;
 
@@ -111,14 +107,16 @@ export const Calendar = forwardRef((p, ref) => {
 
     while (cells.length < 6 * 7) {
       const d = iterator;
-
-      const isSelect = (() => {
-        if (!begin) return false;
-        if (d.isSame(begin, 'day')) return true;
-        if (!end) return false;
-        if (d.isSame(end, 'day')) return true;
-        return d.isAfter(begin, 'day') && d.isBefore(end, 'day');
-      })();
+      let isSelect = false;
+      let isBegin = false;
+      let isEnd = false;
+
+      if (dateRange) {
+        const [begin, end] = dateRange;
+        isBegin = d.isSame(begin, 'day');
+        isEnd = d.isSame(end, 'day');
+        isSelect = isBegin || isEnd || d.isAfter(begin, 'day') && d.isBefore(end, 'day');
+      }
 
       const inThisMonth = d.month() === current.month();
       cells.push(React.createElement("div", {
@@ -126,41 +124,52 @@ export const Calendar = forwardRef((p, ref) => {
         className: classNames(`${classPrefix}-cell`, inThisMonth ? `${classPrefix}-cell-in` : `${classPrefix}-cell-out`, inThisMonth && {
           [`${classPrefix}-cell-today`]: d.isSame(today, 'day'),
           [`${classPrefix}-cell-selected`]: isSelect,
-          [`${classPrefix}-cell-selected-begin`]: isSelect && d.isSame(begin, 'day'),
-          [`${classPrefix}-cell-selected-end`]: isSelect && (!end || d.isSame(end, 'day'))
+          [`${classPrefix}-cell-selected-begin`]: isBegin,
+          [`${classPrefix}-cell-selected-end`]: isEnd
         }),
         onClick: () => {
-          var _a, _b, _c;
-
           if (!props.selectionMode) return;
+          const date = d.toDate();
+
+          if (!inThisMonth) {
+            setCurrent(d.clone().date(1));
+          }
+
+          function shouldClear() {
+            if (!props.allowClear) return false;
+            if (!dateRange) return false;
+            const [begin, end] = dateRange;
+            return d.isSame(begin, 'date') && d.isSame(end, 'day');
+          }
 
           if (props.selectionMode === 'single') {
-            setBegin(d);
-            setEnd(d);
-            (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, d.toDate());
+            if (props.allowClear && shouldClear()) {
+              setDateRange(null);
+              return;
+            }
+
+            setDateRange([date, date]);
           } else if (props.selectionMode === 'range') {
-            if (begin !== null && end === null) {
-              if (begin.isSame(d.toDate())) {
-                setBegin(null);
-                setEnd(null);
-              } else {
-                if (d.isBefore(begin)) {
-                  setEnd(begin);
-                  setBegin(d);
-                  (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, [d.toDate(), begin.toDate()]);
-                } else {
-                  setEnd(d);
-                  (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, [begin.toDate(), d.toDate()]);
-                }
-              }
-            } else {
-              setBegin(d);
-              setEnd(null);
+            if (!dateRange) {
+              setDateRange([date, date]);
+              setIntermediate(true);
+              return;
             }
-          }
 
-          if (!inThisMonth) {
-            setCurrent(d.clone().date(1));
+            if (shouldClear()) {
+              setDateRange(null);
+              setIntermediate(false);
+              return;
+            }
+
+            if (intermediate) {
+              const another = dateRange[0];
+              setDateRange(another > date ? [date, another] : [another, date]);
+              setIntermediate(false);
+            } else {
+              setDateRange([date, date]);
+              setIntermediate(true);
+            }
           }
         }
       }, React.createElement("div", {

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

@@ -0,0 +1,2 @@
+export declare type DateRange = [Date, Date] | null;
+export declare function convertValueToRange(selectionMode: 'single' | 'range' | undefined, value: Date | [Date, Date] | null): DateRange;

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

@@ -0,0 +1,15 @@
+export function convertValueToRange(selectionMode, value) {
+  if (selectionMode === undefined) {
+    return null;
+  }
+
+  if (value === null) {
+    return null;
+  }
+
+  if (Array.isArray(value)) {
+    return value;
+  }
+
+  return [value, value];
+}

package/2x/es/components/cascader-view/cascader-view.js

@@ -61,6 +61,13 @@ export const CascaderView = p => {
   useEffect(() => {
     setTabActiveKey(levels.length - 1);
   }, [value]);
+  useEffect(() => {
+    const max = levels.length - 1;
+
+    if (tabActiveKey > max) {
+      setTabActiveKey(max);
+    }
+  }, [tabActiveKey, levels]);
 
   const onItemSelect = (selectValue, depth) => {
     const next = value.slice(0, depth);

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

@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useRef } from 'react';
+import React, { useContext } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import classNames from 'classnames';
 import { CheckboxGroupContext } from './group-context';
@@ -8,6 +8,7 @@ import { devWarning } from '../../utils/dev-log';
 import { CheckIcon } from './check-icon';
 import { IndeterminateIcon } from './indeterminate-icon';
 import { isDev } from '../../utils/is-dev';
+import { NativeInput } from './native-input';
 const classPrefix = `adm-checkbox`;
 const defaultProps = {
   defaultChecked: false,
@@ -66,35 +67,17 @@ export const Checkbox = p => {
     }, props.indeterminate ? React.createElement(IndeterminateIcon, null) : checked && React.createElement(CheckIcon, null));
   };
 
-  const inputRef = useRef(null);
-  const labelRef = useRef(null);
-  useEffect(() => {
-    var _a;
-
-    (_a = labelRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('click', e => {
-      if (e.target !== inputRef.current) {
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-      }
-    }, {
-      capture: false
-    });
-  }, []);
   return withNativeProps(props, React.createElement("label", {
-    ref: labelRef,
     className: classNames(classPrefix, {
       [`${classPrefix}-checked`]: checked && !props.indeterminate,
       [`${classPrefix}-indeterminate`]: props.indeterminate,
       [`${classPrefix}-disabled`]: disabled,
       [`${classPrefix}-block`]: props.block
     })
-  }, React.createElement("input", {
-    ref: inputRef,
+  }, React.createElement(NativeInput, {
     type: 'checkbox',
     checked: checked,
-    onChange: e => {
-      setChecked(e.target.checked);
-    },
+    onChange: setChecked,
     disabled: disabled,
     id: props.id
   }), renderIcon(), props.children && React.createElement("div", {

package/2x/es/components/checkbox/native-input.d.ts

@@ -0,0 +1,10 @@
+import { FC } from 'react';
+interface Props {
+    type: 'checkbox' | 'radio';
+    checked: boolean;
+    onChange: (checked: boolean) => void;
+    disabled?: boolean;
+    id?: string;
+}
+export declare const NativeInput: FC<Props>;
+export {};

package/2x/es/components/checkbox/native-input.js

@@ -0,0 +1,28 @@
+import React, { useEffect, useRef } from 'react';
+export const NativeInput = props => {
+  const inputRef = useRef(null);
+  useEffect(() => {
+    if (props.disabled) return;
+    if (!inputRef.current) return;
+    const input = inputRef.current;
+
+    function handleClick(e) {
+      e.stopPropagation();
+      e.stopImmediatePropagation();
+      props.onChange(input.checked);
+    }
+
+    input.addEventListener('click', handleClick);
+    return () => {
+      input.removeEventListener('click', handleClick);
+    };
+  }, [props.disabled, props.onChange]);
+  return React.createElement("input", {
+    ref: inputRef,
+    type: 'checkbox',
+    checked: props.checked,
+    onChange: () => {},
+    disabled: props.disabled,
+    id: props.id
+  });
+};

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

@@ -6,7 +6,7 @@ import { confirm } from './confirm';
 import { clear } from './clear';
 export type { DialogProps } from './dialog';
 export type { Action } from './dialog-action-button';
-export type { DialogShowProps, DialogShowRef } from './show';
+export type { DialogShowProps, DialogShowHandler } from './show';
 export type { DialogAlertProps } from './alert';
 export type { DialogConfirmProps } from './confirm';
 declare const _default: import("react").FC<import("./dialog").DialogProps> & {

package/2x/es/components/dialog/show.d.ts

@@ -1,9 +1,7 @@
 import { DialogProps } from './dialog';
 export declare type DialogShowProps = Omit<DialogProps, 'visible'>;
-export declare type DialogShowRef = {
+export declare type DialogShowHandler = {
     close: () => void;
 };
 export declare const closeFnSet: Set<() => void>;
-export declare function show(props: DialogShowProps): {
-    close: () => void;
-};
+export declare function show(props: DialogShowProps): DialogShowHandler;

package/2x/es/components/dialog/show.js

@@ -1,52 +1,16 @@
-import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
-import { renderToBody } from '../../utils/render-to-body';
+import React from 'react';
 import { Dialog } from './dialog';
+import { renderImperatively } from '../../utils/render-imperatively';
 export const closeFnSet = new Set();
 export function show(props) {
-  const Wrapper = forwardRef((_, ref) => {
-    const [visible, setVisible] = useState(false);
-    useEffect(() => {
-      setVisible(true);
-    }, []);
-
-    function handleClose() {
-      var _a;
-
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      setVisible(false);
-    }
-
-    useImperativeHandle(ref, () => ({
-      close: handleClose
-    }));
-
-    function handleAfterClose() {
+  const handler = renderImperatively(React.createElement(Dialog, Object.assign({}, props, {
+    afterClose: () => {
       var _a;
 
+      closeFnSet.delete(handler.close);
       (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      unmount();
-      closeFnSet.delete(close);
     }
-
-    return React.createElement(Dialog, Object.assign({}, props, {
-      visible: visible,
-      onClose: handleClose,
-      afterClose: handleAfterClose
-    }));
-  });
-  const ref = createRef();
-  const unmount = renderToBody(React.createElement(Wrapper, {
-    ref: ref
-  }));
-
-  const close = () => {
-    var _a;
-
-    (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-  };
-
-  closeFnSet.add(close);
-  return {
-    close
-  };
+  })));
+  closeFnSet.add(handler.close);
+  return handler;
 }

package/2x/es/components/dot-loading/dot-loading.js

@@ -53,7 +53,6 @@ export const DotLoading = memo(p => {
     begin: `${i * 0.2}s`,
     repeatCount: 'indefinite',
     values: '16; 6; 26; 16; 16',
-    keyTimes: '0; 0.1; 0.3; 0.4; 1',
-    id: 'circ-anim'
+    keyTimes: '0; 0.1; 0.3; 0.4; 1'
   }))))))))));
 });

package/2x/es/components/empty/empty-icon.d.ts

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare const EmptyIcon: FC<NativeProps>;

package/2x/es/components/empty/empty-icon.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import { withNativeProps } from '../../utils/native-props';
+export const EmptyIcon = props => {
+  return withNativeProps(props, React.createElement("svg", {
+    viewBox: '0 0 64 41'
+  }, React.createElement("g", {
+    transform: 'translate(0 1)',
+    fill: 'none',
+    fillRule: 'evenodd'
+  }, React.createElement("ellipse", {
+    fill: '#f5f5f5',
+    cx: '32',
+    cy: '33',
+    rx: '32',
+    ry: '7'
+  }), React.createElement("g", {
+    stroke: '#d9d9d9'
+  }, React.createElement("path", {
+    d: 'M55 12.76L44.854 1.258C44.367.474 43.656 0 42.907 0H21.093c-.749 0-1.46.474-1.947 1.257L9 12.761V22h46v-9.24z'
+  }), React.createElement("path", {
+    d: 'M41.613 15.931c0-1.605.994-2.93 2.227-2.931H55v18.137C55 33.26 53.68 35 52.05 35h-40.1C10.32 35 9 33.259 9 31.137V13h11.16c1.233 0 2.227 1.323 2.227 2.928v.022c0 1.605 1.005 2.901 2.237 2.901h14.752c1.232 0 2.237-1.308 2.237-2.913v-.007z',
+    fill: '#fafafa'
+  })))));
+};

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

@@ -1,25 +1,38 @@
 import React from 'react';
 import classNames from 'classnames';
-import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
-import EmptyIcon from '../../assets/empty-icon.svg';
+import { EmptyIcon } from './empty-icon';
 const classPrefix = `adm-empty`;
-const defaultProps = {
-  image: EmptyIcon
-};
-export const Empty = p => {
-  const props = mergeProps(defaultProps, p);
-  const imageNode = typeof props.image === 'string' ? React.createElement("img", {
-    className: `${classPrefix}-image`,
-    style: props.imageStyle,
-    src: props.image,
-    alt: 'empty'
-  }) : props.image;
+export const Empty = props => {
+  function renderImageNode() {
+    const {
+      image
+    } = props;
+
+    if (image === undefined) {
+      return React.createElement(EmptyIcon, {
+        className: `${classPrefix}-image`,
+        style: props.imageStyle
+      });
+    }
+
+    if (typeof image === 'string') {
+      return React.createElement("img", {
+        className: `${classPrefix}-image`,
+        style: props.imageStyle,
+        src: image,
+        alt: 'empty'
+      });
+    }
+
+    return image;
+  }
+
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix
   }, React.createElement("div", {
     className: `${classPrefix}-image-container`
-  }, imageNode), props.description && React.createElement("div", {
+  }, renderImageNode()), props.description && React.createElement("div", {
     className: classNames(`${classPrefix}-description`)
   }, props.description)));
 };

package/2x/es/components/error-block/error-block.css

@@ -14,6 +14,7 @@
   max-width: 100%;
 }
 
+.adm-error-block-image svg,
 .adm-error-block-image img {
   height: 100%;
 }

package/2x/es/components/error-block/error-block.js

@@ -1,30 +1,28 @@
 import React from 'react';
 import classNames from 'classnames';
-import { iconRecord } from './error';
 import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
 import { useConfig } from '../config-provider';
+import { imageRecord } from './images';
 const classPrefix = `adm-error-block`;
 const defaultProps = {
   status: 'default'
 };
 export const ErrorBlock = p => {
   const props = mergeProps(defaultProps, p);
-  const icon = iconRecord[props.status];
   const {
     locale
   } = useConfig();
   const contentPack = locale.ErrorBlock[props.status];
   const des = 'description' in props ? props.description : contentPack.description;
   const title = 'title' in props ? props.title : contentPack.title;
-  let imageNode = React.createElement("img", {
-    src: icon
-  });
+  let imageNode = imageRecord[props.status];
 
   if (props.image) {
     if (typeof props.image === 'string') {
       imageNode = React.createElement("img", {
-        src: props.image
+        src: props.image,
+        alt: 'error block image'
       });
     } else {
       imageNode = props.image;

package/2x/es/components/error-block/images/busy.d.ts

@@ -0,0 +1 @@
+export declare const busyImage: JSX.Element;