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
@@ -4,38 +4,40 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.Input = void 0;
7
- var _react = _interopRequireWildcard(require("react"));
8
- var _usePropsValue = require("../../utils/use-props-value");
9
7
  var _antdMobileIcons = require("antd-mobile-icons");
10
- var _nativeProps = require("../../utils/native-props");
11
- var _withDefaultProps = require("../../utils/with-default-props");
12
8
  var _classnames = _interopRequireDefault(require("classnames"));
9
+ var _react = _interopRequireWildcard(require("react"));
13
10
  var _bound = require("../../utils/bound");
11
+ var _nativeProps = require("../../utils/native-props");
12
+ var _usePropsValue = require("../../utils/use-props-value");
14
13
  var _validate = require("../../utils/validate");
14
+ var _withDefaultProps = require("../../utils/with-default-props");
15
15
  var _configProvider = require("../config-provider");
16
16
  var _useInputHandleKeyDown = _interopRequireDefault(require("./useInputHandleKeyDown"));
17
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
18
17
  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
18
  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; }
19
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
20
  const classPrefix = `adm-input`;
21
21
  const defaultProps = {
22
22
  defaultValue: '',
23
+ clearIcon: _react.default.createElement(_antdMobileIcons.CloseCircleFill, null),
23
24
  onlyShowClearWhenFocus: true
24
25
  };
25
- const Input = (0, _react.forwardRef)((p, ref) => {
26
- const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
27
- const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
26
+ const Input = (0, _react.forwardRef)((props, ref) => {
27
+ const {
28
+ locale,
29
+ input: componentConfig = {}
30
+ } = (0, _configProvider.useConfig)();
31
+ const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
32
+ const [value, setValue] = (0, _usePropsValue.usePropsValue)(mergedProps);
28
33
  const [hasFocus, setHasFocus] = (0, _react.useState)(false);
29
34
  const compositionStartRef = (0, _react.useRef)(false);
30
35
  const nativeInputRef = (0, _react.useRef)(null);
31
- const {
32
- locale
33
- } = (0, _configProvider.useConfig)();
34
36
  const handleKeydown = (0, _useInputHandleKeyDown.default)({
35
- onEnterPress: props.onEnterPress,
36
- onKeyDown: props.onKeyDown,
37
+ onEnterPress: mergedProps.onEnterPress,
38
+ onKeyDown: mergedProps.onKeyDown,
37
39
  nativeInputRef,
38
- enterKeyHint: props.enterKeyHint
40
+ enterKeyHint: mergedProps.enterKeyHint
39
41
  });
40
42
  (0, _react.useImperativeHandle)(ref, () => ({
41
43
  clear: () => {
@@ -55,8 +57,8 @@ const Input = (0, _react.forwardRef)((p, ref) => {
55
57
  }));
56
58
  function checkValue() {
57
59
  let nextValue = value;
58
- if (props.type === 'number') {
59
- const boundValue = nextValue && (0, _bound.bound)(parseFloat(nextValue), props.min, props.max).toString();
60
+ if (mergedProps.type === 'number') {
61
+ const boundValue = nextValue && (0, _bound.bound)(parseFloat(nextValue), mergedProps.min, mergedProps.max).toString();
60
62
  // fix the display issue of numbers starting with 0
61
63
  if (Number(nextValue) !== Number(boundValue)) {
62
64
  nextValue = boundValue;
@@ -67,15 +69,15 @@ const Input = (0, _react.forwardRef)((p, ref) => {
67
69
  }
68
70
  }
69
71
  const shouldShowClear = (() => {
70
- if (!props.clearable || !value || props.readOnly) return false;
71
- if (props.onlyShowClearWhenFocus) {
72
+ if (!mergedProps.clearable || !value || mergedProps.readOnly) return false;
73
+ if (mergedProps.onlyShowClearWhenFocus) {
72
74
  return hasFocus;
73
75
  } else {
74
76
  return true;
75
77
  }
76
78
  })();
77
- return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
78
- className: (0, _classnames.default)(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
79
+ return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
80
+ className: (0, _classnames.default)(`${classPrefix}`, mergedProps.disabled && `${classPrefix}-disabled`)
79
81
  }, _react.default.createElement("input", {
80
82
  ref: nativeInputRef,
81
83
  className: `${classPrefix}-element`,
@@ -86,50 +88,50 @@ const Input = (0, _react.forwardRef)((p, ref) => {
86
88
  onFocus: e => {
87
89
  var _a;
88
90
  setHasFocus(true);
89
- (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
91
+ (_a = mergedProps.onFocus) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
90
92
  },
91
93
  onBlur: e => {
92
94
  var _a;
93
95
  setHasFocus(false);
94
96
  checkValue();
95
- (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
97
+ (_a = mergedProps.onBlur) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
96
98
  },
97
- id: props.id,
98
- placeholder: props.placeholder,
99
- disabled: props.disabled,
100
- readOnly: props.readOnly,
101
- maxLength: props.maxLength,
102
- minLength: props.minLength,
103
- max: props.max,
104
- min: props.min,
105
- autoComplete: props.autoComplete,
106
- enterKeyHint: props.enterKeyHint,
107
- autoFocus: props.autoFocus,
108
- pattern: props.pattern,
109
- inputMode: props.inputMode,
110
- type: props.type,
111
- name: props.name,
112
- autoCapitalize: props.autoCapitalize,
113
- autoCorrect: props.autoCorrect,
99
+ id: mergedProps.id,
100
+ placeholder: mergedProps.placeholder,
101
+ disabled: mergedProps.disabled,
102
+ readOnly: mergedProps.readOnly,
103
+ maxLength: mergedProps.maxLength,
104
+ minLength: mergedProps.minLength,
105
+ max: mergedProps.max,
106
+ min: mergedProps.min,
107
+ autoComplete: mergedProps.autoComplete,
108
+ enterKeyHint: mergedProps.enterKeyHint,
109
+ autoFocus: mergedProps.autoFocus,
110
+ pattern: mergedProps.pattern,
111
+ inputMode: mergedProps.inputMode,
112
+ type: mergedProps.type,
113
+ name: mergedProps.name,
114
+ autoCapitalize: mergedProps.autoCapitalize,
115
+ autoCorrect: mergedProps.autoCorrect,
114
116
  onKeyDown: handleKeydown,
115
- onKeyUp: props.onKeyUp,
117
+ onKeyUp: mergedProps.onKeyUp,
116
118
  onCompositionStart: e => {
117
119
  var _a;
118
120
  compositionStartRef.current = true;
119
- (_a = props.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(props, e);
121
+ (_a = mergedProps.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
120
122
  },
121
123
  onCompositionEnd: e => {
122
124
  var _a;
123
125
  compositionStartRef.current = false;
124
- (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
126
+ (_a = mergedProps.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
125
127
  },
126
- onClick: props.onClick,
127
- step: props.step,
128
- role: props.role,
129
- "aria-valuenow": props['aria-valuenow'],
130
- "aria-valuemax": props['aria-valuemax'],
131
- "aria-valuemin": props['aria-valuemin'],
132
- "aria-label": props['aria-label']
128
+ onClick: mergedProps.onClick,
129
+ step: mergedProps.step,
130
+ role: mergedProps.role,
131
+ "aria-valuenow": mergedProps['aria-valuenow'],
132
+ "aria-valuemax": mergedProps['aria-valuemax'],
133
+ "aria-valuemin": mergedProps['aria-valuemin'],
134
+ "aria-label": mergedProps['aria-label']
133
135
  }), shouldShowClear && _react.default.createElement("div", {
134
136
  className: `${classPrefix}-clear`,
135
137
  onMouseDown: e => {
@@ -138,7 +140,7 @@ const Input = (0, _react.forwardRef)((p, ref) => {
138
140
  onClick: () => {
139
141
  var _a, _b;
140
142
  setValue('');
141
- (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
143
+ (_a = mergedProps.onClear) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
142
144
  // https://github.com/ant-design/ant-design-mobile/issues/5212
143
145
  if ((0, _validate.isIOS)() && compositionStartRef.current) {
144
146
  compositionStartRef.current = false;
@@ -146,6 +148,6 @@ const Input = (0, _react.forwardRef)((p, ref) => {
146
148
  }
147
149
  },
148
150
  "aria-label": locale.Input.clear
149
- }, _react.default.createElement(_antdMobileIcons.CloseCircleFill, null))));
151
+ }, mergedProps.clearIcon)));
150
152
  });
151
153
  exports.Input = Input;
@@ -1,5 +1,5 @@
1
- import React from 'react';
2
1
  import type { FC, ReactNode } from 'react';
2
+ import React from 'react';
3
3
  import { NativeProps } from '../../utils/native-props';
4
4
  export declare type ListItemProps = {
5
5
  title?: ReactNode;
@@ -8,8 +8,12 @@ export declare type ListItemProps = {
8
8
  prefix?: ReactNode;
9
9
  extra?: ReactNode;
10
10
  clickable?: boolean;
11
- arrow?: boolean | ReactNode;
11
+ arrowIcon?: boolean | ReactNode;
12
12
  disabled?: boolean;
13
13
  onClick?: (e: React.MouseEvent<HTMLElement>) => void;
14
+ /**
15
+ * @deprecated use `arrowIcon` instead
16
+ */
17
+ arrow?: boolean | ReactNode;
14
18
  } & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color'>;
15
19
  export declare const ListItem: FC<ListItemProps>;
@@ -4,17 +4,27 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.ListItem = void 0;
7
- var _react = _interopRequireDefault(require("react"));
8
- var _nativeProps = require("../../utils/native-props");
9
7
  var _antdMobileIcons = require("antd-mobile-icons");
10
8
  var _classnames = _interopRequireDefault(require("classnames"));
9
+ var _react = _interopRequireDefault(require("react"));
11
10
  var _isNodeWithContent = require("../../utils/is-node-with-content");
11
+ var _nativeProps = require("../../utils/native-props");
12
+ var _withDefaultProps = require("../../utils/with-default-props");
13
+ var _configProvider = require("../config-provider");
12
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
15
  const classPrefix = `adm-list-item`;
14
16
  const ListItem = props => {
15
- var _a;
17
+ var _a, _b;
18
+ const {
19
+ arrow,
20
+ arrowIcon
21
+ } = props;
22
+ const {
23
+ list: componentConfig = {}
24
+ } = (0, _configProvider.useConfig)();
16
25
  const clickable = (_a = props.clickable) !== null && _a !== void 0 ? _a : !!props.onClick;
17
- const arrow = props.arrow === undefined ? clickable : props.arrow;
26
+ const showArrow = (_b = arrow !== null && arrow !== void 0 ? arrow : arrowIcon) !== null && _b !== void 0 ? _b : clickable;
27
+ const mergedArrowIcon = (0, _withDefaultProps.mergeProp)(componentConfig.arrowIcon, arrow !== true ? arrow : null, arrowIcon !== true ? arrowIcon : null);
18
28
  const content = _react.default.createElement("div", {
19
29
  className: `${classPrefix}-content`
20
30
  }, (0, _isNodeWithContent.isNodeWithContent)(props.prefix) && _react.default.createElement("div", {
@@ -27,9 +37,9 @@ const ListItem = props => {
27
37
  className: `${classPrefix}-description`
28
38
  }, props.description)), (0, _isNodeWithContent.isNodeWithContent)(props.extra) && _react.default.createElement("div", {
29
39
  className: `${classPrefix}-content-extra`
30
- }, props.extra), (0, _isNodeWithContent.isNodeWithContent)(arrow) && _react.default.createElement("div", {
40
+ }, props.extra), showArrow && _react.default.createElement("div", {
31
41
  className: `${classPrefix}-content-arrow`
32
- }, arrow === true ? _react.default.createElement(_antdMobileIcons.RightOutline, null) : arrow));
42
+ }, mergedArrowIcon || _react.default.createElement(_antdMobileIcons.RightOutline, null)));
33
43
  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement(clickable ? 'a' : 'div', {
34
44
  className: (0, _classnames.default)(`${classPrefix}`, clickable ? ['adm-plain-anchor'] : [], props.disabled && `${classPrefix}-disabled`),
35
45
  onClick: props.disabled ? undefined : props.onClick
@@ -2,6 +2,10 @@ import type { FC, ReactNode } from 'react';
2
2
  import { NativeProps } from '../../utils/native-props';
3
3
  export declare type NavBarProps = {
4
4
  back?: ReactNode;
5
+ backIcon?: boolean | ReactNode;
6
+ /**
7
+ * @deprecated use `backIcon` instead
8
+ */
5
9
  backArrow?: boolean | ReactNode;
6
10
  left?: ReactNode;
7
11
  right?: ReactNode;
@@ -4,38 +4,43 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.NavBar = void 0;
7
- var _react = _interopRequireDefault(require("react"));
8
- var _classnames = _interopRequireDefault(require("classnames"));
9
7
  var _antdMobileIcons = require("antd-mobile-icons");
8
+ var _classnames = _interopRequireDefault(require("classnames"));
9
+ var _react = _interopRequireDefault(require("react"));
10
10
  var _nativeProps = require("../../utils/native-props");
11
11
  var _withDefaultProps = require("../../utils/with-default-props");
12
+ var _configProvider = require("../config-provider");
12
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
14
  const classPrefix = `adm-nav-bar`;
14
- const defaultProps = {
15
- backArrow: true
16
- };
17
- const NavBar = p => {
18
- const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
15
+ const defaultBackIcon = _react.default.createElement(_antdMobileIcons.LeftOutline, null);
16
+ const NavBar = props => {
17
+ const {
18
+ navBar: componentConfig = {}
19
+ } = (0, _configProvider.useConfig)();
20
+ const mergedProps = (0, _withDefaultProps.mergeProps)(componentConfig, props);
19
21
  const {
20
22
  back,
23
+ backIcon,
21
24
  backArrow
22
- } = props;
23
- return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
25
+ } = mergedProps;
26
+ const mergedDefaultBackIcon = componentConfig.backIcon || defaultBackIcon;
27
+ const mergedBackIcon = (0, _withDefaultProps.mergeProp)(defaultBackIcon, componentConfig.backIcon, backArrow === true ? mergedDefaultBackIcon : backArrow, backIcon === true ? mergedDefaultBackIcon : backIcon);
28
+ return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
24
29
  className: (0, _classnames.default)(classPrefix)
25
30
  }, _react.default.createElement("div", {
26
31
  className: `${classPrefix}-left`,
27
32
  role: 'button'
28
33
  }, back !== null && _react.default.createElement("div", {
29
34
  className: `${classPrefix}-back`,
30
- onClick: props.onBack
31
- }, backArrow && _react.default.createElement("span", {
35
+ onClick: mergedProps.onBack
36
+ }, mergedBackIcon && _react.default.createElement("span", {
32
37
  className: `${classPrefix}-back-arrow`
33
- }, backArrow === true ? _react.default.createElement(_antdMobileIcons.LeftOutline, null) : backArrow), _react.default.createElement("span", {
38
+ }, mergedBackIcon), _react.default.createElement("span", {
34
39
  "aria-hidden": 'true'
35
- }, back)), props.left), _react.default.createElement("div", {
40
+ }, back)), mergedProps.left), _react.default.createElement("div", {
36
41
  className: `${classPrefix}-title`
37
- }, props.children), _react.default.createElement("div", {
42
+ }, mergedProps.children), _react.default.createElement("div", {
38
43
  className: `${classPrefix}-right`
39
- }, props.right)));
44
+ }, mergedProps.right)));
40
45
  };
41
46
  exports.NavBar = NavBar;
@@ -70,8 +70,6 @@
70
70
  display: flex;
71
71
  align-items: center;
72
72
  justify-content: center;
73
- }
74
- .adm-notice-bar-close-icon {
75
73
  font-size: var(--adm-font-size-10);
76
74
  }
77
75
  .adm-notice-bar-wrap {
@@ -1,5 +1,5 @@
1
- import React from 'react';
2
1
  import type { ReactNode } from 'react';
2
+ import React from 'react';
3
3
  import { NativeProps } from '../../utils/native-props';
4
4
  export declare type NoticeBarProps = {
5
5
  /** The type of the NoticeBar */
@@ -12,6 +12,8 @@ export declare type NoticeBarProps = {
12
12
  content: ReactNode;
13
13
  /** Whether it can be closed */
14
14
  closeable?: boolean;
15
+ /** Custom close icon */
16
+ closeIcon?: ReactNode;
15
17
  /** Callback when closed */
16
18
  onClose?: () => void;
17
19
  /** Event when click */
@@ -4,35 +4,42 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.NoticeBar = void 0;
7
- var _react = _interopRequireWildcard(require("react"));
8
- var _classnames = _interopRequireDefault(require("classnames"));
9
- var _antdMobileIcons = require("antd-mobile-icons");
10
7
  var _ahooks = require("ahooks");
11
- var _withDefaultProps = require("../../utils/with-default-props");
8
+ var _antdMobileIcons = require("antd-mobile-icons");
9
+ var _classnames = _interopRequireDefault(require("classnames"));
10
+ var _react = _interopRequireWildcard(require("react"));
12
11
  var _nativeProps = require("../../utils/native-props");
13
- var _useResizeEffect = require("../../utils/use-resize-effect");
14
12
  var _useMutationEffect = require("../../utils/use-mutation-effect");
15
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
+ var _useResizeEffect = require("../../utils/use-resize-effect");
14
+ var _withDefaultProps = require("../../utils/with-default-props");
15
+ var _configProvider = require("../config-provider");
16
16
  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); }
17
17
  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; }
18
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
18
19
  const classPrefix = `adm-notice-bar`;
19
20
  const defaultProps = {
20
21
  color: 'default',
21
22
  delay: 2000,
22
23
  speed: 50,
23
- wrap: false,
24
- icon: _react.default.createElement(_antdMobileIcons.SoundOutline, null)
24
+ icon: _react.default.createElement(_antdMobileIcons.SoundOutline, null),
25
+ wrap: false
25
26
  };
26
- const NoticeBar = (0, _react.memo)(p => {
27
- const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
27
+ const NoticeBar = (0, _react.memo)(props => {
28
+ const {
29
+ noticeBar: componentConfig = {}
30
+ } = (0, _configProvider.useConfig)();
31
+ const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
32
+ const closeIcon = (0, _withDefaultProps.mergeProp)(_react.default.createElement(_antdMobileIcons.CloseOutline, {
33
+ className: `${classPrefix}-close-icon`
34
+ }), componentConfig.closeIcon, props.closeIcon);
28
35
  const containerRef = (0, _react.useRef)(null);
29
36
  const textRef = (0, _react.useRef)(null);
30
37
  const [visible, setVisible] = (0, _react.useState)(true);
31
- const speed = props.speed;
38
+ const speed = mergedProps.speed;
32
39
  const delayLockRef = (0, _react.useRef)(true);
33
40
  const animatingRef = (0, _react.useRef)(false);
34
41
  function start() {
35
- if (delayLockRef.current || props.wrap) return;
42
+ if (delayLockRef.current || mergedProps.wrap) return;
36
43
  const container = containerRef.current;
37
44
  const text = textRef.current;
38
45
  if (!container || !text) return;
@@ -58,7 +65,7 @@ const NoticeBar = (0, _react.memo)(p => {
58
65
  (0, _ahooks.useTimeout)(() => {
59
66
  delayLockRef.current = false;
60
67
  start();
61
- }, props.delay);
68
+ }, mergedProps.delay);
62
69
  (0, _useResizeEffect.useResizeEffect)(() => {
63
70
  start();
64
71
  }, containerRef);
@@ -70,14 +77,14 @@ const NoticeBar = (0, _react.memo)(p => {
70
77
  characterData: true
71
78
  });
72
79
  if (!visible) return null;
73
- return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
74
- className: (0, _classnames.default)(classPrefix, `${classPrefix}-${props.color}`, {
75
- [`${classPrefix}-wrap`]: props.wrap
80
+ return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
81
+ className: (0, _classnames.default)(classPrefix, `${classPrefix}-${mergedProps.color}`, {
82
+ [`${classPrefix}-wrap`]: mergedProps.wrap
76
83
  }),
77
- onClick: props.onClick
78
- }, props.icon && _react.default.createElement("span", {
84
+ onClick: mergedProps.onClick
85
+ }, mergedProps.icon && _react.default.createElement("span", {
79
86
  className: `${classPrefix}-left`
80
- }, props.icon), _react.default.createElement("span", {
87
+ }, mergedProps.icon), _react.default.createElement("span", {
81
88
  ref: containerRef,
82
89
  className: `${classPrefix}-content`
83
90
  }, _react.default.createElement("span", {
@@ -87,17 +94,15 @@ const NoticeBar = (0, _react.memo)(p => {
87
94
  },
88
95
  ref: textRef,
89
96
  className: `${classPrefix}-content-inner`
90
- }, props.content)), (props.closeable || props.extra) && _react.default.createElement("span", {
97
+ }, mergedProps.content)), (mergedProps.closeable || mergedProps.extra) && _react.default.createElement("span", {
91
98
  className: `${classPrefix}-right`
92
- }, props.extra, props.closeable && _react.default.createElement("div", {
99
+ }, mergedProps.extra, mergedProps.closeable && _react.default.createElement("div", {
93
100
  className: `${classPrefix}-close`,
94
101
  onClick: () => {
95
102
  var _a;
96
103
  setVisible(false);
97
- (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
104
+ (_a = mergedProps.onClose) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
98
105
  }
99
- }, _react.default.createElement(_antdMobileIcons.CloseOutline, {
100
- className: `${classPrefix}-close-icon`
101
- })))));
106
+ }, closeIcon))));
102
107
  });
103
108
  exports.NoticeBar = NoticeBar;
@@ -1,6 +1,6 @@
1
1
  import type { FC } from 'react';
2
- import { PopupProps } from '../popup';
3
2
  import { NativeProps } from '../../utils/native-props';
3
+ import { PopupProps } from '../popup';
4
4
  export declare type NumberKeyboardProps = {
5
5
  visible?: boolean;
6
6
  title?: string;
@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.NumberKeyboard = void 0;
7
- var _react = _interopRequireWildcard(require("react"));
8
- var _classnames = _interopRequireDefault(require("classnames"));
7
+ var _ahooks = require("ahooks");
9
8
  var _antdMobileIcons = require("antd-mobile-icons");
10
- var _withDefaultProps = require("../../utils/with-default-props");
9
+ var _classnames = _interopRequireDefault(require("classnames"));
10
+ var _react = _interopRequireWildcard(require("react"));
11
+ var _nativeProps = require("../../utils/native-props");
11
12
  var _shuffle = require("../../utils/shuffle");
13
+ var _withDefaultProps = require("../../utils/with-default-props");
14
+ var _configProvider = require("../config-provider");
12
15
  var _popup = _interopRequireDefault(require("../popup"));
13
- var _nativeProps = require("../../utils/native-props");
14
16
  var _safeArea = _interopRequireDefault(require("../safe-area"));
15
- var _ahooks = require("ahooks");
16
- var _configProvider = require("../config-provider");
17
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
18
17
  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
18
  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; }
19
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
20
  const classPrefix = 'adm-number-keyboard';
21
21
  const defaultProps = {
22
22
  defaultVisible: false,
@@ -66,13 +66,13 @@ const NumberKeyboard = p => {
66
66
  var _a;
67
67
  (_a = props.onDelete) === null || _a === void 0 ? void 0 : _a.call(props);
68
68
  });
69
- const onBackspacePressStart = () => {
69
+ const startContinueClear = () => {
70
70
  timeoutRef.current = window.setTimeout(() => {
71
71
  onDelete();
72
72
  intervalRef.current = window.setInterval(onDelete, 150);
73
73
  }, 700);
74
74
  };
75
- const onBackspacePressEnd = () => {
75
+ const stopContinueClear = () => {
76
76
  clearTimeout(timeoutRef.current);
77
77
  clearInterval(intervalRef.current);
78
78
  };
@@ -131,14 +131,15 @@ const NumberKeyboard = p => {
131
131
  key: key,
132
132
  className: className,
133
133
  onTouchStart: () => {
134
+ stopContinueClear();
134
135
  if (key === 'BACKSPACE') {
135
- onBackspacePressStart();
136
+ startContinueClear();
136
137
  }
137
138
  },
138
139
  onTouchEnd: e => {
139
140
  onKeyPress(e, key);
140
141
  if (key === 'BACKSPACE') {
141
- onBackspacePressEnd();
142
+ stopContinueClear();
142
143
  }
143
144
  }
144
145
  }, ariaProps), key === 'BACKSPACE' ? _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null) : key);
@@ -170,11 +171,11 @@ const NumberKeyboard = p => {
170
171
  }, _react.default.createElement("div", {
171
172
  className: `${classPrefix}-key ${classPrefix}-key-extra ${classPrefix}-key-bs`,
172
173
  onTouchStart: () => {
173
- onBackspacePressStart();
174
+ startContinueClear();
174
175
  },
175
176
  onTouchEnd: e => {
176
177
  onKeyPress(e, 'BACKSPACE');
177
- onBackspacePressEnd();
178
+ stopContinueClear();
178
179
  },
179
180
  onContextMenu: e => {
180
181
  // Long press should not trigger native context menu
@@ -1,5 +1,4 @@
1
- import React from 'react';
2
- import type { CSSProperties } from 'react';
1
+ import React, { CSSProperties, ReactNode } from 'react';
3
2
  import { GetContainer } from '../../utils/render-to-container';
4
3
  import { MaskProps } from '../mask';
5
4
  import { PropagationEvent } from '../../utils/with-stop-propagation';
@@ -9,6 +8,7 @@ export declare type PopupBaseProps = {
9
8
  bodyClassName?: string;
10
9
  bodyStyle?: CSSProperties;
11
10
  closeOnMaskClick?: boolean;
11
+ closeIcon?: ReactNode;
12
12
  destroyOnClose?: boolean;
13
13
  disableBodyScroll?: boolean;
14
14
  forceRender?: boolean;
@@ -25,6 +25,7 @@ export declare type PopupBaseProps = {
25
25
  };
26
26
  export declare const defaultPopupBaseProps: {
27
27
  closeOnMaskClick: boolean;
28
+ closeIcon: React.JSX.Element;
28
29
  destroyOnClose: boolean;
29
30
  disableBodyScroll: boolean;
30
31
  forceRender: boolean;
@@ -4,8 +4,12 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.defaultPopupBaseProps = void 0;
7
+ var _react = _interopRequireDefault(require("react"));
8
+ var _antdMobileIcons = require("antd-mobile-icons");
9
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
7
10
  const defaultPopupBaseProps = {
8
11
  closeOnMaskClick: false,
12
+ closeIcon: _react.default.createElement(_antdMobileIcons.CloseOutline, null),
9
13
  destroyOnClose: false,
10
14
  disableBodyScroll: true,
11
15
  forceRender: false,
@@ -15,7 +15,6 @@ var _renderToContainer = require("../../utils/render-to-container");
15
15
  var _web = require("@react-spring/web");
16
16
  var _withStopPropagation = require("../../utils/with-stop-propagation");
17
17
  var _shouldRender = require("../../utils/should-render");
18
- var _antdMobileIcons = require("antd-mobile-icons");
19
18
  var _popupBaseProps = require("./popup-base-props");
20
19
  var _useInnerVisible = require("../../utils/use-inner-visible");
21
20
  var _configProvider = require("../config-provider");
@@ -29,11 +28,12 @@ const defaultProps = Object.assign(Object.assign({}, _popupBaseProps.defaultPopu
29
28
  position: 'bottom'
30
29
  });
31
30
  const Popup = p => {
32
- const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
33
- const bodyCls = (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
34
31
  const {
35
- locale
32
+ locale,
33
+ popup: componentConfig = {}
36
34
  } = (0, _configProvider.useConfig)();
35
+ const props = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, p);
36
+ const bodyCls = (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
37
37
  const [active, setActive] = (0, _react.useState)(props.visible);
38
38
  const ref = (0, _react.useRef)(null);
39
39
  (0, _useLockScroll.useLockScroll)(ref, props.disableBodyScroll && active ? 'strict' : false);
@@ -128,7 +128,7 @@ const Popup = p => {
128
128
  },
129
129
  role: 'button',
130
130
  "aria-label": locale.common.close
131
- }, _react.default.createElement(_antdMobileIcons.CloseOutline, null)), props.children))));
131
+ }, props.closeIcon), props.children))));
132
132
  return _react.default.createElement(_shouldRender.ShouldRender, {
133
133
  active: active,
134
134
  forceRender: props.forceRender,
@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.Result = void 0;
7
7
  var _react = _interopRequireDefault(require("react"));
8
8
  var _classnames = _interopRequireDefault(require("classnames"));
9
- var _antdMobileIcons = require("antd-mobile-icons");
10
9
  var _nativeProps = require("../../utils/native-props");
11
10
  var _withDefaultProps = require("../../utils/with-default-props");
11
+ var _useResultIcon = require("./use-result-icon");
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
  const classPrefix = `adm-result`;
14
- const iconRecord = {
15
- success: _antdMobileIcons.CheckCircleFill,
16
- error: _antdMobileIcons.CloseCircleFill,
17
- info: _antdMobileIcons.InformationCircleFill,
18
- waiting: _antdMobileIcons.ClockCircleFill,
19
- warning: _antdMobileIcons.ExclamationCircleFill
20
- };
21
14
  const defaultProps = {
22
15
  status: 'info'
23
16
  };
@@ -29,13 +22,13 @@ const Result = p => {
29
22
  description,
30
23
  icon
31
24
  } = props;
25
+ const fallbackIcon = (0, _useResultIcon.useResultIcon)(status);
32
26
  if (!status) return null;
33
- const resultIcon = icon || _react.default.createElement(iconRecord[status]);
34
27
  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
35
28
  className: (0, _classnames.default)(classPrefix, `${classPrefix}-${status}`)
36
29
  }, _react.default.createElement("div", {
37
30
  className: `${classPrefix}-icon`
38
- }, resultIcon), _react.default.createElement("div", {
31
+ }, icon || fallbackIcon), _react.default.createElement("div", {
39
32
  className: `${classPrefix}-title`
40
33
  }, title), !!description && _react.default.createElement("div", {
41
34
  className: `${classPrefix}-description`