antd-mobile 5.14.3 → 5.16.0

package/2x/cjs/components/progress-bar/progress-bar.js

@@ -11,25 +11,47 @@ var _nativeProps = require("../../utils/native-props");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _isNodeWithContent = require("../../utils/is-node-with-content");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const classPrefix = `adm-progress-bar`;
+const defaultProps = {
+  percent: 0,
+  rounded: true,
+  text: false
+};
 
 const ProgressBar = p => {
-  const props = (0, _withDefaultProps.mergeProps)({
-    percent: 0
-  }, p);
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const fillStyle = {
     width: `${props.percent}%`
   };
+
+  const textElement = function () {
+    if (props.text === true) {
+      return `${props.percent}%`;
+    }
+
+    if (typeof props.text === 'function') {
+      return props.text(props.percent);
+    }
+
+    return props.text;
+  }();
+
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: classPrefix
+    className: (0, _classnames.default)(classPrefix, props.rounded && `${classPrefix}-rounded`)
   }, _react.default.createElement("div", {
     className: `${classPrefix}-trail`
   }, _react.default.createElement("div", {
     className: `${classPrefix}-fill`,
     style: fillStyle
-  }))));
+  })), (0, _isNodeWithContent.isNodeWithContent)(textElement) && _react.default.createElement("div", {
+    className: `${classPrefix}-text`
+  }, textElement)));
 };
 
 exports.ProgressBar = ProgressBar;

package/2x/cjs/components/radio/radio.js

@@ -62,16 +62,16 @@ const Radio = p => {
 
     checked = groupContext.value.includes(value);
 
-    setChecked = checked => {
+    setChecked = innerChecked => {
       var _a;
 
-      if (checked) {
+      if (innerChecked) {
         groupContext.check(value);
       } else {
         groupContext.uncheck(value);
       }
 
-      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, checked);
+      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerChecked);
     };
 
     disabled = disabled || groupContext.disabled;

package/2x/cjs/components/rate/rate.css

@@ -1,7 +1,7 @@
 .adm-rate {
   --star-size: 48px;
   --active-color: #ffd21e;
-  --inactive-color: var(--adm-color-light);
+  --inactive-color: var(--adm-color-border);
   display: inline-flex;
 }
 
@@ -10,7 +10,7 @@
 }
 
 .adm-rate-star {
-  padding: calc(var(--star-size) / 8);
+  padding: 0.125em;
   line-height: var(--star-size);
   font-size: var(--star-size);
   color: var(--inactive-color);

package/2x/cjs/components/rate/rate.js

@@ -13,17 +13,17 @@ var _nativeProps = require("../../utils/native-props");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
-var _antdMobileIcons = require("antd-mobile-icons");
-
 var _usePropsValue = require("../../utils/use-props-value");
 
+var _star = require("./star");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const classPrefix = `adm-rate`;
 const defaultProps = {
   count: 5,
   allowHalf: false,
-  character: _react.default.createElement(_antdMobileIcons.StarFill, null),
+  character: _react.default.createElement(_star.Star, null),
   defaultValue: 0,
   readOnly: false,
   allowClear: true

package/2x/cjs/components/rate/star.d.ts

@@ -0,0 +1,2 @@
+import { FC } from 'react';
+export declare const Star: FC;

package/2x/cjs/components/rate/star.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Star = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const Star = () => {
+  // return (
+  //   <svg height='1em' viewBox='0 0 48 48' xmlns='http://www.w3.org/2000/svg'>
+  //     <title>{'star-fill\u5907\u4EFD 71'}</title>
+  //     <path
+  //       d='m24 36-10.52 5.53a2 2 0 0 1-2.902-2.108l2.01-11.714-8.511-8.296a2 2 0 0 1 1.108-3.411l11.762-1.71 5.26-10.657a2 2 0 0 1 3.586 0l5.26 10.658L42.815 16a2 2 0 0 1 1.108 3.411l-8.51 8.296 2.009 11.714a2 2 0 0 1-2.902 2.109L24 36Z'
+  //       fill='#E5E5E5'
+  //       fillRule='evenodd'
+  //     />
+  //   </svg>
+  // )
+  return _react.default.createElement("svg", {
+    viewBox: '0 0 42 40',
+    height: '1em',
+    xmlns: 'http://www.w3.org/2000/svg',
+    style: {
+      verticalAlign: '-0.125em'
+    }
+  }, _react.default.createElement("path", {
+    d: 'm21 34-10.52 5.53a2 2 0 0 1-2.902-2.108l2.01-11.714-8.511-8.296a2 2 0 0 1 1.108-3.411l11.762-1.71 5.26-10.657a2 2 0 0 1 3.586 0l5.26 10.658L39.815 14a2 2 0 0 1 1.108 3.411l-8.51 8.296 2.009 11.714a2 2 0 0 1-2.902 2.109L21 34Z',
+    fill: 'currentColor',
+    fillRule: 'evenodd'
+  }));
+};
+
+exports.Star = Star;

package/2x/cjs/components/safe-area/safe-area.css

@@ -1,12 +1,13 @@
 .adm-safe-area {
+  --multiple: var(--adm-safe-area-multiple, 1);
   display: block;
   width: 100%;
 }
 
 .adm-safe-area-position-top {
-  padding-top: calc(env(safe-area-inset-top) * var(--adm-hd));
+  padding-top: calc(env(safe-area-inset-top) * var(--multiple));
 }
 
 .adm-safe-area-position-bottom {
-  padding-bottom: calc(env(safe-area-inset-bottom) * var(--adm-hd));
+  padding-bottom: calc(env(safe-area-inset-bottom) * var(--multiple));
 }

package/2x/cjs/components/search-bar/search-bar.d.ts

@@ -31,4 +31,8 @@ export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps,
     onSearch?: ((val: string) => void) | undefined;
     onChange?: ((val: string) => void) | undefined;
     onCancel?: (() => void) | undefined;
-} & NativeProps<"--height" | "--border-radius" | "--padding-left" | "--background" | "--placeholder-color"> & React.RefAttributes<InputRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--height" | "--border-radius" | "--padding-left" | "--background" | "--placeholder-color", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<InputRef>>;

package/2x/cjs/components/slider/slider.js

@@ -178,7 +178,8 @@ const Slider = p => {
             dragLockRef.current -= 1;
           }, 100);
         }
-      }
+      },
+      "aria-label": props['aria-label']
     });
   };
 

package/2x/cjs/components/slider/thumb.d.ts

@@ -1,4 +1,5 @@
 import React, { FC, RefObject, ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
 declare type ThumbProps = {
     value: number;
     min: number;
@@ -8,6 +9,6 @@ declare type ThumbProps = {
     trackRef: RefObject<HTMLDivElement>;
     icon?: React.ReactNode;
     popover: boolean | ((value: number) => ReactNode);
-};
+} & NativeProps;
 declare const Thumb: FC<ThumbProps>;
 export default Thumb;

package/2x/cjs/components/slider/thumb.js

@@ -13,6 +13,8 @@ var _thumbIcon = require("./thumb-icon");
 
 var _popover = require("../popover/popover");
 
+var _configProvider = require("../config-provider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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; }
@@ -29,6 +31,9 @@ const Thumb = props => {
     icon
   } = props;
   const prevValue = (0, _react.useRef)(value);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
 
   const currentPosition = () => {
     return {
@@ -70,7 +75,14 @@ const Thumb = props => {
   return _react.default.createElement("div", Object.assign({
     className: `${classPrefix}-thumb-container`,
     style: currentPosition()
-  }, bind()), renderPopoverContent ? _react.default.createElement(_popover.Popover, {
+  }, bind(), {
+    role: 'slider',
+    "aria-label": props['aria-label'] || locale.Slider.name,
+    "aria-valuemax": max,
+    "aria-valuemin": min,
+    "aria-valuenow": value,
+    "aria-disabled": disabled
+  }), renderPopoverContent ? _react.default.createElement(_popover.Popover, {
     content: renderPopoverContent(value),
     placement: 'top',
     visible: dragging,

package/2x/cjs/components/stepper/stepper.js

@@ -25,6 +25,8 @@ var _button = _interopRequireDefault(require("../button"));
 
 var _big = _interopRequireDefault(require("big.js"));
 
+var _configProvider = require("../config-provider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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; }
@@ -48,6 +50,9 @@ const Stepper = p => {
     min,
     inputReadOnly
   } = props;
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
   const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
   const [inputValue, setInputValue] = (0, _react.useState)(() => convertValueToText(value, props.digits));
 
@@ -129,7 +134,8 @@ const Stepper = p => {
     disabled: minusDisabled(),
     fill: 'none',
     shape: 'rectangular',
-    color: 'primary'
+    color: 'primary',
+    "aria-label": locale.Stepper.decrease
   }, _react.default.createElement(_antdMobileIcons.MinusOutline, null)), _react.default.createElement("div", {
     className: `${classPrefix}-middle`
   }, _react.default.createElement(_input.default, {
@@ -151,14 +157,19 @@ const Stepper = p => {
       setHasFocus(false);
       (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
-    readOnly: inputReadOnly
+    readOnly: inputReadOnly,
+    role: 'spinbutton',
+    "aria-valuenow": Number(inputValue),
+    "aria-valuemax": max,
+    "aria-valuemin": min
   })), _react.default.createElement(_button.default, {
     className: `${classPrefix}-plus`,
     onClick: handlePlus,
     disabled: plusDisabled(),
     fill: 'none',
     shape: 'rectangular',
-    color: 'primary'
+    color: 'primary',
+    "aria-label": locale.Stepper.increase
   }, _react.default.createElement(_antdMobileIcons.AddOutline, null))));
 };
 

package/2x/cjs/components/steps/steps.css

@@ -17,7 +17,7 @@
 .adm-step .adm-step-indicator .adm-step-icon-container {
   position: absolute;
   z-index: 1;
-  background: var(--adm-color-white);
+  background: var(--adm-color-background);
   color: var(--icon-color);
 }
 

package/2x/cjs/components/swipe-action/swipe-action.d.ts

@@ -29,5 +29,9 @@ export declare const SwipeAction: React.ForwardRefExoticComponent<{
     closeOnAction?: boolean | undefined;
     children: ReactNode;
     stopPropagation?: "click"[] | undefined;
-} & NativeProps<"--background"> & React.RefAttributes<SwipeActionRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--background", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<SwipeActionRef>>;
 export {};

package/2x/cjs/components/swiper/index.d.ts

@@ -16,10 +16,18 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
-} & import("../../utils/native-props").NativeProps<"--width" | "--height" | "--border-radius" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
         children?: import("react").ReactNode;
-    } & import("../../utils/native-props").NativeProps<never>>;
+    } & {
+        className?: string | undefined;
+        style?: (import("react").CSSProperties & Partial<Record<never, string>>) | undefined;
+        tabIndex?: number | undefined;
+    } & import("react").AriaAttributes>;
 };
 export default _default;

package/2x/cjs/components/swiper/swiper.d.ts

@@ -37,4 +37,8 @@ export declare const Swiper: React.ForwardRefExoticComponent<{
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
-} & NativeProps<"--width" | "--height" | "--border-radius" | "--track-padding"> & React.RefAttributes<SwiperRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<SwiperRef>>;

package/2x/cjs/components/switch/switch.js

@@ -19,6 +19,8 @@ var _withDefaultProps = require("../../utils/with-default-props");
 
 var _spinIcon = require("./spin-icon");
 
+var _configProvider = require("../config-provider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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; }
@@ -34,6 +36,9 @@ const Switch = p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const disabled = props.disabled || props.loading || false;
   const [changing, setChanging] = (0, _react.useState)(false);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
   const [checked, setChecked] = (0, _usePropsValue.usePropsValue)({
     value: props.checked,
     defaultValue: props.defaultChecked,
@@ -70,7 +75,11 @@ const Switch = p => {
     className: (0, _classnames.default)(classPrefix, {
       [`${classPrefix}-checked`]: checked,
       [`${classPrefix}-disabled`]: disabled || changing
-    })
+    }),
+    role: 'switch',
+    "aria-label": locale.Switch.name,
+    "aria-checked": checked,
+    "aria-disabled": disabled
   }, _react.default.createElement("div", {
     className: `${classPrefix}-checkbox`
   }, _react.default.createElement("div", {

package/2x/cjs/components/text-area/text-area.d.ts

@@ -19,6 +19,7 @@ export declare type TextAreaRef = {
     clear: () => void;
     focus: () => void;
     blur: () => void;
+    nativeElement: HTMLTextAreaElement | null;
 };
 export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "name" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoComplete" | "autoFocus" | "readOnly"> & {
     onChange?: ((val: string) => void) | undefined;
@@ -33,4 +34,8 @@ export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.Detail
         maxRows?: number | undefined;
     } | undefined;
     id?: string | undefined;
-} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--count-text-align"> & React.RefAttributes<TextAreaRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--count-text-align", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<TextAreaRef>>;

package/2x/cjs/components/text-area/text-area.js

@@ -57,7 +57,12 @@ const TextArea = (0, _react.forwardRef)((p, ref) => {
       var _a;
 
       (_a = nativeTextAreaRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+    },
+
+    get nativeElement() {
+      return nativeTextAreaRef.current;
     }
+
   }));
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     if (!autoSize) return;

package/2x/cjs/components/toast/methods.js

@@ -7,100 +7,59 @@ exports.clear = clear;
 exports.config = config;
 exports.show = show;
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _getContainer = require("../../utils/get-container");
+var _react = _interopRequireDefault(require("react"));
 
 var _toast = require("./toast");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
-var _render = require("../../utils/render");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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 _renderImperatively = require("../../utils/render-imperatively");
 
-const containers = [];
-
-function unmount(container) {
-  const unmountResult = (0, _render.unmount)(container);
-
-  if (unmountResult && container.parentNode) {
-    container.parentNode.removeChild(container);
-  }
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+let currentHandler = null;
+let currentTimeout = null;
 const defaultProps = {
   duration: 2000,
   position: 'center',
   maskClickable: true
 };
 
+const ToastInner = props => _react.default.createElement(_toast.InternalToast, Object.assign({}, props));
+
 function show(p) {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, typeof p === 'string' ? {
     content: p
   } : p);
-  let timer = 0;
-  const {
-    getContainer = () => document.body
-  } = props;
-  const container = document.createElement('div');
-  const bodyContainer = (0, _getContainer.resolveContainer)(getContainer);
-  bodyContainer.appendChild(container);
-  clear();
-  containers.push(container);
-  const TempToast = (0, _react.forwardRef)((_, ref) => {
-    const [visible, setVisible] = (0, _react.useState)(true);
-    (0, _react.useEffect)(() => {
-      return () => {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      };
-    }, []);
-    (0, _react.useEffect)(() => {
-      if (props.duration === 0) {
-        return;
-      }
-
-      timer = window.setTimeout(() => {
-        setVisible(false);
-      }, props.duration);
-      return () => {
-        window.clearTimeout(timer);
-      };
-    }, []);
-    (0, _react.useImperativeHandle)(ref, () => ({
-      close: () => setVisible(false)
-    }));
-    return _react.default.createElement(_toast.InternalToast, Object.assign({}, props, {
-      getContainer: () => container,
-      visible: visible,
-      afterClose: () => {
-        unmount(container);
-      }
-    }));
-  });
-  const ref = (0, _react.createRef)();
-  (0, _render.render)(_react.default.createElement(TempToast, {
-    ref: ref
-  }), container);
-  return {
-    close: () => {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+
+  const element = _react.default.createElement(ToastInner, Object.assign({}, props, {
+    onClose: () => {
+      currentHandler = null;
     }
-  };
+  }));
+
+  if (currentHandler) {
+    currentHandler.replace(element);
+  } else {
+    currentHandler = (0, _renderImperatively.renderImperatively)(element);
+  }
+
+  if (currentTimeout) {
+    window.clearTimeout(currentTimeout);
+  }
+
+  if (props.duration !== 0) {
+    currentTimeout = window.setTimeout(() => {
+      clear();
+    }, props.duration);
+  }
+
+  return currentHandler;
 }
 
 function clear() {
-  while (true) {
-    const container = containers.pop();
-    if (!container) break;
-    unmount(container);
-  }
+  currentHandler === null || currentHandler === void 0 ? void 0 : currentHandler.close();
+  currentHandler = null;
 }
 
 function config(val) {

package/2x/cjs/components/virtual-input/virtual-input.d.ts

@@ -21,4 +21,8 @@ export declare const VirtualInput: React.ForwardRefExoticComponent<{
     keyboard?: React.ReactElement<NumberKeyboardProps, string | React.JSXElementConstructor<any>> | undefined;
     clearable?: boolean | undefined;
     onClear?: (() => void) | undefined;
-} & Pick<InputProps, "value" | "onChange" | "disabled" | "placeholder"> & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--caret-width" | "--caret-color"> & React.RefAttributes<VirtualInputRef>>;
+} & Pick<InputProps, "value" | "onChange" | "disabled" | "placeholder"> & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--caret-width" | "--caret-color", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<VirtualInputRef>>;

package/2x/cjs/components/water-mark/water-mark.js

@@ -62,13 +62,14 @@ const WaterMark = p => {
         const img = new Image();
         img.crossOrigin = 'anonymous';
         img.referrerPolicy = 'no-referrer';
-        img.src = image;
 
         img.onload = () => {
           ctx.drawImage(img, -imageWidth * ratio / 2, -imageHeight * ratio / 2, imageWidth * ratio, imageHeight * ratio);
           ctx.restore();
           setBase64Url(canvas.toDataURL());
         };
+
+        img.src = image;
       } else if (content) {
         ctx.textBaseline = 'middle';
         ctx.textAlign = 'center'; // 文字绕中间旋转
@@ -83,7 +84,7 @@ const WaterMark = p => {
         setBase64Url(canvas.toDataURL());
       }
     } else {
-      throw new Error('当前环境不支持Canvas');
+      throw new Error('Canvas is not supported in the current environment');
     }
   }, [gapX, gapY, rotate, fontStyle, fontWeight, width, height, fontFamily, fontColor, image, content, fontSize]);
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {

package/2x/cjs/global/global.css

@@ -12,7 +12,6 @@
   --adm-font-size-8: 32px;
   --adm-font-size-9: 34px;
   --adm-font-size-10: 36px;
-  --adm-hd: 2;
   --adm-color-primary: #1677ff;
   --adm-color-success: #00b578;
   --adm-color-warning: #ff8f1f;

package/2x/cjs/global/theme-default.css

@@ -12,7 +12,6 @@
   --adm-font-size-8: 32px;
   --adm-font-size-9: 34px;
   --adm-font-size-10: 36px;
-  --adm-hd: 2;
   --adm-color-primary: #1677ff;
   --adm-color-success: #00b578;
   --adm-color-warning: #ff8f1f;

package/2x/cjs/locales/base.d.ts

@@ -104,5 +104,15 @@ export declare const base: {
         canRelease: string;
         complete: string;
     };
+    Slider: {
+        name: string;
+    };
+    Stepper: {
+        decrease: string;
+        increase: string;
+    };
+    Switch: {
+        name: string;
+    };
 };
 export declare type Locale = typeof base;

package/2x/cjs/locales/base.js

@@ -110,6 +110,16 @@ const base = {
     pulling: 'Scroll down to refresh',
     canRelease: 'Release to refresh immediately',
     complete: 'Refresh successful'
+  },
+  Slider: {
+    name: 'Slider'
+  },
+  Stepper: {
+    decrease: 'decrease',
+    increase: 'increase'
+  },
+  Switch: {
+    name: 'Switch'
   }
 };
 exports.base = base;

package/2x/cjs/locales/en-US.d.ts

@@ -104,5 +104,15 @@ declare const enUS: {
         canRelease: string;
         complete: string;
     };
+    Slider: {
+        name: string;
+    };
+    Stepper: {
+        decrease: string;
+        increase: string;
+    };
+    Switch: {
+        name: string;
+    };
 };
 export default enUS;