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

package/es/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/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/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/es/components/picker/picker.js

@@ -103,6 +103,7 @@ 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));

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

@@ -88,14 +88,55 @@ export var Column = function Column(props) {
       touch: true
     }
   });
+  var selectedIndex = null;
+
+  function renderAccessible() {
+    console.log('selectedIndex', selectedIndex);
+
+    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.createElement("div", {
+      className: 'adm-picker-view-column-accessible'
+    }, /*#__PURE__*/React.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.createElement("div", null, previous && /*#__PURE__*/React.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.createElement("div", null, next && /*#__PURE__*/React.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.createElement("div", Object.assign({
     className: classPrefix + "-column"
   }, bind()), /*#__PURE__*/React.createElement(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);
@@ -103,10 +144,13 @@ export var Column = function Column(props) {
 
     return /*#__PURE__*/React.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.createElement("div", {
       className: classPrefix + "-column-item-label"
     }, item.label));
-  })));
+  })), renderAccessible());
 };

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

@@ -12,6 +12,7 @@
   user-select: none;
   touch-action: none;
   position: relative;
+  z-index: 0;
 }
 .adm-picker-view-column-wheel {
   width: 100%;
@@ -49,20 +50,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);
 }

package/es/components/picker-view/picker-view.js

@@ -59,8 +59,12 @@ export var PickerView = /*#__PURE__*/memo(function (p) {
       }
     });
   }), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-mask " + classPrefix + "-mask-top"
+    className: classPrefix + "-mask"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-mask-top"
   }), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-mask " + classPrefix + "-mask-bottom"
-  })));
+    className: classPrefix + "-mask-middle"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-mask-bottom"
+  }))));
 });

package/es/components/toast/index.d.ts

@@ -1,8 +1,9 @@
 import './toast.less';
-import { clear, show } from './methods';
+import { clear, show, config } from './methods';
 export type { ToastShowProps } from './methods';
 declare const Toast: {
     show: typeof show;
     clear: typeof clear;
+    config: typeof config;
 };
 export default Toast;

package/es/components/toast/index.js

@@ -1,7 +1,8 @@
 import "./toast.css";
-import { clear, show } from './methods';
+import { clear, show, config } from './methods';
 var Toast = {
   show: show,
-  clear: clear
+  clear: clear,
+  config: config
 };
 export default Toast;

package/es/components/toast/methods.d.ts

@@ -2,3 +2,4 @@ import { ToastProps } from './toast';
 export declare type ToastShowProps = Omit<ToastProps, 'visible'>;
 export declare function show(p: ToastShowProps | string): void;
 export declare function clear(): void;
+export declare function config(val: Pick<ToastProps, 'duration' | 'position' | 'maskClickable'>): void;

package/es/components/toast/methods.js

@@ -14,7 +14,9 @@ function unmount(container) {
 }
 
 var defaultProps = {
-  duration: 2000
+  duration: 2000,
+  position: 'center',
+  maskClickable: true
 };
 export function show(p) {
   var props = mergeProps(defaultProps, typeof p === 'string' ? {
@@ -74,4 +76,17 @@ export function clear() {
     if (!container) break;
     unmount(container);
   }
+}
+export function config(val) {
+  if (val.duration !== undefined) {
+    defaultProps.duration = val.duration;
+  }
+
+  if (val.position !== undefined) {
+    defaultProps.position = val.position;
+  }
+
+  if (val.maskClickable !== undefined) {
+    defaultProps.maskClickable = val.maskClickable;
+  }
 }

package/es/index.d.ts

@@ -72,3 +72,4 @@ export { default as Toast } from './components/toast';
 export { default as TreeSelect } from './components/tree-select';
 export { default as VirtualInput } from './components/virtual-input';
 export { default as WaterMark } from './components/water-mark';
+export { default as PasscodeInput } from './components/passcode-input';

package/es/index.js

@@ -72,4 +72,5 @@ export { default as TextArea } from './components/text-area';
 export { default as Toast } from './components/toast';
 export { default as TreeSelect } from './components/tree-select';
 export { default as VirtualInput } from './components/virtual-input';
-export { default as WaterMark } from './components/water-mark';
+export { default as WaterMark } from './components/water-mark';
+export { default as PasscodeInput } from './components/passcode-input';

package/es/utils/memo-with-event-marks.d.ts

@@ -0,0 +1,2 @@
+import { FunctionComponent } from 'react';
+export declare function memoWithEventMarks<P extends object>(Component: FunctionComponent<P>, eventProps: (keyof P)[]): import("react").NamedExoticComponent<P>;

package/es/utils/memo-with-event-marks.js

@@ -0,0 +1,15 @@
+import { memo } from 'react';
+export function memoWithEventMarks(Component, eventProps) {
+  return /*#__PURE__*/memo(Component, function (prevProps, nextProps) {
+    for (var k in nextProps) {
+      var key = k;
+      if (eventProps.includes(key)) continue;
+
+      if (prevProps[key] !== nextProps[key]) {
+        return false;
+      }
+    }
+
+    return true;
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.0.0-rc.4",
+  "version": "5.0.0-rc.5",
   "dependencies": {
     "@react-spring/web": "^9.3.1",
     "@types/resize-observer-browser": "^0.1.6",