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

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

@@ -1,12 +1,7 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-declare type EnterKeyHintProps = NativeInputProps extends {
-    enterKeyHint?: unknown;
-} ? {
-    enterKeyHint?: NativeInputProps['enterKeyHint'];
-} : {};
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp'> & EnterKeyHintProps & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -17,6 +12,7 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     onClear?: () => void;
     id?: string;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+    enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
 } & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align'>;
 export declare type InputRef = {
     clear: () => void;
@@ -24,8 +20,6 @@ export declare type InputRef = {
     blur: () => void;
 };
 export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "max" | "min" | "type" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "autoComplete" | "maxLength" | "minLength"> & {
-    enterKeyHint?: React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>["enterKeyHint"] | undefined;
-} & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -36,5 +30,6 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedH
     onClear?: (() => void) | undefined;
     id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;
+    enterKeyHint?: "enter" | "search" | "done" | "go" | "next" | "previous" | "send" | undefined;
 } & NativeProps<"--font-size" | "--color" | "--placeholder-color" | "--disabled-color" | "--text-align"> & React.RefAttributes<InputRef>>;
 export {};

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

@@ -63,6 +63,17 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (p, ref) {
     (_a = props.onKeyDown) === null || _a === void 0 ? void 0 : _a.call(props, e);
   };
 
+  (0, _react.useLayoutEffect)(function () {
+    var _a;
+
+    if (!props.enterKeyHint) return;
+    (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.setAttribute('enterkeyhint', props.enterKeyHint);
+    return function () {
+      var _a;
+
+      (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.removeAttribute('enterkeyhint');
+    };
+  }, [props.enterKeyHint]);
   return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
     className: classPrefix + "-wrapper"
   }, /*#__PURE__*/_react["default"].createElement("input", {
@@ -93,7 +104,6 @@ var Input = /*#__PURE__*/(0, _react.forwardRef)(function (p, ref) {
     max: props.max,
     min: props.min,
     autoComplete: props.autoComplete,
-    enterKeyHint: props.enterKeyHint,
     pattern: props.pattern,
     type: props.type,
     autoCapitalize: props.autoCapitalize,

package/2x/cjs/components/list/list.css

@@ -2,6 +2,10 @@
   --prefix-width: 'auto';
   --align-items: center;
   --active-background-color: var(--adm-border-color);
+  --border-inner: solid 2px var(--adm-border-color);
+  --border-top: solid 2px var(--adm-border-color);
+  --border-bottom: solid 2px var(--adm-border-color);
+  --padding-left: 24px;
   background-color: #ffffff;
   overflow: hidden;
   font-size: 34px;
@@ -12,9 +16,8 @@
 }
 
 .adm-list-default {
-  border: solid 2px var(--adm-border-color);
-  border-right: none;
-  border-left: none;
+  border-top: var(--border-top);
+  border-bottom: var(--border-bottom);
 }
 
 .adm-list-card {
@@ -24,7 +27,7 @@
 
 .adm-list-item {
   display: block;
-  padding-left: 24px;
+  padding-left: var(--padding-left);
 }
 
 .adm-list-item-title,
@@ -38,7 +41,7 @@
   align-items: var(--align-items);
   justify-content: flex-start;
   padding: 24px 24px 24px 0;
-  border-bottom: solid 2px var(--adm-border-color);
+  border-bottom: var(--border-inner);
 }
 
 .adm-list-item-content-prefix {

package/2x/cjs/components/list/list.d.ts

@@ -2,5 +2,5 @@ import { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ListProps = {
     mode?: 'default' | 'card';
-} & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color'>;
+} & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left'>;
 export declare const List: FC<ListProps>;

package/2x/cjs/components/mask/mask.js

@@ -9,6 +9,8 @@ var _nativeProps = require("../../utils/native-props");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _ahooks = require("ahooks");
+
 var _useLockScroll = require("../../utils/use-lock-scroll");
 
 var _web = require("@react-spring/web");
@@ -64,13 +66,16 @@ var Mask = function Mask(p) {
       active = _useState[0],
       setActive = _useState[1];
 
+  var unmountedRef = (0, _ahooks.useUnmountedRef)();
+
   var _useSpring = (0, _web.useSpring)({
     opacity: props.visible ? 1 : 0,
     config: {
       precision: 0.01,
       mass: 1,
       tension: 200,
-      friction: 30
+      friction: 30,
+      clamp: true
     },
     onStart: function onStart() {
       setActive(true);
@@ -78,6 +83,7 @@ var Mask = function Mask(p) {
     onRest: function onRest() {
       var _a, _b;
 
+      if (unmountedRef.current) return;
       setActive(props.visible);
 
       if (props.visible) {

package/2x/cjs/components/modal/alert.d.ts

@@ -0,0 +1,7 @@
+import { ModalProps } from './index';
+import { ReactNode } from 'react';
+export declare type ModalAlertProps = Omit<ModalProps, 'visible' | 'closeOnAction' | 'actions'> & {
+    confirmText?: ReactNode;
+    onConfirm?: () => void | Promise<void>;
+};
+export declare function alert(p: ModalAlertProps): Promise<void>;

package/2x/cjs/components/modal/alert.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.alert = alert;
+
+var _show = require("./show");
+
+var _withDefaultProps = require("../../utils/with-default-props");
+
+var _configProvider = require("../config-provider");
+
+function alert(p) {
+  var defaultProps = {
+    confirmText: (0, _configProvider.getDefaultConfig)().locale.Modal.ok
+  };
+  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  return new Promise(function (resolve) {
+    (0, _show.show)(Object.assign(Object.assign({}, props), {
+      closeOnAction: true,
+      actions: [{
+        key: 'confirm',
+        text: props.confirmText,
+        primary: true
+      }],
+      onAction: props.onConfirm,
+      onClose: function onClose() {
+        resolve();
+      }
+    }));
+  });
+}

package/2x/cjs/components/modal/confirm.d.ts

@@ -0,0 +1,9 @@
+import { ModalProps } from './index';
+import { ReactNode } from 'react';
+export declare type ModalConfirmProps = Omit<ModalProps, 'visible' | 'closeOnAction' | 'actions'> & {
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
+    onConfirm?: () => void | Promise<void>;
+    onCancel?: () => void | Promise<void>;
+};
+export declare function confirm(p: ModalConfirmProps): Promise<boolean>;

package/2x/cjs/components/modal/confirm.js

@@ -0,0 +1,116 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.confirm = confirm;
+
+var _show = require("./show");
+
+var _withDefaultProps = require("../../utils/with-default-props");
+
+var __awaiter = void 0 && (void 0).__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());
+  });
+};
+
+var defaultProps = {
+  confirmText: '确认',
+  cancelText: '取消'
+};
+
+function confirm(p) {
+  var _this = this;
+
+  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  return new Promise(function (resolve) {
+    (0, _show.show)(Object.assign(Object.assign({}, props), {
+      closeOnAction: true,
+      onClose: function onClose() {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        resolve(false);
+      },
+      actions: [{
+        key: 'confirm',
+        text: props.confirmText,
+        primary: true,
+        onClick: function onClick() {
+          return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+            var _a;
+
+            return regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props);
+
+                  case 2:
+                    resolve(true);
+
+                  case 3:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+        }
+      }, {
+        key: 'cancel',
+        text: props.cancelText,
+        onClick: function onClick() {
+          return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+            var _b;
+
+            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return (_b = props.onCancel) === null || _b === void 0 ? void 0 : _b.call(props);
+
+                  case 2:
+                    resolve(false);
+
+                  case 3:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
+        }
+      }]
+    }));
+  });
+}

package/2x/cjs/components/modal/index.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import './modal.less';
+import { show } from './show';
+import { alert } from './alert';
+import { confirm } from './confirm';
+export type { ModalProps } from './modal';
+export type { Action } from './modal-action-button';
+export type { ModalShowProps, ModalShowRef } from './show';
+export type { ModalAlertProps } from './alert';
+export type { ModalConfirmProps } from './confirm';
+declare const _default: import("react").FC<import("./modal").ModalProps> & {
+    show: typeof show;
+    alert: typeof alert;
+    confirm: typeof confirm;
+};
+export default _default;

package/2x/cjs/components/modal/index.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+require("./modal.css");
+
+var _show = require("./show");
+
+var _alert = require("./alert");
+
+var _confirm = require("./confirm");
+
+var _attachPropertiesToComponent = require("../../utils/attach-properties-to-component");
+
+var _modal2 = require("./modal");
+
+var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_modal2.Modal, {
+  show: _show.show,
+  alert: _alert.alert,
+  confirm: _confirm.confirm
+});
+
+exports["default"] = _default;

package/2x/cjs/components/modal/modal-action-button.d.ts

@@ -0,0 +1,14 @@
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type Action = {
+    key: string | number;
+    text: string;
+    disabled?: boolean;
+    danger?: boolean;
+    primary?: boolean;
+    onClick?: () => void | Promise<void>;
+} & NativeProps;
+export declare const ModalActionButton: FC<{
+    action: Action;
+    onAction: () => void | Promise<void>;
+}>;

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

@@ -0,0 +1,109 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ModalActionButton = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _button = _interopRequireDefault(require("../button"));
+
+var _nativeProps = require("../../utils/native-props");
+
+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 _getRequireWildcardCache(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; }
+
+var __awaiter = void 0 && (void 0).__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());
+  });
+};
+
+var ModalActionButton = function ModalActionButton(props) {
+  var action = props.action;
+
+  var _useState = (0, _react.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 (0, _nativeProps.withNativeProps)(props.action, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    key: action.key,
+    onClick: handleClick,
+    className: (0, _classnames["default"])('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));
+};
+
+exports.ModalActionButton = ModalActionButton;

package/2x/cjs/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/cjs/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>;