antd-mobile 5.0.0-rc.9 → 5.2.0

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

@@ -20,10 +20,25 @@
 
 .adm-dialog-main {
   width: 100%;
+  max-height: 70vh;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.adm-dialog-main > * {
+  flex: none;
+}
+
+.adm-dialog-main > .adm-dialog-image-container {
+  flex: auto;
+}
+
+.adm-dialog-main > .adm-dialog-image-container + .adm-dialog-body {
+  padding-top: 24px;
 }
 
 .adm-dialog-main .adm-dialog-body {
@@ -79,4 +94,8 @@
 
 .adm-dialog-main .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button:last-child {
   border-right: none;
+}
+
+.adm-dialog-image-container {
+  overflow-y: auto;
 }

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

@@ -1,35 +1,4 @@
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
+import { __awaiter } from "tslib";
 import React, { useState } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import classNames from 'classnames';
@@ -43,8 +12,8 @@ import { withStopPropagation } from '../../utils/with-stop-propagation';
 import AutoCenter from '../auto-center';
 import { useSpring, animated } from '@react-spring/web';
 import { withNativeProps } from '../../utils/native-props';
-var classPrefix = "adm-dialog";
-var defaultProps = {
+const classPrefix = `adm-dialog`;
+const defaultProps = {
   visible: false,
   actions: [],
   closeOnAction: false,
@@ -52,10 +21,10 @@ var defaultProps = {
   stopPropagation: ['click'],
   getContainer: null
 };
-export var Dialog = function Dialog(p) {
-  var props = mergeProps(defaultProps, p);
-  var unmountedRef = useUnmountedRef();
-  var style = useSpring({
+export const Dialog = p => {
+  const props = mergeProps(defaultProps, p);
+  const unmountedRef = useUnmountedRef();
+  const style = useSpring({
     scale: props.visible ? 1 : 0.8,
     opacity: props.visible ? 1 : 0,
     config: {
@@ -64,10 +33,10 @@ export var Dialog = function Dialog(p) {
       friction: 30,
       clamp: true
     },
-    onStart: function onStart() {
+    onStart: () => {
       setActive(true);
     },
-    onRest: function onRest() {
+    onRest: () => {
       var _a, _b;
 
       if (unmountedRef.current) return;
@@ -80,87 +49,66 @@ export var Dialog = function Dialog(p) {
       }
     }
   });
-
-  var _useState = useState(props.visible),
-      active = _useState[0],
-      setActive = _useState[1];
-
-  var node = withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+  const [active, setActive] = useState(props.visible);
+  const node = withNativeProps(props, React.createElement("div", {
     className: classPrefix,
     style: {
       display: active ? 'unset' : 'none'
     }
-  }, /*#__PURE__*/React.createElement(Mask, {
+  }, React.createElement(Mask, {
     visible: props.visible,
     onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
     style: props.maskStyle,
-    className: classNames(classPrefix + "-mask", props.maskClassName)
-  }), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-wrap",
+    className: classNames(`${classPrefix}-mask`, props.maskClassName)
+  }), React.createElement("div", {
+    className: `${classPrefix}-wrap`,
     style: {
       pointerEvents: props.visible ? 'unset' : 'none'
     }
-  }, /*#__PURE__*/React.createElement(animated.div, {
+  }, React.createElement(animated.div, {
     style: Object.assign({}, style),
-    onClick: function onClick(e) {
-      return e.stopPropagation();
-    },
-    className: classPrefix + "-main"
-  }, !!props.image && /*#__PURE__*/React.createElement(Image, {
+    onClick: e => e.stopPropagation(),
+    className: `${classPrefix}-main`
+  }, !!props.image && React.createElement("div", {
+    className: `${classPrefix}-image-container`
+  }, React.createElement(Image, {
     src: props.image,
     alt: 'dialog header image',
     width: '100%'
-  }), /*#__PURE__*/React.createElement("div", {
+  })), React.createElement("div", {
     style: props.bodyStyle,
-    className: classNames(classPrefix + "-body", props.bodyClassName)
-  }, /*#__PURE__*/React.createElement(Space, {
+    className: classNames(`${classPrefix}-body`, props.bodyClassName)
+  }, React.createElement(Space, {
     direction: 'vertical',
     block: true
-  }, !!props.header && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-body-header-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-body-header"
-  }, props.header)), !!props.title && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-body-title"
-  }, props.title), !!props.content && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-body-content"
-  }, typeof props.content === 'string' ? /*#__PURE__*/React.createElement(AutoCenter, null, props.content) : props.content))), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-footer"
-  }, props.actions.map(function (row, index) {
-    var actions = Array.isArray(row) ? row : [row];
-    return /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-action-row",
+  }, !!props.header && React.createElement("div", {
+    className: `${classPrefix}-body-header-wrapper`
+  }, React.createElement("div", {
+    className: `${classPrefix}-body-header`
+  }, props.header)), !!props.title && React.createElement("div", {
+    className: `${classPrefix}-body-title`
+  }, props.title), !!props.content && React.createElement("div", {
+    className: `${classPrefix}-body-content`
+  }, typeof props.content === 'string' ? React.createElement(AutoCenter, null, props.content) : props.content))), React.createElement("div", {
+    className: `${classPrefix}-footer`
+  }, props.actions.map((row, index) => {
+    const actions = Array.isArray(row) ? row : [row];
+    return React.createElement("div", {
+      className: `${classPrefix}-action-row`,
       key: index
-    }, actions.map(function (action, index) {
-      return /*#__PURE__*/React.createElement(DialogActionButton, {
-        key: action.key,
-        action: action,
-        onAction: function onAction() {
-          return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-            var _a, _b, _c;
-
-            return regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return Promise.all([(_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action), (_b = props.onAction) === null || _b === void 0 ? void 0 : _b.call(props, action, index)]);
+    }, actions.map((action, index) => React.createElement(DialogActionButton, {
+      key: action.key,
+      action: action,
+      onAction: () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c;
 
-                  case 2:
-                    if (props.closeOnAction) {
-                      (_c = props.onClose) === null || _c === void 0 ? void 0 : _c.call(props);
-                    }
+        yield Promise.all([(_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action), (_b = props.onAction) === null || _b === void 0 ? void 0 : _b.call(props, action, index)]);
 
-                  case 3:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
+        if (props.closeOnAction) {
+          (_c = props.onClose) === null || _c === void 0 ? void 0 : _c.call(props);
         }
-      });
-    }));
+      })
+    })));
   }))))));
   return renderToContainer(props.getContainer, withStopPropagation(props.stopPropagation, node));
 };

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

@@ -3,6 +3,7 @@ import './dialog.less';
 import { show } from './show';
 import { alert } from './alert';
 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';
@@ -12,5 +13,6 @@ declare const _default: import("react").FC<import("./dialog").DialogProps> & {
     show: typeof show;
     alert: typeof alert;
     confirm: typeof confirm;
+    clear: typeof clear;
 };
 export default _default;

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

@@ -2,10 +2,12 @@ import "./dialog.css";
 import { show } from './show';
 import { alert } from './alert';
 import { confirm } from './confirm';
+import { clear } from './clear';
 import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
 import { Dialog } from './dialog';
 export default attachPropertiesToComponent(Dialog, {
-  show: show,
-  alert: alert,
-  confirm: confirm
+  show,
+  alert,
+  confirm,
+  clear
 });

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

@@ -3,6 +3,7 @@ export declare type DialogShowProps = Omit<DialogProps, 'visible'>;
 export declare type DialogShowRef = {
     close: () => void;
 };
+export declare const closeFnSet: Set<() => void>;
 export declare function show(props: DialogShowProps): {
     close: () => void;
 };

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

@@ -1,13 +1,11 @@
 import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { renderToBody } from '../../utils/render-to-body';
 import { Dialog } from './dialog';
+export const closeFnSet = new Set();
 export function show(props) {
-  var Wrapper = /*#__PURE__*/forwardRef(function (_, ref) {
-    var _useState = useState(false),
-        visible = _useState[0],
-        setVisible = _useState[1];
-
-    useEffect(function () {
+  const Wrapper = forwardRef((_, ref) => {
+    const [visible, setVisible] = useState(false);
+    useEffect(() => {
       setVisible(true);
     }, []);
 
@@ -18,31 +16,37 @@ export function show(props) {
       setVisible(false);
     }
 
-    useImperativeHandle(ref, function () {
-      return {
-        close: handleClose
-      };
-    });
-    return /*#__PURE__*/React.createElement(Dialog, Object.assign({}, props, {
+    useImperativeHandle(ref, () => ({
+      close: handleClose
+    }));
+
+    function handleAfterClose() {
+      var _a;
+
+      (_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: function afterClose() {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
+      afterClose: handleAfterClose
     }));
   });
-  var ref = /*#__PURE__*/createRef();
-  var unmount = renderToBody( /*#__PURE__*/React.createElement(Wrapper, {
+  const ref = createRef();
+  const unmount = renderToBody(React.createElement(Wrapper, {
     ref: ref
   }));
-  return {
-    close: function close() {
-      var _a;
 
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
+  const close = () => {
+    var _a;
+
+    (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+  };
+
+  closeFnSet.add(close);
+  return {
+    close
   };
 }

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

@@ -2,15 +2,15 @@ import React from 'react';
 import classNames from 'classnames';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
-var classPrefix = "adm-divider";
-var defaultProps = {
+const classPrefix = `adm-divider`;
+const defaultProps = {
   contentPosition: 'center'
 };
-export var Divider = function Divider(p) {
-  var props = mergeProps(defaultProps, p);
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix, classPrefix + "-" + props.contentPosition)
-  }, props.children && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-content"
+export const Divider = p => {
+  const props = mergeProps(defaultProps, p);
+  return withNativeProps(props, React.createElement("div", {
+    className: classNames(classPrefix, `${classPrefix}-${props.contentPosition}`)
+  }, props.children && React.createElement("div", {
+    className: `${classPrefix}-content`
   }, props.children)));
 };

package/2x/es/components/{loading/loading.css → dot-loading/dot-loading.css}

@@ -1,3 +1,3 @@
-.adm-loading {
+.adm-dot-loading {
   display: inline-block;
 }

package/2x/es/components/{loading/loading.d.ts → dot-loading/dot-loading.d.ts}

@@ -1,6 +1,6 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
-export declare type LoadingProps = {
+export declare type DotLoadingProps = {
     color?: 'default' | 'primary' | 'white' | (string & {});
 } & NativeProps;
-export declare const Loading: React.NamedExoticComponent<LoadingProps>;
+export declare const DotLoading: React.NamedExoticComponent<DotLoadingProps>;

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

@@ -0,0 +1,59 @@
+import React, { memo } from 'react';
+import { mergeProps } from '../../utils/with-default-props';
+import { withNativeProps } from '../../utils/native-props';
+import classNames from 'classnames';
+const classPrefix = `adm-dot-loading`;
+const colorRecord = {
+  default: 'var(--adm-color-weak)',
+  primary: 'var(--adm-color-primary)',
+  white: 'var(--adm-color-white)'
+};
+const defaultProps = {
+  color: 'default'
+};
+export const DotLoading = memo(p => {
+  var _a;
+
+  const props = mergeProps(defaultProps, p);
+  return withNativeProps(props, React.createElement("div", {
+    style: {
+      color: (_a = colorRecord[props.color]) !== null && _a !== void 0 ? _a : props.color
+    },
+    className: classNames('adm-loading', classPrefix)
+  }, React.createElement("svg", {
+    height: '1em',
+    viewBox: '0 0 100 40',
+    style: {
+      verticalAlign: '-0.125em'
+    }
+  }, React.createElement("g", {
+    stroke: 'none',
+    strokeWidth: '1',
+    fill: 'none',
+    fillRule: 'evenodd'
+  }, React.createElement("g", {
+    transform: 'translate(-100.000000, -71.000000)'
+  }, React.createElement("g", {
+    transform: 'translate(95.000000, 71.000000)'
+  }, React.createElement("g", {
+    transform: 'translate(5.000000, 0.000000)'
+  }, [0, 1, 2].map(i => React.createElement("rect", {
+    key: i,
+    fill: 'currentColor',
+    x: 20 + i * 26,
+    y: '16',
+    width: '8',
+    height: '8',
+    rx: '2'
+  }, React.createElement("animate", {
+    attributeName: 'y',
+    from: '16',
+    to: '16',
+    dur: '2s',
+    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'
+  }))))))))));
+});

package/2x/es/components/dot-loading/index.d.ts

@@ -0,0 +1,4 @@
+import './dot-loading.less';
+import { DotLoading } from './dot-loading';
+export type { DotLoadingProps } from './dot-loading';
+export default DotLoading;

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

@@ -0,0 +1,3 @@
+import "./dot-loading.css";
+import { DotLoading } from './dot-loading';
+export default DotLoading;

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

@@ -35,14 +35,14 @@
 }
 
 .adm-dropdown-item .adm-dropdown-item-title-arrow {
-  font-size: 16px;
-  width: 16px;
-  transform: rotate(0deg) translate(0, -2px);
+  color: var(--adm-color-light);
+  font-size: 18px;
+  transform: rotate(0deg) translateY(-2px);
   transition: all ease 0.2s;
 }
 
 .adm-dropdown-item .adm-dropdown-item-title-arrow-active {
-  transform: rotate(180deg) translate(0, -2px);
+  transform: rotate(-180deg) translateY(-2px);
 }
 
 .adm-dropdown-item .adm-dropdown-item-title:active {
@@ -53,10 +53,6 @@
   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: -2px;
   transform: rotate(135deg);

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

@@ -4,6 +4,7 @@ export declare type DropdownProps = {
     activeKey?: string | null;
     defaultActiveKey?: string | null;
     closeOnMaskClick?: boolean;
+    closeOnClickAway?: boolean;
     onChange?: (key: string | null) => void;
     arrow?: React.ReactNode;
 } & NativeProps;
@@ -14,6 +15,7 @@ declare const Dropdown: React.ForwardRefExoticComponent<{
     activeKey?: string | null | undefined;
     defaultActiveKey?: string | null | undefined;
     closeOnMaskClick?: boolean | undefined;
+    closeOnClickAway?: boolean | undefined;
     onChange?: ((key: string | null) => void) | undefined;
     arrow?: React.ReactNode;
 } & NativeProps<never> & {

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

@@ -6,47 +6,40 @@ import { ItemChildrenWrap } from './item';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
-var classPrefix = "adm-dropdown";
-var defaultProps = {
+const classPrefix = `adm-dropdown`;
+const defaultProps = {
   defaultActiveKey: null,
-  closeOnMaskClick: true
+  closeOnMaskClick: true,
+  closeOnClickAway: false
 };
-var Dropdown = /*#__PURE__*/forwardRef(function (p, ref) {
-  var _classNames;
-
-  var props = mergeProps(defaultProps, p);
-
-  var _usePropsValue = usePropsValue({
+const Dropdown = forwardRef((p, ref) => {
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue({
     value: props.activeKey,
     defaultValue: props.defaultActiveKey,
     onChange: props.onChange
-  }),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
-
-  var navRef = useRef(null);
-  var contentRef = useRef(null); // 点击外部区域，关闭
+  });
+  const navRef = useRef(null);
+  const contentRef = useRef(null); // 点击外部区域，关闭
 
-  useClickAway(function () {
+  useClickAway(() => {
+    if (!props.closeOnClickAway) return;
     setValue(null);
   }, [navRef, contentRef]); // 计算 navs 的 top 值
 
-  var _useState = useState(),
-      top = _useState[0],
-      setTop = _useState[1];
-
-  var containerRef = useRef(null);
-  useEffect(function () {
-    var container = containerRef.current;
+  const [top, setTop] = useState();
+  const containerRef = useRef(null);
+  useEffect(() => {
+    const container = containerRef.current;
     if (!container) return;
 
     if (value) {
-      var rect = container.getBoundingClientRect();
+      const rect = container.getBoundingClientRect();
       setTop(rect.bottom);
     }
   }, [value]);
 
-  var changeActive = function changeActive(key) {
+  const changeActive = key => {
     if (value === key) {
       setValue(null);
     } else {
@@ -54,12 +47,12 @@ var Dropdown = /*#__PURE__*/forwardRef(function (p, ref) {
     }
   };
 
-  var popupForceRender = false;
-  var items = [];
-  var navs = React.Children.map(props.children, function (child) {
-    if ( /*#__PURE__*/React.isValidElement(child)) {
-      var childProps = Object.assign(Object.assign({}, child.props), {
-        onClick: function onClick() {
+  let popupForceRender = false;
+  const items = [];
+  const navs = React.Children.map(props.children, child => {
+    if (React.isValidElement(child)) {
+      const childProps = Object.assign(Object.assign({}, child.props), {
+        onClick: () => {
           changeActive(child.key);
         },
         active: child.key === value,
@@ -67,42 +60,42 @@ var Dropdown = /*#__PURE__*/forwardRef(function (p, ref) {
       });
       items.push(child);
       if (child.props.forceRender) popupForceRender = true;
-      return /*#__PURE__*/cloneElement(child, childProps);
+      return cloneElement(child, childProps);
     } else {
       return child;
     }
   });
-  useImperativeHandle(ref, function () {
-    return {
-      close: function close() {
-        setValue(null);
-      }
-    };
-  }, [setValue]);
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-open"] = !!value, _classNames)),
+  useImperativeHandle(ref, () => ({
+    close: () => {
+      setValue(null);
+    }
+  }), [setValue]);
+  return withNativeProps(props, React.createElement("div", {
+    className: classNames(classPrefix, {
+      [`${classPrefix}-open`]: !!value
+    }),
     ref: containerRef
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-nav",
+  }, React.createElement("div", {
+    className: `${classPrefix}-nav`,
     ref: navRef
-  }, navs), /*#__PURE__*/React.createElement(Popup, {
+  }, navs), React.createElement(Popup, {
     visible: !!value,
     position: 'top',
-    className: classPrefix + "-popup",
-    maskClassName: classPrefix + "-popup-mask",
-    bodyClassName: classPrefix + "-popup-body",
+    className: `${classPrefix}-popup`,
+    maskClassName: `${classPrefix}-popup-mask`,
+    bodyClassName: `${classPrefix}-popup-body`,
     style: {
-      top: top
+      top
     },
     forceRender: popupForceRender,
-    onMaskClick: props.closeOnMaskClick ? function () {
+    onMaskClick: props.closeOnMaskClick ? () => {
       changeActive(null);
     } : undefined
-  }, /*#__PURE__*/React.createElement("div", {
+  }, React.createElement("div", {
     ref: contentRef
-  }, items.map(function (item) {
-    var isActive = item.key === value;
-    return /*#__PURE__*/React.createElement(ItemChildrenWrap, {
+  }, items.map(item => {
+    const isActive = item.key === value;
+    return React.createElement(ItemChildrenWrap, {
       key: item.key,
       active: isActive,
       forceRender: item.props.forceRender,