antd-mobile 5.17.2 → 5.18.0

package/bundle/style.css

@@ -2504,6 +2504,14 @@ a.adm-list-item:active:not(.adm-list-item-disabled)::after {
   flex-shrink: 0;
   margin-left: 12px;
 }
+.adm-notice-bar-close {
+  width: 24px;
+  height: 24px;
+  margin-right: -3px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .adm-notice-bar-close-icon {
   font-size: var(--adm-font-size-10);
 }

package/cjs/components/calendar/calendar.d.ts

@@ -4,7 +4,7 @@ declare type Page = {
     month: number;
     year: number;
 };
-export declare type CalenderRef = {
+export declare type CalendarRef = {
     jumpTo: (page: Page | ((page: Page) => Page)) => void;
     jumpToToday: () => void;
 };
@@ -36,5 +36,5 @@ export declare type CalendarProps = {
     defaultValue?: [Date, Date] | null;
     onChange?: (val: [Date, Date] | null) => void;
 }) & NativeProps;
-export declare const Calendar: React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<CalenderRef>>;
+export declare const Calendar: React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<CalendarRef>>;
 export {};

package/cjs/components/calendar/index.d.ts

@@ -1,4 +1,4 @@
 import './calendar.less';
 import { Calendar } from './calendar';
-export type { CalendarProps, CalenderRef } from './calendar';
+export type { CalendarProps, CalendarRef } from './calendar';
 export default Calendar;

package/cjs/components/form/form-item.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _nativeProps = require("../../utils/native-props");
+
 var _rcFieldForm = require("rc-field-form");
 
 var _FieldContext = _interopRequireDefault(require("rc-field-form/lib/FieldContext"));
@@ -114,7 +116,7 @@ const FormItemLayout = props => {
     key: `warning-${index}`,
     className: `${classPrefix}-feedback-warning`
   }, warning)))) : null;
-  return _react.default.createElement(_list.default.Item, {
+  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement(_list.default.Item, {
     style: style,
     title: layout === 'vertical' && labelElement,
     prefix: layout === 'horizontal' && labelElement,
@@ -132,7 +134,7 @@ const FormItemLayout = props => {
     className: (0, _classnames.default)(`${classPrefix}-child`, `${classPrefix}-child-position-${childElementPosition}`)
   }, _react.default.createElement("div", {
     className: (0, _classnames.default)(`${classPrefix}-child-inner`)
-  }, children)));
+  }, children))));
 };
 
 const FormItem = props => {
@@ -223,7 +225,7 @@ const FormItem = props => {
 
       return subWarnings;
     }, curWarnings);
-    return _react.default.createElement(FormItemLayout, {
+    return (0, _nativeProps.withNativeProps)(props, _react.default.createElement(FormItemLayout, {
       className: className,
       style: style,
       label: label,
@@ -244,7 +246,7 @@ const FormItem = props => {
       arrow: arrow
     }, _react.default.createElement(_context.NoStyleItemContext.Provider, {
       value: onSubMetaChange
-    }, baseChildren));
+    }, baseChildren)));
   }
 
   const isRenderProps = typeof children === 'function';

package/cjs/components/notice-bar/notice-bar.css

@@ -61,6 +61,14 @@
   flex-shrink: 0;
   margin-left: 12px;
 }
+.adm-notice-bar-close {
+  width: 24px;
+  height: 24px;
+  margin-right: -3px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .adm-notice-bar-close-icon {
   font-size: var(--adm-font-size-10);
 }

package/cjs/components/notice-bar/notice-bar.js

@@ -103,14 +103,16 @@ const NoticeBar = (0, _react.memo)(p => {
     className: `${classPrefix}-content-inner`
   }, props.content)), (props.closeable || props.extra) && _react.default.createElement("span", {
     className: `${classPrefix}-right`
-  }, props.extra, props.closeable && _react.default.createElement(_antdMobileIcons.CloseOutline, {
-    className: `${classPrefix}-close-icon`,
+  }, props.extra, props.closeable && _react.default.createElement("div", {
+    className: `${classPrefix}-close`,
     onClick: () => {
       var _a;
 
       setVisible(false);
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     }
-  }))));
+  }, _react.default.createElement(_antdMobileIcons.CloseOutline, {
+    className: `${classPrefix}-close-icon`
+  })))));
 });
 exports.NoticeBar = NoticeBar;

package/cjs/components/rate/rate.js

@@ -49,12 +49,17 @@ const Rate = p => {
         } else {
           setValue(v);
         }
-      }
+      },
+      role: 'radio',
+      "aria-checked": value >= v,
+      "aria-label": '' + v
     }, props.character);
   }
 
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: classPrefix
+    className: classPrefix,
+    role: 'radiogroup',
+    "aria-readonly": props.readOnly
   }, starList.map((_, i) => _react.default.createElement("div", {
     key: i,
     className: (0, _classnames.default)(`${classPrefix}-box`)

package/cjs/components/rate/star.js

@@ -10,16 +10,6 @@ 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',

package/cjs/components/switch/switch.d.ts

@@ -5,8 +5,9 @@ export declare type SwitchProps = {
     disabled?: boolean;
     checked?: boolean;
     defaultChecked?: boolean;
+    /** @deprecated use `onChange` instead */
     beforeChange?: (val: boolean) => Promise<void>;
-    onChange?: (checked: boolean) => void;
+    onChange?: (checked: boolean) => void | Promise<void>;
     checkedText?: ReactNode;
     uncheckedText?: ReactNode;
 } & NativeProps<'--checked-color' | '--width' | '--height' | '--border-width'>;

package/cjs/components/switch/switch.js

@@ -21,6 +21,8 @@ var _spinIcon = require("./spin-icon");
 
 var _configProvider = require("../config-provider");
 
+var _validate = require("../../utils/validate");
+
 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; }
@@ -58,14 +60,25 @@ const Switch = p => {
 
         try {
           yield props.beforeChange(nextChecked);
-          setChecked(nextChecked);
           setChanging(false);
         } catch (e) {
           setChanging(false);
           throw e;
         }
-      } else {
-        setChecked(nextChecked);
+      }
+
+      const result = setChecked(nextChecked);
+
+      if ((0, _validate.isPromise)(result)) {
+        setChanging(true);
+
+        try {
+          yield result;
+          setChanging(false);
+        } catch (e) {
+          setChanging(false);
+          throw e;
+        }
       }
     });
   }

package/cjs/utils/merge-locale.d.ts

@@ -1 +1 @@
-export declare function mergeLocale<T, P>(base: T, patch: P): T;
+export declare function mergeLocale<T extends object, P extends object>(base: T, patch: P): T;

package/cjs/utils/merge-locale.js

@@ -5,12 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mergeLocale = mergeLocale;
 
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+function mergeLocale(base, patch) {
+  function merge(a, b) {
+    if (typeof a !== 'object' || typeof b !== 'object' || Array.isArray(a) || Array.isArray(b)) {
+      return b !== undefined ? b : a;
+    }
 
-var _merge = _interopRequireDefault(require("lodash/merge"));
+    const result = {};
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+    for (const key in a) {
+      if (a.hasOwnProperty(key)) {
+        result[key] = merge(a[key], b[key]);
+      }
+    }
 
-function mergeLocale(base, patch) {
-  return (0, _merge.default)((0, _cloneDeep.default)(base), patch);
+    return result;
+  }
+
+  return merge(base, patch);
 }

package/cjs/utils/use-drag-and-pinch.d.ts

@@ -1 +1 @@
-export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react").ReactDOMAttributes;
+export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react/dist/declarations/src/types").ReactDOMAttributes;

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

@@ -28,7 +28,7 @@ function usePropsValue(options) {
     if (!forceTrigger && nextValue === stateRef.current) return;
     stateRef.current = nextValue;
     update();
-    onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
+    return onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
   });
   return [stateRef.current, setState];
 }

package/cjs/utils/with-default-props.js

@@ -5,20 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mergeProps = mergeProps;
 
-var _assign = _interopRequireDefault(require("lodash/assign"));
-
 var _assignWith = _interopRequireDefault(require("lodash/assignWith"));
 
-var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function mergeProps(...items) {
   function customizer(objValue, srcValue) {
-    return (0, _isUndefined.default)(srcValue) ? objValue : srcValue;
+    return srcValue === undefined ? objValue : srcValue;
   }
 
-  let ret = (0, _assign.default)({}, items[0]);
+  let ret = Object.assign({}, items[0]);
 
   for (let i = 1; i < items.length; i++) {
     ret = (0, _assignWith.default)(ret, items[i], customizer);

package/es/components/calendar/calendar.d.ts

@@ -4,7 +4,7 @@ declare type Page = {
     month: number;
     year: number;
 };
-export declare type CalenderRef = {
+export declare type CalendarRef = {
     jumpTo: (page: Page | ((page: Page) => Page)) => void;
     jumpToToday: () => void;
 };
@@ -36,5 +36,5 @@ export declare type CalendarProps = {
     defaultValue?: [Date, Date] | null;
     onChange?: (val: [Date, Date] | null) => void;
 }) & NativeProps;
-export declare const Calendar: React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<CalenderRef>>;
+export declare const Calendar: React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<CalendarRef>>;
 export {};

package/es/components/calendar/index.d.ts

@@ -1,4 +1,4 @@
 import './calendar.less';
 import { Calendar } from './calendar';
-export type { CalendarProps, CalenderRef } from './calendar';
+export type { CalendarProps, CalendarRef } from './calendar';
 export default Calendar;

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

@@ -1,6 +1,7 @@
 import { __rest } from "tslib";
 import React, { useContext, useCallback, useState, useRef } from 'react';
 import classNames from 'classnames';
+import { withNativeProps } from '../../utils/native-props';
 import { Field } from 'rc-field-form';
 import FieldContext from 'rc-field-form/lib/FieldContext';
 import { devWarning } from '../../utils/dev-log';
@@ -87,7 +88,7 @@ const FormItemLayout = props => {
     key: `warning-${index}`,
     className: `${classPrefix}-feedback-warning`
   }, warning)))) : null;
-  return React.createElement(List.Item, {
+  return withNativeProps(props, React.createElement(List.Item, {
     style: style,
     title: layout === 'vertical' && labelElement,
     prefix: layout === 'horizontal' && labelElement,
@@ -105,7 +106,7 @@ const FormItemLayout = props => {
     className: classNames(`${classPrefix}-child`, `${classPrefix}-child-position-${childElementPosition}`)
   }, React.createElement("div", {
     className: classNames(`${classPrefix}-child-inner`)
-  }, children)));
+  }, children))));
 };
 
 export const FormItem = props => {
@@ -197,7 +198,7 @@ export const FormItem = props => {
 
       return subWarnings;
     }, curWarnings);
-    return React.createElement(FormItemLayout, {
+    return withNativeProps(props, React.createElement(FormItemLayout, {
       className: className,
       style: style,
       label: label,
@@ -218,7 +219,7 @@ export const FormItem = props => {
       arrow: arrow
     }, React.createElement(NoStyleItemContext.Provider, {
       value: onSubMetaChange
-    }, baseChildren));
+    }, baseChildren)));
   }
 
   const isRenderProps = typeof children === 'function';

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

@@ -61,6 +61,14 @@
   flex-shrink: 0;
   margin-left: 12px;
 }
+.adm-notice-bar-close {
+  width: 24px;
+  height: 24px;
+  margin-right: -3px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .adm-notice-bar-close-icon {
   font-size: var(--adm-font-size-10);
 }

package/es/components/notice-bar/notice-bar.js

@@ -82,13 +82,15 @@ export const NoticeBar = memo(p => {
     className: `${classPrefix}-content-inner`
   }, props.content)), (props.closeable || props.extra) && React.createElement("span", {
     className: `${classPrefix}-right`
-  }, props.extra, props.closeable && React.createElement(CloseOutline, {
-    className: `${classPrefix}-close-icon`,
+  }, props.extra, props.closeable && React.createElement("div", {
+    className: `${classPrefix}-close`,
     onClick: () => {
       var _a;
 
       setVisible(false);
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     }
-  }))));
+  }, React.createElement(CloseOutline, {
+    className: `${classPrefix}-close-icon`
+  })))));
 });

package/es/components/rate/rate.js

@@ -33,12 +33,17 @@ export const Rate = p => {
         } else {
           setValue(v);
         }
-      }
+      },
+      role: 'radio',
+      "aria-checked": value >= v,
+      "aria-label": '' + v
     }, props.character);
   }
 
   return withNativeProps(props, React.createElement("div", {
-    className: classPrefix
+    className: classPrefix,
+    role: 'radiogroup',
+    "aria-readonly": props.readOnly
   }, starList.map((_, i) => React.createElement("div", {
     key: i,
     className: classNames(`${classPrefix}-box`)

package/es/components/rate/star.js

@@ -1,15 +1,5 @@
 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',

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

@@ -5,8 +5,9 @@ export declare type SwitchProps = {
     disabled?: boolean;
     checked?: boolean;
     defaultChecked?: boolean;
+    /** @deprecated use `onChange` instead */
     beforeChange?: (val: boolean) => Promise<void>;
-    onChange?: (checked: boolean) => void;
+    onChange?: (checked: boolean) => void | Promise<void>;
     checkedText?: ReactNode;
     uncheckedText?: ReactNode;
 } & NativeProps<'--checked-color' | '--width' | '--height' | '--border-width'>;

package/es/components/switch/switch.js

@@ -6,6 +6,7 @@ import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
 import { SpinIcon } from './spin-icon';
 import { useConfig } from '../config-provider';
+import { isPromise } from '../../utils/validate';
 const classPrefix = `adm-switch`;
 const defaultProps = {
   defaultChecked: false
@@ -36,14 +37,25 @@ export const Switch = p => {
 
         try {
           yield props.beforeChange(nextChecked);
-          setChecked(nextChecked);
           setChanging(false);
         } catch (e) {
           setChanging(false);
           throw e;
         }
-      } else {
-        setChecked(nextChecked);
+      }
+
+      const result = setChecked(nextChecked);
+
+      if (isPromise(result)) {
+        setChanging(true);
+
+        try {
+          yield result;
+          setChanging(false);
+        } catch (e) {
+          setChanging(false);
+          throw e;
+        }
       }
     });
   }

package/es/utils/merge-locale.d.ts

@@ -1 +1 @@
-export declare function mergeLocale<T, P>(base: T, patch: P): T;
+export declare function mergeLocale<T extends object, P extends object>(base: T, patch: P): T;

package/es/utils/merge-locale.js

@@ -1,5 +1,19 @@
-import cloneDeep from 'lodash/cloneDeep';
-import merge from 'lodash/merge';
 export function mergeLocale(base, patch) {
-  return merge(cloneDeep(base), patch);
+  function merge(a, b) {
+    if (typeof a !== 'object' || typeof b !== 'object' || Array.isArray(a) || Array.isArray(b)) {
+      return b !== undefined ? b : a;
+    }
+
+    const result = {};
+
+    for (const key in a) {
+      if (a.hasOwnProperty(key)) {
+        result[key] = merge(a[key], b[key]);
+      }
+    }
+
+    return result;
+  }
+
+  return merge(base, patch);
 }

package/es/utils/use-drag-and-pinch.d.ts

@@ -1 +1 @@
-export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react").ReactDOMAttributes;
+export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react/dist/declarations/src/types").ReactDOMAttributes;

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

@@ -19,7 +19,7 @@ export function usePropsValue(options) {
     if (!forceTrigger && nextValue === stateRef.current) return;
     stateRef.current = nextValue;
     update();
-    onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
+    return onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
   });
   return [stateRef.current, setState];
 }

package/es/utils/with-default-props.js

@@ -1,12 +1,10 @@
-import assign from 'lodash/assign';
 import assignWith from 'lodash/assignWith';
-import isUndefined from 'lodash/isUndefined';
 export function mergeProps(...items) {
   function customizer(objValue, srcValue) {
-    return isUndefined(srcValue) ? objValue : srcValue;
+    return srcValue === undefined ? objValue : srcValue;
   }
 
-  let ret = assign({}, items[0]);
+  let ret = Object.assign({}, items[0]);
 
   for (let i = 1; i < items.length; i++) {
     ret = assignWith(ret, items[i], customizer);

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "antd-mobile",
-  "version": "5.17.2",
+  "version": "5.18.0",
   "dependencies": {
     "@floating-ui/dom": "^0.5.2",
     "@react-spring/web": "^9.4.5",
-    "@use-gesture/react": "10.2.15",
-    "ahooks": "^3.4.1",
+    "@use-gesture/react": "10.2.16",
+    "ahooks": "^3.5.2",
     "antd-mobile-icons": "^0.3.0",
     "antd-mobile-v5-count": "^1.0.1",
     "big.js": "^6.1.1",
     "classnames": "^2.3.1",
     "dayjs": "^1.11.3",
     "lodash": "^4.17.21",
-    "rc-field-form": "~1.26.7",
+    "rc-field-form": "~1.27.0",
     "react-is": "^17.0.2",
     "staged-components": "^1.1.3",
     "tslib": "^2.4.0",