antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.bc248f5c7

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

@@ -1,31 +1,16 @@
 .adm-modal {
   --z-index: var(--adm-modal-z-index, 1000);
-  position: fixed;
-  z-index: var(--z-index);
+  ---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 .adm-center-popup {
+  --z-index: var(---z-index);
 }
 
 .adm-modal-body {
   width: 100%;
   max-height: 70vh;
-  box-sizing: border-box;
-  font-size: 28px;
-  background-color: white;
-  border-radius: 16px;
+  font-size: var(--adm-font-size-6);
   overflow: hidden;
   display: flex;
   flex-direction: column;
@@ -43,46 +28,38 @@
   padding-top: 40px;
 }
 
-.adm-modal-body .adm-modal-image-container {
+.adm-modal-image-container {
   margin-bottom: 24px;
   max-height: 40vh;
   overflow-y: scroll;
 }
 
-.adm-modal-body .adm-modal-header {
+.adm-modal-header {
   margin-bottom: 16px;
   padding: 0 24px;
 }
 
-.adm-modal-body .adm-modal-title {
+.adm-modal-title {
   margin-bottom: 16px;
   padding: 0 24px;
   font-weight: bold;
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   line-height: 50px;
   text-align: center;
 }
 
-.adm-modal-body .adm-modal-content {
+.adm-modal-content {
   padding: 0 24px 24px;
   max-height: 70vh;
   overflow-x: hidden;
   overflow-y: auto;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
   line-height: 1.4;
-  color: #333;
-}
-
-.adm-modal-body .adm-modal-close {
-  position: absolute;
-  right: 16px;
-  top: 16px;
-  color: var(--adm-color-weak);
-  padding: 8px;
-  font-size: 36px;
+  color: var(--adm-color-text);
 }
 
 .adm-modal-footer {
+  -webkit-user-select: none;
   user-select: none;
   padding: 16px 24px 24px;
 }
@@ -97,7 +74,7 @@
 }
 
 .adm-modal-footer .adm-modal-button {
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   line-height: 50px;
 }
 

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

@@ -1,28 +1,17 @@
-import React, { FC, ReactNode } from 'react';
+import { 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;
-    afterShow?: () => void;
+import { CenterPopupProps } from '../center-popup';
+export declare type ModalProps = Pick<CenterPopupProps, 'afterClose' | 'afterShow' | 'bodyClassName' | 'bodyStyle' | 'destroyOnClose' | 'disableBodyScroll' | 'forceRender' | 'getContainer' | 'maskClassName' | 'maskStyle' | 'stopPropagation' | 'visible'> & {
     image?: string;
     header?: ReactNode;
     title?: ReactNode;
     content?: ReactNode;
     actions?: Action[];
     onAction?: (action: Action, index: number) => void | Promise<void>;
-    closeOnAction?: boolean;
     onClose?: () => void;
+    closeOnAction?: boolean;
     closeOnMaskClick?: boolean;
-    visible?: boolean;
-    getContainer?: GetContainer;
-    bodyStyle?: React.CSSProperties;
-    bodyClassName?: string;
-    maskStyle?: React.CSSProperties;
-    maskClassName?: string;
-    stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;
-    disableBodyScroll?: boolean;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

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

@@ -1,64 +1,21 @@
 import { __awaiter } from "tslib";
-import React, { useState } from 'react';
+import React 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 { renderToContainer } from '../../utils/render-to-container';
-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';
+import CenterPopup from '../center-popup';
 const defaultProps = {
-  visible: false,
   actions: [],
   closeOnAction: false,
   closeOnMaskClick: false,
-  stopPropagation: ['click'],
-  showCloseButton: false,
-  getContainer: null,
-  disableBodyScroll: true
+  getContainer: null
 };
 export const Modal = p => {
   const props = mergeProps(defaultProps, p);
-  const unmountedRef = useUnmountedRef();
-  const style = useSpring({
-    scale: props.visible ? 1 : 0.8,
-    opacity: props.visible ? 1 : 0,
-    config: {
-      mass: 1.2,
-      tension: 200,
-      friction: 25,
-      clamp: true
-    },
-    onStart: () => {
-      setActive(true);
-    },
-    onRest: () => {
-      var _a, _b;
-
-      if (unmountedRef.current) return;
-      setActive(props.visible);
-
-      if (props.visible) {
-        (_a = props.afterShow) === null || _a === void 0 ? void 0 : _a.call(props);
-      } else {
-        (_b = props.afterClose) === null || _b === void 0 ? void 0 : _b.call(props);
-      }
-    }
-  });
-  const [active, setActive] = useState(props.visible);
-  const body = React.createElement("div", {
-    className: classNames(cls('body'), props.image && cls('with-image'), props.bodyClassName),
-    style: props.bodyStyle
-  }, props.showCloseButton && React.createElement("a", {
-    className: classNames(cls('close'), 'adm-plain-anchor'),
-    onClick: props.onClose
-  }, React.createElement(CloseOutline, null)), !!props.image && React.createElement("div", {
+  const element = React.createElement(React.Fragment, null, !!props.image && React.createElement("div", {
     className: cls('image-container')
   }, React.createElement(Image, {
     src: props.image,
@@ -89,26 +46,25 @@ export const Modal = p => {
       })
     });
   })));
-  const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
-    className: cls(),
-    style: {
-      display: active ? undefined : 'none'
-    }
-  }, React.createElement(Mask, {
+  return React.createElement(CenterPopup, {
+    className: classNames(cls(), props.className),
+    style: props.style,
+    afterClose: props.afterClose,
+    afterShow: props.afterShow,
+    showCloseButton: props.showCloseButton,
+    closeOnMaskClick: props.closeOnMaskClick,
+    onClose: props.onClose,
     visible: props.visible,
-    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
-    style: props.maskStyle,
-    className: classNames(cls('mask'), props.maskClassName),
-    disableBodyScroll: props.disableBodyScroll
-  }), React.createElement("div", {
-    className: cls('wrap'),
-    style: {
-      pointerEvents: props.visible ? undefined : 'none'
-    }
-  }, React.createElement(animated.div, {
-    style: style
-  }, body)))));
-  return renderToContainer(props.getContainer, node);
+    getContainer: props.getContainer,
+    bodyStyle: props.bodyStyle,
+    bodyClassName: classNames(cls('body'), props.image && cls('with-image'), props.bodyClassName),
+    maskStyle: props.maskStyle,
+    maskClassName: props.maskClassName,
+    stopPropagation: props.stopPropagation,
+    disableBodyScroll: props.disableBodyScroll,
+    destroyOnClose: props.destroyOnClose,
+    forceRender: props.forceRender
+  }, element);
 };
 
 function cls(name = '') {

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

@@ -0,0 +1,29 @@
+.adm-modal-body {
+  font-size: 28px;
+}
+
+.adm-modal-title {
+  font-size: 36px;
+}
+
+.adm-modal-content {
+  font-size: 30px;
+  color: #333333;
+}
+
+.adm-modal-close {
+  color: #999999;
+  font-size: 36px;
+}
+
+.adm-modal-footer.adm-space.adm-space-vertical > .adm-space-item.adm-space-item {
+  margin-bottom: 40px;
+}
+
+.adm-modal-footer.adm-space.adm-space-vertical > .adm-space-item.adm-space-item:last-child {
+  margin-bottom: 0;
+}
+
+.adm-modal-footer .adm-modal-button {
+  font-size: 36px;
+}

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

@@ -1,5 +1,5 @@
 import { ModalProps } from './modal';
-export declare type ModalShowProps = Omit<ModalProps, 'visible'>;
+export declare type ModalShowProps = Omit<ModalProps, 'visible' | 'destroyOnClose' | 'forceRender'>;
 export declare type ModalShowHandler = {
     close: () => void;
 };

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

@@ -35,7 +35,7 @@
 }
 
 .adm-nav-bar-left {
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
   display: flex;
   justify-content: flex-start;
   align-items: center;
@@ -44,7 +44,7 @@
 .adm-nav-bar-title {
   justify-content: center;
   white-space: nowrap;
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   padding: 0 24px;
 }
 

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

@@ -1,9 +1,9 @@
 .adm-notice-bar {
   --background-color: #ababab;
   --border-color: #999999;
-  --text-color: #ffffff;
-  --font-size: 30px;
-  --icon-font-size: 36px;
+  --text-color: var(--adm-color-white);
+  --font-size: var(--adm-font-size-7);
+  --icon-font-size: var(--adm-font-size-10);
   --height: 76px;
   height: var(--height);
   box-sizing: border-box;
@@ -70,6 +70,15 @@
   margin-left: 24px;
 }
 
+.adm-notice-bar-close {
+  width: 48px;
+  height: 48px;
+  margin-right: -6px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .adm-notice-bar-close-icon {
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
 }

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

@@ -82,13 +82,15 @@ export const NoticeBar = memo(p => {
     className: `${classPrefix}-content-inner`
   }, props.content)), (props.closeable || props.extra) && React.createElement("span", {
     className: `${classPrefix}-right`
-  }, props.extra, props.closeable && React.createElement(CloseOutline, {
-    className: `${classPrefix}-close-icon`,
+  }, props.extra, props.closeable && React.createElement("div", {
+    className: `${classPrefix}-close`,
     onClick: () => {
       var _a;
 
       setVisible(false);
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     }
-  }))));
+  }, React.createElement(CloseOutline, {
+    className: `${classPrefix}-close-icon`
+  })))));
 });

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

@@ -4,18 +4,19 @@
   flex: 1;
 }
 
-.adm-number-keyboard-main.confirmed-style .sign-key {
+.adm-number-keyboard-main.adm-number-keyboard-main-confirmed-style .adm-number-keyboard-key-sign {
   background-color: var(--adm-color-white);
 }
 
 .adm-number-keyboard-popup.adm-popup {
   width: 100%;
+  -webkit-user-select: none;
   user-select: none;
   z-index: 1050;
 }
 
 .adm-number-keyboard-popup.adm-popup .adm-popup-body {
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
 }
 
 .adm-number-keyboard-wrapper {
@@ -25,13 +26,13 @@
 .adm-number-keyboard-header {
   height: 68px;
   line-height: 68px;
-  border-top: solid 2px #f5f5f5;
+  border-top: solid 2px var(--adm-color-border);
   display: flex;
   justify-content: center;
   align-items: center;
   padding: 0 24px;
   color: var(--adm-color-weak);
-  background-color: var(--adm-color-white);
+  background-color: var(--adm-color-background);
 }
 
 .adm-number-keyboard-header-close-button {
@@ -39,11 +40,11 @@
   font-size: 32px;
 }
 
-.adm-number-keyboard-header.with-title {
+.adm-number-keyboard-header.adm-number-keyboard-header-with-title {
   justify-content: space-between;
 }
 
-.adm-number-keyboard-header.with-title .adm-number-keyboard-header-close-button {
+.adm-number-keyboard-header.adm-number-keyboard-header-with-title .adm-number-keyboard-header-close-button {
   padding-right: 0;
 }
 
@@ -70,7 +71,7 @@
   height: 96px;
   font-size: 44px;
   box-sizing: border-box;
-  border: solid 2px #f5f5f5;
+  border: solid 2px var(--adm-color-border);
   border-bottom: none;
   border-left: none;
 }
@@ -96,37 +97,33 @@
   box-sizing: content-box;
 }
 
-.adm-number-keyboard-key.mid-key {
+.adm-number-keyboard-key.adm-number-keyboard-key-mid {
   flex-basis: 66.67%;
 }
 
-.adm-number-keyboard-key.sign-key:active::before {
+.adm-number-keyboard-key.adm-number-keyboard-key-sign:active::before {
   opacity: 0.1;
 }
 
-.adm-number-keyboard-key.extra-key {
-  border-left: solid 2px #f5f5f5;
+.adm-number-keyboard-key.adm-number-keyboard-key-extra {
+  border-left: solid 2px var(--adm-color-border);
   border-right: none;
 }
 
-.adm-number-keyboard-key.extra-key,
-.adm-number-keyboard-key.number-key {
-  background-color: var(--adm-color-white);
+.adm-number-keyboard-key.adm-number-keyboard-key-extra,
+.adm-number-keyboard-key.adm-number-keyboard-key-number {
+  background-color: var(--adm-color-background);
 }
 
-.adm-number-keyboard-key.extra-key:active::before,
-.adm-number-keyboard-key.number-key:active::before {
+.adm-number-keyboard-key.adm-number-keyboard-key-extra:active::before,
+.adm-number-keyboard-key.adm-number-keyboard-key-number:active::before {
   opacity: 0.1;
 }
 
-.adm-number-keyboard-key.ok-key {
+.adm-number-keyboard-key.adm-number-keyboard-key-ok {
   background-color: var(--adm-color-primary);
   color: var(--adm-color-white);
   height: 288px;
   font-size: 32px;
   border: none;
-}
-
-.adm-number-keyboard-bs-key {
-  height: 40px;
 }

package/2x/es/components/number-keyboard/number-keyboard.d.ts

@@ -1,22 +1,18 @@
 import React from 'react';
 import { PopupProps } from '../popup';
-import { GetContainer } from '../../utils/render-to-container';
 import { NativeProps } from '../../utils/native-props';
 export declare type NumberKeyboardProps = {
     visible?: boolean;
     title?: string;
-    getContainer?: GetContainer;
     confirmText?: string | null;
-    customKey?: '-' | '.' | 'X';
+    customKey?: string | [string, string];
     randomOrder?: boolean;
     showCloseButton?: boolean;
     onInput?: (v: string) => void;
     onDelete?: () => void;
     onClose?: () => void;
     onConfirm?: () => void;
-    afterShow?: () => void;
-    afterClose?: () => void;
     closeOnConfirm?: boolean;
     safeArea?: boolean;
-} & Pick<PopupProps, 'stopPropagation'> & NativeProps;
+} & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps;
 export declare const NumberKeyboard: React.FC<NumberKeyboardProps>;

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

@@ -14,7 +14,9 @@ const defaultProps = {
   showCloseButton: true,
   confirmText: null,
   closeOnConfirm: true,
-  safeArea: true
+  safeArea: true,
+  destroyOnClose: false,
+  forceRender: false
 };
 export const NumberKeyboard = p => {
   const props = mergeProps(defaultProps, p);
@@ -32,13 +34,18 @@ export const NumberKeyboard = p => {
   const keys = useMemo(() => {
     const defaultKeys = ['1', '2', '3', '4', '5', '6', '7', '8', '9'];
     const keyList = randomOrder ? shuffle(defaultKeys) : defaultKeys;
+    const customKeys = Array.isArray(customKey) ? customKey : [customKey];
     keyList.push('0');
 
     if (confirmText) {
-      keyList.push(customKey || '');
+      if (customKeys.length === 2) {
+        keyList.splice(9, 0, customKeys.pop());
+      }
+
+      keyList.push(customKeys[0] || '');
     } else {
-      keyList.splice(9, 0, customKey || '');
-      keyList.push('BACKSPACE');
+      keyList.splice(9, 0, customKeys[0] || '');
+      keyList.push(customKeys[1] || 'BACKSPACE');
     }
 
     return keyList;
@@ -61,8 +68,7 @@ export const NumberKeyboard = p => {
   const onBackspacePressEnd = () => {
     clearTimeout(timeoutRef.current);
     clearInterval(intervalRef.current);
-  }; // 点击键盘按键
-
+  };
 
   const onKeyPress = (e, key) => {
     var _a, _b;
@@ -84,18 +90,17 @@ export const NumberKeyboard = p => {
         break;
 
       default:
-        // 当 customKey 不存在时，点击该键不应该触发 onInput
+        // onInput should't be called when customKey doesn't exist
         if (key !== '') onInput === null || onInput === void 0 ? void 0 : onInput(key);
         break;
     }
-  }; // 渲染 title 和 close button
-
+  };
 
   const renderHeader = () => {
     if (!showCloseButton && !title) return null;
     return React.createElement("div", {
       className: classNames(`${classPrefix}-header`, {
-        'with-title': !!title
+        [`${classPrefix}-header-with-title`]: !!title
       })
     }, title && React.createElement("div", {
       className: `${classPrefix}-title`
@@ -109,17 +114,20 @@ export const NumberKeyboard = p => {
       role: 'button',
       title: 'CLOSE'
     }, React.createElement(DownOutline, null)));
-  }; // 渲染基础键盘按键
-
+  };
 
   const renderKey = (key, index) => {
     const isNumberKey = /^\d$/.test(key);
     const className = classNames(`${classPrefix}-key`, {
-      'number-key': isNumberKey,
-      'sign-key': !isNumberKey && key,
-      'mid-key': index === 9 && !!confirmText
+      [`${classPrefix}-key-number`]: isNumberKey,
+      [`${classPrefix}-key-sign`]: !isNumberKey && key,
+      [`${classPrefix}-key-mid`]: index === 9 && !!confirmText && keys.length < 12
     });
-    return React.createElement("div", {
+    const ariaProps = key ? {
+      role: 'button',
+      title: key
+    } : undefined;
+    return React.createElement("div", Object.assign({
       key: key,
       className: className,
       onTouchStart: () => {
@@ -133,10 +141,8 @@ export const NumberKeyboard = p => {
         if (key === 'BACKSPACE') {
           onBackspacePressEnd();
         }
-      },
-      title: key,
-      role: 'button'
-    }, key === 'BACKSPACE' ? React.createElement(TextDeletionOutline, null) : key);
+      }
+    }, ariaProps), key === 'BACKSPACE' ? React.createElement(TextDeletionOutline, null) : key);
   };
 
   return React.createElement(Popup, {
@@ -146,7 +152,9 @@ export const NumberKeyboard = p => {
     afterClose: props.afterClose,
     afterShow: props.afterShow,
     className: `${classPrefix}-popup`,
-    stopPropagation: props.stopPropagation
+    stopPropagation: props.stopPropagation,
+    destroyOnClose: props.destroyOnClose,
+    forceRender: props.forceRender
   }, withNativeProps(props, React.createElement("div", {
     ref: keyboardRef,
     className: classPrefix,
@@ -157,12 +165,12 @@ export const NumberKeyboard = p => {
     className: `${classPrefix}-wrapper`
   }, React.createElement("div", {
     className: classNames(`${classPrefix}-main`, {
-      'confirmed-style': !!confirmText
+      [`${classPrefix}-main-confirmed-style`]: !!confirmText
     })
   }, keys.map(renderKey)), !!confirmText && React.createElement("div", {
     className: `${classPrefix}-confirm`
   }, React.createElement("div", {
-    className: `${classPrefix}-key extra-key bs-key`,
+    className: `${classPrefix}-key ${classPrefix}-key-extra ${classPrefix}-key-bs`,
     onTouchStart: () => {
       onBackspacePressStart();
     },
@@ -173,7 +181,7 @@ export const NumberKeyboard = p => {
     title: 'BACKSPACE',
     role: 'button'
   }, React.createElement(TextDeletionOutline, null)), React.createElement("div", {
-    className: `${classPrefix}-key extra-key ok-key`,
+    className: `${classPrefix}-key ${classPrefix}-key-extra ${classPrefix}-key-ok`,
     onTouchEnd: e => onKeyPress(e, 'OK'),
     role: 'button'
   }, confirmText))), props.safeArea && React.createElement("div", {

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

@@ -0,0 +1,31 @@
+.adm-page-indicator-dot {
+  width: 6px;
+  height: 6px;
+  border-radius: 2px;
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.adm-page-indicator-dot-active {
+  border-radius: 2px;
+  background: #1677ff;
+}
+
+.adm-page-indicator-color-white .adm-page-indicator-dot-active.adm-page-indicator-dot-active {
+  background: #ffffff;
+}
+
+.adm-page-indicator-horizontal .adm-page-indicator-dot {
+  margin-right: 6px;
+}
+
+.adm-page-indicator-horizontal .adm-page-indicator-dot-active {
+  width: 26px;
+}
+
+.adm-page-indicator-vertical .adm-page-indicator-dot {
+  margin-bottom: 6px;
+}
+
+.adm-page-indicator-vertical .adm-page-indicator-dot-active {
+  height: 26px;
+}

package/2x/es/components/passcode-input/index.d.ts

@@ -1,4 +1,4 @@
 import './passcode-input.less';
 import { PasscodeInput } from './passcode-input';
-export type { PasscodeInputProps } from './passcode-input';
+export type { PasscodeInputProps, PasscodeInputRef } from './passcode-input';
 export default PasscodeInput;