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

package/2x/es/components/image-viewer/slide.js

@@ -92,11 +92,6 @@ export var Slide = function Slide(props) {
       }
     },
     pinch: {
-      transform: function transform(_ref) {
-        var d = _ref[0],
-            a = _ref[1];
-        return [d < 0 ? d * 0.5 : d * 2, 0];
-      },
       from: function from() {
         return [zoom.get(), 0];
       }

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

@@ -58,7 +58,7 @@
 
 .adm-index-bar-sidebar-row {
   cursor: pointer;
-  width: 100%;
+  width: auto;
   text-align: right;
   position: relative;
   padding: 0 24px;

package/2x/es/components/infinite-scroll/infinite-scroll.js

@@ -1,6 +1,6 @@
 import { mergeProps } from '../../utils/with-default-props';
 import React, { useEffect, useRef } from 'react';
-import { useLockFn, usePersistFn } from 'ahooks';
+import { useLockFn, useMemoizedFn } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { getScrollParent } from '../../utils/get-scroll-parent';
 import Loading from '../loading';
@@ -25,7 +25,7 @@ export var InfiniteScroll = function InfiniteScroll(p) {
   });
   var elementRef = useRef(null);
   var checkTimeoutRef = useRef();
-  var check = usePersistFn(function () {
+  var check = useMemoizedFn(function () {
     window.clearTimeout(checkTimeoutRef.current);
     checkTimeoutRef.current = window.setTimeout(function () {
       if (!props.hasMore) return;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'inputMode' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -19,7 +19,7 @@ export declare type InputRef = {
     focus: () => void;
     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"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "max" | "min" | "type" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;

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

@@ -11,10 +11,6 @@
   font-size: 34px;
 }
 
-.adm-list-inner {
-  margin-bottom: -2px;
-}
-
 .adm-list-default {
   border-top: var(--border-top);
   border-bottom: var(--border-bottom);
@@ -26,10 +22,15 @@
 }
 
 .adm-list-item {
+  margin-bottom: -2px;
   display: block;
   padding-left: var(--padding-left);
 }
 
+.adm-list-item:not(:first-child) {
+  padding-top: 2px;
+}
+
 .adm-list-item-title,
 .adm-list-item-description {
   color: var(--adm-color-weak);

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

@@ -10,7 +10,5 @@ export var List = function List(p) {
   var props = mergeProps(defaultProps, p);
   return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
     className: classNames(classPrefix, classPrefix + "-" + props.mode)
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-inner"
-  }, props.children)));
+  }, props.children));
 };

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

@@ -77,9 +77,10 @@ export var Mask = function Mask(p) {
   var node = withStopPropagation(props.stopPropagation, withNativeProps(props, /*#__PURE__*/React.createElement(animated.div, {
     className: classPrefix,
     ref: ref,
-    style: Object.assign(Object.assign({}, props.style), {
+    style: Object.assign(Object.assign({
       background: background,
-      opacity: opacity,
+      opacity: opacity
+    }, props.style), {
       display: active ? 'unset' : 'none'
     })
   }, props.onMaskClick && /*#__PURE__*/React.createElement("div", {

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

@@ -5,6 +5,7 @@ import { PropagationEvent } from '../../utils/with-stop-propagation';
 import { NativeProps } from '../../utils/native-props';
 export declare type ModalProps = {
     afterClose?: () => void;
+    afterShow?: () => void;
     image?: string;
     header?: ReactNode;
     title?: ReactNode;

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

@@ -68,13 +68,15 @@ export var Modal = function Modal(p) {
       setActive(true);
     },
     onRest: function onRest() {
-      var _a;
+      var _a, _b;
 
       if (unmountedRef.current) return;
       setActive(props.visible);
 
-      if (!props.visible) {
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      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);
       }
     }
   });

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

@@ -1,5 +1,6 @@
 .adm-notice-bar {
   height: 60px;
+  box-sizing: border-box;
   font-size: 28px;
   line-height: 60px;
   padding: 0 24px;

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

@@ -4,8 +4,7 @@
   flex: 1;
 }
 
-.adm-number-keyboard.confirmed-style {
-  width: 75%;
+.adm-number-keyboard-main.confirmed-style .sign-key {
   background-color: var(--adm-color-white);
 }
 
@@ -125,6 +124,7 @@
   color: var(--adm-color-white);
   height: 288px;
   font-size: 32px;
+  border: none;
 }
 
 .adm-number-keyboard-bs-key {

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

@@ -6,7 +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';
+import { useMemoizedFn } from 'ahooks';
 var classPrefix = 'adm-number-keyboard';
 var defaultProps = {
   defaultVisible: false,
@@ -43,7 +43,7 @@ export var NumberKeyboard = function NumberKeyboard(p) {
   }, [customKey, confirmText, randomOrder, randomOrder && visible]);
   var timeoutRef = useRef(-1);
   var intervalRef = useRef(-1);
-  var onDelete = usePersistFn(function () {
+  var onDelete = useMemoizedFn(function () {
     var _a;
 
     (_a = props.onDelete) === null || _a === void 0 ? void 0 : _a.call(props);

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

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

package/2x/es/components/passcode-input/index.js

@@ -0,0 +1,3 @@
+import "./passcode-input.css";
+import { PasscodeInput } from './passcode-input';
+export default PasscodeInput;

package/2x/es/components/passcode-input/passcode-input.css

@@ -0,0 +1,166 @@
+.adm-passcode-input {
+  position: relative;
+  display: inline-block;
+  --cell-size: 80px;
+  --cell-gap: 12px;
+  --dot-size: 20px;
+  --border-color: #e5e5e5;
+  --border-radius: 16px;
+}
+
+.adm-passcode-input-cell-container {
+  display: inline-flex;
+  vertical-align: top;
+}
+
+.adm-passcode-input-cell {
+  flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  font-size: 36px;
+  width: var(--cell-size);
+  height: var(--cell-size);
+  background: var(--adm-color-white);
+}
+
+.adm-passcode-input:not(.seperated) {
+  border-radius: var(--border-radius);
+  overflow: hidden;
+  border: 2px solid var(--border-color);
+}
+
+.adm-passcode-input:not(.seperated) .adm-passcode-input-cell:not(:last-child) {
+  border-right: 2px solid var(--border-color);
+}
+
+.adm-passcode-input:not(.seperated).focused {
+  border-color: var(--adm-color-primary);
+  box-shadow: 0 0 4px 0 var(--adm-color-primary);
+  outline: none;
+}
+
+.adm-passcode-input:not(.seperated).error {
+  border-color: var(--adm-color-danger);
+  box-shadow: 0 0 4px 0 var(--adm-color-danger);
+  animation: 100ms ease-in-out 0s 3 normal none running adm-shake-horizontal;
+}
+
+.adm-passcode-input.seperated .adm-passcode-input-cell {
+  border-radius: var(--border-radius);
+  border: 2px solid var(--border-color);
+}
+
+.adm-passcode-input.seperated .adm-passcode-input-cell:not(:last-child) {
+  margin-right: var(--cell-gap);
+}
+
+.adm-passcode-input.seperated .adm-passcode-input-cell.focused {
+  border-color: var(--adm-color-primary);
+  box-shadow: 0 0 4px 0 var(--adm-color-primary);
+}
+
+.adm-passcode-input.seperated.focused {
+  outline: none;
+}
+
+.adm-passcode-input.seperated.error {
+  animation: 100ms ease-in-out 0s 3 normal none running adm-shake-horizontal;
+}
+
+.adm-passcode-input.seperated.error .adm-passcode-input-cell {
+  border-color: var(--adm-color-danger);
+  box-shadow: 0 0 4px 0 var(--adm-color-danger);
+}
+
+.adm-passcode-input-cell.dot::before {
+  content: '';
+  width: var(--dot-size);
+  height: var(--dot-size);
+  border-radius: 50%;
+  background: var(--adm-color-text);
+}
+
+.adm-passcode-input-cell.caret::after {
+  content: '';
+  width: 4px;
+  height: 1.1em;
+  margin-left: 2px;
+  background: var(--adm-color-primary);
+  animation: 1s linear infinite adm-caret-blink;
+}
+
+.adm-passcode-input > .adm-passcode-input-native-input {
+  position: absolute;
+  left: -200vw;
+  top: 0;
+  display: block;
+  width: 100px;
+  height: 40px;
+  opacity: 0.5;
+}
+
+@keyframes adm-shake-horizontal {
+  0% {
+    transform: translateX(0);
+  }
+
+  10% {
+    transform: translateX(-8px);
+  }
+
+  20% {
+    transform: translateX(10px);
+  }
+
+  30% {
+    transform: translateX(-2px);
+  }
+
+  40% {
+    transform: translateX(16px);
+  }
+
+  50% {
+    transform: translateX(0);
+  }
+
+  60% {
+    transform: translateX(-16px);
+  }
+
+  70% {
+    transform: translateX(2px);
+  }
+
+  80% {
+    transform: translateX(-10px);
+  }
+
+  90% {
+    transform: translateX(8px);
+  }
+
+  100% {
+    transform: translateX(0);
+  }
+}
+
+@keyframes adm-caret-blink {
+  from {
+    opacity: 1;
+  }
+
+  60% {
+    opacity: 1;
+  }
+
+  80% {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 0;
+  }
+}

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

@@ -0,0 +1,35 @@
+import React, { ReactElement } from 'react';
+import { NativeProps } from '../../utils/native-props';
+import type { NumberKeyboardProps } from '../number-keyboard';
+export declare type PasscodeInputProps = {
+    value?: string;
+    defaultValue?: string;
+    onChange?: (val: string) => void;
+    length?: number;
+    plain?: boolean;
+    error?: boolean;
+    caret?: boolean;
+    seperated?: boolean;
+    onBlur?: () => void;
+    onFocus?: () => void;
+    keyboard?: ReactElement<NumberKeyboardProps>;
+    onFill?: (val: string) => void;
+} & NativeProps<'--cell-gap' | '--cell-size'>;
+export declare type PasscodeInputRef = {
+    focus: () => void;
+    blur: () => void;
+};
+export declare const PasscodeInput: React.ForwardRefExoticComponent<{
+    value?: string | undefined;
+    defaultValue?: string | undefined;
+    onChange?: ((val: string) => void) | undefined;
+    length?: number | undefined;
+    plain?: boolean | undefined;
+    error?: boolean | undefined;
+    caret?: boolean | undefined;
+    seperated?: boolean | undefined;
+    onBlur?: (() => void) | undefined;
+    onFocus?: (() => void) | undefined;
+    keyboard?: React.ReactElement<NumberKeyboardProps, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined;
+    onFill?: ((val: string) => void) | undefined;
+} & NativeProps<"--cell-size" | "--cell-gap"> & React.RefAttributes<PasscodeInputRef>>;

package/2x/es/components/passcode-input/passcode-input.js

@@ -0,0 +1,149 @@
+import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle } from 'react';
+import { mergeProps } from '../../utils/with-default-props';
+import { withNativeProps } from '../../utils/native-props';
+import classNames from 'classnames';
+import { bound } from '../../utils/bound';
+import { usePropsValue } from '../../utils/use-props-value';
+var classPrefix = 'adm-passcode-input';
+var defaultProps = {
+  defaultValue: '',
+  length: 6,
+  plain: false,
+  error: false,
+  seperated: false,
+  caret: true
+};
+export var PasscodeInput = /*#__PURE__*/forwardRef(function (p, ref) {
+  var props = mergeProps(defaultProps, p); // 防止 length 值不合法
+
+  var cellLength = props.length > 0 && props.length < Infinity ? Math.floor(props.length) : defaultProps.length;
+
+  var _useState = useState(false),
+      focused = _useState[0],
+      setFocused = _useState[1];
+
+  var _usePropsValue = usePropsValue(props),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
+
+  var rootRef = useRef(null);
+  var nativeInputRef = useRef(null);
+  useEffect(function () {
+    var _a;
+
+    if (value.length >= cellLength) {
+      (_a = props.onFill) === null || _a === void 0 ? void 0 : _a.call(props, value);
+    }
+  }, [props.onFill, value, cellLength]);
+
+  var onFocus = function onFocus() {
+    var _a, _b;
+
+    if (!props.keyboard) {
+      (_a = nativeInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+
+    setFocused(true);
+    (_b = props.onFocus) === null || _b === void 0 ? void 0 : _b.call(props);
+  };
+
+  useEffect(function () {
+    if (!focused) return;
+    var timeout = window.setTimeout(function () {
+      var _a;
+
+      (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.scrollIntoView({
+        block: 'center',
+        inline: 'center',
+        behavior: 'smooth'
+      });
+    }, 100);
+    return function () {
+      window.clearTimeout(timeout);
+    };
+  }, [focused]);
+
+  var onBlur = function onBlur() {
+    var _a;
+
+    setFocused(false);
+    (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props);
+  };
+
+  useImperativeHandle(ref, function () {
+    return {
+      focus: function focus() {
+        var _a;
+
+        return (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+      },
+      blur: function blur() {
+        var _a, _b;
+
+        (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+        (_b = nativeInputRef.current) === null || _b === void 0 ? void 0 : _b.blur();
+      }
+    };
+  });
+
+  var renderCells = function renderCells() {
+    var cells = [];
+    var chars = value.split('');
+    var caretIndex = chars.length; // 光标位置index等于当前文字长度
+
+    var focusedIndex = bound(chars.length, 0, cellLength - 1);
+
+    for (var i = 0; i < cellLength; i++) {
+      cells.push( /*#__PURE__*/React.createElement("div", {
+        className: classNames(classPrefix + "-cell", {
+          caret: props.caret && caretIndex === i && focused,
+          focused: focusedIndex === i && focused,
+          dot: !props.plain && chars[i]
+        }),
+        key: i
+      }, chars[i] && props.plain ? chars[i] : ''));
+    }
+
+    return cells;
+  };
+
+  var cls = classNames(classPrefix, {
+    focused: focused,
+    error: props.error,
+    seperated: props.seperated
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null, withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    ref: rootRef,
+    tabIndex: 0,
+    className: cls,
+    onFocus: onFocus,
+    onBlur: onBlur
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-cell-container"
+  }, renderCells()), /*#__PURE__*/React.createElement("input", {
+    ref: nativeInputRef,
+    className: classPrefix + "-native-input",
+    value: value,
+    type: 'text',
+    pattern: '[0-9]*',
+    inputMode: 'numeric',
+    onChange: function onChange(e) {
+      setValue(e.target.value.slice(0, props.length));
+    }
+  }))), props.keyboard && /*#__PURE__*/React.cloneElement(props.keyboard, {
+    visible: focused,
+    onInput: function onInput(v) {
+      if (value.length < cellLength) {
+        setValue((value + v).slice(0, props.length));
+      }
+    },
+    onDelete: function onDelete() {
+      setValue(value.slice(0, -1));
+    },
+    onClose: function onClose() {
+      var _a;
+
+      (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+    }
+  }));
+});

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

@@ -7,7 +7,7 @@ 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';
+import { useMemoizedFn } from 'ahooks';
 var classPrefix = "adm-picker";
 var defaultProps = {
   defaultValue: []
@@ -42,7 +42,7 @@ export var Picker = /*#__PURE__*/memo(function (p) {
       setInnerValue = _useState[1];
 
   useEffect(function () {
-    if (!props.visible) {
+    if (innerValue !== value) {
       setInnerValue(value);
     }
   }, [props.visible]);
@@ -51,7 +51,7 @@ export var Picker = /*#__PURE__*/memo(function (p) {
       setInnerValue(value);
     }
   }, [value]);
-  var onChange = usePersistFn(function (val, ext) {
+  var onChange = useMemoizedFn(function (val, ext) {
     var _a;
 
     setInnerValue(val);
@@ -103,7 +103,9 @@ export var Picker = /*#__PURE__*/memo(function (p) {
     afterShow: props.afterShow,
     afterClose: props.afterClose,
     onClick: props.onClick,
+    forceRender: true,
     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));
-});
+});
+Picker.displayName = 'Picker';

package/2x/es/components/picker-view/picker-view.css

@@ -5,6 +5,7 @@
   display: flex;
   position: relative;
   overflow: hidden;
+  background: var(--adm-color-white);
 }
 
 .adm-picker-view-column {
@@ -13,6 +14,7 @@
   user-select: none;
   touch-action: none;
   position: relative;
+  z-index: 0;
 }
 
 .adm-picker-view-column-wheel {
@@ -56,22 +58,61 @@
   white-space: nowrap;
 }
 
+.adm-picker-view-column-accessible {
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  opacity: 0;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.adm-picker-view-column-accessible > * {
+  flex: 1;
+  text-overflow: ellipsis;
+}
+
+.adm-picker-view-column-accessible-current {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+}
+
+.adm-picker-view-column-accessible-button {
+  width: 100%;
+  height: 100%;
+}
+
 .adm-picker-view-mask {
   position: absolute;
+  z-index: 100;
   left: 0;
+  top: 0;
   width: 100%;
-  height: calc(50% - 24px);
+  height: 100%;
+  display: flex;
+  flex-direction: column;
   pointer-events: none;
 }
 
-.adm-picker-view-mask-top {
-  top: -10px;
+.adm-picker-view-mask-top,
+.adm-picker-view-mask-bottom {
+  flex: auto;
+}
+
+.adm-picker-view-mask-middle {
+  height: 68px;
+  box-sizing: border-box;
+  flex: none;
+  border-top: solid 2px var(--adm-border-color);
   border-bottom: solid 2px var(--adm-border-color);
+}
+
+.adm-picker-view-mask-top {
   background: linear-gradient(0deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
 }
 
 .adm-picker-view-mask-bottom {
-  bottom: -10px;
-  border-top: solid 2px var(--adm-border-color);
   background: linear-gradient(180deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
 }