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

package/2x/cjs/components/collapse/collapse.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Collapse = exports.CollapsePanel = void 0;
+exports.CollapsePanel = exports.Collapse = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -11,15 +11,17 @@ var _nativeProps = require("../../utils/native-props");
 
 var _list = _interopRequireDefault(require("../list"));
 
-var _icons = require("@ant-design/icons");
+var _antdMobileIcons = require("antd-mobile-icons");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _useInitialized = require("../../utils/use-initialized");
-
 var _web = require("@react-spring/web");
 
-var _useControllableValue = require("../../utils/use-controllable-value");
+var _usePropsValue2 = require("../../utils/use-props-value");
+
+var _ahooks = require("ahooks");
+
+var _useShouldRender = require("../../utils/use-should-render");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -38,38 +40,60 @@ exports.CollapsePanel = CollapsePanel;
 var CollapsePanelContent = function CollapsePanelContent(props) {
   var visible = props.visible;
   var innerRef = (0, _react.useRef)(null);
-  var initialized = (0, _useInitialized.useInitialized)(visible || props.forceRender);
+  var shouldRender = (0, _useShouldRender.useShouldRender)(visible, props.forceRender, props.destroyOnClose);
 
   var _useSpring = (0, _web.useSpring)(function () {
     return {
       from: {
-        height: visible ? 'auto' : 0
+        height: 0
       }
     };
   }),
-      style = _useSpring[0],
+      height = _useSpring[0].height,
       api = _useSpring[1];
 
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useMount)(function () {
+    if (!visible) return;
+    var inner = innerRef.current;
+    if (!inner) return;
+    api.start({
+      height: inner.offsetHeight,
+      immediate: true
+    });
+  });
+  (0, _ahooks.useUpdateLayoutEffect)(function () {
+    var inner = innerRef.current;
+    if (!inner) return;
+
     if (visible) {
-      var inner = innerRef.current;
-      if (!inner) return;
       api.start({
         height: inner.offsetHeight
       });
     } else {
+      api.start({
+        height: inner.offsetHeight,
+        immediate: true
+      });
       api.start({
         height: 0
       });
     }
   }, [visible]);
-  return initialized ? /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
+  return /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
     className: classPrefix + "-panel-content",
-    style: style
+    style: {
+      height: height.to(function (v) {
+        if (height.idle && visible) {
+          return 'auto';
+        } else {
+          return v;
+        }
+      })
+    }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: classPrefix + "-panel-content-inner",
     ref: innerRef
-  }, /*#__PURE__*/_react["default"].createElement(_list["default"].Item, null, props.children))) : null;
+  }, /*#__PURE__*/_react["default"].createElement(_list["default"].Item, null, shouldRender && props.children)));
 };
 
 var Collapse = function Collapse(props) {
@@ -84,7 +108,7 @@ var Collapse = function Collapse(props) {
     panels.push(child);
   });
 
-  var _useNewControllableVa = (0, _useControllableValue.useNewControllableValue)(props.accordion ? {
+  var _usePropsValue = (0, _usePropsValue2.usePropsValue)(props.accordion ? {
     value: props.activeKey === undefined ? undefined : props.activeKey === null ? [] : [props.activeKey],
     defaultValue: props.defaultActiveKey === undefined || props.defaultActiveKey === null ? [] : [props.defaultActiveKey],
     onChange: function onChange(v) {
@@ -97,8 +121,8 @@ var Collapse = function Collapse(props) {
     defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
     onChange: props.onChange
   }),
-      activeKey = _useNewControllableVa[0],
-      setActiveKey = _useNewControllableVa[1];
+      activeKey = _usePropsValue[0],
+      setActiveKey = _usePropsValue[1];
 
   var activeKeyList = activeKey === null ? [] : Array.isArray(activeKey) ? activeKey : [activeKey];
   return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
@@ -109,7 +133,9 @@ var Collapse = function Collapse(props) {
     var key = panel.key;
     var active = activeKeyList.includes(key);
 
-    function handleClick() {
+    function handleClick(event) {
+      var _a, _b;
+
       if (props.accordion) {
         if (active) {
           setActiveKey([]);
@@ -125,6 +151,8 @@ var Collapse = function Collapse(props) {
           setActiveKey([].concat(activeKeyList, [key]));
         }
       }
+
+      (_b = (_a = panel.props).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, event);
     }
 
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
@@ -134,10 +162,11 @@ var Collapse = function Collapse(props) {
       onClick: panel.props.disabled ? undefined : handleClick,
       arrow: /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])(classPrefix + "-arrow", (_classNames2 = {}, _classNames2[classPrefix + "-arrow-active"] = active, _classNames2))
-      }, /*#__PURE__*/_react["default"].createElement(_icons.RightOutlined, null))
+      }, /*#__PURE__*/_react["default"].createElement(_antdMobileIcons.RightOutline, null))
     }, panel.props.title)), /*#__PURE__*/_react["default"].createElement(CollapsePanelContent, {
       visible: active,
-      forceRender: !!panel.props.forceRender
+      forceRender: !!panel.props.forceRender,
+      destroyOnClose: !!panel.props.destroyOnClose
     }, panel.props.children));
   }))));
 };

package/2x/cjs/components/config-provider/config-provider.d.ts

@@ -3,24 +3,12 @@ import { Locale } from '../../locales/base';
 declare type Config = {
     locale: Locale;
 };
-export declare const globalConfigRef: {
-    key: symbol | null;
-    current: {
-        locale: {
-            common: {
-                cancel: string;
-            };
-            Dialog: {
-                ok: string;
-            };
-        };
-    };
-};
-export declare type ConfigProviderProps = Config & {
-    global?: boolean;
+export declare const defaultConfigRef: {
+    current: Config;
 };
+export declare function setDefaultConfig(config: Config): void;
+export declare function getDefaultConfig(): Config;
+export declare type ConfigProviderProps = Config;
 export declare const ConfigProvider: FC<ConfigProviderProps>;
-export declare function useConfig(): Config & {
-    isFallback: boolean;
-};
+export declare function useConfig(): Config;
 export {};

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

@@ -3,15 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.defaultConfigRef = exports.ConfigProvider = void 0;
+exports.getDefaultConfig = getDefaultConfig;
+exports.setDefaultConfig = setDefaultConfig;
 exports.useConfig = useConfig;
-exports.ConfigProvider = exports.globalConfigRef = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _devLog = require("../../utils/dev-log");
-
-var _ahooks = require("ahooks");
-
 var _zhCN = _interopRequireDefault(require("../../locales/zh-CN"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -33,64 +31,37 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var defaultConfig = {
-  locale: _zhCN["default"]
+var defaultConfigRef = {
+  current: {
+    locale: _zhCN["default"]
+  }
 };
+exports.defaultConfigRef = defaultConfigRef;
 
-var ConfigContext = /*#__PURE__*/_react["default"].createContext(Object.assign(Object.assign({}, defaultConfig), {
-  isFallback: true
-}));
+function setDefaultConfig(config) {
+  defaultConfigRef.current = config;
+}
 
-var globalConfigRef = {
-  key: null,
-  current: defaultConfig
-};
-exports.globalConfigRef = globalConfigRef;
+function getDefaultConfig() {
+  return defaultConfigRef.current;
+}
+
+var ConfigContext = /*#__PURE__*/_react["default"].createContext(null);
 
 var ConfigProvider = function ConfigProvider(props) {
   var children = props.children,
-      global = props.global,
-      config = __rest(props, ["children", "global"]);
-
-  var key = (0, _ahooks.useCreation)(function () {
-    return Symbol();
-  }, []);
+      config = __rest(props, ["children"]);
 
-  function cleanUp() {
-    if (globalConfigRef.key !== key) {
-      return;
-    }
-
-    (0, _devLog.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 {
-      (0, _devLog.devWarning)('ConfigProvider', 'It seems you are rendering more than one ConfigProvider with `global: true`. Only the first rendered component will take effect.');
-    }
-  } else {
-    cleanUp();
-  }
-
-  (0, _ahooks.useUnmount)(function () {
-    cleanUp();
-  });
+  var parentConfig = useConfig();
   return /*#__PURE__*/_react["default"].createElement(ConfigContext.Provider, {
-    value: Object.assign(Object.assign({}, config), {
-      isFallback: true
-    })
+    value: Object.assign(Object.assign({}, parentConfig), config)
   }, children);
 };
 
 exports.ConfigProvider = ConfigProvider;
 
 function useConfig() {
-  return (0, _react.useContext)(ConfigContext);
+  var _a;
+
+  return (_a = (0, _react.useContext)(ConfigContext)) !== null && _a !== void 0 ? _a : getDefaultConfig();
 }

package/2x/cjs/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/cjs/components/config-provider/index.js

@@ -3,19 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "useConfig", {
+exports["default"] = void 0;
+Object.defineProperty(exports, "getDefaultConfig", {
   enumerable: true,
   get: function get() {
-    return _configProvider.useConfig;
+    return _configProvider.getDefaultConfig;
   }
 });
-Object.defineProperty(exports, "globalConfigRef", {
+Object.defineProperty(exports, "setDefaultConfig", {
   enumerable: true,
   get: function get() {
-    return _configProvider.globalConfigRef;
+    return _configProvider.setDefaultConfig;
+  }
+});
+Object.defineProperty(exports, "useConfig", {
+  enumerable: true,
+  get: function get() {
+    return _configProvider.useConfig;
   }
 });
-exports["default"] = void 0;
 
 var _configProvider = require("./config-provider");
 

package/2x/cjs/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/cjs/components/date-picker/date-picker-date-utils.js

@@ -0,0 +1,185 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertDateToStringArray = convertDateToStringArray;
+exports.convertStringArrayToDate = convertStringArrayToDate;
+exports.defaultRenderLabel = defaultRenderLabel;
+exports.generateDatePickerColumns = generateDatePickerColumns;
+
+var _dayjs = _interopRequireDefault(require("dayjs"));
+
+var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
+
+var _isoWeeksInYear = _interopRequireDefault(require("dayjs/plugin/isoWeeksInYear"));
+
+var _isLeapYear = _interopRequireDefault(require("dayjs/plugin/isLeapYear"));
+
+var _generateIntArray = require("../../utils/generate-int-array");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+_dayjs["default"].extend(_isoWeek["default"]);
+
+_dayjs["default"].extend(_isoWeeksInYear["default"]);
+
+_dayjs["default"].extend(_isLeapYear["default"]);
+
+var precisionRankRecord = {
+  year: 0,
+  month: 1,
+  day: 2,
+  hour: 3,
+  minute: 4,
+  second: 5
+};
+
+function defaultRenderLabel(type, data) {
+  switch (type) {
+    case 'minute':
+    case 'second':
+    case 'hour':
+      return ('0' + data.toString()).slice(-2);
+
+    default:
+      return data.toString();
+  }
+}
+
+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 = (0, _dayjs["default"])(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 = (0, _generateIntArray.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 = (0, _generateIntArray.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 = (0, _generateIntArray.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 = (0, _generateIntArray.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 = (0, _generateIntArray.generateIntArray)(_lower4, _upper4);
+    ret.push(seconds.map(function (v) {
+      return {
+        label: renderLabel('second', v),
+        value: v.toString()
+      };
+    }));
+  }
+
+  return ret;
+}
+
+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/cjs/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/cjs/components/date-picker/date-picker-utils.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateDatePickerColumns = exports.defaultRenderLabel = exports.convertStringArrayToDate = exports.convertDateToStringArray = void 0;
+
+var dateUtils = _interopRequireWildcard(require("./date-picker-date-utils"));
+
+var weekUtils = _interopRequireWildcard(require("./date-picker-week-utils"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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; }
+
+var convertDateToStringArray = function convertDateToStringArray(date, precision) {
+  if (precision.includes('week')) {
+    return weekUtils.convertDateToStringArray(date);
+  } else {
+    return dateUtils.convertDateToStringArray(date);
+  }
+};
+
+exports.convertDateToStringArray = convertDateToStringArray;
+
+var convertStringArrayToDate = function convertStringArrayToDate(value, precision) {
+  if (precision.includes('week')) {
+    return weekUtils.convertStringArrayToDate(value);
+  } else {
+    return dateUtils.convertStringArrayToDate(value);
+  }
+};
+
+exports.convertStringArrayToDate = convertStringArrayToDate;
+
+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);
+  }
+};
+
+exports.generateDatePickerColumns = generateDatePickerColumns;
+
+var defaultRenderLabel = function defaultRenderLabel(precision, data) {
+  if (precision.includes('week')) {
+    return weekUtils.defaultRenderLabel(precision, data);
+  } else {
+    return dateUtils.defaultRenderLabel(precision, data);
+  }
+};
+
+exports.defaultRenderLabel = defaultRenderLabel;

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