@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (482) hide show
  1. package/CHANGELOG.md +1022 -893
  2. package/README.md +23 -27
  3. package/dist/cjs/locales/base.d.ts +7 -0
  4. package/dist/cjs/locales/en-US.js +7 -0
  5. package/dist/cjs/locales/id-ID.js +7 -0
  6. package/dist/cjs/locales/tr-TR.js +7 -0
  7. package/dist/cjs/locales/zh-CN.js +7 -0
  8. package/dist/cjs/locales/zh-TW.js +7 -0
  9. package/dist/cjs/locales/zh-UG.js +7 -0
  10. package/dist/cjs/packages/actionsheet/actionsheet.js +9 -7
  11. package/dist/cjs/packages/actionsheet/style/actionsheet.scss +1 -1
  12. package/dist/cjs/packages/actionsheet/style/style.css +71 -24
  13. package/dist/cjs/packages/address/address.js +0 -1
  14. package/dist/cjs/packages/address/existRender.js +1 -0
  15. package/dist/cjs/packages/address/style/address.scss +1 -1
  16. package/dist/cjs/packages/address/style/style.css +105 -57
  17. package/dist/cjs/packages/address/types.js +0 -1
  18. package/dist/cjs/packages/animatingnumbers/animatingnumbers.js +4 -3
  19. package/dist/cjs/packages/animatingnumbers/countup.js +18 -9
  20. package/dist/cjs/packages/animatingnumbers/style/style.css +3 -3
  21. package/dist/cjs/packages/audio/audio.js +19 -20
  22. package/dist/cjs/packages/audio/style/style.css +68 -66
  23. package/dist/cjs/packages/avatar/avatar.js +11 -13
  24. package/dist/cjs/packages/avatar/style/style.css +2 -2
  25. package/dist/cjs/packages/avatarcropper/avatarcropper.js +38 -39
  26. package/dist/cjs/packages/backtop/backtop.d.ts +5 -0
  27. package/dist/cjs/packages/backtop/backtop.js +55 -17
  28. package/dist/cjs/packages/backtop/style/backtop.scss +9 -3
  29. package/dist/cjs/packages/backtop/style/style.css +12 -8
  30. package/dist/cjs/packages/backtop/style/style.harmony.css +13 -6
  31. package/dist/cjs/packages/badge/style/style.css +1 -1
  32. package/dist/cjs/packages/barrage/barrage.js +64 -52
  33. package/dist/cjs/packages/barrage/style/barrage.scss +1 -1
  34. package/dist/cjs/packages/barrage/style/style.css +3 -3
  35. package/dist/cjs/packages/button/button.js +5 -3
  36. package/dist/cjs/packages/button/style/style.css +58 -58
  37. package/dist/cjs/packages/calendar/calendar.d.ts +2 -0
  38. package/dist/cjs/packages/calendar/calendar.js +4 -2
  39. package/dist/cjs/packages/calendar/style/calendar.scss +1 -1
  40. package/dist/cjs/packages/calendar/style/style.css +75 -28
  41. package/dist/cjs/packages/calendarcard/style/style.css +4 -4
  42. package/dist/cjs/packages/calendaritem/calendaritem.d.ts +1 -0
  43. package/dist/cjs/packages/calendaritem/calendaritem.js +36 -25
  44. package/dist/cjs/packages/card/style/style.css +16 -14
  45. package/dist/cjs/packages/cascader/cascader.js +26 -13
  46. package/dist/cjs/packages/cascader/style/style.css +88 -40
  47. package/dist/cjs/packages/cell/cell.d.ts +2 -1
  48. package/dist/cjs/packages/cell/cell.js +7 -3
  49. package/dist/cjs/packages/cell/style/cell.scss +20 -0
  50. package/dist/cjs/packages/cell/style/style.css +33 -13
  51. package/dist/cjs/packages/cell/style/style.harmony.css +20 -0
  52. package/dist/cjs/packages/cellgroup/style/style.css +5 -5
  53. package/dist/cjs/packages/checkbox/style/checkbox.scss +3 -3
  54. package/dist/cjs/packages/checkbox/style/style.css +21 -21
  55. package/dist/cjs/packages/checkboxgroup/checkboxgroup.js +7 -8
  56. package/dist/cjs/packages/checkboxgroup/style/checkboxgroup.scss +2 -2
  57. package/dist/cjs/packages/checkboxgroup/style/style.css +5 -5
  58. package/dist/cjs/packages/circleprogress/style/style.css +3 -3
  59. package/dist/cjs/packages/collapse/style/style.css +10 -10
  60. package/dist/cjs/packages/collapseitem/collapseitem.js +0 -1
  61. package/dist/cjs/packages/collapseitem/style/style.css +10 -10
  62. package/dist/cjs/packages/configprovider/configprovider.js +0 -1
  63. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  64. package/dist/cjs/packages/countdown/countdown.js +0 -1
  65. package/dist/cjs/packages/countdown/style/style.css +1 -1
  66. package/dist/cjs/packages/countup/style/style.css +3 -3
  67. package/dist/cjs/packages/datepicker/datepicker.js +4 -5
  68. package/dist/cjs/packages/datepicker/style/style.css +79 -32
  69. package/dist/cjs/packages/dialog/dialog.js +3 -3
  70. package/dist/cjs/packages/dialog/style/style.css +64 -67
  71. package/dist/cjs/packages/divider/style/divider.scss +1 -0
  72. package/dist/cjs/packages/divider/style/style.css +6 -5
  73. package/dist/cjs/packages/drag/drag.js +1 -1
  74. package/dist/cjs/packages/elevator/elevator.js +9 -10
  75. package/dist/cjs/packages/elevator/style/elevator.scss +1 -2
  76. package/dist/cjs/packages/elevator/style/style.css +12 -12
  77. package/dist/cjs/packages/ellipsis/ellipsis.js +9 -10
  78. package/dist/cjs/packages/ellipsis/style/style.css +1 -1
  79. package/dist/cjs/packages/empty/empty.js +0 -2
  80. package/dist/cjs/packages/empty/style/empty.scss +2 -2
  81. package/dist/cjs/packages/empty/style/style.css +6 -6
  82. package/dist/cjs/packages/fixednav/fixednav.js +8 -7
  83. package/dist/cjs/packages/fixednav/style/fixednav.scss +1 -1
  84. package/dist/cjs/packages/fixednav/style/style.css +2 -5
  85. package/dist/cjs/packages/form/form.js +2 -0
  86. package/dist/cjs/packages/form/style/style.css +42 -22
  87. package/dist/cjs/packages/form/types.d.ts +1 -0
  88. package/dist/cjs/packages/form/useform.js +19 -16
  89. package/dist/cjs/packages/formitem/formitem.d.ts +1 -0
  90. package/dist/cjs/packages/formitem/formitem.js +15 -21
  91. package/dist/cjs/packages/formitem/style/style.css +4 -4
  92. package/dist/cjs/packages/grid/style/style.css +7 -7
  93. package/dist/cjs/packages/griditem/griditem.js +0 -2
  94. package/dist/cjs/packages/griditem/style/style.css +6 -6
  95. package/dist/cjs/packages/hoverbutton/style/hoverbutton.scss +4 -4
  96. package/dist/cjs/packages/image/image.js +0 -1
  97. package/dist/cjs/packages/image/style/style.css +2 -2
  98. package/dist/cjs/packages/imagepreview/imagepreview.d.ts +17 -13
  99. package/dist/cjs/packages/imagepreview/imagepreview.js +53 -31
  100. package/dist/cjs/packages/imagepreview/style/style.css +66 -19
  101. package/dist/cjs/packages/indicator/style/style.css +1 -1
  102. package/dist/cjs/packages/infiniteloading/infiniteloading.d.ts +2 -1
  103. package/dist/cjs/packages/infiniteloading/infiniteloading.js +42 -15
  104. package/dist/cjs/packages/infiniteloading/style/infiniteloading.scss +2 -2
  105. package/dist/cjs/packages/infiniteloading/style/style.css +4 -4
  106. package/dist/cjs/packages/input/input.js +5 -7
  107. package/dist/cjs/packages/input/style/style.css +5 -5
  108. package/dist/cjs/packages/inputnumber/inputnumber.d.ts +2 -1
  109. package/dist/cjs/packages/inputnumber/inputnumber.js +35 -13
  110. package/dist/cjs/packages/inputnumber/style/style.css +3 -3
  111. package/dist/cjs/packages/layout/layout.js +1 -4
  112. package/dist/cjs/packages/loading/loading.js +4 -3
  113. package/dist/cjs/packages/loading/style/style.css +6 -6
  114. package/dist/cjs/packages/menu/menu.js +37 -24
  115. package/dist/cjs/packages/menu/style/style.css +8 -11
  116. package/dist/cjs/packages/menuitem/menuitem.d.ts +1 -0
  117. package/dist/cjs/packages/menuitem/menuitem.js +39 -29
  118. package/dist/cjs/packages/menuitem/style/style.css +5 -8
  119. package/dist/cjs/packages/navbar/navbar.js +7 -4
  120. package/dist/cjs/packages/navbar/style/navbar.scss +0 -5
  121. package/dist/cjs/packages/navbar/style/style.css +7 -11
  122. package/dist/cjs/packages/noticebar/style/style.css +2 -2
  123. package/dist/cjs/packages/notify/notify.js +4 -2
  124. package/dist/cjs/packages/notify/style/style.css +4 -4
  125. package/dist/cjs/packages/numberkeyboard/numberkeyboard.js +43 -23
  126. package/dist/cjs/packages/numberkeyboard/style/style.css +73 -26
  127. package/dist/cjs/packages/overlay/style/overlay.scss +0 -4
  128. package/dist/cjs/packages/overlay/style/style.css +1 -4
  129. package/dist/cjs/packages/pagination/pagination.js +2 -3
  130. package/dist/cjs/packages/pagination/style/pagination.scss +2 -2
  131. package/dist/cjs/packages/pagination/style/style.css +7 -7
  132. package/dist/cjs/packages/picker/picker.js +5 -5
  133. package/dist/cjs/packages/picker/pickerpanel.js +8 -7
  134. package/dist/cjs/packages/picker/style/style.css +79 -32
  135. package/dist/cjs/packages/popover/popover.js +14 -13
  136. package/dist/cjs/packages/popover/style/popover.scss +3 -3
  137. package/dist/cjs/packages/popover/style/style.css +66 -19
  138. package/dist/cjs/packages/popup/popup.js +3 -2
  139. package/dist/cjs/packages/popup/style/popup.scss +52 -3
  140. package/dist/cjs/packages/popup/style/style.css +63 -16
  141. package/dist/cjs/packages/popup/style/style.harmony.css +133 -9
  142. package/dist/cjs/packages/price/style/price.scss +1 -1
  143. package/dist/cjs/packages/price/style/style.css +3 -3
  144. package/dist/cjs/packages/progress/progress.js +65 -25
  145. package/dist/cjs/packages/progress/style/progress.scss +4 -2
  146. package/dist/cjs/packages/progress/style/style.css +5 -4
  147. package/dist/cjs/packages/progress/style/style.harmony.css +5 -4
  148. package/dist/cjs/packages/pulltorefresh/pulltorefresh.js +25 -9
  149. package/dist/cjs/packages/pulltorefresh/style/pulltorefresh.scss +7 -2
  150. package/dist/cjs/packages/pulltorefresh/style/style.css +6 -3
  151. package/dist/cjs/packages/pulltorefresh/style/style.harmony.css +13 -1
  152. package/dist/cjs/packages/radio/radio.js +16 -14
  153. package/dist/cjs/packages/radio/style/radio.scss +2 -2
  154. package/dist/cjs/packages/radio/style/style.css +9 -9
  155. package/dist/cjs/packages/radiogroup/radiogroup.js +5 -3
  156. package/dist/cjs/packages/radiogroup/style/radiogroup.scss +2 -2
  157. package/dist/cjs/packages/radiogroup/style/style.css +2 -2
  158. package/dist/cjs/packages/range/range.js +51 -42
  159. package/dist/cjs/packages/range/style/range.scss +4 -2
  160. package/dist/cjs/packages/range/style/style.css +9 -7
  161. package/dist/cjs/packages/resultpage/style/style.css +5 -5
  162. package/dist/cjs/packages/searchbar/searchbar.d.ts +0 -14
  163. package/dist/cjs/packages/searchbar/style/style.css +7 -7
  164. package/dist/cjs/packages/shortpassword/shortpassword.js +15 -14
  165. package/dist/cjs/packages/shortpassword/style/shortpassword.scss +3 -3
  166. package/dist/cjs/packages/shortpassword/style/style.css +74 -27
  167. package/dist/cjs/packages/sidenavbar/sidenavbar.js +5 -4
  168. package/dist/cjs/packages/sidenavbar/style/style.css +67 -20
  169. package/dist/cjs/packages/sidenavbaritem/style/style.css +2 -2
  170. package/dist/cjs/packages/signature/signature.js +4 -3
  171. package/dist/cjs/packages/signature/style/style.css +3 -3
  172. package/dist/cjs/packages/skeleton/style/style.css +5 -5
  173. package/dist/cjs/packages/skeleton/style/style.harmony.css +90 -68
  174. package/dist/cjs/packages/step/style/style.css +16 -16
  175. package/dist/cjs/packages/steps/style/style.css +16 -16
  176. package/dist/cjs/packages/sticky/sticky.js +27 -31
  177. package/dist/cjs/packages/subsidenavbar/style/style.css +2 -2
  178. package/dist/cjs/packages/subsidenavbar/subsidenavbar.js +3 -2
  179. package/dist/cjs/packages/swipe/swipe.js +3 -3
  180. package/dist/cjs/packages/swiper/style/style.css +1 -1
  181. package/dist/cjs/packages/swiper/swiper.d.ts +2 -1
  182. package/dist/cjs/packages/swiper/swiper.js +0 -1
  183. package/dist/cjs/packages/swiperitem/swiperitem.js +0 -1
  184. package/dist/cjs/packages/switch/style/style.css +4 -4
  185. package/dist/cjs/packages/switch/style/switch.scss +1 -1
  186. package/dist/cjs/packages/tabbar/style/style.css +5 -5
  187. package/dist/cjs/packages/tabbar/tabbar.js +4 -3
  188. package/dist/cjs/packages/tabbaritem/style/style.css +4 -4
  189. package/dist/cjs/packages/tabbaritem/tabbaritem.js +5 -4
  190. package/dist/cjs/packages/table/style/style.css +12 -12
  191. package/dist/cjs/packages/table/table.js +21 -17
  192. package/dist/cjs/packages/tabpane/style/style.css +1 -1
  193. package/dist/cjs/packages/tabpane/tabpane.js +2 -1
  194. package/dist/cjs/packages/tabs/style/style.css +19 -18
  195. package/dist/cjs/packages/tabs/style/tabs.scss +6 -5
  196. package/dist/cjs/packages/tabs/tabs.js +2 -0
  197. package/dist/cjs/packages/tag/style/style.css +10 -8
  198. package/dist/cjs/packages/tag/style/style.harmony.css +4 -2
  199. package/dist/cjs/packages/tag/style/tag.scss +2 -0
  200. package/dist/cjs/packages/textarea/style/style.css +16 -16
  201. package/dist/cjs/packages/textarea/style/style.harmony.css +9 -9
  202. package/dist/cjs/packages/textarea/style/textarea.scss +10 -11
  203. package/dist/cjs/packages/textarea/textarea.js +1 -1
  204. package/dist/cjs/packages/timedetail/style/style.css +4 -4
  205. package/dist/cjs/packages/timedetail/style/timedetail.scss +1 -1
  206. package/dist/cjs/packages/timedetail/timedetail.js +3 -2
  207. package/dist/cjs/packages/timeselect/style/style.css +74 -27
  208. package/dist/cjs/packages/timeselect/timeselect.js +5 -5
  209. package/dist/cjs/packages/toast/style/style.css +3 -3
  210. package/dist/cjs/packages/toast/style/toast.scss +2 -2
  211. package/dist/cjs/packages/toast/toast.js +2 -2
  212. package/dist/cjs/packages/tour/style/style.css +68 -21
  213. package/dist/cjs/packages/trendarrow/style/style.css +1 -1
  214. package/dist/cjs/packages/uploader/preview.js +13 -14
  215. package/dist/cjs/packages/uploader/style/style.css +17 -14
  216. package/dist/cjs/packages/uploader/style/uploader.scss +4 -3
  217. package/dist/cjs/packages/uploader/uploader.d.ts +2 -3
  218. package/dist/cjs/packages/uploader/uploader.js +45 -20
  219. package/dist/cjs/packages/uploader/utils.js +8 -5
  220. package/dist/cjs/packages/virtuallist/style/style.css +4 -4
  221. package/dist/cjs/packages/watermark/watermark.d.ts +2 -0
  222. package/dist/cjs/packages/watermark/watermark.js +4 -2
  223. package/dist/cjs/utils/get-rect-by-taro.js +1 -1
  224. package/dist/cjs/utils/get-scroll-parent.d.ts +1 -1
  225. package/dist/cjs/utils/merge-props.d.ts +9 -5
  226. package/dist/cjs/utils/merge-props.js +37 -6
  227. package/dist/cjs/utils/raf.js +3 -2
  228. package/dist/cjs/utils/typings.d.ts +1 -0
  229. package/dist/cjs/utils/use-client-rect.d.ts +1 -1
  230. package/dist/es/locales/base.d.ts +7 -0
  231. package/dist/es/locales/en-US.js +7 -0
  232. package/dist/es/locales/id-ID.js +7 -0
  233. package/dist/es/locales/tr-TR.js +7 -0
  234. package/dist/es/locales/zh-CN.js +7 -0
  235. package/dist/es/locales/zh-TW.js +7 -0
  236. package/dist/es/locales/zh-UG.js +7 -0
  237. package/dist/es/packages/actionsheet/actionsheet.js +9 -7
  238. package/dist/es/packages/actionsheet/style/actionsheet.scss +1 -1
  239. package/dist/es/packages/actionsheet/style/style.css +71 -24
  240. package/dist/es/packages/address/address.js +0 -1
  241. package/dist/es/packages/address/existRender.js +1 -0
  242. package/dist/es/packages/address/style/address.scss +1 -1
  243. package/dist/es/packages/address/style/style.css +105 -57
  244. package/dist/es/packages/address/types.js +0 -1
  245. package/dist/es/packages/animatingnumbers/animatingnumbers.js +4 -3
  246. package/dist/es/packages/animatingnumbers/countup.js +19 -10
  247. package/dist/es/packages/animatingnumbers/style/style.css +3 -3
  248. package/dist/es/packages/audio/audio.js +19 -20
  249. package/dist/es/packages/audio/style/style.css +68 -66
  250. package/dist/es/packages/avatar/avatar.js +12 -13
  251. package/dist/es/packages/avatar/style/style.css +2 -2
  252. package/dist/es/packages/avatarcropper/avatarcropper.js +39 -40
  253. package/dist/es/packages/backtop/backtop.d.ts +8 -19
  254. package/dist/es/packages/backtop/backtop.js +57 -19
  255. package/dist/es/packages/backtop/style/backtop.scss +9 -3
  256. package/dist/es/packages/backtop/style/style.css +12 -8
  257. package/dist/es/packages/backtop/style/style.harmony.css +13 -6
  258. package/dist/es/packages/badge/style/style.css +1 -1
  259. package/dist/es/packages/barrage/barrage.js +64 -52
  260. package/dist/es/packages/barrage/style/barrage.scss +1 -1
  261. package/dist/es/packages/barrage/style/style.css +3 -3
  262. package/dist/es/packages/button/button.js +5 -3
  263. package/dist/es/packages/button/style/style.css +58 -58
  264. package/dist/es/packages/calendar/calendar.d.ts +10 -0
  265. package/dist/es/packages/calendar/calendar.js +4 -2
  266. package/dist/es/packages/calendar/style/calendar.scss +1 -1
  267. package/dist/es/packages/calendar/style/style.css +75 -28
  268. package/dist/es/packages/calendarcard/style/style.css +4 -4
  269. package/dist/es/packages/calendaritem/calendaritem.d.ts +1 -0
  270. package/dist/es/packages/calendaritem/calendaritem.js +37 -26
  271. package/dist/es/packages/card/style/style.css +16 -14
  272. package/dist/es/packages/cascader/cascader.js +27 -14
  273. package/dist/es/packages/cascader/style/style.css +88 -40
  274. package/dist/es/packages/cell/cell.d.ts +2 -1
  275. package/dist/es/packages/cell/cell.js +7 -3
  276. package/dist/es/packages/cell/style/cell.scss +20 -0
  277. package/dist/es/packages/cell/style/style.css +33 -13
  278. package/dist/es/packages/cell/style/style.harmony.css +20 -0
  279. package/dist/es/packages/cellgroup/style/style.css +5 -5
  280. package/dist/es/packages/checkbox/style/checkbox.scss +3 -3
  281. package/dist/es/packages/checkbox/style/style.css +21 -21
  282. package/dist/es/packages/checkboxgroup/checkboxgroup.js +7 -8
  283. package/dist/es/packages/checkboxgroup/style/checkboxgroup.scss +2 -2
  284. package/dist/es/packages/checkboxgroup/style/style.css +5 -5
  285. package/dist/es/packages/circleprogress/style/style.css +3 -3
  286. package/dist/es/packages/collapse/style/style.css +10 -10
  287. package/dist/es/packages/collapseitem/collapseitem.js +0 -1
  288. package/dist/es/packages/collapseitem/style/style.css +10 -10
  289. package/dist/es/packages/configprovider/configprovider.js +0 -1
  290. package/dist/es/packages/configprovider/types.d.ts +1 -1
  291. package/dist/es/packages/countdown/countdown.js +0 -1
  292. package/dist/es/packages/countdown/style/style.css +1 -1
  293. package/dist/es/packages/countup/style/style.css +3 -3
  294. package/dist/es/packages/datepicker/datepicker.js +4 -5
  295. package/dist/es/packages/datepicker/style/style.css +79 -32
  296. package/dist/es/packages/dialog/dialog.js +3 -3
  297. package/dist/es/packages/dialog/style/style.css +64 -67
  298. package/dist/es/packages/divider/style/divider.scss +1 -0
  299. package/dist/es/packages/divider/style/style.css +6 -5
  300. package/dist/es/packages/drag/drag.js +1 -1
  301. package/dist/es/packages/elevator/elevator.js +10 -11
  302. package/dist/es/packages/elevator/style/elevator.scss +1 -2
  303. package/dist/es/packages/elevator/style/style.css +12 -12
  304. package/dist/es/packages/ellipsis/ellipsis.js +7 -10
  305. package/dist/es/packages/ellipsis/style/style.css +1 -1
  306. package/dist/es/packages/empty/empty.js +0 -2
  307. package/dist/es/packages/empty/style/empty.scss +2 -2
  308. package/dist/es/packages/empty/style/style.css +6 -6
  309. package/dist/es/packages/fixednav/fixednav.js +8 -7
  310. package/dist/es/packages/fixednav/style/fixednav.scss +1 -1
  311. package/dist/es/packages/fixednav/style/style.css +2 -5
  312. package/dist/es/packages/form/form.js +2 -0
  313. package/dist/es/packages/form/style/style.css +42 -22
  314. package/dist/es/packages/form/types.d.ts +1 -0
  315. package/dist/es/packages/form/useform.js +16 -16
  316. package/dist/es/packages/formitem/formitem.d.ts +5 -0
  317. package/dist/es/packages/formitem/formitem.js +16 -21
  318. package/dist/es/packages/formitem/style/style.css +4 -4
  319. package/dist/es/packages/grid/style/style.css +7 -7
  320. package/dist/es/packages/griditem/griditem.js +0 -2
  321. package/dist/es/packages/griditem/style/style.css +6 -6
  322. package/dist/es/packages/hoverbutton/style/hoverbutton.scss +4 -4
  323. package/dist/es/packages/image/image.js +0 -1
  324. package/dist/es/packages/image/style/style.css +2 -2
  325. package/dist/es/packages/imagepreview/imagepreview.d.ts +17 -13
  326. package/dist/es/packages/imagepreview/imagepreview.js +51 -29
  327. package/dist/es/packages/imagepreview/style/style.css +66 -19
  328. package/dist/es/packages/indicator/style/style.css +1 -1
  329. package/dist/es/packages/infiniteloading/infiniteloading.d.ts +13 -56
  330. package/dist/es/packages/infiniteloading/infiniteloading.js +44 -17
  331. package/dist/es/packages/infiniteloading/style/infiniteloading.scss +2 -2
  332. package/dist/es/packages/infiniteloading/style/style.css +4 -4
  333. package/dist/es/packages/input/input.js +5 -7
  334. package/dist/es/packages/input/style/style.css +5 -5
  335. package/dist/es/packages/inputnumber/inputnumber.d.ts +2 -1
  336. package/dist/es/packages/inputnumber/inputnumber.js +35 -13
  337. package/dist/es/packages/inputnumber/style/style.css +3 -3
  338. package/dist/es/packages/layout/layout.js +1 -4
  339. package/dist/es/packages/loading/loading.js +4 -3
  340. package/dist/es/packages/loading/style/style.css +6 -6
  341. package/dist/es/packages/menu/menu.js +38 -25
  342. package/dist/es/packages/menu/style/style.css +8 -11
  343. package/dist/es/packages/menuitem/menuitem.d.ts +5 -0
  344. package/dist/es/packages/menuitem/menuitem.js +40 -30
  345. package/dist/es/packages/menuitem/style/style.css +5 -8
  346. package/dist/es/packages/navbar/navbar.js +7 -4
  347. package/dist/es/packages/navbar/style/navbar.scss +0 -5
  348. package/dist/es/packages/navbar/style/style.css +7 -11
  349. package/dist/es/packages/noticebar/style/style.css +2 -2
  350. package/dist/es/packages/notify/notify.js +5 -3
  351. package/dist/es/packages/notify/style/style.css +4 -4
  352. package/dist/es/packages/numberkeyboard/numberkeyboard.js +43 -23
  353. package/dist/es/packages/numberkeyboard/style/style.css +73 -26
  354. package/dist/es/packages/overlay/style/overlay.scss +0 -4
  355. package/dist/es/packages/overlay/style/style.css +1 -4
  356. package/dist/es/packages/pagination/pagination.js +2 -3
  357. package/dist/es/packages/pagination/style/pagination.scss +2 -2
  358. package/dist/es/packages/pagination/style/style.css +7 -7
  359. package/dist/es/packages/picker/picker.js +5 -5
  360. package/dist/es/packages/picker/pickerpanel.js +8 -7
  361. package/dist/es/packages/picker/style/style.css +79 -32
  362. package/dist/es/packages/popover/popover.js +14 -13
  363. package/dist/es/packages/popover/style/popover.scss +3 -3
  364. package/dist/es/packages/popover/style/style.css +66 -19
  365. package/dist/es/packages/popup/popup.d.ts +18 -90
  366. package/dist/es/packages/popup/popup.js +3 -2
  367. package/dist/es/packages/popup/style/popup.scss +52 -3
  368. package/dist/es/packages/popup/style/style.css +63 -16
  369. package/dist/es/packages/popup/style/style.harmony.css +133 -9
  370. package/dist/es/packages/price/style/price.scss +1 -1
  371. package/dist/es/packages/price/style/style.css +3 -3
  372. package/dist/es/packages/progress/progress.d.ts +8 -40
  373. package/dist/es/packages/progress/progress.js +66 -25
  374. package/dist/es/packages/progress/style/progress.scss +4 -2
  375. package/dist/es/packages/progress/style/style.css +5 -4
  376. package/dist/es/packages/progress/style/style.harmony.css +5 -4
  377. package/dist/es/packages/pulltorefresh/pulltorefresh.d.ts +12 -60
  378. package/dist/es/packages/pulltorefresh/pulltorefresh.js +25 -9
  379. package/dist/es/packages/pulltorefresh/style/pulltorefresh.scss +7 -2
  380. package/dist/es/packages/pulltorefresh/style/style.css +6 -3
  381. package/dist/es/packages/pulltorefresh/style/style.harmony.css +13 -1
  382. package/dist/es/packages/radio/radio.js +16 -14
  383. package/dist/es/packages/radio/style/radio.scss +2 -2
  384. package/dist/es/packages/radio/style/style.css +9 -9
  385. package/dist/es/packages/radiogroup/radiogroup.js +5 -3
  386. package/dist/es/packages/radiogroup/style/radiogroup.scss +2 -2
  387. package/dist/es/packages/radiogroup/style/style.css +2 -2
  388. package/dist/es/packages/range/range.js +51 -43
  389. package/dist/es/packages/range/style/range.scss +4 -2
  390. package/dist/es/packages/range/style/style.css +9 -7
  391. package/dist/es/packages/resultpage/style/style.css +5 -5
  392. package/dist/es/packages/searchbar/searchbar.d.ts +14 -14
  393. package/dist/es/packages/searchbar/style/style.css +7 -7
  394. package/dist/es/packages/shortpassword/shortpassword.js +15 -14
  395. package/dist/es/packages/shortpassword/style/shortpassword.scss +3 -3
  396. package/dist/es/packages/shortpassword/style/style.css +74 -27
  397. package/dist/es/packages/sidenavbar/sidenavbar.js +5 -4
  398. package/dist/es/packages/sidenavbar/style/style.css +67 -20
  399. package/dist/es/packages/sidenavbaritem/style/style.css +2 -2
  400. package/dist/es/packages/signature/signature.js +4 -3
  401. package/dist/es/packages/signature/style/style.css +3 -3
  402. package/dist/es/packages/skeleton/style/style.css +5 -5
  403. package/dist/es/packages/skeleton/style/style.harmony.css +90 -68
  404. package/dist/es/packages/step/style/style.css +16 -16
  405. package/dist/es/packages/steps/style/style.css +16 -16
  406. package/dist/es/packages/sticky/sticky.js +29 -33
  407. package/dist/es/packages/subsidenavbar/style/style.css +2 -2
  408. package/dist/es/packages/subsidenavbar/subsidenavbar.js +3 -2
  409. package/dist/es/packages/swipe/swipe.js +2 -3
  410. package/dist/es/packages/swiper/style/style.css +1 -1
  411. package/dist/es/packages/swiper/swiper.d.ts +2 -1
  412. package/dist/es/packages/swiper/swiper.js +0 -1
  413. package/dist/es/packages/swiperitem/swiperitem.js +0 -1
  414. package/dist/es/packages/switch/style/style.css +4 -4
  415. package/dist/es/packages/switch/style/switch.scss +1 -1
  416. package/dist/es/packages/tabbar/style/style.css +5 -5
  417. package/dist/es/packages/tabbar/tabbar.d.ts +1 -1
  418. package/dist/es/packages/tabbar/tabbar.js +4 -3
  419. package/dist/es/packages/tabbaritem/style/style.css +4 -4
  420. package/dist/es/packages/tabbaritem/tabbaritem.js +5 -4
  421. package/dist/es/packages/table/style/style.css +12 -12
  422. package/dist/es/packages/table/table.js +21 -17
  423. package/dist/es/packages/tabpane/style/style.css +1 -1
  424. package/dist/es/packages/tabpane/tabpane.js +2 -1
  425. package/dist/es/packages/tabs/style/style.css +19 -18
  426. package/dist/es/packages/tabs/style/tabs.scss +6 -5
  427. package/dist/es/packages/tabs/tabs.js +2 -0
  428. package/dist/es/packages/tag/style/style.css +10 -8
  429. package/dist/es/packages/tag/style/style.harmony.css +4 -2
  430. package/dist/es/packages/tag/style/tag.scss +2 -0
  431. package/dist/es/packages/textarea/style/style.css +16 -16
  432. package/dist/es/packages/textarea/style/style.harmony.css +9 -9
  433. package/dist/es/packages/textarea/style/textarea.scss +10 -11
  434. package/dist/es/packages/textarea/textarea.js +1 -1
  435. package/dist/es/packages/timedetail/style/style.css +4 -4
  436. package/dist/es/packages/timedetail/style/timedetail.scss +1 -1
  437. package/dist/es/packages/timedetail/timedetail.js +3 -2
  438. package/dist/es/packages/timeselect/style/style.css +74 -27
  439. package/dist/es/packages/timeselect/timeselect.js +5 -5
  440. package/dist/es/packages/toast/style/style.css +3 -3
  441. package/dist/es/packages/toast/style/toast.scss +2 -2
  442. package/dist/es/packages/toast/toast.js +2 -2
  443. package/dist/es/packages/tour/style/style.css +68 -21
  444. package/dist/es/packages/trendarrow/style/style.css +1 -1
  445. package/dist/es/packages/uploader/preview.js +14 -15
  446. package/dist/es/packages/uploader/style/style.css +17 -14
  447. package/dist/es/packages/uploader/style/uploader.scss +4 -3
  448. package/dist/es/packages/uploader/uploader.d.ts +10 -3
  449. package/dist/es/packages/uploader/uploader.js +48 -23
  450. package/dist/es/packages/uploader/utils.js +8 -5
  451. package/dist/es/packages/virtuallist/style/style.css +4 -4
  452. package/dist/es/packages/watermark/watermark.d.ts +10 -0
  453. package/dist/es/packages/watermark/watermark.js +4 -2
  454. package/dist/es/utils/get-rect-by-taro.js +1 -1
  455. package/dist/es/utils/get-scroll-parent.d.ts +1 -1
  456. package/dist/es/utils/merge-props.d.ts +9 -5
  457. package/dist/es/utils/merge-props.js +30 -3
  458. package/dist/es/utils/raf.js +3 -2
  459. package/dist/es/utils/typings.d.ts +1 -0
  460. package/dist/es/utils/use-client-rect.d.ts +1 -1
  461. package/dist/nutui.react.umd.js +1554 -1192
  462. package/dist/style.css +1 -1
  463. package/dist/styles/font-jrkf/config.json +175 -0
  464. package/dist/styles/font-jrkf/demo.css +539 -0
  465. package/dist/styles/font-jrkf/demo_index.html +1821 -0
  466. package/dist/styles/font-jrkf/iconfont.css +299 -0
  467. package/dist/styles/font-jrkf/iconfont.eot +0 -0
  468. package/dist/styles/font-jrkf/iconfont.js +68 -0
  469. package/dist/styles/font-jrkf/iconfont.json +506 -0
  470. package/dist/styles/font-jrkf/iconfont.svg +356 -0
  471. package/dist/styles/font-jrkf/iconfont.ttf +0 -0
  472. package/dist/styles/font-jrkf/iconfont.woff +0 -0
  473. package/dist/styles/font-jrkf/iconfont.woff2 +0 -0
  474. package/dist/styles/theme-dark.scss +254 -59
  475. package/dist/styles/theme-default.scss +198 -29
  476. package/dist/styles/theme-jmapp.scss +1 -1
  477. package/dist/styles/theme-jrkf.scss +260 -0
  478. package/dist/styles/themes/default.scss +39 -39
  479. package/dist/styles/variables-jmapp.scss +150 -110
  480. package/dist/styles/variables-jrkf.scss +2504 -0
  481. package/dist/styles/variables.scss +190 -179
  482. package/package.json +6 -4
@@ -6,9 +6,12 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
6
6
  import React, { useEffect, useRef, useState } from "react";
7
7
  import classNames from "classnames";
8
8
  import Taro from "@tarojs/taro";
9
+ import { View } from "@tarojs/components";
10
+ import pxTransform from "../../utils/px-transform";
9
11
  import { ComponentDefaults } from "../../utils/typings";
10
12
  import { useRtl } from "../configprovider/index";
11
13
  import useUuid from "../../utils/use-uuid";
14
+ import { harmony, harmonyAndRn, rn, web } from "../../utils/platform-taro";
12
15
  var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
13
16
  percent: 0,
14
17
  showText: false,
@@ -35,14 +38,18 @@ export var Progress = function(props) {
35
38
  var _obj;
36
39
  var classesInner = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-inner"), true), _define_property(_obj, "".concat(classPrefix, "-active"), animated), _obj));
37
40
  var stylesOuter = {
38
- height: "".concat(strokeWidth, "px"),
39
- background: background
41
+ width: '100%',
42
+ backgroundColor: background
40
43
  };
41
- var _useState = _sliced_to_array(useState(0), 2), displayPercent = _useState[0], setDispalyPercent = _useState[1];
44
+ var _useState = _sliced_to_array(useState(percent), 2), displayPercent = _useState[0], setDispalyPercent = _useState[1];
42
45
  var stylesInner = {
43
46
  width: "".concat(displayPercent, "%"),
44
- background: color
47
+ backgroundColor: color || '#FF0F23'
45
48
  };
49
+ if (strokeWidth) {
50
+ stylesOuter.height = pxTransform(Number(strokeWidth));
51
+ stylesInner.height = pxTransform(Number(strokeWidth));
52
+ }
46
53
  var handlePercent = function() {
47
54
  var timer = null;
48
55
  if (delay) {
@@ -52,7 +59,7 @@ export var Progress = function(props) {
52
59
  }, delay);
53
60
  }
54
61
  return function() {
55
- lazy && resetObserver(Taro.getEnv());
62
+ lazy && resetObserver();
56
63
  timer && clearTimeout(timer);
57
64
  };
58
65
  };
@@ -66,9 +73,9 @@ export var Progress = function(props) {
66
73
  var webObserver = useRef(null);
67
74
  var uuid = useUuid();
68
75
  var selector = "".concat(classPrefix, "-lazy-").concat(uuid);
69
- var resetObserver = function(env) {
70
- var observer = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
71
- if (env === 'WEB') {
76
+ var resetObserver = function() {
77
+ var observer = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
78
+ if (web()) {
72
79
  webObserver.current.disconnect && webObserver.current.disconnect();
73
80
  } else {
74
81
  observer && observer.disconnect();
@@ -123,35 +130,69 @@ export var Progress = function(props) {
123
130
  handlePercent();
124
131
  };
125
132
  useEffect(function() {
126
- if (Taro.getEnv() === 'WEB') {
133
+ if (web()) {
127
134
  handleWebObserver();
128
- } else {
135
+ } else if (!harmonyAndRn()) {
129
136
  handleOtherObserver();
130
137
  }
131
138
  }, []);
132
- return /*#__PURE__*/ React.createElement("div", _object_spread({
139
+ var getTextStyle = function() {
140
+ var value = harmony() ? '93%' : '99%';
141
+ return rtl ? {
142
+ right: value
143
+ } : {
144
+ left: value
145
+ };
146
+ };
147
+ var computeRight = function() {
148
+ if (children) {
149
+ return 0;
150
+ }
151
+ if (!harmonyAndRn()) {
152
+ return Math.floor("".concat(percent, "%").length * 9 / 2);
153
+ }
154
+ if (rn()) {
155
+ return "".concat(percent, "%").length * 9 + 4;
156
+ }
157
+ return Math.floor(("".concat(percent, "%").length * 9 + 4) / 2);
158
+ };
159
+ var computeInnerStyle = function() {
160
+ var style = {
161
+ backgroundColor: color || '#ff0f23'
162
+ };
163
+ if (harmonyAndRn()) {
164
+ style.width = harmony() ? pxTransform("".concat(percent, "%").length * 9 + 4) : "".concat(percent, "%").length * 9 + 4;
165
+ }
166
+ return style;
167
+ };
168
+ return /*#__PURE__*/ React.createElement(View, _object_spread({
133
169
  ref: progressRef,
134
170
  id: selector,
135
171
  className: classNames(classPrefix, className),
136
172
  style: style
137
- }, rest), /*#__PURE__*/ React.createElement("div", {
173
+ }, rest), /*#__PURE__*/ React.createElement(View, {
138
174
  className: "".concat(classPrefix, "-outer"),
139
175
  style: stylesOuter
140
- }, /*#__PURE__*/ React.createElement("div", {
176
+ }, /*#__PURE__*/ React.createElement(View, {
141
177
  className: classesInner,
142
- style: stylesInner
143
- }, showText && /*#__PURE__*/ React.createElement("div", {
178
+ style: _object_spread_props(_object_spread({}, stylesInner), {
179
+ position: 'relative'
180
+ })
181
+ }, showText && /*#__PURE__*/ React.createElement(View, {
182
+ style: _define_property({
183
+ position: 'relative'
184
+ }, rtl ? 'left' : 'right', computeRight())
185
+ }, /*#__PURE__*/ React.createElement(View, {
144
186
  className: "".concat(classPrefix, "-text"),
145
- style: rtl ? {
146
- right: "".concat(displayPercent, "%")
147
- } : {
148
- left: "".concat(displayPercent, "%")
149
- }
150
- }, children || /*#__PURE__*/ React.createElement("div", {
187
+ style: _object_spread_props(_object_spread({}, getTextStyle()), {
188
+ height: // eslint-disable-next-line no-nested-ternary
189
+ harmony() ? pxTransform(strokeWidth ? Number(strokeWidth) + 8 : 18) : strokeWidth ? Number(strokeWidth) + 8 : 18,
190
+ position: 'absolute',
191
+ top: -(strokeWidth ? (Number(strokeWidth) + 8 - 9) / 2 + 5 : 9)
192
+ })
193
+ }, children || /*#__PURE__*/ React.createElement(View, {
151
194
  className: "".concat(classPrefix, "-text-inner"),
152
- style: {
153
- background: color
154
- }
155
- }, percent, "%")))));
195
+ style: computeInnerStyle()
196
+ }, "".concat(percent, "%")))))));
156
197
  };
157
198
  Progress.displayName = 'NutProgress';
@@ -29,7 +29,7 @@
29
29
  justify-content: center;
30
30
  transition: all 0.4s;
31
31
  border-radius: $progress-border-radius;
32
- background: $progress-color;
32
+ background-color: $progress-color;
33
33
  }
34
34
 
35
35
  &-text {
@@ -39,10 +39,12 @@
39
39
  top: $progress-text-position-top;
40
40
  bottom: $progress-text-position-bottom;
41
41
  transition: all 0.4s;
42
- transform: translate(-50%);
42
+ // transform: translate(-50%);
43
43
 
44
44
  &-inner {
45
45
  display: flex;
46
+ flex-direction: row;
47
+ justify-content: center;
46
48
  align-items: center;
47
49
  height: 100%;
48
50
  width: 100%;
@@ -8,7 +8,7 @@
8
8
  flex: auto;
9
9
  border-radius: var(--nutui-progress-border-radius, 12px);
10
10
  height: var(--nutui-progress-height, 10px);
11
- background: var(--nutui-progress-background, var(--nutui-gray-3, #f5f6fa));
11
+ background: var(--nutui-progress-background, var(--nutui-color-background, #f5f6fa));
12
12
  }
13
13
  .nut-progress-outer .nut-progress-active:before {
14
14
  content: "";
@@ -27,7 +27,7 @@
27
27
  justify-content: center;
28
28
  transition: all 0.4s;
29
29
  border-radius: var(--nutui-progress-border-radius, 12px);
30
- background: var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
30
+ background-color: var(--nutui-progress-color, #ff0f23);
31
31
  }
32
32
  .nut-progress-text {
33
33
  display: flex;
@@ -36,10 +36,11 @@
36
36
  top: var(--nutui-progress-text-position-top, -4px);
37
37
  bottom: var(--nutui-progress-text-position-bottom, -4px);
38
38
  transition: all 0.4s;
39
- transform: translate(-50%);
40
39
  }
41
40
  .nut-progress-text-inner {
42
41
  display: flex;
42
+ flex-direction: row;
43
+ justify-content: center;
43
44
  align-items: center;
44
45
  height: 100%;
45
46
  width: 100%;
@@ -48,7 +49,7 @@
48
49
  border-radius: var(--nutui-progress-text-border-radius, 5px);
49
50
  font-size: var(--nutui-progress-text-font-size, 9px);
50
51
  line-height: 1;
51
- background: var(--nutui-progress-text-background, var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%)));
52
+ background: var(--nutui-progress-text-background, #ff0f23);
52
53
  }
53
54
  @keyframes progressActive {
54
55
  0% {
@@ -8,7 +8,7 @@
8
8
  flex: auto;
9
9
  border-radius: 12px;
10
10
  height: 10px;
11
- background: #F7F8FC;
11
+ background: #f5f6fa;
12
12
  }
13
13
  .nut-progress-outer .nut-progress-active:before {
14
14
  content: "";
@@ -27,7 +27,7 @@
27
27
  justify-content: center;
28
28
  transition: all 0.4s;
29
29
  border-radius: 12px;
30
- background: linear-gradient(135deg, #FF0F23 0%, #FF0F23 100%);
30
+ background-color: #ff0f23;
31
31
  }
32
32
  .nut-progress-text {
33
33
  display: flex;
@@ -36,10 +36,11 @@
36
36
  top: -4px;
37
37
  bottom: -4px;
38
38
  transition: all 0.4s;
39
- transform: translate(-50%);
40
39
  }
41
40
  .nut-progress-text-inner {
42
41
  display: flex;
42
+ flex-direction: row;
43
+ justify-content: center;
43
44
  align-items: center;
44
45
  height: 100%;
45
46
  width: 100%;
@@ -48,7 +49,7 @@
48
49
  border-radius: 5px;
49
50
  font-size: 9px;
50
51
  line-height: 1;
51
- background: linear-gradient(135deg, #FF0F23 0%, #FF0F23 100%);
52
+ background: #ff0f23;
52
53
  }
53
54
  @keyframes progressActive {
54
55
  0% {
@@ -3,66 +3,18 @@ import { BasicComponent } from "../../utils/typings";
3
3
  import { PullToRefreshType } from './types';
4
4
  export type PullStatus = 'pulling' | 'canRelease' | 'refreshing' | 'complete';
5
5
  export interface PullToRefreshProps extends BasicComponent {
6
- /**
7
- * 触发刷新时的处理函数
8
- * @default -
9
- */
10
- onRefresh: () => Promise<any>
6
+ onRefresh: () => Promise<any>;
11
7
  type: PullToRefreshType;
12
- /**
13
- * 下拉的提示文案
14
- * @default 下拉刷新
15
- */
16
- pullingText: ReactNode
17
- /**
18
- * 释放的提示文案
19
- * @default 松手刷新
20
- */
21
- canReleaseText: ReactNode
22
- /**
23
- * 刷新时的提示文案
24
- * @default 刷新中
25
- */
26
- refreshingText: ReactNode
27
- /**
28
- * 完成时的提示文案
29
- * @default 刷新成功
30
- */
31
- completeText: ReactNode
32
- /**
33
- * 完成后延迟消失的时间,单位为 ms
34
- * @default 500
35
- */
36
- completeDelay: number
37
- /**
38
- * 头部提示内容区的高度,单位为 px
39
- * @default 40
40
- */
41
- headHeight: number
42
- /**
43
- * 触发刷新需要下拉多少距离,单位为 px
44
- * @default 60
45
- */
46
- threshold: number
47
- /**
48
- * 是否禁用下拉刷新
49
- * @default false
50
- */
51
- disabled: boolean
52
- /**
53
- * 可滚动的父元素的 scrollTop
54
- * @default 0
55
- */
56
- scrollTop: number
57
- /**
58
- * 根据下拉状态,自定义下拉提示图标
59
- * @default <Loading />
60
- */
61
- renderIcon: (status: PullStatus) => ReactNode
62
- /**
63
- * 根据下拉状态,自定义下拉提示文案
64
- * @default -
65
- */
66
- renderText: (status: PullStatus) => ReactNode
8
+ pullingText: ReactNode;
9
+ canReleaseText: ReactNode;
10
+ refreshingText: ReactNode;
11
+ completeText: ReactNode;
12
+ completeDelay: number;
13
+ headHeight: number;
14
+ threshold: number;
15
+ disabled: boolean;
16
+ scrollTop: number;
17
+ renderIcon: (status: PullStatus) => ReactNode;
18
+ renderText: (status: PullStatus) => ReactNode;
67
19
  }
68
20
  export declare const PullToRefresh: FunctionComponent<Partial<PullToRefreshProps>>;
@@ -1,4 +1,5 @@
1
1
  import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
2
+ import { _ as _define_property } from "@swc/helpers/_/_define_property";
2
3
  import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
3
4
  import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
4
5
  import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
@@ -13,6 +14,8 @@ import { useTouch } from "../../utils/use-touch";
13
14
  import { rubberbandIfOutOfBounds } from "../../utils/rubberband";
14
15
  import { sleep } from "../../utils/sleep";
15
16
  import { ComponentDefaults } from "../../utils/typings";
17
+ import pxTransform from "../../utils/px-transform";
18
+ import { harmonyAndRn, rn } from "../../utils/platform-taro";
16
19
  var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
17
20
  type: 'default',
18
21
  pullingText: '',
@@ -45,8 +48,9 @@ export var PullToRefresh = function(p) {
45
48
  var pullingRef = useRef(false);
46
49
  var _useState = _sliced_to_array(useState('pulling'), 2), status = _useState[0], setStatus = _useState[1];
47
50
  var _useState1 = _sliced_to_array(useState(0), 2), height = _useState1[0], setHeight = _useState1[1];
51
+ var timer = useRef();
48
52
  var renderIcons = function(status) {
49
- return /*#__PURE__*/ React.createElement(React.Fragment, null, (status === 'pulling' || status === 'complete') && /*#__PURE__*/ React.createElement(Loading, null), (status === 'canRelease' || status === 'refreshing') && /*#__PURE__*/ React.createElement(More, null));
53
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, (status === 'pulling' || status === 'complete') && (!harmonyAndRn() ? /*#__PURE__*/ React.createElement(Loading, null) : null), (status === 'canRelease' || status === 'refreshing') && (!harmonyAndRn() ? /*#__PURE__*/ React.createElement(More, null) : null));
50
54
  };
51
55
  var renderStatusIcon = function() {
52
56
  if (props.renderIcon) {
@@ -67,10 +71,11 @@ export var PullToRefresh = function(p) {
67
71
  return '';
68
72
  };
69
73
  var handleTouchStart = function(e) {
74
+ if (props.disabled) return;
70
75
  touch.start(e);
71
76
  };
72
77
  var handleTouchMove = function(e) {
73
- if (props.scrollTop > 0) {
78
+ if (props.scrollTop > 0 || props.disabled) {
74
79
  return;
75
80
  }
76
81
  if (status === 'refreshing' || status === 'complete') return;
@@ -81,6 +86,12 @@ export var PullToRefresh = function(p) {
81
86
  setHeight(Math.max(rubberbandIfOutOfBounds(touch.deltaY.current, 0, 0, headHeight * 5, 0.5), 0));
82
87
  setStatus(height > threshold ? 'canRelease' : 'pulling');
83
88
  }
89
+ clearTimeout(timer.current);
90
+ if (rn()) {
91
+ timer.current = setTimeout(function() {
92
+ handleTouchEnd();
93
+ }, 300);
94
+ }
84
95
  };
85
96
  function _doRefresh() {
86
97
  _doRefresh = _async_to_generator(function() {
@@ -138,6 +149,7 @@ export var PullToRefresh = function(p) {
138
149
  return _doRefresh.apply(this, arguments);
139
150
  }
140
151
  var handleTouchEnd = function() {
152
+ if (props.disabled) return;
141
153
  pullingRef.current = false;
142
154
  if (status === 'canRelease') {
143
155
  doRefresh();
@@ -151,10 +163,11 @@ export var PullToRefresh = function(p) {
151
163
  // 安卓微信小程序onTouchMove回调次数少导致下拉卡顿,增加动效会更顺畅
152
164
  var isAndroidWeApp = Taro.getSystemInfoSync().platform === 'android' && Taro.getEnv() === 'WEAPP';
153
165
  var springStyles = _object_spread({
154
- height: "".concat(height, "px")
166
+ height: pxTransform(height)
155
167
  }, !pullingRef.current || isAndroidWeApp ? {
156
168
  transition: 'height .3s ease'
157
169
  } : {});
170
+ var _obj, _obj1, _obj2, _obj3, _obj4;
158
171
  return /*#__PURE__*/ React.createElement(View, {
159
172
  className: classes,
160
173
  style: props.style,
@@ -163,15 +176,18 @@ export var PullToRefresh = function(p) {
163
176
  onTouchEnd: handleTouchEnd
164
177
  }, /*#__PURE__*/ React.createElement(View, {
165
178
  style: springStyles,
166
- className: "".concat(classPrefix, "-head")
179
+ className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-head"), true), _define_property(_obj, "".concat(classPrefix, "-primary-head"), props.type === 'primary'), _obj))
167
180
  }, /*#__PURE__*/ React.createElement(View, {
168
- className: "".concat(classPrefix, "-head-content"),
181
+ className: classNames((_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-head-content"), true), _define_property(_obj1, "".concat(classPrefix, "-primary-head-content"), props.type === 'primary'), _obj1)),
169
182
  style: {
170
- height: headHeight
183
+ height: pxTransform(headHeight)
171
184
  }
172
- }, /*#__PURE__*/ React.createElement(View, null, renderStatusIcon()), /*#__PURE__*/ React.createElement(View, null, renderStatusText()))), /*#__PURE__*/ React.createElement(View, {
173
- className: "".concat(classPrefix, "-content")
185
+ }, /*#__PURE__*/ React.createElement(View, {
186
+ className: classNames((_obj2 = {}, _define_property(_obj2, "".concat(classPrefix, "-status-icon"), true), _define_property(_obj2, "".concat(classPrefix, "-primary-status-icon"), props.type === 'primary'), _obj2))
187
+ }, renderStatusIcon()), /*#__PURE__*/ React.createElement(View, {
188
+ className: classNames((_obj3 = {}, _define_property(_obj3, "".concat(classPrefix, "-status-text"), true), _define_property(_obj3, "".concat(classPrefix, "-primary-status-text"), props.type === 'primary'), _obj3))
189
+ }, renderStatusText()))), /*#__PURE__*/ React.createElement(View, {
190
+ className: classNames((_obj4 = {}, _define_property(_obj4, "".concat(classPrefix, "-content"), true), _define_property(_obj4, "".concat(classPrefix, "-primary-content}"), props.type === 'primary'), _obj4))
174
191
  }, props.children));
175
192
  };
176
- PullToRefresh.defaultProps = defaultProps;
177
193
  PullToRefresh.displayName = 'NutPullToRefresh';
@@ -25,15 +25,20 @@
25
25
 
26
26
  &-primary {
27
27
  background: $pulltorefresh-color-primary;
28
- .nut-pulltorefresh-content {
28
+
29
+ &-content {
29
30
  color: $color-text-dark;
30
31
  }
31
32
 
32
- .nut-pulltorefresh-head {
33
+ &-head {
33
34
  &-content {
34
35
  color: $color-text-dark;
35
36
  }
36
37
  }
38
+
39
+ &-status-text {
40
+ color: $white;
41
+ }
37
42
  }
38
43
  }
39
44
 
@@ -8,7 +8,7 @@
8
8
  bottom: 0;
9
9
  left: 0;
10
10
  width: 100%;
11
- color: var(--nutui-gray-7, #1a1a1a);
11
+ color: var(--nutui-color-title, #1a1a1a);
12
12
  display: flex;
13
13
  flex-direction: column;
14
14
  justify-content: center;
@@ -22,12 +22,15 @@
22
22
  .nut-pulltorefresh-primary {
23
23
  background: var(--nutui-pulltorefresh-color-primary, var(--nutui-color-primary, #ff0f23));
24
24
  }
25
- .nut-pulltorefresh-primary .nut-pulltorefresh-content {
25
+ .nut-pulltorefresh-primary-content {
26
26
  color: var(--nutui-white-12);
27
27
  }
28
- .nut-pulltorefresh-primary .nut-pulltorefresh-head-content {
28
+ .nut-pulltorefresh-primary-head-content {
29
29
  color: var(--nutui-white-12);
30
30
  }
31
+ .nut-pulltorefresh-primary-status-text {
32
+ color: #ffffff;
33
+ }
31
34
 
32
35
  [dir=rtl] .nut-pulltorefresh-head-content,
33
36
  .nut-rtl .nut-pulltorefresh-head-content {
@@ -8,7 +8,7 @@
8
8
  bottom: 0;
9
9
  left: 0;
10
10
  width: 100%;
11
- color: #1A1A1A;
11
+ color: #1a1a1a;
12
12
  display: flex;
13
13
  flex-direction: column;
14
14
  justify-content: center;
@@ -19,6 +19,18 @@
19
19
  height: 26px;
20
20
  margin-bottom: 4px;
21
21
  }
22
+ .nut-pulltorefresh-primary {
23
+ background: #ff0f23;
24
+ }
25
+ .nut-pulltorefresh-primary-content {
26
+ color: rgba(255, 255, 255, 0.9);
27
+ }
28
+ .nut-pulltorefresh-primary-head-content {
29
+ color: rgba(255, 255, 255, 0.9);
30
+ }
31
+ .nut-pulltorefresh-primary-status-text {
32
+ color: #ffffff;
33
+ }
22
34
 
23
35
  [dir=rtl] .nut-pulltorefresh-head-content,
24
36
  .nut-rtl .nut-pulltorefresh-head-content {
@@ -60,17 +60,6 @@ export var Radio = function(props) {
60
60
  }
61
61
  };
62
62
  }
63
- var renderLabel = function() {
64
- return /*#__PURE__*/ React.createElement(View, {
65
- className: classNames("".concat(classPrefix, "-label"), _define_property({}, "".concat(classPrefix, "-label-disabled"), disabled))
66
- }, children);
67
- };
68
- var renderButton = function() {
69
- var _obj;
70
- return /*#__PURE__*/ React.createElement(View, {
71
- className: classNames("".concat(classPrefix, "-button"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-button-active"), checkedStatement), _define_property(_obj, "".concat(classPrefix, "-button-disabled"), disabled), _obj))
72
- }, children);
73
- };
74
63
  var color = function() {
75
64
  var _obj;
76
65
  return _obj = {}, _define_property(_obj, "".concat(classPrefix, "-icon-disabled"), disabled), _define_property(_obj, "".concat(classPrefix, "-icon"), !checkedStatement), _define_property(_obj, "".concat(classPrefix, "-icon-checked"), checkedStatement), _obj;
@@ -95,8 +84,21 @@ export var Radio = function(props) {
95
84
  className: classNames(color())
96
85
  });
97
86
  };
87
+ var renderLabel = function() {
88
+ var labelcls = classNames("".concat(classPrefix, "-label"), _define_property({}, "".concat(classPrefix, "-label-disabled"), disabled));
89
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, renderIcon(), /*#__PURE__*/ React.createElement("div", {
90
+ className: labelcls
91
+ }, children));
92
+ };
93
+ var renderButton = function() {
94
+ var _obj;
95
+ var buttoncls = classNames("".concat(classPrefix, "-button"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-button-active"), checkedStatement), _define_property(_obj, "".concat(classPrefix, "-button-disabled"), disabled), _obj));
96
+ return /*#__PURE__*/ React.createElement("div", {
97
+ className: buttoncls
98
+ }, children);
99
+ };
98
100
  var renderByShape = function(shape) {
99
- return shape === 'button' ? renderButton() : /*#__PURE__*/ React.createElement(React.Fragment, null, renderIcon(), renderLabel());
101
+ return shape === 'button' ? renderButton() : renderLabel();
100
102
  };
101
103
  var renderRadioItem = function() {
102
104
  return renderByShape(context && context.shape ? context.shape : shape);
@@ -105,12 +107,12 @@ export var Radio = function(props) {
105
107
  if (disabled || checkedStatement) return;
106
108
  setCheckedStatement(!checkedStatement);
107
109
  };
110
+ var cls = classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-reverse"), labelPosition === 'left'), className);
108
111
  return /*#__PURE__*/ React.createElement(View, {
109
- className: classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-reverse"), labelPosition === 'left'), className),
112
+ className: cls,
110
113
  style: style,
111
114
  onClick: handleClick
112
115
  }, renderRadioItem());
113
116
  };
114
- Radio.defaultProps = defaultProps;
115
117
  Radio.displayName = 'NutRadio';
116
118
  Radio.Group = RadioGroup;
@@ -39,7 +39,7 @@
39
39
  color: $color-primary;
40
40
 
41
41
  &.nut-radio-icon-disabled {
42
- color: $color-primary-disabled;
42
+ color: $color-primary-disabled-special;
43
43
  }
44
44
  }
45
45
 
@@ -60,7 +60,7 @@
60
60
  border: 1px solid $radio-button-background;
61
61
 
62
62
  &-active {
63
- background: $color-primary-light;
63
+ background: $color-primary-light-pressed;
64
64
  color: $color-primary;
65
65
  border: $radio-button-active-border;
66
66
  }
@@ -16,7 +16,7 @@
16
16
  }
17
17
  .nut-radiogroup-vertical .nut-radio-button-active {
18
18
  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
19
- background-color: var(--nutui-color-primary-light, #ffebf1);
19
+ background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
20
20
  }
21
21
  .nut-radiogroup-horizontal .nut-radio {
22
22
  display: inline-flex;
@@ -26,7 +26,7 @@
26
26
  }
27
27
  .nut-radiogroup-horizontal .nut-radio-button-active {
28
28
  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
29
- background-color: var(--nutui-color-primary-light, #ffebf1);
29
+ background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
30
30
  }
31
31
  .nut-radiogroup .nut-radio-button-active.nut-radio-button-disabled {
32
32
  background: var(--nutui-color-text-disabled, #c2c4cc);
@@ -58,8 +58,8 @@
58
58
  }
59
59
  .nut-radio-label {
60
60
  margin-left: var(--nutui-radio-label-margin-left, 4px);
61
- font-size: var(--nutui-radio-label-font-size, var(--nutui-font-size-2, 12px));
62
- color: var(--nutui-radio-label-color, var(--nutui-gray-7, #1a1a1a));
61
+ font-size: var(--nutui-radio-label-font-size, var(--nutui-font-size-s, 12px));
62
+ color: var(--nutui-radio-label-color, var(--nutui-color-title, #1a1a1a));
63
63
  }
64
64
  .nut-radio-label-disabled {
65
65
  color: var(--nutui-radio-label-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
@@ -68,13 +68,13 @@
68
68
  color: var(--nutui-color-text-disabled, #c2c4cc);
69
69
  transition-duration: 0.3s;
70
70
  transition-property: color, border-color, background-color;
71
- font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-4, 16px));
71
+ font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-l, 16px));
72
72
  }
73
73
  .nut-radio-icon-checked {
74
74
  color: var(--nutui-color-primary, #ff0f23);
75
75
  }
76
76
  .nut-radio-icon-checked.nut-radio-icon-disabled {
77
- color: var(--nutui-color-primary-disabled, #ffadbe);
77
+ color: var(--nutui-color-primary-disabled-special, #ffadbe);
78
78
  }
79
79
  .nut-radio-icon-disabled {
80
80
  color: var(--nutui-color-text-disabled, #c2c4cc);
@@ -83,15 +83,15 @@
83
83
  display: inline-flex;
84
84
  align-items: center;
85
85
  padding: var(--nutui-radio-button-padding, 5px 18px);
86
- font-size: var(--nutui-radio-button-font-size, var(--nutui-font-size-2, 12px));
86
+ font-size: var(--nutui-radio-button-font-size, var(--nutui-font-size-s, 12px));
87
87
  background: var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
88
88
  border-radius: var(--nutui-radio-button-border-radius, 15px);
89
- color: var(--nutui-radio-label-color, var(--nutui-gray-7, #1a1a1a));
89
+ color: var(--nutui-radio-label-color, var(--nutui-color-title, #1a1a1a));
90
90
  box-sizing: border-box;
91
91
  border: 1px solid var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
92
92
  }
93
93
  .nut-radio-button-active {
94
- background: var(--nutui-color-primary-light, #ffebf1);
94
+ background: var(--nutui-color-primary-light-pressed, #ffebf1);
95
95
  color: var(--nutui-color-primary, #ff0f23);
96
96
  border: var(--nutui-radio-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
97
97
  }
@@ -28,6 +28,7 @@ export var RadioGroup = /*#__PURE__*/ React.forwardRef(function(props, ref) {
28
28
  "options",
29
29
  "disabled"
30
30
  ]);
31
+ var cls = classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-").concat(props.direction), props.direction), className);
31
32
  var _usePropsValue = _sliced_to_array(usePropsValue({
32
33
  defaultValue: props.defaultValue,
33
34
  value: props.value,
@@ -53,7 +54,9 @@ export var RadioGroup = /*#__PURE__*/ React.forwardRef(function(props, ref) {
53
54
  }));
54
55
  });
55
56
  }, [
56
- options
57
+ options,
58
+ labelPosition,
59
+ val2State
57
60
  ]);
58
61
  return /*#__PURE__*/ React.createElement(RadioContext.Provider, {
59
62
  value: {
@@ -69,8 +72,7 @@ export var RadioGroup = /*#__PURE__*/ React.forwardRef(function(props, ref) {
69
72
  }
70
73
  }
71
74
  }, /*#__PURE__*/ React.createElement("div", _object_spread({
72
- className: classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-").concat(props.direction), props.direction), className)
75
+ className: cls
73
76
  }, rest), (options === null || options === void 0 ? void 0 : options.length) ? renderOptionsChildren() : children));
74
77
  });
75
- RadioGroup.defaultProps = defaultProps;
76
78
  RadioGroup.displayName = 'NutRadioGroup';