@nutui/nutui-react 3.0.0-beta.11 → 3.0.0-beta.12

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 (307) hide show
  1. package/dist/cjs/packages/actionsheet/style/style.css +13 -18
  2. package/dist/cjs/packages/address/style/style.css +45 -57
  3. package/dist/cjs/packages/animatingnumbers/style/style.css +3 -3
  4. package/dist/cjs/packages/audio/style/style.css +55 -55
  5. package/dist/cjs/packages/avatar/style/style.css +2 -2
  6. package/dist/cjs/packages/backtop/style/backtop.scss +0 -4
  7. package/dist/cjs/packages/backtop/style/style.css +8 -14
  8. package/dist/cjs/packages/badge/style/style.css +4 -4
  9. package/dist/cjs/packages/barrage/style/style.css +2 -2
  10. package/dist/cjs/packages/button/button.js +14 -11
  11. package/dist/cjs/packages/button/style/button.scss +3 -3
  12. package/dist/cjs/packages/button/style/style.css +43 -43
  13. package/dist/cjs/packages/calendar/style/style.css +16 -21
  14. package/dist/cjs/packages/calendarcard/style/style.css +8 -8
  15. package/dist/cjs/packages/card/style/style.css +8 -8
  16. package/dist/cjs/packages/cascader/cascader.d.ts +2 -2
  17. package/dist/cjs/packages/cascader/cascader.js +2 -2
  18. package/dist/cjs/packages/cascader/style/style.css +35 -47
  19. package/dist/cjs/packages/cell/style/style.css +8 -8
  20. package/dist/cjs/packages/cellgroup/style/style.css +3 -3
  21. package/dist/cjs/packages/checkbox/style/style.css +29 -29
  22. package/dist/cjs/packages/checkboxgroup/style/style.css +7 -7
  23. package/dist/cjs/packages/circleprogress/style/style.css +3 -3
  24. package/dist/cjs/packages/col/style/col.scss +0 -1
  25. package/dist/cjs/packages/collapse/style/style.css +11 -11
  26. package/dist/cjs/packages/collapseitem/style/style.css +11 -11
  27. package/dist/cjs/packages/configprovider/configprovider.js +2 -2
  28. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  29. package/dist/cjs/packages/countdown/style/style.css +7 -7
  30. package/dist/cjs/packages/countup/style/style.css +3 -3
  31. package/dist/cjs/packages/datepicker/style/style.css +14 -19
  32. package/dist/cjs/packages/dialog/confirm.d.ts +4 -3
  33. package/dist/cjs/packages/dialog/confirm.js +7 -21
  34. package/dist/cjs/packages/dialog/content.d.ts +4 -11
  35. package/dist/cjs/packages/dialog/content.js +30 -14
  36. package/dist/cjs/packages/dialog/dialog.d.ts +1 -2
  37. package/dist/cjs/packages/dialog/dialog.js +5 -5
  38. package/dist/cjs/packages/dialog/dialogwrap.d.ts +3 -14
  39. package/dist/cjs/packages/dialog/dialogwrap.js +33 -15
  40. package/dist/cjs/packages/dialog/index.d.ts +1 -2
  41. package/dist/cjs/packages/dialog/style/dialog.scss +0 -4
  42. package/dist/cjs/packages/dialog/style/style.css +49 -57
  43. package/dist/cjs/packages/dialog/types.d.ts +57 -0
  44. package/dist/cjs/packages/divider/style/style.css +4 -4
  45. package/dist/cjs/packages/elevator/style/style.css +8 -8
  46. package/dist/cjs/packages/empty/style/style.css +3 -3
  47. package/dist/cjs/packages/fixednav/fixednav.d.ts +2 -15
  48. package/dist/cjs/packages/fixednav/fixednav.js +20 -23
  49. package/dist/cjs/packages/fixednav/index.d.ts +1 -2
  50. package/dist/cjs/packages/fixednav/style/style.css +3 -8
  51. package/dist/cjs/packages/fixednav/types.d.ts +12 -0
  52. package/dist/cjs/packages/form/style/style.css +15 -15
  53. package/dist/cjs/packages/formitem/style/style.css +4 -4
  54. package/dist/cjs/packages/grid/style/style.css +6 -6
  55. package/dist/cjs/packages/griditem/style/style.css +5 -5
  56. package/dist/cjs/packages/hoverbutton/style/hoverbutton.scss +0 -4
  57. package/dist/cjs/packages/hoverbutton/style/style.css +4 -7
  58. package/dist/cjs/packages/hoverbuttonitem/style/style.css +4 -4
  59. package/dist/cjs/packages/image/style/style.css +2 -2
  60. package/dist/cjs/packages/imagepreview/style/style.css +11 -27
  61. package/dist/cjs/packages/indicator/style/style.css +4 -4
  62. package/dist/cjs/packages/infiniteloading/style/style.css +4 -4
  63. package/dist/cjs/packages/input/style/input.scss +0 -6
  64. package/dist/cjs/packages/input/style/style.css +8 -14
  65. package/dist/cjs/packages/inputnumber/style/style.css +7 -7
  66. package/dist/cjs/packages/loading/style/style.css +2 -2
  67. package/dist/cjs/packages/menu/style/style.css +8 -13
  68. package/dist/cjs/packages/menuitem/style/style.css +4 -9
  69. package/dist/cjs/packages/navbar/style/navbar.scss +1 -1
  70. package/dist/cjs/packages/navbar/style/style.css +3 -3
  71. package/dist/cjs/packages/notify/style/style.css +4 -4
  72. package/dist/cjs/packages/numberkeyboard/numberkeyboard.d.ts +1 -1
  73. package/dist/cjs/packages/numberkeyboard/numberkeyboard.js +2 -2
  74. package/dist/cjs/packages/numberkeyboard/style/style.css +13 -18
  75. package/dist/cjs/packages/overlay/index.d.ts +1 -1
  76. package/dist/cjs/packages/overlay/overlay.d.ts +2 -12
  77. package/dist/cjs/packages/overlay/overlay.js +10 -16
  78. package/dist/cjs/packages/overlay/style/overlay.scss +0 -5
  79. package/dist/cjs/packages/overlay/style/style.css +1 -6
  80. package/dist/cjs/packages/overlay/types.d.ts +11 -0
  81. package/dist/cjs/packages/overlay/types.js +4 -0
  82. package/dist/cjs/packages/pagination/style/style.css +7 -7
  83. package/dist/cjs/packages/picker/picker.d.ts +1 -1
  84. package/dist/cjs/packages/picker/picker.js +2 -2
  85. package/dist/cjs/packages/picker/style/style.css +14 -19
  86. package/dist/cjs/packages/popover/popover.d.ts +1 -1
  87. package/dist/cjs/packages/popover/popover.js +3 -3
  88. package/dist/cjs/packages/popover/style/style.css +12 -17
  89. package/dist/cjs/packages/popup/index.d.ts +1 -1
  90. package/dist/cjs/packages/popup/popup.d.ts +2 -24
  91. package/dist/cjs/packages/popup/popup.js +24 -41
  92. package/dist/cjs/packages/popup/style/style.css +5 -10
  93. package/dist/cjs/packages/popup/types.d.ts +25 -0
  94. package/dist/cjs/packages/popup/types.js +6 -0
  95. package/dist/cjs/packages/price/style/style.css +1 -1
  96. package/dist/cjs/packages/progress/style/style.css +1 -1
  97. package/dist/cjs/packages/pulltorefresh/style/style.css +4 -4
  98. package/dist/cjs/packages/radio/style/style.css +19 -19
  99. package/dist/cjs/packages/radiogroup/style/style.css +6 -6
  100. package/dist/cjs/packages/range/style/style.css +9 -9
  101. package/dist/cjs/packages/resultpage/style/style.css +2 -2
  102. package/dist/cjs/packages/searchbar/style/style.css +5 -5
  103. package/dist/cjs/packages/segmented/style/style.css +2 -2
  104. package/dist/cjs/packages/shortpassword/shortpassword.js +2 -2
  105. package/dist/cjs/packages/shortpassword/style/style.css +15 -20
  106. package/dist/cjs/packages/sidebar/style/style.css +5 -5
  107. package/dist/cjs/packages/sidebaritem/style/style.css +1 -1
  108. package/dist/cjs/packages/sidenavbar/style/style.css +9 -14
  109. package/dist/cjs/packages/sidenavbaritem/style/style.css +2 -2
  110. package/dist/cjs/packages/signature/style/style.css +2 -2
  111. package/dist/cjs/packages/skeleton/style/skeleton.scss +0 -18
  112. package/dist/cjs/packages/skeleton/style/style.css +5 -11
  113. package/dist/cjs/packages/step/style/style.css +19 -19
  114. package/dist/cjs/packages/steps/style/style.css +19 -19
  115. package/dist/cjs/packages/subsidenavbar/style/style.css +2 -2
  116. package/dist/cjs/packages/swiper/style/style.css +4 -15
  117. package/dist/cjs/packages/swiper/style/swiper.scss +0 -11
  118. package/dist/cjs/packages/switch/style/style.css +6 -6
  119. package/dist/cjs/packages/tabbar/style/style.css +10 -10
  120. package/dist/cjs/packages/tabbaritem/style/style.css +9 -9
  121. package/dist/cjs/packages/table/style/style.css +11 -11
  122. package/dist/cjs/packages/tabpane/style/style.css +1 -1
  123. package/dist/cjs/packages/tabpane/tabpane.js +2 -2
  124. package/dist/cjs/packages/tabs/style/style.css +25 -32
  125. package/dist/cjs/packages/tabs/style/tabs.scss +4 -9
  126. package/dist/cjs/packages/tabs/tabs.js +35 -52
  127. package/dist/cjs/packages/tag/style/style.css +5 -5
  128. package/dist/cjs/packages/tag/style/tag.scss +0 -2
  129. package/dist/cjs/packages/textarea/style/style.css +13 -13
  130. package/dist/cjs/packages/timedetail/style/style.css +4 -4
  131. package/dist/cjs/packages/timeselect/style/style.css +14 -19
  132. package/dist/cjs/packages/toast/Notification.d.ts +6 -20
  133. package/dist/cjs/packages/toast/Notification.js +8 -7
  134. package/dist/cjs/packages/toast/index.d.ts +1 -1
  135. package/dist/cjs/packages/toast/style/style.css +2 -20
  136. package/dist/cjs/packages/toast/style/toast.scss +0 -13
  137. package/dist/cjs/packages/toast/toast.d.ts +4 -22
  138. package/dist/cjs/packages/toast/toast.js +10 -9
  139. package/dist/cjs/packages/toast/types.d.ts +17 -0
  140. package/dist/cjs/packages/toast/types.js +4 -0
  141. package/dist/cjs/packages/tour/style/style.css +16 -21
  142. package/dist/cjs/packages/trendarrow/style/style.css +1 -1
  143. package/dist/cjs/packages/uploader/style/style.css +12 -12
  144. package/dist/cjs/packages/virtuallist/style/style.css +4 -4
  145. package/dist/cjs/utils/get-rect-by-taro.js +0 -14
  146. package/dist/cjs/utils/platform-taro.d.ts +0 -2
  147. package/dist/cjs/utils/platform-taro.js +0 -21
  148. package/dist/cjs/utils/px-transform.js +0 -1
  149. package/dist/cjs/utils/use-custom-event.js +2 -2
  150. package/dist/es/packages/actionsheet/style/style.css +13 -18
  151. package/dist/es/packages/address/style/style.css +45 -57
  152. package/dist/es/packages/animatingnumbers/style/style.css +3 -3
  153. package/dist/es/packages/audio/style/style.css +55 -55
  154. package/dist/es/packages/avatar/style/style.css +2 -2
  155. package/dist/es/packages/backtop/style/backtop.scss +0 -4
  156. package/dist/es/packages/backtop/style/style.css +8 -14
  157. package/dist/es/packages/badge/style/style.css +4 -4
  158. package/dist/es/packages/barrage/style/style.css +2 -2
  159. package/dist/es/packages/button/button.js +15 -12
  160. package/dist/es/packages/button/style/button.scss +3 -3
  161. package/dist/es/packages/button/style/style.css +43 -43
  162. package/dist/es/packages/calendar/style/style.css +16 -21
  163. package/dist/es/packages/calendarcard/style/style.css +8 -8
  164. package/dist/es/packages/card/style/style.css +8 -8
  165. package/dist/es/packages/cascader/cascader.d.ts +2 -2
  166. package/dist/es/packages/cascader/cascader.js +1 -1
  167. package/dist/es/packages/cascader/style/style.css +35 -47
  168. package/dist/es/packages/cell/style/style.css +8 -8
  169. package/dist/es/packages/cellgroup/style/style.css +3 -3
  170. package/dist/es/packages/checkbox/style/style.css +29 -29
  171. package/dist/es/packages/checkboxgroup/style/style.css +7 -7
  172. package/dist/es/packages/circleprogress/style/style.css +3 -3
  173. package/dist/es/packages/col/style/col.scss +0 -1
  174. package/dist/es/packages/collapse/style/style.css +11 -11
  175. package/dist/es/packages/collapseitem/style/style.css +11 -11
  176. package/dist/es/packages/configprovider/configprovider.js +2 -2
  177. package/dist/es/packages/configprovider/types.d.ts +1 -1
  178. package/dist/es/packages/countdown/style/style.css +7 -7
  179. package/dist/es/packages/countup/style/style.css +3 -3
  180. package/dist/es/packages/datepicker/style/style.css +14 -19
  181. package/dist/es/packages/dialog/confirm.d.ts +4 -3
  182. package/dist/es/packages/dialog/confirm.js +3 -17
  183. package/dist/es/packages/dialog/content.d.ts +4 -11
  184. package/dist/es/packages/dialog/content.js +19 -11
  185. package/dist/es/packages/dialog/dialog.d.ts +1 -2
  186. package/dist/es/packages/dialog/dialog.js +6 -6
  187. package/dist/es/packages/dialog/dialogwrap.d.ts +3 -14
  188. package/dist/es/packages/dialog/dialogwrap.js +23 -13
  189. package/dist/es/packages/dialog/index.d.ts +1 -2
  190. package/dist/es/packages/dialog/style/dialog.scss +0 -4
  191. package/dist/es/packages/dialog/style/style.css +49 -57
  192. package/dist/es/packages/dialog/types.d.ts +57 -0
  193. package/dist/es/packages/divider/style/style.css +4 -4
  194. package/dist/es/packages/elevator/style/style.css +8 -8
  195. package/dist/es/packages/empty/style/style.css +3 -3
  196. package/dist/es/packages/fixednav/fixednav.d.ts +2 -55
  197. package/dist/es/packages/fixednav/fixednav.js +19 -22
  198. package/dist/es/packages/fixednav/index.d.ts +1 -2
  199. package/dist/es/packages/fixednav/style/style.css +3 -8
  200. package/dist/es/packages/fixednav/types.d.ts +12 -0
  201. package/dist/es/packages/form/style/style.css +15 -15
  202. package/dist/es/packages/formitem/style/style.css +4 -4
  203. package/dist/es/packages/grid/style/style.css +6 -6
  204. package/dist/es/packages/griditem/style/style.css +5 -5
  205. package/dist/es/packages/hoverbutton/style/hoverbutton.scss +0 -4
  206. package/dist/es/packages/hoverbutton/style/style.css +4 -7
  207. package/dist/es/packages/hoverbuttonitem/style/style.css +4 -4
  208. package/dist/es/packages/image/style/style.css +2 -2
  209. package/dist/es/packages/imagepreview/style/style.css +11 -27
  210. package/dist/es/packages/indicator/style/style.css +4 -4
  211. package/dist/es/packages/infiniteloading/style/style.css +4 -4
  212. package/dist/es/packages/input/style/input.scss +0 -6
  213. package/dist/es/packages/input/style/style.css +8 -14
  214. package/dist/es/packages/inputnumber/style/style.css +7 -7
  215. package/dist/es/packages/loading/style/style.css +2 -2
  216. package/dist/es/packages/menu/style/style.css +8 -13
  217. package/dist/es/packages/menuitem/style/style.css +4 -9
  218. package/dist/es/packages/navbar/style/navbar.scss +1 -1
  219. package/dist/es/packages/navbar/style/style.css +3 -3
  220. package/dist/es/packages/notify/style/style.css +4 -4
  221. package/dist/es/packages/numberkeyboard/numberkeyboard.d.ts +1 -1
  222. package/dist/es/packages/numberkeyboard/numberkeyboard.js +1 -1
  223. package/dist/es/packages/numberkeyboard/style/style.css +13 -18
  224. package/dist/es/packages/overlay/index.d.ts +1 -1
  225. package/dist/es/packages/overlay/overlay.d.ts +2 -12
  226. package/dist/es/packages/overlay/overlay.js +10 -16
  227. package/dist/es/packages/overlay/style/overlay.scss +0 -5
  228. package/dist/es/packages/overlay/style/style.css +1 -6
  229. package/dist/es/packages/overlay/types.d.ts +11 -0
  230. package/dist/es/packages/overlay/types.js +1 -0
  231. package/dist/es/packages/pagination/style/style.css +7 -7
  232. package/dist/es/packages/picker/picker.d.ts +1 -1
  233. package/dist/es/packages/picker/picker.js +1 -1
  234. package/dist/es/packages/picker/style/style.css +14 -19
  235. package/dist/es/packages/popover/popover.d.ts +1 -1
  236. package/dist/es/packages/popover/popover.js +2 -2
  237. package/dist/es/packages/popover/style/style.css +12 -17
  238. package/dist/es/packages/popup/index.d.ts +1 -1
  239. package/dist/es/packages/popup/popup.d.ts +2 -24
  240. package/dist/es/packages/popup/popup.js +24 -41
  241. package/dist/es/packages/popup/style/style.css +5 -10
  242. package/dist/es/packages/popup/types.d.ts +25 -0
  243. package/dist/es/packages/popup/types.js +1 -0
  244. package/dist/es/packages/price/style/style.css +1 -1
  245. package/dist/es/packages/progress/style/style.css +1 -1
  246. package/dist/es/packages/pulltorefresh/style/style.css +4 -4
  247. package/dist/es/packages/radio/style/style.css +19 -19
  248. package/dist/es/packages/radiogroup/style/style.css +6 -6
  249. package/dist/es/packages/range/style/style.css +9 -9
  250. package/dist/es/packages/resultpage/style/style.css +2 -2
  251. package/dist/es/packages/searchbar/style/style.css +5 -5
  252. package/dist/es/packages/segmented/style/style.css +2 -2
  253. package/dist/es/packages/shortpassword/shortpassword.js +1 -1
  254. package/dist/es/packages/shortpassword/style/style.css +15 -20
  255. package/dist/es/packages/sidebar/style/style.css +5 -5
  256. package/dist/es/packages/sidebaritem/style/style.css +1 -1
  257. package/dist/es/packages/sidenavbar/style/style.css +9 -14
  258. package/dist/es/packages/sidenavbaritem/style/style.css +2 -2
  259. package/dist/es/packages/signature/style/style.css +2 -2
  260. package/dist/es/packages/skeleton/style/skeleton.scss +0 -18
  261. package/dist/es/packages/skeleton/style/style.css +5 -11
  262. package/dist/es/packages/step/style/style.css +19 -19
  263. package/dist/es/packages/steps/style/style.css +19 -19
  264. package/dist/es/packages/subsidenavbar/style/style.css +2 -2
  265. package/dist/es/packages/swiper/style/style.css +4 -15
  266. package/dist/es/packages/swiper/style/swiper.scss +0 -11
  267. package/dist/es/packages/switch/style/style.css +6 -6
  268. package/dist/es/packages/tabbar/style/style.css +10 -10
  269. package/dist/es/packages/tabbaritem/style/style.css +9 -9
  270. package/dist/es/packages/table/style/style.css +11 -11
  271. package/dist/es/packages/tabpane/style/style.css +1 -1
  272. package/dist/es/packages/tabpane/tabpane.js +2 -2
  273. package/dist/es/packages/tabs/style/style.css +25 -32
  274. package/dist/es/packages/tabs/style/tabs.scss +4 -9
  275. package/dist/es/packages/tabs/tabs.js +35 -52
  276. package/dist/es/packages/tag/style/style.css +5 -5
  277. package/dist/es/packages/tag/style/tag.scss +0 -2
  278. package/dist/es/packages/textarea/style/style.css +13 -13
  279. package/dist/es/packages/timedetail/style/style.css +4 -4
  280. package/dist/es/packages/timeselect/style/style.css +14 -19
  281. package/dist/es/packages/toast/Notification.d.ts +6 -20
  282. package/dist/es/packages/toast/Notification.js +8 -7
  283. package/dist/es/packages/toast/index.d.ts +1 -1
  284. package/dist/es/packages/toast/style/style.css +2 -20
  285. package/dist/es/packages/toast/style/toast.scss +0 -13
  286. package/dist/es/packages/toast/toast.d.ts +4 -22
  287. package/dist/es/packages/toast/toast.js +10 -8
  288. package/dist/es/packages/toast/types.d.ts +17 -0
  289. package/dist/es/packages/toast/types.js +1 -0
  290. package/dist/es/packages/tour/style/style.css +16 -21
  291. package/dist/es/packages/trendarrow/style/style.css +1 -1
  292. package/dist/es/packages/uploader/style/style.css +12 -12
  293. package/dist/es/packages/virtuallist/style/style.css +4 -4
  294. package/dist/es/utils/get-rect-by-taro.js +0 -14
  295. package/dist/es/utils/platform-taro.d.ts +0 -2
  296. package/dist/es/utils/platform-taro.js +0 -15
  297. package/dist/es/utils/px-transform.js +1 -2
  298. package/dist/es/utils/use-custom-event.js +1 -1
  299. package/dist/nutui.react.umd.js +426 -1017
  300. package/dist/style.css +1 -1
  301. package/dist/style.scss +34 -34
  302. package/dist/styles/variables.scss +68 -32
  303. package/package.json +2 -2
  304. package/dist/cjs/packages/dialog/config.d.ts +0 -50
  305. package/dist/es/packages/dialog/config.d.ts +0 -50
  306. /package/dist/cjs/packages/dialog/{config.js → types.js} +0 -0
  307. /package/dist/es/packages/dialog/{config.js → types.js} +0 -0
@@ -6,10 +6,10 @@
6
6
  position: relative;
7
7
  display: flex;
8
8
  display: inline-block;
9
- /* #ifdef rn harmony*/
9
+ /* #ifdef harmony*/
10
10
  width: 80px;
11
11
  /* #endif */
12
- /* #ifndef rn harmony*/
12
+ /* #ifndef harmony*/
13
13
  width: auto;
14
14
  /* #endif */
15
15
  flex-direction: row;
@@ -29,7 +29,7 @@
29
29
  touch-action: manipulation;
30
30
  -webkit-appearance: none;
31
31
  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
32
- color: var(--nutui-button-default-color, var(--nutui-gray-7));
32
+ color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
33
33
  background: var(--nutui-button-default-background-color, transparent);
34
34
  border-width: var(--nutui-button-border-width, 0.5px);
35
35
  }
@@ -50,9 +50,9 @@
50
50
  left: 50%;
51
51
  width: 100%;
52
52
  height: 100%;
53
- background-color: var(--nutui-black-10);
53
+ background-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
54
54
  border: inherit;
55
- border-color: var(--nutui-black-10);
55
+ border-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
56
56
  border-radius: inherit;
57
57
  transform: translate(-50%, -50%);
58
58
  opacity: 0;
@@ -71,7 +71,7 @@
71
71
  flex-direction: row;
72
72
  align-items: center;
73
73
  justify-content: center;
74
- /* #ifndef rn harmony */
74
+ /* #ifndef harmony */
75
75
  background: initial;
76
76
  /* #endif */
77
77
  }
@@ -109,20 +109,20 @@
109
109
  .nut-button-default {
110
110
  padding: var(--nutui-button-default-padding, 0px 12px);
111
111
  border-style: solid;
112
- border-color: var(--nutui-button-default-border-color, var(--nutui-gray-4));
112
+ border-color: var(--nutui-button-default-border-color, var(--nutui-color-text-disabled, #c2c4cc));
113
113
  }
114
114
  .nut-button-default-disabled, .nut-button-default-solid-disabled {
115
115
  color: var(--nutui-button-primary-color, #ffffff);
116
- background: var(--nutui-button-default-disabled, var(--nutui-gray-4));
117
- border-color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
116
+ background: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
117
+ border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
118
118
  }
119
119
  .nut-button-default-none-disabled {
120
- color: var(--nutui-button-default-disabled-color, var(--nutui-gray-5));
120
+ color: var(--nutui-button-default-disabled-color, var(--nutui-color-text-help, #888b94));
121
121
  }
122
122
  .nut-button-default-outline-disabled, .nut-button-default-dashed-disabled {
123
123
  background: transparent;
124
- color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
125
- border-color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
124
+ color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
125
+ border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
126
126
  }
127
127
  .nut-button-normal {
128
128
  padding: var(--nutui-button-normal-padding, 0px 12px);
@@ -214,37 +214,37 @@
214
214
  }
215
215
  .nut-button-primary-disabled, .nut-button-primary-solid-disabled {
216
216
  color: var(--nutui-button-primary-color, #ffffff);
217
- background: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
218
- border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
217
+ background: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
218
+ border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
219
219
  }
220
220
  .nut-button-primary-none {
221
- color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
221
+ color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
222
222
  }
223
223
  .nut-button-primary-none-disabled {
224
- color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
224
+ color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
225
225
  }
226
226
  .nut-button-primary-outline {
227
- color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
228
- border-color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
227
+ color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
228
+ border-color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
229
229
  }
230
230
  .nut-button-primary-outline-disabled {
231
- color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
232
- border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
231
+ color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
232
+ border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
233
233
  }
234
234
  .nut-button-primary-dashed {
235
- color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
236
- border-color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
235
+ color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
236
+ border-color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
237
237
  }
238
238
  .nut-button-primary-dashed-disabled {
239
- color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
240
- border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
239
+ color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
240
+ border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
241
241
  }
242
242
  .nut-button-primary.nut-button-solid.nut-button-normal {
243
243
  font-weight: var(--nutui-font-weight-bold, 600);
244
244
  }
245
245
  .nut-button-success {
246
246
  color: var(--nutui-button-success-color, #ffffff);
247
- background: var(--nutui-button-success-background-color, var(--nutui-green-2));
247
+ background: var(--nutui-button-success-background-color, var(--nutui-color-success, #00d900));
248
248
  background-origin: border-box;
249
249
  border-color: transparent;
250
250
  }
@@ -256,15 +256,15 @@
256
256
  border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
257
257
  }
258
258
  .nut-button-success-outline, .nut-button-success-dashed {
259
- color: var(--nutui-button-success-border-color, var(--nutui-green-2));
260
- border-color: var(--nutui-button-success-border-color, var(--nutui-green-2));
259
+ color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
260
+ border-color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
261
261
  }
262
262
  .nut-button-success-outline-disabled, .nut-button-success-dashed-disabled {
263
- color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
264
- border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
263
+ color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
264
+ border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
265
265
  }
266
266
  .nut-button-success-none {
267
- color: var(--nutui-button-success-border-color, var(--nutui-green-2));
267
+ color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
268
268
  }
269
269
  .nut-button-success-none-disabled {
270
270
  color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
@@ -298,7 +298,7 @@
298
298
  }
299
299
  .nut-button-danger {
300
300
  color: var(--nutui-button-danger-color, #ffffff);
301
- background: var(--nutui-button-danger-background-color, var(--nutui-red-2));
301
+ background: var(--nutui-button-danger-background-color, var(--nutui-color-danger, #ff0f23));
302
302
  background-origin: border-box;
303
303
  border-color: transparent;
304
304
  }
@@ -306,26 +306,26 @@
306
306
  color: var(--nutui-button-danger-color, #ffffff);
307
307
  }
308
308
  .nut-button-danger-solid-disabled {
309
- background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
310
- border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
309
+ background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
310
+ border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
311
311
  }
312
312
  .nut-button-danger-outline, .nut-button-danger-dashed {
313
- color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
314
- border-color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
313
+ color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
314
+ border-color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
315
315
  }
316
316
  .nut-button-danger-outline-disabled, .nut-button-danger-dashed-disabled {
317
- color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
318
- border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
317
+ color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
318
+ border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
319
319
  }
320
320
  .nut-button-danger-none {
321
- color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
321
+ color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
322
322
  }
323
323
  .nut-button-danger-none-disabled {
324
- color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
324
+ color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
325
325
  }
326
326
  .nut-button-warning {
327
327
  color: var(--nutui-button-warning-color, #ffffff);
328
- background: var(--nutui-button-warning-background-color, var(--nutui-yellow-2));
328
+ background: var(--nutui-button-warning-background-color, var(--nutui-color-warning, #ffbf00));
329
329
  background-origin: border-box;
330
330
  border-color: transparent;
331
331
  }
@@ -338,15 +338,15 @@
338
338
  border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
339
339
  }
340
340
  .nut-button-warning-outline, .nut-button-warning-dashed {
341
- color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
342
- border-color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
341
+ color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
342
+ border-color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
343
343
  }
344
344
  .nut-button-warning-outline-disabled, .nut-button-warning-dashed-disabled {
345
345
  color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
346
346
  border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
347
347
  }
348
348
  .nut-button-warning-none {
349
- color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
349
+ color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
350
350
  }
351
351
  .nut-button-warning-none-disabled {
352
352
  color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
@@ -409,7 +409,7 @@
409
409
  position: relative;
410
410
  height: var(--nutui-range-height, 4px);
411
411
  margin: 0 var(--nutui-range-margin, 15px);
412
- background-color: var(--nutui-range-inactive-color, var(--nutui-brand-1));
412
+ background-color: var(--nutui-range-inactive-color, var(--nutui-color-primary-light-pressed, #ffebf1));
413
413
  border-radius: 2px;
414
414
  flex: 1;
415
415
  cursor: pointer;
@@ -422,7 +422,7 @@
422
422
  }
423
423
  .nut-range-min, .nut-range-max {
424
424
  font-size: var(--nutui-font-size-s, 12px);
425
- color: var(--nutui-range-color, var(--nutui-gray-7));
425
+ color: var(--nutui-range-color, var(--nutui-color-title, #1a1a1a));
426
426
  user-select: none;
427
427
  }
428
428
  .nut-range-bar {
@@ -432,7 +432,7 @@
432
432
  height: 100%;
433
433
  max-width: 100%;
434
434
  max-height: 100%;
435
- background: var(--nutui-range-active-color, var(--nutui-brand-6));
435
+ background: var(--nutui-range-active-color, var(--nutui-color-primary, #ff0f23));
436
436
  border-radius: 2px;
437
437
  transition: all 0.2s;
438
438
  }
@@ -444,7 +444,7 @@
444
444
  background: var(--nutui-range-button-background, #ffffff);
445
445
  border-radius: 50%;
446
446
  box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.15);
447
- border: var(--nutui-range-button-border, 1px solid var(--nutui-brand-6));
447
+ border: var(--nutui-range-button-border, 1px solid var(--nutui-color-primary, #ff0f23));
448
448
  outline: none;
449
449
  align-items: center;
450
450
  top: 50%;
@@ -482,7 +482,7 @@
482
482
  justify-content: center;
483
483
  user-select: none;
484
484
  font-size: var(--nutui-font-size-s, 12px);
485
- color: var(--nutui-range-color, var(--nutui-gray-7));
485
+ color: var(--nutui-range-color, var(--nutui-color-title, #1a1a1a));
486
486
  text-align: center;
487
487
  vertical-align: center;
488
488
  box-sizing: border-box;
@@ -526,10 +526,10 @@
526
526
  height: 11px;
527
527
  left: 0px;
528
528
  border-radius: 6px;
529
- background: var(--nutui-range-inactive-color, var(--nutui-brand-1));
529
+ background: var(--nutui-range-inactive-color, var(--nutui-color-primary-light-pressed, #ffebf1));
530
530
  }
531
531
  .nut-range-tick-active {
532
- background: var(--nutui-range-active-color, var(--nutui-brand-6));
532
+ background: var(--nutui-range-active-color, var(--nutui-color-primary, #ff0f23));
533
533
  }
534
534
 
535
535
  .nut-range-vertical-container {
@@ -592,10 +592,10 @@
592
592
  width: 10px;
593
593
  height: 10px;
594
594
  border-radius: 5px;
595
- background: var(--nutui-range-inactive-color, var(--nutui-brand-1));
595
+ background: var(--nutui-range-inactive-color, var(--nutui-color-primary-light-pressed, #ffebf1));
596
596
  }
597
597
  .nut-range-vertical-tick-active {
598
- background: var(--nutui-range-active-color, var(--nutui-brand-6));
598
+ background: var(--nutui-range-active-color, var(--nutui-color-primary, #ff0f23));
599
599
  }
600
600
 
601
601
  [dir=rtl] .nut-range-button-wrapper, [dir=rtl] .nut-range-button-wrapper-right,
@@ -658,7 +658,7 @@
658
658
  height: 30px;
659
659
  background: #ffffff;
660
660
  border-radius: 50%;
661
- box-shadow: 0 0 8px var(--nutui-gray-4);
661
+ box-shadow: 0 0 8px var(--nutui-color-text-disabled, #c2c4cc);
662
662
  }
663
663
  .nut-audio-icon .nut-audio-icon-stop {
664
664
  position: relative;
@@ -671,7 +671,7 @@
671
671
  content: "";
672
672
  height: 2px;
673
673
  width: 30px;
674
- background: var(--nutui-gray-4);
674
+ background: var(--nutui-color-text-disabled, #c2c4cc);
675
675
  transform: rotate(45deg);
676
676
  transform-origin: 8px -18px;
677
677
  }
@@ -706,7 +706,7 @@
706
706
  color: blue;
707
707
  }
708
708
  .nut-audio .nut-audio-none-container .nut-voice {
709
- border: 1px solid var(--nutui-gray-7);
709
+ border: 1px solid var(--nutui-color-title, #1a1a1a);
710
710
  align-items: center;
711
711
  }
712
712
 
@@ -25,7 +25,7 @@
25
25
  flex-direction: column;
26
26
  align-items: center;
27
27
  justify-content: center;
28
- background: var(--nutui-gray-3);
28
+ background: var(--nutui-color-background, #f2f3f5);
29
29
  background-size: 100% 100%;
30
30
  }
31
31
  .nut-image-error {
@@ -38,7 +38,7 @@
38
38
  flex-direction: column;
39
39
  align-items: center;
40
40
  justify-content: center;
41
- background: var(--nutui-gray-3);
41
+ background: var(--nutui-color-background, #f2f3f5);
42
42
  background-size: 100% 100%;
43
43
  }
44
44
 
@@ -1,10 +1,6 @@
1
1
  .nut-backtop {
2
2
  display: none;
3
3
 
4
- &-rn {
5
- position: absolute;
6
- }
7
-
8
4
  &-show {
9
5
  display: flex;
10
6
  align-items: center;
@@ -33,8 +33,8 @@
33
33
  width: 20px;
34
34
  height: 20px;
35
35
  margin: 9px;
36
- color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
37
- fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
36
+ color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
37
+ fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
38
38
  }
39
39
  .nut-hoverbutton-item-icon .nut-icon {
40
40
  display: block;
@@ -43,8 +43,8 @@
43
43
  font-size: 20px;
44
44
  }
45
45
  .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
46
- color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
47
- fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
46
+ color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
47
+ fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
48
48
  }
49
49
  .nut-hoverbutton-item-text-icon {
50
50
  width: 14px;
@@ -67,9 +67,6 @@
67
67
  bottom: var(--nutui-hoverbutton-position-bottom, 60px);
68
68
  z-index: 10;
69
69
  }
70
- .nut-hoverbutton-container-rn {
71
- position: absolute;
72
- }
73
70
 
74
71
  [dir=rtl] .nut-hoverbutton-container,
75
72
  .nut-hoverbutton-container-rtl {
@@ -108,8 +105,8 @@
108
105
  width: 20px;
109
106
  height: 20px;
110
107
  margin: 9px;
111
- color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
112
- fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
108
+ color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
109
+ fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
113
110
  }
114
111
  .nut-hoverbutton-item-icon .nut-icon {
115
112
  display: block;
@@ -118,8 +115,8 @@
118
115
  font-size: 20px;
119
116
  }
120
117
  .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
121
- color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
122
- fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
118
+ color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
119
+ fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
123
120
  }
124
121
  .nut-hoverbutton-item-text-icon {
125
122
  width: 14px;
@@ -134,9 +131,6 @@
134
131
  .nut-backtop {
135
132
  display: none;
136
133
  }
137
- .nut-backtop-rn {
138
- position: absolute;
139
- }
140
134
  .nut-backtop-show {
141
135
  display: flex;
142
136
  align-items: center;
@@ -11,7 +11,7 @@
11
11
  display: flex;
12
12
  justify-content: center;
13
13
  align-items: center;
14
- background: var(--nutui-badge-background-color, var(--nutui-brand-6));
14
+ background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
15
15
  padding: var(--nutui-badge-icon-padding, 2px);
16
16
  text-align: center;
17
17
  z-index: var(--nutui-badge-z-index, 1);
@@ -48,7 +48,7 @@
48
48
  white-space: nowrap;
49
49
  font-weight: normal;
50
50
  vertical-align: middle;
51
- background: var(--nutui-badge-background-color, var(--nutui-brand-6));
51
+ background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
52
52
  z-index: 1;
53
53
  }
54
54
  .nut-badge-number {
@@ -93,8 +93,8 @@
93
93
  }
94
94
  .nut-badge-outline {
95
95
  background: #ffffff;
96
- color: var(--nutui-badge-outline-color, var(--nutui-brand-6));
96
+ color: var(--nutui-badge-outline-color, var(--nutui-color-primary, #ff0f23));
97
97
  }
98
98
  .nut-badge-outline::after {
99
- border: var(--nutui-badge-outline-border, 1px solid var(--nutui-brand-6));
99
+ border: var(--nutui-badge-outline-border, 1px solid var(--nutui-color-primary, #ff0f23));
100
100
  }
@@ -10,8 +10,8 @@
10
10
  height: 100%;
11
11
  overflow: hidden;
12
12
  box-sizing: border-box;
13
- background-color: var(--nutui-gray-3);
14
- color: var(--nutui-gray-7);
13
+ background-color: var(--nutui-color-background, #f2f3f5);
14
+ color: var(--nutui-color-title, #1a1a1a);
15
15
  }
16
16
  .nut-barrage .barrage-item {
17
17
  display: block;
@@ -31,7 +31,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
31
31
  icon: null,
32
32
  rightIcon: null,
33
33
  nativeType: 'button',
34
- onClick: function onClick(e) {}
34
+ onClick: function onClick() {}
35
35
  });
36
36
  var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
37
37
  var _ref = (0, _object_spread._)({}, defaultProps, props), color = _ref.color, shape = _ref.shape, fill = _ref.fill, loading = _ref.loading, disabled = _ref.disabled, type = _ref.type, size = _ref.size, block = _ref.block, icon = _ref.icon, rightIcon = _ref.rightIcon, children = _ref.children, className = _ref.className, style = _ref.style, nativeType = _ref.nativeType, onClick = _ref.onClick, rest = (0, _object_without_properties._)(_ref, [
@@ -51,7 +51,7 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
51
51
  "nativeType",
52
52
  "onClick"
53
53
  ]);
54
- var getStyle = (0, _react.useCallback)(function() {
54
+ var getStyle = (0, _react.useMemo)(function() {
55
55
  var style = {};
56
56
  if (color) {
57
57
  if (props.fill === 'outline' || props.fill === 'dashed') {
@@ -70,26 +70,29 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
70
70
  color,
71
71
  props.fill
72
72
  ]);
73
- var handleClick = function handleClick(e) {
73
+ var handleClick = (0, _react.useCallback)(function(e) {
74
74
  if (!loading && !disabled && onClick) {
75
75
  onClick(e);
76
76
  }
77
- };
77
+ }, [
78
+ loading,
79
+ disabled,
80
+ onClick
81
+ ]);
78
82
  var _obj;
83
+ var buttonClassNames = (0, _classnames.default)(prefixCls, "".concat(prefixCls, "-").concat(type), (_obj = {}, (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type, "-solid"), type === 'primary' && !props.fill), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(fill), props.fill), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type, "-").concat(fill), props.fill), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(size), size), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(shape), shape), (0, _define_property._)(_obj, "".concat(prefixCls, "-block"), block), (0, _define_property._)(_obj, "".concat(prefixCls, "-disabled"), disabled || loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type).concat(props.fill ? "-".concat(fill) : '', "-disabled"), disabled || loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-loading"), loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-icononly"), !children), _obj), className);
79
84
  return /*#__PURE__*/ _react.default.createElement("button", (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
80
85
  ref: ref,
81
86
  type: nativeType,
82
- className: (0, _classnames.default)(prefixCls, "".concat(prefixCls, "-").concat(type), type === 'primary' && !props.fill ? "".concat(prefixCls, "-").concat(type, "-solid") : null, props.fill ? "".concat(prefixCls, "-").concat(fill) : null, props.fill ? "".concat(prefixCls, "-").concat(type, "-").concat(fill) : null, children ? '' : "".concat(prefixCls, "-icononly"), (_obj = {}, (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(size), size), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(shape), shape), (0, _define_property._)(_obj, "".concat(prefixCls, "-block"), block), (0, _define_property._)(_obj, "".concat(prefixCls, "-disabled"), disabled || loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type).concat(props.fill ? "-".concat(fill) : '', "-disabled"), disabled || loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-loading"), loading), _obj), className),
83
- style: (0, _object_spread._)({}, getStyle(), style),
84
- onClick: function onClick(e) {
85
- return handleClick(e);
86
- }
87
+ className: buttonClassNames,
88
+ style: (0, _object_spread._)({}, getStyle, style),
89
+ onClick: handleClick
87
90
  }), /*#__PURE__*/ _react.default.createElement("div", {
88
91
  className: "nut-button-wrap"
89
92
  }, loading && /*#__PURE__*/ _react.default.createElement(_iconsreact.Loading, {
90
93
  className: "nut-icon-loading"
91
- }), !loading && icon ? icon : null, children && /*#__PURE__*/ _react.default.createElement("div", {
94
+ }), !loading && icon, children && /*#__PURE__*/ _react.default.createElement("div", {
92
95
  className: "".concat(props.fill || disabled || loading ? "nut-button-".concat(type).concat(props.fill ? "-".concat(fill) : '').concat(disabled || loading ? '-disabled' : '') : '').concat(icon || loading ? ' nut-button-text' : '').concat(rightIcon ? ' nut-button-text-right' : '')
93
- }, children), rightIcon || null));
96
+ }, children), rightIcon));
94
97
  });
95
98
  Button.displayName = 'NutButton';
@@ -2,10 +2,10 @@
2
2
  position: relative;
3
3
  display: flex;
4
4
  display: inline-block;
5
- /* #ifdef rn harmony*/
5
+ /* #ifdef harmony*/
6
6
  width: 80px;
7
7
  /* #endif */
8
- /* #ifndef rn harmony*/
8
+ /* #ifndef harmony*/
9
9
  width: auto;
10
10
  /* #endif */
11
11
  flex-direction: row;
@@ -72,7 +72,7 @@
72
72
  flex-direction: row;
73
73
  align-items: center;
74
74
  justify-content: center;
75
- /* #ifndef rn harmony */
75
+ /* #ifndef harmony */
76
76
  background: initial;
77
77
  /* #endif */
78
78
  .nut-icon {