@nutui/nutui-react 3.0.0-beta.10 → 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 (311) 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/index.js +2 -0
  8. package/dist/cjs/packages/backtop/style/style.css +126 -3
  9. package/dist/cjs/packages/badge/style/style.css +4 -4
  10. package/dist/cjs/packages/barrage/style/style.css +2 -2
  11. package/dist/cjs/packages/button/button.js +14 -11
  12. package/dist/cjs/packages/button/style/button.scss +3 -3
  13. package/dist/cjs/packages/button/style/style.css +43 -43
  14. package/dist/cjs/packages/calendar/style/style.css +16 -21
  15. package/dist/cjs/packages/calendarcard/style/style.css +8 -8
  16. package/dist/cjs/packages/card/style/style.css +8 -8
  17. package/dist/cjs/packages/cascader/cascader.d.ts +2 -2
  18. package/dist/cjs/packages/cascader/cascader.js +2 -2
  19. package/dist/cjs/packages/cascader/style/style.css +35 -47
  20. package/dist/cjs/packages/cell/style/style.css +8 -8
  21. package/dist/cjs/packages/cellgroup/style/style.css +3 -3
  22. package/dist/cjs/packages/checkbox/style/style.css +29 -29
  23. package/dist/cjs/packages/checkboxgroup/style/style.css +7 -7
  24. package/dist/cjs/packages/circleprogress/style/style.css +3 -3
  25. package/dist/cjs/packages/col/style/col.scss +0 -1
  26. package/dist/cjs/packages/collapse/style/style.css +11 -11
  27. package/dist/cjs/packages/collapseitem/style/style.css +11 -11
  28. package/dist/cjs/packages/configprovider/configprovider.js +2 -2
  29. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  30. package/dist/cjs/packages/countdown/style/style.css +8 -8
  31. package/dist/cjs/packages/countup/style/style.css +3 -3
  32. package/dist/cjs/packages/datepicker/style/style.css +14 -19
  33. package/dist/cjs/packages/dialog/confirm.d.ts +4 -3
  34. package/dist/cjs/packages/dialog/confirm.js +7 -21
  35. package/dist/cjs/packages/dialog/content.d.ts +4 -11
  36. package/dist/cjs/packages/dialog/content.js +30 -14
  37. package/dist/cjs/packages/dialog/dialog.d.ts +1 -2
  38. package/dist/cjs/packages/dialog/dialog.js +5 -5
  39. package/dist/cjs/packages/dialog/dialogwrap.d.ts +3 -14
  40. package/dist/cjs/packages/dialog/dialogwrap.js +33 -15
  41. package/dist/cjs/packages/dialog/index.d.ts +1 -2
  42. package/dist/cjs/packages/dialog/style/dialog.scss +0 -4
  43. package/dist/cjs/packages/dialog/style/style.css +49 -57
  44. package/dist/cjs/packages/dialog/types.d.ts +57 -0
  45. package/dist/cjs/packages/divider/style/style.css +4 -4
  46. package/dist/cjs/packages/elevator/style/style.css +8 -8
  47. package/dist/cjs/packages/empty/style/style.css +3 -3
  48. package/dist/cjs/packages/fixednav/fixednav.d.ts +2 -15
  49. package/dist/cjs/packages/fixednav/fixednav.js +20 -23
  50. package/dist/cjs/packages/fixednav/index.d.ts +1 -2
  51. package/dist/cjs/packages/fixednav/style/style.css +3 -8
  52. package/dist/cjs/packages/fixednav/types.d.ts +12 -0
  53. package/dist/cjs/packages/form/style/style.css +15 -15
  54. package/dist/cjs/packages/formitem/style/style.css +4 -4
  55. package/dist/cjs/packages/grid/style/style.css +6 -6
  56. package/dist/cjs/packages/griditem/style/style.css +5 -5
  57. package/dist/cjs/packages/hoverbutton/style/hoverbutton.scss +0 -4
  58. package/dist/cjs/packages/hoverbutton/style/style.css +4 -7
  59. package/dist/cjs/packages/hoverbuttonitem/style/style.css +4 -4
  60. package/dist/cjs/packages/image/style/style.css +2 -2
  61. package/dist/cjs/packages/imagepreview/style/style.css +11 -27
  62. package/dist/cjs/packages/indicator/style/style.css +4 -4
  63. package/dist/cjs/packages/infiniteloading/style/style.css +4 -4
  64. package/dist/cjs/packages/input/style/input.scss +0 -6
  65. package/dist/cjs/packages/input/style/style.css +8 -14
  66. package/dist/cjs/packages/inputnumber/style/style.css +7 -7
  67. package/dist/cjs/packages/loading/style/style.css +2 -2
  68. package/dist/cjs/packages/menu/style/style.css +8 -13
  69. package/dist/cjs/packages/menuitem/style/style.css +4 -9
  70. package/dist/cjs/packages/navbar/style/navbar.scss +1 -1
  71. package/dist/cjs/packages/navbar/style/style.css +3 -3
  72. package/dist/cjs/packages/notify/style/style.css +4 -4
  73. package/dist/cjs/packages/numberkeyboard/numberkeyboard.d.ts +1 -1
  74. package/dist/cjs/packages/numberkeyboard/numberkeyboard.js +2 -2
  75. package/dist/cjs/packages/numberkeyboard/style/style.css +13 -18
  76. package/dist/cjs/packages/overlay/index.d.ts +1 -1
  77. package/dist/cjs/packages/overlay/overlay.d.ts +2 -12
  78. package/dist/cjs/packages/overlay/overlay.js +10 -16
  79. package/dist/cjs/packages/overlay/style/overlay.scss +0 -5
  80. package/dist/cjs/packages/overlay/style/style.css +1 -6
  81. package/dist/cjs/packages/overlay/types.d.ts +11 -0
  82. package/dist/cjs/packages/overlay/types.js +4 -0
  83. package/dist/cjs/packages/pagination/style/style.css +7 -7
  84. package/dist/cjs/packages/picker/picker.d.ts +1 -1
  85. package/dist/cjs/packages/picker/picker.js +2 -2
  86. package/dist/cjs/packages/picker/style/style.css +14 -19
  87. package/dist/cjs/packages/popover/popover.d.ts +1 -1
  88. package/dist/cjs/packages/popover/popover.js +3 -3
  89. package/dist/cjs/packages/popover/style/style.css +12 -17
  90. package/dist/cjs/packages/popup/index.d.ts +1 -1
  91. package/dist/cjs/packages/popup/popup.d.ts +2 -24
  92. package/dist/cjs/packages/popup/popup.js +24 -41
  93. package/dist/cjs/packages/popup/style/style.css +5 -10
  94. package/dist/cjs/packages/popup/types.d.ts +25 -0
  95. package/dist/cjs/packages/popup/types.js +6 -0
  96. package/dist/cjs/packages/price/style/style.css +1 -1
  97. package/dist/cjs/packages/progress/style/style.css +1 -1
  98. package/dist/cjs/packages/pulltorefresh/style/style.css +4 -4
  99. package/dist/cjs/packages/radio/style/style.css +19 -19
  100. package/dist/cjs/packages/radiogroup/style/style.css +6 -6
  101. package/dist/cjs/packages/range/style/style.css +9 -9
  102. package/dist/cjs/packages/rate/style/style.css +4 -4
  103. package/dist/cjs/packages/resultpage/style/style.css +2 -2
  104. package/dist/cjs/packages/searchbar/style/style.css +5 -5
  105. package/dist/cjs/packages/segmented/style/style.css +2 -2
  106. package/dist/cjs/packages/shortpassword/shortpassword.js +2 -2
  107. package/dist/cjs/packages/shortpassword/style/style.css +15 -20
  108. package/dist/cjs/packages/sidebar/style/style.css +5 -5
  109. package/dist/cjs/packages/sidebaritem/style/style.css +1 -1
  110. package/dist/cjs/packages/sidenavbar/style/style.css +9 -14
  111. package/dist/cjs/packages/sidenavbaritem/style/style.css +2 -2
  112. package/dist/cjs/packages/signature/style/style.css +2 -2
  113. package/dist/cjs/packages/skeleton/style/skeleton.scss +0 -18
  114. package/dist/cjs/packages/skeleton/style/style.css +5 -11
  115. package/dist/cjs/packages/step/style/style.css +19 -19
  116. package/dist/cjs/packages/steps/style/style.css +19 -19
  117. package/dist/cjs/packages/subsidenavbar/style/style.css +2 -2
  118. package/dist/cjs/packages/swiper/style/style.css +4 -15
  119. package/dist/cjs/packages/swiper/style/swiper.scss +0 -11
  120. package/dist/cjs/packages/switch/style/style.css +6 -6
  121. package/dist/cjs/packages/tabbar/style/style.css +10 -10
  122. package/dist/cjs/packages/tabbaritem/style/style.css +9 -9
  123. package/dist/cjs/packages/table/style/style.css +11 -11
  124. package/dist/cjs/packages/tabpane/style/style.css +1 -1
  125. package/dist/cjs/packages/tabpane/tabpane.js +2 -2
  126. package/dist/cjs/packages/tabs/style/style.css +25 -32
  127. package/dist/cjs/packages/tabs/style/tabs.scss +4 -9
  128. package/dist/cjs/packages/tabs/tabs.js +35 -52
  129. package/dist/cjs/packages/tag/style/style.css +5 -5
  130. package/dist/cjs/packages/tag/style/tag.scss +0 -2
  131. package/dist/cjs/packages/textarea/style/style.css +13 -13
  132. package/dist/cjs/packages/timedetail/style/style.css +4 -4
  133. package/dist/cjs/packages/timeselect/style/style.css +14 -19
  134. package/dist/cjs/packages/toast/Notification.d.ts +6 -20
  135. package/dist/cjs/packages/toast/Notification.js +8 -7
  136. package/dist/cjs/packages/toast/index.d.ts +1 -1
  137. package/dist/cjs/packages/toast/style/style.css +2 -20
  138. package/dist/cjs/packages/toast/style/toast.scss +0 -13
  139. package/dist/cjs/packages/toast/toast.d.ts +4 -22
  140. package/dist/cjs/packages/toast/toast.js +10 -9
  141. package/dist/cjs/packages/toast/types.d.ts +17 -0
  142. package/dist/cjs/packages/toast/types.js +4 -0
  143. package/dist/cjs/packages/tour/style/style.css +16 -21
  144. package/dist/cjs/packages/trendarrow/style/style.css +1 -1
  145. package/dist/cjs/packages/uploader/style/style.css +12 -12
  146. package/dist/cjs/packages/virtuallist/style/style.css +4 -4
  147. package/dist/cjs/utils/get-rect-by-taro.js +0 -14
  148. package/dist/cjs/utils/platform-taro.d.ts +0 -2
  149. package/dist/cjs/utils/platform-taro.js +0 -21
  150. package/dist/cjs/utils/px-transform.js +0 -1
  151. package/dist/cjs/utils/use-custom-event.js +2 -2
  152. package/dist/es/packages/actionsheet/style/style.css +13 -18
  153. package/dist/es/packages/address/style/style.css +45 -57
  154. package/dist/es/packages/animatingnumbers/style/style.css +3 -3
  155. package/dist/es/packages/audio/style/style.css +55 -55
  156. package/dist/es/packages/avatar/style/style.css +2 -2
  157. package/dist/es/packages/backtop/style/backtop.scss +0 -4
  158. package/dist/es/packages/backtop/style/index.js +2 -0
  159. package/dist/es/packages/backtop/style/style.css +126 -3
  160. package/dist/es/packages/badge/style/style.css +4 -4
  161. package/dist/es/packages/barrage/style/style.css +2 -2
  162. package/dist/es/packages/button/button.js +15 -12
  163. package/dist/es/packages/button/style/button.scss +3 -3
  164. package/dist/es/packages/button/style/style.css +43 -43
  165. package/dist/es/packages/calendar/style/style.css +16 -21
  166. package/dist/es/packages/calendarcard/style/style.css +8 -8
  167. package/dist/es/packages/card/style/style.css +8 -8
  168. package/dist/es/packages/cascader/cascader.d.ts +2 -2
  169. package/dist/es/packages/cascader/cascader.js +1 -1
  170. package/dist/es/packages/cascader/style/style.css +35 -47
  171. package/dist/es/packages/cell/style/style.css +8 -8
  172. package/dist/es/packages/cellgroup/style/style.css +3 -3
  173. package/dist/es/packages/checkbox/style/style.css +29 -29
  174. package/dist/es/packages/checkboxgroup/style/style.css +7 -7
  175. package/dist/es/packages/circleprogress/style/style.css +3 -3
  176. package/dist/es/packages/col/style/col.scss +0 -1
  177. package/dist/es/packages/collapse/style/style.css +11 -11
  178. package/dist/es/packages/collapseitem/style/style.css +11 -11
  179. package/dist/es/packages/configprovider/configprovider.js +2 -2
  180. package/dist/es/packages/configprovider/types.d.ts +1 -1
  181. package/dist/es/packages/countdown/style/style.css +8 -8
  182. package/dist/es/packages/countup/style/style.css +3 -3
  183. package/dist/es/packages/datepicker/style/style.css +14 -19
  184. package/dist/es/packages/dialog/confirm.d.ts +4 -3
  185. package/dist/es/packages/dialog/confirm.js +3 -17
  186. package/dist/es/packages/dialog/content.d.ts +4 -11
  187. package/dist/es/packages/dialog/content.js +19 -11
  188. package/dist/es/packages/dialog/dialog.d.ts +1 -2
  189. package/dist/es/packages/dialog/dialog.js +6 -6
  190. package/dist/es/packages/dialog/dialogwrap.d.ts +3 -14
  191. package/dist/es/packages/dialog/dialogwrap.js +23 -13
  192. package/dist/es/packages/dialog/index.d.ts +1 -2
  193. package/dist/es/packages/dialog/style/dialog.scss +0 -4
  194. package/dist/es/packages/dialog/style/style.css +49 -57
  195. package/dist/es/packages/dialog/types.d.ts +57 -0
  196. package/dist/es/packages/divider/style/style.css +4 -4
  197. package/dist/es/packages/elevator/style/style.css +8 -8
  198. package/dist/es/packages/empty/style/style.css +3 -3
  199. package/dist/es/packages/fixednav/fixednav.d.ts +2 -55
  200. package/dist/es/packages/fixednav/fixednav.js +19 -22
  201. package/dist/es/packages/fixednav/index.d.ts +1 -2
  202. package/dist/es/packages/fixednav/style/style.css +3 -8
  203. package/dist/es/packages/fixednav/types.d.ts +12 -0
  204. package/dist/es/packages/form/style/style.css +15 -15
  205. package/dist/es/packages/formitem/style/style.css +4 -4
  206. package/dist/es/packages/grid/style/style.css +6 -6
  207. package/dist/es/packages/griditem/style/style.css +5 -5
  208. package/dist/es/packages/hoverbutton/style/hoverbutton.scss +0 -4
  209. package/dist/es/packages/hoverbutton/style/style.css +4 -7
  210. package/dist/es/packages/hoverbuttonitem/style/style.css +4 -4
  211. package/dist/es/packages/image/style/style.css +2 -2
  212. package/dist/es/packages/imagepreview/style/style.css +11 -27
  213. package/dist/es/packages/indicator/style/style.css +4 -4
  214. package/dist/es/packages/infiniteloading/style/style.css +4 -4
  215. package/dist/es/packages/input/style/input.scss +0 -6
  216. package/dist/es/packages/input/style/style.css +8 -14
  217. package/dist/es/packages/inputnumber/style/style.css +7 -7
  218. package/dist/es/packages/loading/style/style.css +2 -2
  219. package/dist/es/packages/menu/style/style.css +8 -13
  220. package/dist/es/packages/menuitem/style/style.css +4 -9
  221. package/dist/es/packages/navbar/style/navbar.scss +1 -1
  222. package/dist/es/packages/navbar/style/style.css +3 -3
  223. package/dist/es/packages/notify/style/style.css +4 -4
  224. package/dist/es/packages/numberkeyboard/numberkeyboard.d.ts +1 -1
  225. package/dist/es/packages/numberkeyboard/numberkeyboard.js +1 -1
  226. package/dist/es/packages/numberkeyboard/style/style.css +13 -18
  227. package/dist/es/packages/overlay/index.d.ts +1 -1
  228. package/dist/es/packages/overlay/overlay.d.ts +2 -12
  229. package/dist/es/packages/overlay/overlay.js +10 -16
  230. package/dist/es/packages/overlay/style/overlay.scss +0 -5
  231. package/dist/es/packages/overlay/style/style.css +1 -6
  232. package/dist/es/packages/overlay/types.d.ts +11 -0
  233. package/dist/es/packages/overlay/types.js +1 -0
  234. package/dist/es/packages/pagination/style/style.css +7 -7
  235. package/dist/es/packages/picker/picker.d.ts +1 -1
  236. package/dist/es/packages/picker/picker.js +1 -1
  237. package/dist/es/packages/picker/style/style.css +14 -19
  238. package/dist/es/packages/popover/popover.d.ts +1 -1
  239. package/dist/es/packages/popover/popover.js +2 -2
  240. package/dist/es/packages/popover/style/style.css +12 -17
  241. package/dist/es/packages/popup/index.d.ts +1 -1
  242. package/dist/es/packages/popup/popup.d.ts +2 -24
  243. package/dist/es/packages/popup/popup.js +24 -41
  244. package/dist/es/packages/popup/style/style.css +5 -10
  245. package/dist/es/packages/popup/types.d.ts +25 -0
  246. package/dist/es/packages/popup/types.js +1 -0
  247. package/dist/es/packages/price/style/style.css +1 -1
  248. package/dist/es/packages/progress/style/style.css +1 -1
  249. package/dist/es/packages/pulltorefresh/style/style.css +4 -4
  250. package/dist/es/packages/radio/style/style.css +19 -19
  251. package/dist/es/packages/radiogroup/style/style.css +6 -6
  252. package/dist/es/packages/range/style/style.css +9 -9
  253. package/dist/es/packages/rate/style/style.css +4 -4
  254. package/dist/es/packages/resultpage/style/style.css +2 -2
  255. package/dist/es/packages/searchbar/style/style.css +5 -5
  256. package/dist/es/packages/segmented/style/style.css +2 -2
  257. package/dist/es/packages/shortpassword/shortpassword.js +1 -1
  258. package/dist/es/packages/shortpassword/style/style.css +15 -20
  259. package/dist/es/packages/sidebar/style/style.css +5 -5
  260. package/dist/es/packages/sidebaritem/style/style.css +1 -1
  261. package/dist/es/packages/sidenavbar/style/style.css +9 -14
  262. package/dist/es/packages/sidenavbaritem/style/style.css +2 -2
  263. package/dist/es/packages/signature/style/style.css +2 -2
  264. package/dist/es/packages/skeleton/style/skeleton.scss +0 -18
  265. package/dist/es/packages/skeleton/style/style.css +5 -11
  266. package/dist/es/packages/step/style/style.css +19 -19
  267. package/dist/es/packages/steps/style/style.css +19 -19
  268. package/dist/es/packages/subsidenavbar/style/style.css +2 -2
  269. package/dist/es/packages/swiper/style/style.css +4 -15
  270. package/dist/es/packages/swiper/style/swiper.scss +0 -11
  271. package/dist/es/packages/switch/style/style.css +6 -6
  272. package/dist/es/packages/tabbar/style/style.css +10 -10
  273. package/dist/es/packages/tabbaritem/style/style.css +9 -9
  274. package/dist/es/packages/table/style/style.css +11 -11
  275. package/dist/es/packages/tabpane/style/style.css +1 -1
  276. package/dist/es/packages/tabpane/tabpane.js +2 -2
  277. package/dist/es/packages/tabs/style/style.css +25 -32
  278. package/dist/es/packages/tabs/style/tabs.scss +4 -9
  279. package/dist/es/packages/tabs/tabs.js +35 -52
  280. package/dist/es/packages/tag/style/style.css +5 -5
  281. package/dist/es/packages/tag/style/tag.scss +0 -2
  282. package/dist/es/packages/textarea/style/style.css +13 -13
  283. package/dist/es/packages/timedetail/style/style.css +4 -4
  284. package/dist/es/packages/timeselect/style/style.css +14 -19
  285. package/dist/es/packages/toast/Notification.d.ts +6 -20
  286. package/dist/es/packages/toast/Notification.js +8 -7
  287. package/dist/es/packages/toast/index.d.ts +1 -1
  288. package/dist/es/packages/toast/style/style.css +2 -20
  289. package/dist/es/packages/toast/style/toast.scss +0 -13
  290. package/dist/es/packages/toast/toast.d.ts +4 -22
  291. package/dist/es/packages/toast/toast.js +10 -8
  292. package/dist/es/packages/toast/types.d.ts +17 -0
  293. package/dist/es/packages/toast/types.js +1 -0
  294. package/dist/es/packages/tour/style/style.css +16 -21
  295. package/dist/es/packages/trendarrow/style/style.css +1 -1
  296. package/dist/es/packages/uploader/style/style.css +12 -12
  297. package/dist/es/packages/virtuallist/style/style.css +4 -4
  298. package/dist/es/utils/get-rect-by-taro.js +0 -14
  299. package/dist/es/utils/platform-taro.d.ts +0 -2
  300. package/dist/es/utils/platform-taro.js +0 -15
  301. package/dist/es/utils/px-transform.js +1 -2
  302. package/dist/es/utils/use-custom-event.js +1 -1
  303. package/dist/nutui.react.umd.js +426 -1017
  304. package/dist/style.css +1 -1
  305. package/dist/style.scss +44 -44
  306. package/dist/styles/variables.scss +77 -35
  307. package/package.json +2 -2
  308. package/dist/cjs/packages/dialog/config.d.ts +0 -50
  309. package/dist/es/packages/dialog/config.d.ts +0 -50
  310. /package/dist/cjs/packages/dialog/{config.js → types.js} +0 -0
  311. /package/dist/es/packages/dialog/{config.js → types.js} +0 -0
@@ -1,5 +1,5 @@
1
1
  import React, { RefObject } from 'react';
2
- import { PopupProps } from "../popup/popup";
2
+ import { PopupProps } from "../popup/index";
3
3
  import { PickerOption } from './types';
4
4
  import { BasicComponent } from "../../utils/typings";
5
5
  export type PickerActions = {
@@ -5,7 +5,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
5
5
  import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
6
6
  import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
7
7
  import classNames from "classnames";
8
- import { Popup } from "../popup/popup";
8
+ import Popup from "../popup/index";
9
9
  import { SafeArea } from "../safearea/safearea";
10
10
  import PickerPanel from "./pickerpanel";
11
11
  import useRefs from "../../utils/use-refs";
@@ -4,19 +4,14 @@
4
4
  /* #ifndef harmony */
5
5
  /* #endif */
6
6
  .nut-overlay {
7
- /* #ifdef rn */
8
- position: absolute;
9
- /* #endif */
10
- /* #ifndef rn */
11
7
  position: fixed;
12
- /* #endif */
13
8
  top: 0;
14
9
  left: 0;
15
10
  bottom: 0;
16
11
  right: 0;
17
12
  width: 100%;
18
13
  height: 100%;
19
- background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
14
+ background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
20
15
  z-index: var(--nutui-overlay-zIndex, 1000);
21
16
  }
22
17
 
@@ -67,7 +62,7 @@
67
62
  position: fixed;
68
63
  min-height: 46%;
69
64
  max-height: 100%;
70
- background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
65
+ background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
71
66
  -webkit-overflow-scrolling: touch;
72
67
  font-size: var(--nutui-font-size-base, 14px);
73
68
  }
@@ -87,13 +82,13 @@
87
82
  align-items: center;
88
83
  }
89
84
  .nut-popup-title-title {
90
- color: var(--nutui-gray-7);
85
+ color: var(--nutui-color-title, #1a1a1a);
91
86
  font-weight: var(--nutui-font-weight-bold, 600);
92
87
  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
93
88
  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
94
89
  }
95
90
  .nut-popup-title-description {
96
- color: var(--nutui-gray-6);
91
+ color: var(--nutui-color-text, #505259);
97
92
  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
98
93
  font-weight: var(--nutui-font-weight, 400);
99
94
  }
@@ -112,7 +107,7 @@
112
107
  z-index: 1;
113
108
  width: var(--nutui-popup-icon-size, 20px);
114
109
  height: var(--nutui-popup-icon-size, 20px);
115
- color: var(--nutui-gray-7);
110
+ color: var(--nutui-color-title, #1a1a1a);
116
111
  cursor: pointer;
117
112
  }
118
113
  .nut-popup-title-right:active {
@@ -377,7 +372,7 @@
377
372
  }
378
373
 
379
374
  .nut-picker {
380
- background-color: var(--nutui-gray-1);
375
+ background-color: var(--nutui-color-background-overlay, #ffffff);
381
376
  width: 100%;
382
377
  }
383
378
  .nut-picker-control {
@@ -389,11 +384,11 @@
389
384
  padding: var(--nutui-popup-title-padding, 16px);
390
385
  }
391
386
  .nut-picker-cancel-btn {
392
- color: var(--nutui-picker-title-cancel-color, var(--nutui-gray-6));
387
+ color: var(--nutui-picker-title-cancel-color, var(--nutui-color-text, #505259));
393
388
  font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-base, 14px));
394
389
  }
395
390
  .nut-picker-confirm-btn {
396
- color: var(--nutui-picker-title-ok-color, var(--nutui-brand-6));
391
+ color: var(--nutui-picker-title-ok-color, var(--nutui-color-primary, #ff0f23));
397
392
  font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-base, 14px));
398
393
  }
399
394
  .nut-picker-title {
@@ -402,7 +397,7 @@
402
397
  text-overflow: ellipsis;
403
398
  white-space: nowrap;
404
399
  text-align: center;
405
- color: var(--nutui-gray-7);
400
+ color: var(--nutui-color-title, #1a1a1a);
406
401
  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
407
402
  font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 600));
408
403
  }
@@ -415,10 +410,10 @@
415
410
  top: 108px;
416
411
  height: var(--nutui-picker-item-height, 36px);
417
412
  width: 100%;
418
- border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
413
+ border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
419
414
  border-left: 0;
420
415
  border-right: 0;
421
- color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
416
+ color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
422
417
  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
423
418
  z-index: 3;
424
419
  }
@@ -427,7 +422,7 @@
427
422
  border: 0;
428
423
  }
429
424
  .nut-picker-indicator-taro::before, .nut-picker-indicator-taro::after {
430
- border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
425
+ border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
431
426
  border-left: 0;
432
427
  border-right: 0;
433
428
  }
@@ -475,7 +470,7 @@
475
470
  text-overflow: ellipsis;
476
471
  height: var(--nutui-picker-item-height, 36px);
477
472
  line-height: var(--nutui-picker-item-height, 36px);
478
- color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
473
+ color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
479
474
  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
480
475
  text-align: center;
481
476
  }
@@ -501,7 +496,7 @@
501
496
  height: var(--nutui-picker-item-height, 36px);
502
497
  line-height: var(--nutui-picker-item-height, 36px);
503
498
  text-align: center;
504
- color: var(--nutui-gray-7);
499
+ color: var(--nutui-color-title, #1a1a1a);
505
500
  font-size: var(--nutui-font-size-base, 14px);
506
501
  }
507
502
  .nut-picker-roller-item-hidden {
@@ -1,5 +1,5 @@
1
1
  import React, { FunctionComponent } from 'react';
2
- import { PopupProps } from "../popup/popup";
2
+ import { PopupProps } from "../popup/index";
3
3
  import { PopoverTheme, PopoverLocation, PopoverList } from './types';
4
4
  export interface PopoverProps extends PopupProps {
5
5
  list: PopoverList[];
@@ -7,7 +7,7 @@ import React, { useEffect, useMemo, useRef, useState } from "react";
7
7
  import classNames from "classnames";
8
8
  import { createPortal } from "react-dom";
9
9
  import { ArrowRadius } from "@nutui/icons-react";
10
- import Popup from "../popup";
10
+ import Popup from "../popup/index";
11
11
  import { getRect } from "../../utils/use-client-rect";
12
12
  import { ComponentDefaults } from "../../utils/typings";
13
13
  import useClickAway from "../../utils/use-click-away";
@@ -249,7 +249,7 @@ export var Popover = function(props) {
249
249
  className: "nut-popover-content nut-popover-content-".concat(location),
250
250
  visible: showPopup,
251
251
  overlay: overlay,
252
- position: "default",
252
+ position: "none",
253
253
  lockScroll: false
254
254
  }, rest), /*#__PURE__*/ React.createElement("div", {
255
255
  className: "nut-popover-content-group",
@@ -4,19 +4,14 @@
4
4
  /* #ifndef harmony */
5
5
  /* #endif */
6
6
  .nut-overlay {
7
- /* #ifdef rn */
8
- position: absolute;
9
- /* #endif */
10
- /* #ifndef rn */
11
7
  position: fixed;
12
- /* #endif */
13
8
  top: 0;
14
9
  left: 0;
15
10
  bottom: 0;
16
11
  right: 0;
17
12
  width: 100%;
18
13
  height: 100%;
19
- background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
14
+ background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
20
15
  z-index: var(--nutui-overlay-zIndex, 1000);
21
16
  }
22
17
 
@@ -67,7 +62,7 @@
67
62
  position: fixed;
68
63
  min-height: 46%;
69
64
  max-height: 100%;
70
- background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
65
+ background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
71
66
  -webkit-overflow-scrolling: touch;
72
67
  font-size: var(--nutui-font-size-base, 14px);
73
68
  }
@@ -87,13 +82,13 @@
87
82
  align-items: center;
88
83
  }
89
84
  .nut-popup-title-title {
90
- color: var(--nutui-gray-7);
85
+ color: var(--nutui-color-title, #1a1a1a);
91
86
  font-weight: var(--nutui-font-weight-bold, 600);
92
87
  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
93
88
  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
94
89
  }
95
90
  .nut-popup-title-description {
96
- color: var(--nutui-gray-6);
91
+ color: var(--nutui-color-text, #505259);
97
92
  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
98
93
  font-weight: var(--nutui-font-weight, 400);
99
94
  }
@@ -112,7 +107,7 @@
112
107
  z-index: 1;
113
108
  width: var(--nutui-popup-icon-size, 20px);
114
109
  height: var(--nutui-popup-icon-size, 20px);
115
- color: var(--nutui-gray-7);
110
+ color: var(--nutui-color-title, #1a1a1a);
116
111
  cursor: pointer;
117
112
  }
118
113
  .nut-popup-title-right:active {
@@ -437,7 +432,7 @@
437
432
  background: var(--nutui-popover-content-background-color, #ffffff);
438
433
  border-radius: var(--nutui-popover-border-radius, var(--nutui-radius-xs, 4px));
439
434
  font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
440
- color: var(--nutui-popover-text-color, var(--nutui-black-10));
435
+ color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
441
436
  line-height: 28px;
442
437
  max-height: initial;
443
438
  overflow-y: initial;
@@ -447,7 +442,7 @@
447
442
  align-items: center;
448
443
  justify-content: center;
449
444
  padding: 0 var(--nutui-popover-menu-item-padding, 8px);
450
- border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3));
445
+ border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
451
446
  max-width: var(--nutui-popover-menu-item-width, 160px);
452
447
  word-wrap: break-word;
453
448
  }
@@ -481,7 +476,7 @@
481
476
  width: 12px;
482
477
  height: 12px;
483
478
  font-size: 12px;
484
- color: var(--nutui-gray-6);
479
+ color: var(--nutui-color-text, #505259);
485
480
  }
486
481
  .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
487
482
  width: 12px;
@@ -489,7 +484,7 @@
489
484
  font-size: 12px;
490
485
  }
491
486
  .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
492
- color: var(--nutui-popover-disable-color, var(--nutui-gray-4));
487
+ color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
493
488
  cursor: not-allowed;
494
489
  }
495
490
  .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -548,14 +543,14 @@
548
543
  }
549
544
 
550
545
  .nut-popover-dark {
551
- background: var(--nutui-popover-text-color, var(--nutui-black-10));
546
+ background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
552
547
  color: var(--nutui-popover-content-background-color, #ffffff);
553
548
  }
554
549
  .nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
555
- color: var(--nutui-popover-text-color, var(--nutui-black-10));
550
+ color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
556
551
  }
557
552
  .nut-popover-dark .nut-popover-content {
558
- background: var(--nutui-popover-text-color, var(--nutui-black-10)) !important;
553
+ background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7))) !important;
559
554
  color: var(--nutui-popover-content-background-color, #ffffff) !important;
560
555
  }
561
556
  .nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {
@@ -1,3 +1,3 @@
1
1
  import { Popup } from './popup';
2
- export type { PopupProps } from './popup';
2
+ export type { PopupProps, CloseIconPosition, Teleport } from './types';
3
3
  export default Popup;
@@ -1,25 +1,3 @@
1
- import React, { FunctionComponent, MouseEvent, ReactNode } from 'react';
2
- import { OverlayProps } from "../overlay/overlay";
3
- type Teleport = HTMLElement | (() => HTMLElement) | null;
4
- export interface PopupProps extends OverlayProps {
5
- position: string;
6
- transition: string;
7
- overlayStyle: React.CSSProperties;
8
- overlayClassName: string;
9
- closeable: boolean;
10
- closeIconPosition: string;
11
- closeIcon: ReactNode;
12
- left: ReactNode;
13
- title: ReactNode;
14
- description: ReactNode;
15
- destroyOnClose: boolean;
16
- portal: Teleport;
17
- overlay: boolean;
18
- round: boolean;
19
- onOpen: () => void;
20
- onClose: () => void;
21
- onOverlayClick: (e: MouseEvent) => boolean | void;
22
- onCloseIconClick: (e: MouseEvent) => boolean | void;
23
- }
1
+ import React, { FunctionComponent } from 'react';
2
+ import { PopupProps } from './types';
24
3
  export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>>;
25
- export {};
@@ -9,9 +9,8 @@ import classNames from "classnames";
9
9
  import { Close } from "@nutui/icons-react";
10
10
  import { defaultOverlayProps } from "../overlay/overlay";
11
11
  import Overlay from "../overlay";
12
- import { ComponentDefaults } from "../../utils/typings";
13
12
  import { useLockScroll } from "../../utils/use-lock-scroll";
14
- var defaultProps = _object_spread(_object_spread_props(_object_spread({}, ComponentDefaults), {
13
+ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
15
14
  position: 'center',
16
15
  transition: '',
17
16
  overlayStyle: {},
@@ -25,13 +24,13 @@ var defaultProps = _object_spread(_object_spread_props(_object_spread({}, Compon
25
24
  round: false,
26
25
  onOpen: function() {},
27
26
  onClose: function() {},
28
- onOverlayClick: function(e) {
27
+ onOverlayClick: function() {
29
28
  return true;
30
29
  },
31
- onCloseIconClick: function(e) {
30
+ onCloseIconClick: function() {
32
31
  return true;
33
32
  }
34
- }), defaultOverlayProps);
33
+ });
35
34
  // 默认1000,参看variables
36
35
  var _zIndex = 1100;
37
36
  export var Popup = function(props) {
@@ -42,20 +41,14 @@ export var Popup = function(props) {
42
41
  var _useState1 = _sliced_to_array(useState(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
43
42
  var _useState2 = _sliced_to_array(useState(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
44
43
  var _useState3 = _sliced_to_array(useState(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
45
- var shouldLockScroll = !innerVisible ? false : lockScroll;
46
- useLockScroll(nodeRef, shouldLockScroll);
44
+ useLockScroll(nodeRef, innerVisible && lockScroll);
47
45
  var classPrefix = 'nut-popup';
48
- var baseStyle = {
46
+ var overlayStyles = _object_spread({}, overlayStyle);
47
+ var popStyles = _object_spread_props(_object_spread({}, style), {
49
48
  zIndex: index
50
- };
51
- var overlayStyles = _object_spread_props(_object_spread({}, overlayStyle), {
52
- '--nutui-overlay-zIndex': index
53
49
  });
54
- var popStyles = _object_spread({}, style, baseStyle);
55
50
  var _obj;
56
- var popClassName = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix), true), _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
57
- var _obj1;
58
- var closeClasses = classNames((_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-title-right"), true), _define_property(_obj1, "".concat(classPrefix, "-title-right-").concat(closeIconPosition), true), _obj1));
51
+ var popClassName = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
59
52
  var open = function() {
60
53
  if (!innerVisible) {
61
54
  setInnerVisible(true);
@@ -77,30 +70,20 @@ export var Popup = function(props) {
77
70
  onClose && onClose();
78
71
  }
79
72
  };
80
- var onHandleClickOverlay = function(e) {
73
+ var handleOverlayClick = function(e) {
81
74
  e.stopPropagation();
82
- if (closeOnOverlayClick) {
83
- var closed = onOverlayClick && onOverlayClick(e);
84
- closed && close();
75
+ if (closeOnOverlayClick && onOverlayClick(e)) {
76
+ close();
85
77
  }
86
78
  };
87
- var onHandleClick = function(e) {
88
- onClick && onClick(e);
89
- };
90
- var onHandleClickCloseIcon = function(e) {
91
- var closed = onCloseIconClick && onCloseIconClick(e);
92
- closed && close();
93
- };
94
- var onHandleOpened = function(e) {
95
- afterShow && afterShow();
96
- };
97
- var onHandleClosed = function(e) {
98
- afterClose && afterClose();
79
+ var handleCloseIconClick = function(e) {
80
+ onCloseIconClick(e) && close();
99
81
  };
100
82
  var renderCloseIcon = function() {
83
+ var closeClasses = classNames("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
101
84
  return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement("div", {
102
85
  className: closeClasses,
103
- onClick: onHandleClickCloseIcon
86
+ onClick: handleCloseIconClick
104
87
  }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
105
88
  };
106
89
  var renderTitle = function() {
@@ -129,25 +112,26 @@ export var Popup = function(props) {
129
112
  unmountOnExit: destroyOnClose,
130
113
  timeout: duration,
131
114
  in: innerVisible,
132
- onEntered: onHandleOpened,
133
- onExited: onHandleClosed
115
+ onEntered: afterShow,
116
+ onExited: afterClose
134
117
  }, /*#__PURE__*/ React.createElement("div", {
135
118
  ref: nodeRef,
136
119
  style: popStyles,
137
120
  className: popClassName,
138
- onClick: onHandleClick
139
- }, renderTitle(), showChildren ? children : ''));
121
+ onClick: onClick
122
+ }, renderTitle(), showChildren && children));
140
123
  };
141
124
  var renderNode = function() {
142
- return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
125
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay && /*#__PURE__*/ React.createElement(Overlay, {
126
+ zIndex: index,
143
127
  style: overlayStyles,
144
128
  className: overlayClassName,
145
129
  visible: innerVisible,
146
130
  closeOnOverlayClick: closeOnOverlayClick,
147
131
  lockScroll: lockScroll,
148
132
  duration: duration,
149
- onClick: onHandleClickOverlay
150
- }) : null, renderPop());
133
+ onClick: handleOverlayClick
134
+ }), renderPop());
151
135
  };
152
136
  useEffect(function() {
153
137
  visible ? open() : close();
@@ -161,8 +145,7 @@ export var Popup = function(props) {
161
145
  transition
162
146
  ]);
163
147
  var resolveContainer = function(getContainer) {
164
- var container = typeof getContainer === 'function' ? getContainer() : getContainer;
165
- return container || document.body;
148
+ return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
166
149
  };
167
150
  var renderToContainer = function(getContainer, node) {
168
151
  if (getContainer) {
@@ -4,19 +4,14 @@
4
4
  /* #ifndef harmony */
5
5
  /* #endif */
6
6
  .nut-overlay {
7
- /* #ifdef rn */
8
- position: absolute;
9
- /* #endif */
10
- /* #ifndef rn */
11
7
  position: fixed;
12
- /* #endif */
13
8
  top: 0;
14
9
  left: 0;
15
10
  bottom: 0;
16
11
  right: 0;
17
12
  width: 100%;
18
13
  height: 100%;
19
- background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
14
+ background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
20
15
  z-index: var(--nutui-overlay-zIndex, 1000);
21
16
  }
22
17
 
@@ -67,7 +62,7 @@
67
62
  position: fixed;
68
63
  min-height: 46%;
69
64
  max-height: 100%;
70
- background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
65
+ background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
71
66
  -webkit-overflow-scrolling: touch;
72
67
  font-size: var(--nutui-font-size-base, 14px);
73
68
  }
@@ -87,13 +82,13 @@
87
82
  align-items: center;
88
83
  }
89
84
  .nut-popup-title-title {
90
- color: var(--nutui-gray-7);
85
+ color: var(--nutui-color-title, #1a1a1a);
91
86
  font-weight: var(--nutui-font-weight-bold, 600);
92
87
  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
93
88
  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
94
89
  }
95
90
  .nut-popup-title-description {
96
- color: var(--nutui-gray-6);
91
+ color: var(--nutui-color-text, #505259);
97
92
  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
98
93
  font-weight: var(--nutui-font-weight, 400);
99
94
  }
@@ -112,7 +107,7 @@
112
107
  z-index: 1;
113
108
  width: var(--nutui-popup-icon-size, 20px);
114
109
  height: var(--nutui-popup-icon-size, 20px);
115
- color: var(--nutui-gray-7);
110
+ color: var(--nutui-color-title, #1a1a1a);
116
111
  cursor: pointer;
117
112
  }
118
113
  .nut-popup-title-right:active {
@@ -0,0 +1,25 @@
1
+ import React, { ReactNode } from 'react';
2
+ import { OverlayProps } from "../overlay/types";
3
+ export type Teleport = HTMLElement | (() => HTMLElement) | null;
4
+ export type Position = 'top' | 'bottom' | 'left' | 'right' | 'center' | 'none';
5
+ export type CloseIconPosition = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
6
+ export interface PopupProps extends OverlayProps {
7
+ position: Position;
8
+ transition: string;
9
+ overlayStyle: React.CSSProperties;
10
+ overlayClassName: string;
11
+ closeable: boolean;
12
+ closeIconPosition: CloseIconPosition;
13
+ closeIcon: ReactNode;
14
+ left?: ReactNode;
15
+ title?: ReactNode;
16
+ description?: ReactNode;
17
+ destroyOnClose: boolean;
18
+ portal: Teleport;
19
+ overlay: boolean;
20
+ round: boolean;
21
+ onOpen: () => void;
22
+ onClose: () => void;
23
+ onOverlayClick: (e: React.MouseEvent) => boolean | void;
24
+ onCloseIconClick: (e: React.MouseEvent) => boolean | void;
25
+ }
@@ -0,0 +1 @@
1
+ import React from "react";
@@ -20,7 +20,7 @@
20
20
  }
21
21
  .nut-price-primary .nut-price-symbol, .nut-price-primary .nut-price-integer, .nut-price-primary .nut-price-decimal {
22
22
  font-family: "JD-Bold";
23
- color: var(--nutui-price-color, var(--nutui-brand-6));
23
+ color: var(--nutui-price-color, var(--nutui-color-primary, #ff0f23));
24
24
  }
25
25
  .nut-price-symbol {
26
26
  padding-right: var(--nutui-price-symbol-padding-right, 0px);
@@ -12,7 +12,7 @@
12
12
  flex: auto;
13
13
  border-radius: var(--nutui-progress-border-radius, 12px);
14
14
  height: var(--nutui-progress-height, 10px);
15
- background: var(--nutui-progress-background, var(--nutui-gray-3));
15
+ background: var(--nutui-progress-background, var(--nutui-color-background, #f2f3f5));
16
16
  }
17
17
  .nut-progress-outer .nut-progress-active:before {
18
18
  content: "";
@@ -12,7 +12,7 @@
12
12
  bottom: 0;
13
13
  left: 0;
14
14
  width: 100%;
15
- color: var(--nutui-gray-5);
15
+ color: var(--nutui-color-text-help, #888b94);
16
16
  display: flex;
17
17
  flex-direction: column;
18
18
  justify-content: center;
@@ -24,13 +24,13 @@
24
24
  margin-bottom: 4px;
25
25
  }
26
26
  .nut-pulltorefresh-primary {
27
- background: var(--nutui-pulltorefresh-color-primary, var(--nutui-brand-6));
27
+ background: var(--nutui-pulltorefresh-color-primary, var(--nutui-color-primary, #ff0f23));
28
28
  }
29
29
  .nut-pulltorefresh-primary-content {
30
- color: var(--nutui-white-12);
30
+ color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
31
31
  }
32
32
  .nut-pulltorefresh-primary-head-content {
33
- color: var(--nutui-white-12);
33
+ color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
34
34
  }
35
35
  .nut-pulltorefresh-primary-status-text {
36
36
  color: #ffffff;