@nutui/nutui-react-taro 3.0.0 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (179) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/cjs/packages/actionsheet/style/style.css +12 -0
  3. package/dist/cjs/packages/address/style/style.css +12 -0
  4. package/dist/cjs/packages/calendar/style/style.css +12 -0
  5. package/dist/cjs/packages/cascader/style/style.css +12 -0
  6. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  7. package/dist/cjs/packages/datepicker/datepicker.js +8 -6
  8. package/dist/cjs/packages/datepicker/style/style.css +12 -0
  9. package/dist/cjs/packages/datepickerview/datepickerview.d.ts +3 -0
  10. package/dist/cjs/packages/datepickerview/datepickerview.js +119 -0
  11. package/dist/cjs/packages/datepickerview/index.d.ts +3 -0
  12. package/dist/cjs/packages/{subsidenavbar → datepickerview}/index.js +2 -2
  13. package/dist/cjs/packages/datepickerview/style/datepickerview.scss +4 -0
  14. package/dist/cjs/packages/datepickerview/style/index.js +1 -0
  15. package/dist/cjs/packages/datepickerview/style/style.css +8 -0
  16. package/dist/cjs/packages/datepickerview/style/style.harmony.css +8 -0
  17. package/dist/cjs/packages/datepickerview/types.d.ts +15 -0
  18. package/dist/cjs/packages/datepickerview/types.js +4 -0
  19. package/dist/cjs/packages/dialog/dialog.js +8 -3
  20. package/dist/cjs/packages/dialog/style/dialog.scss +0 -1
  21. package/dist/cjs/packages/dialog/style/style.css +0 -1
  22. package/dist/cjs/packages/dialog/style/style.harmony.css +0 -1
  23. package/dist/cjs/packages/drag/drag.js +33 -39
  24. package/dist/cjs/packages/drag/style/drag.scss +1 -0
  25. package/dist/cjs/packages/drag/style/style.css +1 -0
  26. package/dist/cjs/packages/drag/style/style.harmony.css +1 -0
  27. package/dist/cjs/packages/imagepreview/style/style.css +12 -0
  28. package/dist/cjs/packages/input/input.js +2 -1
  29. package/dist/cjs/packages/input/style/input.scss +6 -4
  30. package/dist/cjs/packages/input/style/style.css +4 -0
  31. package/dist/cjs/packages/input/style/style.harmony.css +8 -0
  32. package/dist/cjs/packages/numberkeyboard/style/style.css +12 -0
  33. package/dist/cjs/packages/nutui.react.build.d.ts +11 -15
  34. package/dist/cjs/packages/nutui.react.build.js +172 -180
  35. package/dist/cjs/packages/nutui.react.d.ts +16 -22
  36. package/dist/cjs/packages/nutui.react.js +177 -187
  37. package/dist/cjs/packages/nutui.react.scss.d.ts +5 -7
  38. package/dist/cjs/packages/nutui.react.scss.js +5 -7
  39. package/dist/cjs/packages/overlay/overlay.js +4 -5
  40. package/dist/cjs/packages/overlay/style/overlay.scss +0 -4
  41. package/dist/cjs/packages/picker/style/style.css +12 -0
  42. package/dist/cjs/packages/popover/style/style.css +12 -0
  43. package/dist/cjs/packages/popup/popup.js +17 -11
  44. package/dist/cjs/packages/popup/style/popup.scss +12 -4
  45. package/dist/cjs/packages/popup/style/style.css +12 -0
  46. package/dist/cjs/packages/popup/style/style.harmony.css +12 -0
  47. package/dist/cjs/packages/shortpassword/shortpassword.js +5 -7
  48. package/dist/cjs/packages/shortpassword/style/shortpassword.scss +10 -0
  49. package/dist/cjs/packages/shortpassword/style/style.css +21 -0
  50. package/dist/cjs/packages/shortpassword/style/style.harmony.css +9 -0
  51. package/dist/cjs/packages/tabbar/style/style.css +6 -0
  52. package/dist/cjs/packages/tabbaritem/style/style.css +6 -0
  53. package/dist/cjs/packages/tabbaritem/style/style.harmony.css +6 -0
  54. package/dist/cjs/packages/tabbaritem/style/tabbaritem.scss +6 -0
  55. package/dist/cjs/packages/tabs/tabs.js +6 -13
  56. package/dist/cjs/packages/textarea/textarea.js +1 -1
  57. package/dist/cjs/packages/timeselect/style/style.css +12 -0
  58. package/dist/cjs/packages/tour/style/style.css +12 -0
  59. package/dist/es/packages/actionsheet/style/style.css +12 -0
  60. package/dist/es/packages/address/style/style.css +12 -0
  61. package/dist/es/packages/calendar/style/style.css +12 -0
  62. package/dist/es/packages/cascader/style/style.css +12 -0
  63. package/dist/es/packages/configprovider/types.d.ts +1 -1
  64. package/dist/es/packages/datepicker/datepicker.js +8 -6
  65. package/dist/es/packages/datepicker/style/style.css +12 -0
  66. package/dist/es/packages/datepickerview/datepickerview.d.ts +3 -0
  67. package/dist/es/packages/datepickerview/datepickerview.js +107 -0
  68. package/dist/es/packages/datepickerview/index.d.ts +3 -0
  69. package/dist/es/packages/datepickerview/index.js +2 -0
  70. package/dist/es/packages/datepickerview/style/datepickerview.scss +4 -0
  71. package/dist/es/packages/datepickerview/style/index.js +1 -0
  72. package/dist/es/packages/datepickerview/style/style.css +8 -0
  73. package/dist/es/packages/datepickerview/style/style.harmony.css +8 -0
  74. package/dist/es/packages/datepickerview/types.d.ts +15 -0
  75. package/dist/es/packages/datepickerview/types.js +1 -0
  76. package/dist/es/packages/dialog/dialog.js +8 -3
  77. package/dist/es/packages/dialog/style/dialog.scss +0 -1
  78. package/dist/es/packages/dialog/style/style.css +0 -1
  79. package/dist/es/packages/dialog/style/style.harmony.css +0 -1
  80. package/dist/es/packages/drag/drag.js +33 -39
  81. package/dist/es/packages/drag/style/drag.scss +1 -0
  82. package/dist/es/packages/drag/style/style.css +1 -0
  83. package/dist/es/packages/drag/style/style.harmony.css +1 -0
  84. package/dist/es/packages/imagepreview/style/style.css +12 -0
  85. package/dist/es/packages/input/input.js +2 -1
  86. package/dist/es/packages/input/style/input.scss +6 -4
  87. package/dist/es/packages/input/style/style.css +4 -0
  88. package/dist/es/packages/input/style/style.harmony.css +8 -0
  89. package/dist/es/packages/numberkeyboard/style/style.css +12 -0
  90. package/dist/es/packages/nutui.react.build.d.ts +11 -15
  91. package/dist/es/packages/nutui.react.build.js +11 -15
  92. package/dist/es/packages/overlay/overlay.js +4 -5
  93. package/dist/es/packages/overlay/style/overlay.scss +0 -4
  94. package/dist/es/packages/picker/style/style.css +12 -0
  95. package/dist/es/packages/popover/style/style.css +12 -0
  96. package/dist/es/packages/popup/popup.js +17 -11
  97. package/dist/es/packages/popup/style/popup.scss +12 -4
  98. package/dist/es/packages/popup/style/style.css +12 -0
  99. package/dist/es/packages/popup/style/style.harmony.css +12 -0
  100. package/dist/es/packages/shortpassword/shortpassword.js +5 -7
  101. package/dist/es/packages/shortpassword/style/shortpassword.scss +10 -0
  102. package/dist/es/packages/shortpassword/style/style.css +21 -0
  103. package/dist/es/packages/shortpassword/style/style.harmony.css +9 -0
  104. package/dist/es/packages/tabbar/style/style.css +6 -0
  105. package/dist/es/packages/tabbaritem/style/style.css +6 -0
  106. package/dist/es/packages/tabbaritem/style/style.harmony.css +6 -0
  107. package/dist/es/packages/tabbaritem/style/tabbaritem.scss +6 -0
  108. package/dist/es/packages/tabs/tabs.js +6 -13
  109. package/dist/es/packages/textarea/textarea.js +2 -2
  110. package/dist/es/packages/timeselect/style/style.css +12 -0
  111. package/dist/es/packages/tour/style/style.css +12 -0
  112. package/dist/nutui.react.umd.js +1317 -1383
  113. package/dist/style.css +1 -1
  114. package/dist/style.scss +32 -34
  115. package/dist/styles/variables-jmapp.scss +0 -50
  116. package/dist/styles/variables-jrkf.scss +0 -50
  117. package/dist/styles/variables.scss +0 -49
  118. package/package.json +1 -1
  119. package/dist/cjs/packages/sidenavbar/context.d.ts +0 -1
  120. package/dist/cjs/packages/sidenavbar/context.js +0 -12
  121. package/dist/cjs/packages/sidenavbar/index.d.ts +0 -3
  122. package/dist/cjs/packages/sidenavbar/index.js +0 -12
  123. package/dist/cjs/packages/sidenavbar/sidenavbar.d.ts +0 -14
  124. package/dist/cjs/packages/sidenavbar/sidenavbar.js +0 -75
  125. package/dist/cjs/packages/sidenavbar/style/index.js +0 -2
  126. package/dist/cjs/packages/sidenavbar/style/sidenavbar.scss +0 -89
  127. package/dist/cjs/packages/sidenavbar/style/style.css +0 -443
  128. package/dist/cjs/packages/sidenavbar/style/style.harmony.css +0 -74
  129. package/dist/cjs/packages/sidenavbar/utils.d.ts +0 -3
  130. package/dist/cjs/packages/sidenavbar/utils.js +0 -23
  131. package/dist/cjs/packages/sidenavbaritem/index.d.ts +0 -3
  132. package/dist/cjs/packages/sidenavbaritem/index.js +0 -12
  133. package/dist/cjs/packages/sidenavbaritem/sidenavbaritem.d.ts +0 -11
  134. package/dist/cjs/packages/sidenavbaritem/sidenavbaritem.js +0 -34
  135. package/dist/cjs/packages/sidenavbaritem/style/index.js +0 -1
  136. package/dist/cjs/packages/sidenavbaritem/style/sidenavbaritem.scss +0 -13
  137. package/dist/cjs/packages/sidenavbaritem/style/style.css +0 -14
  138. package/dist/cjs/packages/sidenavbaritem/style/style.harmony.css +0 -14
  139. package/dist/cjs/packages/subsidenavbar/index.d.ts +0 -3
  140. package/dist/cjs/packages/subsidenavbar/style/css.js +0 -1
  141. package/dist/cjs/packages/subsidenavbar/style/index.js +0 -1
  142. package/dist/cjs/packages/subsidenavbar/style/style.css +0 -20
  143. package/dist/cjs/packages/subsidenavbar/style/style.harmony.css +0 -20
  144. package/dist/cjs/packages/subsidenavbar/style/subsidenavbar.scss +0 -26
  145. package/dist/cjs/packages/subsidenavbar/subsidenavbar.d.ts +0 -13
  146. package/dist/cjs/packages/subsidenavbar/subsidenavbar.js +0 -90
  147. package/dist/es/packages/sidenavbar/context.d.ts +0 -1
  148. package/dist/es/packages/sidenavbar/context.js +0 -2
  149. package/dist/es/packages/sidenavbar/index.d.ts +0 -3
  150. package/dist/es/packages/sidenavbar/index.js +0 -2
  151. package/dist/es/packages/sidenavbar/sidenavbar.d.ts +0 -38
  152. package/dist/es/packages/sidenavbar/sidenavbar.js +0 -63
  153. package/dist/es/packages/sidenavbar/style/css.js +0 -1
  154. package/dist/es/packages/sidenavbar/style/index.js +0 -2
  155. package/dist/es/packages/sidenavbar/style/sidenavbar.scss +0 -89
  156. package/dist/es/packages/sidenavbar/style/style.css +0 -443
  157. package/dist/es/packages/sidenavbar/style/style.harmony.css +0 -74
  158. package/dist/es/packages/sidenavbar/utils.d.ts +0 -3
  159. package/dist/es/packages/sidenavbar/utils.js +0 -14
  160. package/dist/es/packages/sidenavbaritem/index.d.ts +0 -3
  161. package/dist/es/packages/sidenavbaritem/index.js +0 -2
  162. package/dist/es/packages/sidenavbaritem/sidenavbaritem.d.ts +0 -11
  163. package/dist/es/packages/sidenavbaritem/sidenavbaritem.js +0 -23
  164. package/dist/es/packages/sidenavbaritem/style/css.js +0 -1
  165. package/dist/es/packages/sidenavbaritem/style/index.js +0 -1
  166. package/dist/es/packages/sidenavbaritem/style/sidenavbaritem.scss +0 -13
  167. package/dist/es/packages/sidenavbaritem/style/style.css +0 -14
  168. package/dist/es/packages/sidenavbaritem/style/style.harmony.css +0 -14
  169. package/dist/es/packages/subsidenavbar/index.d.ts +0 -3
  170. package/dist/es/packages/subsidenavbar/index.js +0 -2
  171. package/dist/es/packages/subsidenavbar/style/css.js +0 -1
  172. package/dist/es/packages/subsidenavbar/style/index.js +0 -1
  173. package/dist/es/packages/subsidenavbar/style/style.css +0 -20
  174. package/dist/es/packages/subsidenavbar/style/style.harmony.css +0 -20
  175. package/dist/es/packages/subsidenavbar/style/subsidenavbar.scss +0 -26
  176. package/dist/es/packages/subsidenavbar/subsidenavbar.d.ts +0 -13
  177. package/dist/es/packages/subsidenavbar/subsidenavbar.js +0 -79
  178. /package/dist/cjs/packages/{sidenavbar → datepickerview}/style/css.js +0 -0
  179. /package/dist/{cjs/packages/sidenavbaritem → es/packages/datepickerview}/style/css.js +0 -0
@@ -22,12 +22,12 @@ import Col from "./col/index";
22
22
  export * from "./col/index";
23
23
  import Row from "./row/index";
24
24
  export * from "./row/index";
25
+ import SafeArea from "./safearea/index";
26
+ export * from "./safearea/index";
25
27
  import Space from "./space/index";
26
28
  export * from "./space/index";
27
29
  import Sticky from "./sticky/index";
28
30
  export * from "./sticky/index";
29
- import SafeArea from "./safearea/index";
30
- export * from "./safearea/index";
31
31
  import BackTop from "./backtop/index";
32
32
  export * from "./backtop/index";
33
33
  import Elevator from "./elevator/index";
@@ -40,16 +40,10 @@ import HoverButtonItem from "./hoverbuttonitem/index";
40
40
  export * from "./hoverbuttonitem/index";
41
41
  import NavBar from "./navbar/index";
42
42
  export * from "./navbar/index";
43
- import SideNavBar from "./sidenavbar/index";
44
- export * from "./sidenavbar/index";
45
43
  import SideBar from "./sidebar/index";
46
44
  export * from "./sidebar/index";
47
45
  import SideBarItem from "./sidebaritem/index";
48
46
  export * from "./sidebaritem/index";
49
- import SideNavBarItem from "./sidenavbaritem/index";
50
- export * from "./sidenavbaritem/index";
51
- import SubSideNavBar from "./subsidenavbar/index";
52
- export * from "./subsidenavbar/index";
53
47
  import Tabbar from "./tabbar/index";
54
48
  export * from "./tabbar/index";
55
49
  import TabbarItem from "./tabbaritem/index";
@@ -74,6 +68,8 @@ import CheckboxGroup from "./checkboxgroup/index";
74
68
  export * from "./checkboxgroup/index";
75
69
  import DatePicker from "./datepicker/index";
76
70
  export * from "./datepicker/index";
71
+ import DatePickerView from "./datepickerview/index";
72
+ export * from "./datepickerview/index";
77
73
  import Form from "./form/index";
78
74
  export * from "./form/index";
79
75
  import FormItem from "./formitem/index";
@@ -122,8 +118,6 @@ import Drag from "./drag/index";
122
118
  export * from "./drag/index";
123
119
  import Empty from "./empty/index";
124
120
  export * from "./empty/index";
125
- import ResultPage from "./resultpage/index";
126
- export * from "./resultpage/index";
127
121
  import InfiniteLoading from "./infiniteloading/index";
128
122
  export * from "./infiniteloading/index";
129
123
  import Loading from "./loading/index";
@@ -138,6 +132,8 @@ import Popup from "./popup/index";
138
132
  export * from "./popup/index";
139
133
  import PullToRefresh from "./pulltorefresh/index";
140
134
  export * from "./pulltorefresh/index";
135
+ import ResultPage from "./resultpage/index";
136
+ export * from "./resultpage/index";
141
137
  import Skeleton from "./skeleton/index";
142
138
  export * from "./skeleton/index";
143
139
  import Swipe from "./swipe/index";
@@ -172,12 +168,12 @@ import Lottie from "./lottie/index";
172
168
  export * from "./lottie/index";
173
169
  import Pagination from "./pagination/index";
174
170
  export * from "./pagination/index";
175
- import Segmented from "./segmented/index";
176
- export * from "./segmented/index";
177
171
  import Price from "./price/index";
178
172
  export * from "./price/index";
179
173
  import Progress from "./progress/index";
180
174
  export * from "./progress/index";
175
+ import Segmented from "./segmented/index";
176
+ export * from "./segmented/index";
181
177
  import Step from "./step/index";
182
178
  export * from "./step/index";
183
179
  import Steps from "./steps/index";
@@ -196,6 +192,8 @@ import Video from "./video/index";
196
192
  export * from "./video/index";
197
193
  import VirtualList from "./virtuallist/index";
198
194
  export * from "./virtuallist/index";
195
+ import AvatarCropper from "./avatarcropper/index";
196
+ export * from "./avatarcropper/index";
199
197
  import Barrage from "./barrage/index";
200
198
  export * from "./barrage/index";
201
199
  import Card from "./card/index";
@@ -208,6 +206,4 @@ import TrendArrow from "./trendarrow/index";
208
206
  export * from "./trendarrow/index";
209
207
  import WaterMark from "./watermark/index";
210
208
  export * from "./watermark/index";
211
- import AvatarCropper from "./avatarcropper/index";
212
- export * from "./avatarcropper/index";
213
- export { Button, Cell, CellGroup, ConfigProvider, Image, Overlay, Divider, Grid, GridItem, Layout, Col, Row, Space, Sticky, SafeArea, BackTop, Elevator, FixedNav, HoverButton, HoverButtonItem, NavBar, SideNavBar, SideBar, SideBarItem, SideNavBarItem, SubSideNavBar, Tabbar, TabbarItem, TabPane, Tabs, Address, Calendar, CalendarItem, CalendarCard, Cascader, Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, InputNumber, Menu, MenuItem, NumberKeyboard, Picker, PickerView, Radio, RadioGroup, Range, Rate, SearchBar, ShortPassword, Signature, Switch, TextArea, Uploader, ActionSheet, Badge, Dialog, Drag, Empty, ResultPage, InfiniteLoading, Loading, NoticeBar, Notify, Popover, Popup, PullToRefresh, Skeleton, Swipe, Toast, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, CircleProgress, Collapse, CollapseItem, CountDown, Ellipsis, ImagePreview, Indicator, Lottie, Pagination, Segmented, Price, Progress, Step, Steps, Swiper, SwiperItem, Table, Tag, Tour, Video, VirtualList, Barrage, Card, TimeDetail, TimeSelect, TrendArrow, WaterMark, AvatarCropper };
209
+ export { Button, Cell, CellGroup, ConfigProvider, Image, Overlay, Divider, Grid, GridItem, Layout, Col, Row, SafeArea, Space, Sticky, BackTop, Elevator, FixedNav, HoverButton, HoverButtonItem, NavBar, SideBar, SideBarItem, Tabbar, TabbarItem, TabPane, Tabs, Address, Calendar, CalendarItem, CalendarCard, Cascader, Checkbox, CheckboxGroup, DatePicker, DatePickerView, Form, FormItem, Input, InputNumber, Menu, MenuItem, NumberKeyboard, Picker, PickerView, Radio, RadioGroup, Range, Rate, SearchBar, ShortPassword, Signature, Switch, TextArea, Uploader, ActionSheet, Badge, Dialog, Drag, Empty, InfiniteLoading, Loading, NoticeBar, Notify, Popover, Popup, PullToRefresh, ResultPage, Skeleton, Swipe, Toast, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, CircleProgress, Collapse, CollapseItem, CountDown, Ellipsis, ImagePreview, Indicator, Lottie, Pagination, Price, Progress, Segmented, Step, Steps, Swiper, SwiperItem, Table, Tag, Tour, Video, VirtualList, AvatarCropper, Barrage, Card, TimeDetail, TimeSelect, TrendArrow, WaterMark };
@@ -8,7 +8,6 @@ import classNames from "classnames";
8
8
  import { View } from "@tarojs/components";
9
9
  import { ComponentDefaults } from "../../utils/typings";
10
10
  import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
11
- import { harmony } from "../../utils/platform-taro";
12
11
  export var defaultOverlayProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
13
12
  zIndex: 1000,
14
13
  duration: 300,
@@ -42,9 +41,9 @@ export var Overlay = function(props) {
42
41
  visible
43
42
  ]);
44
43
  var classes = classNames(classPrefix, className);
45
- var styles = _object_spread_props(_object_spread({}, style), {
44
+ var styles = _object_spread({
46
45
  zIndex: zIndex
47
- });
46
+ }, style);
48
47
  var handleClick = function(e) {
49
48
  if (closeOnOverlayClick) {
50
49
  onClick && onClick(e);
@@ -60,7 +59,7 @@ export var Overlay = function(props) {
60
59
  onClick: handleClick
61
60
  }), children);
62
61
  };
63
- return /*#__PURE__*/ React.createElement(React.Fragment, null, !harmony() ? /*#__PURE__*/ React.createElement(CSSTransition, {
62
+ return /*#__PURE__*/ React.createElement(CSSTransition, {
64
63
  nodeRef: nodeRef,
65
64
  classNames: "".concat(classPrefix, "-slide"),
66
65
  unmountOnExit: true,
@@ -68,6 +67,6 @@ export var Overlay = function(props) {
68
67
  in: innerVisible,
69
68
  onEntered: afterShow,
70
69
  onExited: afterClose
71
- }, renderOverlay()) : innerVisible && renderOverlay());
70
+ }, renderOverlay());
72
71
  };
73
72
  Overlay.displayName = 'NutOverlay';
@@ -19,11 +19,9 @@
19
19
  0% {
20
20
  opacity: 0;
21
21
  }
22
-
23
22
  1% {
24
23
  opacity: 0;
25
24
  }
26
-
27
25
  100% {
28
26
  opacity: 1;
29
27
  }
@@ -33,11 +31,9 @@
33
31
  0% {
34
32
  opacity: 1;
35
33
  }
36
-
37
34
  1% {
38
35
  opacity: 1;
39
36
  }
40
-
41
37
  100% {
42
38
  opacity: 0;
43
39
  }
@@ -238,6 +238,9 @@
238
238
  from {
239
239
  transform: translate3d(0, -100%, 0);
240
240
  }
241
+ to {
242
+ transform: translate3d(0, 0%, 0);
243
+ }
241
244
  }
242
245
  @keyframes popup-slide-top-exit {
243
246
  to {
@@ -259,6 +262,9 @@
259
262
  from {
260
263
  transform: translate3d(100%, 0, 0);
261
264
  }
265
+ to {
266
+ transform: translate3d(0%, 0, 0);
267
+ }
262
268
  }
263
269
  @keyframes popup-slide-right-exit {
264
270
  to {
@@ -280,6 +286,9 @@
280
286
  from {
281
287
  transform: translate3d(0, 100%, 0);
282
288
  }
289
+ to {
290
+ transform: translate3d(0, 0%, 0);
291
+ }
283
292
  }
284
293
  @keyframes slide-bottom-exit {
285
294
  to {
@@ -301,6 +310,9 @@
301
310
  from {
302
311
  transform: translate3d(-100%, 0, 0);
303
312
  }
313
+ to {
314
+ transform: translate3d(0%, 0, 0);
315
+ }
304
316
  }
305
317
  @keyframes popup-slide-left-exit {
306
318
  to {
@@ -238,6 +238,9 @@
238
238
  from {
239
239
  transform: translate3d(0, -100%, 0);
240
240
  }
241
+ to {
242
+ transform: translate3d(0, 0%, 0);
243
+ }
241
244
  }
242
245
  @keyframes popup-slide-top-exit {
243
246
  to {
@@ -259,6 +262,9 @@
259
262
  from {
260
263
  transform: translate3d(100%, 0, 0);
261
264
  }
265
+ to {
266
+ transform: translate3d(0%, 0, 0);
267
+ }
262
268
  }
263
269
  @keyframes popup-slide-right-exit {
264
270
  to {
@@ -280,6 +286,9 @@
280
286
  from {
281
287
  transform: translate3d(0, 100%, 0);
282
288
  }
289
+ to {
290
+ transform: translate3d(0, 0%, 0);
291
+ }
283
292
  }
284
293
  @keyframes slide-bottom-exit {
285
294
  to {
@@ -301,6 +310,9 @@
301
310
  from {
302
311
  transform: translate3d(-100%, 0, 0);
303
312
  }
313
+ to {
314
+ transform: translate3d(0%, 0, 0);
315
+ }
304
316
  }
305
317
  @keyframes popup-slide-left-exit {
306
318
  to {
@@ -11,6 +11,7 @@ import { View } from "@tarojs/components";
11
11
  import { defaultOverlayProps } from "../overlay/overlay";
12
12
  import Overlay from "../overlay/index";
13
13
  import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
14
+ import { harmony } from "../../utils/platform-taro";
14
15
  var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
15
16
  position: 'center',
16
17
  transition: '',
@@ -44,9 +45,11 @@ export var Popup = function(props) {
44
45
  var refObject = useLockScrollTaro(innerVisible && lockScroll);
45
46
  var classPrefix = 'nut-popup';
46
47
  var overlayStyles = _object_spread({}, overlayStyle);
47
- var popStyles = _object_spread_props(_object_spread({}, style), {
48
- zIndex: index
49
- });
48
+ var contentZIndex = harmony() ? index + 1 : index // 解决harmony层级问题
49
+ ;
50
+ var popStyles = _object_spread({
51
+ zIndex: contentZIndex
52
+ }, style);
50
53
  var _obj;
51
54
  var popClassName = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
52
55
  var open = function() {
@@ -104,6 +107,15 @@ export var Popup = function(props) {
104
107
  return renderCloseIcon();
105
108
  }
106
109
  };
110
+ var renderContent = function() {
111
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
112
+ ref: refObject,
113
+ style: popStyles,
114
+ className: popClassName,
115
+ onClick: onClick,
116
+ catchMove: lockScroll
117
+ }, renderTitle(), showChildren ? children : null));
118
+ };
107
119
  var renderPop = function() {
108
120
  return /*#__PURE__*/ React.createElement(CSSTransition, {
109
121
  nodeRef: refObject,
@@ -114,13 +126,7 @@ export var Popup = function(props) {
114
126
  in: innerVisible,
115
127
  onEntered: afterShow,
116
128
  onExited: afterClose
117
- }, /*#__PURE__*/ React.createElement(View, {
118
- ref: refObject,
119
- style: popStyles,
120
- className: popClassName,
121
- onClick: onClick,
122
- catchMove: lockScroll
123
- }, renderTitle(), showChildren ? children : null));
129
+ }, renderContent());
124
130
  };
125
131
  var renderNode = function() {
126
132
  return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
@@ -132,7 +138,7 @@ export var Popup = function(props) {
132
138
  lockScroll: lockScroll,
133
139
  duration: duration,
134
140
  onClick: handleOverlayClick
135
- }, renderPop()) : renderPop());
141
+ }) : null, renderPop());
136
142
  };
137
143
  useEffect(function() {
138
144
  visible ? open() : close();
@@ -141,7 +141,6 @@
141
141
  opacity: 0;
142
142
  transform: scale(0.8);
143
143
  }
144
-
145
144
  to {
146
145
  opacity: 1;
147
146
  transform: scale(1);
@@ -153,7 +152,6 @@
153
152
  opacity: 1;
154
153
  transform: scale(1);
155
154
  }
156
-
157
155
  to {
158
156
  opacity: 0;
159
157
  transform: scale(0.8);
@@ -176,7 +174,6 @@
176
174
  from {
177
175
  opacity: 0;
178
176
  }
179
-
180
177
  to {
181
178
  opacity: 1;
182
179
  }
@@ -186,7 +183,6 @@
186
183
  from {
187
184
  opacity: 1;
188
185
  }
189
-
190
186
  to {
191
187
  opacity: 0;
192
188
  }
@@ -209,6 +205,9 @@
209
205
  from {
210
206
  transform: translate3d(0, -100%, 0);
211
207
  }
208
+ to {
209
+ transform: translate3d(0, 0%, 0);
210
+ }
212
211
  }
213
212
 
214
213
  @keyframes popup-slide-top-exit {
@@ -236,6 +235,9 @@
236
235
  from {
237
236
  transform: translate3d(100%, 0, 0);
238
237
  }
238
+ to {
239
+ transform: translate3d(0%, 0, 0);
240
+ }
239
241
  }
240
242
 
241
243
  @keyframes popup-slide-right-exit {
@@ -263,6 +265,9 @@
263
265
  from {
264
266
  transform: translate3d(0, 100%, 0);
265
267
  }
268
+ to {
269
+ transform: translate3d(0, 0%, 0);
270
+ }
266
271
  }
267
272
 
268
273
  @keyframes slide-bottom-exit {
@@ -290,6 +295,9 @@
290
295
  from {
291
296
  transform: translate3d(-100%, 0, 0);
292
297
  }
298
+ to {
299
+ transform: translate3d(0%, 0, 0);
300
+ }
293
301
  }
294
302
 
295
303
  @keyframes popup-slide-left-exit {
@@ -238,6 +238,9 @@
238
238
  from {
239
239
  transform: translate3d(0, -100%, 0);
240
240
  }
241
+ to {
242
+ transform: translate3d(0, 0%, 0);
243
+ }
241
244
  }
242
245
  @keyframes popup-slide-top-exit {
243
246
  to {
@@ -259,6 +262,9 @@
259
262
  from {
260
263
  transform: translate3d(100%, 0, 0);
261
264
  }
265
+ to {
266
+ transform: translate3d(0%, 0, 0);
267
+ }
262
268
  }
263
269
  @keyframes popup-slide-right-exit {
264
270
  to {
@@ -280,6 +286,9 @@
280
286
  from {
281
287
  transform: translate3d(0, 100%, 0);
282
288
  }
289
+ to {
290
+ transform: translate3d(0, 0%, 0);
291
+ }
283
292
  }
284
293
  @keyframes slide-bottom-exit {
285
294
  to {
@@ -301,6 +310,9 @@
301
310
  from {
302
311
  transform: translate3d(-100%, 0, 0);
303
312
  }
313
+ to {
314
+ transform: translate3d(0%, 0, 0);
315
+ }
304
316
  }
305
317
  @keyframes popup-slide-left-exit {
306
318
  to {
@@ -184,6 +184,9 @@
184
184
  from {
185
185
  transform: translate3d(0, -100%, 0);
186
186
  }
187
+ to {
188
+ transform: translate3d(0, 0%, 0);
189
+ }
187
190
  }
188
191
  @keyframes popup-slide-top-exit {
189
192
  to {
@@ -211,6 +214,9 @@
211
214
  from {
212
215
  transform: translate3d(100%, 0, 0);
213
216
  }
217
+ to {
218
+ transform: translate3d(0%, 0, 0);
219
+ }
214
220
  }
215
221
  @keyframes popup-slide-right-exit {
216
222
  to {
@@ -238,6 +244,9 @@
238
244
  from {
239
245
  transform: translate3d(0, 100%, 0);
240
246
  }
247
+ to {
248
+ transform: translate3d(0, 0%, 0);
249
+ }
241
250
  }
242
251
  @keyframes slide-bottom-exit {
243
252
  to {
@@ -265,6 +274,9 @@
265
274
  from {
266
275
  transform: translate3d(-100%, 0, 0);
267
276
  }
277
+ to {
278
+ transform: translate3d(0%, 0, 0);
279
+ }
268
280
  }
269
281
  @keyframes popup-slide-left-exit {
270
282
  to {
@@ -21,7 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
21
21
  });
22
22
  export var InternalShortPassword = function(props, ref) {
23
23
  var locale = useConfig().locale;
24
- var _ref = _object_spread({}, defaultProps, props), title = _ref.title, description = _ref.description, tips = _ref.tips, outerVisible = _ref.visible, value = _ref.value, error = _ref.error, hideFooter = _ref.hideFooter, length = _ref.length, plain = _ref.plain, style = _ref.style, className = _ref.className, closeable = _ref.closeable, autoFocus = _ref.autoFocus, onFocus = _ref.onFocus, onChange = _ref.onChange, onConfirm = _ref.onConfirm, onTips = _ref.onTips, onCancel = _ref.onCancel, onClose = _ref.onClose, onComplete = _ref.onComplete, onOverlayClick = _ref.onOverlayClick, onCloseIconClick = _ref.onCloseIconClick, rest = _object_without_properties(_ref, [
24
+ var _ref = _object_spread({}, defaultProps, props), title = _ref.title, description = _ref.description, tips = _ref.tips, outerVisible = _ref.visible, value = _ref.value, error = _ref.error, hideFooter = _ref.hideFooter, length = _ref.length, plain = _ref.plain, style = _ref.style, className = _ref.className, closeable = _ref.closeable, autoFocus = _ref.autoFocus, round = _ref.round, onFocus = _ref.onFocus, onChange = _ref.onChange, onConfirm = _ref.onConfirm, onTips = _ref.onTips, onCancel = _ref.onCancel, onClose = _ref.onClose, onComplete = _ref.onComplete, onOverlayClick = _ref.onOverlayClick, onCloseIconClick = _ref.onCloseIconClick, rest = _object_without_properties(_ref, [
25
25
  "title",
26
26
  "description",
27
27
  "tips",
@@ -35,6 +35,7 @@ export var InternalShortPassword = function(props, ref) {
35
35
  "className",
36
36
  "closeable",
37
37
  "autoFocus",
38
+ "round",
38
39
  "onFocus",
39
40
  "onChange",
40
41
  "onConfirm",
@@ -98,15 +99,12 @@ export var InternalShortPassword = function(props, ref) {
98
99
  onConfirm && onConfirm(inputValue);
99
100
  };
100
101
  return /*#__PURE__*/ React.createElement(Popup, _object_spread({
101
- style: {
102
- padding: '32px 24px 28px 24px',
103
- borderRadius: '12px',
104
- textAlign: 'center'
105
- },
102
+ className: "".concat(classPrefix, "-popup"),
106
103
  visible: visible,
107
104
  closeable: true,
108
105
  onOverlayClick: onClose,
109
- onCloseIconClick: onClose
106
+ onCloseIconClick: onClose,
107
+ round: round
110
108
  }, rest), /*#__PURE__*/ React.createElement(View, {
111
109
  className: classNames(classPrefix, className),
112
110
  style: style
@@ -1,11 +1,21 @@
1
1
  .nut-shortpassword {
2
+ &-popup {
3
+ padding: 32px 24px 28px 24px;
4
+ border-radius: 12px;
5
+ text-align: center;
6
+ }
7
+
2
8
  &-title {
9
+ display: flex;
10
+ justify-content: center;
3
11
  line-height: 1;
4
12
  font-size: $font-size-l;
5
13
  color: $color-title;
6
14
  }
7
15
 
8
16
  &-description {
17
+ display: flex;
18
+ justify-content: center;
9
19
  margin-top: 12px;
10
20
  margin-bottom: 24px;
11
21
  line-height: 1;
@@ -238,6 +238,9 @@
238
238
  from {
239
239
  transform: translate3d(0, -100%, 0);
240
240
  }
241
+ to {
242
+ transform: translate3d(0, 0%, 0);
243
+ }
241
244
  }
242
245
  @keyframes popup-slide-top-exit {
243
246
  to {
@@ -259,6 +262,9 @@
259
262
  from {
260
263
  transform: translate3d(100%, 0, 0);
261
264
  }
265
+ to {
266
+ transform: translate3d(0%, 0, 0);
267
+ }
262
268
  }
263
269
  @keyframes popup-slide-right-exit {
264
270
  to {
@@ -280,6 +286,9 @@
280
286
  from {
281
287
  transform: translate3d(0, 100%, 0);
282
288
  }
289
+ to {
290
+ transform: translate3d(0, 0%, 0);
291
+ }
283
292
  }
284
293
  @keyframes slide-bottom-exit {
285
294
  to {
@@ -301,6 +310,9 @@
301
310
  from {
302
311
  transform: translate3d(-100%, 0, 0);
303
312
  }
313
+ to {
314
+ transform: translate3d(0%, 0, 0);
315
+ }
304
316
  }
305
317
  @keyframes popup-slide-left-exit {
306
318
  to {
@@ -371,12 +383,21 @@
371
383
  right: 0;
372
384
  }
373
385
 
386
+ .nut-shortpassword-popup {
387
+ padding: 32px 24px 28px 24px;
388
+ border-radius: 12px;
389
+ text-align: center;
390
+ }
374
391
  .nut-shortpassword-title {
392
+ display: flex;
393
+ justify-content: center;
375
394
  line-height: 1;
376
395
  font-size: var(--nutui-font-size-l, 16px);
377
396
  color: var(--nutui-color-title, #1a1a1a);
378
397
  }
379
398
  .nut-shortpassword-description {
399
+ display: flex;
400
+ justify-content: center;
380
401
  margin-top: 12px;
381
402
  margin-bottom: 24px;
382
403
  line-height: 1;
@@ -2,12 +2,21 @@
2
2
  /* #endif */
3
3
  /* #ifndef harmony */
4
4
  /* #endif */
5
+ .nut-shortpassword-popup {
6
+ padding: 32px 24px 28px 24px;
7
+ border-radius: 12px;
8
+ text-align: center;
9
+ }
5
10
  .nut-shortpassword-title {
11
+ display: flex;
12
+ justify-content: center;
6
13
  line-height: 1;
7
14
  font-size: 16px;
8
15
  color: #1a1a1a;
9
16
  }
10
17
  .nut-shortpassword-description {
18
+ display: flex;
19
+ justify-content: center;
11
20
  margin-top: 12px;
12
21
  margin-bottom: 24px;
13
22
  line-height: 1;
@@ -121,6 +121,12 @@
121
121
  width: 22px;
122
122
  height: 22px;
123
123
  font-size: 22px;
124
+ /* #ifdef harmony*/
125
+ color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
126
+ /* #endif*/
127
+ /* #ifndef harmony*/
128
+ color: inherit;
129
+ /* #endif*/
124
130
  }
125
131
  .nut-tabbar-item-icon-box-nav {
126
132
  display: block;
@@ -121,6 +121,12 @@
121
121
  width: 22px;
122
122
  height: 22px;
123
123
  font-size: 22px;
124
+ /* #ifdef harmony*/
125
+ color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
126
+ /* #endif*/
127
+ /* #ifndef harmony*/
128
+ color: inherit;
129
+ /* #endif*/
124
130
  }
125
131
  .nut-tabbar-item-icon-box-nav {
126
132
  display: block;
@@ -24,6 +24,12 @@
24
24
  width: 22px;
25
25
  height: 22px;
26
26
  font-size: 22px;
27
+ /* #ifdef harmony*/
28
+ color: #1a1a1a;
29
+ /* #endif*/
30
+ /* #ifndef harmony*/
31
+ color: inherit;
32
+ /* #endif*/
27
33
  }
28
34
  .nut-tabbar-item-icon-box-nav {
29
35
  display: block;
@@ -20,6 +20,12 @@
20
20
  width: 22px;
21
21
  height: 22px;
22
22
  font-size: 22px;
23
+ /* #ifdef harmony*/
24
+ color: $tabbar-inactive-color;
25
+ /* #endif*/
26
+ /* #ifndef harmony*/
27
+ color: inherit;
28
+ /* #endif*/
23
29
  }
24
30
 
25
31
  &-nav {