@nutui/nutui-react 3.0.0-beta.8 → 3.0.0-beta.9

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 (326) hide show
  1. package/dist/cjs/packages/actionsheet/style/style.css +45 -79
  2. package/dist/cjs/packages/address/address.js +9 -6
  3. package/dist/cjs/packages/address/style/style.css +74 -109
  4. package/dist/cjs/packages/animatingnumbers/style/style.css +3 -3
  5. package/dist/cjs/packages/audio/style/style.css +95 -84
  6. package/dist/cjs/packages/avatar/style/style.css +2 -2
  7. package/dist/cjs/packages/badge/style/style.css +8 -8
  8. package/dist/cjs/packages/barrage/style/style.css +2 -2
  9. package/dist/cjs/packages/button/style/button.scss +16 -4
  10. package/dist/cjs/packages/button/style/style.css +82 -71
  11. package/dist/cjs/packages/calendar/style/style.css +51 -85
  12. package/dist/cjs/packages/calendarcard/style/style.css +11 -11
  13. package/dist/cjs/packages/card/style/style.css +42 -23
  14. package/dist/cjs/packages/cascader/cascader.js +1 -1
  15. package/dist/cjs/packages/cascader/style/style.css +63 -98
  16. package/dist/cjs/packages/cell/cell.d.ts +2 -12
  17. package/dist/cjs/packages/cell/index.d.ts +1 -1
  18. package/dist/cjs/packages/cell/style/style.css +10 -10
  19. package/dist/cjs/packages/cell/types.d.ts +12 -0
  20. package/dist/cjs/packages/cell/types.js +4 -0
  21. package/dist/cjs/packages/cellgroup/style/style.css +3 -3
  22. package/dist/cjs/packages/checkbox/style/checkbox.scss +5 -0
  23. package/dist/cjs/packages/checkbox/style/style.css +34 -29
  24. package/dist/cjs/packages/checkboxgroup/style/style.css +7 -7
  25. package/dist/cjs/packages/circleprogress/style/style.css +3 -3
  26. package/dist/cjs/packages/collapse/style/style.css +11 -11
  27. package/dist/cjs/packages/collapseitem/style/style.css +11 -11
  28. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  29. package/dist/cjs/packages/countdown/style/style.css +9 -9
  30. package/dist/cjs/packages/countup/style/style.css +3 -3
  31. package/dist/cjs/packages/datepicker/style/style.css +48 -82
  32. package/dist/cjs/packages/dialog/style/style.css +92 -81
  33. package/dist/cjs/packages/divider/style/style.css +4 -4
  34. package/dist/cjs/packages/elevator/style/style.css +8 -8
  35. package/dist/cjs/packages/empty/style/style.css +3 -3
  36. package/dist/cjs/packages/fixednav/style/style.css +9 -9
  37. package/dist/cjs/packages/form/style/style.css +19 -17
  38. package/dist/cjs/packages/formitem/style/formitem.scss +2 -0
  39. package/dist/cjs/packages/formitem/style/style.css +6 -4
  40. package/dist/cjs/packages/grid/style/style.css +7 -7
  41. package/dist/cjs/packages/griditem/style/style.css +6 -6
  42. package/dist/cjs/packages/hoverbutton/style/style.css +4 -4
  43. package/dist/cjs/packages/hoverbuttonitem/style/style.css +4 -4
  44. package/dist/cjs/packages/image/style/style.css +2 -2
  45. package/dist/cjs/packages/imagepreview/style/style.css +138 -95
  46. package/dist/cjs/packages/indicator/indicator.d.ts +4 -0
  47. package/dist/cjs/packages/indicator/indicator.js +39 -10
  48. package/dist/cjs/packages/indicator/style/indicator.scss +127 -14
  49. package/dist/cjs/packages/indicator/style/style.css +99 -22
  50. package/dist/cjs/packages/infiniteloading/style/infiniteloading.scss +1 -1
  51. package/dist/cjs/packages/infiniteloading/style/style.css +4 -4
  52. package/dist/cjs/packages/input/input.d.ts +1 -0
  53. package/dist/cjs/packages/input/input.js +7 -3
  54. package/dist/cjs/packages/input/style/input.scss +24 -13
  55. package/dist/cjs/packages/input/style/style.css +21 -15
  56. package/dist/cjs/packages/inputnumber/style/inputnumber.scss +2 -2
  57. package/dist/cjs/packages/inputnumber/style/style.css +9 -9
  58. package/dist/cjs/packages/loading/index.d.ts +1 -1
  59. package/dist/cjs/packages/loading/loading.d.ts +3 -10
  60. package/dist/cjs/packages/loading/loading.js +45 -12
  61. package/dist/cjs/packages/loading/style/loading.scss +7 -1
  62. package/dist/cjs/packages/loading/style/style.css +9 -3
  63. package/dist/cjs/packages/loading/types.d.ts +13 -0
  64. package/dist/cjs/packages/loading/types.js +4 -0
  65. package/dist/cjs/packages/lottie/index.d.ts +3 -0
  66. package/dist/cjs/packages/lottie/index.js +12 -0
  67. package/dist/cjs/packages/lottie/style/css.js +1 -0
  68. package/dist/cjs/packages/lottie/style/index.js +1 -0
  69. package/dist/cjs/packages/lottie/style/lottie.scss +0 -0
  70. package/dist/cjs/packages/lottie/style/style.css +4 -0
  71. package/dist/cjs/packages/lottie/types.d.ts +11 -0
  72. package/dist/cjs/packages/lottie/types.js +6 -0
  73. package/dist/cjs/packages/lottie/web.d.ts +3 -0
  74. package/dist/cjs/packages/lottie/web.js +34 -0
  75. package/dist/cjs/packages/menu/style/style.css +14 -14
  76. package/dist/cjs/packages/menuitem/style/style.css +10 -10
  77. package/dist/cjs/packages/navbar/navbar.d.ts +1 -1
  78. package/dist/cjs/packages/navbar/navbar.js +15 -65
  79. package/dist/cjs/packages/navbar/style/navbar.scss +32 -40
  80. package/dist/cjs/packages/navbar/style/style.css +27 -41
  81. package/dist/cjs/packages/notify/style/style.css +4 -4
  82. package/dist/cjs/packages/numberkeyboard/style/style.css +47 -81
  83. package/dist/cjs/packages/nutui.react.build.d.ts +3 -1
  84. package/dist/cjs/packages/nutui.react.build.js +4 -0
  85. package/dist/cjs/packages/nutui.react.d.ts +4 -1
  86. package/dist/cjs/packages/nutui.react.js +5 -0
  87. package/dist/cjs/packages/nutui.react.scss.d.ts +1 -0
  88. package/dist/cjs/packages/nutui.react.scss.js +1 -0
  89. package/dist/cjs/packages/overlay/style/overlay.scss +6 -6
  90. package/dist/cjs/packages/overlay/style/style.css +7 -7
  91. package/dist/cjs/packages/pagination/style/style.css +8 -8
  92. package/dist/cjs/packages/picker/style/style.css +48 -82
  93. package/dist/cjs/packages/popover/popover.js +17 -14
  94. package/dist/cjs/packages/popover/style/popover.scss +42 -65
  95. package/dist/cjs/packages/popover/style/style.css +85 -141
  96. package/dist/cjs/packages/popup/popup.js +24 -23
  97. package/dist/cjs/packages/popup/style/popup.scss +24 -56
  98. package/dist/cjs/packages/popup/style/style.css +37 -71
  99. package/dist/cjs/packages/price/index.d.ts +1 -1
  100. package/dist/cjs/packages/price/price.d.ts +1 -10
  101. package/dist/cjs/packages/price/price.js +9 -9
  102. package/dist/cjs/packages/price/style/price.scss +49 -9
  103. package/dist/cjs/packages/price/style/style.css +35 -16
  104. package/dist/cjs/packages/price/types.d.ts +13 -0
  105. package/dist/cjs/packages/price/types.js +4 -0
  106. package/dist/cjs/packages/progress/style/style.css +2 -2
  107. package/dist/cjs/packages/pulltorefresh/style/style.css +2 -2
  108. package/dist/cjs/packages/radio/style/radio.scss +3 -0
  109. package/dist/cjs/packages/radio/style/style.css +22 -19
  110. package/dist/cjs/packages/radiogroup/style/style.css +6 -6
  111. package/dist/cjs/packages/range/style/style.css +10 -10
  112. package/dist/cjs/packages/rate/style/style.css +4 -4
  113. package/dist/cjs/packages/resultpage/style/style.css +2 -2
  114. package/dist/cjs/packages/searchbar/style/style.css +5 -5
  115. package/dist/cjs/packages/segmented/style/style.css +3 -3
  116. package/dist/cjs/packages/shortpassword/style/style.css +48 -82
  117. package/dist/cjs/packages/sidenavbar/sidenavbar.d.ts +3 -0
  118. package/dist/cjs/packages/sidenavbar/sidenavbar.js +5 -1
  119. package/dist/cjs/packages/sidenavbar/style/style.css +41 -75
  120. package/dist/cjs/packages/sidenavbaritem/style/style.css +2 -2
  121. package/dist/cjs/packages/signature/style/style.css +2 -2
  122. package/dist/cjs/packages/skeleton/style/style.css +5 -5
  123. package/dist/cjs/packages/step/style/style.css +22 -22
  124. package/dist/cjs/packages/steps/style/style.css +22 -22
  125. package/dist/cjs/packages/subsidenavbar/style/style.css +2 -2
  126. package/dist/cjs/packages/swiper/style/style.css +99 -22
  127. package/dist/cjs/packages/switch/style/style.css +10 -10
  128. package/dist/cjs/packages/switch/style/switch.scss +1 -1
  129. package/dist/cjs/packages/tabbar/style/style.css +13 -13
  130. package/dist/cjs/packages/tabbaritem/style/style.css +12 -12
  131. package/dist/cjs/packages/table/style/style.css +11 -11
  132. package/dist/cjs/packages/tabpane/style/style.css +1 -1
  133. package/dist/cjs/packages/tabs/style/style.css +21 -22
  134. package/dist/cjs/packages/tabs/style/tabs.scss +1 -1
  135. package/dist/cjs/packages/tag/style/style.css +5 -5
  136. package/dist/cjs/packages/textarea/style/style.css +30 -19
  137. package/dist/cjs/packages/textarea/style/textarea.scss +43 -16
  138. package/dist/cjs/packages/textarea/textarea.d.ts +2 -0
  139. package/dist/cjs/packages/textarea/textarea.js +9 -7
  140. package/dist/cjs/packages/timedetail/style/style.css +4 -4
  141. package/dist/cjs/packages/timeselect/style/style.css +46 -80
  142. package/dist/cjs/packages/timeselect/timeselect.js +1 -4
  143. package/dist/cjs/packages/toast/style/style.css +8 -8
  144. package/dist/cjs/packages/tour/style/style.css +89 -145
  145. package/dist/cjs/packages/trendarrow/style/style.css +1 -1
  146. package/dist/cjs/packages/uploader/index.d.ts +1 -1
  147. package/dist/cjs/packages/uploader/preview.js +13 -14
  148. package/dist/cjs/packages/uploader/style/style.css +13 -13
  149. package/dist/cjs/packages/uploader/types.d.ts +17 -0
  150. package/dist/cjs/packages/uploader/types.js +4 -0
  151. package/dist/cjs/packages/uploader/uploader.d.ts +5 -28
  152. package/dist/cjs/packages/uploader/uploader.js +241 -220
  153. package/dist/cjs/packages/virtuallist/style/style.css +4 -4
  154. package/dist/cjs/utils/platform-taro.d.ts +1 -0
  155. package/dist/cjs/utils/platform-taro.js +8 -0
  156. package/dist/es/packages/actionsheet/style/style.css +45 -79
  157. package/dist/es/packages/address/address.js +9 -6
  158. package/dist/es/packages/address/style/style.css +74 -109
  159. package/dist/es/packages/animatingnumbers/style/style.css +3 -3
  160. package/dist/es/packages/audio/style/style.css +95 -84
  161. package/dist/es/packages/avatar/style/style.css +2 -2
  162. package/dist/es/packages/badge/style/style.css +8 -8
  163. package/dist/es/packages/barrage/style/style.css +2 -2
  164. package/dist/es/packages/button/style/button.scss +16 -4
  165. package/dist/es/packages/button/style/style.css +82 -71
  166. package/dist/es/packages/calendar/style/style.css +51 -85
  167. package/dist/es/packages/calendarcard/style/style.css +11 -11
  168. package/dist/es/packages/card/style/style.css +42 -23
  169. package/dist/es/packages/cascader/cascader.js +2 -2
  170. package/dist/es/packages/cascader/style/style.css +63 -98
  171. package/dist/es/packages/cell/cell.d.ts +2 -12
  172. package/dist/es/packages/cell/index.d.ts +1 -1
  173. package/dist/es/packages/cell/style/style.css +10 -10
  174. package/dist/es/packages/cell/types.d.ts +12 -0
  175. package/dist/es/packages/cell/types.js +1 -0
  176. package/dist/es/packages/cellgroup/style/style.css +3 -3
  177. package/dist/es/packages/checkbox/style/checkbox.scss +5 -0
  178. package/dist/es/packages/checkbox/style/style.css +34 -29
  179. package/dist/es/packages/checkboxgroup/style/style.css +7 -7
  180. package/dist/es/packages/circleprogress/style/style.css +3 -3
  181. package/dist/es/packages/collapse/style/style.css +11 -11
  182. package/dist/es/packages/collapseitem/style/style.css +11 -11
  183. package/dist/es/packages/configprovider/types.d.ts +1 -1
  184. package/dist/es/packages/countdown/style/style.css +9 -9
  185. package/dist/es/packages/countup/style/style.css +3 -3
  186. package/dist/es/packages/datepicker/style/style.css +48 -82
  187. package/dist/es/packages/dialog/style/style.css +92 -81
  188. package/dist/es/packages/divider/style/style.css +4 -4
  189. package/dist/es/packages/elevator/style/style.css +8 -8
  190. package/dist/es/packages/empty/style/style.css +3 -3
  191. package/dist/es/packages/fixednav/style/style.css +9 -9
  192. package/dist/es/packages/form/style/style.css +19 -17
  193. package/dist/es/packages/formitem/style/formitem.scss +2 -0
  194. package/dist/es/packages/formitem/style/style.css +6 -4
  195. package/dist/es/packages/grid/style/style.css +7 -7
  196. package/dist/es/packages/griditem/style/style.css +6 -6
  197. package/dist/es/packages/hoverbutton/style/style.css +4 -4
  198. package/dist/es/packages/hoverbuttonitem/style/style.css +4 -4
  199. package/dist/es/packages/image/style/style.css +2 -2
  200. package/dist/es/packages/imagepreview/style/style.css +138 -95
  201. package/dist/es/packages/indicator/indicator.d.ts +4 -0
  202. package/dist/es/packages/indicator/indicator.js +39 -10
  203. package/dist/es/packages/indicator/style/indicator.scss +127 -14
  204. package/dist/es/packages/indicator/style/style.css +99 -22
  205. package/dist/es/packages/infiniteloading/style/infiniteloading.scss +1 -1
  206. package/dist/es/packages/infiniteloading/style/style.css +4 -4
  207. package/dist/es/packages/input/input.d.ts +1 -0
  208. package/dist/es/packages/input/input.js +7 -3
  209. package/dist/es/packages/input/style/input.scss +24 -13
  210. package/dist/es/packages/input/style/style.css +21 -15
  211. package/dist/es/packages/inputnumber/style/inputnumber.scss +2 -2
  212. package/dist/es/packages/inputnumber/style/style.css +9 -9
  213. package/dist/es/packages/loading/index.d.ts +1 -1
  214. package/dist/es/packages/loading/loading.d.ts +3 -10
  215. package/dist/es/packages/loading/loading.js +44 -12
  216. package/dist/es/packages/loading/style/loading.scss +7 -1
  217. package/dist/es/packages/loading/style/style.css +9 -3
  218. package/dist/es/packages/loading/types.d.ts +13 -0
  219. package/dist/es/packages/loading/types.js +1 -0
  220. package/dist/es/packages/lottie/index.d.ts +3 -0
  221. package/dist/es/packages/lottie/index.js +2 -0
  222. package/dist/es/packages/lottie/style/css.js +1 -0
  223. package/dist/es/packages/lottie/style/index.js +1 -0
  224. package/dist/es/packages/lottie/style/lottie.scss +0 -0
  225. package/dist/es/packages/lottie/style/style.css +4 -0
  226. package/dist/es/packages/lottie/types.d.ts +11 -0
  227. package/dist/es/packages/lottie/types.js +1 -0
  228. package/dist/es/packages/lottie/web.d.ts +3 -0
  229. package/dist/es/packages/lottie/web.js +22 -0
  230. package/dist/es/packages/menu/style/style.css +14 -14
  231. package/dist/es/packages/menuitem/style/style.css +10 -10
  232. package/dist/es/packages/navbar/navbar.d.ts +1 -1
  233. package/dist/es/packages/navbar/navbar.js +14 -63
  234. package/dist/es/packages/navbar/style/navbar.scss +32 -40
  235. package/dist/es/packages/navbar/style/style.css +27 -41
  236. package/dist/es/packages/notify/style/style.css +4 -4
  237. package/dist/es/packages/numberkeyboard/style/style.css +47 -81
  238. package/dist/es/packages/nutui.react.build.d.ts +3 -1
  239. package/dist/es/packages/nutui.react.build.js +3 -1
  240. package/dist/es/packages/overlay/style/overlay.scss +6 -6
  241. package/dist/es/packages/overlay/style/style.css +7 -7
  242. package/dist/es/packages/pagination/style/style.css +8 -8
  243. package/dist/es/packages/picker/style/style.css +48 -82
  244. package/dist/es/packages/popover/popover.d.ts +13 -65
  245. package/dist/es/packages/popover/popover.js +17 -14
  246. package/dist/es/packages/popover/style/popover.scss +42 -65
  247. package/dist/es/packages/popover/style/style.css +85 -141
  248. package/dist/es/packages/popup/popup.js +24 -23
  249. package/dist/es/packages/popup/style/popup.scss +24 -56
  250. package/dist/es/packages/popup/style/style.css +37 -71
  251. package/dist/es/packages/price/index.d.ts +1 -1
  252. package/dist/es/packages/price/price.d.ts +1 -10
  253. package/dist/es/packages/price/price.js +9 -9
  254. package/dist/es/packages/price/style/price.scss +49 -9
  255. package/dist/es/packages/price/style/style.css +35 -16
  256. package/dist/es/packages/price/types.d.ts +13 -0
  257. package/dist/es/packages/price/types.js +1 -0
  258. package/dist/es/packages/progress/style/style.css +2 -2
  259. package/dist/es/packages/pulltorefresh/style/style.css +2 -2
  260. package/dist/es/packages/radio/style/radio.scss +3 -0
  261. package/dist/es/packages/radio/style/style.css +22 -19
  262. package/dist/es/packages/radiogroup/style/style.css +6 -6
  263. package/dist/es/packages/range/style/style.css +10 -10
  264. package/dist/es/packages/rate/style/style.css +4 -4
  265. package/dist/es/packages/resultpage/style/style.css +2 -2
  266. package/dist/es/packages/searchbar/style/style.css +5 -5
  267. package/dist/es/packages/segmented/style/style.css +3 -3
  268. package/dist/es/packages/shortpassword/style/style.css +48 -82
  269. package/dist/es/packages/sidenavbar/sidenavbar.d.ts +3 -0
  270. package/dist/es/packages/sidenavbar/sidenavbar.js +4 -1
  271. package/dist/es/packages/sidenavbar/style/style.css +41 -75
  272. package/dist/es/packages/sidenavbaritem/style/style.css +2 -2
  273. package/dist/es/packages/signature/style/style.css +2 -2
  274. package/dist/es/packages/skeleton/style/style.css +5 -5
  275. package/dist/es/packages/step/style/style.css +22 -22
  276. package/dist/es/packages/steps/style/style.css +22 -22
  277. package/dist/es/packages/subsidenavbar/style/style.css +2 -2
  278. package/dist/es/packages/swiper/style/style.css +99 -22
  279. package/dist/es/packages/switch/style/style.css +10 -10
  280. package/dist/es/packages/switch/style/switch.scss +1 -1
  281. package/dist/es/packages/tabbar/style/style.css +13 -13
  282. package/dist/es/packages/tabbaritem/style/style.css +12 -12
  283. package/dist/es/packages/table/style/style.css +11 -11
  284. package/dist/es/packages/tabpane/style/style.css +1 -1
  285. package/dist/es/packages/tabs/style/style.css +21 -22
  286. package/dist/es/packages/tabs/style/tabs.scss +1 -1
  287. package/dist/es/packages/tag/style/style.css +5 -5
  288. package/dist/es/packages/textarea/style/style.css +30 -19
  289. package/dist/es/packages/textarea/style/textarea.scss +43 -16
  290. package/dist/es/packages/textarea/textarea.d.ts +2 -0
  291. package/dist/es/packages/textarea/textarea.js +9 -7
  292. package/dist/es/packages/timedetail/style/style.css +4 -4
  293. package/dist/es/packages/timeselect/style/style.css +46 -80
  294. package/dist/es/packages/timeselect/timeselect.js +1 -4
  295. package/dist/es/packages/toast/style/style.css +8 -8
  296. package/dist/es/packages/tour/style/style.css +89 -145
  297. package/dist/es/packages/trendarrow/style/style.css +1 -1
  298. package/dist/es/packages/uploader/index.d.ts +1 -1
  299. package/dist/es/packages/uploader/preview.js +13 -14
  300. package/dist/es/packages/uploader/style/style.css +13 -13
  301. package/dist/es/packages/uploader/types.d.ts +17 -0
  302. package/dist/es/packages/uploader/types.js +1 -0
  303. package/dist/es/packages/uploader/uploader.d.ts +29 -200
  304. package/dist/es/packages/uploader/uploader.js +241 -220
  305. package/dist/es/packages/virtuallist/style/style.css +4 -4
  306. package/dist/es/utils/platform-taro.d.ts +1 -0
  307. package/dist/es/utils/platform-taro.js +5 -0
  308. package/dist/nutui.react.umd.js +20248 -3662
  309. package/dist/style.css +1 -1
  310. package/dist/style.scss +108 -0
  311. package/dist/styles/jd-font.scss +9 -1
  312. package/dist/styles/theme-dark.scss +17 -17
  313. package/dist/styles/theme-default.scss +3 -3
  314. package/dist/styles/themes/default.css +1 -0
  315. package/dist/styles/variables-jmapp.scss +4 -0
  316. package/dist/styles/variables-jrkf.scss +4 -0
  317. package/dist/styles/variables.scss +128 -137
  318. package/package.json +8 -3
  319. package/dist/cjs/packages/uploader/file-item.d.ts +0 -19
  320. package/dist/cjs/packages/uploader/file-item.js +0 -28
  321. package/dist/cjs/packages/uploader/utils.d.ts +0 -30
  322. package/dist/cjs/packages/uploader/utils.js +0 -184
  323. package/dist/es/packages/uploader/file-item.d.ts +0 -19
  324. package/dist/es/packages/uploader/file-item.js +0 -18
  325. package/dist/es/packages/uploader/utils.d.ts +0 -30
  326. package/dist/es/packages/uploader/utils.js +0 -154
@@ -4,59 +4,136 @@
4
4
  /* #endif */
5
5
  .nut-indicator {
6
6
  display: flex;
7
- flex-direction: row;
8
7
  width: auto;
8
+ flex-direction: row;
9
9
  flex-wrap: nowrap;
10
10
  align-items: center;
11
- justify-content: center;
12
11
  }
13
- .nut-indicator-dot {
12
+ .nut-indicator-fixed-width {
13
+ width: 21px;
14
+ }
15
+ .nut-indicator-dot, .nut-indicator-line {
14
16
  display: inline-block;
15
17
  vertical-align: middle;
16
- width: var(--nutui-indicator-dot-size, 4px);
17
- height: var(--nutui-indicator-dot-size, 4px);
18
+ width: var(--nutui-indicator-dot-size, 3px);
19
+ height: var(--nutui-indicator-dot-size, 3px);
18
20
  border-radius: 50%;
19
- background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
20
- margin: 0 var(--nutui-indicator-dot-margin, 2px);
21
+ background-color: var(--nutui-gray-4);
22
+ margin: 0 var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
23
+ opacity: 0.4;
21
24
  }
22
- .nut-indicator-dot:first-child {
25
+ .nut-indicator-dot:first-child, .nut-indicator-line:first-child {
23
26
  margin-left: 0px;
24
27
  }
25
- .nut-indicator-dot:last-child {
28
+ .nut-indicator-dot:last-child, .nut-indicator-line:last-child {
26
29
  margin-right: 0px;
27
30
  }
28
- .nut-indicator-active {
29
- width: var(--nutui-indicator-dot-active-size, 8px);
30
- border-radius: var(--nutui-indicator-border-radius, 2px);
31
- background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
31
+ .nut-indicator-dot-active, .nut-indicator-line-active {
32
+ width: var(--nutui-indicator-dot-active-size, 6px);
33
+ border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
34
+ background: var(--nutui-indicator-color, var(--nutui-brand-6));
35
+ opacity: 1;
36
+ }
37
+ .nut-indicator-fixed-width .nut-indicator-dot {
38
+ width: 12px;
39
+ border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
40
+ }
41
+ .nut-indicator-fixed-width .nut-indicator-dot-active {
42
+ width: 6px;
43
+ }
44
+ .nut-indicator-vertical.nut-indicator-fixed-width {
45
+ justify-content: flex-start;
46
+ height: 21px;
47
+ width: auto;
48
+ }
49
+ .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
50
+ width: 3px;
51
+ height: 12px;
52
+ border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
53
+ }
54
+ .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
55
+ height: 6px;
56
+ }
57
+ .nut-indicator-line {
58
+ width: var(--nutui-indicator-dot-active-size, 6px);
59
+ margin: 0;
60
+ border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
61
+ background-color: transparent;
62
+ }
63
+ .nut-indicator-line-active {
64
+ transition: transform 0.3s ease-in-out;
65
+ background: var(--nutui-indicator-color, var(--nutui-brand-6));
32
66
  }
67
+
68
+ .nut-indicator-track {
69
+ position: relative;
70
+ }
71
+ .nut-indicator-track:after {
72
+ display: block;
73
+ content: " ";
74
+ position: absolute;
75
+ width: 100%;
76
+ height: 100%;
77
+ box-sizing: border-box;
78
+ border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
79
+ background-color: var(--nutui-gray-4);
80
+ opacity: 0.4;
81
+ }
82
+
83
+ .nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
84
+ position: relative;
85
+ box-sizing: content-box;
86
+ background: rgba(255, 255, 255, 0.4);
87
+ border: 1px solid rgba(0, 0, 0, 0.06);
88
+ opacity: 1;
89
+ }
90
+ .nut-indicator-white .nut-indicator-line {
91
+ opacity: 0;
92
+ }
93
+ .nut-indicator-white .nut-indicator-line-active {
94
+ opacity: 1;
95
+ background: rgb(255, 255, 255);
96
+ }
97
+ .nut-indicator-white .nut-indicator-dot-active {
98
+ background: rgb(255, 255, 255);
99
+ }
100
+
101
+ .nut-indicator-track.nut-indicator-white:after {
102
+ border: 1px solid rgba(0, 0, 0, 0.06);
103
+ background: rgba(255, 255, 255, 0.4);
104
+ }
105
+
33
106
  .nut-indicator-vertical {
34
107
  display: flex;
35
108
  flex-direction: column;
36
109
  align-items: center;
37
110
  justify-content: center;
38
111
  }
39
- .nut-indicator-vertical-dot {
40
- margin: var(--nutui-indicator-dot-margin, 2px) 0;
112
+ .nut-indicator-vertical .nut-indicator-dot {
113
+ margin: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px)) 0;
41
114
  }
42
- .nut-indicator-vertical-dot:first-child {
115
+ .nut-indicator-vertical .nut-indicator-dot:first-child {
43
116
  margin-top: 0px;
44
117
  }
45
- .nut-indicator-vertical-dot:last-child {
118
+ .nut-indicator-vertical .nut-indicator-dot:last-child {
46
119
  margin-bottom: 0px;
47
120
  }
48
- .nut-indicator-vertical-active {
49
- width: var(--nutui-indicator-dot-size, 4px);
50
- height: var(--nutui-indicator-dot-active-size, 8px);
121
+ .nut-indicator-vertical .nut-indicator-dot-active {
122
+ width: var(--nutui-indicator-dot-size, 3px);
123
+ height: var(--nutui-indicator-dot-active-size, 6px);
124
+ }
125
+ .nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
126
+ width: var(--nutui-indicator-dot-size, 3px);
127
+ height: var(--nutui-indicator-dot-active-size, 6px);
51
128
  }
52
129
 
53
130
  [dir=rtl] .nut-indicator-dot:first-child,
54
131
  .nut-rtl .nut-indicator-dot:first-child {
55
- margin-left: var(--nutui-indicator-dot-margin, 2px);
132
+ margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
56
133
  margin-right: 0px;
57
134
  }
58
135
  [dir=rtl] .nut-indicator-dot:last-child,
59
136
  .nut-rtl .nut-indicator-dot:last-child {
60
- margin-right: var(--nutui-indicator-dot-margin, 2px);
137
+ margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
61
138
  margin-left: 0px;
62
139
  }
@@ -33,7 +33,6 @@
33
33
  justify-content: center;
34
34
  width: 100%;
35
35
  padding-top: 6px;
36
- font-size: $font-size-s;
37
36
  color: $infiniteloading-color;
38
37
  text-align: center;
39
38
 
@@ -41,6 +40,7 @@
41
40
  display: flex;
42
41
  justify-content: center;
43
42
  align-items: center;
43
+ font-size: $font-size-xxs;
44
44
 
45
45
  &-icons {
46
46
  margin-right: 8px;
@@ -13,7 +13,7 @@
13
13
  width: 100%;
14
14
  overflow: hidden;
15
15
  font-size: var(--nutui-font-size-s, 12px);
16
- color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help, #888b94));
16
+ color: var(--nutui-infiniteloading-color, var(--nutui-gray-5));
17
17
  }
18
18
  .nut-infiniteloading .nut-infinite-top-tips {
19
19
  width: 100%;
@@ -34,20 +34,20 @@
34
34
  justify-content: center;
35
35
  width: 100%;
36
36
  padding-top: 6px;
37
- font-size: var(--nutui-font-size-s, 12px);
38
- color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help, #888b94));
37
+ color: var(--nutui-infiniteloading-color, var(--nutui-gray-5));
39
38
  text-align: center;
40
39
  }
41
40
  .nut-infiniteloading .nut-infinite-bottom-tips {
42
41
  display: flex;
43
42
  justify-content: center;
44
43
  align-items: center;
44
+ font-size: var(--nutui-font-size-xxs, 10px);
45
45
  }
46
46
  .nut-infiniteloading .nut-infinite-bottom-tips-icons {
47
47
  margin-right: 8px;
48
48
  }
49
49
  .nut-infiniteloading-primary {
50
- background-color: var(--nutui-color-primary, #ff0f23);
50
+ background-color: var(--nutui-brand-6);
51
51
  }
52
52
  .nut-infiniteloading-primary .nut-infinite-bottom,
53
53
  .nut-infiniteloading-primary .nut-infinite-top {
@@ -19,6 +19,7 @@ export interface InputProps extends BasicComponent {
19
19
  formatTrigger: InputFormatTrigger;
20
20
  autoFocus: boolean;
21
21
  confirmType: InputConfirmType;
22
+ plain: boolean;
22
23
  formatter?: (value: string) => void;
23
24
  onChange?: (value: string) => void;
24
25
  onBlur?: (value: string) => void;
@@ -21,12 +21,13 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
21
21
  clearable: false,
22
22
  clearIcon: null,
23
23
  formatTrigger: 'onChange',
24
- autoFocus: false
24
+ autoFocus: false,
25
+ plain: false
25
26
  });
26
27
  export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
27
28
  var rtl = useRtl();
28
29
  var locale = useConfig().locale;
29
- var _ref = _object_spread({}, defaultProps, props), type = _ref.type, name = _ref.name, placeholder = _ref.placeholder, align = _ref.align, disabled = _ref.disabled, readOnly = _ref.readOnly, maxLength = _ref.maxLength, clearable = _ref.clearable, clearIcon = _ref.clearIcon, formatTrigger = _ref.formatTrigger, autoFocus = _ref.autoFocus, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onFocus = _ref.onFocus, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, onCompositionStart = _ref.onCompositionStart, onCompositionEnd = _ref.onCompositionEnd, rest = _object_without_properties(_ref, [
30
+ var _ref = _object_spread({}, defaultProps, props), type = _ref.type, name = _ref.name, placeholder = _ref.placeholder, align = _ref.align, disabled = _ref.disabled, readOnly = _ref.readOnly, maxLength = _ref.maxLength, clearable = _ref.clearable, clearIcon = _ref.clearIcon, formatTrigger = _ref.formatTrigger, autoFocus = _ref.autoFocus, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onFocus = _ref.onFocus, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, plain = _ref.plain, defaultValue = _ref.defaultValue, _value = _ref.value, onCompositionStart = _ref.onCompositionStart, onCompositionEnd = _ref.onCompositionEnd, rest = _object_without_properties(_ref, [
30
31
  "type",
31
32
  "name",
32
33
  "placeholder",
@@ -46,6 +47,7 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
46
47
  "formatter",
47
48
  "onClick",
48
49
  "confirmType",
50
+ "plain",
49
51
  "defaultValue",
50
52
  "value",
51
53
  "onCompositionStart",
@@ -82,7 +84,9 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
82
84
  var classPrefix = 'nut-input';
83
85
  return [
84
86
  classPrefix,
85
- "".concat(disabled ? "".concat(classPrefix, "-disabled") : '')
87
+ disabled ? "".concat(classPrefix, "-disabled") : '',
88
+ readOnly ? "".concat(classPrefix, "-readonly") : '',
89
+ plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container")
86
90
  ].filter(Boolean).join(' ');
87
91
  }, [
88
92
  disabled
@@ -5,23 +5,29 @@
5
5
  flex-wrap: nowrap;
6
6
  flex: 1;
7
7
  align-items: center;
8
- padding: $input-padding;
9
- line-height: 24px;
10
8
  font-size: $input-font-size;
11
9
  box-sizing: border-box;
12
- border-radius: $input-border-radius;
13
- background-color: $input-background-color;
14
- border-bottom: $input-border-bottom-width solid $input-border-bottom;
15
10
 
16
11
  .nut-icon {
17
- color: #c8c9cc;
12
+ color: $color-text-disabled;
13
+ width: 14px;
14
+ height: 14px;
15
+ font-size: 14px;
16
+ }
17
+ &-container {
18
+ height: 38px;
19
+ padding: $input-padding;
20
+ background-color: $input-background-color;
21
+ border-radius: $input-border-radius;
22
+ border-bottom: $input-border-bottom-width solid $input-border-bottom;
18
23
  }
19
24
  }
20
25
 
21
26
  .nut-input-native {
22
27
  flex: 1;
23
- color: $input-color;
28
+ color: $color-title;
24
29
  font-size: $input-font-size;
30
+ line-height: $input-font-size;
25
31
  padding: 0;
26
32
  border: 0;
27
33
  outline: 0 none;
@@ -31,23 +37,28 @@
31
37
 
32
38
  /* #ifndef rn */
33
39
  .nut-input-native::placeholder {
34
- color: #757575;
40
+ color: $color-text-help;
35
41
  }
36
-
37
42
  /* #endif */
38
43
 
44
+ .nut-input-readonly {
45
+ .nut-input-native {
46
+ color: $color-text-help;
47
+ }
48
+ }
49
+
39
50
  .nut-input-disabled {
40
- color: $input-disabled-color !important;
51
+ color: $color-text-disabled !important;
41
52
 
42
53
  input:disabled {
43
- color: $input-disabled-color;
54
+ color: $color-text-disabled;
44
55
  cursor: not-allowed;
45
56
  background: none;
46
57
  opacity: 1;
47
- -webkit-text-fill-color: $input-disabled-color;
58
+ -webkit-text-fill-color: $color-text-disabled;
48
59
  }
49
60
  }
50
61
 
51
62
  .nut-input-clear {
52
- flex: 0;
63
+ // flex: 0;
53
64
  }
@@ -9,22 +9,28 @@
9
9
  flex-wrap: nowrap;
10
10
  flex: 1;
11
11
  align-items: center;
12
- padding: var(--nutui-input-padding, 10px 25px);
13
- line-height: 24px;
14
12
  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
15
13
  box-sizing: border-box;
16
- border-radius: var(--nutui-input-border-radius, 0);
17
- background-color: var(--nutui-input-background-color, var(--nutui-color-background-overlay, #ffffff));
18
- border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
19
14
  }
20
15
  .nut-input .nut-icon {
21
- color: #c8c9cc;
16
+ color: var(--nutui-gray-4);
17
+ width: 14px;
18
+ height: 14px;
19
+ font-size: 14px;
20
+ }
21
+ .nut-input-container {
22
+ height: 38px;
23
+ padding: var(--nutui-input-padding, 12px);
24
+ background-color: var(--nutui-input-background-color, var(--nutui-gray-1));
25
+ border-radius: var(--nutui-input-border-radius, var(--nutui-radius-s, 6px));
26
+ border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-black-3));
22
27
  }
23
28
 
24
29
  .nut-input-native {
25
30
  flex: 1;
26
- color: var(--nutui-input-color, var(--nutui-color-title, #1a1a1a));
31
+ color: var(--nutui-gray-7);
27
32
  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
33
+ line-height: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
28
34
  padding: 0;
29
35
  border: 0;
30
36
  outline: 0 none;
@@ -34,21 +40,21 @@
34
40
 
35
41
  /* #ifndef rn */
36
42
  .nut-input-native::placeholder {
37
- color: #757575;
43
+ color: var(--nutui-gray-5);
38
44
  }
39
45
 
40
46
  /* #endif */
47
+ .nut-input-readonly .nut-input-native {
48
+ color: var(--nutui-gray-5);
49
+ }
50
+
41
51
  .nut-input-disabled {
42
- color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
52
+ color: var(--nutui-gray-4) !important;
43
53
  }
44
54
  .nut-input-disabled input:disabled {
45
- color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
55
+ color: var(--nutui-gray-4);
46
56
  cursor: not-allowed;
47
57
  background: none;
48
58
  opacity: 1;
49
- -webkit-text-fill-color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
50
- }
51
-
52
- .nut-input-clear {
53
- flex: 0;
59
+ -webkit-text-fill-color: var(--nutui-gray-4);
54
60
  }
@@ -17,8 +17,8 @@
17
17
  height: $inputnumber-button-height;
18
18
  background-color: $inputnumber-button-background-color;
19
19
  .nut-icon {
20
- --nut-icon-width: 20px;
21
- --nut-icon-height: 20px;
20
+ --nut-icon-width: 10px;
21
+ --nut-icon-height: 10px;
22
22
  }
23
23
  }
24
24
 
@@ -7,7 +7,7 @@
7
7
  width: calc(2 * var(--nutui-inputnumber-input-margin, 0px) + 2 * var(--nutui-inputnumber-button-width, 20px) + var(--nutui-inputnumber-input-width, 26px));
8
8
  flex-direction: row;
9
9
  align-items: center;
10
- background-color: var(--nutui-color-background, #f5f6fa);
10
+ background-color: var(--nutui-gray-3);
11
11
  border-radius: var(--nutui-inputnumber-input-border-radius, 4px);
12
12
  overflow: hidden;
13
13
  }
@@ -20,15 +20,15 @@
20
20
  background-color: var(--nutui-inputnumber-button-background-color, transparent);
21
21
  }
22
22
  .nut-inputnumber-minus .nut-icon, .nut-inputnumber-add .nut-icon {
23
- --nut-icon-width: 20px;
24
- --nut-icon-height: 20px;
23
+ --nut-icon-width: 10px;
24
+ --nut-icon-height: 10px;
25
25
  }
26
26
  .nut-inputnumber-icon {
27
- color: var(--nutui-color-text, #505259);
27
+ color: var(--nutui-gray-6);
28
28
  cursor: pointer;
29
29
  }
30
30
  .nut-inputnumber-icon-disabled {
31
- color: var(--nutui-color-text-disabled, #c2c4cc);
31
+ color: var(--nutui-gray-4);
32
32
  cursor: not-allowed;
33
33
  }
34
34
  .nut-inputnumber-input {
@@ -43,17 +43,17 @@
43
43
  border: var(--nutui-inputnumber-input-border, 0);
44
44
  margin-left: var(--nutui-inputnumber-input-margin, 0px);
45
45
  margin-right: var(--nutui-inputnumber-input-margin, 0px);
46
- color: var(--nutui-color-text, #505259);
47
- background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background, #f5f6fa));
46
+ color: var(--nutui-gray-6);
47
+ background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-gray-3));
48
48
  }
49
49
  .nut-inputnumber-input-disabled {
50
- color: var(--nutui-color-text-disabled, #c2c4cc);
50
+ color: var(--nutui-gray-4);
51
51
  }
52
52
  .nut-inputnumber-input::-webkit-outer-spin-button, .nut-inputnumber-input::-webkit-inner-spin-button {
53
53
  appearance: none;
54
54
  }
55
55
  .nut-inputnumber-input-disabled {
56
- color: var(--nutui-color-text-disabled, #c2c4cc);
56
+ color: var(--nutui-gray-4);
57
57
  }
58
58
  .nut-inputnumber-icon-minus {
59
59
  --nut-icon-width: 16px;
@@ -1,3 +1,3 @@
1
1
  import { Loading } from './loading';
2
- export type { LoadingProps, LoadingType, LoadingDirection } from './loading';
2
+ export type { LoadingProps, LoadingType, LoadingDirection } from './types';
3
3
  export default Loading;
@@ -1,10 +1,3 @@
1
- import React, { FunctionComponent, ReactNode } from 'react';
2
- import { BasicComponent } from "../../utils/typings";
3
- export type LoadingType = 'spinner' | 'circular';
4
- export type LoadingDirection = 'horizontal' | 'vertical';
5
- export interface LoadingProps extends BasicComponent {
6
- type: LoadingType;
7
- direction: LoadingDirection;
8
- icon?: ReactNode;
9
- }
10
- export declare const Loading: FunctionComponent<Partial<LoadingProps> & React.HTMLAttributes<HTMLDivElement>>;
1
+ import React from 'react';
2
+ import { LoadingProps } from './types';
3
+ export declare const Loading: React.ForwardRefExoticComponent<Partial<LoadingProps> & React.RefAttributes<any>>;
@@ -1,10 +1,12 @@
1
1
  import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
2
2
  import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
3
3
  import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
4
- import React from "react";
4
+ import React, { useRef } from "react";
5
5
  import classNames from "classnames";
6
6
  import { Loading as IconLoading, Loading1 as IconLoading1 } from "@nutui/icons-react";
7
+ import Lottie from "../lottie";
7
8
  import { ComponentDefaults } from "../../utils/typings";
9
+ import { mergeProps } from "../../utils/merge-props"; // 方便以后扩展设置为键值对形式
8
10
  // 方便以后扩展设置为键值对形式
9
11
  var loadingMap = {
10
12
  circular: IconLoading1,
@@ -13,27 +15,57 @@ var loadingMap = {
13
15
  var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
14
16
  // 对比一下,个人感觉还是Loading1比较好看一些,所以用它作为了默认的loading图标
15
17
  type: 'circular',
16
- direction: 'horizontal'
18
+ direction: 'horizontal',
19
+ lottieProps: {}
17
20
  });
18
- export var Loading = function(props) {
19
- var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, children = _ref.children, direction = _ref.direction, icon = _ref.icon, rest = _object_without_properties(_ref, [
21
+ var defaultLottieProps = {
22
+ loop: true,
23
+ autoplay: true
24
+ };
25
+ export var Loading = /*#__PURE__*/ React.forwardRef(function(props, ref) {
26
+ var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, children = _ref.children, direction = _ref.direction, icon = _ref.icon, lottieProps = _ref.lottieProps, rest = _object_without_properties(_ref, [
20
27
  "className",
21
28
  "style",
22
29
  "children",
23
30
  "direction",
24
- "icon"
31
+ "icon",
32
+ "lottieProps"
25
33
  ]);
34
+ var loadingLottieRef = useRef(null);
35
+ // @ts-ignore
36
+ // const loadingLottieRef: React.MutableRefObject<LottieProps | null> =
37
+ // useRef()
38
+ var mergedLottieProps = mergeProps(defaultLottieProps, lottieProps);
39
+ React.useImperativeHandle(ref, function() {
40
+ return loadingLottieRef;
41
+ });
26
42
  var classPrefix = 'nut-loading';
27
- var CurLoadingIcon = loadingMap[rest.type] || IconLoading1;
43
+ var getLoadingIcon = function() {
44
+ if (!rest.jsonData) {
45
+ console.warn('Lottie animation requires jsonData prop');
46
+ }
47
+ if (rest.type === 'lottie') {
48
+ return /*#__PURE__*/ React.createElement(Lottie, _object_spread_props(_object_spread({}, mergedLottieProps), {
49
+ ref: loadingLottieRef,
50
+ source: rest.jsonData
51
+ }));
52
+ }
53
+ var LoadingIcon = loadingMap[rest.type] || IconLoading1;
54
+ return /*#__PURE__*/ React.createElement(LoadingIcon, {
55
+ className: "".concat(classPrefix, "-icon")
56
+ });
57
+ };
58
+ var iconboxClassName = function() {
59
+ if (rest.type === 'lottie') return "".concat(classPrefix, "-lottie-box");
60
+ return "".concat(classPrefix, "-icon-box");
61
+ };
28
62
  return /*#__PURE__*/ React.createElement("div", {
29
63
  className: classNames(classPrefix, direction === 'vertical' ? "".concat(classPrefix, "-vertical") : '', className),
30
64
  style: style
31
65
  }, /*#__PURE__*/ React.createElement("div", {
32
- className: "".concat(classPrefix, "-icon-box")
33
- }, icon || /*#__PURE__*/ React.createElement(CurLoadingIcon, {
34
- className: "".concat(classPrefix, "-icon")
35
- })), children ? /*#__PURE__*/ React.createElement("div", {
66
+ className: iconboxClassName()
67
+ }, icon || getLoadingIcon()), children ? /*#__PURE__*/ React.createElement("div", {
36
68
  className: "".concat(classPrefix, "-text")
37
- }, children) : '');
38
- };
69
+ }, children) : null);
70
+ });
39
71
  Loading.displayName = 'NutLoading';
@@ -21,9 +21,15 @@
21
21
  font-size: $loading-icon-size;
22
22
  }
23
23
  }
24
+ .nut-loading-lottie-box {
25
+ width: 56px;
26
+ height: 56px;
27
+ border-radius: $radius-base;
28
+ background: $loading-lottie-background;
29
+ }
24
30
 
25
31
  .nut-loading-text {
26
- padding: 8px;
32
+ padding-top: $spacing-base;
27
33
  color: $loading-color;
28
34
  font-size: $loading-font-size;
29
35
  }
@@ -18,14 +18,20 @@
18
18
  animation: nut-loading-rotation 1s infinite linear;
19
19
  }
20
20
  .nut-loading .nut-loading-icon-box .nut-loading-icon {
21
- color: var(--nutui-loading-icon-color, var(--nutui-color-text-help, #888b94));
21
+ color: var(--nutui-loading-icon-color, var(--nutui-gray-5));
22
22
  width: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
23
23
  height: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
24
24
  font-size: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
25
25
  }
26
+ .nut-loading .nut-loading-lottie-box {
27
+ width: 56px;
28
+ height: 56px;
29
+ border-radius: var(--nutui-radius-base, 8px);
30
+ background: var(--nutui-loading-lottie-background, rgba(0, 0, 0, 0.06));
31
+ }
26
32
  .nut-loading .nut-loading-text {
27
- padding: 8px;
28
- color: var(--nutui-loading-color, var(--nutui-color-text-help, #888b94));
33
+ padding-top: var(--nutui-spacing-base, 8px);
34
+ color: var(--nutui-loading-color, var(--nutui-gray-5));
29
35
  font-size: var(--nutui-loading-font-size, var(--nutui-font-size-s, 12px));
30
36
  }
31
37
 
@@ -0,0 +1,13 @@
1
+ import { ReactNode } from 'react';
2
+ import { LottieProps } from '../lottie/types';
3
+ import { BasicComponent } from "../../utils/typings";
4
+ export type LoadingRef = any;
5
+ export type LoadingType = 'spinner' | 'circular' | 'lottie';
6
+ export type LoadingDirection = 'horizontal' | 'vertical';
7
+ export interface LoadingProps extends BasicComponent {
8
+ type: LoadingType;
9
+ jsonData: any;
10
+ lottieProps: Partial<LottieProps>;
11
+ direction: LoadingDirection;
12
+ icon?: ReactNode;
13
+ }
@@ -0,0 +1 @@
1
+ export { };
@@ -0,0 +1,3 @@
1
+ import { Lottie } from './web';
2
+ export type { LottieProps } from './types';
3
+ export default Lottie;
@@ -0,0 +1,2 @@
1
+ import { Lottie } from "./web";
2
+ export default Lottie;
@@ -0,0 +1 @@
1
+ import './style.css'
@@ -0,0 +1 @@
1
+ import './lottie.scss';
File without changes
@@ -0,0 +1,4 @@
1
+ /* #ifdef harmony */
2
+ /* #endif */
3
+ /* #ifndef harmony */
4
+ /* #endif */
@@ -0,0 +1,11 @@
1
+ import React from 'react';
2
+ import { LottieOptions } from 'lottie-react';
3
+ import { BasicComponent } from "../../utils/typings";
4
+ export interface LottieProps extends Omit<LottieOptions, 'animationData'>, BasicComponent {
5
+ style: React.CSSProperties;
6
+ source: NonNullable<unknown>;
7
+ loop: boolean | number;
8
+ autoPlay: boolean;
9
+ initialSegment: [number, number];
10
+ speed: number;
11
+ }
@@ -0,0 +1 @@
1
+ import React from "react";
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ import { LottieProps } from './types';
3
+ export declare const Lottie: React.ForwardRefExoticComponent<Omit<Partial<LottieProps>, "ref"> & React.RefAttributes<unknown>>;