antd-mobile 5.14.1 → 5.15.0

package/2x/cjs/utils/use-props-value.js

@@ -24,12 +24,8 @@ function usePropsValue(options) {
 
   const setState = (0, _ahooks.useMemoizedFn)(v => {
     const nextValue = typeof v === 'function' ? v(stateRef.current) : v;
-
-    if (value === undefined) {
-      stateRef.current = nextValue;
-      update();
-    }
-
+    stateRef.current = nextValue;
+    update();
     onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
   });
   return [stateRef.current, setState];

package/2x/es/components/badge/badge.css

@@ -1,4 +1,4 @@
-.adm-badge-wrap {
+.adm-badge-wrapper {
   display: inline-block;
   position: relative;
 }

package/2x/es/components/badge/badge.d.ts

@@ -6,5 +6,7 @@ export declare type BadgeProps = {
     color?: string;
     bordered?: boolean;
     children?: React.ReactNode;
+    wrapperClassName?: string;
+    wrapperStyle?: React.CSSProperties;
 } & NativeProps<'--right' | '--top' | '--color'>;
 export declare const Badge: FC<BadgeProps>;

package/2x/es/components/badge/badge.js

@@ -20,6 +20,7 @@ export const Badge = props => {
     className: `${classPrefix}-content`
   }, content))) : null;
   return children ? React.createElement("div", {
-    className: `${classPrefix}-wrap`
+    className: classNames(`${classPrefix}-wrapper`, props.wrapperClassName),
+    style: props.wrapperStyle
   }, children, element) : element;
 };

package/2x/es/components/checkbox/checkbox.d.ts

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type CheckboxValue = string | number;
 export declare type CheckboxProps = {
@@ -13,4 +13,20 @@ export declare type CheckboxProps = {
     icon?: (checked: boolean, indeterminate: boolean) => React.ReactNode;
     children?: React.ReactNode;
 } & NativeProps<'--icon-size' | '--font-size' | '--gap'>;
-export declare const Checkbox: FC<CheckboxProps>;
+export declare type CheckboxRef = {
+    check: () => void;
+    uncheck: () => void;
+    toggle: () => void;
+};
+export declare const Checkbox: React.ForwardRefExoticComponent<{
+    checked?: boolean | undefined;
+    defaultChecked?: boolean | undefined;
+    disabled?: boolean | undefined;
+    onChange?: ((checked: boolean) => void) | undefined;
+    value?: CheckboxValue | undefined;
+    indeterminate?: boolean | undefined;
+    block?: boolean | undefined;
+    id?: string | undefined;
+    icon?: ((checked: boolean, indeterminate: boolean) => React.ReactNode) | undefined;
+    children?: React.ReactNode;
+} & NativeProps<"--font-size" | "--icon-size" | "--gap"> & React.RefAttributes<CheckboxRef>>;

package/2x/es/components/checkbox/checkbox.js

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { forwardRef, useContext, useImperativeHandle } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import classNames from 'classnames';
 import { CheckboxGroupContext } from './group-context';
@@ -14,7 +14,7 @@ const defaultProps = {
   defaultChecked: false,
   indeterminate: false
 };
-export const Checkbox = p => {
+export const Checkbox = forwardRef((p, ref) => {
   const groupContext = useContext(CheckboxGroupContext);
   const props = mergeProps(defaultProps, p);
   let [checked, setChecked] = usePropsValue({
@@ -55,6 +55,18 @@ export const Checkbox = p => {
     disabled = disabled || groupContext.disabled;
   }
 
+  useImperativeHandle(ref, () => ({
+    check: () => {
+      setChecked(true);
+    },
+    uncheck: () => {
+      setChecked(false);
+    },
+    toggle: () => {
+      setChecked(!checked);
+    }
+  }));
+
   const renderIcon = () => {
     if (props.icon) {
       return React.createElement("div", {
@@ -83,4 +95,4 @@ export const Checkbox = p => {
   }), renderIcon(), props.children && React.createElement("div", {
     className: `${classPrefix}-content`
   }, props.children)));
-};
+});

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

@@ -1,8 +1,19 @@
 /// <reference types="react" />
 import './checkbox.less';
-export type { CheckboxValue, CheckboxProps } from './checkbox';
+export type { CheckboxValue, CheckboxProps, CheckboxRef } from './checkbox';
 export type { CheckboxGroupProps } from './group';
-declare const _default: import("react").FC<import("./checkbox").CheckboxProps> & {
+declare const _default: import("react").ForwardRefExoticComponent<{
+    checked?: boolean | undefined;
+    defaultChecked?: boolean | undefined;
+    disabled?: boolean | undefined;
+    onChange?: ((checked: boolean) => void) | undefined;
+    value?: import("./checkbox").CheckboxValue | undefined;
+    indeterminate?: boolean | undefined;
+    block?: boolean | undefined;
+    id?: string | undefined;
+    icon?: ((checked: boolean, indeterminate: boolean) => import("react").ReactNode) | undefined;
+    children?: import("react").ReactNode;
+} & import("../../utils/native-props").NativeProps<"--font-size" | "--icon-size" | "--gap"> & import("react").RefAttributes<import("./checkbox").CheckboxRef>> & {
     Group: import("react").FC<import("./group").CheckboxGroupProps>;
 };
 export default _default;

package/2x/es/components/form/form-item.js

@@ -80,13 +80,13 @@ const FormItemLayout = props => {
       e.preventDefault();
     }
   }, React.createElement(QuestionCircleOutline, null)))) : null;
-  const description = React.createElement(React.Fragment, null, props.description, hasFeedback && React.createElement(React.Fragment, null, props.errors.map((error, index) => React.createElement("div", {
+  const description = props.description || hasFeedback ? React.createElement(React.Fragment, null, props.description, hasFeedback && React.createElement(React.Fragment, null, props.errors.map((error, index) => React.createElement("div", {
     key: `error-${index}`,
     className: `${classPrefix}-feedback-error`
   }, error)), props.warnings.map((warning, index) => React.createElement("div", {
     key: `warning-${index}`,
     className: `${classPrefix}-feedback-warning`
-  }, warning))));
+  }, warning)))) : null;
   return React.createElement(List.Item, {
     style: style,
     title: layout === 'vertical' && labelElement,

package/2x/es/components/form/form-subscribe.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { FC } from 'react';
 import type { FormInstance } from 'rc-field-form';
 import type { NamePath } from 'rc-field-form/es/interface';
 declare type RenderChildren<Values = any> = (changedValues: Record<string, any>, form: FormInstance<Values>) => React.ReactNode;
@@ -7,5 +7,10 @@ export interface FormSubscribeProps {
     to: NamePath[];
     children: ChildrenType;
 }
-export declare const FormSubscribe: React.VFC<FormSubscribeProps>;
+export declare const FormSubscribe: FC<FormSubscribeProps>;
+export declare const Watcher: React.NamedExoticComponent<{
+    form: FormInstance;
+    namePath: NamePath;
+    onChange: () => void;
+}>;
 export {};

package/2x/es/components/form/form-subscribe.js

@@ -1,14 +1,21 @@
-import React from 'react';
-import Form from '.';
-export const FormSubscribe = ({
-  children,
-  to
-}) => {
-  return React.createElement(Form.Item, {
-    noStyle: true,
-    dependencies: to
-  }, form => {
-    const changedValues = form.getFieldsValue(to);
-    return children(changedValues, form);
-  });
-};
+import React, { memo, useContext } from 'react';
+import { FieldContext, useWatch } from 'rc-field-form';
+import { useUpdate } from 'ahooks';
+import { useIsomorphicUpdateLayoutEffect } from '../../utils/use-isomorphic-update-layout-effect';
+export const FormSubscribe = props => {
+  const update = useUpdate();
+  const form = useContext(FieldContext);
+  return React.createElement(React.Fragment, null, props.children(form.getFieldsValue(props.to), form), props.to.map(namePath => React.createElement(Watcher, {
+    key: namePath.toString(),
+    form: form,
+    namePath: namePath,
+    onChange: update
+  })));
+};
+export const Watcher = memo(props => {
+  const value = useWatch(props.namePath, props.form);
+  useIsomorphicUpdateLayoutEffect(() => {
+    props.onChange();
+  }, [value]);
+  return null;
+});

package/2x/es/components/form/form.d.ts

@@ -8,7 +8,7 @@ export declare type FormProps = Pick<RcFormProps, 'form' | 'initialValues' | 'na
     footer?: ReactNode;
     mode?: ListProps['mode'];
 };
-export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<FormContextType> & {
+export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & NativeProps<"--border-bottom" | "--border-inner" | "--border-top"> & Partial<FormContextType> & {
     footer?: ReactNode;
     mode?: ListProps['mode'];
 } & React.RefAttributes<FormInstance>>;

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

@@ -7,12 +7,12 @@ export type { FormItemProps } from './form-item';
 export type { FormSubscribeProps } from './form-subscribe';
 export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/interface';
 export type { FormArrayField, FormArrayOperation, FormArrayProps, } from './form-array';
-declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & import("../../utils/native-props").NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<import("./context").FormContextType> & {
+declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & import("../../utils/native-props").NativeProps<"--border-bottom" | "--border-inner" | "--border-top"> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
     mode?: "default" | "card" | undefined;
 } & import("react").RefAttributes<import("./form").FormInstance>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
-    Subscribe: import("react").VFC<import("./form-subscribe").FormSubscribeProps>;
+    Subscribe: import("react").FC<import("./form-subscribe").FormSubscribeProps>;
     Header: import("react").FC<{
         children?: import("react").ReactNode;
     }>;

package/2x/es/components/infinite-scroll/infinite-scroll.js

@@ -1,7 +1,7 @@
 import { __awaiter } from "tslib";
 import { mergeProps } from '../../utils/with-default-props';
 import React, { useEffect, useRef, useState } from 'react';
-import { useLockFn, useMemoizedFn } from 'ahooks';
+import { useLockFn, useThrottleFn } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { getScrollParent } from '../../utils/get-scroll-parent';
 import { useConfig } from '../config-provider';
@@ -36,7 +36,9 @@ export const InfiniteScroll = p => {
   const [flag, setFlag] = useState({});
   const nextFlagRef = useRef(flag);
   const [scrollParent, setScrollParent] = useState();
-  const check = useMemoizedFn(() => __awaiter(void 0, void 0, void 0, function* () {
+  const {
+    run: check
+  } = useThrottleFn(() => __awaiter(void 0, void 0, void 0, function* () {
     if (nextFlagRef.current !== flag) return;
     if (!props.hasMore) return;
     const element = elementRef.current;
@@ -55,7 +57,11 @@ export const InfiniteScroll = p => {
       yield doLoadMore(false);
       setFlag(nextFlag);
     }
-  })); // 确保在内容不足时会自动触发加载事件
+  }), {
+    wait: 100,
+    leading: true,
+    trailing: true
+  }); // Make sure to trigger `loadMore` when content changes
 
   useEffect(() => {
     check();
@@ -76,8 +82,11 @@ export const InfiniteScroll = p => {
   }, [scrollParent]);
 
   function retry() {
-    setFailed(false);
-    doLoadMore(true);
+    return __awaiter(this, void 0, void 0, function* () {
+      setFailed(false);
+      yield doLoadMore(true);
+      setFlag(nextFlagRef.current);
+    });
   }
 
   return withNativeProps(props, React.createElement("div", {

package/2x/es/components/list/list.css

@@ -10,6 +10,7 @@
   --padding-left: 24px;
   --padding-right: 24px;
   --font-size: var(--adm-font-size-9);
+  --extra-max-width: 70%;
 }
 
 .adm-list-header {
@@ -79,9 +80,11 @@
 }
 
 .adm-list-item-content-extra {
+  flex: none;
   padding-left: 24px;
   font-size: var(--adm-font-size-7);
   color: var(--adm-color-weak);
+  max-width: var(--extra-max-width);
 }
 
 .adm-list-item-content-arrow {

package/2x/es/components/list/list.d.ts

@@ -4,5 +4,5 @@ export declare type ListProps = {
     header?: ReactNode;
     mode?: 'default' | 'card';
     children?: ReactNode;
-} & NativeProps<'--header-font-size' | '--prefix-width' | '--prefix-padding-right' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left' | '--padding-right' | '--font-size'>;
+} & NativeProps<'--active-background-color' | '--align-items' | '--border-bottom' | '--border-inner' | '--border-top' | '--extra-max-width' | '--font-size' | '--header-font-size' | '--padding-left' | '--padding-right' | '--prefix-padding-right' | '--prefix-width'>;
 export declare const List: FC<ListProps>;

package/2x/es/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/es/components/rate/rate.js

@@ -2,13 +2,13 @@ import React from 'react';
 import classNames from 'classnames';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
-import { StarFill } from 'antd-mobile-icons';
 import { usePropsValue } from '../../utils/use-props-value';
+import { Star } from './star';
 const classPrefix = `adm-rate`;
 const defaultProps = {
   count: 5,
   allowHalf: false,
-  character: React.createElement(StarFill, null),
+  character: React.createElement(Star, null),
   defaultValue: 0,
   readOnly: false,
   allowClear: true

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

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

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

@@ -0,0 +1,25 @@
+import React from 'react';
+export 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.createElement("svg", {
+    viewBox: '0 0 42 40',
+    height: '1em',
+    xmlns: 'http://www.w3.org/2000/svg',
+    style: {
+      verticalAlign: '-0.125em'
+    }
+  }, React.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'
+  }));
+};

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

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

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

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

@@ -1,86 +1,48 @@
-import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
-import { resolveContainer } from '../../utils/get-container';
+import React from 'react';
 import { InternalToast } from './toast';
 import { mergeProps } from '../../utils/with-default-props';
-import { render, unmount as reactUnmount } from '../../utils/render';
-const containers = [];
-
-function unmount(container) {
-  const unmountResult = reactUnmount(container);
-
-  if (unmountResult && container.parentNode) {
-    container.parentNode.removeChild(container);
-  }
-}
-
+import { renderImperatively } from '../../utils/render-imperatively';
+let currentHandler = null;
+let currentTimeout = null;
 const defaultProps = {
   duration: 2000,
   position: 'center',
   maskClickable: true
 };
+
+const ToastInner = props => React.createElement(InternalToast, Object.assign({}, props));
+
 export function show(p) {
   const props = mergeProps(defaultProps, typeof p === 'string' ? {
     content: p
   } : p);
-  let timer = 0;
-  const {
-    getContainer = () => document.body
-  } = props;
-  const container = document.createElement('div');
-  const bodyContainer = resolveContainer(getContainer);
-  bodyContainer.appendChild(container);
-  clear();
-  containers.push(container);
-  const TempToast = forwardRef((_, ref) => {
-    const [visible, setVisible] = useState(true);
-    useEffect(() => {
-      return () => {
-        var _a;
+  const element = React.createElement(ToastInner, Object.assign({}, props, {
+    onClose: () => {
+      currentHandler = null;
+    }
+  }));
 
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      };
-    }, []);
-    useEffect(() => {
-      if (props.duration === 0) {
-        return;
-      }
+  if (currentHandler) {
+    currentHandler.replace(element);
+  } else {
+    currentHandler = renderImperatively(element);
+  }
 
-      timer = window.setTimeout(() => {
-        setVisible(false);
-      }, props.duration);
-      return () => {
-        window.clearTimeout(timer);
-      };
-    }, []);
-    useImperativeHandle(ref, () => ({
-      close: () => setVisible(false)
-    }));
-    return React.createElement(InternalToast, Object.assign({}, props, {
-      getContainer: () => container,
-      visible: visible,
-      afterClose: () => {
-        unmount(container);
-      }
-    }));
-  });
-  const ref = createRef();
-  render(React.createElement(TempToast, {
-    ref: ref
-  }), container);
-  return {
-    close: () => {
-      var _a;
+  if (currentTimeout) {
+    window.clearTimeout(currentTimeout);
+  }
 
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
+  if (props.duration !== 0) {
+    currentTimeout = window.setTimeout(() => {
+      clear();
+    }, props.duration);
+  }
+
+  return currentHandler;
 }
 export function clear() {
-  while (true) {
-    const container = containers.pop();
-    if (!container) break;
-    unmount(container);
-  }
+  currentHandler === null || currentHandler === void 0 ? void 0 : currentHandler.close();
+  currentHandler = null;
 }
 export function config(val) {
   if (val.duration !== undefined) {

package/2x/es/components/toast/toast.js

@@ -23,10 +23,14 @@ export const InternalToast = p => {
 
     switch (icon) {
       case 'success':
-        return React.createElement(CheckOutline, null);
+        return React.createElement(CheckOutline, {
+          className: `${classPrefix}-icon-success`
+        });
 
       case 'fail':
-        return React.createElement(CloseOutline, null);
+        return React.createElement(CloseOutline, {
+          className: `${classPrefix}-icon-fail`
+        });
 
       case 'loading':
         return React.createElement(SpinLoading, {

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

@@ -44,13 +44,14 @@ export 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'; // 文字绕中间旋转
@@ -65,7 +66,7 @@ export 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 withNativeProps(props, React.createElement("div", {