antd-mobile 5.6.1 → 5.7.2

package/cjs/components/collapse/collapse.js

@@ -50,6 +50,13 @@ const CollapsePanelContent = props => {
   }, api] = (0, _web.useSpring)(() => ({
     from: {
       height: 0
+    },
+    config: {
+      precision: 0.01,
+      mass: 1,
+      tension: 200,
+      friction: 25,
+      clamp: true
     }
   }));
   (0, _ahooks.useMount)(() => {

package/cjs/components/dialog/confirm.js

@@ -11,13 +11,21 @@ var _show = require("./show");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _configProvider = require("../config-provider");
+
 const defaultProps = {
   confirmText: '确认',
   cancelText: '取消'
 };
 
 function confirm(p) {
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const {
+    locale
+  } = (0, _configProvider.getDefaultConfig)();
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, {
+    confirmText: locale.common.confirm,
+    cancelText: locale.common.cancel
+  }, p);
   return new Promise(resolve => {
     (0, _show.show)(Object.assign(Object.assign({}, props), {
       closeOnAction: true,

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

@@ -93,12 +93,15 @@ const FormItemLayout = props => {
   const labelElement = label ? _react.default.createElement("label", {
     className: `${classPrefix}-label`,
     htmlFor: htmlFor
-  }, label, requiredMark, help && _react.default.createElement("span", {
-    className: `${classPrefix}-label-help`
-  }, _react.default.createElement(_popover.default, {
+  }, label, requiredMark, help && _react.default.createElement(_popover.default, {
     content: help,
     mode: 'dark',
     trigger: 'click'
+  }, _react.default.createElement("span", {
+    className: `${classPrefix}-label-help`,
+    onClick: e => {
+      e.preventDefault();
+    }
   }, _react.default.createElement(_antdMobileIcons.QuestionCircleOutline, null)))) : null;
 
   const description = _react.default.createElement(_react.default.Fragment, null, props.description, hasFeedback && _react.default.createElement(_react.default.Fragment, null, props.errors.map((error, index) => _react.default.createElement("div", {

package/cjs/components/modal/confirm.js

@@ -11,13 +11,21 @@ var _show = require("./show");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _configProvider = require("../config-provider");
+
 const defaultProps = {
   confirmText: '确认',
   cancelText: '取消'
 };
 
 function confirm(p) {
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const {
+    locale
+  } = (0, _configProvider.getDefaultConfig)();
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, {
+    confirmText: locale.common.confirm,
+    cancelText: locale.common.cancel
+  }, p);
   return new Promise(resolve => {
     (0, _show.show)(Object.assign(Object.assign({}, props), {
       closeOnAction: true,

package/cjs/components/passcode-input/passcode-input.js

@@ -46,7 +46,7 @@ const PasscodeInput = (0, _react.forwardRef)((p, ref) => {
     if (value.length >= cellLength) {
       (_a = props.onFill) === null || _a === void 0 ? void 0 : _a.call(props, value);
     }
-  }, [props.onFill, value, cellLength]);
+  }, [value, cellLength]);
 
   const onFocus = () => {
     var _a, _b;

package/cjs/components/picker/picker.js

@@ -17,12 +17,10 @@ var _usePropsValue = require("../../utils/use-props-value");
 
 var _pickerView = _interopRequireDefault(require("../picker-view"));
 
-var _useColumns = require("../picker-view/use-columns");
+var _columnsExtend = require("../picker-view/columns-extend");
 
 var _configProvider = require("../config-provider");
 
-var _usePickerValueExtend = require("../picker-view/use-picker-value-extend");
-
 var _ahooks = require("ahooks");
 
 var _safeArea = _interopRequireDefault(require("../safe-area"));
@@ -52,12 +50,11 @@ const Picker = (0, _react.memo)(p => {
     onChange: val => {
       var _a;
 
-      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val, generateValueExtend(val));
+      const extend = (0, _columnsExtend.generateColumnsExtend)(props.columns, val);
+      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val, extend);
     }
-  })); // TODO: columns generated twice in Picker and PickerView, which can be improved
-
-  const columns = (0, _useColumns.useColumns)(props.columns, value);
-  const generateValueExtend = (0, _usePickerValueExtend.usePickerValueExtend)(columns);
+  }));
+  const extend = (0, _columnsExtend.useColumnsExtend)(props.columns, value);
   const [innerValue, setInnerValue] = (0, _react.useState)(value);
   (0, _react.useEffect)(() => {
     if (innerValue !== value) {
@@ -130,7 +127,7 @@ const Picker = (0, _react.memo)(p => {
     position: 'bottom'
   }));
 
-  return _react.default.createElement(_react.default.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, generateValueExtend(value).items));
+  return _react.default.createElement(_react.default.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, extend.items));
 });
 exports.Picker = Picker;
 Picker.displayName = 'Picker';

package/cjs/components/picker-view/columns-extend.d.ts

@@ -0,0 +1,3 @@
+import type { PickerViewProps, PickerValue, PickerValueExtend } from './picker-view';
+export declare function generateColumnsExtend(rawColumns: PickerViewProps['columns'], val: PickerValue[]): PickerValueExtend;
+export declare function useColumnsExtend(rawColumns: PickerViewProps['columns'], value: PickerValue[]): PickerValueExtend;

package/cjs/components/picker-view/columns-extend.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateColumnsExtend = generateColumnsExtend;
+exports.useColumnsExtend = useColumnsExtend;
+
+var _react = require("react");
+
+var _withCache = require("../../utils/with-cache");
+
+function generateColumnsExtend(rawColumns, val) {
+  const columns = (0, _withCache.withCache)(() => {
+    const c = typeof rawColumns === 'function' ? rawColumns(val) : rawColumns;
+    return c.map(column => column.map(item => typeof item === 'string' ? {
+      label: item,
+      value: item
+    } : item));
+  });
+  const items = (0, _withCache.withCache)(() => {
+    return val.map((v, index) => {
+      var _a;
+
+      const column = columns()[index];
+      if (!column) return null;
+      return (_a = column.find(item => item.value === v)) !== null && _a !== void 0 ? _a : null;
+    });
+  });
+  const extend = {
+    get columns() {
+      return columns();
+    },
+
+    get items() {
+      return items();
+    }
+
+  };
+  return extend;
+}
+
+function useColumnsExtend(rawColumns, value) {
+  return (0, _react.useMemo)(() => generateColumnsExtend(rawColumns, value), [rawColumns, value]);
+}

package/cjs/components/picker-view/picker-view.d.ts

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type PickerValue = string | null;
 export declare type PickerValueExtend = {
+    columns: PickerColumnItem[][];
     items: (PickerColumnItem | null)[];
 };
 export declare type PickerColumnItem = {

package/cjs/components/picker-view/picker-view.js

@@ -11,12 +11,10 @@ var _withDefaultProps = require("../../utils/with-default-props");
 
 var _wheel = require("./wheel");
 
-var _useColumns = require("./use-columns");
+var _columnsExtend = require("./columns-extend");
 
 var _nativeProps = require("../../utils/native-props");
 
-var _usePickerValueExtend = require("./use-picker-value-extend");
-
 var _ahooks = require("ahooks");
 
 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); }
@@ -29,17 +27,7 @@ const defaultProps = {
 };
 const PickerView = (0, _react.memo)(p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  const [innerValue, setInnerValue] = (0, _react.useState)(props.value === undefined ? props.defaultValue : props.value);
-  (0, _ahooks.useDebounceEffect)(() => {
-    var _a;
-
-    if (props.value === innerValue) return;
-    (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerValue, generateValueExtend(innerValue));
-  }, [innerValue], {
-    wait: 0,
-    leading: false,
-    trailing: true
-  }); // Sync `value` to `innerValue`
+  const [innerValue, setInnerValue] = (0, _react.useState)(props.value === undefined ? props.defaultValue : props.value); // Sync `value` to `innerValue`
 
   (0, _react.useEffect)(() => {
     if (props.value === undefined) return; // Uncontrolled mode
@@ -58,8 +46,18 @@ const PickerView = (0, _react.memo)(p => {
       window.clearTimeout(timeout);
     };
   }, [props.value, innerValue]);
-  const columns = (0, _useColumns.useColumns)(props.columns, innerValue);
-  const generateValueExtend = (0, _usePickerValueExtend.usePickerValueExtend)(columns);
+  const extend = (0, _columnsExtend.useColumnsExtend)(props.columns, innerValue);
+  const columns = extend.columns;
+  (0, _ahooks.useDebounceEffect)(() => {
+    var _a;
+
+    if (props.value === innerValue) return;
+    (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerValue, extend);
+  }, [innerValue], {
+    wait: 0,
+    leading: false,
+    trailing: true
+  });
   const handleSelect = (0, _react.useCallback)((val, index) => {
     setInnerValue(prev => {
       const next = [...prev];

package/cjs/components/pull-to-refresh/pull-to-refresh.js

@@ -23,6 +23,8 @@ var _convertPx = require("../../utils/convert-px");
 
 var _rubberband = require("../../utils/rubberband");
 
+var _configProvider = require("../config-provider");
+
 var _sleep = require("../../utils/sleep");
 
 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); }
@@ -44,7 +46,15 @@ exports.defaultProps = defaultProps;
 const PullToRefresh = p => {
   var _a, _b;
 
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, {
+    refreshingText: locale.common.loading,
+    pullingText: locale.PullToRefresh.pulling,
+    canReleaseText: locale.PullToRefresh.canRelease,
+    completeText: locale.PullToRefresh.complete
+  }, p);
   const headHeight = (_a = props.headHeight) !== null && _a !== void 0 ? _a : (0, _convertPx.convertPx)(40);
   const threshold = (_b = props.threshold) !== null && _b !== void 0 ? _b : (0, _convertPx.convertPx)(60);
   const [status, setStatus] = (0, _react2.useState)('pulling');

package/cjs/components/result/result.d.ts

@@ -2,8 +2,8 @@ import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ResultProps = {
     status: 'success' | 'error' | 'info' | 'waiting' | 'warning';
-    title: string;
-    description?: string;
+    title: ReactNode;
+    description?: ReactNode;
     icon?: ReactNode;
 } & NativeProps;
 export declare const Result: FC<ResultProps>;

package/cjs/components/virtual-input/virtual-input.js

@@ -84,6 +84,30 @@ const VirtualInput = (0, _react.forwardRef)((p, ref) => {
     (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props);
   }
 
+  const keyboard = props.keyboard;
+
+  const keyboardElement = keyboard && _react.default.cloneElement(keyboard, {
+    onInput: v => {
+      var _a, _b;
+
+      setValue(value + v);
+      (_b = (_a = keyboard.props).onInput) === null || _b === void 0 ? void 0 : _b.call(_a, v);
+    },
+    onDelete: () => {
+      var _a, _b;
+
+      setValue(value.slice(0, -1));
+      (_b = (_a = keyboard.props).onDelete) === null || _b === void 0 ? void 0 : _b.call(_a);
+    },
+    visible: hasFocus,
+    onClose: () => {
+      var _a, _b, _c;
+
+      (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+      (_c = (_b = keyboard.props).onClose) === null || _c === void 0 ? void 0 : _c.call(_b);
+    }
+  });
+
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     ref: rootRef,
     className: (0, _classnames.default)(classPrefix, {
@@ -111,19 +135,6 @@ const VirtualInput = (0, _react.forwardRef)((p, ref) => {
     }
   }, _react.default.createElement(_antdMobileIcons.CloseCircleFill, null)), !value && _react.default.createElement("div", {
     className: `${classPrefix}-placeholder`
-  }, props.placeholder), props.keyboard && _react.default.cloneElement(props.keyboard, {
-    onInput: v => {
-      setValue(value + v);
-    },
-    onDelete: () => {
-      setValue(value.slice(0, -1));
-    },
-    visible: hasFocus,
-    onClose: () => {
-      var _a;
-
-      (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.blur();
-    }
-  })));
+  }, props.placeholder), keyboardElement));
 });
 exports.VirtualInput = VirtualInput;

package/cjs/locales/base.d.ts

@@ -2,6 +2,7 @@ export declare const base: {
     common: {
         confirm: string;
         cancel: string;
+        loading: string;
     };
     Calendar: {
         markItems: string[];
@@ -91,5 +92,10 @@ export declare const base: {
     Modal: {
         ok: string;
     };
+    PullToRefresh: {
+        pulling: string;
+        canRelease: string;
+        complete: string;
+    };
 };
 export declare type Locale = typeof base;

package/cjs/locales/base.js

@@ -8,7 +8,8 @@ const typeTemplate = '${label} is not a valid ${type}';
 const base = {
   common: {
     confirm: 'Confirm',
-    cancel: 'Cancel'
+    cancel: 'Cancel',
+    loading: 'Loading...'
   },
   Calendar: {
     markItems: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
@@ -97,6 +98,11 @@ const base = {
   },
   Modal: {
     ok: 'OK'
+  },
+  PullToRefresh: {
+    pulling: 'Scroll down to refresh',
+    canRelease: 'Release to refresh immediately',
+    complete: 'Refresh successful'
   }
 };
 exports.base = base;

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

@@ -2,6 +2,7 @@ declare const enUS: {
     common: {
         confirm: string;
         cancel: string;
+        loading: string;
     };
     Calendar: {
         markItems: string[];
@@ -91,5 +92,10 @@ declare const enUS: {
     Modal: {
         ok: string;
     };
+    PullToRefresh: {
+        pulling: string;
+        canRelease: string;
+        complete: string;
+    };
 };
 export default enUS;

package/cjs/locales/fa-IR.d.ts

@@ -0,0 +1,101 @@
+declare const faIR: {
+    common: {
+        confirm: string;
+        cancel: string;
+        loading: string;
+    };
+    Calendar: {
+        markItems: string[];
+        renderYearAndMonth: (year: number, month: number) => string;
+    };
+    Cascader: {
+        placeholder: string;
+    };
+    Dialog: {
+        ok: string;
+    };
+    ErrorBlock: {
+        default: {
+            title: string;
+            description: string;
+        };
+        busy: {
+            title: string;
+            description: string;
+        };
+        disconnected: {
+            title: string;
+            description: string;
+        };
+        empty: {
+            title: string;
+            description: string;
+        };
+    };
+    Form: {
+        required: string;
+        optional: string;
+        defaultValidateMessages: {
+            default: string;
+            required: string;
+            enum: string;
+            whitespace: string;
+            date: {
+                format: string;
+                parse: string;
+                invalid: string;
+            };
+            types: {
+                string: string;
+                method: string;
+                array: string;
+                object: string;
+                number: string;
+                date: string;
+                boolean: string;
+                integer: string;
+                float: string;
+                regexp: string;
+                email: string;
+                url: string;
+                hex: string;
+            };
+            string: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            number: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            array: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            pattern: {
+                mismatch: string;
+            };
+        };
+    };
+    ImageUploader: {
+        uploading: string;
+    };
+    Mask: {
+        name: string;
+    };
+    Modal: {
+        ok: string;
+    };
+    PullToRefresh: {
+        pulling: string;
+        canRelease: string;
+        complete: string;
+    };
+};
+export default faIR;

package/cjs/locales/fa-IR.js

@@ -0,0 +1,108 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _mergeLocale = require("../utils/merge-locale");
+
+var _base = require("./base");
+
+const typeTemplate = '${label} یک ${type} معتبر نیست';
+const faIR = (0, _mergeLocale.mergeLocale)(_base.base, {
+  common: {
+    confirm: 'تایید',
+    cancel: 'لغو'
+  },
+  Calendar: {
+    markItems: ['شنبه', 'یک‌شنبه', 'دو‌شنبه', 'سه‌شنبه', 'چهار‌شنبه', 'پنج‌نشبه', 'جمعه'],
+    renderYearAndMonth: (year, month) => `${year}/${month}`
+  },
+  Cascader: {
+    placeholder: 'انتخاب کنید'
+  },
+  Dialog: {
+    ok: 'باشه'
+  },
+  ErrorBlock: {
+    default: {
+      title: 'اوه، مشکلی پیش آمد',
+      description: 'لطفاً یک دقیقه صبر کنید و دوباره امتحان کنید'
+    },
+    busy: {
+      title: 'اوه، بارگیری نمی شود',
+      description: 'سعی کنید صفحه را به روز کنید'
+    },
+    disconnected: {
+      title: 'شبکه مشغول است',
+      description: 'سعی کنید صفحه را به روز کنید'
+    },
+    empty: {
+      title: 'هوم، نتونستم پیداش کنم...',
+      description: 'آیا می خواهید یک جستجوی جدید را امتحان کنید؟'
+    }
+  },
+  Form: {
+    required: 'اجباری',
+    optional: 'اختیاری',
+    defaultValidateMessages: {
+      default: 'خطای اعتبارسنجی فیلد برای ${label}',
+      required: 'لطفا وارد کنید ${label}',
+      enum: '${label} باید یکی از [${enum}]',
+      whitespace: '${label} نمی تواند یک کاراکتر خالی باشد',
+      date: {
+        format: '${label} قالب تاریخ نامعتبر است',
+        parse: '${label} نمی توان به تاریخ تبدیل کرد',
+        invalid: '${label} تاریخ نامعتبر است'
+      },
+      types: {
+        string: typeTemplate,
+        method: typeTemplate,
+        array: typeTemplate,
+        object: typeTemplate,
+        number: typeTemplate,
+        date: typeTemplate,
+        boolean: typeTemplate,
+        integer: typeTemplate,
+        float: typeTemplate,
+        regexp: typeTemplate,
+        email: typeTemplate,
+        url: typeTemplate,
+        hex: typeTemplate
+      },
+      string: {
+        len: 'تعداد کاراکترهای ${label} باید ${len} کاراکتر باشد',
+        min: 'حداقل کاراکترهای ${label} باید ${min} کاراکتر باشد',
+        max: 'حداکثر کاراکترهای ${label} باید ${max} کاراکتر باشد',
+        range: 'تعداد کاراکترهای ${label} باید بین ${min}-${max} کاراکتر باشد'
+      },
+      number: {
+        len: 'تعداد اعداد ${label} باید برابر با ${len} باشد',
+        min: 'تعداد اعداد ${label} باید حداقل ${min} باشد',
+        max: 'تعداد اعداد ${label} باید حداکثر ${max} باشد',
+        range: 'تعداد اعداد ${label} باید بین ${min}-${max} باشد'
+      },
+      array: {
+        len: 'طول آیتم‌های ${label} باید برابر با ${len} باشد',
+        min: 'آیتم‌های ${label} باید حداقل ${min} باشد',
+        max: 'آیتم‌های ${label} باید حداکثر ${max} باشد',
+        range: 'آیتم‌های ${label} باید بین ${min}-${max} باشد'
+      },
+      pattern: {
+        mismatch: '${label} با الگوی ${pattern} مطابقت ندارد'
+      }
+    }
+  },
+  ImageUploader: {
+    uploading: 'در حال آپلود...'
+  },
+  Mask: {
+    name: 'ماسک'
+  },
+  Modal: {
+    ok: 'باشه'
+  }
+});
+var _default = faIR;
+exports.default = _default;

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

@@ -2,6 +2,7 @@ declare const zhCN: {
     common: {
         confirm: string;
         cancel: string;
+        loading: string;
     };
     Calendar: {
         markItems: string[];
@@ -91,5 +92,10 @@ declare const zhCN: {
     Modal: {
         ok: string;
     };
+    PullToRefresh: {
+        pulling: string;
+        canRelease: string;
+        complete: string;
+    };
 };
 export default zhCN;

package/cjs/locales/zh-CN.js

@@ -13,7 +13,8 @@ const typeTemplate = '${label}不是一个有效的${type}';
 const zhCN = (0, _mergeLocale.mergeLocale)(_base.base, {
   common: {
     confirm: '确定',
-    cancel: '取消'
+    cancel: '取消',
+    loading: '加载中……'
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
@@ -102,6 +103,11 @@ const zhCN = (0, _mergeLocale.mergeLocale)(_base.base, {
   },
   Modal: {
     ok: '我知道了'
+  },
+  PullToRefresh: {
+    pulling: '下拉刷新',
+    canRelease: '释放立即刷新',
+    complete: '刷新成功'
   }
 });
 var _default = zhCN;