antd-mobile 5.36.1 → 5.37.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (224) hide show
  1. package/2x/bundle/antd-mobile.cjs.development.js +1260 -1138
  2. package/2x/bundle/antd-mobile.cjs.js +7 -7
  3. package/2x/bundle/antd-mobile.es.development.js +1260 -1138
  4. package/2x/bundle/antd-mobile.es.js +6853 -6777
  5. package/2x/bundle/antd-mobile.umd.development.js +1260 -1138
  6. package/2x/bundle/antd-mobile.umd.js +7 -7
  7. package/2x/bundle/style.css +50 -53
  8. package/2x/cjs/components/calendar-picker/calendar-picker.js +12 -6
  9. package/2x/cjs/components/calendar-picker-view/calendar-picker-view.d.ts +3 -0
  10. package/2x/cjs/components/calendar-picker-view/calendar-picker-view.js +41 -19
  11. package/2x/cjs/components/calendar-picker-view/useSyncScroll.d.ts +2 -0
  12. package/2x/cjs/components/calendar-picker-view/useSyncScroll.js +39 -0
  13. package/2x/cjs/components/card/card.css +5 -5
  14. package/2x/cjs/components/card/card.patch.css +21 -0
  15. package/2x/cjs/components/center-popup/center-popup.js +46 -43
  16. package/2x/cjs/components/check-list/check-list.js +15 -11
  17. package/2x/cjs/components/collapse/collapse.d.ts +9 -1
  18. package/2x/cjs/components/collapse/collapse.js +26 -28
  19. package/2x/cjs/components/config-provider/config-provider.d.ts +40 -2
  20. package/2x/cjs/components/dropdown/context.d.ts +2 -0
  21. package/2x/cjs/components/dropdown/context.js +10 -0
  22. package/2x/cjs/components/dropdown/dropdown.d.ts +11 -3
  23. package/2x/cjs/components/dropdown/dropdown.js +23 -16
  24. package/2x/cjs/components/dropdown/index.d.ts +1 -0
  25. package/2x/cjs/components/dropdown/item.d.ts +5 -1
  26. package/2x/cjs/components/dropdown/item.js +22 -8
  27. package/2x/cjs/components/form/form-item.d.ts +6 -5
  28. package/2x/cjs/components/form/form-item.js +25 -17
  29. package/2x/cjs/components/form/form.d.ts +1 -1
  30. package/2x/cjs/components/form/index.d.ts +1 -1
  31. package/2x/cjs/components/input/input.d.ts +3 -1
  32. package/2x/cjs/components/input/input.js +53 -51
  33. package/2x/cjs/components/list/list-item.d.ts +6 -2
  34. package/2x/cjs/components/list/list-item.js +16 -6
  35. package/2x/cjs/components/nav-bar/nav-bar.d.ts +4 -0
  36. package/2x/cjs/components/nav-bar/nav-bar.js +20 -15
  37. package/2x/cjs/components/notice-bar/notice-bar.css +0 -3
  38. package/2x/cjs/components/notice-bar/notice-bar.d.ts +3 -1
  39. package/2x/cjs/components/notice-bar/notice-bar.js +30 -25
  40. package/2x/cjs/components/number-keyboard/number-keyboard.d.ts +1 -1
  41. package/2x/cjs/components/number-keyboard/number-keyboard.js +14 -13
  42. package/2x/cjs/components/popup/popup-base-props.d.ts +3 -2
  43. package/2x/cjs/components/popup/popup-base-props.js +4 -0
  44. package/2x/cjs/components/popup/popup.js +5 -5
  45. package/2x/cjs/components/result/result.js +3 -10
  46. package/2x/cjs/components/result/use-result-icon.d.ts +3 -0
  47. package/2x/cjs/components/result/use-result-icon.js +37 -0
  48. package/2x/cjs/components/result-page/result-page.js +3 -10
  49. package/2x/cjs/components/search-bar/search-bar.d.ts +10 -2
  50. package/2x/cjs/components/search-bar/search-bar.js +34 -33
  51. package/2x/cjs/components/toast/toast.d.ts +2 -2
  52. package/2x/cjs/components/toast/toast.js +4 -4
  53. package/2x/cjs/components/virtual-input/virtual-input.d.ts +5 -5
  54. package/2x/cjs/components/virtual-input/virtual-input.js +26 -24
  55. package/2x/cjs/utils/is-node-with-content.d.ts +3 -0
  56. package/2x/cjs/utils/is-node-with-content.js +3 -0
  57. package/2x/cjs/utils/with-default-props.d.ts +7 -0
  58. package/2x/cjs/utils/with-default-props.js +21 -5
  59. package/2x/es/components/calendar-picker/calendar-picker.js +11 -5
  60. package/2x/es/components/calendar-picker-view/calendar-picker-view.d.ts +3 -0
  61. package/2x/es/components/calendar-picker-view/calendar-picker-view.js +40 -19
  62. package/2x/es/components/calendar-picker-view/useSyncScroll.d.ts +2 -0
  63. package/2x/es/components/calendar-picker-view/useSyncScroll.js +33 -0
  64. package/2x/es/components/card/card.css +5 -5
  65. package/2x/es/components/card/card.patch.css +21 -0
  66. package/2x/es/components/center-popup/center-popup.js +45 -42
  67. package/2x/es/components/check-list/check-list.js +15 -11
  68. package/2x/es/components/collapse/collapse.d.ts +9 -1
  69. package/2x/es/components/collapse/collapse.js +26 -28
  70. package/2x/es/components/config-provider/config-provider.d.ts +40 -2
  71. package/2x/es/components/dropdown/context.d.ts +2 -0
  72. package/2x/es/components/dropdown/context.js +2 -0
  73. package/2x/es/components/dropdown/dropdown.d.ts +11 -3
  74. package/2x/es/components/dropdown/dropdown.js +24 -17
  75. package/2x/es/components/dropdown/index.d.ts +1 -0
  76. package/2x/es/components/dropdown/item.d.ts +5 -1
  77. package/2x/es/components/dropdown/item.js +22 -8
  78. package/2x/es/components/form/form-item.d.ts +6 -5
  79. package/2x/es/components/form/form-item.js +24 -16
  80. package/2x/es/components/form/form.d.ts +1 -1
  81. package/2x/es/components/form/index.d.ts +1 -1
  82. package/2x/es/components/input/input.d.ts +3 -1
  83. package/2x/es/components/input/input.js +52 -50
  84. package/2x/es/components/list/list-item.d.ts +6 -2
  85. package/2x/es/components/list/list-item.js +16 -6
  86. package/2x/es/components/nav-bar/nav-bar.d.ts +4 -0
  87. package/2x/es/components/nav-bar/nav-bar.js +21 -16
  88. package/2x/es/components/notice-bar/notice-bar.css +0 -3
  89. package/2x/es/components/notice-bar/notice-bar.d.ts +3 -1
  90. package/2x/es/components/notice-bar/notice-bar.js +29 -24
  91. package/2x/es/components/number-keyboard/number-keyboard.d.ts +1 -1
  92. package/2x/es/components/number-keyboard/number-keyboard.js +13 -12
  93. package/2x/es/components/popup/popup-base-props.d.ts +3 -2
  94. package/2x/es/components/popup/popup-base-props.js +3 -0
  95. package/2x/es/components/popup/popup.js +5 -5
  96. package/2x/es/components/result/result.js +3 -10
  97. package/2x/es/components/result/use-result-icon.d.ts +3 -0
  98. package/2x/es/components/result/use-result-icon.js +29 -0
  99. package/2x/es/components/result-page/result-page.js +3 -10
  100. package/2x/es/components/search-bar/search-bar.d.ts +10 -2
  101. package/2x/es/components/search-bar/search-bar.js +33 -32
  102. package/2x/es/components/toast/toast.d.ts +2 -2
  103. package/2x/es/components/toast/toast.js +3 -3
  104. package/2x/es/components/virtual-input/virtual-input.d.ts +5 -5
  105. package/2x/es/components/virtual-input/virtual-input.js +25 -23
  106. package/2x/es/utils/is-node-with-content.d.ts +3 -0
  107. package/2x/es/utils/is-node-with-content.js +3 -0
  108. package/2x/es/utils/with-default-props.d.ts +7 -0
  109. package/2x/es/utils/with-default-props.js +20 -5
  110. package/2x/package.json +1 -1
  111. package/bundle/antd-mobile.cjs.development.js +1260 -1138
  112. package/bundle/antd-mobile.cjs.js +7 -7
  113. package/bundle/antd-mobile.compatible.umd.js +1 -1
  114. package/bundle/antd-mobile.es.development.js +1260 -1138
  115. package/bundle/antd-mobile.es.js +6853 -6777
  116. package/bundle/antd-mobile.umd.development.js +1260 -1138
  117. package/bundle/antd-mobile.umd.js +7 -7
  118. package/bundle/style.css +1 -1
  119. package/cjs/components/calendar-picker/calendar-picker.js +12 -6
  120. package/cjs/components/calendar-picker-view/calendar-picker-view.d.ts +3 -0
  121. package/cjs/components/calendar-picker-view/calendar-picker-view.js +41 -19
  122. package/cjs/components/calendar-picker-view/useSyncScroll.d.ts +2 -0
  123. package/cjs/components/calendar-picker-view/useSyncScroll.js +39 -0
  124. package/cjs/components/card/card.css +5 -5
  125. package/cjs/components/card/card.patch.css +17 -0
  126. package/cjs/components/center-popup/center-popup.js +46 -43
  127. package/cjs/components/check-list/check-list.js +15 -11
  128. package/cjs/components/collapse/collapse.d.ts +9 -1
  129. package/cjs/components/collapse/collapse.js +26 -28
  130. package/cjs/components/config-provider/config-provider.d.ts +40 -2
  131. package/cjs/components/dropdown/context.d.ts +2 -0
  132. package/cjs/components/dropdown/context.js +10 -0
  133. package/cjs/components/dropdown/dropdown.d.ts +11 -3
  134. package/cjs/components/dropdown/dropdown.js +23 -16
  135. package/cjs/components/dropdown/index.d.ts +1 -0
  136. package/cjs/components/dropdown/item.d.ts +5 -1
  137. package/cjs/components/dropdown/item.js +22 -8
  138. package/cjs/components/form/form-item.d.ts +6 -5
  139. package/cjs/components/form/form-item.js +25 -17
  140. package/cjs/components/form/form.d.ts +1 -1
  141. package/cjs/components/form/index.d.ts +1 -1
  142. package/cjs/components/input/input.d.ts +3 -1
  143. package/cjs/components/input/input.js +53 -51
  144. package/cjs/components/list/list-item.d.ts +6 -2
  145. package/cjs/components/list/list-item.js +16 -6
  146. package/cjs/components/nav-bar/nav-bar.d.ts +4 -0
  147. package/cjs/components/nav-bar/nav-bar.js +20 -15
  148. package/cjs/components/notice-bar/notice-bar.css +0 -2
  149. package/cjs/components/notice-bar/notice-bar.d.ts +3 -1
  150. package/cjs/components/notice-bar/notice-bar.js +30 -25
  151. package/cjs/components/number-keyboard/number-keyboard.d.ts +1 -1
  152. package/cjs/components/number-keyboard/number-keyboard.js +14 -13
  153. package/cjs/components/popup/popup-base-props.d.ts +3 -2
  154. package/cjs/components/popup/popup-base-props.js +4 -0
  155. package/cjs/components/popup/popup.js +5 -5
  156. package/cjs/components/result/result.js +3 -10
  157. package/cjs/components/result/use-result-icon.d.ts +3 -0
  158. package/cjs/components/result/use-result-icon.js +37 -0
  159. package/cjs/components/result-page/result-page.js +3 -10
  160. package/cjs/components/search-bar/search-bar.d.ts +10 -2
  161. package/cjs/components/search-bar/search-bar.js +34 -33
  162. package/cjs/components/toast/toast.css +1 -1
  163. package/cjs/components/toast/toast.d.ts +2 -2
  164. package/cjs/components/toast/toast.js +4 -4
  165. package/cjs/components/virtual-input/virtual-input.d.ts +5 -5
  166. package/cjs/components/virtual-input/virtual-input.js +26 -24
  167. package/cjs/utils/is-node-with-content.d.ts +3 -0
  168. package/cjs/utils/is-node-with-content.js +3 -0
  169. package/cjs/utils/with-default-props.d.ts +7 -0
  170. package/cjs/utils/with-default-props.js +21 -5
  171. package/es/components/calendar-picker/calendar-picker.js +11 -5
  172. package/es/components/calendar-picker-view/calendar-picker-view.d.ts +3 -0
  173. package/es/components/calendar-picker-view/calendar-picker-view.js +40 -19
  174. package/es/components/calendar-picker-view/useSyncScroll.d.ts +2 -0
  175. package/es/components/calendar-picker-view/useSyncScroll.js +33 -0
  176. package/es/components/card/card.css +5 -5
  177. package/es/components/card/card.patch.css +17 -0
  178. package/es/components/center-popup/center-popup.js +45 -42
  179. package/es/components/check-list/check-list.js +15 -11
  180. package/es/components/collapse/collapse.d.ts +9 -1
  181. package/es/components/collapse/collapse.js +26 -28
  182. package/es/components/config-provider/config-provider.d.ts +40 -2
  183. package/es/components/dropdown/context.d.ts +2 -0
  184. package/es/components/dropdown/context.js +2 -0
  185. package/es/components/dropdown/dropdown.d.ts +11 -3
  186. package/es/components/dropdown/dropdown.js +24 -17
  187. package/es/components/dropdown/index.d.ts +1 -0
  188. package/es/components/dropdown/item.d.ts +5 -1
  189. package/es/components/dropdown/item.js +22 -8
  190. package/es/components/form/form-item.d.ts +6 -5
  191. package/es/components/form/form-item.js +24 -16
  192. package/es/components/form/form.d.ts +1 -1
  193. package/es/components/form/index.d.ts +1 -1
  194. package/es/components/input/input.d.ts +3 -1
  195. package/es/components/input/input.js +52 -50
  196. package/es/components/list/list-item.d.ts +6 -2
  197. package/es/components/list/list-item.js +16 -6
  198. package/es/components/nav-bar/nav-bar.d.ts +4 -0
  199. package/es/components/nav-bar/nav-bar.js +21 -16
  200. package/es/components/notice-bar/notice-bar.css +0 -2
  201. package/es/components/notice-bar/notice-bar.d.ts +3 -1
  202. package/es/components/notice-bar/notice-bar.js +29 -24
  203. package/es/components/number-keyboard/number-keyboard.d.ts +1 -1
  204. package/es/components/number-keyboard/number-keyboard.js +13 -12
  205. package/es/components/popup/popup-base-props.d.ts +3 -2
  206. package/es/components/popup/popup-base-props.js +3 -0
  207. package/es/components/popup/popup.js +5 -5
  208. package/es/components/result/result.js +3 -10
  209. package/es/components/result/use-result-icon.d.ts +3 -0
  210. package/es/components/result/use-result-icon.js +29 -0
  211. package/es/components/result-page/result-page.js +3 -10
  212. package/es/components/search-bar/search-bar.d.ts +10 -2
  213. package/es/components/search-bar/search-bar.js +33 -32
  214. package/es/components/toast/toast.css +1 -1
  215. package/es/components/toast/toast.d.ts +2 -2
  216. package/es/components/toast/toast.js +3 -3
  217. package/es/components/virtual-input/virtual-input.d.ts +5 -5
  218. package/es/components/virtual-input/virtual-input.js +25 -23
  219. package/es/utils/is-node-with-content.d.ts +3 -0
  220. package/es/utils/is-node-with-content.js +3 -0
  221. package/es/utils/with-default-props.d.ts +7 -0
  222. package/es/utils/with-default-props.js +20 -5
  223. package/package.json +1 -1
  224. package/umd/antd-mobile.js +1 -1
@@ -5,18 +5,19 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.CalendarPicker = void 0;
7
7
  var _tslib = require("tslib");
8
+ var _classnames = _interopRequireDefault(require("classnames"));
8
9
  var _react = _interopRequireWildcard(require("react"));
9
10
  var _nativeProps = require("../../utils/native-props");
10
- var _classnames = _interopRequireDefault(require("classnames"));
11
+ var _withDefaultProps = require("../../utils/with-default-props");
11
12
  var _button = _interopRequireDefault(require("../button"));
13
+ var _calendarPickerView = _interopRequireDefault(require("../calendar-picker-view"));
14
+ var _calendarPickerView2 = require("../calendar-picker-view/calendar-picker-view");
15
+ var _configProvider = require("../config-provider");
12
16
  var _divider = _interopRequireDefault(require("../divider"));
13
17
  var _popup = _interopRequireDefault(require("../popup"));
14
- var _withDefaultProps = require("../../utils/with-default-props");
15
- var _configProvider = require("../config-provider");
16
- var _calendarPickerView = _interopRequireDefault(require("../calendar-picker-view"));
17
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
18
18
  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); }
19
19
  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; }
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
21
  const classPrefix = 'adm-calendar-picker';
21
22
  const defaultProps = {
22
23
  weekStartsOn: 'Sunday',
@@ -45,6 +46,9 @@ const CalendarPicker = (0, _react.forwardRef)((p, ref) => {
45
46
  getContainer
46
47
  } = props,
47
48
  calendarViewProps = (0, _tslib.__rest)(props, ["visible", "confirmText", "popupClassName", "popupStyle", "popupBodyStyle", "forceRender", "closeOnMaskClick", "onClose", "onConfirm", "onMaskClick", "getContainer"]);
49
+ const viewContext = _react.default.useMemo(() => ({
50
+ visible: !!visible
51
+ }), [visible]);
48
52
  const footer = _react.default.createElement("div", {
49
53
  className: `${classPrefix}-footer`
50
54
  }, _react.default.createElement(_divider.default, null), _react.default.createElement("div", {
@@ -84,8 +88,10 @@ const CalendarPicker = (0, _react.forwardRef)((p, ref) => {
84
88
  }
85
89
  },
86
90
  getContainer: getContainer
91
+ }, _react.default.createElement(_calendarPickerView2.Context.Provider, {
92
+ value: viewContext
87
93
  }, _react.default.createElement(_calendarPickerView.default, Object.assign({
88
94
  ref: calendarRef
89
- }, calendarViewProps)), footer)));
95
+ }, calendarViewProps))), footer)));
90
96
  });
91
97
  exports.CalendarPicker = CalendarPicker;
@@ -1,6 +1,9 @@
1
1
  import React from 'react';
2
2
  import { NativeProps } from '../../utils/native-props';
3
3
  import { DateRange, Page } from './convert';
4
+ export declare const Context: React.Context<{
5
+ visible: boolean;
6
+ }>;
4
7
  export declare type CalendarPickerViewRef = {
5
8
  jumpTo: (page: Page | ((page: Page) => Page)) => void;
6
9
  jumpToToday: () => void;
@@ -3,23 +3,28 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.CalendarPickerView = void 0;
6
+ exports.Context = exports.CalendarPickerView = void 0;
7
+ var _classnames = _interopRequireDefault(require("classnames"));
8
+ var _dayjs = _interopRequireDefault(require("dayjs"));
9
+ var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
10
+ var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
7
11
  var _react = _interopRequireWildcard(require("react"));
8
12
  var _nativeProps = require("../../utils/native-props");
9
- var _dayjs = _interopRequireDefault(require("dayjs"));
10
- var _classnames = _interopRequireDefault(require("classnames"));
13
+ var _usePropsValue = require("../../utils/use-props-value");
11
14
  var _withDefaultProps = require("../../utils/with-default-props");
12
15
  var _configProvider = require("../config-provider");
13
- var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
14
- var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
15
- var _usePropsValue = require("../../utils/use-props-value");
16
16
  var _convert = require("./convert");
17
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
+ var _useSyncScroll = _interopRequireDefault(require("./useSyncScroll"));
18
18
  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); }
19
19
  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; }
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
21
  _dayjs.default.extend(_isoWeek.default);
21
22
  _dayjs.default.extend(_isSameOrBefore.default);
22
23
  const classPrefix = 'adm-calendar-picker-view';
24
+ const Context = _react.default.createContext({
25
+ visible: false
26
+ });
27
+ exports.Context = Context;
23
28
  const defaultProps = {
24
29
  weekStartsOn: 'Sunday',
25
30
  defaultValue: null,
@@ -29,6 +34,7 @@ const defaultProps = {
29
34
  };
30
35
  const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
31
36
  var _a;
37
+ const bodyRef = (0, _react.useRef)(null);
32
38
  const today = (0, _dayjs.default)();
33
39
  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
34
40
  const {
@@ -53,6 +59,13 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
53
59
  });
54
60
  const [intermediate, setIntermediate] = (0, _react.useState)(false);
55
61
  const [current, setCurrent] = (0, _react.useState)(() => (0, _dayjs.default)(dateRange ? dateRange[0] : today).date(1));
62
+ // =============================== Scroll ===============================
63
+ const context = (0, _react.useContext)(Context);
64
+ const scrollTo = (0, _useSyncScroll.default)(current, context.visible, bodyRef);
65
+ // ============================== Boundary ==============================
66
+ const maxDay = (0, _react.useMemo)(() => props.max ? (0, _dayjs.default)(props.max) : current.add(6, 'month'), [props.max, current]);
67
+ const minDay = (0, _react.useMemo)(() => props.min ? (0, _dayjs.default)(props.min) : current, [props.min, current]);
68
+ // ================================ Refs ================================
56
69
  (0, _react.useImperativeHandle)(ref, () => ({
57
70
  jumpTo: pageOrPageGenerator => {
58
71
  let page;
@@ -64,20 +77,23 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
64
77
  } else {
65
78
  page = pageOrPageGenerator;
66
79
  }
67
- setCurrent((0, _convert.convertPageToDayjs)(page));
80
+ const next = (0, _convert.convertPageToDayjs)(page);
81
+ setCurrent(next);
82
+ scrollTo(next);
68
83
  },
69
84
  jumpToToday: () => {
70
- setCurrent((0, _dayjs.default)().date(1));
85
+ const next = (0, _dayjs.default)().date(1);
86
+ setCurrent(next);
87
+ scrollTo(next);
71
88
  },
72
89
  getDateRange: () => dateRange
73
90
  }));
91
+ // =============================== Render ===============================
74
92
  const header = _react.default.createElement("div", {
75
93
  className: `${classPrefix}-header`
76
94
  }, _react.default.createElement("div", {
77
95
  className: `${classPrefix}-title`
78
96
  }, (_a = props.title) !== null && _a !== void 0 ? _a : locale.Calendar.title));
79
- const maxDay = (0, _react.useMemo)(() => props.max ? (0, _dayjs.default)(props.max) : current.add(6, 'month'), [props.max, current]);
80
- const minDay = (0, _react.useMemo)(() => props.min ? (0, _dayjs.default)(props.min) : current, [props.min, current]);
81
97
  function renderBody() {
82
98
  var _a;
83
99
  const cells = [];
@@ -85,13 +101,21 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
85
101
  // 遍历月份
86
102
  while (monthIterator.isSameOrBefore(maxDay, 'month')) {
87
103
  const year = monthIterator.year();
88
- const month = monthIterator.month();
104
+ const month = monthIterator.month() + 1;
89
105
  const renderMap = {
90
106
  year,
91
- month: month + 1
107
+ month
92
108
  };
109
+ const yearMonth = `${year}-${month}`;
110
+ // 获取需要预先填充的空格,如果是 7 天则不需要填充
111
+ const presetEmptyCellCount = props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday();
112
+ const presetEmptyCells = presetEmptyCellCount == 7 ? null : Array(presetEmptyCellCount).fill(null).map((_, index) => _react.default.createElement("div", {
113
+ key: index,
114
+ className: `${classPrefix}-cell`
115
+ }));
93
116
  cells.push(_react.default.createElement("div", {
94
- key: `${year}-${month}`
117
+ key: yearMonth,
118
+ "data-year-month": yearMonth
95
119
  }, _react.default.createElement("div", {
96
120
  className: `${classPrefix}-title`
97
121
  }, (_a = locale.Calendar.yearAndMonth) === null || _a === void 0 ? void 0 : _a.replace(/\${(.*?)}/g, (_, variable) => {
@@ -99,10 +123,7 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
99
123
  return (_a = renderMap[variable]) === null || _a === void 0 ? void 0 : _a.toString();
100
124
  })), _react.default.createElement("div", {
101
125
  className: `${classPrefix}-cells`
102
- }, Array(props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday()).fill(null).map((_, index) => _react.default.createElement("div", {
103
- key: index,
104
- className: `${classPrefix}-cell`
105
- })), Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
126
+ }, presetEmptyCells, Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
106
127
  var _a;
107
128
  const d = monthIterator.date(index + 1);
108
129
  let isSelect = false;
@@ -200,7 +221,8 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
200
221
  return cells;
201
222
  }
202
223
  const body = _react.default.createElement("div", {
203
- className: `${classPrefix}-body`
224
+ className: `${classPrefix}-body`,
225
+ ref: bodyRef
204
226
  }, renderBody());
205
227
  const mark = _react.default.createElement("div", {
206
228
  className: `${classPrefix}-mark`
@@ -0,0 +1,2 @@
1
+ import type { Dayjs } from 'dayjs';
2
+ export default function useSyncScroll(current: Dayjs, visible: boolean, bodyRef: React.RefObject<HTMLDivElement>): (date: Dayjs) => void;
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = useSyncScroll;
7
+ var _rcUtil = require("rc-util");
8
+ var _react = require("react");
9
+ function useSyncScroll(current, visible, bodyRef) {
10
+ const rafRef = (0, _react.useRef)();
11
+ const clean = () => {
12
+ if (rafRef.current) {
13
+ cancelAnimationFrame(rafRef.current);
14
+ }
15
+ };
16
+ const scrollTo = (0, _rcUtil.useEvent)(date => {
17
+ clean();
18
+ rafRef.current = requestAnimationFrame(() => {
19
+ if (bodyRef.current) {
20
+ const yearMonth = date.format('YYYY-M');
21
+ const target = bodyRef.current.querySelector(`[data-year-month="${yearMonth}"]`);
22
+ if (target) {
23
+ // Scroll to the top of view
24
+ target.scrollIntoView({
25
+ block: 'start',
26
+ inline: 'nearest'
27
+ });
28
+ }
29
+ }
30
+ });
31
+ });
32
+ (0, _react.useEffect)(() => {
33
+ if (visible && current) {
34
+ scrollTo(current);
35
+ return clean;
36
+ }
37
+ }, [current, visible]);
38
+ return scrollTo;
39
+ }
@@ -1,7 +1,7 @@
1
1
  .adm-card {
2
2
  background: var(--adm-color-background);
3
- border-radius: 8px;
4
- padding: 0 12px;
3
+ border-radius: var(--adm-card-border-radius, 8px);
4
+ padding: 0 var(--adm-card-padding-inline, 12px);
5
5
  }
6
6
  .adm-card-header {
7
7
  position: relative;
@@ -9,10 +9,10 @@
9
9
  justify-content: space-between;
10
10
  align-items: center;
11
11
  box-sizing: border-box;
12
- padding: 12px 0;
12
+ padding: var(--adm-card-header-padding-block, 12px) 0;
13
13
  }
14
14
  .adm-card-header:not(:last-child) {
15
- border-bottom: solid 0.5px var(--adm-color-border);
15
+ border-bottom: solid var(--adm-card-header-border-width, 0.5px) var(--adm-card-header-border-color, var(--adm-color-border));
16
16
  }
17
17
  .adm-card-header-title {
18
18
  font-size: var(--adm-font-size-7);
@@ -20,5 +20,5 @@
20
20
  font-weight: bold;
21
21
  }
22
22
  .adm-card-body {
23
- padding: 12px 0;
23
+ padding: var(--adm-card-body-padding-block, 12px) 0;
24
24
  }
@@ -0,0 +1,17 @@
1
+ .adm-card {
2
+ background: #fff;
3
+ border-radius: 8px;
4
+ padding: 0 12px;
5
+ }
6
+ .adm-card-header {
7
+ padding: 12px 0;
8
+ }
9
+ .adm-card-header:not(:last-child) {
10
+ border-bottom: solid 0.5px #eee;
11
+ }
12
+ .adm-card-header-title {
13
+ font-size: 15px;
14
+ }
15
+ .adm-card-body {
16
+ padding: 12px 0;
17
+ }
@@ -4,33 +4,36 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.CenterPopup = void 0;
7
- var _react = _interopRequireWildcard(require("react"));
8
- var _renderToContainer = require("../../utils/render-to-container");
9
- var _mask = _interopRequireDefault(require("../mask"));
10
- var _withStopPropagation = require("../../utils/with-stop-propagation");
11
- var _withDefaultProps = require("../../utils/with-default-props");
12
- var _ahooks = require("ahooks");
13
7
  var _web = require("@react-spring/web");
14
- var _useInnerVisible = require("../../utils/use-inner-visible");
8
+ var _ahooks = require("ahooks");
15
9
  var _classnames = _interopRequireDefault(require("classnames"));
10
+ var _react = _interopRequireWildcard(require("react"));
16
11
  var _nativeProps = require("../../utils/native-props");
12
+ var _renderToContainer = require("../../utils/render-to-container");
17
13
  var _shouldRender = require("../../utils/should-render");
14
+ var _useInnerVisible = require("../../utils/use-inner-visible");
18
15
  var _useLockScroll = require("../../utils/use-lock-scroll");
19
- var _antdMobileIcons = require("antd-mobile-icons");
16
+ var _withDefaultProps = require("../../utils/with-default-props");
17
+ var _withStopPropagation = require("../../utils/with-stop-propagation");
18
+ var _configProvider = require("../config-provider");
19
+ var _mask = _interopRequireDefault(require("../mask"));
20
20
  var _popupBaseProps = require("../popup/popup-base-props");
21
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
22
21
  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); }
23
22
  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; }
23
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
24
24
  const classPrefix = 'adm-center-popup';
25
25
  const defaultProps = Object.assign(Object.assign({}, _popupBaseProps.defaultPopupBaseProps), {
26
26
  getContainer: null
27
27
  });
28
- const CenterPopup = p => {
29
- const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
28
+ const CenterPopup = props => {
29
+ const {
30
+ popup: componentConfig = {}
31
+ } = (0, _configProvider.useConfig)();
32
+ const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
30
33
  const unmountedRef = (0, _ahooks.useUnmountedRef)();
31
34
  const style = (0, _web.useSpring)({
32
- scale: props.visible ? 1 : 0.8,
33
- opacity: props.visible ? 1 : 0,
35
+ scale: mergedProps.visible ? 1 : 0.8,
36
+ opacity: mergedProps.visible ? 1 : 0,
34
37
  config: {
35
38
  mass: 1.2,
36
39
  tension: 200,
@@ -40,68 +43,68 @@ const CenterPopup = p => {
40
43
  onRest: () => {
41
44
  var _a, _b;
42
45
  if (unmountedRef.current) return;
43
- setActive(props.visible);
44
- if (props.visible) {
45
- (_a = props.afterShow) === null || _a === void 0 ? void 0 : _a.call(props);
46
+ setActive(mergedProps.visible);
47
+ if (mergedProps.visible) {
48
+ (_a = mergedProps.afterShow) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
46
49
  } else {
47
- (_b = props.afterClose) === null || _b === void 0 ? void 0 : _b.call(props);
50
+ (_b = mergedProps.afterClose) === null || _b === void 0 ? void 0 : _b.call(mergedProps);
48
51
  }
49
52
  }
50
53
  });
51
- const [active, setActive] = (0, _react.useState)(props.visible);
54
+ const [active, setActive] = (0, _react.useState)(mergedProps.visible);
52
55
  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
53
- if (props.visible) {
56
+ if (mergedProps.visible) {
54
57
  setActive(true);
55
58
  }
56
- }, [props.visible]);
59
+ }, [mergedProps.visible]);
57
60
  const ref = (0, _react.useRef)(null);
58
- (0, _useLockScroll.useLockScroll)(ref, props.disableBodyScroll && active);
59
- const maskVisible = (0, _useInnerVisible.useInnerVisible)(active && props.visible);
61
+ (0, _useLockScroll.useLockScroll)(ref, mergedProps.disableBodyScroll && active);
62
+ const maskVisible = (0, _useInnerVisible.useInnerVisible)(active && mergedProps.visible);
60
63
  const body = _react.default.createElement("div", {
61
- className: (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName),
62
- style: props.bodyStyle
63
- }, props.children);
64
- const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
64
+ className: (0, _classnames.default)(`${classPrefix}-body`, mergedProps.bodyClassName),
65
+ style: mergedProps.bodyStyle
66
+ }, mergedProps.children);
67
+ const node = (0, _withStopPropagation.withStopPropagation)(mergedProps.stopPropagation, (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
65
68
  className: classPrefix,
66
69
  style: {
67
70
  display: active ? undefined : 'none',
68
71
  pointerEvents: active ? undefined : 'none'
69
72
  }
70
- }, props.mask && _react.default.createElement(_mask.default, {
73
+ }, mergedProps.mask && _react.default.createElement(_mask.default, {
71
74
  visible: maskVisible,
72
- forceRender: props.forceRender,
73
- destroyOnClose: props.destroyOnClose,
75
+ forceRender: mergedProps.forceRender,
76
+ destroyOnClose: mergedProps.destroyOnClose,
74
77
  onMaskClick: e => {
75
78
  var _a, _b;
76
- (_a = props.onMaskClick) === null || _a === void 0 ? void 0 : _a.call(props, e);
77
- if (props.closeOnMaskClick) {
78
- (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
79
+ (_a = mergedProps.onMaskClick) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
80
+ if (mergedProps.closeOnMaskClick) {
81
+ (_b = mergedProps.onClose) === null || _b === void 0 ? void 0 : _b.call(mergedProps);
79
82
  }
80
83
  },
81
- style: props.maskStyle,
82
- className: (0, _classnames.default)(`${classPrefix}-mask`, props.maskClassName),
84
+ style: mergedProps.maskStyle,
85
+ className: (0, _classnames.default)(`${classPrefix}-mask`, mergedProps.maskClassName),
83
86
  disableBodyScroll: false,
84
- stopPropagation: props.stopPropagation
87
+ stopPropagation: mergedProps.stopPropagation
85
88
  }), _react.default.createElement("div", {
86
89
  className: `${classPrefix}-wrap`,
87
- role: props.role,
88
- "aria-label": props['aria-label']
90
+ role: mergedProps.role,
91
+ "aria-label": mergedProps['aria-label']
89
92
  }, _react.default.createElement(_web.animated.div, {
90
93
  style: Object.assign(Object.assign({}, style), {
91
94
  pointerEvents: style.opacity.to(v => v === 1 ? 'unset' : 'none')
92
95
  }),
93
96
  ref: ref
94
- }, props.showCloseButton && _react.default.createElement("a", {
97
+ }, mergedProps.showCloseButton && _react.default.createElement("a", {
95
98
  className: (0, _classnames.default)(`${classPrefix}-close`, 'adm-plain-anchor'),
96
99
  onClick: () => {
97
100
  var _a;
98
- (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
101
+ (_a = mergedProps.onClose) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
99
102
  }
100
- }, _react.default.createElement(_antdMobileIcons.CloseOutline, null)), body)))));
103
+ }, mergedProps.closeIcon), body)))));
101
104
  return _react.default.createElement(_shouldRender.ShouldRender, {
102
105
  active: active,
103
- forceRender: props.forceRender,
104
- destroyOnClose: props.destroyOnClose
105
- }, (0, _renderToContainer.renderToContainer)(props.getContainer, node));
106
+ forceRender: mergedProps.forceRender,
107
+ destroyOnClose: mergedProps.destroyOnClose
108
+ }, (0, _renderToContainer.renderToContainer)(mergedProps.getContainer, node));
106
109
  };
107
110
  exports.CenterPopup = CenterPopup;
@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.CheckList = void 0;
7
+ var _antdMobileIcons = require("antd-mobile-icons");
7
8
  var _react = _interopRequireDefault(require("react"));
8
9
  var _nativeProps = require("../../utils/native-props");
9
- var _list = _interopRequireDefault(require("../list"));
10
+ var _usePropsValue = require("../../utils/use-props-value");
10
11
  var _withDefaultProps = require("../../utils/with-default-props");
12
+ var _configProvider = require("../config-provider");
13
+ var _list = _interopRequireDefault(require("../list"));
11
14
  var _context = require("./context");
12
- var _usePropsValue = require("../../utils/use-props-value");
13
- var _antdMobileIcons = require("antd-mobile-icons");
14
15
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
16
  const classPrefix = 'adm-check-list';
16
17
  const defaultProps = {
@@ -18,11 +19,14 @@ const defaultProps = {
18
19
  defaultValue: [],
19
20
  activeIcon: _react.default.createElement(_antdMobileIcons.CheckOutline, null)
20
21
  };
21
- const CheckList = p => {
22
- const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
23
- const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
22
+ const CheckList = props => {
23
+ const {
24
+ checkList: componentConfig = {}
25
+ } = (0, _configProvider.useConfig)();
26
+ const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
27
+ const [value, setValue] = (0, _usePropsValue.usePropsValue)(mergedProps);
24
28
  function check(val) {
25
- if (props.multiple) {
29
+ if (mergedProps.multiple) {
26
30
  setValue([...value, val]);
27
31
  } else {
28
32
  setValue([val]);
@@ -36,7 +40,7 @@ const CheckList = p => {
36
40
  extra,
37
41
  disabled,
38
42
  readOnly
39
- } = props;
43
+ } = mergedProps;
40
44
  return _react.default.createElement(_context.CheckListContext.Provider, {
41
45
  value: {
42
46
  value,
@@ -47,9 +51,9 @@ const CheckList = p => {
47
51
  disabled,
48
52
  readOnly
49
53
  }
50
- }, (0, _nativeProps.withNativeProps)(props, _react.default.createElement(_list.default, {
51
- mode: props.mode,
54
+ }, (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement(_list.default, {
55
+ mode: mergedProps.mode,
52
56
  className: classPrefix
53
- }, props.children)));
57
+ }, mergedProps.children)));
54
58
  };
55
59
  exports.CheckList = CheckList;
@@ -8,14 +8,22 @@ export declare type CollapsePanelProps = {
8
8
  forceRender?: boolean;
9
9
  destroyOnClose?: boolean;
10
10
  onClick?: (event: React.MouseEvent<Element, MouseEvent>) => void;
11
- arrow?: ReactNode | ((active: boolean) => ReactNode);
11
+ arrowIcon?: ReactNode | ((active: boolean) => ReactNode);
12
12
  children?: ReactNode;
13
+ /**
14
+ * @deprecated use `arrowIcon` instead
15
+ */
16
+ arrow?: ReactNode | ((active: boolean) => ReactNode);
13
17
  } & NativeProps;
14
18
  export declare const CollapsePanel: FC<CollapsePanelProps>;
15
19
  declare type ValueProps<T> = {
16
20
  activeKey?: T;
17
21
  defaultActiveKey?: T;
18
22
  onChange?: (activeKey: T) => void;
23
+ arrowIcon?: ReactNode | ((active: boolean) => ReactNode);
24
+ /**
25
+ * @deprecated use `arrowIcon` instead
26
+ */
19
27
  arrow?: ReactNode | ((active: boolean) => ReactNode);
20
28
  };
21
29
  export declare type CollapseProps = (({
@@ -15,6 +15,8 @@ var _traverseReactNode = require("../../utils/traverse-react-node");
15
15
  var _useIsomorphicUpdateLayoutEffect = require("../../utils/use-isomorphic-update-layout-effect");
16
16
  var _useMutationEffect = require("../../utils/use-mutation-effect");
17
17
  var _usePropsValue = require("../../utils/use-props-value");
18
+ var _withDefaultProps = require("../../utils/with-default-props");
19
+ var _configProvider = require("../config-provider");
18
20
  var _list = _interopRequireDefault(require("../list"));
19
21
  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); }
20
22
  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; }
@@ -105,8 +107,12 @@ const CollapsePanelContent = props => {
105
107
  }, _react.default.createElement(_list.default.Item, null, shouldRender && props.children)));
106
108
  };
107
109
  const Collapse = props => {
110
+ const {
111
+ collapse: componentConfig = {}
112
+ } = (0, _configProvider.useConfig)();
113
+ const mergedProps = (0, _withDefaultProps.mergeProps)(componentConfig, props);
108
114
  const panels = [];
109
- (0, _traverseReactNode.traverseReactNode)(props.children, child => {
115
+ (0, _traverseReactNode.traverseReactNode)(mergedProps.children, child => {
110
116
  if (!(0, _react.isValidElement)(child)) return;
111
117
  const key = child.key;
112
118
  if (typeof key !== 'string') return;
@@ -114,11 +120,11 @@ const Collapse = props => {
114
120
  });
115
121
  const handlePropsValue = () => {
116
122
  var _a;
117
- if (!props.accordion) {
123
+ if (!mergedProps.accordion) {
118
124
  return {
119
- value: props.activeKey,
120
- defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
121
- onChange: props.onChange
125
+ value: mergedProps.activeKey,
126
+ defaultValue: (_a = mergedProps.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
127
+ onChange: mergedProps.onChange
122
128
  };
123
129
  }
124
130
  const initValue = {
@@ -126,29 +132,29 @@ const Collapse = props => {
126
132
  defaultValue: [],
127
133
  onChange: v => {
128
134
  var _a, _b;
129
- (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, (_b = v[0]) !== null && _b !== void 0 ? _b : null);
135
+ (_a = mergedProps.onChange) === null || _a === void 0 ? void 0 : _a.call(mergedProps, (_b = v[0]) !== null && _b !== void 0 ? _b : null);
130
136
  }
131
137
  };
132
- if (props.activeKey === undefined) {
138
+ if (mergedProps.activeKey === undefined) {
133
139
  initValue.value = undefined;
134
- } else if (props.activeKey !== null) {
135
- initValue.value = [props.activeKey];
140
+ } else if (mergedProps.activeKey !== null) {
141
+ initValue.value = [mergedProps.activeKey];
136
142
  }
137
- if (![null, undefined].includes(props.defaultActiveKey)) {
138
- initValue.defaultValue = [props.defaultActiveKey];
143
+ if (![null, undefined].includes(mergedProps.defaultActiveKey)) {
144
+ initValue.defaultValue = [mergedProps.defaultActiveKey];
139
145
  }
140
146
  return initValue;
141
147
  };
142
148
  const [activeKey, setActiveKey] = (0, _usePropsValue.usePropsValue)(handlePropsValue());
143
149
  const activeKeyList = activeKey === null ? [] : Array.isArray(activeKey) ? activeKey : [activeKey];
144
- return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
150
+ return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
145
151
  className: classPrefix
146
152
  }, _react.default.createElement(_list.default, null, panels.map(panel => {
147
153
  const key = panel.key;
148
154
  const active = activeKeyList.includes(key);
149
155
  function handleClick(event) {
150
156
  var _a, _b;
151
- if (props.accordion) {
157
+ if (mergedProps.accordion) {
152
158
  if (active) {
153
159
  setActiveKey([]);
154
160
  } else {
@@ -163,27 +169,19 @@ const Collapse = props => {
163
169
  }
164
170
  (_b = (_a = panel.props).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, event);
165
171
  }
166
- const renderArrow = () => {
167
- let arrow = _react.default.createElement(_antdMobileIcons.DownOutline, null);
168
- if (props.arrow !== undefined) {
169
- arrow = props.arrow;
170
- }
171
- if (panel.props.arrow !== undefined) {
172
- arrow = panel.props.arrow;
173
- }
174
- return typeof arrow === 'function' ? arrow(active) : _react.default.createElement("div", {
175
- className: (0, _classnames.default)(`${classPrefix}-arrow`, {
176
- [`${classPrefix}-arrow-active`]: active
177
- })
178
- }, arrow);
179
- };
172
+ const arrow = (0, _withDefaultProps.mergeProp)(_react.default.createElement(_antdMobileIcons.DownOutline, null), mergedProps.arrow, mergedProps.arrowIcon, panel.props.arrow, panel.props.arrowIcon);
173
+ const arrowIcon = typeof arrow === 'function' ? arrow(active) : _react.default.createElement("div", {
174
+ className: (0, _classnames.default)(`${classPrefix}-arrow`, {
175
+ [`${classPrefix}-arrow-active`]: active
176
+ })
177
+ }, arrow);
180
178
  return _react.default.createElement(_react.default.Fragment, {
181
179
  key: key
182
180
  }, (0, _nativeProps.withNativeProps)(panel.props, _react.default.createElement(_list.default.Item, {
183
181
  className: `${classPrefix}-panel-header`,
184
182
  onClick: handleClick,
185
183
  disabled: panel.props.disabled,
186
- arrow: renderArrow()
184
+ arrowIcon: arrowIcon
187
185
  }, panel.props.title)), _react.default.createElement(CollapsePanelContent, {
188
186
  visible: active,
189
187
  forceRender: !!panel.props.forceRender,