@oceanbase/design 1.0.0-alpha.1 → 1.0.0-alpha.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 (478) hide show
  1. package/dist/design.min.css +1 -1
  2. package/dist/design.min.js +1 -1
  3. package/dist/reset.css +2 -1
  4. package/dist/static/Inter-Medium.ea234620.woff2 +0 -0
  5. package/dist/static/Inter-Regular.34ba43c9.woff2 +0 -0
  6. package/dist/static/Inter-SemiBold.95439fb4.woff2 +0 -0
  7. package/es/_util/genComponentStyleHook.d.ts +21 -4
  8. package/es/_util/genComponentStyleHook.js +68 -20
  9. package/es/_util/index.js +1 -0
  10. package/es/_util/styleChecker.js +1 -0
  11. package/es/affix/index.js +1 -0
  12. package/es/alert/index.d.ts +2 -2
  13. package/es/alert/index.js +25 -6
  14. package/es/alert/style/index.d.ts +2 -5
  15. package/es/alert/style/index.js +166 -67
  16. package/es/anchor/index.js +1 -0
  17. package/es/app/index.d.ts +8 -0
  18. package/es/app/index.js +44 -1
  19. package/es/app/style/index.d.ts +6 -0
  20. package/es/app/style/index.js +9 -0
  21. package/es/auto-complete/index.js +1 -0
  22. package/es/avatar/index.js +1 -0
  23. package/es/badge/index.d.ts +2 -0
  24. package/es/badge/index.js +38 -14
  25. package/es/badge/style/index.d.ts +2 -5
  26. package/es/badge/style/index.js +15 -18
  27. package/es/breadcrumb/Breadcrumb.js +1 -0
  28. package/es/breadcrumb/index.js +1 -0
  29. package/es/button/index.js +11 -4
  30. package/es/button/style/index.d.ts +4 -5
  31. package/es/button/style/index.js +40 -7
  32. package/es/calendar/index.js +1 -0
  33. package/es/card/index.d.ts +11 -0
  34. package/es/card/index.js +153 -9
  35. package/es/card/style/index.d.ts +2 -5
  36. package/es/card/style/index.js +85 -18
  37. package/es/carousel/index.js +1 -0
  38. package/es/cascader/index.js +1 -0
  39. package/es/checkbox/index.js +10 -2
  40. package/es/checkbox/style/index.d.ts +2 -5
  41. package/es/checkbox/style/index.js +14 -11
  42. package/es/collapse/index.js +1 -0
  43. package/es/color-picker/index.js +1 -0
  44. package/es/config-provider/DefaultRenderEmpty.js +1 -0
  45. package/es/config-provider/context.d.ts +11 -0
  46. package/es/config-provider/context.js +2 -1
  47. package/es/config-provider/index.d.ts +4 -3
  48. package/es/config-provider/index.js +93 -40
  49. package/es/date-picker/index.js +1 -0
  50. package/es/descriptions/hooks/useItems.d.ts +4 -4
  51. package/es/descriptions/hooks/useItems.js +1 -0
  52. package/es/descriptions/index.d.ts +10 -0
  53. package/es/descriptions/index.js +63 -5
  54. package/es/descriptions/style/index.d.ts +3 -6
  55. package/es/descriptions/style/index.js +70 -10
  56. package/es/divider/index.js +1 -0
  57. package/es/drawer/index.js +11 -7
  58. package/es/drawer/style/index.d.ts +2 -5
  59. package/es/drawer/style/index.js +44 -17
  60. package/es/dropdown/dropdown-button.js +27 -6
  61. package/es/dropdown/index.js +1 -0
  62. package/es/dropdown/style/index.d.ts +6 -0
  63. package/es/{_util/genStyle.js → dropdown/style/index.js} +14 -11
  64. package/es/empty/colored.js +1 -0
  65. package/es/empty/database.js +1 -0
  66. package/es/empty/default.js +1 -0
  67. package/es/empty/guide.js +1 -0
  68. package/es/empty/index.js +5 -3
  69. package/es/empty/style/index.d.ts +2 -5
  70. package/es/empty/style/index.js +10 -10
  71. package/es/float-button/index.js +1 -0
  72. package/es/fonts/Inter-Medium.woff2 +0 -0
  73. package/es/fonts/Inter-Regular.woff2 +0 -0
  74. package/es/fonts/Inter-SemiBold.woff2 +0 -0
  75. package/es/form/FormItem.d.ts +1 -0
  76. package/es/form/FormItem.js +27 -11
  77. package/es/form/index.js +10 -2
  78. package/es/form/style/index.d.ts +2 -5
  79. package/es/form/style/index.js +19 -8
  80. package/es/grid/col.js +1 -0
  81. package/es/grid/index.js +1 -0
  82. package/es/grid/row.js +1 -0
  83. package/es/image/index.js +1 -0
  84. package/es/index.d.ts +4 -3
  85. package/es/index.js +2 -1
  86. package/es/input/Input.d.ts +2 -0
  87. package/es/input/Input.js +31 -7
  88. package/es/input/Password.js +25 -5
  89. package/es/input/Search.js +25 -5
  90. package/es/input/TextArea.js +25 -5
  91. package/es/input/index.js +1 -0
  92. package/es/input/style/index.d.ts +6 -0
  93. package/es/input/style/index.js +32 -0
  94. package/es/input-number/index.d.ts +2 -1
  95. package/es/input-number/index.js +19 -4
  96. package/es/input-number/style/index.d.ts +6 -0
  97. package/es/input-number/style/index.js +19 -0
  98. package/es/layout/index.js +1 -0
  99. package/es/list/index.js +1 -0
  100. package/es/locale/en-US.js +4 -1
  101. package/es/locale/index.d.ts +2 -0
  102. package/es/locale/index.js +1 -0
  103. package/es/locale/ja-JP.d.ts +3 -0
  104. package/es/locale/ja-JP.js +31 -0
  105. package/es/locale/zh-CN.js +4 -1
  106. package/es/locale/zh-TW.js +4 -1
  107. package/es/lottie/index.js +1 -0
  108. package/es/mentions/index.js +1 -0
  109. package/es/menu/index.js +1 -0
  110. package/es/message/index.js +1 -0
  111. package/es/modal/Modal.d.ts +1 -1
  112. package/es/modal/Modal.js +36 -12
  113. package/es/modal/Progress.js +1 -0
  114. package/es/modal/index.js +1 -0
  115. package/es/modal/style/index.d.ts +2 -5
  116. package/es/modal/style/index.js +71 -26
  117. package/es/notification/index.js +1 -0
  118. package/es/pagination/index.js +1 -0
  119. package/es/popconfirm/index.js +1 -0
  120. package/es/popover/index.js +1 -0
  121. package/es/progress/index.js +1 -0
  122. package/es/qrcode/index.js +1 -0
  123. package/es/radio/index.js +10 -2
  124. package/es/radio/style/index.d.ts +2 -5
  125. package/es/radio/style/index.js +16 -10
  126. package/es/rate/index.js +1 -0
  127. package/es/result/403.js +1 -0
  128. package/es/result/404.js +1 -0
  129. package/es/result/500.js +1 -0
  130. package/es/result/Error.js +1 -0
  131. package/es/result/Processing.js +1 -0
  132. package/es/result/Success.js +1 -0
  133. package/es/result/Warning.js +1 -0
  134. package/es/result/index.d.ts +2 -2
  135. package/es/result/index.js +15 -6
  136. package/es/result/style/index.d.ts +2 -5
  137. package/es/result/style/index.js +3 -6
  138. package/es/segmented/index.d.ts +1 -0
  139. package/es/segmented/index.js +25 -9
  140. package/es/segmented/style/index.d.ts +1 -4
  141. package/es/segmented/style/index.js +4 -6
  142. package/es/select/index.js +10 -2
  143. package/es/select/style/index.d.ts +2 -5
  144. package/es/select/style/index.js +6 -7
  145. package/es/skeleton/index.js +1 -0
  146. package/es/slider/index.js +10 -2
  147. package/es/slider/style/index.d.ts +2 -5
  148. package/es/slider/style/index.js +11 -11
  149. package/es/space/index.js +10 -2
  150. package/es/space/style/index.d.ts +2 -5
  151. package/es/space/style/index.js +3 -6
  152. package/es/spin/index.js +10 -2
  153. package/es/spin/style/index.d.ts +2 -5
  154. package/es/spin/style/index.js +27 -27
  155. package/es/static-function/index.js +14 -4
  156. package/es/statistic/index.js +1 -0
  157. package/es/steps/index.js +1 -0
  158. package/es/style/cssVariables.d.ts +25 -0
  159. package/es/style/cssVariables.js +49 -0
  160. package/es/style/cssVariablesMeta.d.ts +24 -0
  161. package/es/style/cssVariablesMeta.js +974 -0
  162. package/es/style/global.d.ts +8 -0
  163. package/es/style/global.js +122 -0
  164. package/es/style/reset.css +2 -1
  165. package/es/switch/index.js +10 -2
  166. package/es/switch/style/index.d.ts +2 -5
  167. package/es/switch/style/index.js +3 -6
  168. package/es/table/index.d.ts +1 -4
  169. package/es/table/index.js +12 -2
  170. package/es/table/style/index.d.ts +2 -5
  171. package/es/table/style/index.js +68 -40
  172. package/es/tabs/TabPane.js +1 -0
  173. package/es/tabs/hooks/useLegacyItems.js +1 -0
  174. package/es/tabs/index.js +10 -2
  175. package/es/tabs/style/index.d.ts +2 -5
  176. package/es/tabs/style/index.js +10 -10
  177. package/es/tag/index.d.ts +1 -0
  178. package/es/tag/index.js +18 -4
  179. package/es/tag/style/index.d.ts +3 -8
  180. package/es/tag/style/index.js +42 -35
  181. package/es/theme/compact.d.ts +1 -1
  182. package/es/theme/compact.js +2 -6
  183. package/es/theme/dark.d.ts +1 -48
  184. package/es/theme/default.d.ts +48 -2
  185. package/es/theme/default.js +324 -62
  186. package/es/theme/index.d.ts +20 -57
  187. package/es/theme/index.js +1 -0
  188. package/es/theme/interface.d.ts +137 -0
  189. package/es/theme/interface.js +4 -1
  190. package/es/theme/style/aliyun.less +42 -42
  191. package/es/theme/style/compact.less +166 -137
  192. package/es/theme/style/dark.less +59 -59
  193. package/es/theme/style/default.less +169 -140
  194. package/es/time-picker/index.js +1 -0
  195. package/es/timeline/index.js +1 -0
  196. package/es/tooltip/MouseTooltip.js +1 -0
  197. package/es/tooltip/ReactStickyMouseTooltip.js +1 -0
  198. package/es/tooltip/index.js +5 -4
  199. package/es/tooltip/style/index.d.ts +2 -5
  200. package/es/tooltip/style/index.js +10 -13
  201. package/es/tour/index.js +1 -0
  202. package/es/transfer/index.js +1 -0
  203. package/es/tree/index.js +1 -0
  204. package/es/tree-select/index.js +10 -2
  205. package/es/tree-select/style/index.d.ts +2 -5
  206. package/es/tree-select/style/index.js +3 -6
  207. package/es/typography/Link.js +10 -2
  208. package/es/typography/Paragraph.js +10 -2
  209. package/es/typography/Text.d.ts +1 -0
  210. package/es/typography/Text.js +13 -4
  211. package/es/typography/Title.js +10 -2
  212. package/es/typography/hooks/useClassName.d.ts +1 -1
  213. package/es/typography/hooks/useClassName.js +2 -2
  214. package/es/typography/index.d.ts +12 -1
  215. package/es/typography/index.js +3 -1
  216. package/es/typography/style/index.d.ts +2 -5
  217. package/es/typography/style/index.js +36 -28
  218. package/es/upload/index.js +1 -0
  219. package/es/watermark/index.js +1 -0
  220. package/lib/_util/genComponentStyleHook.d.ts +21 -4
  221. package/lib/_util/genComponentStyleHook.js +69 -57
  222. package/lib/_util/getEllipsisConfig.js +16 -39
  223. package/lib/_util/index.js +13 -29
  224. package/lib/_util/styleChecker.js +33 -53
  225. package/lib/_util/type.js +4 -16
  226. package/lib/_util/useFlexGapSupport.js +11 -36
  227. package/lib/affix/index.js +15 -21
  228. package/lib/alert/index.d.ts +2 -2
  229. package/lib/alert/index.js +68 -78
  230. package/lib/alert/style/index.d.ts +2 -5
  231. package/lib/alert/style/index.js +203 -105
  232. package/lib/anchor/index.js +26 -23
  233. package/lib/app/index.d.ts +8 -0
  234. package/lib/app/index.js +49 -21
  235. package/lib/app/style/index.d.ts +6 -0
  236. package/lib/app/style/index.js +18 -0
  237. package/lib/auto-complete/index.js +15 -21
  238. package/lib/avatar/index.js +26 -23
  239. package/lib/badge/index.d.ts +2 -0
  240. package/lib/badge/index.js +108 -101
  241. package/lib/badge/style/index.d.ts +2 -5
  242. package/lib/badge/style/index.js +28 -49
  243. package/lib/breadcrumb/Breadcrumb.js +15 -21
  244. package/lib/breadcrumb/index.js +31 -31
  245. package/lib/button/index.js +50 -59
  246. package/lib/button/style/index.d.ts +4 -5
  247. package/lib/button/style/index.js +52 -35
  248. package/lib/calendar/index.js +15 -21
  249. package/lib/card/Card.js +14 -21
  250. package/lib/card/index.d.ts +11 -0
  251. package/lib/card/index.js +247 -108
  252. package/lib/card/style/index.d.ts +2 -5
  253. package/lib/card/style/index.js +164 -64
  254. package/lib/carousel/index.js +15 -21
  255. package/lib/cascader/index.js +15 -21
  256. package/lib/checkbox/index.js +52 -68
  257. package/lib/checkbox/style/index.d.ts +2 -5
  258. package/lib/checkbox/style/index.js +25 -38
  259. package/lib/collapse/index.js +15 -21
  260. package/lib/color-picker/index.js +15 -21
  261. package/lib/color-picker/interface.js +14 -21
  262. package/lib/config-provider/DefaultRenderEmpty.js +34 -47
  263. package/lib/config-provider/SizeContext.js +14 -21
  264. package/lib/config-provider/context.d.ts +11 -0
  265. package/lib/config-provider/context.js +14 -21
  266. package/lib/config-provider/index.d.ts +4 -3
  267. package/lib/config-provider/index.js +204 -134
  268. package/lib/config-provider/navigate.js +4 -16
  269. package/lib/date-picker/index.js +15 -21
  270. package/lib/descriptions/Item.js +6 -24
  271. package/lib/descriptions/hooks/useItems.d.ts +4 -4
  272. package/lib/descriptions/hooks/useItems.js +50 -72
  273. package/lib/descriptions/index.d.ts +10 -0
  274. package/lib/descriptions/index.js +104 -74
  275. package/lib/descriptions/style/index.d.ts +3 -6
  276. package/lib/descriptions/style/index.js +142 -50
  277. package/lib/divider/index.js +15 -21
  278. package/lib/drawer/index.js +109 -117
  279. package/lib/drawer/style/index.d.ts +2 -5
  280. package/lib/drawer/style/index.js +67 -52
  281. package/lib/dropdown/dropdown-button.js +34 -38
  282. package/lib/dropdown/index.js +30 -46
  283. package/lib/dropdown/style/index.d.ts +6 -0
  284. package/lib/dropdown/style/index.js +27 -0
  285. package/lib/empty/colored.js +325 -355
  286. package/lib/empty/database.js +227 -250
  287. package/lib/empty/default.js +53 -53
  288. package/lib/empty/guide.js +147 -209
  289. package/lib/empty/index.js +77 -90
  290. package/lib/empty/style/index.d.ts +2 -5
  291. package/lib/empty/style/index.js +31 -47
  292. package/lib/float-button/index.js +15 -21
  293. package/lib/float-button/interface.js +14 -21
  294. package/lib/fonts/Inter-Medium.woff2 +0 -0
  295. package/lib/fonts/Inter-Regular.woff2 +0 -0
  296. package/lib/fonts/Inter-SemiBold.woff2 +0 -0
  297. package/lib/form/FormItem.d.ts +1 -0
  298. package/lib/form/FormItem.js +81 -76
  299. package/lib/form/index.js +58 -75
  300. package/lib/form/interface.js +14 -21
  301. package/lib/form/style/index.d.ts +2 -5
  302. package/lib/form/style/index.js +40 -38
  303. package/lib/grid/col.js +28 -44
  304. package/lib/grid/index.js +26 -44
  305. package/lib/grid/row.js +30 -44
  306. package/lib/image/index.js +15 -21
  307. package/lib/index.d.ts +4 -3
  308. package/lib/index.js +333 -152
  309. package/lib/input/Input.d.ts +2 -0
  310. package/lib/input/Input.js +63 -52
  311. package/lib/input/Password.js +59 -58
  312. package/lib/input/Search.js +55 -52
  313. package/lib/input/TextArea.js +59 -58
  314. package/lib/input/index.js +30 -49
  315. package/lib/input/style/index.d.ts +6 -0
  316. package/lib/input/style/index.js +57 -0
  317. package/lib/input-number/index.d.ts +2 -1
  318. package/lib/input-number/index.js +56 -60
  319. package/lib/input-number/style/index.d.ts +6 -0
  320. package/lib/input-number/style/index.js +29 -0
  321. package/lib/layout/index.js +15 -21
  322. package/lib/list/index.js +52 -58
  323. package/lib/locale/en-US.js +24 -48
  324. package/lib/locale/index.d.ts +2 -0
  325. package/lib/locale/index.js +25 -38
  326. package/lib/locale/ja-JP.d.ts +3 -0
  327. package/lib/locale/ja-JP.js +36 -0
  328. package/lib/locale/useLocale.js +6 -24
  329. package/lib/locale/zh-CN.js +24 -48
  330. package/lib/locale/zh-TW.js +24 -48
  331. package/lib/lottie/index.js +61 -79
  332. package/lib/mentions/index.js +15 -21
  333. package/lib/menu/index.js +15 -21
  334. package/lib/menu/interface.js +14 -21
  335. package/lib/message/index.js +15 -21
  336. package/lib/message/interface.js +14 -21
  337. package/lib/modal/Modal.d.ts +1 -1
  338. package/lib/modal/Modal.js +82 -69
  339. package/lib/modal/Progress.js +44 -57
  340. package/lib/modal/index.js +23 -42
  341. package/lib/modal/interface.js +14 -21
  342. package/lib/modal/style/index.d.ts +2 -5
  343. package/lib/modal/style/index.js +105 -60
  344. package/lib/notification/index.js +15 -21
  345. package/lib/notification/interface.js +14 -21
  346. package/lib/pagination/index.js +15 -21
  347. package/lib/popconfirm/index.js +15 -21
  348. package/lib/popover/index.js +15 -21
  349. package/lib/progress/index.js +26 -23
  350. package/lib/progress/progress.js +14 -21
  351. package/lib/qrcode/index.js +15 -21
  352. package/lib/qrcode/interface.js +14 -21
  353. package/lib/radio/index.js +53 -61
  354. package/lib/radio/interface.js +14 -21
  355. package/lib/radio/style/index.d.ts +2 -5
  356. package/lib/radio/style/index.js +32 -38
  357. package/lib/rate/index.js +15 -21
  358. package/lib/result/403.js +166 -162
  359. package/lib/result/404.js +302 -304
  360. package/lib/result/500.js +226 -291
  361. package/lib/result/Error.js +127 -133
  362. package/lib/result/Processing.js +348 -247
  363. package/lib/result/Success.js +208 -203
  364. package/lib/result/Warning.js +513 -549
  365. package/lib/result/index.d.ts +2 -2
  366. package/lib/result/index.js +65 -79
  367. package/lib/result/style/index.d.ts +2 -5
  368. package/lib/result/style/index.js +16 -39
  369. package/lib/segmented/index.d.ts +1 -0
  370. package/lib/segmented/index.js +86 -72
  371. package/lib/segmented/style/index.d.ts +1 -4
  372. package/lib/segmented/style/index.js +21 -40
  373. package/lib/select/index.js +63 -80
  374. package/lib/select/style/index.d.ts +2 -5
  375. package/lib/select/style/index.js +17 -37
  376. package/lib/skeleton/index.js +15 -21
  377. package/lib/slider/index.js +48 -57
  378. package/lib/slider/style/index.d.ts +2 -5
  379. package/lib/slider/style/index.js +23 -40
  380. package/lib/space/index.js +63 -68
  381. package/lib/space/style/index.d.ts +2 -5
  382. package/lib/space/style/index.js +17 -40
  383. package/lib/spin/index.js +58 -75
  384. package/lib/spin/style/index.d.ts +2 -5
  385. package/lib/spin/style/index.js +54 -60
  386. package/lib/static-function/index.js +49 -68
  387. package/lib/statistic/index.js +15 -21
  388. package/lib/steps/index.js +15 -21
  389. package/lib/style/cssVariables.d.ts +25 -0
  390. package/lib/style/cssVariables.js +242 -0
  391. package/lib/style/cssVariablesMeta.d.ts +24 -0
  392. package/lib/style/cssVariablesMeta.js +980 -0
  393. package/lib/style/global.d.ts +8 -0
  394. package/lib/style/global.js +140 -0
  395. package/lib/style/reset.css +2 -1
  396. package/lib/switch/index.js +52 -59
  397. package/lib/switch/style/index.d.ts +2 -5
  398. package/lib/switch/style/index.js +13 -36
  399. package/lib/table/hooks/useDefaultPagination.js +18 -46
  400. package/lib/table/index.d.ts +1 -4
  401. package/lib/table/index.js +178 -172
  402. package/lib/table/interface.js +14 -21
  403. package/lib/table/style/index.d.ts +2 -5
  404. package/lib/table/style/index.js +102 -80
  405. package/lib/tabs/TabPane.js +7 -24
  406. package/lib/tabs/hooks/useLegacyItems.js +27 -43
  407. package/lib/tabs/index.js +107 -119
  408. package/lib/tabs/style/index.d.ts +2 -5
  409. package/lib/tabs/style/index.js +32 -43
  410. package/lib/tag/index.d.ts +1 -0
  411. package/lib/tag/index.js +78 -88
  412. package/lib/tag/style/index.d.ts +3 -8
  413. package/lib/tag/style/index.js +65 -78
  414. package/lib/theme/aliyun.js +7 -34
  415. package/lib/theme/compact.d.ts +1 -1
  416. package/lib/theme/compact.js +9 -40
  417. package/lib/theme/dark.d.ts +1 -48
  418. package/lib/theme/dark.js +9 -36
  419. package/lib/theme/default.d.ts +48 -2
  420. package/lib/theme/default.js +344 -104
  421. package/lib/theme/index.d.ts +20 -57
  422. package/lib/theme/index.js +48 -55
  423. package/lib/theme/interface.d.ts +137 -0
  424. package/lib/theme/interface.js +14 -21
  425. package/lib/theme/internal.js +14 -21
  426. package/lib/theme/style/aliyun.less +42 -42
  427. package/lib/theme/style/compact.less +166 -137
  428. package/lib/theme/style/dark.less +59 -59
  429. package/lib/theme/style/default.less +169 -140
  430. package/lib/theme/themes/compact/index.js +19 -39
  431. package/lib/theme/themes/dark/index.js +19 -39
  432. package/lib/theme/themes/default/index.js +19 -39
  433. package/lib/theme/themes/seed.js +24 -43
  434. package/lib/theme/util/alias.js +19 -39
  435. package/lib/theme/util/format.js +15 -35
  436. package/lib/time-picker/index.js +15 -21
  437. package/lib/timeline/index.js +15 -21
  438. package/lib/tooltip/MouseTooltip.js +66 -76
  439. package/lib/tooltip/ReactStickyMouseTooltip.js +62 -86
  440. package/lib/tooltip/hooks/useTooltipTypeList.js +28 -61
  441. package/lib/tooltip/index.js +123 -133
  442. package/lib/tooltip/style/index.d.ts +2 -5
  443. package/lib/tooltip/style/index.js +26 -50
  444. package/lib/tour/index.js +15 -21
  445. package/lib/tour/interface.js +14 -21
  446. package/lib/transfer/index.js +15 -21
  447. package/lib/transfer/interface.js +14 -21
  448. package/lib/tree/index.js +15 -21
  449. package/lib/tree-select/index.js +67 -84
  450. package/lib/tree-select/style/index.d.ts +2 -5
  451. package/lib/tree-select/style/index.js +10 -35
  452. package/lib/typography/Link.js +54 -67
  453. package/lib/typography/Paragraph.js +54 -67
  454. package/lib/typography/Text.d.ts +1 -0
  455. package/lib/typography/Text.js +55 -67
  456. package/lib/typography/Title.js +54 -67
  457. package/lib/typography/hooks/useClassName.d.ts +1 -1
  458. package/lib/typography/hooks/useClassName.js +12 -42
  459. package/lib/typography/index.d.ts +12 -1
  460. package/lib/typography/index.js +89 -57
  461. package/lib/typography/style/index.d.ts +2 -5
  462. package/lib/typography/style/index.js +56 -64
  463. package/lib/upload/index.js +15 -21
  464. package/lib/upload/interface.js +14 -21
  465. package/lib/watermark/index.js +15 -21
  466. package/package.json +10 -9
  467. package/dist/static/Inter.f6bcdfb6.woff2 +0 -0
  468. package/es/_util/genStyle.d.ts +0 -2
  469. package/es/_util/getWeakenBorderColor.d.ts +0 -1
  470. package/es/_util/getWeakenBorderColor.js +0 -4
  471. package/es/fonts/Inter.woff2 +0 -0
  472. package/es/global.css +0 -48
  473. package/lib/_util/genStyle.d.ts +0 -2
  474. package/lib/_util/genStyle.js +0 -43
  475. package/lib/_util/getWeakenBorderColor.d.ts +0 -1
  476. package/lib/_util/getWeakenBorderColor.js +0 -32
  477. package/lib/fonts/Inter.woff2 +0 -0
  478. package/lib/global.css +0 -48
@@ -1,33 +1,37 @@
1
- var __defProp = Object.defineProperty;
2
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
- var __getOwnPropNames = Object.getOwnPropertyNames;
4
- var __hasOwnProp = Object.prototype.hasOwnProperty;
5
- var __export = (target, all) => {
6
- for (var name in all)
7
- __defProp(target, name, { get: all[name], enumerable: true });
8
- };
9
- var __copyProps = (to, from, except, desc) => {
10
- if (from && typeof from === "object" || typeof from === "function") {
11
- for (let key of __getOwnPropNames(from))
12
- if (!__hasOwnProp.call(to, key) && key !== except)
13
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
- }
15
- return to;
16
- };
17
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
1
+ "use strict";
18
2
 
19
- // src/table/style/index.ts
20
- var style_exports = {};
21
- __export(style_exports, {
22
- default: () => style_default,
23
- genTableStyle: () => genTableStyle
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
24
5
  });
25
- module.exports = __toCommonJS(style_exports);
26
- var import_genComponentStyleHook = require("../../_util/genComponentStyleHook");
27
- var genTableStyle = (token) => {
6
+ exports.genTableStyle = exports.default = void 0;
7
+ var _cssinjs = require("@ant-design/cssinjs");
8
+ var _genComponentStyleHook = require("../../_util/genComponentStyleHook");
9
+ const genSmallBtnStyle = token => {
10
+ const {
11
+ antCls
12
+ } = token;
13
+ return {
14
+ // button is small size by default
15
+ [`${antCls}-btn:not(${antCls}-btn-sm):not(${antCls}-btn-lg)`]: {
16
+ height: token.controlHeightSM,
17
+ fontSize: token.fontSizeSM,
18
+ [`&:not(${antCls}-btn-icon-only):not(${antCls}-btn-circle)`]: {
19
+ paddingInline: token.paddingXS
20
+ },
21
+ [`&${antCls}-btn-icon-only`]: {
22
+ width: token.controlHeightSM
23
+ },
24
+ [`&${antCls}-btn-circle`]: {
25
+ minWidth: token.controlHeightSM
26
+ }
27
+ }
28
+ };
29
+ };
30
+ const genTableStyle = token => {
28
31
  const {
29
32
  antCls,
30
33
  componentCls,
34
+ iconCls,
31
35
  colorText,
32
36
  colorBgBase,
33
37
  colorTextSecondary,
@@ -38,7 +42,8 @@ var genTableStyle = (token) => {
38
42
  colorBorderSecondary,
39
43
  padding,
40
44
  marginLG,
41
- marginXS
45
+ marginXS,
46
+ calc
42
47
  } = token;
43
48
  return {
44
49
  // 表格通用样式
@@ -52,10 +57,9 @@ var genTableStyle = (token) => {
52
57
  },
53
58
  // head 样式
54
59
  [`${componentCls}-thead > tr`]: {
55
- ["th"]: {
56
- // 弱化列标题
60
+ ['th']: {
57
61
  color: colorTextSecondary,
58
- fontWeight: "normal",
62
+ fontWeight: token.fontWeight,
59
63
  backgroundColor: colorBgBase
60
64
  },
61
65
  // 去掉排序列表头的灰色背景
@@ -75,34 +79,43 @@ var genTableStyle = (token) => {
75
79
  [`${componentCls}-tbody-virtual-scrollbar ${componentCls}-tbody-virtual-scrollbar-thumb`]: {
76
80
  background: `${token.colorFillSecondary} !important`
77
81
  },
82
+ // for custom expand icon
83
+ [`${componentCls}-row-indent+${iconCls}`]: {
84
+ marginInlineEnd: token.marginXS
85
+ },
78
86
  // expandRowByClick 行样式
79
87
  [`tr${componentCls}-expand-row-by-click`]: {
80
- cursor: "pointer"
88
+ cursor: 'pointer'
81
89
  },
82
90
  // 去掉可展开行在展开时的底部 border
83
91
  [`tr > td:has(${componentCls}-row-expand-icon-expanded)`]: {
84
- borderBottom: "none",
92
+ borderBottom: 'none',
85
93
  [`& ~ td`]: {
86
- borderBottom: "none"
94
+ borderBottom: 'none'
87
95
  }
88
96
  },
89
97
  // 为了避免行展开/收起时出现 border 动画,覆盖 antd 默认配置,仅设置背景色动画
90
98
  [`tr > td`]: {
91
- transition: `background ${token.motionDurationMid}`
99
+ fontWeight: token.fontWeight,
100
+ transition: `background ${token.motionDurationMid}`,
101
+ a: {
102
+ fontWeight: token.fontWeightStrong,
103
+ // work for ProTable link style
104
+ fontSize: token.fontSizeSM
105
+ }
92
106
  },
107
+ ...genSmallBtnStyle(token),
93
108
  // empty style
94
- [`${componentCls}-placeholder td`]: {
95
- borderBottom: "none"
96
- },
109
+ [`${componentCls}-placeholder td`]: {},
97
110
  [`${componentCls}-empty-wrapper`]: {
98
- minHeight: 360 - token.paddingSM * 2,
99
- display: "flex",
100
- justifyContent: "center",
101
- alignItems: "center"
111
+ minHeight: calc(360).sub(calc(token.paddingSM).mul(2).equal()).equal(),
112
+ display: 'flex',
113
+ justifyContent: 'center',
114
+ alignItems: 'center'
102
115
  },
103
116
  // 嵌套子表格样式
104
117
  [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
105
- borderBottom: "none",
118
+ borderBottom: 'none',
106
119
  // 设置嵌套子表格的表头背景色
107
120
  [`${componentCls}-thead > tr > th`]: {
108
121
  backgroundColor: token.colorFillQuaternary
@@ -116,7 +129,7 @@ var genTableStyle = (token) => {
116
129
  },
117
130
  // empty wrapper style
118
131
  [`${componentCls}-empty-wrapper`]: {
119
- minHeight: "auto"
132
+ minHeight: 'auto'
120
133
  }
121
134
  }
122
135
  }
@@ -125,7 +138,7 @@ var genTableStyle = (token) => {
125
138
  [`${componentCls}-wrapper ${componentCls}${componentCls}-middle`]: {
126
139
  [`${componentCls}-tbody`]: {
127
140
  [`${componentCls}-empty-wrapper`]: {
128
- minHeight: 260 - token.paddingXS * 2
141
+ minHeight: calc(260).sub(calc(token.paddingXS).mul(2).equal()).equal()
129
142
  }
130
143
  }
131
144
  },
@@ -133,24 +146,24 @@ var genTableStyle = (token) => {
133
146
  [`${componentCls}-wrapper ${componentCls}${componentCls}-small`]: {
134
147
  [`${componentCls}-tbody`]: {
135
148
  [`${componentCls}-empty-wrapper`]: {
136
- minHeight: 160 - token.paddingXXS * 2
149
+ minHeight: calc(160).sub(calc(token.paddingXXS).mul(2).equal()).equal()
137
150
  }
138
151
  }
139
152
  },
140
153
  // 带边框的表格样式
141
154
  [`${componentCls}-wrapper ${componentCls}${componentCls}-bordered`]: {
142
155
  [`${componentCls}-footer`]: {
143
- borderRadius: `0px 0px ${token.borderRadiusLG}px ${token.borderRadiusLG}px`
156
+ borderRadius: `0px 0px ${(0, _cssinjs.unit)(token.borderRadiusLG)} ${(0, _cssinjs.unit)(token.borderRadiusLG)}`
144
157
  }
145
158
  },
146
- // 带边框的表格样式
159
+ // 带内部边框的表格样式
147
160
  [`${componentCls}-wrapper${componentCls}-inner-bordered ${componentCls}-bordered`]: {
148
161
  [`${componentCls}-container`]: {
149
- borderInlineStart: "none",
150
- borderTop: "none",
162
+ borderInlineStart: 'none',
163
+ borderTop: 'none',
151
164
  [`${componentCls}-thead > tr > th, ${componentCls}-tbody > tr > td`]: {
152
- ["&:last-child"]: {
153
- borderInlineEnd: "none"
165
+ ['&:last-child']: {
166
+ borderInlineEnd: 'none'
154
167
  }
155
168
  }
156
169
  }
@@ -159,9 +172,8 @@ var genTableStyle = (token) => {
159
172
  [`${componentCls}-wrapper ${componentCls}:not(${componentCls}-bordered)`]: {
160
173
  // 单元格通用样式
161
174
  [`${componentCls}-thead, ${componentCls}-tbody`]: {
162
- ["td, th"]: {
175
+ ['td, th']: {
163
176
  [`&${componentCls}-row-expand-icon-cell`]: {
164
- backgroundColor: colorBgBase,
165
177
  // 设置 paddingRight 即可
166
178
  paddingRight: token.paddingXS
167
179
  },
@@ -192,6 +204,7 @@ var genTableStyle = (token) => {
192
204
  // },
193
205
  // },
194
206
  // },
207
+
195
208
  // 非可展开表格、不带 footer 表格、非空表格、不带边框表格: 去掉底部圆角
196
209
  [`${componentCls}-wrapper:not(${componentCls}-expandable):not(${componentCls}-has-footer) ${componentCls}:not(${componentCls}-bordered):not(${componentCls}-empty)`]: {
197
210
  borderBottomLeftRadius: 0,
@@ -204,15 +217,19 @@ var genTableStyle = (token) => {
204
217
  [`${componentCls}-expanded-row > td`]: {
205
218
  // 除内嵌子表格外,设置其他内嵌元素样式
206
219
  [`& > *:not(${componentCls}-wrapper):not(${componentCls}-expanded-row-fixed)`]: {
207
- marginLeft: token.marginXL + token.lineWidth * 2
220
+ marginLeft: calc(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).equal()
208
221
  },
209
222
  [`& > *${componentCls}-expanded-row-fixed`]: {
210
- paddingLeft: token.marginXL + token.lineWidth * 2 + token.padding
223
+ paddingLeft: calc(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).add(token.padding).equal(),
224
+ margin: `-${(0, _cssinjs.unit)(token.marginXS)} -${(0, _cssinjs.unit)(token.margin)}`
211
225
  }
212
226
  },
213
227
  // 嵌套子表格和父表格第一列对齐
214
228
  [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
215
- marginLeft: token.margin + token.lineWidth * 2
229
+ marginLeft: calc(token.margin).add(calc(token.lineWidth).mul(2).equal()).equal()
230
+ },
231
+ [`tr > td > ${componentCls}-expanded-row-fixed > ${componentCls}-wrapper:only-child ${componentCls}`]: {
232
+ marginLeft: -token.padding
216
233
  }
217
234
  }
218
235
  },
@@ -220,7 +237,7 @@ var genTableStyle = (token) => {
220
237
  [`${componentCls}-tbody`]: {
221
238
  // 嵌套子表格和父表格第一列对齐
222
239
  [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
223
- marginLeft: token.margin + token.lineWidth * 2 + token.margin
240
+ marginLeft: calc(token.margin).add(calc(token.lineWidth).mul(2).equal()).add(token.margin).equal()
224
241
  }
225
242
  }
226
243
  }
@@ -232,15 +249,15 @@ var genTableStyle = (token) => {
232
249
  [`${componentCls}-expanded-row > td`]: {
233
250
  // 除内嵌子表格外,设置其他内嵌元素样式
234
251
  [`& > *:not(${componentCls}-wrapper):not(${componentCls}-expanded-row-fixed)`]: {
235
- marginLeft: token.marginXL + token.marginXL + token.lineWidth * 2
252
+ marginLeft: calc(token.marginXL).add(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).equal()
236
253
  },
237
254
  [`& > *${componentCls}-expanded-row-fixed`]: {
238
- paddingLeft: token.marginXL + token.marginXL + token.lineWidth * 2 + token.padding
255
+ paddingLeft: calc(token.marginXL).add(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).add(token.padding).equal()
239
256
  }
240
257
  },
241
258
  // 嵌套子表格和父表格第一列对齐
242
259
  [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
243
- marginLeft: token.margin + token.marginXL + token.lineWidth * 2
260
+ marginLeft: calc(token.margin).add(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).equal()
244
261
  }
245
262
  }
246
263
  },
@@ -248,7 +265,7 @@ var genTableStyle = (token) => {
248
265
  [`${componentCls}-tbody`]: {
249
266
  // 嵌套子表格和父表格第一列对齐
250
267
  [`tr > td > ${componentCls}-wrapper:only-child ${componentCls}`]: {
251
- marginLeft: token.margin + token.marginXL + token.lineWidth * 2 + token.margin
268
+ marginLeft: calc(token.margin).add(token.marginXL).add(calc(token.lineWidth).mul(2).equal()).add(token.margin).equal()
252
269
  }
253
270
  }
254
271
  }
@@ -258,7 +275,7 @@ var genTableStyle = (token) => {
258
275
  [`${componentCls}-tbody`]: {
259
276
  [`${componentCls}-placeholder`]: {
260
277
  // hide empty when Table loading
261
- visibility: "hidden"
278
+ visibility: 'hidden'
262
279
  }
263
280
  }
264
281
  },
@@ -266,23 +283,34 @@ var genTableStyle = (token) => {
266
283
  [`${componentCls}-wrapper`]: {
267
284
  [`${componentCls}-pagination`]: {
268
285
  [`&${antCls}-pagination`]: {
269
- padding: `${padding}px 0`,
270
- margin: "0 !important"
286
+ fontSize: token.fontSizeSM,
287
+ padding: `${(0, _cssinjs.unit)(token.paddingSM)} 0`,
288
+ margin: '0 !important',
289
+ [`${antCls}-pagination-item, ${antCls}-pagination-total-text, ${antCls}-pagination-prev, ${antCls}-pagination-next`]: {
290
+ height: token.controlHeightSM,
291
+ minWidth: token.controlHeightSM,
292
+ lineHeight: (0, _cssinjs.unit)(calc(token.controlHeightSM).sub(calc(token.lineWidth).mul(2)).equal())
293
+ },
294
+ [`${antCls}-pagination-options ${antCls}-select-single`]: {
295
+ height: token.controlHeightSM,
296
+ [`${antCls}-select-selector`]: {
297
+ paddingInline: calc(token.paddingXS).sub(token.lineWidth).equal()
298
+ }
299
+ }
271
300
  },
272
301
  // 批量操作栏样式
273
302
  [`${componentCls}-batch-operation-bar`]: {
274
- position: "absolute",
303
+ position: 'absolute',
275
304
  left: 0,
276
- display: "inline-block",
305
+ display: 'inline-block',
277
306
  marginRight: marginLG,
278
307
  [`${componentCls}-batch-operation-selection`]: {
279
- color: colorTextSecondary,
280
- fontWeight: 500,
281
308
  [`${componentCls}-batch-operation-selection-count`]: {
282
- margin: `0 ${marginXS}px`,
309
+ margin: `0 ${(0, _cssinjs.unit)(marginXS)}`,
283
310
  color: colorLink
284
311
  }
285
- }
312
+ },
313
+ ...genSmallBtnStyle(token)
286
314
  }
287
315
  }
288
316
  },
@@ -296,19 +324,13 @@ var genTableStyle = (token) => {
296
324
  [`${antCls}-popover, ${antCls}-tooltip`]: {
297
325
  [`${componentCls} ${componentCls}-tbody`]: {
298
326
  [`${componentCls}-empty-wrapper`]: {
299
- minHeight: "auto"
327
+ minHeight: 'auto'
300
328
  }
301
329
  }
302
330
  }
303
331
  };
304
332
  };
305
- var style_default = (prefixCls) => {
306
- const useStyle = (0, import_genComponentStyleHook.genComponentStyleHook)("Table", (token) => {
307
- return [genTableStyle(token)];
308
- });
309
- return useStyle(prefixCls);
310
- };
311
- // Annotate the CommonJS export names for ESM import in node:
312
- 0 && (module.exports = {
313
- genTableStyle
314
- });
333
+ exports.genTableStyle = genTableStyle;
334
+ var _default = exports.default = (0, _genComponentStyleHook.genStyleHooks)('Table', token => {
335
+ return [genTableStyle(token)];
336
+ });
@@ -1,26 +1,9 @@
1
- var __defProp = Object.defineProperty;
2
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
- var __getOwnPropNames = Object.getOwnPropertyNames;
4
- var __hasOwnProp = Object.prototype.hasOwnProperty;
5
- var __export = (target, all) => {
6
- for (var name in all)
7
- __defProp(target, name, { get: all[name], enumerable: true });
8
- };
9
- var __copyProps = (to, from, except, desc) => {
10
- if (from && typeof from === "object" || typeof from === "function") {
11
- for (let key of __getOwnPropNames(from))
12
- if (!__hasOwnProp.call(to, key) && key !== except)
13
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
- }
15
- return to;
16
- };
17
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
1
+ "use strict";
18
2
 
19
- // src/tabs/TabPane.tsx
20
- var TabPane_exports = {};
21
- __export(TabPane_exports, {
22
- default: () => TabPane_default
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
23
5
  });
24
- module.exports = __toCommonJS(TabPane_exports);
25
- var import_antd = require("antd");
26
- var TabPane_default = import_antd.Tabs.TabPane;
6
+ exports.default = void 0;
7
+ var _antd = require("antd");
8
+ "use client";
9
+ var _default = exports.default = _antd.Tabs.TabPane;
@@ -1,54 +1,38 @@
1
- var __create = Object.create;
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
- var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
8
- for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
1
+ "use strict";
28
2
 
29
- // src/tabs/hooks/useLegacyItems.tsx
30
- var useLegacyItems_exports = {};
31
- __export(useLegacyItems_exports, {
32
- default: () => useLegacyItems
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
33
5
  });
34
- module.exports = __toCommonJS(useLegacyItems_exports);
35
- var import_warning = __toESM(require("antd/es/_util/warning"));
36
- var import_toArray = __toESM(require("rc-util/lib/Children/toArray"));
37
- var React = __toESM(require("react"));
6
+ exports.default = useLegacyItems;
7
+ var _warning = _interopRequireDefault(require("antd/es/_util/warning"));
8
+ var _toArray = _interopRequireDefault(require("rc-util/lib/Children/toArray"));
9
+ var React = _interopRequireWildcard(require("react"));
10
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
11
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
12
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
+ "use client";
38
14
  function filter(items) {
39
- return items.filter((item) => item);
15
+ return items.filter(item => item);
40
16
  }
17
+
18
+ // ref: https://github.com/ant-design/ant-design/blob/master/components/tabs/hooks/useLegacyItems.ts
41
19
  function useLegacyItems(items, children) {
42
20
  if (items) {
43
21
  return items;
44
22
  }
45
- (0, import_warning.default)(!children, "Tabs", "Tabs.TabPane is deprecated. Please use `items` directly.");
46
- const childrenItems = (0, import_toArray.default)(children).map((node) => {
47
- if (React.isValidElement(node)) {
48
- const { key, props } = node;
49
- const { tab, ...restProps } = props || {};
50
- const item = {
23
+ (0, _warning.default)(!children, 'Tabs', 'Tabs.TabPane is deprecated. Please use `items` directly.');
24
+ const childrenItems = (0, _toArray.default)(children).map(node => {
25
+ if ( /*#__PURE__*/React.isValidElement(node)) {
26
+ const {
51
27
  key,
28
+ props
29
+ } = node;
30
+ const {
31
+ tab,
32
+ ...restProps
33
+ } = props || {};
34
+ const item = {
35
+ key: key,
52
36
  ...restProps,
53
37
  label: tab
54
38
  };
@@ -57,4 +41,4 @@ function useLegacyItems(items, children) {
57
41
  return null;
58
42
  });
59
43
  return filter(childrenItems);
60
- }
44
+ }