antd-mobile 5.0.0-beta.9 → 5.0.0-rc.3

package/2x/es/components/config-provider/config-provider.js

@@ -12,60 +12,30 @@ var __rest = this && this.__rest || function (s, e) {
 };
 
 import React, { useContext } from 'react';
-import { devWarning } from '../../utils/dev-log';
-import { useCreation, useUnmount } from 'ahooks';
 import zhCN from '../../locales/zh-CN';
-var defaultConfig = {
-  locale: zhCN
-};
-var ConfigContext = /*#__PURE__*/React.createContext(Object.assign(Object.assign({}, defaultConfig), {
-  isFallback: true
-}));
-export var globalConfigRef = {
-  key: null,
-  current: defaultConfig
+export var defaultConfigRef = {
+  current: {
+    locale: zhCN
+  }
 };
+export function setDefaultConfig(config) {
+  defaultConfigRef.current = config;
+}
+export function getDefaultConfig() {
+  return defaultConfigRef.current;
+}
+var ConfigContext = /*#__PURE__*/React.createContext(null);
 export var ConfigProvider = function ConfigProvider(props) {
   var children = props.children,
-      global = props.global,
-      config = __rest(props, ["children", "global"]);
-
-  var key = useCreation(function () {
-    return Symbol();
-  }, []);
+      config = __rest(props, ["children"]);
 
-  function cleanUp() {
-    if (globalConfigRef.key !== key) {
-      return;
-    }
-
-    devWarning('cleanUp', 'cleanUp');
-    globalConfigRef.key = null;
-    globalConfigRef.current = defaultConfig;
-  }
-
-  if (global) {
-    if (globalConfigRef.key === key || globalConfigRef.key === null) {
-      console.log('globalConfigRef.current = config', config.locale.Dialog);
-      globalConfigRef.key = key;
-      globalConfigRef.current = config;
-      console.log('globalConfigRef2', globalConfigRef);
-    } else {
-      devWarning('ConfigProvider', 'It seems you are rendering more than one ConfigProvider with `global: true`. Only the first rendered component will take effect.');
-    }
-  } else {
-    cleanUp();
-  }
-
-  useUnmount(function () {
-    cleanUp();
-  });
+  var parentConfig = useConfig();
   return /*#__PURE__*/React.createElement(ConfigContext.Provider, {
-    value: Object.assign(Object.assign({}, config), {
-      isFallback: true
-    })
+    value: Object.assign(Object.assign({}, parentConfig), config)
   }, children);
 };
 export function useConfig() {
-  return useContext(ConfigContext);
+  var _a;
+
+  return (_a = useContext(ConfigContext)) !== null && _a !== void 0 ? _a : getDefaultConfig();
 }

package/2x/es/components/config-provider/index.d.ts

@@ -1,4 +1,4 @@
 import { ConfigProvider } from './config-provider';
 export type { ConfigProviderProps } from './config-provider';
-export { useConfig, globalConfigRef } from './config-provider';
+export { useConfig, setDefaultConfig, getDefaultConfig, } from './config-provider';
 export default ConfigProvider;

package/2x/es/components/config-provider/index.js

@@ -1,3 +1,3 @@
 import { ConfigProvider } from './config-provider';
-export { useConfig, globalConfigRef } from './config-provider';
+export { useConfig, setDefaultConfig, getDefaultConfig } from './config-provider';
 export default ConfigProvider;

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

@@ -0,0 +1,7 @@
+import { ReactNode } from 'react';
+import { PickerColumn } from '../picker';
+export declare type DatePrecision = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
+export declare function defaultRenderLabel(type: DatePrecision, data: number): string;
+export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: DatePrecision, renderLabel: (type: DatePrecision, data: number) => ReactNode): PickerColumn[];
+export declare function convertDateToStringArray(date: Date | undefined | null): string[];
+export declare function convertStringArrayToDate(value: (string | null | undefined)[]): Date | null;

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

@@ -0,0 +1,161 @@
+import dayjs from 'dayjs';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import isoWeeksInYear from 'dayjs/plugin/isoWeeksInYear';
+import isLeapYear from 'dayjs/plugin/isLeapYear';
+import { generateIntArray } from '../../utils/generate-int-array';
+dayjs.extend(isoWeek);
+dayjs.extend(isoWeeksInYear);
+dayjs.extend(isLeapYear);
+var precisionRankRecord = {
+  year: 0,
+  month: 1,
+  day: 2,
+  hour: 3,
+  minute: 4,
+  second: 5
+};
+export function defaultRenderLabel(type, data) {
+  switch (type) {
+    case 'minute':
+    case 'second':
+    case 'hour':
+      return ('0' + data.toString()).slice(-2);
+
+    default:
+      return data.toString();
+  }
+}
+export function generateDatePickerColumns(selected, min, max, precision, renderLabel) {
+  var ret = [];
+  var minYear = min.getFullYear();
+  var minMonth = min.getMonth() + 1;
+  var minDay = min.getDate();
+  var minHour = min.getHours();
+  var minMinute = min.getMinutes();
+  var minSecond = min.getSeconds();
+  var maxYear = max.getFullYear();
+  var maxMonth = max.getMonth() + 1;
+  var maxDay = max.getDate();
+  var maxHour = max.getHours();
+  var maxMinute = max.getMinutes();
+  var maxSecond = max.getSeconds();
+  var rank = precisionRankRecord[precision];
+
+  if (rank >= precisionRankRecord.year) {
+    var years = [];
+
+    for (var i = minYear; i <= maxYear; i++) {
+      var value = i.toString();
+      years.push({
+        label: renderLabel ? renderLabel('year', i) : value,
+        value: value
+      });
+    }
+
+    ret.push(years);
+  }
+
+  var selectedYear = parseInt(selected[0]);
+  var isInMinYear = selectedYear === minYear;
+  var isInMaxYear = selectedYear === maxYear; // rank < 10 的情况：标准时间选择
+
+  var firstDayInSelectedMonth = dayjs(convertStringArrayToDate([selected[0], selected[1], '1']));
+  var selectedMonth = parseInt(selected[1]);
+  var selectedDay = parseInt(selected[2]);
+  var selectedHour = parseInt(selected[3]);
+  var selectedMinute = parseInt(selected[4]);
+  var isInMinMonth = isInMinYear && selectedMonth === minMonth;
+  var isInMaxMonth = isInMaxYear && selectedMonth === maxMonth;
+  var isInMinDay = isInMinMonth && selectedDay === minDay;
+  var isInMaxDay = isInMaxMonth && selectedDay === maxDay;
+  var isInMinHour = isInMinDay && selectedHour === minHour;
+  var isInMaxHour = isInMaxDay && selectedHour === maxHour;
+  var isInMinMinute = isInMinHour && selectedMinute === minMinute;
+  var isInMaxMinute = isInMaxHour && selectedMinute === maxMinute;
+
+  if (rank >= precisionRankRecord.month) {
+    var lower = isInMinYear ? minMonth : 1;
+    var upper = isInMaxYear ? maxMonth : 12;
+    var months = generateIntArray(lower, upper);
+    ret.push(months.map(function (v) {
+      return {
+        label: renderLabel('month', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  if (rank >= precisionRankRecord.day) {
+    var _lower = isInMinMonth ? minDay : 1;
+
+    var _upper = isInMaxMonth ? maxDay : firstDayInSelectedMonth.daysInMonth();
+
+    var days = generateIntArray(_lower, _upper);
+    ret.push(days.map(function (v) {
+      return {
+        label: renderLabel('day', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  if (rank >= precisionRankRecord.hour) {
+    var _lower2 = isInMinDay ? minHour : 0;
+
+    var _upper2 = isInMaxDay ? maxHour : 23;
+
+    var hours = generateIntArray(_lower2, _upper2);
+    ret.push(hours.map(function (v) {
+      return {
+        label: renderLabel('hour', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  if (rank >= precisionRankRecord.minute) {
+    var _lower3 = isInMinHour ? minMinute : 0;
+
+    var _upper3 = isInMaxHour ? maxMinute : 59;
+
+    var minutes = generateIntArray(_lower3, _upper3);
+    ret.push(minutes.map(function (v) {
+      return {
+        label: renderLabel('minute', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  if (rank >= precisionRankRecord.second) {
+    var _lower4 = isInMinMinute ? minSecond : 0;
+
+    var _upper4 = isInMaxMinute ? maxSecond : 59;
+
+    var seconds = generateIntArray(_lower4, _upper4);
+    ret.push(seconds.map(function (v) {
+      return {
+        label: renderLabel('second', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  return ret;
+}
+export function convertDateToStringArray(date) {
+  if (!date) return [];
+  return [date.getFullYear().toString(), (date.getMonth() + 1).toString(), date.getDate().toString(), date.getHours().toString(), date.getMinutes().toString(), date.getSeconds().toString()];
+}
+export function convertStringArrayToDate(value) {
+  var _a, _b, _c, _d, _e, _f;
+
+  if (value.length === 0) return null;
+  var yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
+  var monthString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
+  var dateString = (_c = value[2]) !== null && _c !== void 0 ? _c : '1';
+  var hourString = (_d = value[3]) !== null && _d !== void 0 ? _d : '0';
+  var minuteString = (_e = value[4]) !== null && _e !== void 0 ? _e : '0';
+  var secondString = (_f = value[5]) !== null && _f !== void 0 ? _f : '0';
+  return new Date(parseInt(yearString), parseInt(monthString) - 1, parseInt(dateString), parseInt(hourString), parseInt(minuteString), parseInt(secondString));
+}

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

@@ -0,0 +1,8 @@
+import { ReactNode } from 'react';
+import type { DatePrecision } from './date-picker-date-utils';
+import type { WeekPrecision } from './date-picker-week-utils';
+export declare type Precision = DatePrecision | WeekPrecision;
+export declare const convertDateToStringArray: (date: Date | undefined | null, precision: Precision) => string[];
+export declare const convertStringArrayToDate: (value: (string | null | undefined)[], precision: Precision) => Date | null;
+export declare const generateDatePickerColumns: (selected: string[], min: Date, max: Date, precision: Precision, renderLabel: (type: Precision, data: number) => ReactNode) => import("../picker-view").PickerColumn[];
+export declare const defaultRenderLabel: (precision: Precision, data: number) => string;

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

@@ -0,0 +1,30 @@
+import * as dateUtils from './date-picker-date-utils';
+import * as weekUtils from './date-picker-week-utils';
+export var convertDateToStringArray = function convertDateToStringArray(date, precision) {
+  if (precision.includes('week')) {
+    return weekUtils.convertDateToStringArray(date);
+  } else {
+    return dateUtils.convertDateToStringArray(date);
+  }
+};
+export var convertStringArrayToDate = function convertStringArrayToDate(value, precision) {
+  if (precision.includes('week')) {
+    return weekUtils.convertStringArrayToDate(value);
+  } else {
+    return dateUtils.convertStringArrayToDate(value);
+  }
+};
+export var generateDatePickerColumns = function generateDatePickerColumns(selected, min, max, precision, renderLabel) {
+  if (precision.startsWith('week')) {
+    return weekUtils.generateDatePickerColumns(selected, min, max, precision, renderLabel);
+  } else {
+    return dateUtils.generateDatePickerColumns(selected, min, max, precision, renderLabel);
+  }
+};
+export var defaultRenderLabel = function defaultRenderLabel(precision, data) {
+  if (precision.includes('week')) {
+    return weekUtils.defaultRenderLabel(precision, data);
+  } else {
+    return dateUtils.defaultRenderLabel(precision, data);
+  }
+};

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

@@ -0,0 +1,7 @@
+import { ReactNode } from 'react';
+import { PickerColumn } from '../picker';
+export declare type WeekPrecision = 'year' | 'week' | 'week-day';
+export declare function defaultRenderLabel(type: WeekPrecision, data: number): string;
+export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: WeekPrecision, renderLabel: (type: WeekPrecision, data: number) => ReactNode): PickerColumn[];
+export declare function convertDateToStringArray(date: Date | undefined | null): string[];
+export declare function convertStringArrayToDate(value: (string | null | undefined)[]): Date | null;

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

@@ -0,0 +1,94 @@
+import dayjs from 'dayjs';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import isoWeeksInYear from 'dayjs/plugin/isoWeeksInYear';
+import isLeapYear from 'dayjs/plugin/isLeapYear';
+import { generateIntArray } from '../../utils/generate-int-array';
+dayjs.extend(isoWeek);
+dayjs.extend(isoWeeksInYear);
+dayjs.extend(isLeapYear);
+var precisionRankRecord = {
+  year: 0,
+  week: 1,
+  'week-day': 2
+};
+export function defaultRenderLabel(type, data) {
+  return data.toString();
+}
+export function generateDatePickerColumns(selected, min, max, precision, renderLabel) {
+  var ret = [];
+  var minYear = min.getFullYear();
+  var maxYear = max.getFullYear();
+  var rank = precisionRankRecord[precision];
+
+  if (rank >= precisionRankRecord.year) {
+    var years = [];
+
+    for (var i = minYear; i <= maxYear; i++) {
+      var value = i.toString();
+      years.push({
+        label: renderLabel ? renderLabel('year', i) : 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();
+
+  if (rank >= precisionRankRecord.week) {
+    var lower = isInMinYear ? minWeek : 1;
+    var upper = isInMaxYear ? maxWeek : selectedYearWeeks;
+    var weeks = generateIntArray(lower, upper);
+    ret.push(weeks.map(function (v) {
+      return {
+        label: renderLabel('week', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  if (rank >= precisionRankRecord['week-day']) {
+    var _lower = isInMinWeek ? minWeekday : 1;
+
+    var _upper = isInMaxWeek ? maxWeekday : 7;
+
+    var _weeks = generateIntArray(_lower, _upper);
+
+    ret.push(_weeks.map(function (v) {
+      return {
+        label: renderLabel('week-day', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  return ret;
+}
+export function convertDateToStringArray(date) {
+  if (!date) return [];
+  var day = dayjs(date);
+  return [day.isoWeekYear().toString(), day.isoWeek().toString(), day.isoWeekday().toString()];
+}
+export function convertStringArrayToDate(value) {
+  var _a, _b, _c;
+
+  if (value.length === 0) return null;
+  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);
+  return day.toDate();
+}

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

@@ -1,8 +1,8 @@
-import React, { ReactNode } from 'react';
+import { FC, ReactNode } from 'react';
 import { PickerProps } from '../picker';
 import { NativeProps } from '../../utils/native-props';
-declare type Precision = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
-export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' | 'visible' | 'confirmText' | 'cancelText' | 'getContainer' | 'afterShow' | 'afterClose' | 'onClick'> & {
+import { Precision } 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;
     onSelect?: (value: Date) => void;
@@ -11,6 +11,6 @@ export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' |
     max?: Date;
     precision?: Precision;
     children?: (value: Date | null) => ReactNode;
+    renderLabel?: (type: Precision, data: number) => ReactNode;
 } & NativeProps;
-export declare const DatePicker: React.FC<DatePickerProps>;
-export {};
+export declare const DatePicker: FC<DatePickerProps>;

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

@@ -1,158 +1,48 @@
-import React, { useMemo, useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import Picker from '../picker';
-import dayjs from 'dayjs';
-import { generateIntArray } from '../../utils/generate-int-array';
 import { withNativeProps } from '../../utils/native-props';
-import { withDefaultProps } from '../../utils/with-default-props';
-import { useNewControllableValue } from '../../utils/use-controllable-value';
-var precisionRankRecord = {
-  year: 0,
-  month: 1,
-  day: 2,
-  hour: 3,
-  minute: 4,
-  second: 5
-};
+import { mergeProps } from '../../utils/with-default-props';
+import { usePropsValue } from '../../utils/use-props-value';
+import { convertDateToStringArray, convertStringArrayToDate, generateDatePickerColumns, defaultRenderLabel } from './date-picker-utils';
+import { usePersistFn } from 'ahooks';
 var thisYear = new Date().getFullYear();
 var defaultProps = {
   min: new Date(new Date().setFullYear(thisYear - 10)),
   max: new Date(new Date().setFullYear(thisYear + 10)),
-  precision: 'day'
+  precision: 'day',
+  renderLabel: defaultRenderLabel
 };
-export var DatePicker = withDefaultProps(defaultProps)(function (props) {
+export var DatePicker = function DatePicker(p) {
   var _a;
 
-  var _useNewControllableVa = useNewControllableValue({
+  var props = mergeProps(defaultProps, p);
+
+  var _usePropsValue = usePropsValue({
     value: props.value,
     defaultValue: (_a = props.defaultValue) !== null && _a !== void 0 ? _a : null,
     onChange: props.onConfirm
   }),
-      value = _useNewControllableVa[0],
-      setValue = _useNewControllableVa[1];
-
-  function columns(selected) {
-    var ret = [];
-    var minYear = props.min.getFullYear();
-    var minMonth = props.min.getMonth() + 1;
-    var minDay = props.min.getDate();
-    var minHour = props.min.getHours();
-    var minMinute = props.min.getMinutes();
-    var minSecond = props.min.getSeconds();
-    var maxYear = props.max.getFullYear();
-    var maxMonth = props.max.getMonth() + 1;
-    var maxDay = props.max.getDate();
-    var maxHour = props.max.getHours();
-    var maxMinute = props.max.getMinutes();
-    var maxSecond = props.max.getSeconds();
-    var rank = precisionRankRecord[props.precision];
-
-    if (rank >= precisionRankRecord.year) {
-      var years = [];
-
-      for (var i = minYear; i <= maxYear; i++) {
-        years.push(i.toString());
-      }
-
-      ret.push(years);
-    }
-
-    var firstDayInSelectedMonth = dayjs(convertStringArrayToDate([selected[0], selected[1], '1']));
-    var selectedYear = parseInt(selected[0]);
-    var selectedMonth = parseInt(selected[1]);
-    var selectedDay = parseInt(selected[2]);
-    var selectedHour = parseInt(selected[3]);
-    var selectedMinute = parseInt(selected[4]);
-    var isInMinYear = selectedYear === minYear;
-    var isInMaxYear = selectedYear === maxYear;
-    var isInMinMonth = isInMinYear && selectedMonth === minMonth;
-    var isInMaxMonth = isInMaxYear && selectedMonth === maxMonth;
-    var isInMinDay = isInMinMonth && selectedDay === minDay;
-    var isInMaxDay = isInMaxMonth && selectedDay === maxDay;
-    var isInMinHour = isInMinDay && selectedHour === minHour;
-    var isInMaxHour = isInMaxDay && selectedHour === maxHour;
-    var isInMinMinute = isInMinHour && selectedMinute === minMinute;
-    var isInMaxMinute = isInMaxHour && selectedMinute === maxMinute;
-
-    if (rank >= precisionRankRecord.month) {
-      var lower = isInMinYear ? minMonth : 1;
-      var upper = isInMaxYear ? maxMonth : 12;
-      var months = generateIntArray(lower, upper);
-      ret.push(months.map(function (v) {
-        return v.toString();
-      }));
-    }
-
-    if (rank >= precisionRankRecord.day) {
-      var _lower = isInMinMonth ? minDay : 1;
-
-      var _upper = isInMaxMonth ? maxDay : firstDayInSelectedMonth.daysInMonth();
-
-      var days = generateIntArray(_lower, _upper);
-      ret.push(days.map(function (v) {
-        return v.toString();
-      }));
-    }
-
-    if (rank >= precisionRankRecord.hour) {
-      var _lower2 = isInMinDay ? minHour : 0;
-
-      var _upper2 = isInMaxDay ? maxHour : 23;
-
-      var hours = generateIntArray(_lower2, _upper2);
-      ret.push(hours.map(function (v) {
-        return {
-          label: ('0' + v.toString()).slice(-2),
-          value: v.toString()
-        };
-      }));
-    }
-
-    if (rank >= precisionRankRecord.minute) {
-      var _lower3 = isInMinHour ? minMinute : 0;
-
-      var _upper3 = isInMaxHour ? maxMinute : 59;
-
-      var minutes = generateIntArray(_lower3, _upper3);
-      ret.push(minutes.map(function (v) {
-        return {
-          label: ('0' + v.toString()).slice(-2),
-          value: v.toString()
-        };
-      }));
-    }
-
-    if (rank >= precisionRankRecord.second) {
-      var _lower4 = isInMinMinute ? minSecond : 0;
-
-      var _upper4 = isInMaxMinute ? maxSecond : 59;
-
-      var seconds = generateIntArray(_lower4, _upper4);
-      ret.push(seconds.map(function (v) {
-        return {
-          label: ('0' + v.toString()).slice(-2),
-          value: v.toString()
-        };
-      }));
-    }
-
-    return ret;
-  }
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
 
   var pickerValue = useMemo(function () {
-    return convertDateToStringArray(value);
-  }, [value]);
+    return convertDateToStringArray(value, props.precision);
+  }, [value, props.precision]);
   var onConfirm = useCallback(function (val) {
-    setValue(convertStringArrayToDate(val));
-  }, [setValue]);
-  var onSelect = useCallback(function (val) {
+    setValue(convertStringArrayToDate(val, props.precision));
+  }, [setValue, props.precision]);
+  var onSelect = usePersistFn(function (val) {
     var _a;
 
-    var date = convertStringArrayToDate(val);
+    var date = convertStringArrayToDate(val, props.precision);
 
     if (date) {
       (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, date);
     }
-  }, [props.onSelect]);
+  });
+  var columns = useCallback(function (selected) {
+    return generateDatePickerColumns(selected, props.min, props.max, props.precision, props.renderLabel);
+  }, [props.min, props.max, props.precision, props.renderLabel]);
   return withNativeProps(props, /*#__PURE__*/React.createElement(Picker, {
     columns: columns,
     value: pickerValue,
@@ -166,30 +56,14 @@ export var DatePicker = withDefaultProps(defaultProps)(function (props) {
     getContainer: props.getContainer,
     afterShow: props.afterShow,
     afterClose: props.afterClose,
-    onClick: props.onClick
+    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, convertStringArrayToDate(items.map(function (item) {
       return item === null || item === void 0 ? void 0 : item.value;
-    })));
+    }), props.precision));
   }));
-});
-
-function convertDateToStringArray(date) {
-  if (!date) return [];
-  return [date.getFullYear().toString(), (date.getMonth() + 1).toString(), date.getDate().toString(), date.getHours().toString(), date.getMinutes().toString(), date.getSeconds().toString()];
-}
-
-function convertStringArrayToDate(value) {
-  var _a, _b, _c, _d, _e, _f;
-
-  if (value.length === 0) return null;
-  var yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : '1900';
-  var monthString = (_b = value[1]) !== null && _b !== void 0 ? _b : '1';
-  var dateString = (_c = value[2]) !== null && _c !== void 0 ? _c : '1';
-  var hourString = (_d = value[3]) !== null && _d !== void 0 ? _d : '0';
-  var minuteString = (_e = value[4]) !== null && _e !== void 0 ? _e : '0';
-  var secondString = (_f = value[5]) !== null && _f !== void 0 ? _f : '0';
-  return new Date(parseInt(yearString), parseInt(monthString) - 1, parseInt(dateString), parseInt(hourString), parseInt(minuteString), parseInt(secondString));
-}
+};

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

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import './date-picker.less';
 import { prompt } from './prompt';
+export type { DatePickerProps } from './date-picker';
 declare const _default: import("react").FC<import("./date-picker").DatePickerProps> & {
     prompt: typeof prompt;
 };

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

@@ -14,6 +14,9 @@ export function prompt(props) {
       return /*#__PURE__*/React.createElement(DatePicker, Object.assign({}, props, {
         visible: visible,
         onConfirm: function onConfirm(val) {
+          var _a;
+
+          (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val);
           resolve(val);
         },
         onClose: function onClose() {

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

@@ -0,0 +1,13 @@
+import { FC, ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
+import { Precision } from '../date-picker/date-picker-utils';
+export declare type DatePickerViewProps = {
+    value?: Date;
+    defaultValue?: Date;
+    onChange?: (value: Date) => void;
+    min?: Date;
+    max?: Date;
+    precision?: Precision;
+    renderLabel?: (type: Precision, data: number) => ReactNode;
+} & NativeProps<'--height'>;
+export declare const DatePickerView: FC<DatePickerViewProps>;