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

package/es/components/tag/tag.css

@@ -1,19 +1,17 @@
 .adm-tag {
-  padding: 2px 4px;
-  font-size: 10px;
+  --border-radius: var(--adm-tag-border-radius, 2px);
+  padding: 3px 5px;
+  font-size: 12px;
+  line-height: 1;
   font-weight: normal;
-  background-color: var(--color);
-  color: #ffffff;
+  background: var(--background-color);
+  color: var(--text-color);
   display: inline-block;
   white-space: nowrap;
-  border-radius: 2px;
-  border: 0.5px solid var(--color);
+  border-radius: var(--border-radius);
+  border: 0.5px solid var(--border-color);
   box-sizing: border-box;
 }
 .adm-tag-round {
   border-radius: 100px;
 }
-.adm-tag-outline {
-  background: transparent;
-  color: var(--color);
-}

package/es/components/tag/tag.d.ts

@@ -5,5 +5,5 @@ export declare type TagProps = {
     fill?: 'solid' | 'outline';
     round?: boolean;
     onClick?: (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => void;
-} & NativeProps;
+} & NativeProps<'--border-color' | '--background-color' | '--text-color' | '--border-radius'>;
 export declare const Tag: FC<TagProps>;

package/es/components/tag/tag.js

@@ -23,11 +23,13 @@ export var Tag = function Tag(p) {
   var props = mergeProps(defaultProps, p);
   var color = (_a = colorRecord[props.color]) !== null && _a !== void 0 ? _a : props.color;
   var style = {
-    '--color': color
+    '--border-color': color,
+    '--text-color': props.fill === 'outline' ? color : '#ffffff',
+    '--background-color': props.fill === 'outline' ? 'transparent' : color
   };
   return withNativeProps(props, /*#__PURE__*/React.createElement("span", {
     style: style,
     onClick: props.onClick,
-    className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-round"] = props.round, _classNames[classPrefix + "-outline"] = props.fill === 'outline', _classNames))
+    className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-round"] = props.round, _classNames))
   }, props.children));
 };

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>>;

package/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/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,9 @@ 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';

package/es/index.js

@@ -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,10 +52,12 @@ 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'; // TODO: deprecated
 
+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';
@@ -59,15 +67,9 @@ 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 WaterMark } from './components/water-mark';

package/es/locales/base.d.ts

@@ -3,6 +3,9 @@ export declare const base: {
         confirm: string;
         cancel: string;
     };
+    Cascader: {
+        placeholder: string;
+    };
     Dialog: {
         ok: string;
     };
@@ -30,5 +33,8 @@ export declare const base: {
     Mask: {
         name: string;
     };
+    Modal: {
+        ok: string;
+    };
 };
 export declare type Locale = typeof base;

package/es/locales/base.js

@@ -3,6 +3,9 @@ export var base = {
     confirm: 'Confirm',
     cancel: 'Cancel'
   },
+  Cascader: {
+    placeholder: 'Selecting'
+  },
   Dialog: {
     ok: 'OK'
   },
@@ -29,5 +32,8 @@ export var base = {
   },
   Mask: {
     name: 'Mask'
+  },
+  Modal: {
+    ok: 'OK'
   }
 };

package/es/locales/en-US.d.ts

@@ -3,6 +3,9 @@ declare const enUS: {
         confirm: string;
         cancel: string;
     };
+    Cascader: {
+        placeholder: string;
+    };
     Dialog: {
         ok: string;
     };
@@ -30,5 +33,8 @@ declare const enUS: {
     Mask: {
         name: string;
     };
+    Modal: {
+        ok: string;
+    };
 };
 export default enUS;

package/es/locales/zh-CN.d.ts

@@ -3,6 +3,9 @@ declare const zhCN: {
         confirm: string;
         cancel: string;
     };
+    Cascader: {
+        placeholder: string;
+    };
     Dialog: {
         ok: string;
     };
@@ -30,5 +33,8 @@ declare const zhCN: {
     Mask: {
         name: string;
     };
+    Modal: {
+        ok: string;
+    };
 };
 export default zhCN;

package/es/locales/zh-CN.js

@@ -5,6 +5,9 @@ var zhCN = mergeLocale(base, {
     confirm: '确定',
     cancel: '取消'
   },
+  Cascader: {
+    placeholder: '请选择'
+  },
   Dialog: {
     ok: '我知道了'
   },
@@ -31,6 +34,9 @@ var zhCN = mergeLocale(base, {
   },
   Mask: {
     name: '遮罩层'
+  },
+  Modal: {
+    ok: '我知道了'
   }
 });
 export default zhCN;

package/es/utils/use-props-value.js

@@ -1,5 +1,5 @@
-import { useCallback, useRef } from 'react';
-import { useUpdate } from 'ahooks';
+import { useRef } from 'react';
+import { usePersistFn, useUpdate } from 'ahooks';
 export function usePropsValue(options) {
   var value = options.value,
       defaultValue = options.defaultValue,
@@ -11,13 +11,13 @@ export function usePropsValue(options) {
     stateRef.current = value;
   }
 
-  var setState = useCallback(function (v) {
+  var setState = usePersistFn(function (v) {
     if (value === undefined) {
       stateRef.current = v;
       update();
     }
 
     onChange === null || onChange === void 0 ? void 0 : onChange(v);
-  }, [value, update, onChange]);
+  });
   return [stateRef.current, setState];
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "antd-mobile",
-  "version": "5.0.0-rc.0",
+  "version": "5.0.0-rc.4",
   "dependencies": {
-    "@react-spring/web": "^9.3.0",
+    "@react-spring/web": "^9.3.1",
     "@types/resize-observer-browser": "^0.1.6",
-    "@use-gesture/react": "10.1.5",
-    "ahooks": "^2.10.12",
+    "@use-gesture/react": "^10.2.2",
+    "ahooks": "^2.10.14",
     "antd-mobile-icons": "^0.2.2",
     "antd-mobile-v5-count": "^1.0.1",
     "classnames": "^2.3.1",