antd-mobile 5.0.0-rc.3 → 5.0.0-rc.7

package/cjs/components/number-keyboard/number-keyboard.css

@@ -3,8 +3,7 @@
   flex-wrap: wrap;
   flex: 1;
 }
-.adm-number-keyboard.confirmed-style {
-  width: 75%;
+.adm-number-keyboard-main.confirmed-style .sign-key {
   background-color: var(--adm-color-white);
 }
 .adm-number-keyboard-popup.adm-popup {
@@ -105,6 +104,7 @@
   color: var(--adm-color-white);
   height: 144px;
   font-size: 16px;
+  border: none;
 }
 .adm-number-keyboard-bs-key {
   height: 20px;

package/cjs/components/number-keyboard/number-keyboard.js

@@ -105,7 +105,8 @@ 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

package/cjs/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: 3px;

package/cjs/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/cjs/components/passcode-input/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+require("./passcode-input.css");
+
+var _passcodeInput2 = require("./passcode-input");
+
+var _default = _passcodeInput2.PasscodeInput;
+exports["default"] = _default;

package/cjs/components/passcode-input/passcode-input.css

@@ -0,0 +1,136 @@
+.adm-passcode-input {
+  position: relative;
+  display: inline-block;
+  --cell-size: 40px;
+  --cell-gap: 6px;
+  --dot-size: 10px;
+  --border-color: #e5e5e5;
+  --border-radius: 8px;
+}
+.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: 18px;
+  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: 1px solid var(--border-color);
+}
+.adm-passcode-input:not(.seperated) .adm-passcode-input-cell:not(:last-child) {
+  border-right: 1px solid var(--border-color);
+}
+.adm-passcode-input:not(.seperated).focused {
+  border-color: var(--adm-color-primary);
+  box-shadow: 0 0 2px 0 var(--adm-color-primary);
+  outline: none;
+}
+.adm-passcode-input:not(.seperated).error {
+  border-color: var(--adm-color-danger);
+  box-shadow: 0 0 2px 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: 1px 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 2px 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 2px 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: 2px;
+  height: 1.1em;
+  margin-left: 1px;
+  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: 50px;
+  height: 20px;
+  opacity: 0.5;
+}
+@keyframes adm-shake-horizontal {
+  0% {
+    transform: translateX(0);
+  }
+  10% {
+    transform: translateX(-4px);
+  }
+  20% {
+    transform: translateX(5px);
+  }
+  30% {
+    transform: translateX(-1px);
+  }
+  40% {
+    transform: translateX(8px);
+  }
+  50% {
+    transform: translateX(0);
+  }
+  60% {
+    transform: translateX(-8px);
+  }
+  70% {
+    transform: translateX(1px);
+  }
+  80% {
+    transform: translateX(-5px);
+  }
+  90% {
+    transform: translateX(4px);
+  }
+  100% {
+    transform: translateX(0);
+  }
+}
+@keyframes adm-caret-blink {
+  from {
+    opacity: 1;
+  }
+  60% {
+    opacity: 1;
+  }
+  80% {
+    opacity: 0;
+  }
+  to {
+    opacity: 0;
+  }
+}

package/cjs/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/cjs/components/passcode-input/passcode-input.js

@@ -0,0 +1,169 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PasscodeInput = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _withDefaultProps = require("../../utils/with-default-props");
+
+var _nativeProps = require("../../utils/native-props");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _bound = require("../../utils/bound");
+
+var _usePropsValue2 = require("../../utils/use-props-value");
+
+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 classPrefix = 'adm-passcode-input';
+var defaultProps = {
+  defaultValue: '',
+  length: 6,
+  plain: false,
+  error: false,
+  seperated: false,
+  caret: true
+};
+var PasscodeInput = /*#__PURE__*/(0, _react.forwardRef)(function (p, ref) {
+  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p); // 防止 length 值不合法
+
+  var cellLength = props.length > 0 && props.length < Infinity ? Math.floor(props.length) : defaultProps.length;
+
+  var _useState = (0, _react.useState)(false),
+      focused = _useState[0],
+      setFocused = _useState[1];
+
+  var _usePropsValue = (0, _usePropsValue2.usePropsValue)(props),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
+
+  var rootRef = (0, _react.useRef)(null);
+  var nativeInputRef = (0, _react.useRef)(null);
+  (0, _react.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);
+  };
+
+  (0, _react.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);
+  };
+
+  (0, _react.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 = (0, _bound.bound)(chars.length, 0, cellLength - 1);
+
+    for (var i = 0; i < cellLength; i++) {
+      cells.push( /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _classnames["default"])(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 = (0, _classnames["default"])(classPrefix, {
+    focused: focused,
+    error: props.error,
+    seperated: props.seperated
+  });
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
+    ref: rootRef,
+    tabIndex: 0,
+    className: cls,
+    onFocus: onFocus,
+    onBlur: onBlur
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: classPrefix + "-cell-container"
+  }, renderCells()), /*#__PURE__*/_react["default"].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["default"].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();
+    }
+  }));
+});
+exports.PasscodeInput = PasscodeInput;

package/cjs/components/picker/picker.js

@@ -65,7 +65,7 @@ var Picker = /*#__PURE__*/(0, _react.memo)(function (p) {
       setInnerValue = _useState[1];
 
   (0, _react.useEffect)(function () {
-    if (!props.visible) {
+    if (innerValue !== value) {
       setInnerValue(value);
     }
   }, [props.visible]);
@@ -127,9 +127,11 @@ var Picker = /*#__PURE__*/(0, _react.memo)(function (p) {
     afterShow: props.afterShow,
     afterClose: props.afterClose,
     onClick: props.onClick,
+    forceRender: true,
     stopPropagation: props.stopPropagation
   }, pickerElement);
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, generateValueExtend(value).items));
 });
-exports.Picker = Picker;
+exports.Picker = Picker;
+Picker.displayName = 'Picker';

package/cjs/components/picker-view/column.d.ts

@@ -1,9 +1,10 @@
-import { FC } from 'react';
+import React from 'react';
 import { PickerColumnItem, PickerValue } from './index';
 interface Props {
+    index: number;
     column: PickerColumnItem[];
     value: PickerValue;
-    onSelect: (value: PickerValue) => void;
+    onSelect: (value: PickerValue, index: number) => void;
 }
-export declare const Column: FC<Props>;
+export declare const Column: React.NamedExoticComponent<Props>;
 export {};

package/cjs/components/picker-view/column.js

@@ -17,18 +17,24 @@ var _rubberband = require("../../utils/rubberband");
 
 var _bound = require("../../utils/bound");
 
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
+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 classPrefix = "adm-picker-view";
-
-var Column = function Column(props) {
+var Column = /*#__PURE__*/(0, _react.memo)(function (props) {
   var itemHeight = (0, _convertPx.convertPx)(34);
   var value = props.value,
-      onSelect = props.onSelect,
       column = props.column;
 
+  function onSelect(val) {
+    props.onSelect(val, props.index);
+  }
+
   var _useSpring = (0, _web.useSpring)(function () {
     return {
       from: {
@@ -54,20 +60,20 @@ var Column = function Column(props) {
     var finalPosition = targetIndex * -itemHeight;
     api.start({
       y: finalPosition,
-      immediate: y.idle
+      immediate: y.goal !== finalPosition
     });
   }, [value, column]);
   (0, _react.useLayoutEffect)(function () {
     if (column.length === 0) {
       if (value !== null) {
-        props.onSelect(null);
+        onSelect(null);
       }
     } else {
       if (!column.some(function (item) {
         return item.value === value;
       })) {
         var firstItem = column[0];
-        props.onSelect(firstItem.value);
+        onSelect(firstItem.value);
       }
     }
   }, [column, value]);
@@ -106,14 +112,53 @@ var Column = function Column(props) {
       touch: true
     }
   });
+  var selectedIndex = null;
+
+  function renderAccessible() {
+    if (selectedIndex === null) {
+      return null;
+    }
+
+    var current = column[selectedIndex];
+    var previousIndex = selectedIndex - 1;
+    var nextIndex = selectedIndex + 1;
+    var previous = column[previousIndex];
+    var next = column[nextIndex];
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: 'adm-picker-view-column-accessible'
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: 'adm-picker-view-column-accessible-current',
+      role: 'button',
+      "aria-label": current ? "\u5F53\u524D\u9009\u62E9\u7684\u662F\uFF1A" + current.label : '当前未选择'
+    }, "-"), /*#__PURE__*/_react["default"].createElement("div", null, previous && /*#__PURE__*/_react["default"].createElement("div", {
+      className: 'adm-picker-view-column-accessible-button',
+      onClick: function onClick() {
+        scrollSelect(previousIndex);
+      },
+      role: 'button',
+      "aria-label": "\u9009\u62E9\u4E0A\u4E00\u9879\uFF1A" + previous.label
+    }, "-")), /*#__PURE__*/_react["default"].createElement("div", null, next && /*#__PURE__*/_react["default"].createElement("div", {
+      className: 'adm-picker-view-column-accessible-button',
+      onClick: function onClick() {
+        scrollSelect(nextIndex);
+      },
+      role: 'button',
+      "aria-label": "\u9009\u62E9\u4E0B\u4E00\u9879\uFF1A" + next.label
+    }, "-")));
+  }
+
   return /*#__PURE__*/_react["default"].createElement("div", Object.assign({
     className: classPrefix + "-column"
   }, bind()), /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
     style: {
       y: y
     },
-    className: classPrefix + "-column-wheel"
+    className: classPrefix + "-column-wheel",
+    "aria-hidden": true
   }, column.map(function (item, index) {
+    var selected = props.value === item.value;
+    if (selected) selectedIndex = index;
+
     function handleClick() {
       draggingRef.current = false;
       scrollSelect(index);
@@ -121,12 +166,24 @@ var Column = function Column(props) {
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: item.value,
+      "data-selected": item.value === value,
       className: classPrefix + "-column-item",
-      onClick: handleClick
+      onClick: handleClick,
+      "aria-hidden": !selected,
+      "aria-label": selected ? 'active' : ''
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: classPrefix + "-column-item-label"
     }, item.label));
-  })));
-};
+  })), renderAccessible());
+}, function (prev, next) {
+  if (prev.value !== next.value) return false;
+  if (prev.onSelect !== next.onSelect) return false;
+
+  if (!(0, _isEqual["default"])(prev.column, next.column)) {
+    return false;
+  }
 
-exports.Column = Column;
+  return true;
+});
+exports.Column = Column;
+Column.displayName = 'Column';

package/cjs/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 {
   height: 100%;
@@ -12,6 +13,7 @@
   user-select: none;
   touch-action: none;
   position: relative;
+  z-index: 0;
 }
 .adm-picker-view-column-wheel {
   width: 100%;
@@ -49,20 +51,53 @@
   text-overflow: ellipsis;
   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% - 12px);
+  height: 100%;
+  display: flex;
+  flex-direction: column;
   pointer-events: none;
 }
-.adm-picker-view-mask-top {
-  top: -5px;
+.adm-picker-view-mask-top,
+.adm-picker-view-mask-bottom {
+  flex: auto;
+}
+.adm-picker-view-mask-middle {
+  height: 34px;
+  box-sizing: border-box;
+  flex: none;
+  border-top: solid 1px var(--adm-border-color);
   border-bottom: solid 1px 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: -5px;
-  border-top: solid 1px var(--adm-border-color);
   background: linear-gradient(180deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
 }