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

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/popup/popup.js

@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import React, { useState, useRef } from 'react';
+import { useUnmountedRef } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import Mask from '../mask';
@@ -29,6 +30,7 @@ export var Popup = function Popup(p) {
 
   useLockScroll(ref, active);
   var shouldRender = useShouldRender(active, props.forceRender, props.destroyOnClose);
+  var unmountedRef = useUnmountedRef();
 
   var _useSpring = useSpring({
     percent: props.visible ? 0 : 100,
@@ -44,6 +46,7 @@ export var Popup = function Popup(p) {
     onRest: function onRest() {
       var _a, _b;
 
+      if (unmountedRef.current) return;
       setActive(props.visible);
 
       if (props.visible) {

package/es/components/search-bar/search-bar.css

@@ -32,7 +32,7 @@
 }
 .adm-search-bar .adm-search-bar-input-box .adm-search-bar-input .adm-input {
   font-size: 13px;
-  line-height: 20px;
+  line-height: 19px;
 }
 .adm-search-bar .adm-search-bar-suffix {
   flex: none;

package/es/components/swipe-action/swipe-action.css

@@ -14,7 +14,8 @@
   display: flex;
   justify-content: center;
   align-items: stretch;
-  width: fit-content;
+  width: auto;
+  white-space: nowrap;
 }
 .adm-swipe-action-actions-right {
   left: 100%;

package/es/components/swiper/swiper.js

@@ -15,11 +15,11 @@ var defaultProps = {
   allowTouchMove: true,
   autoplay: false,
   autoplayInterval: 3000,
-  loop: true,
+  loop: false,
   direction: 'horizontal',
   slideSize: 100,
   trackOffset: 0,
-  stuckAtBoundary: false,
+  stuckAtBoundary: true,
   rubberband: true
 };
 export var Swiper = /*#__PURE__*/forwardRef(staged(function (p, ref) {
@@ -84,7 +84,7 @@ export var Swiper = /*#__PURE__*/forwardRef(staged(function (p, ref) {
       var max = count - 1;
 
       if (props.stuckAtBoundary) {
-        min += (1 - slideRatio - offsetRatio) / slideRatio;
+        min += offsetRatio / slideRatio;
         max -= (1 - slideRatio - offsetRatio) / slideRatio;
       }
 
@@ -244,7 +244,7 @@ export var Swiper = /*#__PURE__*/forwardRef(staged(function (p, ref) {
               var flagWidth = totalWidth / 2;
               finalPosition = modulus(finalPosition + flagWidth, totalWidth) - flagWidth;
               return finalPosition + "%";
-            }), _style.left = "-" + index * 100 + "%", _style)
+            }), _style[isVertical ? 'top' : 'left'] = "-" + index * 100 + "%", _style)
           }, child);
         }));
       } else {

package/es/components/switch/switch.css

@@ -5,6 +5,9 @@
 }
 .adm-switch {
   --checked-color: var(--adm-color-primary);
+  --height: 30px;
+  --width: 50px;
+  --border-width: 2px;
   display: inline-block;
   vertical-align: middle;
   box-sizing: border-box;
@@ -19,23 +22,23 @@
   display: none;
 }
 .adm-switch-checkbox {
-  min-width: 51px;
-  height: 31px;
+  min-width: var(--width);
+  height: var(--height);
   box-sizing: border-box;
   border-radius: 31px;
   background: #e5e5e5;
   z-index: 0;
   overflow: hidden;
-  line-height: 31px;
+  line-height: var(--height);
 }
 .adm-switch-checkbox:before {
   content: ' ';
   position: absolute;
-  left: 2px;
-  top: 2px;
-  width: calc(100% - 2 * 2px);
-  height: 27px;
-  border-radius: 27px;
+  left: var(--border-width);
+  top: var(--border-width);
+  width: calc(100% - 2 * var(--border-width));
+  height: calc(var(--height) - 2 * var(--border-width));
+  border-radius: calc(var(--height) - 2 * var(--border-width));
   box-sizing: border-box;
   background: #fff;
   z-index: 1;
@@ -46,21 +49,21 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 27px;
-  height: 27px;
-  border-radius: 27px;
+  width: calc(var(--height) - 2 * var(--border-width));
+  height: calc(var(--height) - 2 * var(--border-width));
+  border-radius: calc(var(--height) - 2 * var(--border-width));
   background: #fff;
   position: absolute;
   z-index: 2;
-  top: 2px;
-  left: 2px;
+  top: var(--border-width);
+  left: var(--border-width);
   transition: all 200ms;
   box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2), 0 2px 11.5px 0 rgba(0, 0, 0, 0.08), -1px 2px 2px 0 rgba(0, 0, 0, 0.1);
 }
 .adm-switch-inner {
   position: relative;
   z-index: 1;
-  margin: 0 10px 0 34px;
+  margin: 0 10px 0 calc(var(--height) - var(--border-width) + 5px);
   color: var(--adm-color-weak);
   transition: margin 200ms;
 }
@@ -71,10 +74,10 @@
   transform: scale(0);
 }
 .adm-switch.adm-switch-checked .adm-switch-handle {
-  left: calc(100% - (31px - 2px));
+  left: calc(100% - (var(--height) - var(--border-width)));
 }
 .adm-switch.adm-switch-checked .adm-switch-inner {
-  margin: 0 34px 0 10px;
+  margin: 0 calc(var(--height) - var(--border-width) + 5px) 0 10px;
   color: var(--adm-color-white);
 }
 .adm-switch.adm-switch-disabled {

package/es/components/switch/switch.d.ts

@@ -9,5 +9,5 @@ export declare type SwitchProps = {
     onChange?: (checked: boolean) => void;
     checkedText?: ReactNode;
     uncheckedText?: ReactNode;
-} & NativeProps<'--checked-color'>;
+} & NativeProps<'--checked-color' | '--width' | '--height' | '--border-width'>;
 export declare const Switch: FC<SwitchProps>;

package/es/components/tag/tag.css

@@ -1,7 +1,8 @@
 .adm-tag {
   --border-radius: var(--adm-tag-border-radius, 2px);
-  padding: 2px 4px;
-  font-size: 10px;
+  padding: 3px 5px;
+  font-size: 12px;
+  line-height: 1;
   font-weight: normal;
   background: var(--background-color);
   color: var(--text-color);

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/components/toast/toast.css

@@ -2,26 +2,29 @@
   position: absolute;
   top: 50%;
   left: 50%;
-  width: fit-content;
+  width: auto;
   min-width: 96px;
   max-width: 70%;
   max-height: 70%;
   overflow: auto;
   color: white;
-  text-align: center;
   word-break: break-all;
   background-color: rgba(0, 0, 0, 0.7);
   border-radius: 8px;
   transform: translate(-50%, -50%);
   pointer-events: all;
+  font-size: 15px;
+  line-height: 1.5;
+  box-sizing: border-box;
 }
 .adm-toast-mask .adm-toast-wrap-text {
-  padding: 8px 12px;
+  padding: 12px;
 }
 .adm-toast-mask .adm-toast-wrap-icon {
-  padding: 16px;
+  padding: 35px 40px;
 }
 .adm-toast-mask .adm-toast-wrap-icon .adm-toast-icon {
+  text-align: center;
   margin-bottom: 8px;
   font-size: 36px;
   line-height: 1;

package/es/components/toast/toast.js

@@ -4,6 +4,7 @@ import { CheckOutline, CloseOutline } from 'antd-mobile-icons';
 import Loading from '../loading';
 import Mask from '../mask';
 import { mergeProps } from '../../utils/with-default-props';
+import AutoCenter from '../auto-center';
 var classPrefix = "adm-toast";
 var defaultProps = {
   maskClickable: true,
@@ -66,5 +67,5 @@ export var InternalToast = function InternalToast(p) {
     className: classNames(classPrefix + "-wrap", icon ? classPrefix + "-wrap-icon" : classPrefix + "-wrap-text")
   }, iconElement && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-icon"
-  }, iconElement), content));
+  }, iconElement), /*#__PURE__*/React.createElement(AutoCenter, null, content)));
 };

package/es/components/virtual-input/virtual-input.css

@@ -6,27 +6,32 @@
   --text-align: left;
   --caret-width: var(--adm-virtual-input-caret-width, 2px);
   --caret-color: var(--adm-virtual-input-caret-color, var(--adm-color-primary));
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
   position: relative;
   text-align: var(--text-align);
   font-size: var(--font-size);
   line-height: 1.5;
   white-space: nowrap;
-  display: block;
-  overflow-y: hidden;
-  overflow-x: scroll;
   color: var(--color);
-  scrollbar-width: none;
 }
 .adm-virtual-input > * {
   vertical-align: top;
 }
-.adm-virtual-input::-webkit-scrollbar {
-  display: none;
-}
 .adm-virtual-input-content {
+  flex: auto;
   display: inline-block;
   position: relative;
   z-index: 1;
+  width: 100%;
+  max-width: 100%;
+  overflow-y: hidden;
+  overflow-x: scroll;
+  scrollbar-width: none;
+}
+.adm-virtual-input-content::-webkit-scrollbar {
+  display: none;
 }
 .adm-virtual-input-placeholder {
   display: block;
@@ -44,9 +49,9 @@
   width: var(--caret-width);
   height: 1.3em;
   vertical-align: top;
+  margin-right: 1px;
 }
 .adm-virtual-input-caret {
-  display: none;
   width: 100%;
   height: 100%;
   background-color: var(--caret-color);
@@ -80,3 +85,14 @@
     opacity: 0;
   }
 }
+.adm-virtual-input-clear {
+  flex: none;
+  margin-left: 8px;
+  color: var(--placeholder-color);
+  padding: 3px;
+  cursor: pointer;
+}
+.adm-virtual-input-clear .antd-mobile-icon {
+  display: block;
+  font-size: 14px;
+}

package/es/components/virtual-input/virtual-input.d.ts

@@ -7,6 +7,8 @@ export declare type VirtualInputProps = {
     onBlur?: () => void;
     onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
     keyboard?: ReactElement<NumberKeyboardProps>;
+    clearable?: boolean;
+    onClear?: () => void;
 } & Pick<InputProps, 'value' | 'onChange' | 'placeholder' | 'disabled'> & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align' | '--caret-width' | '--caret-color'>;
 export declare type VirtualInputRef = {
     focus: () => void;
@@ -17,4 +19,6 @@ export declare const VirtualInput: React.ForwardRefExoticComponent<{
     onBlur?: (() => void) | undefined;
     onClick?: ((e: React.MouseEvent<HTMLDivElement>) => void) | undefined;
     keyboard?: React.ReactElement<NumberKeyboardProps, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined;
+    clearable?: boolean | undefined;
+    onClear?: (() => void) | undefined;
 } & Pick<InputProps, "value" | "disabled" | "onChange" | "placeholder"> & NativeProps<"--font-size" | "--color" | "--placeholder-color" | "--disabled-color" | "--text-align" | "--caret-width" | "--caret-color"> & React.RefAttributes<VirtualInputRef>>;