@nutui/nutui-react 3.0.0-beta.2 → 3.0.0-beta.4

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 (167) hide show
  1. package/dist/cjs/packages/address/style/style.css +1 -1
  2. package/dist/cjs/packages/animatingnumbers/countup.js +7 -6
  3. package/dist/cjs/packages/animatingnumbers/style/style.css +10 -4
  4. package/dist/cjs/packages/audio/style/style.css +49 -34
  5. package/dist/cjs/packages/avatar/style/avatar.scss +7 -60
  6. package/dist/cjs/packages/avatar/style/style.css +5 -43
  7. package/dist/cjs/packages/badge/badge.js +5 -3
  8. package/dist/cjs/packages/badge/style/badge.scss +18 -24
  9. package/dist/cjs/packages/badge/style/style.css +17 -15
  10. package/dist/cjs/packages/button/style/button.scss +36 -19
  11. package/dist/cjs/packages/button/style/style.css +49 -34
  12. package/dist/cjs/packages/calendar/style/style.css +1 -1
  13. package/dist/cjs/packages/calendarcard/calendarcard.js +8 -3
  14. package/dist/cjs/packages/calendarcard/style/calendarcard.scss +25 -4
  15. package/dist/cjs/packages/calendarcard/style/style.css +27 -2
  16. package/dist/cjs/packages/card/style/style.css +1 -0
  17. package/dist/cjs/packages/checkbox/checkbox.d.ts +1 -4
  18. package/dist/cjs/packages/checkbox/checkbox.js +0 -2
  19. package/dist/cjs/packages/checkbox/index.d.ts +7 -2
  20. package/dist/cjs/packages/checkbox/index.js +4 -1
  21. package/dist/cjs/packages/checkbox/style/style.css +10 -0
  22. package/dist/cjs/packages/checkboxgroup/style/checkboxgroup.scss +8 -0
  23. package/dist/cjs/packages/checkboxgroup/style/style.css +10 -0
  24. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  25. package/dist/cjs/packages/countdown/countdown.d.ts +2 -20
  26. package/dist/cjs/packages/countdown/countdown.js +3 -2
  27. package/dist/cjs/packages/countdown/index.d.ts +1 -1
  28. package/dist/cjs/packages/countdown/style/countdown.scss +8 -2
  29. package/dist/cjs/packages/countdown/style/style.css +18 -13
  30. package/dist/cjs/packages/countdown/types.d.ts +26 -0
  31. package/dist/cjs/packages/countdown/types.js +4 -0
  32. package/dist/cjs/packages/countup/style/countup.scss +10 -4
  33. package/dist/cjs/packages/countup/style/style.css +10 -4
  34. package/dist/cjs/packages/dialog/style/dialog.scss +10 -7
  35. package/dist/cjs/packages/dialog/style/style.css +58 -41
  36. package/dist/cjs/packages/navbar/navbar.js +10 -5
  37. package/dist/cjs/packages/navbar/style/navbar.scss +46 -101
  38. package/dist/cjs/packages/navbar/style/style.css +44 -89
  39. package/dist/cjs/packages/pagination/pagination.js +2 -0
  40. package/dist/cjs/packages/pagination/style/pagination.scss +6 -12
  41. package/dist/cjs/packages/pagination/style/style.css +8 -14
  42. package/dist/cjs/packages/progress/progress.js +1 -1
  43. package/dist/cjs/packages/progress/style/progress.scss +2 -2
  44. package/dist/cjs/packages/progress/style/style.css +3 -2
  45. package/dist/cjs/packages/radio/index.d.ts +8 -2
  46. package/dist/cjs/packages/radio/index.js +6 -1
  47. package/dist/cjs/packages/radio/radio.d.ts +1 -4
  48. package/dist/cjs/packages/radio/radio.js +0 -2
  49. package/dist/cjs/packages/radio/style/radio.scss +1 -0
  50. package/dist/cjs/packages/radiogroup/radiogroup.js +1 -1
  51. package/dist/cjs/packages/rate/style/rate.scss +10 -5
  52. package/dist/cjs/packages/rate/style/style.css +7 -5
  53. package/dist/cjs/packages/safearea/style/safearea.scss +1 -1
  54. package/dist/cjs/packages/safearea/style/style.css +1 -1
  55. package/dist/cjs/packages/searchbar/style/searchbar.scss +10 -7
  56. package/dist/cjs/packages/searchbar/style/style.css +11 -8
  57. package/dist/cjs/packages/skeleton/style/style.css +5 -43
  58. package/dist/cjs/packages/tabbar/style/style.css +27 -15
  59. package/dist/cjs/packages/tabbaritem/style/style.css +27 -15
  60. package/dist/cjs/packages/tabbaritem/style/tabbaritem.scss +10 -0
  61. package/dist/cjs/packages/tag/style/style.css +1 -0
  62. package/dist/cjs/packages/tag/style/tag.scss +1 -0
  63. package/dist/cjs/packages/toast/style/index.js +1 -0
  64. package/dist/cjs/packages/toast/style/style.css +60 -0
  65. package/dist/cjs/packages/uploader/style/style.css +3 -2
  66. package/dist/cjs/utils/add-color-for-harmony.d.ts +9 -0
  67. package/dist/cjs/utils/add-color-for-harmony.js +27 -0
  68. package/dist/es/packages/address/style/style.css +1 -1
  69. package/dist/es/packages/animatingnumbers/countup.js +7 -6
  70. package/dist/es/packages/animatingnumbers/style/style.css +10 -4
  71. package/dist/es/packages/audio/style/style.css +49 -34
  72. package/dist/es/packages/avatar/style/avatar.scss +7 -60
  73. package/dist/es/packages/avatar/style/style.css +5 -43
  74. package/dist/es/packages/badge/badge.d.ts +7 -35
  75. package/dist/es/packages/badge/badge.js +5 -3
  76. package/dist/es/packages/badge/style/badge.scss +18 -24
  77. package/dist/es/packages/badge/style/style.css +17 -15
  78. package/dist/es/packages/button/style/button.scss +36 -19
  79. package/dist/es/packages/button/style/style.css +49 -34
  80. package/dist/es/packages/calendar/style/style.css +1 -1
  81. package/dist/es/packages/calendarcard/calendarcard.d.ts +13 -65
  82. package/dist/es/packages/calendarcard/calendarcard.js +9 -4
  83. package/dist/es/packages/calendarcard/style/calendarcard.scss +25 -4
  84. package/dist/es/packages/calendarcard/style/style.css +27 -2
  85. package/dist/es/packages/card/style/style.css +1 -0
  86. package/dist/es/packages/checkbox/checkbox.d.ts +1 -4
  87. package/dist/es/packages/checkbox/checkbox.js +1 -3
  88. package/dist/es/packages/checkbox/index.d.ts +7 -2
  89. package/dist/es/packages/checkbox/index.js +4 -1
  90. package/dist/es/packages/checkbox/style/style.css +10 -0
  91. package/dist/es/packages/checkboxgroup/checkboxgroup.d.ts +10 -50
  92. package/dist/es/packages/checkboxgroup/style/checkboxgroup.scss +8 -0
  93. package/dist/es/packages/checkboxgroup/style/style.css +10 -0
  94. package/dist/es/packages/configprovider/types.d.ts +1 -1
  95. package/dist/es/packages/countdown/countdown.d.ts +2 -20
  96. package/dist/es/packages/countdown/countdown.js +3 -2
  97. package/dist/es/packages/countdown/index.d.ts +1 -1
  98. package/dist/es/packages/countdown/style/countdown.scss +8 -2
  99. package/dist/es/packages/countdown/style/style.css +18 -13
  100. package/dist/es/packages/countdown/types.d.ts +26 -0
  101. package/dist/es/packages/countdown/types.js +1 -0
  102. package/dist/es/packages/countup/style/countup.scss +10 -4
  103. package/dist/es/packages/countup/style/style.css +10 -4
  104. package/dist/es/packages/dialog/style/dialog.scss +10 -7
  105. package/dist/es/packages/dialog/style/style.css +58 -41
  106. package/dist/es/packages/ellipsis/ellipsis.d.ts +1 -1
  107. package/dist/es/packages/loading/loading.d.ts +3 -15
  108. package/dist/es/packages/navbar/navbar.js +10 -5
  109. package/dist/es/packages/navbar/style/navbar.scss +46 -101
  110. package/dist/es/packages/navbar/style/style.css +44 -89
  111. package/dist/es/packages/pagination/pagination.js +2 -0
  112. package/dist/es/packages/pagination/style/pagination.scss +6 -12
  113. package/dist/es/packages/pagination/style/style.css +8 -14
  114. package/dist/es/packages/progress/progress.js +1 -1
  115. package/dist/es/packages/progress/style/progress.scss +2 -2
  116. package/dist/es/packages/progress/style/style.css +3 -2
  117. package/dist/es/packages/radio/index.d.ts +8 -2
  118. package/dist/es/packages/radio/index.js +5 -1
  119. package/dist/es/packages/radio/radio.d.ts +10 -49
  120. package/dist/es/packages/radio/radio.js +0 -2
  121. package/dist/es/packages/radio/style/radio.scss +1 -0
  122. package/dist/es/packages/radiogroup/radiogroup.d.ts +7 -35
  123. package/dist/es/packages/radiogroup/radiogroup.js +1 -1
  124. package/dist/es/packages/rate/rate.d.ts +12 -60
  125. package/dist/es/packages/rate/style/rate.scss +10 -5
  126. package/dist/es/packages/rate/style/style.css +7 -5
  127. package/dist/es/packages/safearea/safearea.d.ts +1 -5
  128. package/dist/es/packages/safearea/style/safearea.scss +1 -1
  129. package/dist/es/packages/safearea/style/style.css +1 -1
  130. package/dist/es/packages/searchbar/searchbar.d.ts +19 -95
  131. package/dist/es/packages/searchbar/style/searchbar.scss +10 -7
  132. package/dist/es/packages/searchbar/style/style.css +11 -8
  133. package/dist/es/packages/skeleton/style/style.css +5 -43
  134. package/dist/es/packages/tabbar/style/style.css +27 -15
  135. package/dist/es/packages/tabbar/tabbar.d.ts +7 -35
  136. package/dist/es/packages/tabbaritem/style/style.css +27 -15
  137. package/dist/es/packages/tabbaritem/style/tabbaritem.scss +10 -0
  138. package/dist/es/packages/tabbaritem/tabbaritem.d.ts +7 -35
  139. package/dist/es/packages/tag/style/style.css +1 -0
  140. package/dist/es/packages/tag/style/tag.scss +1 -0
  141. package/dist/es/packages/toast/style/index.js +1 -0
  142. package/dist/es/packages/toast/style/style.css +60 -0
  143. package/dist/es/packages/uploader/style/style.css +3 -2
  144. package/dist/es/packages/video/video.d.ts +5 -25
  145. package/dist/es/utils/add-color-for-harmony.d.ts +9 -0
  146. package/dist/es/utils/add-color-for-harmony.js +16 -0
  147. package/dist/nutui.react.umd.js +250 -235
  148. package/dist/style.css +1 -1
  149. package/dist/styles/themes/default.scss +28 -28
  150. package/dist/styles/variables.scss +43 -34
  151. package/package.json +1 -1
  152. package/dist/cjs/packages/nutui.react.build.rn.d.ts +0 -203
  153. package/dist/cjs/packages/nutui.react.build.rn.js +0 -418
  154. package/dist/cjs/packages/nutui.react.rn.d.ts +0 -304
  155. package/dist/cjs/packages/nutui.react.rn.js +0 -519
  156. package/dist/cjs/packages/popup/index.rn.d.ts +0 -3
  157. package/dist/cjs/packages/popup/index.rn.js +0 -12
  158. package/dist/cjs/packages/popup/popup.rn.d.ts +0 -26
  159. package/dist/cjs/packages/popup/popup.rn.js +0 -186
  160. package/dist/es/packages/nutui.react.build.rn.d.ts +0 -203
  161. package/dist/es/packages/nutui.react.build.rn.js +0 -203
  162. package/dist/es/packages/nutui.react.rn.d.ts +0 -304
  163. package/dist/es/packages/nutui.react.rn.js +0 -304
  164. package/dist/es/packages/popup/index.rn.d.ts +0 -3
  165. package/dist/es/packages/popup/index.rn.js +0 -2
  166. package/dist/es/packages/popup/popup.rn.d.ts +0 -26
  167. package/dist/es/packages/popup/popup.rn.js +0 -174
@@ -36,7 +36,7 @@ export var CountUp = function(props) {
36
36
  var currNumber = "".concat(thousands ? intNumber.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') : intNumber).concat(splitArr[1] ? '.' : '').concat(splitArr[1] || '');
37
37
  return currNumber.split('');
38
38
  };
39
- var numerArr = useMemo(getShowNumber, [
39
+ var numberArr = useMemo(getShowNumber, [
40
40
  value,
41
41
  length,
42
42
  thousands
@@ -44,7 +44,7 @@ export var CountUp = function(props) {
44
44
  var setNumberTransform = useCallback(function() {
45
45
  if (countupRef.current) {
46
46
  var numberItems = countupRef.current.querySelectorAll('.nut-countup-number');
47
- var numberFilterArr = numerArr.filter(function(item) {
47
+ var numberFilterArr = numberArr.filter(function(item) {
48
48
  return !Number.isNaN(Number(item));
49
49
  });
50
50
  Object.keys(numberItems).forEach(function(key) {
@@ -59,10 +59,10 @@ export var CountUp = function(props) {
59
59
  });
60
60
  }
61
61
  }, [
62
- numerArr
62
+ numberArr
63
63
  ]);
64
64
  var numberEaseStyle = {
65
- transition: "transform ".concat(duration, "s ease-in-out")
65
+ transitionDuration: "".concat(duration, "s")
66
66
  };
67
67
  useEffect(function() {
68
68
  timerRef.current = window.setTimeout(function() {
@@ -72,7 +72,7 @@ export var CountUp = function(props) {
72
72
  window.clearTimeout(timerRef.current);
73
73
  };
74
74
  }, [
75
- numerArr,
75
+ numberArr,
76
76
  delay,
77
77
  setNumberTransform
78
78
  ]);
@@ -81,7 +81,7 @@ export var CountUp = function(props) {
81
81
  ref: countupRef
82
82
  }, /*#__PURE__*/ React.createElement("ul", {
83
83
  className: "".concat(classPrefix, "-list")
84
- }, numerArr.map(function(item, idx) {
84
+ }, numberArr.map(function(item, idx) {
85
85
  return /*#__PURE__*/ React.createElement("li", {
86
86
  className: "".concat(classPrefix, "-listitem ").concat(!Number.isNaN(Number(item)) ? "".concat(classPrefix, "-listitem-number") : ''),
87
87
  key: idx
@@ -90,6 +90,7 @@ export var CountUp = function(props) {
90
90
  style: numberEaseStyle
91
91
  }, _to_consumable_array(numbers).concat(_to_consumable_array(numbers)).map(function(number, subidx) {
92
92
  return /*#__PURE__*/ React.createElement("span", {
93
+ className: "".concat(classPrefix, "-number-text"),
93
94
  key: subidx
94
95
  }, number);
95
96
  })) : /*#__PURE__*/ React.createElement("span", {
@@ -7,9 +7,8 @@
7
7
  .nut-countup-listitem {
8
8
  height: var(--nutui-countup-height, 32px);
9
9
  overflow: hidden;
10
- color: var(--nutui-color-title, #1a1a1a);
11
- font-size: var(--nutui-countup-base-size, 18px);
12
- font-weight: var(--nutui-font-weight-bold, 600);
10
+ user-select: none;
11
+ -webkit-tap-highlight-color: transparent;
13
12
  }
14
13
  .nut-countup-listitem-number {
15
14
  margin: 0 var(--nutui-countup-lr-margin, 0);
@@ -22,14 +21,21 @@
22
21
  height: 80%;
23
22
  align-items: flex-end;
24
23
  color: var(--nutui-countup-bg-color, inherit);
24
+ font-size: var(--nutui-countup-base-size, 18px);
25
+ font-weight: var(--nutui-font-weight-bold, 600);
25
26
  }
26
27
  .nut-countup-number {
27
28
  display: flex;
28
29
  flex-direction: column;
29
30
  align-items: center;
30
31
  width: var(--nutui-countup-width, auto);
32
+ transition: transform 1s ease-in-out;
33
+ transform: translate(0, 0);
31
34
  }
32
- .nut-countup-number span {
35
+ .nut-countup-number-text {
33
36
  height: var(--nutui-countup-height, 32px);
34
37
  line-height: var(--nutui-countup-height, 32px);
38
+ color: var(--nutui-countup-color, var(--nutui-color-title, #1a1a1a));
39
+ font-size: var(--nutui-countup-base-size, 18px);
40
+ font-weight: var(--nutui-font-weight-bold, 600);
35
41
  }
@@ -1,7 +1,6 @@
1
1
  .nut-button {
2
2
  position: relative;
3
3
  display: flex;
4
- display: inline-block;
5
4
  /* #ifdef rn harmony*/
6
5
  width: 80px;
7
6
  /* #endif */
@@ -16,14 +15,14 @@
16
15
  margin: 0;
17
16
  padding: 0;
18
17
  height: var(--nutui-button-default-height, 32px);
19
- font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
18
+ font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
20
19
  font-weight: var(--nutui-button-default-font-weight, var(--nutui-font-weight, 400));
21
20
  text-align: center;
22
21
  cursor: pointer;
23
22
  transition: opacity 0.2s;
24
- -webkit-appearance: none;
25
23
  user-select: none;
26
24
  touch-action: manipulation;
25
+ -webkit-appearance: none;
27
26
  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
28
27
  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
29
28
  background: var(--nutui-button-default-background-color, transparent);
@@ -72,9 +71,9 @@
72
71
  /* #endif */
73
72
  }
74
73
  .nut-button-wrap .nut-icon {
75
- font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
76
- width: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
77
- height: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
74
+ font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
75
+ width: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
76
+ height: var(--nutui-button-default-font-size, var(--nutui-font-size-s, 12px));
78
77
  }
79
78
  .nut-button-loading::before, .nut-button-disabled::before {
80
79
  display: none;
@@ -87,6 +86,18 @@
87
86
  width: var(--nutui-button-default-height, 32px);
88
87
  padding: 0;
89
88
  }
89
+ .nut-button-round {
90
+ border-radius: var(--nutui-button-border-radius, 8px);
91
+ }
92
+ .nut-button-round-xlarge, .nut-button-round-large {
93
+ border-radius: var(--nutui-button-large-border-radius, 12px);
94
+ }
95
+ .nut-button-round-small {
96
+ border-radius: var(--nutui-button-small-border-radius, 8px);
97
+ }
98
+ .nut-button-round-mini {
99
+ border-radius: var(--nutui-button-mini-border-radius, 6px);
100
+ }
90
101
  .nut-button-default {
91
102
  padding: var(--nutui-button-default-padding, 0px 12px);
92
103
  border-style: solid;
@@ -111,37 +122,52 @@
111
122
  .nut-button-xlarge {
112
123
  height: var(--nutui-button-xlarge-height, 48px);
113
124
  padding: var(--nutui-button-xlarge-padding, 0px 24px);
114
- font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
125
+ font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
115
126
  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
127
+ border-radius: var(--nutui-radius-base, 8px);
128
+ }
129
+ .nut-button-xlarge .nut-button-text {
130
+ margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
131
+ }
132
+ .nut-button-xlarge .nut-button-text-right {
133
+ margin-right: var(--nutui-button-xlarge-text-icon-margin, 6px);
116
134
  }
117
135
  .nut-button-xlarge .nut-icon {
118
- font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
119
- width: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
120
- height: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
136
+ font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
137
+ width: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
138
+ height: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
121
139
  }
122
140
  .nut-button-xlarge-children {
123
- font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xxl, 24px));
141
+ font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
124
142
  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
125
143
  }
126
144
  .nut-button-large {
127
145
  height: var(--nutui-button-large-height, 40px);
128
146
  padding: var(--nutui-button-large-padding, 0px 16px);
129
- font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
147
+ font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
130
148
  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
149
+ border-radius: var(--nutui-radius-base, 8px);
150
+ }
151
+ .nut-button-large .nut-button-text {
152
+ margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
153
+ }
154
+ .nut-button-large .nut-button-text-right {
155
+ margin-right: var(--nutui-button-xlarge-text-icon-margin, 6px);
131
156
  }
132
157
  .nut-button-large .nut-icon {
133
- font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
134
- width: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
135
- height: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
158
+ font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
159
+ width: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
160
+ height: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
136
161
  }
137
162
  .nut-button-large-children {
138
- font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
163
+ font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-base, 14px));
139
164
  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
140
165
  }
141
166
  .nut-button-small {
142
167
  height: var(--nutui-button-small-height, 28px);
143
168
  padding: var(--nutui-button-small-padding, 0px 8px);
144
169
  font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
170
+ border-radius: var(--nutui-radius-s, 6px);
145
171
  }
146
172
  .nut-button-small .nut-icon {
147
173
  font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -154,15 +180,16 @@
154
180
  .nut-button-mini {
155
181
  height: var(--nutui-button-mini-height, 24px);
156
182
  padding: var(--nutui-button-mini-padding, 0px 8px);
157
- font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
183
+ font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
184
+ border-radius: var(--nutui-radius-s, 6px);
158
185
  }
159
186
  .nut-button-mini .nut-icon {
160
- font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
161
- width: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
162
- height: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
187
+ font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
188
+ width: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
189
+ height: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
163
190
  }
164
191
  .nut-button-mini-children {
165
- font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-s, 12px));
192
+ font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
166
193
  }
167
194
  .nut-button-primary {
168
195
  color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
@@ -173,7 +200,7 @@
173
200
  color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
174
201
  }
175
202
  .nut-button-primary-solid {
176
- background: var(--nutui-color-primary, #ff0f23);
203
+ background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
177
204
  color: var(--nutui-button-primary-color, var(--nutui-color-primary-text, #ffffff));
178
205
  border-color: transparent;
179
206
  }
@@ -333,18 +360,6 @@
333
360
  cursor: default;
334
361
  opacity: 0.9;
335
362
  }
336
- .nut-button-round {
337
- border-radius: var(--nutui-button-border-radius, 8px);
338
- }
339
- .nut-button-round-xlarge, .nut-button-round-large {
340
- border-radius: var(--nutui-button-large-border-radius, 12px);
341
- }
342
- .nut-button-round-small {
343
- border-radius: var(--nutui-button-small-border-radius, 8px);
344
- }
345
- .nut-button-round-mini {
346
- border-radius: var(--nutui-button-mini-border-radius, 6px);
347
- }
348
363
  .nut-button-square {
349
364
  border-radius: var(--nutui-button-square-border-radius, 0);
350
365
  }
@@ -1,6 +1,13 @@
1
1
  .nut-avatar {
2
2
  position: relative;
3
3
  flex: 0 0 auto; // 防止被压缩
4
+
5
+ display: flex;
6
+ justify-content: center;
7
+ align-items: center;
8
+ width: $avatar-normal-width;
9
+ height: $avatar-normal-height;
10
+
4
11
  &-round {
5
12
  border-radius: 999px;
6
13
  overflow: hidden;
@@ -28,45 +35,23 @@
28
35
  background-size: 100% 100%;
29
36
  }
30
37
 
31
- .nut-icon-img {
32
- width: 100%;
33
- height: 100%;
34
- }
35
-
36
38
  &-text {
37
39
  display: flex;
38
40
  justify-content: center;
39
41
  align-items: center;
40
- width: 100%;
41
- height: 100%;
42
42
  }
43
43
 
44
44
  &-large {
45
- display: flex;
46
- justify-content: center;
47
- align-items: center;
48
45
  width: $avatar-large-width;
49
46
  height: $avatar-large-height;
50
-
51
47
  &-img {
52
48
  width: $avatar-large-width;
53
49
  height: $avatar-large-height;
54
- &-image {
55
- width: $avatar-large-width;
56
- height: $avatar-large-height;
57
- }
58
50
  }
59
-
60
51
  &-icon {
61
52
  width: $avatar-large-width;
62
53
  height: $avatar-large-height;
63
54
  }
64
-
65
- .nut-icon-img {
66
- width: 100%;
67
- height: 100%;
68
- }
69
-
70
55
  &-text {
71
56
  width: $avatar-large-width;
72
57
  height: $avatar-large-height;
@@ -74,51 +59,13 @@
74
59
  }
75
60
 
76
61
  &-small {
77
- display: flex;
78
- justify-content: center;
79
- align-items: center;
80
62
  width: $avatar-small-width;
81
63
  height: $avatar-small-height;
82
-
83
- &-img-image {
84
- width: $avatar-small-width;
85
- height: $avatar-small-height;
86
- }
87
- &-icon {
88
- // width: $avatar-small-width;
89
- // height: $avatar-small-height;
90
- }
91
64
  &-text {
92
65
  width: $avatar-small-width;
93
66
  height: $avatar-small-height;
94
67
  }
95
68
  }
96
-
97
- &-normal {
98
- display: flex;
99
- justify-content: center;
100
- align-items: center;
101
- width: $avatar-normal-width;
102
- height: $avatar-normal-height;
103
-
104
- &-img-image {
105
- width: $avatar-normal-width;
106
- height: $avatar-normal-height;
107
- }
108
-
109
- &-icon {
110
- }
111
-
112
- .nut-icon-img {
113
- width: 100%;
114
- height: 100%;
115
- }
116
-
117
- &-text {
118
- width: $avatar-normal-width;
119
- height: $avatar-normal-height;
120
- }
121
- }
122
69
  }
123
70
 
124
71
  // [dir='rtl'] .nut-avatar,
@@ -73,6 +73,11 @@
73
73
  .nut-avatar {
74
74
  position: relative;
75
75
  flex: 0 0 auto;
76
+ display: flex;
77
+ justify-content: center;
78
+ align-items: center;
79
+ width: var(--nutui-avatar-normal-width, 40px);
80
+ height: var(--nutui-avatar-normal-height, 40px);
76
81
  }
77
82
  .nut-avatar-round {
78
83
  border-radius: 999px;
@@ -96,21 +101,12 @@
96
101
  .nut-avatar-icon {
97
102
  background-size: 100% 100%;
98
103
  }
99
- .nut-avatar .nut-icon-img {
100
- width: 100%;
101
- height: 100%;
102
- }
103
104
  .nut-avatar-text {
104
105
  display: flex;
105
106
  justify-content: center;
106
107
  align-items: center;
107
- width: 100%;
108
- height: 100%;
109
108
  }
110
109
  .nut-avatar-large {
111
- display: flex;
112
- justify-content: center;
113
- align-items: center;
114
110
  width: var(--nutui-avatar-large-width, 60px);
115
111
  height: var(--nutui-avatar-large-height, 60px);
116
112
  }
@@ -118,53 +114,19 @@
118
114
  width: var(--nutui-avatar-large-width, 60px);
119
115
  height: var(--nutui-avatar-large-height, 60px);
120
116
  }
121
- .nut-avatar-large-img-image {
122
- width: var(--nutui-avatar-large-width, 60px);
123
- height: var(--nutui-avatar-large-height, 60px);
124
- }
125
117
  .nut-avatar-large-icon {
126
118
  width: var(--nutui-avatar-large-width, 60px);
127
119
  height: var(--nutui-avatar-large-height, 60px);
128
120
  }
129
- .nut-avatar-large .nut-icon-img {
130
- width: 100%;
131
- height: 100%;
132
- }
133
121
  .nut-avatar-large-text {
134
122
  width: var(--nutui-avatar-large-width, 60px);
135
123
  height: var(--nutui-avatar-large-height, 60px);
136
124
  }
137
125
  .nut-avatar-small {
138
- display: flex;
139
- justify-content: center;
140
- align-items: center;
141
- width: var(--nutui-avatar-small-width, 32px);
142
- height: var(--nutui-avatar-small-height, 32px);
143
- }
144
- .nut-avatar-small-img-image {
145
126
  width: var(--nutui-avatar-small-width, 32px);
146
127
  height: var(--nutui-avatar-small-height, 32px);
147
128
  }
148
129
  .nut-avatar-small-text {
149
130
  width: var(--nutui-avatar-small-width, 32px);
150
131
  height: var(--nutui-avatar-small-height, 32px);
151
- }
152
- .nut-avatar-normal {
153
- display: flex;
154
- justify-content: center;
155
- align-items: center;
156
- width: var(--nutui-avatar-normal-width, 40px);
157
- height: var(--nutui-avatar-normal-height, 40px);
158
- }
159
- .nut-avatar-normal-img-image {
160
- width: var(--nutui-avatar-normal-width, 40px);
161
- height: var(--nutui-avatar-normal-height, 40px);
162
- }
163
- .nut-avatar-normal .nut-icon-img {
164
- width: 100%;
165
- height: 100%;
166
- }
167
- .nut-avatar-normal-text {
168
- width: var(--nutui-avatar-normal-width, 40px);
169
- height: var(--nutui-avatar-normal-height, 40px);
170
132
  }
@@ -2,40 +2,12 @@ import { FunctionComponent, ReactNode } from 'react';
2
2
  import { BasicComponent } from "../../utils/typings";
3
3
  export type BadgeFill = 'solid' | 'outline';
4
4
  export interface BadgeProps extends BasicComponent {
5
- /**
6
- * 显示的内容,支持数字、字符和自定义内容
7
- * @default -
8
- */
9
- value: ReactNode
10
- /**
11
- * 是否为小点,当value值为自定义内容时,dot不生效
12
- * @default false
13
- */
14
- dot: boolean
15
- /**
16
- * value 为数值时,最大值
17
- * @default 99
18
- */
19
- max: number
20
- /**
21
- * 上下偏移量,支持单位设置,可设置为:"0"或0 等
22
- * @default "0"
23
- */
24
- top: string | number
25
- /**
26
- * 左右偏移量,支持单位设置,可设置为:"5"或5 等
27
- * @default "5"
28
- */
29
- right: string | number
30
- /**
31
- * 徽标背景颜色,默认值为当前主题色
32
- * @default -
33
- */
34
- color: string
35
- /**
36
- * 填充模式
37
- * @default solid
38
- */
39
- fill: BadgeFill
5
+ value: ReactNode;
6
+ dot: boolean;
7
+ max: number;
8
+ top: string | number;
9
+ right: string | number;
10
+ color: string;
11
+ fill: BadgeFill;
40
12
  }
41
13
  export declare const Badge: FunctionComponent<Partial<BadgeProps>>;
@@ -37,10 +37,11 @@ export var Badge = function(props) {
37
37
  var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, value = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right = _$_object_spread.right, color = _$_object_spread.color, fill = _$_object_spread.fill;
38
38
  var classPrefix = 'nut-badge';
39
39
  var classes = classNames(classPrefix, className, _define_property({}, "".concat(classPrefix, "-").concat(fill), fill === 'outline'));
40
- var contentClasses = classNames(_define_property({}, "".concat(classPrefix, "-dot"), dot), "".concat(classPrefix, "-content"), _define_property({}, "".concat(classPrefix, "-sup"), isNumber() || isString() || dot), _define_property({}, "".concat(classPrefix, "-one"), typeof content() === 'string' && ((_this = "".concat(content())) === null || _this === void 0 ? void 0 : _this.length) === 1));
40
+ var _obj;
41
+ var contentClasses = classNames("".concat(classPrefix, "-content"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix, "-one"), typeof content() === 'string' && ((_this = "".concat(content())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix, "-dot"), dot), _define_property(_obj, "".concat(classPrefix, "-").concat(fill), fill === 'outline'), _obj));
41
42
  var getStyle = function() {
42
43
  var style = {};
43
- style.top = "".concat(Number(top) || parseFloat(String(top)) || 0, "px");
44
+ style.top = "".concat(Number(-top) || parseFloat(String(-top)) || 0, "px");
44
45
  var dir = rtl ? 'left' : 'right';
45
46
  style[dir] = "".concat(Number(right) || parseFloat(String(right)) || 0, "px");
46
47
  if (color) {
@@ -57,11 +58,12 @@ export var Badge = function(props) {
57
58
  }
58
59
  return style;
59
60
  };
61
+ var _obj1;
60
62
  return /*#__PURE__*/ React.createElement("div", {
61
63
  className: classes,
62
64
  style: style
63
65
  }, isIcon() && /*#__PURE__*/ React.createElement("div", {
64
- className: "".concat(classPrefix, "-icon")
66
+ className: classNames("".concat(classPrefix, "-content"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-icon"), true), _define_property(_obj1, "".concat(classPrefix, "-icon-rtl"), rtl), _obj1))
65
67
  }, value), children, !isIcon() && /*#__PURE__*/ React.createElement("div", {
66
68
  className: contentClasses,
67
69
  style: getStyle()
@@ -1,15 +1,19 @@
1
1
  .nut-badge {
2
2
  position: relative;
3
- display: inline-block;
4
-
3
+ display: inline-flex;
4
+ width: auto;
5
+ /* #ifdef harmony */
6
+ min-width: 1px;
7
+ /* #endif */
8
+ /* #ifndef harmony */
9
+ min-width: auto;
10
+ /* #endif */
5
11
  &-icon {
6
12
  position: absolute;
7
13
  display: flex;
8
14
  justify-content: center;
9
15
  align-items: center;
10
16
  background: $badge-background-color;
11
- top: -10%;
12
- right: -15%;
13
17
  padding: $badge-icon-padding;
14
18
  text-align: center;
15
19
  border: $badge-border;
@@ -29,7 +33,12 @@
29
33
  display: flex;
30
34
  justify-content: center;
31
35
  align-items: center;
36
+ /* #ifdef harmony */
37
+ background: $color-primary;
38
+ /* #endif */
39
+ /* #ifndef harmony */
32
40
  background: $badge-background-color;
41
+ /* #endif */
33
42
  color: $badge-color;
34
43
  padding: $badge-padding;
35
44
  font-size: $badge-font-size;
@@ -49,7 +58,9 @@
49
58
  }
50
59
 
51
60
  &-content {
61
+ /* #ifndef rn */
52
62
  transform: $badge-content-transform;
63
+ /* #endif */
53
64
  }
54
65
 
55
66
  &-dot {
@@ -61,25 +72,8 @@
61
72
  }
62
73
 
63
74
  &-outline {
64
- .nut-badge-content {
65
- background: $color-primary-text;
66
- border: 1px solid $color-primary;
67
- color: $color-primary;
68
- }
69
- }
70
- }
71
-
72
- [dir='rtl'] .nut-badge,
73
- .nut-rtl .nut-badge {
74
- &-icon {
75
- right: auto;
76
- left: -15%;
77
- }
78
-
79
- &-content {
80
- transform: var(
81
- --nutui-badge-content-transform,
82
- translateY(-50%) translateX(-100%)
83
- );
75
+ background: $color-primary-text;
76
+ border: 1px solid $color-primary;
77
+ color: $color-primary;
84
78
  }
85
79
  }
@@ -1,6 +1,13 @@
1
1
  .nut-badge {
2
2
  position: relative;
3
- display: inline-block;
3
+ display: inline-flex;
4
+ width: auto;
5
+ /* #ifdef harmony */
6
+ min-width: 1px;
7
+ /* #endif */
8
+ /* #ifndef harmony */
9
+ min-width: auto;
10
+ /* #endif */
4
11
  }
5
12
  .nut-badge-icon {
6
13
  position: absolute;
@@ -8,8 +15,6 @@
8
15
  justify-content: center;
9
16
  align-items: center;
10
17
  background: var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
11
- top: -10%;
12
- right: -15%;
13
18
  padding: var(--nutui-badge-icon-padding, 3px);
14
19
  text-align: center;
15
20
  border: var(--nutui-badge-border, 0px solid var(--nutui-color-primary-text, #ffffff));
@@ -27,7 +32,12 @@
27
32
  display: flex;
28
33
  justify-content: center;
29
34
  align-items: center;
35
+ /* #ifdef harmony */
36
+ background: var(--nutui-color-primary, #ff0f23);
37
+ /* #endif */
38
+ /* #ifndef harmony */
30
39
  background: var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
40
+ /* #endif */
31
41
  color: var(--nutui-badge-color, #fff);
32
42
  padding: var(--nutui-badge-padding, 0 4px);
33
43
  font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxs, 10px));
@@ -45,7 +55,9 @@
45
55
  padding: 0;
46
56
  }
47
57
  .nut-badge-content {
48
- transform: var(--nutui-badge-content-transform, translateY(-50%) translateX(100%));
58
+ /* #ifndef rn */
59
+ transform: var(--nutui-badge-content-transform, translateX(100%));
60
+ /* #endif */
49
61
  }
50
62
  .nut-badge-dot {
51
63
  width: var(--nutui-badge-dot-width, 7px);
@@ -54,18 +66,8 @@
54
66
  border-radius: var(--nutui-badge-dot-width, 7px);
55
67
  padding: 0;
56
68
  }
57
- .nut-badge-outline .nut-badge-content {
69
+ .nut-badge-outline {
58
70
  background: var(--nutui-color-primary-text, #ffffff);
59
71
  border: 1px solid var(--nutui-color-primary, #ff0f23);
60
72
  color: var(--nutui-color-primary, #ff0f23);
61
- }
62
-
63
- [dir=rtl] .nut-badge-icon,
64
- .nut-rtl .nut-badge-icon {
65
- right: auto;
66
- left: -15%;
67
- }
68
- [dir=rtl] .nut-badge-content,
69
- .nut-rtl .nut-badge-content {
70
- transform: var(--nutui-badge-content-transform, translateY(-50%) translateX(-100%));
71
73
  }