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

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

@@ -13,6 +13,7 @@
   user-select: none;
   touch-action: none;
   position: relative;
+  z-index: 0;
 }
 
 .adm-picker-view-column-wheel {
@@ -56,22 +57,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);
 }

package/2x/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/2x/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/2x/es/components/search-bar/search-bar.css

@@ -37,7 +37,7 @@
 
 .adm-search-bar .adm-search-bar-input-box .adm-search-bar-input .adm-input {
   font-size: 26px;
-  line-height: 40px;
+  line-height: 38px;
 }
 
 .adm-search-bar .adm-search-bar-suffix {

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

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

package/2x/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/2x/es/components/switch/switch.css

@@ -6,6 +6,9 @@
 
 .adm-switch {
   --checked-color: var(--adm-color-primary);
+  --height: 60px;
+  --width: 100px;
+  --border-width: 4px;
   display: inline-block;
   vertical-align: middle;
   box-sizing: border-box;
@@ -22,24 +25,24 @@
 }
 
 .adm-switch-checkbox {
-  min-width: 102px;
-  height: 62px;
+  min-width: var(--width);
+  height: var(--height);
   box-sizing: border-box;
   border-radius: 62px;
   background: #e5e5e5;
   z-index: 0;
   overflow: hidden;
-  line-height: 62px;
+  line-height: var(--height);
 }
 
 .adm-switch-checkbox:before {
   content: ' ';
   position: absolute;
-  left: 4px;
-  top: 4px;
-  width: calc(100% - 2 * 4px);
-  height: 54px;
-  border-radius: 54px;
+  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;
@@ -51,14 +54,14 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 54px;
-  height: 54px;
-  border-radius: 54px;
+  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: 4px;
-  left: 4px;
+  top: var(--border-width);
+  left: var(--border-width);
   transition: all 200ms;
   box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.2), 0 4px 23px 0 rgba(0, 0, 0, 0.08), -2px 4px 4px 0 rgba(0, 0, 0, 0.1);
 }
@@ -66,7 +69,7 @@
 .adm-switch-inner {
   position: relative;
   z-index: 1;
-  margin: 0 20px 0 68px;
+  margin: 0 20px 0 calc(var(--height) - var(--border-width) + 10px);
   color: var(--adm-color-weak);
   transition: margin 200ms;
 }
@@ -80,11 +83,11 @@
 }
 
 .adm-switch.adm-switch-checked .adm-switch-handle {
-  left: calc(100% - (62px - 4px));
+  left: calc(100% - (var(--height) - var(--border-width)));
 }
 
 .adm-switch.adm-switch-checked .adm-switch-inner {
-  margin: 0 68px 0 20px;
+  margin: 0 calc(var(--height) - var(--border-width) + 10px) 0 20px;
   color: var(--adm-color-white);
 }
 

package/2x/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/2x/es/components/tag/tag.css

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

package/2x/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/2x/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/2x/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/2x/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/2x/es/components/toast/toast.css

@@ -2,29 +2,32 @@
   position: absolute;
   top: 50%;
   left: 50%;
-  width: fit-content;
+  width: auto;
   min-width: 192px;
   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: 16px;
   transform: translate(-50%, -50%);
   pointer-events: all;
+  font-size: 30px;
+  line-height: 1.5;
+  box-sizing: border-box;
 }
 
 .adm-toast-mask .adm-toast-wrap-text {
-  padding: 16px 24px;
+  padding: 24px;
 }
 
 .adm-toast-mask .adm-toast-wrap-icon {
-  padding: 32px;
+  padding: 70px 80px;
 }
 
 .adm-toast-mask .adm-toast-wrap-icon .adm-toast-icon {
+  text-align: center;
   margin-bottom: 16px;
   font-size: 72px;
   line-height: 1;

package/2x/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/2x/es/components/virtual-input/virtual-input.css

@@ -6,30 +6,35 @@
   --text-align: left;
   --caret-width: var(--adm-virtual-input-caret-width, 4px);
   --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 {
@@ -49,10 +54,10 @@
   width: var(--caret-width);
   height: 1.3em;
   vertical-align: top;
+  margin-right: 2px;
 }
 
 .adm-virtual-input-caret {
-  display: none;
   width: 100%;
   height: 100%;
   background-color: var(--caret-color);
@@ -92,4 +97,17 @@
   to {
     opacity: 0;
   }
+}
+
+.adm-virtual-input-clear {
+  flex: none;
+  margin-left: 16px;
+  color: var(--placeholder-color);
+  padding: 6px;
+  cursor: pointer;
+}
+
+.adm-virtual-input-clear .antd-mobile-icon {
+  display: block;
+  font-size: 28px;
 }

package/2x/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>>;

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

@@ -1,8 +1,9 @@
-import React, { forwardRef, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import classNames from 'classnames';
+import { CloseCircleFill } from 'antd-mobile-icons';
 var classPrefix = 'adm-virtual-input';
 var defaultProps = {
   defaultValue: ''
@@ -17,12 +18,13 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
       setValue = _usePropsValue[1];
 
   var rootRef = useRef(null);
+  var contentRef = useRef(null);
 
   var _useState = useState(false),
-      keyboardVisible = _useState[0],
-      setKeyboardVisible = _useState[1];
+      hasFocus = _useState[0],
+      setHasFocus = _useState[1];
 
-  useLayoutEffect(function () {
+  function scrollToEnd() {
     var root = rootRef.current;
     if (!root) return;
 
@@ -30,10 +32,21 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
       return;
     }
 
-    root.scrollTo({
-      left: root.clientWidth
+    var content = contentRef.current;
+    if (!content) return;
+    content.scrollTo({
+      left: content.clientWidth
     });
+  }
+
+  useLayoutEffect(function () {
+    scrollToEnd();
   }, [value]);
+  useEffect(function () {
+    if (hasFocus) {
+      scrollToEnd();
+    }
+  }, [hasFocus]);
   useImperativeHandle(ref, function () {
     return {
       focus: function focus() {
@@ -49,10 +62,17 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
     };
   });
 
+  function onFocus() {
+    var _a;
+
+    setHasFocus(true);
+    (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props);
+  }
+
   function onBlur() {
     var _a;
 
-    setKeyboardVisible(false);
+    setHasFocus(false);
     (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props);
   }
 
@@ -60,21 +80,26 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
     ref: rootRef,
     className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-disabled"] = props.disabled, _classNames)),
     tabIndex: props.disabled ? undefined : 0,
-    onFocus: function onFocus() {
-      var _a;
-
-      setKeyboardVisible(true);
-      (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props);
-    },
+    onFocus: onFocus,
     onBlur: onBlur,
     onClick: props.onClick
   }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-content"
+    className: classPrefix + "-content",
+    ref: contentRef
   }, value, /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-caret-container"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, hasFocus && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-caret"
-  }))), !value && /*#__PURE__*/React.createElement("div", {
+  }))), props.clearable && !!value && hasFocus && /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-clear",
+    onClick: function onClick(e) {
+      var _a;
+
+      e.stopPropagation();
+      setValue('');
+      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
+    }
+  }, /*#__PURE__*/React.createElement(CloseCircleFill, null)), !value && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-placeholder"
   }, props.placeholder), props.keyboard && /*#__PURE__*/React.cloneElement(props.keyboard, {
     onInput: function onInput(v) {
@@ -83,7 +108,11 @@ export var VirtualInput = /*#__PURE__*/forwardRef(function (p, ref) {
     onDelete: function onDelete() {
       setValue(value.slice(0, -1));
     },
-    visible: keyboardVisible,
-    onClose: onBlur
+    visible: hasFocus,
+    onClose: function onClose() {
+      var _a;
+
+      (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+    }
   })));
 });

package/2x/es/index.d.ts

@@ -4,22 +4,25 @@ export { default as ActionSheet } from './components/action-sheet';
 export { default as AutoCenter } from './components/auto-center';
 export { default as Badge } from './components/badge';
 export { default as Button } from './components/button';
+export { default as CapsuleTabs } from './components/capsule-tabs';
 export { default as Card } from './components/card';
 export { default as CascadePicker } from './components/cascade-picker';
 export { default as CascadePickerView } from './components/cascade-picker-view';
+export { default as Cascader } from './components/cascader';
+export { default as CascaderView } from './components/cascader-view';
 export { default as CheckList } from './components/check-list';
 export { default as Checkbox } from './components/checkbox';
 export { default as Collapse } from './components/collapse';
 export { default as ConfigProvider } from './components/config-provider';
 export { default as DatePicker } from './components/date-picker';
 export { default as DatePickerView } from './components/date-picker-view';
-export { default as DesenseText } from './components/desense-text';
 export { default as Dialog } from './components/dialog';
 export { default as Divider } from './components/divider';
 export { default as Dropdown } from './components/dropdown';
 export { default as Ellipsis } from './components/ellipsis';
 export { default as Empty } from './components/empty';
 export { default as ErrorBlock } from './components/error-block';
+export { default as FloatingBubble } from './components/floating-bubble';
 export { default as FloatingPanel } from './components/floating-panel';
 export { default as Form } from './components/form';
 export { default as Grid } from './components/grid';
@@ -29,11 +32,14 @@ export { default as ImageViewer } from './components/image-viewer';
 export { default as IndexBar } from './components/index-bar';
 export { default as InfiniteScroll } from './components/infinite-scroll';
 export { default as Input } from './components/input';
+export { default as JumboTabs } from './components/jumbo-tabs';
 export { default as List } from './components/list';
 export { default as Loading } from './components/loading';
 export { default as Mask } from './components/mask';
+export { default as Modal } from './components/modal';
 export { default as NavBar } from './components/nav-bar';
 export { default as NoticeBar } from './components/notice-bar';
+export { default as NumberKeyboard } from './components/number-keyboard';
 export { default as PageIndicator } from './components/page-indicator';
 export { default as Picker } from './components/picker';
 export { default as PickerView } from './components/picker-view';
@@ -46,9 +52,11 @@ export { default as Radio } from './components/radio';
 export { default as Rate } from './components/rate';
 export { default as Result } from './components/result';
 export { default as SafeArea } from './components/safe-area';
-export { default as SearchBar } from './components/search-bar';
+export { default as ScrollMask } from './components/scroll-mask';
 export { default as Search } from './components/search-bar';
+export { default as SearchBar } from './components/search-bar';
 export { default as Selector } from './components/selector';
+export { default as SideBar } from './components/side-bar';
 export { default as Slider } from './components/slider';
 export { default as Space } from './components/space';
 export { default as Stepper } from './components//stepper';
@@ -58,15 +66,10 @@ export { default as Swiper } from './components/swiper';
 export { default as Switch } from './components/switch';
 export { default as TabBar } from './components/tab-bar';
 export { default as Tabs } from './components/tabs';
-export { default as CapsuleTabs } from './components/capsule-tabs';
-export { default as JumboTabs } from './components/jumbo-tabs';
 export { default as Tag } from './components/tag';
 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 NumberKeyboard } from './components/number-keyboard';
-export { default as SideBar } from './components/side-bar';
-export { default as ScrollMask } from './components/scroll-mask';
-export { default as FloatingBubble } from './components/floating-bubble';
+export { default as PasscodeInput } from './components/passcode-input';