@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
@@ -10,20 +10,17 @@ import "./griditem/griditem.scss";
10
10
  import "./layout/layout.scss";
11
11
  import "./col/col.scss";
12
12
  import "./row/row.scss";
13
+ import "./safearea/safearea.scss";
13
14
  import "./space/space.scss";
14
15
  import "./sticky/sticky.scss";
15
- import "./safearea/safearea.scss";
16
16
  import "./backtop/backtop.scss";
17
17
  import "./elevator/elevator.scss";
18
18
  import "./fixednav/fixednav.scss";
19
19
  import "./hoverbutton/hoverbutton.scss";
20
20
  import "./hoverbuttonitem/hoverbuttonitem.scss";
21
21
  import "./navbar/navbar.scss";
22
- import "./sidenavbar/sidenavbar.scss";
23
22
  import "./sidebar/sidebar.scss";
24
23
  import "./sidebaritem/sidebaritem.scss";
25
- import "./sidenavbaritem/sidenavbaritem.scss";
26
- import "./subsidenavbar/subsidenavbar.scss";
27
24
  import "./tabbar/tabbar.scss";
28
25
  import "./tabbaritem/tabbaritem.scss";
29
26
  import "./tabpane/tabpane.scss";
@@ -36,6 +33,7 @@ import "./cascader/cascader.scss";
36
33
  import "./checkbox/checkbox.scss";
37
34
  import "./checkboxgroup/checkboxgroup.scss";
38
35
  import "./datepicker/datepicker.scss";
36
+ import "./datepickerview/datepickerview.scss";
39
37
  import "./form/form.scss";
40
38
  import "./formitem/formitem.scss";
41
39
  import "./input/input.scss";
@@ -60,7 +58,6 @@ import "./badge/badge.scss";
60
58
  import "./dialog/dialog.scss";
61
59
  import "./drag/drag.scss";
62
60
  import "./empty/empty.scss";
63
- import "./resultpage/resultpage.scss";
64
61
  import "./infiniteloading/infiniteloading.scss";
65
62
  import "./loading/loading.scss";
66
63
  import "./noticebar/noticebar.scss";
@@ -68,6 +65,7 @@ import "./notify/notify.scss";
68
65
  import "./popover/popover.scss";
69
66
  import "./popup/popup.scss";
70
67
  import "./pulltorefresh/pulltorefresh.scss";
68
+ import "./resultpage/resultpage.scss";
71
69
  import "./skeleton/skeleton.scss";
72
70
  import "./swipe/swipe.scss";
73
71
  import "./toast/toast.scss";
@@ -85,9 +83,9 @@ import "./imagepreview/imagepreview.scss";
85
83
  import "./indicator/indicator.scss";
86
84
  import "./lottie/lottie.scss";
87
85
  import "./pagination/pagination.scss";
88
- import "./segmented/segmented.scss";
89
86
  import "./price/price.scss";
90
87
  import "./progress/progress.scss";
88
+ import "./segmented/segmented.scss";
91
89
  import "./step/step.scss";
92
90
  import "./steps/steps.scss";
93
91
  import "./swiper/swiper.scss";
@@ -97,13 +95,13 @@ import "./tag/tag.scss";
97
95
  import "./tour/tour.scss";
98
96
  import "./video/video.scss";
99
97
  import "./virtuallist/virtuallist.scss";
98
+ import "./avatarcropper/avatarcropper.scss";
100
99
  import "./barrage/barrage.scss";
101
100
  import "./card/card.scss";
102
101
  import "./timedetail/timedetail.scss";
103
102
  import "./timeselect/timeselect.scss";
104
103
  import "./trendarrow/trendarrow.scss";
105
104
  import "./watermark/watermark.scss";
106
- import "./avatarcropper/avatarcropper.scss";
107
105
  declare const _default: {
108
106
  NutUI: string;
109
107
  };
@@ -20,20 +20,17 @@ require("./griditem/griditem.scss");
20
20
  require("./layout/layout.scss");
21
21
  require("./col/col.scss");
22
22
  require("./row/row.scss");
23
+ require("./safearea/safearea.scss");
23
24
  require("./space/space.scss");
24
25
  require("./sticky/sticky.scss");
25
- require("./safearea/safearea.scss");
26
26
  require("./backtop/backtop.scss");
27
27
  require("./elevator/elevator.scss");
28
28
  require("./fixednav/fixednav.scss");
29
29
  require("./hoverbutton/hoverbutton.scss");
30
30
  require("./hoverbuttonitem/hoverbuttonitem.scss");
31
31
  require("./navbar/navbar.scss");
32
- require("./sidenavbar/sidenavbar.scss");
33
32
  require("./sidebar/sidebar.scss");
34
33
  require("./sidebaritem/sidebaritem.scss");
35
- require("./sidenavbaritem/sidenavbaritem.scss");
36
- require("./subsidenavbar/subsidenavbar.scss");
37
34
  require("./tabbar/tabbar.scss");
38
35
  require("./tabbaritem/tabbaritem.scss");
39
36
  require("./tabpane/tabpane.scss");
@@ -46,6 +43,7 @@ require("./cascader/cascader.scss");
46
43
  require("./checkbox/checkbox.scss");
47
44
  require("./checkboxgroup/checkboxgroup.scss");
48
45
  require("./datepicker/datepicker.scss");
46
+ require("./datepickerview/datepickerview.scss");
49
47
  require("./form/form.scss");
50
48
  require("./formitem/formitem.scss");
51
49
  require("./input/input.scss");
@@ -70,7 +68,6 @@ require("./badge/badge.scss");
70
68
  require("./dialog/dialog.scss");
71
69
  require("./drag/drag.scss");
72
70
  require("./empty/empty.scss");
73
- require("./resultpage/resultpage.scss");
74
71
  require("./infiniteloading/infiniteloading.scss");
75
72
  require("./loading/loading.scss");
76
73
  require("./noticebar/noticebar.scss");
@@ -78,6 +75,7 @@ require("./notify/notify.scss");
78
75
  require("./popover/popover.scss");
79
76
  require("./popup/popup.scss");
80
77
  require("./pulltorefresh/pulltorefresh.scss");
78
+ require("./resultpage/resultpage.scss");
81
79
  require("./skeleton/skeleton.scss");
82
80
  require("./swipe/swipe.scss");
83
81
  require("./toast/toast.scss");
@@ -95,9 +93,9 @@ require("./imagepreview/imagepreview.scss");
95
93
  require("./indicator/indicator.scss");
96
94
  require("./lottie/lottie.scss");
97
95
  require("./pagination/pagination.scss");
98
- require("./segmented/segmented.scss");
99
96
  require("./price/price.scss");
100
97
  require("./progress/progress.scss");
98
+ require("./segmented/segmented.scss");
101
99
  require("./step/step.scss");
102
100
  require("./steps/steps.scss");
103
101
  require("./swiper/swiper.scss");
@@ -107,13 +105,13 @@ require("./tag/tag.scss");
107
105
  require("./tour/tour.scss");
108
106
  require("./video/video.scss");
109
107
  require("./virtuallist/virtuallist.scss");
108
+ require("./avatarcropper/avatarcropper.scss");
110
109
  require("./barrage/barrage.scss");
111
110
  require("./card/card.scss");
112
111
  require("./timedetail/timedetail.scss");
113
112
  require("./timeselect/timeselect.scss");
114
113
  require("./trendarrow/trendarrow.scss");
115
114
  require("./watermark/watermark.scss");
116
- require("./avatarcropper/avatarcropper.scss");
117
115
  var _default = {
118
116
  "NutUI": "NutUI-Taro"
119
117
  };
@@ -28,7 +28,6 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
28
28
  var _components = require("@tarojs/components");
29
29
  var _typings = require("../../utils/typings");
30
30
  var _uselockscolltaro = require("../../hooks/use-lock-scoll-taro");
31
- var _platformtaro = require("../../utils/platform-taro");
32
31
  var defaultOverlayProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
33
32
  zIndex: 1000,
34
33
  duration: 300,
@@ -62,9 +61,9 @@ var Overlay = function Overlay(props) {
62
61
  visible
63
62
  ]);
64
63
  var classes = (0, _classnames.default)(classPrefix, className);
65
- var styles = (0, _object_spread_props._)((0, _object_spread._)({}, style), {
64
+ var styles = (0, _object_spread._)({
66
65
  zIndex: zIndex
67
- });
66
+ }, style);
68
67
  var handleClick = function handleClick(e) {
69
68
  if (closeOnOverlayClick) {
70
69
  onClick && onClick(e);
@@ -80,7 +79,7 @@ var Overlay = function Overlay(props) {
80
79
  onClick: handleClick
81
80
  }), children);
82
81
  };
83
- return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !(0, _platformtaro.harmony)() ? /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
82
+ return /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
84
83
  nodeRef: nodeRef,
85
84
  classNames: "".concat(classPrefix, "-slide"),
86
85
  unmountOnExit: true,
@@ -88,6 +87,6 @@ var Overlay = function Overlay(props) {
88
87
  in: innerVisible,
89
88
  onEntered: afterShow,
90
89
  onExited: afterClose
91
- }, renderOverlay()) : innerVisible && renderOverlay());
90
+ }, renderOverlay());
92
91
  };
93
92
  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 {
@@ -23,6 +23,7 @@ var _components = require("@tarojs/components");
23
23
  var _overlay = require("../overlay/overlay");
24
24
  var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
25
25
  var _uselockscolltaro = require("../../hooks/use-lock-scoll-taro");
26
+ var _platformtaro = require("../../utils/platform-taro");
26
27
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
27
28
  position: 'center',
28
29
  transition: '',
@@ -56,9 +57,11 @@ var Popup = function Popup(props) {
56
57
  var refObject = (0, _uselockscolltaro.useLockScrollTaro)(innerVisible && lockScroll);
57
58
  var classPrefix = 'nut-popup';
58
59
  var overlayStyles = (0, _object_spread._)({}, overlayStyle);
59
- var popStyles = (0, _object_spread_props._)((0, _object_spread._)({}, style), {
60
- zIndex: index
61
- });
60
+ var contentZIndex = (0, _platformtaro.harmony)() ? index + 1 : index // 解决harmony层级问题
61
+ ;
62
+ var popStyles = (0, _object_spread._)({
63
+ zIndex: contentZIndex
64
+ }, style);
62
65
  var _obj;
63
66
  var popClassName = (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
64
67
  var open = function open() {
@@ -116,6 +119,15 @@ var Popup = function Popup(props) {
116
119
  return renderCloseIcon();
117
120
  }
118
121
  };
122
+ var renderContent = function renderContent() {
123
+ return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
124
+ ref: refObject,
125
+ style: popStyles,
126
+ className: popClassName,
127
+ onClick: onClick,
128
+ catchMove: lockScroll
129
+ }, renderTitle(), showChildren ? children : null));
130
+ };
119
131
  var renderPop = function renderPop() {
120
132
  return /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
121
133
  nodeRef: refObject,
@@ -126,13 +138,7 @@ var Popup = function Popup(props) {
126
138
  in: innerVisible,
127
139
  onEntered: afterShow,
128
140
  onExited: afterClose
129
- }, /*#__PURE__*/ _react.default.createElement(_components.View, {
130
- ref: refObject,
131
- style: popStyles,
132
- className: popClassName,
133
- onClick: onClick,
134
- catchMove: lockScroll
135
- }, renderTitle(), showChildren ? children : null));
141
+ }, renderContent());
136
142
  };
137
143
  var renderNode = function renderNode() {
138
144
  return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_index.default, {
@@ -144,7 +150,7 @@ var Popup = function Popup(props) {
144
150
  lockScroll: lockScroll,
145
151
  duration: duration,
146
152
  onClick: handleOverlayClick
147
- }, renderPop()) : renderPop());
153
+ }) : null, renderPop());
148
154
  };
149
155
  (0, _react.useEffect)(function() {
150
156
  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 {
@@ -41,7 +41,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
41
41
  });
42
42
  var InternalShortPassword = function InternalShortPassword(props, ref) {
43
43
  var locale = (0, _index1.useConfig)().locale;
44
- var _ref = (0, _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 = (0, _object_without_properties._)(_ref, [
44
+ var _ref = (0, _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 = (0, _object_without_properties._)(_ref, [
45
45
  "title",
46
46
  "description",
47
47
  "tips",
@@ -55,6 +55,7 @@ var InternalShortPassword = function InternalShortPassword(props, ref) {
55
55
  "className",
56
56
  "closeable",
57
57
  "autoFocus",
58
+ "round",
58
59
  "onFocus",
59
60
  "onChange",
60
61
  "onConfirm",
@@ -118,15 +119,12 @@ var InternalShortPassword = function InternalShortPassword(props, ref) {
118
119
  onConfirm && onConfirm(inputValue);
119
120
  };
120
121
  return /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread._)({
121
- style: {
122
- padding: '32px 24px 28px 24px',
123
- borderRadius: '12px',
124
- textAlign: 'center'
125
- },
122
+ className: "".concat(classPrefix, "-popup"),
126
123
  visible: visible,
127
124
  closeable: true,
128
125
  onOverlayClick: onClose,
129
- onCloseIconClick: onClose
126
+ onCloseIconClick: onClose,
127
+ round: round
130
128
  }, rest), /*#__PURE__*/ _react.default.createElement(_components.View, {
131
129
  className: (0, _classnames.default)(classPrefix, className),
132
130
  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;