antd-mobile 5.0.0-rc.9 → 5.2.0

package/2x/es/components/date-picker/date-picker-week-utils.js

@@ -5,7 +5,7 @@ import isLeapYear from 'dayjs/plugin/isLeapYear';
 dayjs.extend(isoWeek);
 dayjs.extend(isoWeeksInYear);
 dayjs.extend(isLeapYear);
-var precisionRankRecord = {
+const precisionRankRecord = {
   year: 0,
   week: 1,
   'week-day': 2
@@ -14,69 +14,67 @@ export function defaultRenderLabel(type, data) {
   return data.toString();
 }
 export function generateDatePickerColumns(selected, min, max, precision, renderLabel, filter) {
-  var ret = [];
-  var minYear = min.getFullYear();
-  var maxYear = max.getFullYear();
-  var rank = precisionRankRecord[precision];
+  const ret = [];
+  const minYear = min.getFullYear();
+  const maxYear = max.getFullYear();
+  const rank = precisionRankRecord[precision];
 
   if (rank >= precisionRankRecord.year) {
-    var years = [];
+    const years = [];
 
-    for (var i = minYear; i <= maxYear; i++) {
-      var value = i.toString();
+    for (let i = minYear; i <= maxYear; i++) {
+      const value = i.toString();
       years.push({
         label: renderLabel ? renderLabel('year', i) : value,
-        value: value
+        value
       });
     }
 
     ret.push(years);
   }
 
-  var selectedYear = parseInt(selected[0]);
-  var isInMinYear = selectedYear === minYear;
-  var isInMaxYear = selectedYear === maxYear;
-  var minDay = dayjs(min);
-  var maxDay = dayjs(max);
-  var minWeek = minDay.isoWeek();
-  var maxWeek = maxDay.isoWeek();
-  var minWeekday = minDay.isoWeekday();
-  var maxWeekday = maxDay.isoWeekday();
-  var selectedWeek = parseInt(selected[1]);
-  var isInMinWeek = isInMinYear && selectedWeek === minWeek;
-  var isInMaxWeek = isInMaxYear && selectedWeek === maxWeek;
-  var selectedYearWeeks = dayjs(selectedYear + "-01-01").isoWeeksInYear();
-
-  var generateColumn = function generateColumn(from, to, precision) {
-    var column = [];
-
-    for (var _i = from; _i <= to; _i++) {
-      column.push(_i);
+  const selectedYear = parseInt(selected[0]);
+  const isInMinYear = selectedYear === minYear;
+  const isInMaxYear = selectedYear === maxYear;
+  const minDay = dayjs(min);
+  const maxDay = dayjs(max);
+  const minWeek = minDay.isoWeek();
+  const maxWeek = maxDay.isoWeek();
+  const minWeekday = minDay.isoWeekday();
+  const maxWeekday = maxDay.isoWeekday();
+  const selectedWeek = parseInt(selected[1]);
+  const isInMinWeek = isInMinYear && selectedWeek === minWeek;
+  const isInMaxWeek = isInMaxYear && selectedWeek === maxWeek;
+  const selectedYearWeeks = dayjs(`${selectedYear}-01-01`).isoWeeksInYear();
+
+  const generateColumn = (from, to, precision) => {
+    let column = [];
+
+    for (let i = from; i <= to; i++) {
+      column.push(i);
     }
 
-    var prefix = selected.slice(0, precisionRankRecord[precision]);
-    var currentFilter = filter === null || filter === void 0 ? void 0 : filter[precision];
+    const prefix = selected.slice(0, precisionRankRecord[precision]);
+    const currentFilter = filter === null || filter === void 0 ? void 0 : filter[precision];
 
     if (currentFilter && typeof currentFilter === 'function') {
-      column = column.filter(function (i) {
-        return currentFilter(i, {
-          get date() {
-            var stringArray = [].concat(prefix, [i.toString()]);
-            return convertStringArrayToDate(stringArray);
-          }
+      column = column.filter(i => currentFilter(i, {
+        get date() {
+          const stringArray = [...prefix, i.toString()];
+          return convertStringArrayToDate(stringArray);
+        }
 
-        });
-      });
+      }));
     }
 
     return column;
   };
 
   if (rank >= precisionRankRecord.week) {
-    var lower = isInMinYear ? minWeek : 1;
-    var upper = isInMaxYear ? maxWeek : selectedYearWeeks;
-    var weeks = generateColumn(lower, upper, 'week');
-    ret.push(weeks.map(function (v) {
+    const lower = isInMinYear ? minWeek : 1;
+    const upper = isInMaxYear ? maxWeek : selectedYearWeeks;
+    const weeks = generateColumn(lower, upper, 'week');
+    ret.push(weeks.map(v => {
       return {
         label: renderLabel('week', v),
         value: v.toString()
@@ -85,13 +83,10 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
   }
 
   if (rank >= precisionRankRecord['week-day']) {
-    var _lower = isInMinWeek ? minWeekday : 1;
-
-    var _upper = isInMaxWeek ? maxWeekday : 7;
-
-    var _weeks = generateColumn(_lower, _upper, 'week-day');
-
-    ret.push(_weeks.map(function (v) {
+    const lower = isInMinWeek ? minWeekday : 1;
+    const upper = isInMaxWeek ? maxWeekday : 7;
+    const weeks = generateColumn(lower, upper, 'week-day');
+    ret.push(weeks.map(v => {
       return {
         label: renderLabel('week-day', v),
         value: v.toString()
@@ -103,15 +98,15 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
 }
 export function convertDateToStringArray(date) {
   if (!date) return [];
-  var day = dayjs(date);
+  const day = dayjs(date);
   return [day.isoWeekYear().toString(), day.isoWeek().toString(), day.isoWeekday().toString()];
 }
 export function convertStringArrayToDate(value) {
   var _a, _b, _c;
 
-  var yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
-  var weekString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
-  var weekdayString = (_c = value[2]) !== null && _c !== void 0 ? _c : '1';
-  var day = dayjs().year(parseInt(yearString)).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
+  const yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
+  const weekString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
+  const weekdayString = (_c = value[2]) !== null && _c !== void 0 ? _c : '1';
+  const day = dayjs().year(parseInt(yearString)).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
   return day.toDate();
 }

package/2x/es/components/date-picker/date-picker.d.ts

@@ -1,10 +1,10 @@
 import { FC, ReactNode } from 'react';
-import { PickerProps } from '../picker';
+import type { PickerProps } from '../picker';
 import { NativeProps } from '../../utils/native-props';
 import type { Precision, DatePickerFilter } from './date-picker-utils';
-export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' | 'visible' | 'confirmText' | 'cancelText' | 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'title' | 'stopPropagation'> & {
-    value?: Date;
-    defaultValue?: Date;
+export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' | 'closeOnMaskClick' | 'visible' | 'confirmText' | 'cancelText' | 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'title' | 'stopPropagation' | 'style'> & {
+    value?: Date | null;
+    defaultValue?: Date | null;
     onSelect?: (value: Date) => void;
     onConfirm?: (value: Date) => void;
     min?: Date;

package/2x/es/components/date-picker/date-picker.js

@@ -5,42 +5,39 @@ import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { convertDateToStringArray, convertStringArrayToDate, generateDatePickerColumns, defaultRenderLabel } from './date-picker-utils';
-var thisYear = new Date().getFullYear();
-var defaultProps = {
+const thisYear = new Date().getFullYear();
+const defaultProps = {
   min: new Date(new Date().setFullYear(thisYear - 10)),
   max: new Date(new Date().setFullYear(thisYear + 10)),
   precision: 'day',
-  renderLabel: defaultRenderLabel
+  renderLabel: defaultRenderLabel,
+  defaultValue: null
 };
-export var DatePicker = function DatePicker(p) {
-  var _a;
-
-  var props = mergeProps(defaultProps, p);
-
-  var _usePropsValue = usePropsValue({
+export const DatePicker = p => {
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue({
     value: props.value,
-    defaultValue: (_a = props.defaultValue) !== null && _a !== void 0 ? _a : null,
-    onChange: props.onConfirm
-  }),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
+    defaultValue: props.defaultValue,
+    onChange: v => {
+      var _a;
 
-  var pickerValue = useMemo(function () {
-    return convertDateToStringArray(value, props.precision);
-  }, [value, props.precision]);
-  var onConfirm = useCallback(function (val) {
+      if (v === null) return;
+      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, v);
+    }
+  });
+  const now = useMemo(() => new Date(), []);
+  const pickerValue = useMemo(() => convertDateToStringArray(value !== null && value !== void 0 ? value : now, props.precision), [value, props.precision]);
+  const onConfirm = useCallback(val => {
     setValue(convertStringArrayToDate(val, props.precision));
   }, [setValue, props.precision]);
-  var onSelect = useMemoizedFn(function (val) {
+  const onSelect = useMemoizedFn(val => {
     var _a;
 
-    var date = convertStringArrayToDate(val, props.precision);
+    const date = convertStringArrayToDate(val, props.precision);
     (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, date);
   });
-  var columns = useCallback(function (selected) {
-    return generateDatePickerColumns(selected, props.min, props.max, props.precision, props.renderLabel, props.filter);
-  }, [props.min, props.max, props.precision, props.renderLabel]);
-  return withNativeProps(props, /*#__PURE__*/React.createElement(Picker, {
+  const columns = useCallback(selected => generateDatePickerColumns(selected, props.min, props.max, props.precision, props.renderLabel, props.filter), [props.min, props.max, props.precision, props.renderLabel]);
+  return withNativeProps(props, React.createElement(Picker, {
     columns: columns,
     value: pickerValue,
     onCancel: props.onCancel,
@@ -56,11 +53,9 @@ export var DatePicker = function DatePicker(p) {
     onClick: props.onClick,
     title: props.title,
     stopPropagation: props.stopPropagation
-  }, function (items) {
+  }, () => {
     var _a;
 
-    return (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, items.length === 0 ? null : convertStringArrayToDate(items.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item.value;
-    }), props.precision));
+    return (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, value);
   }));
 };

package/2x/es/components/date-picker/index.js

@@ -3,5 +3,5 @@ import { attachPropertiesToComponent } from '../../utils/attach-properties-to-co
 import { DatePicker } from './date-picker';
 import { prompt } from './prompt';
 export default attachPropertiesToComponent(DatePicker, {
-  prompt: prompt
+  prompt
 });

package/2x/es/components/date-picker/prompt.js

@@ -2,31 +2,28 @@ import React, { useEffect, useState } from 'react';
 import { renderToBody } from '../../utils/render-to-body';
 import { DatePicker } from './date-picker';
 export function prompt(props) {
-  return new Promise(function (resolve) {
-    var Wrapper = function Wrapper() {
-      var _useState = useState(false),
-          visible = _useState[0],
-          setVisible = _useState[1];
-
-      useEffect(function () {
+  return new Promise(resolve => {
+    const Wrapper = () => {
+      const [visible, setVisible] = useState(false);
+      useEffect(() => {
         setVisible(true);
       }, []);
-      return /*#__PURE__*/React.createElement(DatePicker, Object.assign({}, props, {
+      return React.createElement(DatePicker, Object.assign({}, props, {
         visible: visible,
-        onConfirm: function onConfirm(val) {
+        onConfirm: val => {
           var _a;
 
           (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val);
           resolve(val);
         },
-        onClose: function onClose() {
+        onClose: () => {
           var _a;
 
           (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
           setVisible(false);
           resolve(null);
         },
-        afterClose: function afterClose() {
+        afterClose: () => {
           var _a;
 
           (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
@@ -35,6 +32,6 @@ export function prompt(props) {
       }));
     };
 
-    var unmount = renderToBody( /*#__PURE__*/React.createElement(Wrapper, null));
+    const unmount = renderToBody(React.createElement(Wrapper, null));
   });
 }

package/2x/es/components/date-picker-view/date-picker-view.d.ts

@@ -1,7 +1,8 @@
 import { FC, ReactNode } from 'react';
+import type { PickerViewProps } from '../picker-view';
 import { NativeProps } from '../../utils/native-props';
 import type { Precision, DatePickerFilter } from '../date-picker/date-picker-utils';
-export declare type DatePickerViewProps = {
+export declare type DatePickerViewProps = Pick<PickerViewProps, 'style'> & {
     value?: Date;
     defaultValue?: Date;
     onChange?: (value: Date) => void;
@@ -10,5 +11,5 @@ export declare type DatePickerViewProps = {
     precision?: Precision;
     renderLabel?: (type: Precision, data: number) => ReactNode;
     filter?: DatePickerFilter;
-} & NativeProps<'--height'>;
+} & NativeProps;
 export declare const DatePickerView: FC<DatePickerViewProps>;

package/2x/es/components/date-picker-view/date-picker-view.js

@@ -4,42 +4,34 @@ import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { generateDatePickerColumns, convertDateToStringArray, convertStringArrayToDate, defaultRenderLabel } from '../date-picker/date-picker-utils';
-var thisYear = new Date().getFullYear();
-var defaultProps = {
+const thisYear = new Date().getFullYear();
+const defaultProps = {
   min: new Date(new Date().setFullYear(thisYear - 10)),
   max: new Date(new Date().setFullYear(thisYear + 10)),
   precision: 'day',
   renderLabel: defaultRenderLabel
 };
-export var DatePickerView = function DatePickerView(p) {
+export const DatePickerView = p => {
   var _a;
 
-  var props = mergeProps(defaultProps, p);
-
-  var _usePropsValue = usePropsValue({
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue({
     value: props.value,
     defaultValue: (_a = props.defaultValue) !== null && _a !== void 0 ? _a : null
-  }),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
-
-  var pickerValue = useMemo(function () {
-    return convertDateToStringArray(value, props.precision);
-  }, [value, props.precision]);
-  var onChange = useCallback(function (val) {
+  });
+  const pickerValue = useMemo(() => convertDateToStringArray(value, props.precision), [value, props.precision]);
+  const onChange = useCallback(val => {
     var _a;
 
-    var date = convertStringArrayToDate(val, props.precision);
+    const date = convertStringArrayToDate(val, props.precision);
 
     if (date) {
       setValue(date);
       (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, date);
     }
   }, [props.onChange, props.precision]);
-  return withNativeProps(props, /*#__PURE__*/React.createElement(PickerView, {
-    columns: function columns(selected) {
-      return generateDatePickerColumns(selected, props.min, props.max, props.precision, props.renderLabel, props.filter);
-    },
+  return withNativeProps(props, React.createElement(PickerView, {
+    columns: selected => generateDatePickerColumns(selected, props.min, props.max, props.precision, props.renderLabel, props.filter),
     value: pickerValue,
     onChange: onChange
   }));

package/2x/es/components/dialog/alert.js

@@ -2,11 +2,11 @@ import { show } from './show';
 import { mergeProps } from '../../utils/with-default-props';
 import { getDefaultConfig } from '../config-provider';
 export function alert(p) {
-  var defaultProps = {
+  const defaultProps = {
     confirmText: getDefaultConfig().locale.Dialog.ok
   };
-  var props = mergeProps(defaultProps, p);
-  return new Promise(function (resolve) {
+  const props = mergeProps(defaultProps, p);
+  return new Promise(resolve => {
     show(Object.assign(Object.assign({}, props), {
       closeOnAction: true,
       actions: [{
@@ -14,7 +14,10 @@ export function alert(p) {
         text: props.confirmText
       }],
       onAction: props.onConfirm,
-      onClose: function onClose() {
+      onClose: () => {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
         resolve();
       }
     }));

package/2x/es/components/dialog/clear.d.ts

@@ -0,0 +1 @@
+export declare function clear(): void;

package/2x/es/components/dialog/clear.js

@@ -0,0 +1,6 @@
+import { closeFnSet } from './show';
+export function clear() {
+  closeFnSet.forEach(close => {
+    close();
+  });
+}

package/2x/es/components/dialog/confirm.js

@@ -1,49 +1,16 @@
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
+import { __awaiter } from "tslib";
 import { show } from './show';
 import { mergeProps } from '../../utils/with-default-props';
-var defaultProps = {
+const defaultProps = {
   confirmText: '确认',
   cancelText: '取消'
 };
 export function confirm(p) {
-  var _this = this;
-
-  var props = mergeProps(defaultProps, p);
-  return new Promise(function (resolve) {
+  const props = mergeProps(defaultProps, p);
+  return new Promise(resolve => {
     show(Object.assign(Object.assign({}, props), {
       closeOnAction: true,
-      onClose: function onClose() {
+      onClose: () => {
         var _a;
 
         (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
@@ -52,54 +19,22 @@ export function confirm(p) {
       actions: [[{
         key: 'cancel',
         text: props.cancelText,
-        onClick: function onClick() {
-          return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-            var _a;
-
-            return regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
+        onClick: () => __awaiter(this, void 0, void 0, function* () {
+          var _a;
 
-                  case 2:
-                    resolve(false);
-
-                  case 3:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-        }
+          yield (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
+          resolve(false);
+        })
       }, {
         key: 'confirm',
         text: props.confirmText,
         bold: true,
-        onClick: function onClick() {
-          return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-            var _b;
-
-            return regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
-                    return (_b = props.onConfirm) === null || _b === void 0 ? void 0 : _b.call(props);
-
-                  case 2:
-                    resolve(true);
+        onClick: () => __awaiter(this, void 0, void 0, function* () {
+          var _b;
 
-                  case 3:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }));
-        }
+          yield (_b = props.onConfirm) === null || _b === void 0 ? void 0 : _b.call(props);
+          resolve(true);
+        })
       }]]
     }));
   });

package/2x/es/components/dialog/dialog-action-button.js

@@ -1,86 +1,37 @@
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
+import { __awaiter } from "tslib";
 import React, { useState } from 'react';
 import classNames from 'classnames';
 import Button from '../button';
 import { withNativeProps } from '../../utils/native-props';
-export var DialogActionButton = function DialogActionButton(props) {
-  var action = props.action;
-
-  var _useState = useState(false),
-      loading = _useState[0],
-      setLoading = _useState[1];
+export const DialogActionButton = props => {
+  const {
+    action
+  } = props;
+  const [loading, setLoading] = useState(false);
 
   function handleClick() {
-    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var promise;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              setLoading(true);
-              _context.prev = 1;
-              promise = props.onAction();
-              _context.next = 5;
-              return promise;
-
-            case 5:
-              setLoading(false);
-              _context.next = 12;
-              break;
+    return __awaiter(this, void 0, void 0, function* () {
+      setLoading(true);
 
-            case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](1);
-              setLoading(false);
-              throw _context.t0;
-
-            case 12:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[1, 8]]);
-    }));
+      try {
+        const promise = props.onAction();
+        yield promise;
+        setLoading(false);
+      } catch (e) {
+        setLoading(false);
+        throw e;
+      }
+    });
   }
 
-  return withNativeProps(props.action, /*#__PURE__*/React.createElement(Button, {
+  return withNativeProps(props.action, React.createElement(Button, {
     key: action.key,
     onClick: handleClick,
     className: classNames('adm-dialog-button', {
       'adm-dialog-button-bold': action.bold
     }),
     fill: 'none',
+    shape: 'rectangular',
     block: true,
     color: action.danger ? 'danger' : 'primary',
     loading: loading,