@sheinx/base 3.8.0-beta.1 → 3.8.0-beta.11

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 (205) hide show
  1. package/cjs/absolute-list/absolute-list.js +2 -2
  2. package/cjs/alert/alert.d.ts.map +1 -1
  3. package/cjs/alert/alert.js +1 -1
  4. package/cjs/cascader/cascader.d.ts.map +1 -1
  5. package/cjs/cascader/cascader.js +27 -2
  6. package/cjs/cascader/cascader.type.d.ts +8 -0
  7. package/cjs/cascader/cascader.type.d.ts.map +1 -1
  8. package/cjs/cascader/list.d.ts.map +1 -1
  9. package/cjs/cascader/list.js +0 -13
  10. package/cjs/cascader/node.d.ts.map +1 -1
  11. package/cjs/cascader/node.js +13 -11
  12. package/cjs/cascader/node.type.d.ts +0 -2
  13. package/cjs/cascader/node.type.d.ts.map +1 -1
  14. package/cjs/common/use-tip.js +1 -1
  15. package/cjs/date-picker/date-picker.d.ts.map +1 -1
  16. package/cjs/date-picker/date-picker.js +6 -2
  17. package/cjs/date-picker/date-picker.type.d.ts +2 -2
  18. package/cjs/date-picker/date-picker.type.d.ts.map +1 -1
  19. package/cjs/date-picker/day.d.ts.map +1 -1
  20. package/cjs/date-picker/day.js +3 -1
  21. package/cjs/date-picker/picker.d.ts.map +1 -1
  22. package/cjs/date-picker/picker.js +1 -0
  23. package/cjs/date-picker/picker.type.d.ts +2 -1
  24. package/cjs/date-picker/picker.type.d.ts.map +1 -1
  25. package/cjs/date-picker/result.d.ts +4 -4
  26. package/cjs/date-picker/result.d.ts.map +1 -1
  27. package/cjs/date-picker/result.js +1 -1
  28. package/cjs/dropdown/Item.d.ts.map +1 -1
  29. package/cjs/dropdown/Item.js +3 -1
  30. package/cjs/form/form-flow.type.d.ts +5 -1
  31. package/cjs/form/form-flow.type.d.ts.map +1 -1
  32. package/cjs/form/form-item.d.ts.map +1 -1
  33. package/cjs/form/form-item.js +1 -1
  34. package/cjs/form/form-item.type.d.ts +1 -0
  35. package/cjs/form/form-item.type.d.ts.map +1 -1
  36. package/cjs/form/index.d.ts +1 -1
  37. package/cjs/form/index.d.ts.map +1 -1
  38. package/cjs/input/input-password.d.ts.map +1 -1
  39. package/cjs/input/input-password.js +2 -1
  40. package/cjs/input/input.d.ts.map +1 -1
  41. package/cjs/input/input.js +1 -0
  42. package/cjs/input/input.type.d.ts +11 -5
  43. package/cjs/input/input.type.d.ts.map +1 -1
  44. package/cjs/input/simple-input.d.ts.map +1 -1
  45. package/cjs/input/simple-input.js +31 -5
  46. package/cjs/input/use-input-common.d.ts.map +1 -1
  47. package/cjs/input/use-input-common.js +42 -19
  48. package/cjs/modal/modal-content.d.ts.map +1 -1
  49. package/cjs/modal/modal-content.js +31 -17
  50. package/cjs/select/result-more.d.ts.map +1 -1
  51. package/cjs/select/result-more.js +21 -50
  52. package/cjs/select/result-more.type.d.ts +0 -1
  53. package/cjs/select/result-more.type.d.ts.map +1 -1
  54. package/cjs/select/result.d.ts.map +1 -1
  55. package/cjs/select/result.js +24 -8
  56. package/cjs/select/result.type.d.ts +1 -0
  57. package/cjs/select/result.type.d.ts.map +1 -1
  58. package/cjs/select/select.d.ts.map +1 -1
  59. package/cjs/select/select.js +8 -1
  60. package/cjs/select/select.type.d.ts +8 -0
  61. package/cjs/select/select.type.d.ts.map +1 -1
  62. package/cjs/table/table.d.ts.map +1 -1
  63. package/cjs/table/table.js +11 -15
  64. package/cjs/table/table.type.d.ts +7 -0
  65. package/cjs/table/table.type.d.ts.map +1 -1
  66. package/cjs/table/td.d.ts.map +1 -1
  67. package/cjs/table/td.js +5 -23
  68. package/cjs/table/thead.d.ts.map +1 -1
  69. package/cjs/table/thead.js +17 -1
  70. package/cjs/table/thead.type.d.ts +1 -1
  71. package/cjs/table/thead.type.d.ts.map +1 -1
  72. package/cjs/textarea/textarea.d.ts.map +1 -1
  73. package/cjs/textarea/textarea.js +2 -1
  74. package/cjs/tooltip/tooltip.type.d.ts +0 -6
  75. package/cjs/tooltip/tooltip.type.d.ts.map +1 -1
  76. package/cjs/transfer/transfer-list-item.d.ts.map +1 -1
  77. package/cjs/transfer/transfer-list-item.js +14 -3
  78. package/cjs/transfer/transfer-list-item.type.d.ts +2 -1
  79. package/cjs/transfer/transfer-list-item.type.d.ts.map +1 -1
  80. package/cjs/transfer/transfer-list.js +1 -1
  81. package/cjs/transfer/transfer.d.ts.map +1 -1
  82. package/cjs/transfer/transfer.js +12 -5
  83. package/cjs/transfer/transfer.type.d.ts +8 -1
  84. package/cjs/transfer/transfer.type.d.ts.map +1 -1
  85. package/cjs/tree/tree-content.d.ts.map +1 -1
  86. package/cjs/tree/tree-content.js +2 -0
  87. package/cjs/tree/tree-content.type.d.ts +1 -0
  88. package/cjs/tree/tree-content.type.d.ts.map +1 -1
  89. package/cjs/tree/tree-simple-node.d.ts.map +1 -1
  90. package/cjs/tree/tree-simple-node.js +3 -1
  91. package/cjs/tree/tree-virtual-node.d.ts.map +1 -1
  92. package/cjs/tree/tree-virtual-node.js +13 -1
  93. package/cjs/tree/tree-virtual.d.ts.map +1 -1
  94. package/cjs/tree/tree-virtual.js +7 -1
  95. package/cjs/tree-select/tree-select.d.ts.map +1 -1
  96. package/cjs/tree-select/tree-select.js +19 -4
  97. package/cjs/tree-select/tree-select.type.d.ts +1 -0
  98. package/cjs/tree-select/tree-select.type.d.ts.map +1 -1
  99. package/cjs/upload/button.d.ts.map +1 -1
  100. package/cjs/upload/button.js +0 -1
  101. package/cjs/upload/button.type.d.ts +1 -1
  102. package/cjs/upload/button.type.d.ts.map +1 -1
  103. package/esm/absolute-list/absolute-list.js +2 -2
  104. package/esm/alert/alert.d.ts.map +1 -1
  105. package/esm/alert/alert.js +1 -1
  106. package/esm/cascader/cascader.d.ts.map +1 -1
  107. package/esm/cascader/cascader.js +27 -2
  108. package/esm/cascader/cascader.type.d.ts +8 -0
  109. package/esm/cascader/cascader.type.d.ts.map +1 -1
  110. package/esm/cascader/list.d.ts.map +1 -1
  111. package/esm/cascader/list.js +1 -14
  112. package/esm/cascader/node.d.ts.map +1 -1
  113. package/esm/cascader/node.js +13 -11
  114. package/esm/cascader/node.type.d.ts +0 -2
  115. package/esm/cascader/node.type.d.ts.map +1 -1
  116. package/esm/common/use-tip.js +1 -1
  117. package/esm/date-picker/date-picker.d.ts.map +1 -1
  118. package/esm/date-picker/date-picker.js +6 -2
  119. package/esm/date-picker/date-picker.type.d.ts +2 -2
  120. package/esm/date-picker/date-picker.type.d.ts.map +1 -1
  121. package/esm/date-picker/day.d.ts.map +1 -1
  122. package/esm/date-picker/day.js +3 -1
  123. package/esm/date-picker/picker.d.ts.map +1 -1
  124. package/esm/date-picker/picker.js +1 -0
  125. package/esm/date-picker/picker.type.d.ts +2 -1
  126. package/esm/date-picker/picker.type.d.ts.map +1 -1
  127. package/esm/date-picker/result.d.ts +4 -4
  128. package/esm/date-picker/result.d.ts.map +1 -1
  129. package/esm/date-picker/result.js +1 -1
  130. package/esm/dropdown/Item.d.ts.map +1 -1
  131. package/esm/dropdown/Item.js +3 -1
  132. package/esm/form/form-flow.type.d.ts +5 -1
  133. package/esm/form/form-flow.type.d.ts.map +1 -1
  134. package/esm/form/form-item.d.ts.map +1 -1
  135. package/esm/form/form-item.js +1 -1
  136. package/esm/form/form-item.type.d.ts +1 -0
  137. package/esm/form/form-item.type.d.ts.map +1 -1
  138. package/esm/form/index.d.ts +1 -1
  139. package/esm/form/index.d.ts.map +1 -1
  140. package/esm/input/input-password.d.ts.map +1 -1
  141. package/esm/input/input-password.js +2 -1
  142. package/esm/input/input.d.ts.map +1 -1
  143. package/esm/input/input.js +1 -0
  144. package/esm/input/input.type.d.ts +11 -5
  145. package/esm/input/input.type.d.ts.map +1 -1
  146. package/esm/input/simple-input.d.ts.map +1 -1
  147. package/esm/input/simple-input.js +32 -6
  148. package/esm/input/use-input-common.d.ts.map +1 -1
  149. package/esm/input/use-input-common.js +42 -19
  150. package/esm/modal/modal-content.d.ts.map +1 -1
  151. package/esm/modal/modal-content.js +31 -17
  152. package/esm/select/result-more.d.ts.map +1 -1
  153. package/esm/select/result-more.js +21 -50
  154. package/esm/select/result-more.type.d.ts +0 -1
  155. package/esm/select/result-more.type.d.ts.map +1 -1
  156. package/esm/select/result.d.ts.map +1 -1
  157. package/esm/select/result.js +24 -8
  158. package/esm/select/result.type.d.ts +1 -0
  159. package/esm/select/result.type.d.ts.map +1 -1
  160. package/esm/select/select.d.ts.map +1 -1
  161. package/esm/select/select.js +8 -1
  162. package/esm/select/select.type.d.ts +8 -0
  163. package/esm/select/select.type.d.ts.map +1 -1
  164. package/esm/table/table.d.ts.map +1 -1
  165. package/esm/table/table.js +11 -15
  166. package/esm/table/table.type.d.ts +7 -0
  167. package/esm/table/table.type.d.ts.map +1 -1
  168. package/esm/table/td.d.ts.map +1 -1
  169. package/esm/table/td.js +4 -20
  170. package/esm/table/thead.d.ts.map +1 -1
  171. package/esm/table/thead.js +17 -1
  172. package/esm/table/thead.type.d.ts +1 -1
  173. package/esm/table/thead.type.d.ts.map +1 -1
  174. package/esm/textarea/textarea.d.ts.map +1 -1
  175. package/esm/textarea/textarea.js +2 -1
  176. package/esm/tooltip/tooltip.type.d.ts +0 -6
  177. package/esm/tooltip/tooltip.type.d.ts.map +1 -1
  178. package/esm/transfer/transfer-list-item.d.ts.map +1 -1
  179. package/esm/transfer/transfer-list-item.js +16 -5
  180. package/esm/transfer/transfer-list-item.type.d.ts +2 -1
  181. package/esm/transfer/transfer-list-item.type.d.ts.map +1 -1
  182. package/esm/transfer/transfer-list.js +1 -1
  183. package/esm/transfer/transfer.d.ts.map +1 -1
  184. package/esm/transfer/transfer.js +13 -6
  185. package/esm/transfer/transfer.type.d.ts +8 -1
  186. package/esm/transfer/transfer.type.d.ts.map +1 -1
  187. package/esm/tree/tree-content.d.ts.map +1 -1
  188. package/esm/tree/tree-content.js +2 -0
  189. package/esm/tree/tree-content.type.d.ts +1 -0
  190. package/esm/tree/tree-content.type.d.ts.map +1 -1
  191. package/esm/tree/tree-simple-node.d.ts.map +1 -1
  192. package/esm/tree/tree-simple-node.js +3 -1
  193. package/esm/tree/tree-virtual-node.d.ts.map +1 -1
  194. package/esm/tree/tree-virtual-node.js +13 -1
  195. package/esm/tree/tree-virtual.d.ts.map +1 -1
  196. package/esm/tree/tree-virtual.js +7 -1
  197. package/esm/tree-select/tree-select.d.ts.map +1 -1
  198. package/esm/tree-select/tree-select.js +19 -4
  199. package/esm/tree-select/tree-select.type.d.ts +1 -0
  200. package/esm/tree-select/tree-select.type.d.ts.map +1 -1
  201. package/esm/upload/button.d.ts.map +1 -1
  202. package/esm/upload/button.js +0 -1
  203. package/esm/upload/button.type.d.ts +1 -1
  204. package/esm/upload/button.type.d.ts.map +1 -1
  205. package/package.json +2 -2
@@ -15,8 +15,8 @@ export declare const Input: (props: {
15
15
  updateValue?: React.Dispatch<React.SetStateAction<string>> | undefined;
16
16
  } | undefined> | undefined;
17
17
  onPaste?: ((e: React.ClipboardEvent) => void) | undefined;
18
- onFocus?: ((e: React.FocusEvent) => void) | undefined;
19
- onBlur?: ((e: React.FocusEvent) => void) | undefined;
18
+ onFocus?: ((e: React.FocusEvent<HTMLInputElement>) => void) | undefined;
19
+ onBlur?: ((e: React.FocusEvent<HTMLInputElement>) => void) | undefined;
20
20
  onClick?: ((e?: React.MouseEvent) => void) | undefined;
21
21
  readOnly?: boolean | undefined;
22
22
  }) => import("react/jsx-runtime").JSX.Element;
@@ -33,8 +33,8 @@ interface ResultProps extends Pick<DatePickerProps<string>, 'jssStyle' | 'type'
33
33
  inputRef: HTMLInputElement | null;
34
34
  inputRefs: (HTMLInputElement | null)[];
35
35
  }>;
36
- onFocus?: (e: React.FocusEvent) => void;
37
- onBlur?: (e: React.FocusEvent) => void;
36
+ onFocus?: (e: React.FocusEvent<HTMLInputElement>) => void;
37
+ onBlur?: (e: React.FocusEvent<HTMLInputElement>, index?: number) => void;
38
38
  onClick?: (e?: React.MouseEvent) => void;
39
39
  }
40
40
  declare const Result: (props: ResultProps) => import("react/jsx-runtime").JSX.Element;
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,eAAO,MAAM,KAAK;;WAET,MAAM;;;;kBAIC,MAAM,KAAK,IAAI;mBACf,gBAAgB,KAAK,IAAI;uBACrB,gBAAgB,KAAK,IAAI;;;;;;mBAS7B,oBAAoB,KAAK,IAAI;mBAC7B,gBAAgB,KAAK,IAAI;kBAC1B,gBAAgB,KAAK,IAAI;oBACvB,gBAAgB,KAAK,IAAI;;6CA2CzC,CAAC;AACF,UAAU,WACR,SAAQ,IAAI,CACV,eAAe,CAAC,MAAM,CAAC,EACvB,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAC5D;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC5B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC,SAAS,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC;KACxC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CAC1C;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,4CA6JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAkD,MAAM,OAAO,CAAC;AAIvE,eAAO,MAAM,KAAK;;WAET,MAAM;;;;kBAIC,MAAM,KAAK,IAAI;mBACf,gBAAgB,KAAK,IAAI;uBACrB,gBAAgB,KAAK,IAAI;;;;;;mBAS7B,oBAAoB,KAAK,IAAI;mBAC7B,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,IAAI;kBAC5C,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,IAAI;oBACzC,gBAAgB,KAAK,IAAI;;6CA2CzC,CAAC;AACF,UAAU,WACR,SAAQ,IAAI,CACV,eAAe,CAAC,MAAM,CAAC,EACvB,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAC5D;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC;QAC5B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC,SAAS,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC;KACxC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC1D,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;CAC1C;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,4CA6JjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -156,7 +156,7 @@ var Result = function Result(props) {
156
156
  var _props$onBlur, _inputRef$current$upd, _inputRef$current;
157
157
  e.stopPropagation();
158
158
  if (e.relatedTarget === context.inputRefs[1 - info.index]) return;
159
- (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
159
+ (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e, info.index);
160
160
  if (inputRef.current) (_inputRef$current$upd = (_inputRef$current = inputRef.current).updateValue) === null || _inputRef$current$upd === void 0 || _inputRef$current$upd.call(_inputRef$current);
161
161
  context.clickIndex = 0;
162
162
  },
@@ -1 +1 @@
1
- {"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["Item.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAE5D,OAAO,EAAgB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAuB1D,cAAM,IAAK,SAAQ,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;IAC/C,MAAM,CAAC,YAAY;;;MAAgB;gBAEvB,KAAK,EAAE,SAAS;IAK5B,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU;IAY/B,MAAM;CAyCP;AAED,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["Item.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAE5D,OAAO,EAAgB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAuB1D,cAAM,IAAK,SAAQ,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;IAC/C,MAAM,CAAC,YAAY;;;MAAgB;gBAEvB,KAAK,EAAE,SAAS;IAK5B,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU;IAY/B,MAAM;CA6CP;AAED,eAAe,IAAI,CAAC"}
@@ -83,7 +83,9 @@ var Item = /*#__PURE__*/function (_React$PureComponent) {
83
83
  contentPropsClassName = _ref2$className === void 0 ? '' : _ref2$className,
84
84
  contentPropsOnClick = _ref2.onClick,
85
85
  otherContentProps = _objectWithoutProperties(_ref2, _excluded2);
86
- var className = classNames(propsClassName, contentPropsClassName);
86
+ var className = classNames(
87
+ // 如果content是Tooltip,则不传递className(就是dropdown-item的className)
88
+ content.type.displayName !== 'ShineoutTooltip' ? propsClassName : '', contentPropsClassName);
87
89
  return /*#__PURE__*/cloneElement(content, Object.assign(otherProps, otherContentProps, {
88
90
  className: className,
89
91
  onClick: function onClick(e) {
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { UseFormFlowProps, FormDatum } from '@sheinx/hooks';
2
+ import { UseFormFlowProps, FormDatum as UiFormDatum } from '@sheinx/hooks';
3
3
  /**
4
4
  * @title FormFlow
5
5
  */
@@ -23,4 +23,8 @@ export interface FormFlowProps extends UseFormFlowProps {
23
23
  */
24
24
  strict?: boolean;
25
25
  }
26
+ /**
27
+ * @title FormDatum
28
+ */
29
+ export type FormDatum = UiFormDatum;
26
30
  //# sourceMappingURL=form-flow.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"form-flow.type.d.ts","sourceRoot":"","sources":["form-flow.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACrD;;;;OAIG;IACH,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;IACrE;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
1
+ {"version":3,"file":"form-flow.type.d.ts","sourceRoot":"","sources":["form-flow.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAE3E;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACrD;;;;OAIG;IACH,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC;IACrE;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"form-item.d.ts","sourceRoot":"","sources":["form-item.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAmB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEvE,QAAA,MAAM,QAAQ,UAAW,aAAa,4CA6GrC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"form-item.d.ts","sourceRoot":"","sources":["form-item.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAmB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEvE,QAAA,MAAM,QAAQ,UAAW,aAAa,4CA8GrC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -90,7 +90,7 @@ var FormItem = function FormItem(props) {
90
90
  });
91
91
  };
92
92
  return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({
93
- className: classNames(className, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapper, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelTop, labelAlign === 'top'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalMiddle, labelAlign !== 'top' && labelVerticalAlign === 'middle'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalBottom, labelAlign !== 'top' && labelVerticalAlign === 'bottom'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperInline, inline), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperKeepHeight, keepErrorHeight), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperRequired, required), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperTip, showError || tip))
93
+ className: classNames(className, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapper, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelTop, labelAlign === 'top'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalMiddle, labelAlign !== 'top' && labelVerticalAlign === 'middle'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalBottom, labelAlign !== 'top' && labelVerticalAlign === 'bottom'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperInline, inline), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperKeepHeight, keepErrorHeight), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperRequired, required), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperHideRequired, required === false), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperTip, showError || tip))
94
94
  }, attributes), {}, {
95
95
  style: style,
96
96
  children: [label !== undefined ? /*#__PURE__*/_jsx("div", {
@@ -11,6 +11,7 @@ export interface FormItemClasses {
11
11
  wrapperLabelVerticalBottom: string;
12
12
  wrapperKeepHeight: string;
13
13
  wrapperRequired: string;
14
+ wrapperHideRequired: string;
14
15
  wrapperTip: string;
15
16
  label: string;
16
17
  labelWithColon: string;
@@ -1 +1 @@
1
- {"version":3,"file":"form-item.type.d.ts","sourceRoot":"","sources":["form-item.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,0BAA0B,EAAE,MAAM,CAAC;IACnC,0BAA0B,EAAE,MAAM,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,UAAU,CAAC,GAAG;IAC3D,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;CACvB,CAAA;AACD,UAAU,WAAW;IACnB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC;CAC1C;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IAC7F;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,WAAW,CAAC;IACtC;;;OAGG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,QAAQ,CAAC,EAAE,MAAM,eAAe,CAAC;KAClC,CAAC;CACH"}
1
+ {"version":3,"file":"form-item.type.d.ts","sourceRoot":"","sources":["form-item.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,0BAA0B,EAAE,MAAM,CAAC;IACnC,0BAA0B,EAAE,MAAM,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,UAAU,CAAC,GAAG;IAC3D,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;CACvB,CAAA;AACD,UAAU,WAAW;IACnB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC;CAC1C;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IAC7F;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,WAAW,CAAC;IACtC;;;OAGG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,QAAQ,CAAC,EAAE,MAAM,eAAe,CAAC;KAClC,CAAC;CACH"}
@@ -8,5 +8,5 @@ export type { FormProps, FormRef, FormClasses } from './form.type';
8
8
  export type { FormItemProps, FormItemClasses } from './form-item.type';
9
9
  export type { FormFieldProps, FormFieldChildrenFunc } from './form-field.type';
10
10
  export type { FormFieldSetProps, FormFieldSetChildrenFunc } from './form-fieldset.type';
11
- export type { FormFlowProps } from './form-flow.type';
11
+ export type { FormFlowProps, FormDatum } from './form-flow.type';
12
12
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAElD,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACnE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACxF,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAElD,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACnE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACxF,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"input-password.d.ts","sourceRoot":"","sources":["input-password.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;;AAmD3D,wBAAoC"}
1
+ {"version":3,"file":"input-password.d.ts","sourceRoot":"","sources":["input-password.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;;AAoD3D,wBAAoC"}
@@ -45,7 +45,8 @@ var Password = function Password(props) {
45
45
  return /*#__PURE__*/_jsx(SimpleInput, _objectSpread(_objectSpread(_objectSpread({}, forwardProps), inputProps), {}, {
46
46
  className: props.className,
47
47
  suffix: suffix,
48
- hasSuffix: true
48
+ hasSuffix: true,
49
+ showClear: props.showClear
49
50
  }));
50
51
  };
51
52
  export default /*#__PURE__*/React.memo(Password);
@@ -1 +1 @@
1
- {"version":3,"file":"input.d.ts","sourceRoot":"","sources":["input.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAC;;AA4C1B,wBAAiC"}
1
+ {"version":3,"file":"input.d.ts","sourceRoot":"","sources":["input.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAC;;AA6C1B,wBAAiC"}
@@ -33,6 +33,7 @@ var Input = function Input(props) {
33
33
  return /*#__PURE__*/_jsx(SimpleInputInput, _objectSpread(_objectSpread(_objectSpread({}, forwardProps), inputFormatProps), {}, {
34
34
  value: (_inputFormatProps$val = inputFormatProps.value) !== null && _inputFormatProps$val !== void 0 ? _inputFormatProps$val : '',
35
35
  hasSuffix: !!props.suffix,
36
+ showClear: props.showClear,
36
37
  onKeyDown: function onKeyDown(e) {
37
38
  var _props$onKeyDown;
38
39
  if (e.key === 'Enter' && !e.defaultPrevented) {
@@ -4,6 +4,7 @@ import { InnerTitleClasses } from '../common/use-inner-title';
4
4
  import { BaseTipProps } from '../common/use-tip';
5
5
  import { BaseInputProps, InputFormatProps } from '@sheinx/hooks';
6
6
  import { PopoverClasses } from '../popover/popover.type';
7
+ import { TextareaInfoOption } from '../textarea/textarea.type';
7
8
  export interface InputClasses {
8
9
  rootClass: string;
9
10
  /**
@@ -35,7 +36,6 @@ export interface InputClasses {
35
36
  wrapperUnderline: string;
36
37
  wrapperNoBorder: string;
37
38
  info: string;
38
- infoError: string;
39
39
  group: string;
40
40
  groupSeparate: string;
41
41
  groupSmall: string;
@@ -47,6 +47,8 @@ export interface InputClasses {
47
47
  numberStep: string;
48
48
  passwordToggle: string;
49
49
  password: string;
50
+ wrapperShowClear: string;
51
+ wrapperHasValue: string;
50
52
  }
51
53
  export interface InputStyle {
52
54
  input?: () => InputClasses;
@@ -89,14 +91,17 @@ export interface SimpleInputProps extends BaseInputProps, Pick<CommonType, 'stat
89
91
  */
90
92
  onEnterPress?: (value: string, e: React.KeyboardEvent) => void;
91
93
  /**
92
- * @en Whether to show clear
93
- * @cn 是否显示清除
94
+ * @en Whether to show clear button when has value, higher priority than clearable
95
+ * @cn 有值时,是否常驻显示清除按钮,优先级高于 clearable
96
+ * @version 3.8.0
94
97
  */
95
98
  showClear?: boolean;
96
99
  renderInput?: (inputEl: React.ReactElement) => React.ReactElement;
97
100
  hasSuffix?: boolean;
98
101
  name?: string;
99
102
  }
103
+ type InputInfoOption = TextareaInfoOption;
104
+ export type InputInfo = number | ((value: string) => React.ReactNode | Error);
100
105
  export interface InputCommonProps<V> extends BaseTipProps, Pick<CommonType, 'className' | 'style' | 'name'> {
101
106
  suffix?: SimpleInputProps['suffix'];
102
107
  /**
@@ -174,7 +179,7 @@ export interface InputCommonProps<V> extends BaseTipProps, Pick<CommonType, 'cla
174
179
  * @cn 提示信息
175
180
  * @override number | ((value: string | undefined) => string)
176
181
  */
177
- info?: number | ((value: V | undefined) => string);
182
+ info?: InputInfo | InputInfoOption;
178
183
  /**
179
184
  * @en Disable component
180
185
  * @cn 禁用组件
@@ -193,7 +198,8 @@ export interface InputCommonProps<V> extends BaseTipProps, Pick<CommonType, 'cla
193
198
  onBlur?: React.FocusEventHandler<HTMLInputElement>;
194
199
  status?: CommonType['status'];
195
200
  }
196
- export type GetCommonProps<Props, V> = Omit<Props, 'value' | 'onChange' | 'defaultValue' | 'clearable' | 'onClear' | 'name' | 'step' | 'min' | 'max' | 'rootRef' | 'inputRef' | 'getStatus' | 'renderInput' | 'addEnd' | 'hasSuffix' | 'onFocusedChange' | 'showClear'> & InputCommonProps<V>;
201
+ export type GetCommonProps<Props, V> = Omit<Props, 'value' | 'onChange' | 'defaultValue' | 'clearable' | 'onClear' | 'name' | 'step' | 'min' | 'max' | 'rootRef' | 'inputRef' | 'getStatus' | 'renderInput' | 'addEnd' | 'hasSuffix' | 'onFocusedChange'> & InputCommonProps<V>;
197
202
  export interface InputProps extends GetCommonProps<SimpleInputProps, string | undefined>, Omit<InputFormatProps, 'value' | 'onChange' | 'cancelBlurChange'> {
198
203
  }
204
+ export {};
199
205
  //# sourceMappingURL=input.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"input.type.d.ts","sourceRoot":"","sources":["input.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"input.type.d.ts","sourceRoot":"","sources":["input.type.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"simple-input.d.ts","sourceRoot":"","sources":["simple-input.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,KAAK;YAAW,gBAAgB;;CAgGrC,CAAC;AAGF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"simple-input.d.ts","sourceRoot":"","sources":["simple-input.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,KAAK;YAAW,gBAAgB;;CA0HrC,CAAC;AAGF,eAAe,KAAK,CAAC"}
@@ -9,14 +9,14 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
9
9
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
10
10
  import { useInput, useKeyEvent, usePersistFn, util } from '@sheinx/hooks';
11
11
  import classNames from 'classnames';
12
- import React, { useContext } from 'react';
12
+ import React, { useContext, useRef } from 'react';
13
13
  import Icons from "../icons";
14
14
  import { useConfig } from "../config";
15
15
  import { FormFieldContext } from "../form/form-field-context";
16
16
  import { jsx as _jsx } from "react/jsx-runtime";
17
17
  import { jsxs as _jsxs } from "react/jsx-runtime";
18
18
  var Input = function Input(props) {
19
- var _jssStyle$input;
19
+ var _jssStyle$input, _inputElProps$value;
20
20
  var jssStyle = props.jssStyle,
21
21
  className = props.className,
22
22
  style = props.style,
@@ -34,20 +34,41 @@ var Input = function Input(props) {
34
34
  addEnd = props.addEnd,
35
35
  hasSuffix = props.hasSuffix,
36
36
  rest = _objectWithoutProperties(props, _excluded);
37
+ var _useRef = useRef({
38
+ needTriggerEnter: false
39
+ }),
40
+ context = _useRef.current;
37
41
  var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
38
42
  var config = useConfig();
39
43
  var _useContext = useContext(FormFieldContext),
40
44
  fieldId = _useContext.fieldId;
45
+ var showClearFromProp = props.showClear && !props.disabled;
41
46
  var _useInput = useInput(_objectSpread(_objectSpread({}, rest), {}, {
42
- onFocusedChange: onFocusedChange
47
+ onFocusedChange: onFocusedChange,
48
+ // 由于form的原生submit事件是在keydown中触发的,submit校验后触发scrollToError会导致当前焦点的input立即失焦,导致input的回车事件无法触发
49
+ // 所以这里在onKeyDown时机记录下needTriggerEnter标志,在onBlur时机判断是否需要触发onEnterPress
50
+ onKeyDown: function onKeyDown(e) {
51
+ var _props$onKeyDown;
52
+ if (e.key === 'Enter') {
53
+ context.needTriggerEnter = true;
54
+ }
55
+ (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
56
+ },
57
+ onBlur: function onBlur(e) {
58
+ var _props$onBlur;
59
+ if (context.needTriggerEnter) {
60
+ context.needTriggerEnter = false;
61
+ _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
62
+ }
63
+ (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
64
+ }
43
65
  })),
44
66
  getRootProps = _useInput.getRootProps,
45
67
  getClearProps = _useInput.getClearProps,
46
68
  getInputProps = _useInput.getInputProps,
47
- showClear = _useInput.showClear,
69
+ showClearFromClearable = _useInput.showClear,
48
70
  focused = _useInput.focused,
49
71
  disabled = _useInput.disabled;
50
- var rootClass = classNames(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.rootClass, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapper, !!focused && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperFocus), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperDisabled), status === 'error' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperError), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperLarge), !!underline && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperUnderline), !border && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperNoBorder), hasSuffix && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.password));
51
72
  var keyHandler = useKeyEvent({
52
73
  onEnterPress: function onEnterPress(e) {
53
74
  _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
@@ -55,6 +76,10 @@ var Input = function Input(props) {
55
76
  });
56
77
  var onKeyUp = usePersistFn(function (e) {
57
78
  var _props$onKeyUp;
79
+ if (e.key === 'Enter') {
80
+ context.needTriggerEnter = false;
81
+ }
82
+ ;
58
83
  (_props$onKeyUp = props.onKeyUp) === null || _props$onKeyUp === void 0 || _props$onKeyUp.call(props, e);
59
84
  keyHandler(e);
60
85
  });
@@ -71,6 +96,7 @@ var Input = function Input(props) {
71
96
  if (typeof renderInput === 'function') {
72
97
  inputEl = renderInput(inputEl);
73
98
  }
99
+ var rootClass = classNames(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.rootClass, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapper, !!focused && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperFocus), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperDisabled), status === 'error' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperError), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperLarge), !!underline && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperUnderline), !border && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperNoBorder), hasSuffix && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.password), showClearFromProp && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperShowClear), showClearFromProp && ((_inputElProps$value = inputElProps.value) === null || _inputElProps$value === void 0 ? void 0 : _inputElProps$value.length) > 0 && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperHasValue));
74
100
  return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread(_objectSpread({
75
101
  id: fieldId
76
102
  }, util.getDataAttribute(_defineProperty({}, 'input-border', 'true'))), getRootProps({
@@ -79,7 +105,7 @@ var Input = function Input(props) {
79
105
  })), {}, {
80
106
  children: [/*#__PURE__*/_jsxs("div", {
81
107
  className: classNames(inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitleTop, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitleBottom, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperPaddingBox, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.content),
82
- children: [prefix, inputEl, showClear && /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({
108
+ children: [prefix, inputEl, (showClearFromProp || showClearFromClearable) && /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({
83
109
  className: inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.clearWrapper
84
110
  }, getClearProps()), {}, {
85
111
  children: /*#__PURE__*/_jsx("span", {
@@ -1 +1 @@
1
- {"version":3,"file":"use-input-common.d.ts","sourceRoot":"","sources":["use-input-common.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAWhD,QAAA,MAAM,cAAc;;;;;;;;;;gCA6G8B,OAAO;;;;;;;gBAQnB,gBAAgB,CAAC,gBAAgB,CAAC;CAsBvE,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"use-input-common.d.ts","sourceRoot":"","sources":["use-input-common.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAWhD,QAAA,MAAM,cAAc;;;;;;;;;;gCAkI8B,OAAO;;;;;;;gBAQnB,gBAAgB,CAAC,gBAAgB,CAAC;CAsBvE,CAAC;AAEF,eAAe,cAAc,CAAC"}
@@ -1,5 +1,5 @@
1
- function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
1
  var _excluded = ["forwardRef", "forwardedRef", "htmlName", "value", "onChange", "defaultValue", "beforeChange", "clearable", "clearToUndefined", "style", "suffix", "info", "innerTitle", "placeTitle", "width", "delay", "onBlur", "tip", "error", "popover", "popoverProps", "status", "disabled", "size"];
2
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
3
3
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
4
4
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
5
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -30,7 +30,7 @@ var defaultInfo = function defaultInfo(num, msg) {
30
30
  return new Error(text);
31
31
  };
32
32
  var useInputCommon = function useInputCommon(props0) {
33
- var _ref, _props$jssStyle, _props$jssStyle$input;
33
+ var _ref, _props$jssStyle, _props$jssStyle$input, _infoState$error;
34
34
  var config = useConfig();
35
35
  var props = useWithFormConfig(props0);
36
36
  var forwardRef = props.forwardRef,
@@ -59,7 +59,7 @@ var useInputCommon = function useInputCommon(props0) {
59
59
  size = props.size,
60
60
  rest = _objectWithoutProperties(props, _excluded);
61
61
  var delay = (_ref = delayProps !== null && delayProps !== void 0 ? delayProps : config.delay) !== null && _ref !== void 0 ? _ref : 0;
62
- var inputStyle = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$input = _props$jssStyle.input) === null || _props$jssStyle$input === void 0 ? void 0 : _props$jssStyle$input.call(_props$jssStyle);
62
+ var inputClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$input = _props$jssStyle.input) === null || _props$jssStyle$input === void 0 ? void 0 : _props$jssStyle$input.call(_props$jssStyle);
63
63
  var rootRef = React.useRef(null);
64
64
  var _React$useState = React.useState(false),
65
65
  _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -101,27 +101,50 @@ var useInputCommon = function useInputCommon(props0) {
101
101
  value: inputAbleProps.value,
102
102
  onChange: inputAbleProps.onChange
103
103
  });
104
- var getInfo = function getInfo() {
104
+ var getInfoState = function getInfoState() {
105
105
  var notNumber = typeof info !== 'number';
106
- if (typeof info !== 'function' && notNumber) return null;
107
- var textInfo = notNumber ? info : defaultInfo.bind(null, info);
108
- var res = textInfo(inputAbleProps.value);
109
- // empty
110
- if (!res) return null;
111
- var isError = res instanceof Error;
112
- var text = isError ? res.message : res;
106
+ if (typeof info !== 'function' && _typeof(info) !== 'object' && notNumber) return null;
107
+ var infoContent;
108
+ if (_typeof(info) === 'object') {
109
+ infoContent = info.content;
110
+ } else {
111
+ infoContent = info;
112
+ }
113
+ var notContentNumber = typeof infoContent !== 'number';
114
+ var textInfo = notContentNumber ? infoContent : defaultInfo.bind(null, infoContent);
115
+ var error = textInfo(inputAbleProps.value);
116
+ if (!error) return null;
117
+ var isError = error instanceof Error;
118
+ var text = isError ? error.message : error;
113
119
  if (!isError && !focused) return null;
114
- return /*#__PURE__*/_jsx("div", {
120
+ return {
121
+ text: text,
122
+ error: error
123
+ };
124
+ };
125
+ var infoState = useMemo(getInfoState, [info, inputAbleProps.value, focused]);
126
+ var infoPopoverProps = {
127
+ popover: props.popover || (_typeof(info) === 'object' ? info.position : 'bottom-right'),
128
+ popoverProps: Object.assign({
115
129
  style: {
116
- minWidth: 'auto'
130
+ width: 'auto',
131
+ fontSize: 12
117
132
  },
118
- className: classNames(inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.info, !!isError && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.infoError)),
119
- dir: config.direction,
120
- children: text
121
- }, 'info');
133
+ adjust: true
134
+ }, props.popoverProps),
135
+ error: infoState !== null && infoState !== void 0 && infoState.error && (infoState === null || infoState === void 0 ? void 0 : infoState.error) instanceof Error ? infoState === null || infoState === void 0 || (_infoState$error = infoState.error) === null || _infoState$error === void 0 ? void 0 : _infoState$error.message : undefined,
136
+ tip: /*#__PURE__*/_jsx("div", {
137
+ className: inputClasses === null || inputClasses === void 0 ? void 0 : inputClasses.info,
138
+ children: infoState === null || infoState === void 0 ? void 0 : infoState.text
139
+ })
122
140
  };
141
+ var infoPopoverNode = useTip(_objectSpread(_objectSpread({}, infoPopoverProps), {}, {
142
+ focused: focused,
143
+ rootRef: rootRef,
144
+ jssStyle: props.jssStyle
145
+ }));
123
146
  var mergeSuffix = /*#__PURE__*/_jsxs(React.Fragment, {
124
- children: [suffix, getInfo(), tipNode]
147
+ children: [suffix, (infoState === null || infoState === void 0 ? void 0 : infoState.text) && infoPopoverNode, tipNode]
125
148
  });
126
149
  var onFocusedChange = usePersistFn(function (focused) {
127
150
  setFocused(!!focused);
@@ -137,7 +160,7 @@ var useInputCommon = function useInputCommon(props0) {
137
160
  });
138
161
  return _objectSpread(_objectSpread(_objectSpread({}, rest), {}, {
139
162
  value: inputAbleProps.value,
140
- className: classNames(props.className, innerTitle && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitle)),
163
+ className: classNames(props.className, innerTitle && (inputClasses === null || inputClasses === void 0 ? void 0 : inputClasses.wrapperInnerTitle)),
141
164
  onChange: inputAbleProps.onChange,
142
165
  onBlur: handleBlur
143
166
  }, clearProps), {}, {
@@ -1 +1 @@
1
- {"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAoB9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDAiWtC,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAoB9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDA8WtC,CAAC;AAEF,eAAe,KAAK,CAAC"}
@@ -62,7 +62,11 @@ var Modal = function Modal(props) {
62
62
  isMask: false,
63
63
  mouseDownTarget: null,
64
64
  mouseUpTarget: null,
65
- content: null
65
+ content: null,
66
+ originDocumentStyle: {
67
+ overflow: '',
68
+ paddingRight: ''
69
+ }
66
70
  }),
67
71
  context = _useRef.current;
68
72
  var _useState3 = useState(props.visible || props.autoShow),
@@ -162,18 +166,33 @@ var Modal = function Modal(props) {
162
166
  setAnimation(true);
163
167
  }
164
168
  }, [props.visible]);
169
+
170
+ // 设置 document.body.style.overflow 和 document.body.style.paddingRight,并记录原始值到 context 中
171
+ var setDocumentOverflow = usePersistFn(function () {
172
+ var doc = document.body.parentNode;
173
+ if (context.isMask) {
174
+ context.originDocumentStyle.overflow = doc.style.overflow;
175
+ context.originDocumentStyle.paddingRight = doc.style.paddingRight;
176
+ }
177
+ doc.style.overflow = 'hidden';
178
+ if (!doc.style.paddingRight) {
179
+ doc.style.paddingRight = "".concat(window.innerWidth - util.docSize.width, "px");
180
+ }
181
+ });
182
+
183
+ // 还原 document.body.style.overflow 和 document.body.style.paddingRight
184
+ var resetDocumentOverflow = usePersistFn(function () {
185
+ var doc = document.body.parentNode;
186
+ doc.style.overflow = context.originDocumentStyle.overflow;
187
+ doc.style.paddingRight = context.originDocumentStyle.paddingRight;
188
+ });
165
189
  useEffect(function () {
166
190
  if (!props.hideMask) {
167
- var doc = document.body.parentNode;
168
191
  if (visible) {
169
- doc.style.overflow = 'hidden';
170
- if (!doc.style.paddingRight) {
171
- doc.style.paddingRight = "".concat(window.innerWidth - util.docSize.width, "px");
172
- }
192
+ setDocumentOverflow();
173
193
  } else {
174
194
  if (!context.isMask) return;
175
- doc.style.paddingRight = '';
176
- doc.style.overflow = '';
195
+ resetDocumentOverflow();
177
196
  }
178
197
  }
179
198
  }, [visible]);
@@ -187,20 +206,15 @@ var Modal = function Modal(props) {
187
206
  // unmount
188
207
  return function () {
189
208
  var _props$shouldDestroy2;
209
+ if (context.isMask) {
210
+ resetDocumentOverflow();
211
+ }
212
+ ;
190
213
  (_props$shouldDestroy2 = props.shouldDestroy) === null || _props$shouldDestroy2 === void 0 || _props$shouldDestroy2.call(props, true);
191
- // if (props.autoShow) {
192
- // props.onClose?.();
193
- // }
194
214
  if (context.isMask) {
195
215
  context.isMask = false;
196
216
  hasMask = false;
197
217
  }
198
- {
199
- if (!context.isMask) return;
200
- var doc = document.body.parentNode;
201
- doc.style.paddingRight = '';
202
- doc.style.overflow = '';
203
- }
204
218
  };
205
219
  }, []);
206
220
  useEffect(function () {
@@ -1 +1 @@
1
- {"version":3,"file":"result-more.d.ts","sourceRoot":"","sources":["result-more.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKrD,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,WAAW,EACtB,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,UA6D9B;;AAsHD,wBAAyC"}
1
+ {"version":3,"file":"result-more.d.ts","sourceRoot":"","sources":["result-more.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKrD,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,WAAW,EACtB,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,UA4C9B;;AA0GD,wBAAyC"}