antd-mobile 5.0.0-rc.0 → 5.0.0-rc.4

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

@@ -0,0 +1,90 @@
+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 React, { useState } from 'react';
+import classNames from 'classnames';
+import Button from '../button';
+import { withNativeProps } from '../../utils/native-props';
+export var ModalActionButton = function ModalActionButton(props) {
+  var action = props.action;
+
+  var _useState = useState(false),
+      loading = _useState[0],
+      setLoading = _useState[1];
+
+  function handleClick() {
+    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var promise;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              setLoading(true);
+              _context.prev = 1;
+              promise = props.onAction();
+              _context.next = 5;
+              return promise;
+
+            case 5:
+              setLoading(false);
+              _context.next = 12;
+              break;
+
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](1);
+              setLoading(false);
+              throw _context.t0;
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[1, 8]]);
+    }));
+  }
+
+  return withNativeProps(props.action, /*#__PURE__*/React.createElement(Button, {
+    key: action.key,
+    onClick: handleClick,
+    className: classNames('adm-modal-button', {
+      'adm-modal-button-primary': props.action.primary
+    }),
+    fill: props.action.primary ? 'solid' : 'none',
+    size: props.action.primary ? 'large' : 'middle',
+    block: true,
+    color: action.danger ? 'danger' : 'primary',
+    loading: loading,
+    disabled: action.disabled
+  }, action.text));
+};

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

@@ -0,0 +1,89 @@
+.adm-modal {
+  --z-index: var(--adm-modal-z-index, 1000);
+  position: fixed;
+  z-index: var(--z-index);
+}
+
+.adm-modal .adm-modal-mask {
+  z-index: 0;
+}
+
+.adm-modal-wrap {
+  position: fixed;
+  z-index: 1;
+  top: 50%;
+  left: 50%;
+  width: auto;
+  min-width: 560px;
+  max-width: 75vw;
+  transform: translate(-50%, -50%);
+}
+
+.adm-modal-main {
+  width: 100%;
+  font-size: 28px;
+  background-color: white;
+  border-radius: 16px;
+  overflow: hidden;
+}
+
+.adm-modal-main .adm-modal-body {
+  padding: 40px 24px 24px;
+}
+
+.adm-modal-main .adm-modal-body .adm-modal-close {
+  position: absolute;
+  right: 24px;
+  top: 24px;
+  color: var(--adm-color-weak);
+  padding: 4px;
+}
+
+.adm-modal-main .adm-modal-body-header-wrapper {
+  display: flex;
+  justify-content: center;
+}
+
+.adm-modal-main .adm-modal-body-title {
+  font-weight: bold;
+  font-size: 36px;
+  line-height: 50px;
+  text-align: center;
+}
+
+.adm-modal-main .adm-modal-body-content {
+  max-height: 70vh;
+  overflow-x: hidden;
+  overflow-y: auto;
+  font-size: 30px;
+  line-height: 1.4;
+  color: #333;
+}
+
+.adm-modal-main .adm-modal-footer {
+  user-select: none;
+  padding: 16px 24px 24px;
+}
+
+.adm-modal-main .adm-modal-footer .adm-modal-button {
+  font-size: 36px;
+  line-height: 50px;
+  border-right: solid 1px var(--adm-border-color);
+}
+
+.adm-modal-main .adm-modal-footer .adm-modal-button:last-child {
+  border-right: none;
+}
+
+.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
+  display: none;
+}
+
+.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
+  opacity: 0.7;
+}

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

@@ -0,0 +1,26 @@
+import React, { FC, ReactNode } from 'react';
+import { Action } from './modal-action-button';
+import { GetContainer } from '../../utils/render-to-container';
+import { PropagationEvent } from '../../utils/with-stop-propagation';
+import { NativeProps } from '../../utils/native-props';
+export declare type ModalProps = {
+    afterClose?: () => void;
+    image?: string;
+    header?: ReactNode;
+    title?: ReactNode;
+    content?: ReactNode;
+    actions?: Action[];
+    onAction?: (action: Action, index: number) => void | Promise<void>;
+    closeOnAction?: boolean;
+    onClose?: () => void;
+    closeOnMaskClick?: boolean;
+    visible?: boolean;
+    getContainer?: GetContainer;
+    bodyStyle?: React.CSSProperties;
+    bodyClassName?: string;
+    maskStyle?: React.CSSProperties;
+    maskClassName?: string;
+    stopPropagation?: PropagationEvent[];
+    showCloseButton?: boolean;
+} & NativeProps;
+export declare const Modal: FC<ModalProps>;

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

@@ -0,0 +1,164 @@
+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 React, { useState } from 'react';
+import { mergeProps } from '../../utils/with-default-props';
+import classNames from 'classnames';
+import { useUnmountedRef } from 'ahooks';
+import Mask from '../mask';
+import { ModalActionButton } from './modal-action-button';
+import Image from '../image';
+import Space from '../space';
+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';
+import { CloseOutline } from 'antd-mobile-icons';
+var classPrefix = "adm-modal";
+var defaultProps = {
+  visible: false,
+  actions: [],
+  closeOnAction: false,
+  closeOnMaskClick: false,
+  stopPropagation: ['click'],
+  showCloseButton: false
+};
+export var Modal = function Modal(p) {
+  var props = mergeProps(defaultProps, p);
+  var unmountedRef = useUnmountedRef();
+  var style = useSpring({
+    scale: props.visible ? 1 : 0.8,
+    opacity: props.visible ? 1 : 0,
+    config: {
+      mass: 1,
+      tension: 200,
+      friction: 30,
+      clamp: true
+    },
+    onStart: function onStart() {
+      setActive(true);
+    },
+    onRest: function onRest() {
+      var _a;
+
+      if (unmountedRef.current) return;
+      setActive(props.visible);
+
+      if (!props.visible) {
+        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      }
+    }
+  });
+
+  var _useState = useState(props.visible),
+      active = _useState[0],
+      setActive = _useState[1];
+
+  return withStopPropagation(props.stopPropagation, withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix,
+    style: {
+      display: active ? 'unset' : 'none'
+    }
+  }, /*#__PURE__*/React.createElement(Mask, {
+    visible: props.visible,
+    getContainer: props.getContainer,
+    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
+    style: props.maskStyle,
+    className: classNames(classPrefix + "-mask", props.maskClassName)
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-wrap",
+    style: {
+      pointerEvents: props.visible ? 'unset' : 'none'
+    }
+  }, /*#__PURE__*/React.createElement(animated.div, {
+    style: Object.assign({}, style),
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    },
+    className: classPrefix + "-main"
+  }, !!props.image && /*#__PURE__*/React.createElement(Image, {
+    src: props.image,
+    alt: 'modal header image',
+    width: '100%'
+  }), /*#__PURE__*/React.createElement("div", {
+    style: props.bodyStyle,
+    className: classNames(classPrefix + "-body", props.bodyClassName)
+  }, props.showCloseButton && /*#__PURE__*/React.createElement("a", {
+    className: classNames(classPrefix + "-close", 'adm-plain-anchor'),
+    onClick: props.onClose
+  }, /*#__PURE__*/React.createElement(CloseOutline, null)), /*#__PURE__*/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"
+  }, /*#__PURE__*/React.createElement(Space, {
+    direction: 'vertical',
+    block: true
+  }, props.actions.map(function (action, index) {
+    return /*#__PURE__*/React.createElement(ModalActionButton, {
+      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)]);
+
+                case 2:
+                  if (props.closeOnAction) {
+                    (_c = props.onClose) === null || _c === void 0 ? void 0 : _c.call(props);
+                  }
+
+                case 3:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+      }
+    });
+  }))))))));
+};

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

@@ -0,0 +1,8 @@
+import { ModalProps } from './modal';
+export declare type ModalShowProps = Omit<ModalProps, 'visible'>;
+export declare type ModalShowRef = {
+    close: () => void;
+};
+export declare function show(props: ModalShowProps): {
+    close: () => void;
+};

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

@@ -0,0 +1,48 @@
+import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { renderToBody } from '../../utils/render-to-body';
+import { Modal } from './modal';
+export function show(props) {
+  var Wrapper = /*#__PURE__*/forwardRef(function (_, ref) {
+    var _useState = useState(false),
+        visible = _useState[0],
+        setVisible = _useState[1];
+
+    useEffect(function () {
+      setVisible(true);
+    }, []);
+
+    function handleClose() {
+      var _a;
+
+      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      setVisible(false);
+    }
+
+    useImperativeHandle(ref, function () {
+      return {
+        close: handleClose
+      };
+    });
+    return /*#__PURE__*/React.createElement(Modal, 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();
+      }
+    }));
+  });
+  var ref = /*#__PURE__*/createRef();
+  var unmount = renderToBody( /*#__PURE__*/React.createElement(Wrapper, {
+    ref: ref
+  }));
+  return {
+    close: function close() {
+      var _a;
+
+      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+    }
+  };
+}

package/2x/es/components/notice-bar/notice-bar.css

@@ -53,7 +53,7 @@
 }
 
 .adm-notice-bar .adm-notice-bar-content .adm-notice-bar-content-inner {
-  width: fit-content;
+  width: auto;
   transition-timing-function: linear;
   position: absolute;
   padding: 0 8px;

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

@@ -62,7 +62,6 @@ export var NoticeBar = /*#__PURE__*/memo(function (p) {
     start();
   }, containerRef);
   useMutationEffect(function () {
-    console.log('text mutation effect');
     start();
   }, textRef, {
     subtree: true,

package/2x/es/components/number-keyboard/number-keyboard.js

@@ -6,6 +6,7 @@ import { shuffle } from '../../utils/shuffle';
 import Popup from '../popup';
 import { withNativeProps } from '../../utils/native-props';
 import SafeArea from '../safe-area';
+import { usePersistFn } from 'ahooks';
 var classPrefix = 'adm-number-keyboard';
 var defaultProps = {
   defaultVisible: false,
@@ -24,8 +25,7 @@ export var NumberKeyboard = function NumberKeyboard(p) {
       customKey = props.customKey,
       randomOrder = props.randomOrder,
       showCloseButton = props.showCloseButton,
-      onInput = props.onInput,
-      onDelete = props.onDelete;
+      onInput = props.onInput;
   var keyboardRef = useRef(null);
   var keys = useMemo(function () {
     var defaultKeys = ['1', '2', '3', '4', '5', '6', '7', '8', '9'];
@@ -40,11 +40,33 @@ export var NumberKeyboard = function NumberKeyboard(p) {
     }
 
     return keyList;
-  }, [customKey, confirmText, randomOrder, randomOrder && visible]); // 点击键盘按键
+  }, [customKey, confirmText, randomOrder, randomOrder && visible]);
+  var timeoutRef = useRef(-1);
+  var intervalRef = useRef(-1);
+  var onDelete = usePersistFn(function () {
+    var _a;
 
-  var onKeyPress = function onKeyPress(key) {
+    (_a = props.onDelete) === null || _a === void 0 ? void 0 : _a.call(props);
+  });
+
+  var onBackspacePressStart = function onBackspacePressStart() {
+    timeoutRef.current = window.setTimeout(function () {
+      onDelete();
+      intervalRef.current = window.setInterval(onDelete, 150);
+    }, 700);
+  };
+
+  var onBackspacePressEnd = function onBackspacePressEnd() {
+    clearTimeout(timeoutRef.current);
+    clearInterval(intervalRef.current);
+  }; // 点击键盘按键
+
+
+  var onKeyPress = function onKeyPress(e, key) {
     var _a, _b;
 
+    e.preventDefault();
+
     switch (key) {
       case 'BACKSPACE':
         onDelete === null || onDelete === void 0 ? void 0 : onDelete();
@@ -60,7 +82,8 @@ export var NumberKeyboard = function NumberKeyboard(p) {
         break;
 
       default:
-        onInput === null || onInput === void 0 ? void 0 : onInput(key);
+        // 当 customKey 不存在时，点击该键不应该触发 onInput
+        if (key !== '') onInput === null || onInput === void 0 ? void 0 : onInput(key);
         break;
     }
   }; // 渲染 title 和 close button
@@ -97,8 +120,20 @@ export var NumberKeyboard = function NumberKeyboard(p) {
     return /*#__PURE__*/React.createElement("div", {
       key: key,
       className: className,
-      onClick: function onClick() {
-        return key && onKeyPress(key);
+      onTouchStart: function onTouchStart() {
+        if (key === 'BACKSPACE') {
+          onBackspacePressStart();
+        }
+      },
+      onTouchEnd: function onTouchEnd(e) {
+        onKeyPress(e, key);
+
+        if (key === 'BACKSPACE') {
+          onBackspacePressEnd();
+        }
+      },
+      onMouseUp: function onMouseUp(e) {
+        onKeyPress(e, key);
       },
       title: key,
       role: 'button'
@@ -129,15 +164,25 @@ export var NumberKeyboard = function NumberKeyboard(p) {
     className: classPrefix + "-confirm"
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-key extra-key bs-key",
-    onClick: function onClick() {
-      return onKeyPress('BACKSPACE');
+    onTouchStart: function onTouchStart() {
+      onBackspacePressStart();
+    },
+    onTouchEnd: function onTouchEnd(e) {
+      onKeyPress(e, 'BACKSPACE');
+      onBackspacePressEnd();
+    },
+    onMouseUp: function onMouseUp(e) {
+      return onKeyPress(e, 'BACKSPACE');
     },
     title: 'BACKSPACE',
     role: 'button'
   }, /*#__PURE__*/React.createElement(TextDeletionOutline, null)), /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-key extra-key ok-key",
-    onClick: function onClick() {
-      return onKeyPress('OK');
+    onTouchEnd: function onTouchEnd(e) {
+      return onKeyPress(e, 'OK');
+    },
+    onMouseUp: function onMouseUp(e) {
+      return onKeyPress(e, 'OK');
     },
     role: 'button'
   }, confirmText))), props.safeArea && /*#__PURE__*/React.createElement("div", {

package/2x/es/components/page-indicator/page-indicator.css

@@ -1,6 +1,6 @@
 .adm-page-indicator {
   display: flex;
-  width: fit-content;
+  width: auto;
   --dot-color: rgba(0, 0, 0, 0.2);
   --active-dot-color: var(--adm-color-primary);
   --dot-size: 6px;

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

@@ -3,7 +3,7 @@ import './picker.less';
 import { prompt } from './prompt';
 export type { PickerProps } from './picker';
 export type { PickerValue, PickerColumnItem, PickerColumn, PickerValueExtend, } from '../picker-view';
-declare const _default: import("react").FC<import("./picker").PickerProps> & {
+declare const _default: import("react").NamedExoticComponent<import("./picker").PickerProps> & {
     prompt: typeof prompt;
 };
 export default _default;

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

@@ -1,4 +1,4 @@
-import { ReactNode, FC } from 'react';
+import React, { ReactNode } from 'react';
 import { PopupProps } from '../popup';
 import { NativeProps } from '../../utils/native-props';
 import { PickerColumn, PickerColumnItem, PickerValue, PickerValueExtend } from './index';
@@ -16,4 +16,4 @@ export declare type PickerProps = {
     cancelText?: string;
     children?: (items: (PickerColumnItem | null)[]) => ReactNode;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps;
-export declare const Picker: FC<PickerProps>;
+export declare const Picker: React.NamedExoticComponent<PickerProps>;

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, memo } from 'react';
 import Popup from '../popup';
 import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
@@ -7,11 +7,12 @@ import PickerView from '../picker-view';
 import { useColumns } from '../picker-view/use-columns';
 import { useConfig } from '../config-provider';
 import { usePickerValueExtend } from '../picker-view/use-picker-value-extend';
+import { usePersistFn } from 'ahooks';
 var classPrefix = "adm-picker";
 var defaultProps = {
   defaultValue: []
 };
-export var Picker = function Picker(p) {
+export var Picker = /*#__PURE__*/memo(function (p) {
   var _a;
 
   var _useConfig = useConfig(),
@@ -30,7 +31,8 @@ export var Picker = function Picker(p) {
     }
   })),
       value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
+      setValue = _usePropsValue[1]; // TODO: columns generated twice in Picker and PickerView, which can be improved
+
 
   var columns = useColumns(props.columns, value);
   var generateValueExtend = usePickerValueExtend(columns);
@@ -49,7 +51,15 @@ export var Picker = function Picker(p) {
       setInnerValue(value);
     }
   }, [value]);
-  var innerColumns = useColumns(props.columns, innerValue);
+  var onChange = usePersistFn(function (val, ext) {
+    var _a;
+
+    setInnerValue(val);
+
+    if (props.visible) {
+      (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, val, ext);
+    }
+  });
   var pickerElement = withNativeProps(props, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -75,17 +85,9 @@ export var Picker = function Picker(p) {
   }, props.confirmText)), /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-body"
   }, /*#__PURE__*/React.createElement(PickerView, {
-    columns: innerColumns,
+    columns: props.columns,
     value: innerValue,
-    onChange: function onChange(val, ext) {
-      var _a;
-
-      setInnerValue(val);
-
-      if (props.visible) {
-        (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, val, ext);
-      }
-    }
+    onChange: onChange
   }))));
   var popupElement = /*#__PURE__*/React.createElement(Popup, {
     visible: props.visible,
@@ -104,4 +106,4 @@ export var Picker = function Picker(p) {
     stopPropagation: props.stopPropagation
   }, pickerElement);
   return /*#__PURE__*/React.createElement(React.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, generateValueExtend(value).items));
-};
+});