@nutui/nutui-react 3.1.0-beta.1 → 4.0.0-beta.2

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 (196) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/dist/cjs/locales/base.d.ts +6 -0
  3. package/dist/cjs/locales/en-US.js +17 -1
  4. package/dist/cjs/locales/id-ID.js +17 -1
  5. package/dist/cjs/locales/ja-JP.js +16 -2
  6. package/dist/cjs/locales/tr-TR.js +17 -1
  7. package/dist/cjs/locales/vi-VN.js +17 -1
  8. package/dist/cjs/locales/zh-CN.js +15 -1
  9. package/dist/cjs/locales/zh-TW.js +15 -1
  10. package/dist/cjs/locales/zh-UG.js +17 -1
  11. package/dist/cjs/packages/address/style/style.css +2 -2
  12. package/dist/cjs/packages/audio/audio.js +2 -2
  13. package/dist/cjs/packages/button/button.js +30 -6
  14. package/dist/cjs/packages/button/style/button.scss +327 -227
  15. package/dist/cjs/packages/button/style/style.css +292 -47
  16. package/dist/cjs/packages/button/style-jmapp/button.scss +327 -227
  17. package/dist/cjs/packages/button/style-jmapp/style.css +268 -23
  18. package/dist/cjs/packages/button/style-jrkf/button.scss +327 -227
  19. package/dist/cjs/packages/button/style-jrkf/style.css +268 -23
  20. package/dist/cjs/packages/calendar/style/style.css +2 -2
  21. package/dist/cjs/packages/calendarcard/style/style.css +1 -1
  22. package/dist/cjs/packages/checkbox/checkbox.js +4 -3
  23. package/dist/cjs/packages/checkbox/style/checkbox.scss +19 -3
  24. package/dist/cjs/packages/checkbox/style/style.css +21 -6
  25. package/dist/cjs/packages/checkbox/style-jmapp/checkbox.scss +19 -3
  26. package/dist/cjs/packages/checkbox/style-jmapp/style.css +18 -3
  27. package/dist/cjs/packages/checkbox/style-jrkf/checkbox.scss +19 -3
  28. package/dist/cjs/packages/checkbox/style-jrkf/style.css +18 -3
  29. package/dist/cjs/packages/checkboxgroup/style/style.css +2 -2
  30. package/dist/cjs/packages/circleprogress/circleprogress.js +1 -1
  31. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  32. package/dist/cjs/packages/countdown/style/style.css +1 -1
  33. package/dist/cjs/packages/datepicker/datepicker.js +3 -5
  34. package/dist/cjs/packages/datepicker/utils.js +7 -0
  35. package/dist/cjs/packages/elevator/style/elevator.scss +6 -2
  36. package/dist/cjs/packages/elevator/style/style.css +2 -2
  37. package/dist/cjs/packages/elevator/style-jmapp/elevator.scss +6 -2
  38. package/dist/cjs/packages/elevator/style-jmapp/style.css +2 -2
  39. package/dist/cjs/packages/elevator/style-jrkf/elevator.scss +6 -2
  40. package/dist/cjs/packages/elevator/style-jrkf/style.css +2 -2
  41. package/dist/cjs/packages/ellipsis/style/style.css +1 -1
  42. package/dist/cjs/packages/inputnumber/inputnumber.js +5 -1
  43. package/dist/cjs/packages/inputnumber/style/inputnumber.scss +11 -5
  44. package/dist/cjs/packages/inputnumber/style/style.css +16 -11
  45. package/dist/cjs/packages/inputnumber/style-jmapp/inputnumber.scss +11 -5
  46. package/dist/cjs/packages/inputnumber/style-jmapp/style.css +10 -5
  47. package/dist/cjs/packages/inputnumber/style-jrkf/inputnumber.scss +11 -5
  48. package/dist/cjs/packages/inputnumber/style-jrkf/style.css +10 -5
  49. package/dist/cjs/packages/progress/progress.js +1 -1
  50. package/dist/cjs/packages/radio/radio.js +3 -2
  51. package/dist/cjs/packages/radio/style/radio.scss +9 -3
  52. package/dist/cjs/packages/radio/style/style.css +10 -5
  53. package/dist/cjs/packages/radio/style-jmapp/radio.scss +9 -3
  54. package/dist/cjs/packages/radio/style-jmapp/style.css +8 -3
  55. package/dist/cjs/packages/radio/style-jrkf/radio.scss +9 -3
  56. package/dist/cjs/packages/radio/style-jrkf/style.css +8 -3
  57. package/dist/cjs/packages/radiogroup/style/style.css +2 -2
  58. package/dist/cjs/packages/range/style/style.css +3 -3
  59. package/dist/cjs/packages/resultpage/resultpage.js +5 -5
  60. package/dist/cjs/packages/searchbar/style/searchbar.scss +5 -5
  61. package/dist/cjs/packages/searchbar/style/style.css +5 -5
  62. package/dist/cjs/packages/searchbar/style-jmapp/searchbar.scss +5 -5
  63. package/dist/cjs/packages/searchbar/style-jmapp/style.css +5 -5
  64. package/dist/cjs/packages/searchbar/style-jrkf/searchbar.scss +5 -5
  65. package/dist/cjs/packages/searchbar/style-jrkf/style.css +5 -5
  66. package/dist/cjs/packages/signature/signature.js +1 -1
  67. package/dist/cjs/packages/steps/style/style.css +2 -2
  68. package/dist/cjs/packages/swipe/swipe.js +20 -16
  69. package/dist/cjs/packages/switch/style/style.css +2 -2
  70. package/dist/cjs/packages/tabs/style/style.css +2 -2
  71. package/dist/cjs/packages/tag/style/style.css +2 -2
  72. package/dist/cjs/packages/timedetail/style/style.css +1 -1
  73. package/dist/cjs/packages/toast/Notification.js +1 -1
  74. package/dist/cjs/packages/toast/style/style.css +18 -15
  75. package/dist/cjs/packages/toast/style/toast.scss +23 -16
  76. package/dist/cjs/packages/toast/style-jmapp/style.css +17 -14
  77. package/dist/cjs/packages/toast/style-jmapp/toast.scss +23 -16
  78. package/dist/cjs/packages/toast/style-jrkf/style.css +17 -14
  79. package/dist/cjs/packages/toast/style-jrkf/toast.scss +23 -16
  80. package/dist/cjs/packages/toast/toast.js +1 -1
  81. package/dist/cjs/types/base/atoms.d.ts +3 -3
  82. package/dist/cjs/types/spec/button/base.d.ts +1 -0
  83. package/dist/cjs/utils/scale-f.d.ts +0 -17
  84. package/dist/cjs/utils/scale-f.js +14 -105
  85. package/dist/cjs/utils/taro/get-system-info.d.ts +0 -5
  86. package/dist/cjs/utils/taro/get-system-info.js +2 -7
  87. package/dist/es/hooks/taro/use-custom-event.js +1 -0
  88. package/dist/es/locales/base.d.ts +6 -0
  89. package/dist/es/locales/en-US.js +17 -1
  90. package/dist/es/locales/id-ID.js +17 -1
  91. package/dist/es/locales/ja-JP.js +16 -2
  92. package/dist/es/locales/tr-TR.js +17 -1
  93. package/dist/es/locales/vi-VN.js +17 -1
  94. package/dist/es/locales/zh-CN.js +15 -1
  95. package/dist/es/locales/zh-TW.js +15 -1
  96. package/dist/es/locales/zh-UG.js +17 -1
  97. package/dist/es/packages/address/style/style.css +2 -2
  98. package/dist/es/packages/audio/audio.js +2 -2
  99. package/dist/es/packages/button/button.js +30 -6
  100. package/dist/es/packages/button/style/button.scss +327 -227
  101. package/dist/es/packages/button/style/style.css +292 -47
  102. package/dist/es/packages/button/style-jmapp/button.scss +327 -227
  103. package/dist/es/packages/button/style-jmapp/style.css +268 -23
  104. package/dist/es/packages/button/style-jrkf/button.scss +327 -227
  105. package/dist/es/packages/button/style-jrkf/style.css +268 -23
  106. package/dist/es/packages/calendar/style/style.css +2 -2
  107. package/dist/es/packages/calendarcard/style/style.css +1 -1
  108. package/dist/es/packages/checkbox/checkbox.js +4 -3
  109. package/dist/es/packages/checkbox/style/checkbox.scss +19 -3
  110. package/dist/es/packages/checkbox/style/style.css +21 -6
  111. package/dist/es/packages/checkbox/style-jmapp/checkbox.scss +19 -3
  112. package/dist/es/packages/checkbox/style-jmapp/style.css +18 -3
  113. package/dist/es/packages/checkbox/style-jrkf/checkbox.scss +19 -3
  114. package/dist/es/packages/checkbox/style-jrkf/style.css +18 -3
  115. package/dist/es/packages/checkboxgroup/style/style.css +2 -2
  116. package/dist/es/packages/circleprogress/circleprogress.js +1 -1
  117. package/dist/es/packages/configprovider/types.d.ts +1 -1
  118. package/dist/es/packages/countdown/style/style.css +1 -1
  119. package/dist/es/packages/datepicker/datepicker.js +3 -5
  120. package/dist/es/packages/datepicker/utils.js +7 -0
  121. package/dist/es/packages/elevator/style/elevator.scss +6 -2
  122. package/dist/es/packages/elevator/style/style.css +2 -2
  123. package/dist/es/packages/elevator/style-jmapp/elevator.scss +6 -2
  124. package/dist/es/packages/elevator/style-jmapp/style.css +2 -2
  125. package/dist/es/packages/elevator/style-jrkf/elevator.scss +6 -2
  126. package/dist/es/packages/elevator/style-jrkf/style.css +2 -2
  127. package/dist/es/packages/ellipsis/style/style.css +1 -1
  128. package/dist/es/packages/inputnumber/inputnumber.js +5 -1
  129. package/dist/es/packages/inputnumber/style/inputnumber.scss +11 -5
  130. package/dist/es/packages/inputnumber/style/style.css +16 -11
  131. package/dist/es/packages/inputnumber/style-jmapp/inputnumber.scss +11 -5
  132. package/dist/es/packages/inputnumber/style-jmapp/style.css +10 -5
  133. package/dist/es/packages/inputnumber/style-jrkf/inputnumber.scss +11 -5
  134. package/dist/es/packages/inputnumber/style-jrkf/style.css +10 -5
  135. package/dist/es/packages/progress/progress.js +1 -1
  136. package/dist/es/packages/radio/radio.js +3 -2
  137. package/dist/es/packages/radio/style/radio.scss +9 -3
  138. package/dist/es/packages/radio/style/style.css +10 -5
  139. package/dist/es/packages/radio/style-jmapp/radio.scss +9 -3
  140. package/dist/es/packages/radio/style-jmapp/style.css +8 -3
  141. package/dist/es/packages/radio/style-jrkf/radio.scss +9 -3
  142. package/dist/es/packages/radio/style-jrkf/style.css +8 -3
  143. package/dist/es/packages/radiogroup/style/style.css +2 -2
  144. package/dist/es/packages/range/style/style.css +3 -3
  145. package/dist/es/packages/resultpage/resultpage.js +5 -5
  146. package/dist/es/packages/searchbar/style/searchbar.scss +5 -5
  147. package/dist/es/packages/searchbar/style/style.css +5 -5
  148. package/dist/es/packages/searchbar/style-jmapp/searchbar.scss +5 -5
  149. package/dist/es/packages/searchbar/style-jmapp/style.css +5 -5
  150. package/dist/es/packages/searchbar/style-jrkf/searchbar.scss +5 -5
  151. package/dist/es/packages/searchbar/style-jrkf/style.css +5 -5
  152. package/dist/es/packages/signature/signature.js +1 -1
  153. package/dist/es/packages/steps/style/style.css +2 -2
  154. package/dist/es/packages/swipe/swipe.js +20 -16
  155. package/dist/es/packages/switch/style/style.css +2 -2
  156. package/dist/es/packages/tabs/style/style.css +2 -2
  157. package/dist/es/packages/tag/style/style.css +2 -2
  158. package/dist/es/packages/timedetail/style/style.css +1 -1
  159. package/dist/es/packages/toast/Notification.js +1 -1
  160. package/dist/es/packages/toast/style/style.css +18 -15
  161. package/dist/es/packages/toast/style/toast.scss +23 -16
  162. package/dist/es/packages/toast/style-jmapp/style.css +17 -14
  163. package/dist/es/packages/toast/style-jmapp/toast.scss +23 -16
  164. package/dist/es/packages/toast/style-jrkf/style.css +17 -14
  165. package/dist/es/packages/toast/style-jrkf/toast.scss +23 -16
  166. package/dist/es/packages/toast/toast.js +1 -1
  167. package/dist/es/types/base/atoms.d.ts +3 -3
  168. package/dist/es/types/spec/button/base.d.ts +1 -0
  169. package/dist/es/utils/scale-f.d.ts +0 -17
  170. package/dist/es/utils/scale-f.js +15 -106
  171. package/dist/es/utils/taro/get-system-info.d.ts +0 -5
  172. package/dist/es/utils/taro/get-system-info.js +8 -7
  173. package/dist/nutui.react.umd.js +109 -145
  174. package/dist/style-jmapp.css +1 -1
  175. package/dist/style-jmapp.scss +30 -30
  176. package/dist/style-jrkf.css +1 -1
  177. package/dist/style-jrkf.scss +38 -38
  178. package/dist/style.css +1 -1
  179. package/dist/style.scss +31 -31
  180. package/dist/styles/theme-daojia.scss +55 -48
  181. package/dist/styles/theme-dark-daojia.scss +55 -47
  182. package/dist/styles/theme-dark.scss +108 -109
  183. package/dist/styles/theme-default.scss +110 -111
  184. package/dist/styles/theme-jmapp.scss +1 -1
  185. package/dist/styles/theme-jrkf.scss +1 -1
  186. package/dist/styles/themes/daojia.css +1 -1
  187. package/dist/styles/themes/dark-daojia.css +1 -1
  188. package/dist/styles/themes/dark.css +1 -1
  189. package/dist/styles/themes/default.css +1 -1
  190. package/dist/styles/themes/jmapp.css +1 -1
  191. package/dist/styles/themes/jrkf.css +1 -1
  192. package/dist/styles/variables-daojia.scss +1055 -1976
  193. package/dist/styles/variables-jmapp.scss +96 -5
  194. package/dist/styles/variables-jrkf.scss +96 -5
  195. package/dist/styles/variables.scss +141 -37
  196. package/package.json +1 -1
@@ -8,6 +8,12 @@ var jaJP = {
8
8
  select: '選択してください',
9
9
  edit: '編集',
10
10
  reset: 'リセット',
11
+ close: '閉じる',
12
+ back: '戻る',
13
+ clear: 'クリア',
14
+ image: {
15
+ errorTip: '画像の読み込みに失敗しました'
16
+ },
11
17
  video: {
12
18
  errorTip: '動画の読み込みに失敗しました',
13
19
  clickRetry: 'クリックして再試行'
@@ -47,7 +53,16 @@ var jaJP = {
47
53
  },
48
54
  today: '今日',
49
55
  loadPreviousMonth: '前の月を読み込む',
50
- noEarlierMonth: 'これより前の月はありません'
56
+ noEarlierMonth: 'これより前の月はありません',
57
+ dayAriaLabel: function(year, month, day, today, isActive, isDisable) {
58
+ if (isActive) {
59
+ return today ? "今日".concat(month, "月").concat(day, "日を選択しました") : "".concat(month, "月").concat(day, "日を選択しました");
60
+ }
61
+ if (isDisable) {
62
+ return today ? "今日".concat(month, "月").concat(day, "日は無効です") : "".concat(month, "月").concat(day, "日は無効です");
63
+ }
64
+ return today ? "今日".concat(month, "月").concat(day, "日") : "".concat(month, "月").concat(day, "日");
65
+ }
51
66
  },
52
67
  shortpassword: {
53
68
  title: 'パスワードを入力してください',
@@ -155,7 +170,6 @@ var jaJP = {
155
170
  errorCanvasTips: '現在の環境はCanvasをサポートしていません'
156
171
  },
157
172
  mask: 'マスク',
158
- close: '閉じる',
159
173
  quickenter: {
160
174
  title: 'クイックアクセス'
161
175
  }
@@ -9,6 +9,11 @@ var trTR = {
9
9
  edit: 'düzenlemek',
10
10
  reset: 'sıfırlama',
11
11
  close: 'Kapat',
12
+ back: 'Geri',
13
+ clear: 'Temizle',
14
+ image: {
15
+ errorTip: 'Resim yüklenemedi'
16
+ },
12
17
  video: {
13
18
  errorTip: 'Video yüklenemedi',
14
19
  clickRetry: 'Yeniden Tıklayın'
@@ -48,7 +53,18 @@ var trTR = {
48
53
  },
49
54
  today: 'Bugün',
50
55
  loadPreviousMonth: 'Önceki ayı yükle',
51
- noEarlierMonth: 'Önceki ay yok'
56
+ noEarlierMonth: 'Önceki ay yok',
57
+ dayAriaLabel: function(year, month, day, today, isActive, isDisable) {
58
+ var dateStr = "".concat(year, "-").concat(month, "-").concat(day);
59
+ var label = today ? "Bug\xfcn, ".concat(dateStr) : dateStr;
60
+ if (isActive) {
61
+ label = "Se\xe7ili ".concat(label);
62
+ }
63
+ if (isDisable) {
64
+ label = "".concat(label, " devre dışı");
65
+ }
66
+ return label;
67
+ }
52
68
  },
53
69
  shortpassword: {
54
70
  title: 'Lütfen şifrenizi girin',
@@ -9,6 +9,11 @@ var viVN = {
9
9
  edit: 'Chỉnh sửa',
10
10
  reset: 'Đặt lại',
11
11
  close: 'Đóng',
12
+ back: 'Quay lại',
13
+ clear: 'Xóa',
14
+ image: {
15
+ errorTip: 'Tải ảnh không thành công'
16
+ },
12
17
  video: {
13
18
  errorTip: 'Tải video không thành công',
14
19
  clickRetry: 'Nhấn để thử lại'
@@ -48,7 +53,18 @@ var viVN = {
48
53
  },
49
54
  today: 'Hôm nay',
50
55
  loadPreviousMonth: 'Tải dữ liệu của tháng trước',
51
- noEarlierMonth: 'Không có tháng nào sớm hơn'
56
+ noEarlierMonth: 'Không có tháng nào sớm hơn',
57
+ dayAriaLabel: function(year, month, day, today, isActive, isDisable) {
58
+ var dateStr = "".concat(year, "-").concat(month, "-").concat(day);
59
+ var label = today ? "H\xf4m nay, ".concat(dateStr) : dateStr;
60
+ if (isActive) {
61
+ label = "Đ\xe3 chọn ".concat(label);
62
+ }
63
+ if (isDisable) {
64
+ label = "".concat(label, " bị v\xf4 hiệu");
65
+ }
66
+ return label;
67
+ }
52
68
  },
53
69
  shortpassword: {
54
70
  title: 'Vui lòng nhập mật khẩu',
@@ -9,6 +9,11 @@ var zhCN = {
9
9
  edit: '编辑',
10
10
  reset: '重置',
11
11
  close: '关闭',
12
+ back: '返回',
13
+ clear: '清除',
14
+ image: {
15
+ errorTip: '图片加载失败'
16
+ },
12
17
  video: {
13
18
  errorTip: '视频加载失败',
14
19
  clickRetry: '点击重试'
@@ -48,7 +53,16 @@ var zhCN = {
48
53
  },
49
54
  today: '今天',
50
55
  loadPreviousMonth: '加载上一个月',
51
- noEarlierMonth: '没有更早月份'
56
+ noEarlierMonth: '没有更早月份',
57
+ dayAriaLabel: function(year, month, day, today, isActive, isDisable) {
58
+ if (isActive) {
59
+ return today ? "已选定今日".concat(month, "月").concat(day, "号") : "已选定".concat(month, "月").concat(day, "号");
60
+ }
61
+ if (isDisable) {
62
+ return today ? "".concat(month, "月").concat(day, "号今日按钮变暗") : "".concat(month, "月").concat(day, "号按钮变暗");
63
+ }
64
+ return today ? "".concat(month, "月").concat(day, "号今日") : "".concat(month, "月").concat(day, "号");
65
+ }
52
66
  },
53
67
  shortpassword: {
54
68
  title: '请输入密码',
@@ -9,6 +9,11 @@ var zhCN = {
9
9
  edit: '編輯',
10
10
  reset: '重置',
11
11
  close: '關閉',
12
+ back: '返回',
13
+ clear: '清除',
14
+ image: {
15
+ errorTip: '圖片加載失敗'
16
+ },
12
17
  video: {
13
18
  errorTip: '視頻加載失敗',
14
19
  clickRetry: '點擊重試'
@@ -48,7 +53,16 @@ var zhCN = {
48
53
  },
49
54
  today: '今天',
50
55
  loadPreviousMonth: '加載上一個月',
51
- noEarlierMonth: '沒有更早月份'
56
+ noEarlierMonth: '沒有更早月份',
57
+ dayAriaLabel: function(year, month, day, today, isActive, isDisable) {
58
+ if (isActive) {
59
+ return today ? "已選定今日".concat(month, "月").concat(day, "號") : "已選定".concat(month, "月").concat(day, "號");
60
+ }
61
+ if (isDisable) {
62
+ return today ? "".concat(month, "月").concat(day, "號今日按鈕變暗") : "".concat(month, "月").concat(day, "號按鈕變暗");
63
+ }
64
+ return today ? "".concat(month, "月").concat(day, "號今日") : "".concat(month, "月").concat(day, "號");
65
+ }
52
66
  },
53
67
  shortpassword: {
54
68
  title: '請輸入密碼',
@@ -9,6 +9,11 @@ var zhUG = {
9
9
  edit: 'يحرر',
10
10
  reset: 'إعادة ضبط',
11
11
  close: 'تاقاش',
12
+ back: 'قايتىش',
13
+ clear: 'تاقاش',
14
+ image: {
15
+ errorTip: 'رەسىم يۈكلەش مەغلۇپ بولدى'
16
+ },
12
17
  video: {
13
18
  errorTip: 'فىلىمنى قويۇش مەغلۇپ بولدى',
14
19
  clickRetry: 'قايتا سىناش'
@@ -48,7 +53,18 @@ var zhUG = {
48
53
  },
49
54
  today: 'بۈگۈن',
50
55
  loadPreviousMonth: 'ئالدىنقى ئاي',
51
- noEarlierMonth: 'تۈگىدى'
56
+ noEarlierMonth: 'تۈگىدى',
57
+ dayAriaLabel: function(year, month, day, today, isActive, isDisable) {
58
+ var dateStr = "".concat(year, "-").concat(month, "-").concat(day);
59
+ var label = today ? "بۈگۈن, ".concat(dateStr) : dateStr;
60
+ if (isActive) {
61
+ label = "تاللانغان ".concat(label);
62
+ }
63
+ if (isDisable) {
64
+ label = "".concat(label, " چەكلەنگەن");
65
+ }
66
+ return label;
67
+ }
52
68
  },
53
69
  shortpassword: {
54
70
  title: 'مەخپى نومۇرنى كىرگۈزۈڭ',
@@ -45,7 +45,7 @@ page {
45
45
  line-height: calc(42px * var(--nut-scale-f, 1));
46
46
  margin: auto;
47
47
  text-align: center;
48
- background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
48
+ background: var(--nutui-button-primary-background-color, var(--nutui-color-primary, #ff0f23));
49
49
  border-radius: calc(21px * var(--nut-scale-f, 1));
50
50
  font-size: var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1))));
51
51
  color: #ffffff;
@@ -107,7 +107,7 @@ page {
107
107
  }
108
108
  .nut-address-selected-item.active {
109
109
  border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-primary, #ff0f23);
110
- background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
110
+ background-color: var(--nutui-color-primary-light-pressed, #ffe8ee);
111
111
  color: var(--nutui-color-primary, #ff0f23);
112
112
  }
113
113
  .nut-address-selected-border {
@@ -150,8 +150,8 @@ export var Audio = function(props) {
150
150
  currentDescription: null,
151
151
  maxDescription: null,
152
152
  minDescription: null,
153
- "inactive-color": "#cccccc",
154
- "active-color": "#FF0F23"
153
+ "inactive-color": "var(--nutui-color-text-disabled, #c2c4cc)",
154
+ "active-color": "var(--nutui-color-primary, #ff0f23)"
155
155
  })), /*#__PURE__*/ React.createElement("div", {
156
156
  className: "time"
157
157
  }, AudioRef.current ? formatSeconds("".concat(statusRef.current.second)) : '00:00:00')), /*#__PURE__*/ React.createElement("div", {
@@ -22,7 +22,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
22
22
  onClick: function() {}
23
23
  });
24
24
  export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
25
- var _ref = _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 = _object_without_properties(_ref, [
25
+ var _ref = _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, description = _ref.description, onClick = _ref.onClick, rest = _object_without_properties(_ref, [
26
26
  "color",
27
27
  "shape",
28
28
  "fill",
@@ -37,8 +37,22 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
37
37
  "className",
38
38
  "style",
39
39
  "nativeType",
40
+ "description",
40
41
  "onClick"
41
42
  ]);
43
+ var mappedSize = useMemo(function() {
44
+ if (!size) return 'normal';
45
+ var sizeMap = {
46
+ '48': 'xlarge',
47
+ '40': 'large',
48
+ '32': 'normal',
49
+ '28': 'small',
50
+ '24': 'mini'
51
+ };
52
+ return sizeMap[size] || size;
53
+ }, [
54
+ size
55
+ ]);
42
56
  var getStyle = useMemo(function() {
43
57
  var style = {};
44
58
  if (color) {
@@ -48,7 +62,7 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
48
62
  style.borderColor = color;
49
63
  }
50
64
  } else {
51
- style.color = '#fff';
65
+ style.color = 'var(--nutui-color-primary-text, #fff)';
52
66
  style.background = color;
53
67
  style.borderColor = 'transparent';
54
68
  }
@@ -68,19 +82,29 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
68
82
  onClick
69
83
  ]);
70
84
  var _obj;
71
- var buttonClassNames = classNames(prefixCls, "".concat(prefixCls, "-").concat(type), (_obj = {}, _define_property(_obj, "".concat(prefixCls, "-").concat(type, "-solid"), type === 'primary' && !props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(fill), props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(type, "-").concat(fill), props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(size), size), _define_property(_obj, "".concat(prefixCls, "-").concat(shape), shape), _define_property(_obj, "".concat(prefixCls, "-block"), block), _define_property(_obj, "".concat(prefixCls, "-disabled"), disabled || loading), _define_property(_obj, "".concat(prefixCls, "-").concat(type).concat(props.fill ? "-".concat(fill) : '', "-disabled"), disabled || loading), _define_property(_obj, "".concat(prefixCls, "-loading"), loading), _define_property(_obj, "".concat(prefixCls, "-icononly"), !children), _obj), className);
85
+ var buttonClassNames = classNames(prefixCls, "".concat(prefixCls, "-").concat(type), (_obj = {}, _define_property(_obj, "".concat(prefixCls, "-").concat(type, "-solid"), type === 'primary' && !props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(fill), props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(type, "-").concat(fill), props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(mappedSize), mappedSize), _define_property(_obj, "".concat(prefixCls, "-has-desc"), !!description), _define_property(_obj, "".concat(prefixCls, "-").concat(shape), shape), _define_property(_obj, "".concat(prefixCls, "-block"), block), _define_property(_obj, "".concat(prefixCls, "-disabled"), disabled || loading), _define_property(_obj, "".concat(prefixCls, "-").concat(type).concat(props.fill ? "-".concat(fill) : '', "-disabled"), disabled || loading), _define_property(_obj, "".concat(prefixCls, "-loading"), loading), _define_property(_obj, "".concat(prefixCls, "-icononly"), !children), _obj), className);
72
86
  return /*#__PURE__*/ React.createElement("button", _object_spread_props(_object_spread({}, rest), {
73
87
  ref: ref,
74
88
  type: nativeType,
75
89
  className: buttonClassNames,
76
90
  style: _object_spread({}, getStyle, style),
91
+ "aria-disabled": disabled || loading,
92
+ "aria-busy": loading,
77
93
  onClick: handleClick
78
94
  }), /*#__PURE__*/ React.createElement("div", {
79
95
  className: "nut-button-wrap"
80
96
  }, loading && /*#__PURE__*/ React.createElement(Loading, {
81
- className: "nut-icon-loading"
97
+ className: "nut-icon-loading",
98
+ "aria-hidden": "true"
82
99
  }), !loading && icon, children && /*#__PURE__*/ React.createElement("div", {
83
- 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' : '')
84
- }, children), rightIcon));
100
+ className: classNames({
101
+ 'nut-button-text': icon || loading,
102
+ 'nut-button-text-right': rightIcon
103
+ })
104
+ }, description ? /*#__PURE__*/ React.createElement("div", {
105
+ className: "nut-button-title"
106
+ }, children) : children, description && /*#__PURE__*/ React.createElement("div", {
107
+ className: "nut-button-desc"
108
+ }, description)), rightIcon));
85
109
  });
86
110
  Button.displayName = 'NutButton';