@nutui/nutui-react-taro 3.0.6 → 3.0.8

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 (137) hide show
  1. package/CHANGELOG.md +51 -15
  2. package/dist/cjs/packages/actionsheet/style/style.css +4 -4
  3. package/dist/cjs/packages/address/style/style.css +4 -4
  4. package/dist/cjs/packages/audio/style/style.css +4 -16
  5. package/dist/cjs/packages/avatar/style/style.css +4 -0
  6. package/dist/cjs/packages/button/style/button.scss +4 -20
  7. package/dist/cjs/packages/button/style/style.css +4 -16
  8. package/dist/cjs/packages/button/style/style.harmony.css +2 -14
  9. package/dist/cjs/packages/calendar/style/style.css +4 -4
  10. package/dist/cjs/packages/cascader/cascader.js +2 -1
  11. package/dist/cjs/packages/cascader/style/style.css +4 -4
  12. package/dist/cjs/packages/collapse/style/style.css +22 -7
  13. package/dist/cjs/packages/collapseitem/collapseitem.js +63 -77
  14. package/dist/cjs/packages/collapseitem/style/collapseitem.scss +22 -5
  15. package/dist/cjs/packages/collapseitem/style/style.css +22 -7
  16. package/dist/cjs/packages/collapseitem/style/style.harmony.css +22 -7
  17. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  18. package/dist/cjs/packages/datepicker/style/style.css +4 -4
  19. package/dist/cjs/packages/dialog/content.d.ts +11 -3
  20. package/dist/cjs/packages/dialog/content.js +4 -4
  21. package/dist/cjs/packages/dialog/dialog.d.ts +39 -4
  22. package/dist/cjs/packages/dialog/dialog.js +14 -13
  23. package/dist/cjs/packages/dialog/index.d.ts +1 -1
  24. package/dist/cjs/packages/dialog/style/dialog.scss +1 -0
  25. package/dist/cjs/packages/dialog/style/style.css +5 -16
  26. package/dist/cjs/packages/dialog/style/style.harmony.css +1 -0
  27. package/dist/cjs/packages/empty/style/style.css +4 -16
  28. package/dist/cjs/packages/image/image.js +10 -9
  29. package/dist/cjs/packages/image/style/image.scss +4 -1
  30. package/dist/cjs/packages/image/style/style.css +4 -0
  31. package/dist/cjs/packages/image/style/style.harmony.css +4 -0
  32. package/dist/cjs/packages/imagepreview/style/style.css +8 -4
  33. package/dist/cjs/packages/numberkeyboard/style/style.css +4 -4
  34. package/dist/cjs/packages/picker/style/style.css +4 -4
  35. package/dist/cjs/packages/popover/popover.d.ts +0 -7
  36. package/dist/cjs/packages/popover/popover.js +114 -141
  37. package/dist/cjs/packages/popover/style/popover.scss +48 -51
  38. package/dist/cjs/packages/popover/style/style.css +64 -70
  39. package/dist/cjs/packages/popover/style/style.harmony.css +64 -60
  40. package/dist/cjs/packages/popup/style/popup.scss +4 -4
  41. package/dist/cjs/packages/popup/style/style.css +4 -4
  42. package/dist/cjs/packages/popup/style/style.harmony.css +4 -4
  43. package/dist/cjs/packages/resultpage/style/style.css +4 -16
  44. package/dist/cjs/packages/shortpassword/style/style.css +4 -4
  45. package/dist/cjs/packages/sidebar/sidebar.js +11 -3
  46. package/dist/cjs/packages/skeleton/skeleton.js +1 -2
  47. package/dist/cjs/packages/swipe/swipe.js +1 -1
  48. package/dist/cjs/packages/switch/switch.js +53 -8
  49. package/dist/cjs/packages/tabpane/tabpane.js +2 -2
  50. package/dist/cjs/packages/timeselect/style/style.css +4 -4
  51. package/dist/cjs/packages/tour/style/style.css +64 -70
  52. package/dist/cjs/packages/tour/tour.js +3 -4
  53. package/dist/cjs/types/spec/dialog/base.d.ts +50 -1
  54. package/dist/cjs/types/spec/dialog/base.js +7 -0
  55. package/dist/cjs/types/spec/dialog/h5.d.ts +4 -1
  56. package/dist/cjs/types/spec/dialog/taro.d.ts +8 -2
  57. package/dist/cjs/types/spec/popover/base.d.ts +7 -0
  58. package/dist/cjs/utils/get-rect-by-taro.js +10 -0
  59. package/dist/cjs/utils/lru.d.ts +8 -0
  60. package/dist/cjs/utils/lru.js +58 -0
  61. package/dist/es/packages/actionsheet/style/style.css +4 -4
  62. package/dist/es/packages/address/style/style.css +4 -4
  63. package/dist/es/packages/audio/style/style.css +4 -16
  64. package/dist/es/packages/avatar/style/style.css +4 -0
  65. package/dist/es/packages/button/style/button.scss +4 -20
  66. package/dist/es/packages/button/style/style.css +4 -16
  67. package/dist/es/packages/button/style/style.harmony.css +2 -14
  68. package/dist/es/packages/calendar/style/style.css +4 -4
  69. package/dist/es/packages/cascader/cascader.js +2 -1
  70. package/dist/es/packages/cascader/style/style.css +4 -4
  71. package/dist/es/packages/collapse/style/style.css +22 -7
  72. package/dist/es/packages/collapseitem/collapseitem.js +65 -79
  73. package/dist/es/packages/collapseitem/style/collapseitem.scss +22 -5
  74. package/dist/es/packages/collapseitem/style/style.css +22 -7
  75. package/dist/es/packages/collapseitem/style/style.harmony.css +22 -7
  76. package/dist/es/packages/configprovider/types.d.ts +1 -1
  77. package/dist/es/packages/datepicker/style/style.css +4 -4
  78. package/dist/es/packages/dialog/content.d.ts +11 -3
  79. package/dist/es/packages/dialog/content.js +4 -4
  80. package/dist/es/packages/dialog/dialog.d.ts +39 -4
  81. package/dist/es/packages/dialog/dialog.js +14 -13
  82. package/dist/es/packages/dialog/index.d.ts +1 -1
  83. package/dist/es/packages/dialog/style/dialog.scss +1 -0
  84. package/dist/es/packages/dialog/style/style.css +5 -16
  85. package/dist/es/packages/dialog/style/style.harmony.css +1 -0
  86. package/dist/es/packages/empty/style/style.css +4 -16
  87. package/dist/es/packages/image/image.js +10 -10
  88. package/dist/es/packages/image/style/image.scss +4 -1
  89. package/dist/es/packages/image/style/style.css +4 -0
  90. package/dist/es/packages/image/style/style.harmony.css +4 -0
  91. package/dist/es/packages/imagepreview/style/style.css +8 -4
  92. package/dist/es/packages/numberkeyboard/style/style.css +4 -4
  93. package/dist/es/packages/picker/style/style.css +4 -4
  94. package/dist/es/packages/popover/popover.d.ts +0 -7
  95. package/dist/es/packages/popover/popover.js +115 -142
  96. package/dist/es/packages/popover/style/popover.scss +48 -51
  97. package/dist/es/packages/popover/style/style.css +64 -70
  98. package/dist/es/packages/popover/style/style.harmony.css +64 -60
  99. package/dist/es/packages/popup/style/popup.scss +4 -4
  100. package/dist/es/packages/popup/style/style.css +4 -4
  101. package/dist/es/packages/popup/style/style.harmony.css +4 -4
  102. package/dist/es/packages/resultpage/style/style.css +4 -16
  103. package/dist/es/packages/shortpassword/style/style.css +4 -4
  104. package/dist/es/packages/sidebar/sidebar.js +11 -3
  105. package/dist/es/packages/skeleton/skeleton.js +1 -2
  106. package/dist/es/packages/swipe/swipe.js +2 -2
  107. package/dist/es/packages/switch/switch.js +53 -8
  108. package/dist/es/packages/tabpane/tabpane.js +2 -2
  109. package/dist/es/packages/timeselect/style/style.css +4 -4
  110. package/dist/es/packages/tour/style/style.css +64 -70
  111. package/dist/es/packages/tour/tour.js +3 -4
  112. package/dist/es/types/spec/dialog/base.d.ts +83 -1
  113. package/dist/es/types/spec/dialog/base.js +1 -1
  114. package/dist/es/types/spec/dialog/h5.d.ts +4 -1
  115. package/dist/es/types/spec/dialog/taro.d.ts +8 -2
  116. package/dist/es/types/spec/popover/base.d.ts +7 -0
  117. package/dist/es/utils/get-rect-by-taro.js +9 -0
  118. package/dist/es/utils/lru.d.ts +8 -0
  119. package/dist/es/utils/lru.js +49 -0
  120. package/dist/nutui.react.umd.js +339 -286
  121. package/dist/style.css +1 -1
  122. package/dist/style.scss +52 -52
  123. package/dist/styles/theme-jmapp.scss +1 -0
  124. package/dist/styles/themes/dark.css +1 -1
  125. package/dist/styles/themes/default.css +1 -1
  126. package/dist/styles/themes/jmapp.css +1 -1
  127. package/dist/styles/themes/jrkf.css +1 -1
  128. package/dist/styles/variables-jmapp.scss +215 -49
  129. package/dist/styles/variables-jrkf.scss +2 -13
  130. package/dist/styles/variables.scss +7 -14
  131. package/package.json +1 -1
  132. package/dist/cjs/packages/dialog/types.d.ts +0 -57
  133. package/dist/cjs/packages/dialog/types.js +0 -4
  134. package/dist/cjs/packages/dialog/types.taro.d.ts +0 -10
  135. package/dist/es/packages/dialog/types.d.ts +0 -57
  136. package/dist/es/packages/dialog/types.js +0 -1
  137. package/dist/es/packages/dialog/types.taro.d.ts +0 -10
@@ -36,10 +36,10 @@ var _index = /*#__PURE__*/ _interop_require_default._(require("../button/index")
36
36
  var _content = require("./content");
37
37
  var _configprovider = require("../configprovider/configprovider");
38
38
  var _index1 = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
39
+ var _overlay = require("../overlay/overlay");
39
40
  var _usecustomevent = require("../../hooks/use-custom-event");
40
41
  var _uselockscolltaro = require("../../hooks/use-lock-scoll-taro");
41
42
  var _mergeprops = require("../../utils/merge-props");
42
- var _overlay = require("../overlay/overlay");
43
43
  var _platformtaro = require("../../utils/platform-taro");
44
44
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps, _content.defaultContentProps), {
45
45
  title: '',
@@ -48,15 +48,15 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overla
48
48
  footer: '',
49
49
  confirmText: '',
50
50
  cancelText: '',
51
- overlay: true,
52
- overlayStyle: {},
53
- overlayClassName: 'nut-dialog-overlay',
54
51
  hideConfirmButton: false,
55
52
  hideCancelButton: false,
56
53
  disableConfirmButton: false,
57
54
  footerDirection: 'horizontal',
58
55
  closeIconPosition: 'bottom',
59
56
  closeIcon: false,
57
+ overlay: true,
58
+ overlayStyle: {},
59
+ overlayClassName: 'nut-dialog-overlay',
60
60
  zIndex: 1200,
61
61
  beforeCancel: function beforeCancel() {
62
62
  return true;
@@ -66,15 +66,16 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overla
66
66
  },
67
67
  onCancel: function onCancel() {},
68
68
  onClose: function onClose() {},
69
+ onConfirm: function onConfirm() {},
69
70
  onOverlayClick: function onOverlayClick() {
70
71
  return true;
71
72
  }
72
73
  });
73
74
  var BaseDialog = function BaseDialog(props) {
75
+ var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
74
76
  var classPrefix = 'nut-dialog';
75
77
  var locale = (0, _configprovider.useConfig)().locale;
76
78
  var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), loading = _useState[0], setLoading = _useState[1];
77
- var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, className = _useParams_params.className, style = _useParams_params.style, visible = _useParams_params.visible, footer = _useParams_params.footer, title = _useParams_params.title, header = _useParams_params.header, content = _useParams_params.content, children = _useParams_params.children, footerDirection = _useParams_params.footerDirection, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, disableConfirmButton = _useParams_params.disableConfirmButton, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
78
79
  (0, _usecustomevent.useCustomEvent)(id, function(param) {
79
80
  var status = param.status, options = param.options;
80
81
  setParams((0, _object_spread_props._)((0, _object_spread._)({}, options), {
@@ -88,8 +89,8 @@ var BaseDialog = function BaseDialog(props) {
88
89
  e.stopPropagation();
89
90
  if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
90
91
  if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
91
- onClose === null || onClose === void 0 ? void 0 : onClose();
92
- onCancel === null || onCancel === void 0 ? void 0 : onCancel();
92
+ onClose();
93
+ onCancel();
93
94
  };
94
95
  var handleOk = /*#__PURE__*/ function() {
95
96
  var _ref = (0, _async_to_generator._)(function(e) {
@@ -114,7 +115,7 @@ var BaseDialog = function BaseDialog(props) {
114
115
  case 2:
115
116
  _state.sent();
116
117
  setLoading(false);
117
- onClose === null || onClose === void 0 ? void 0 : onClose();
118
+ onClose();
118
119
  return [
119
120
  3,
120
121
  4
@@ -158,8 +159,8 @@ var BaseDialog = function BaseDialog(props) {
158
159
  };
159
160
  var renderConfirm = function renderConfirm() {
160
161
  return !hideConfirmButton && /*#__PURE__*/ _react.default.createElement(_index.default, {
161
- size: "large",
162
162
  type: "primary",
163
+ size: "large",
163
164
  className: (0, _classnames.default)("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
164
165
  disabled: disableConfirmButton
165
166
  }),
@@ -177,8 +178,8 @@ var BaseDialog = function BaseDialog(props) {
177
178
  var handleCancel = function handleCancel() {
178
179
  if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
179
180
  if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
180
- onClose === null || onClose === void 0 ? void 0 : onClose();
181
- onCancel === null || onCancel === void 0 ? void 0 : onCancel();
181
+ onClose();
182
+ onCancel();
182
183
  };
183
184
  var _obj;
184
185
  var closeClasses = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-close"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
@@ -191,8 +192,8 @@ var BaseDialog = function BaseDialog(props) {
191
192
  var onHandleClickOverlay = function onHandleClickOverlay(e) {
192
193
  if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
193
194
  var closed = onOverlayClick && onOverlayClick(e);
194
- closed && onClose && onClose();
195
- closed && onCancel && onCancel();
195
+ closed && onClose();
196
+ closed && onCancel();
196
197
  }
197
198
  };
198
199
  var renderContent = function renderContent() {
@@ -1,3 +1,3 @@
1
1
  import { BaseDialog } from "./dialog";
2
- export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, ContentProps, DialogWrapProps, DialogBasicProps, DialogConfirmProps, DialogReturnProps, } from './types.taro';
2
+ export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, TaroContentProps as ContentProps, DialogWrapProps, TaroDialogProps as DialogProps, DialogReturnProps, } from "../../types";
3
3
  export default BaseDialog;
@@ -127,6 +127,7 @@
127
127
 
128
128
  &-cancel.nut-dialog-footer-cancel {
129
129
  margin-right: $dialog-footer-cancel-margin-right;
130
+ background: $dialog-footer-cancel-bg;
130
131
  }
131
132
 
132
133
  &-ok {
@@ -94,18 +94,6 @@
94
94
  .nut-button-round {
95
95
  border-radius: var(--nutui-button-border-radius, var(--nutui-radius-s, 6px));
96
96
  }
97
- .nut-button-round-xlarge {
98
- border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
99
- }
100
- .nut-button-round-large {
101
- border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
102
- }
103
- .nut-button-round-small {
104
- border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
105
- }
106
- .nut-button-round-mini {
107
- border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
108
- }
109
97
  .nut-button-default {
110
98
  padding: var(--nutui-button-default-padding, 0px 12px);
111
99
  border-style: solid;
@@ -131,7 +119,7 @@
131
119
  height: var(--nutui-button-xlarge-height, 48px);
132
120
  padding: var(--nutui-button-xlarge-padding, 0px 24px);
133
121
  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
134
- border-radius: var(--nutui-radius-base, 8px);
122
+ border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
135
123
  }
136
124
  .nut-button-xlarge .nut-button-text {
137
125
  margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -151,7 +139,7 @@
151
139
  height: var(--nutui-button-large-height, 40px);
152
140
  padding: var(--nutui-button-large-padding, 0px 16px);
153
141
  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
154
- border-radius: var(--nutui-radius-s, 6px);
142
+ border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
155
143
  }
156
144
  .nut-button-large .nut-button-text {
157
145
  margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -171,7 +159,7 @@
171
159
  height: var(--nutui-button-small-height, 28px);
172
160
  padding: var(--nutui-button-small-padding, 0px 8px);
173
161
  font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
174
- border-radius: var(--nutui-radius-xs, 4px);
162
+ border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
175
163
  }
176
164
  .nut-button-small .nut-icon {
177
165
  font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -185,7 +173,7 @@
185
173
  height: var(--nutui-button-mini-height, 24px);
186
174
  padding: var(--nutui-button-mini-padding, 0px 8px);
187
175
  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
188
- border-radius: var(--nutui-radius-xs, 4px);
176
+ border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
189
177
  }
190
178
  .nut-button-mini .nut-icon {
191
179
  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
@@ -562,6 +550,7 @@
562
550
  }
563
551
  .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
564
552
  margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
553
+ background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, transparent));
565
554
  }
566
555
  .nut-dialog-footer-ok {
567
556
  max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
@@ -118,6 +118,7 @@
118
118
  }
119
119
  .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
120
120
  margin-right: 12px;
121
+ background: transparent;
121
122
  }
122
123
  .nut-dialog-footer-ok {
123
124
  max-width: 128px;
@@ -94,18 +94,6 @@
94
94
  .nut-button-round {
95
95
  border-radius: var(--nutui-button-border-radius, var(--nutui-radius-s, 6px));
96
96
  }
97
- .nut-button-round-xlarge {
98
- border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
99
- }
100
- .nut-button-round-large {
101
- border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
102
- }
103
- .nut-button-round-small {
104
- border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
105
- }
106
- .nut-button-round-mini {
107
- border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
108
- }
109
97
  .nut-button-default {
110
98
  padding: var(--nutui-button-default-padding, 0px 12px);
111
99
  border-style: solid;
@@ -131,7 +119,7 @@
131
119
  height: var(--nutui-button-xlarge-height, 48px);
132
120
  padding: var(--nutui-button-xlarge-padding, 0px 24px);
133
121
  font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
134
- border-radius: var(--nutui-radius-base, 8px);
122
+ border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
135
123
  }
136
124
  .nut-button-xlarge .nut-button-text {
137
125
  margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -151,7 +139,7 @@
151
139
  height: var(--nutui-button-large-height, 40px);
152
140
  padding: var(--nutui-button-large-padding, 0px 16px);
153
141
  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
154
- border-radius: var(--nutui-radius-s, 6px);
142
+ border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
155
143
  }
156
144
  .nut-button-large .nut-button-text {
157
145
  margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -171,7 +159,7 @@
171
159
  height: var(--nutui-button-small-height, 28px);
172
160
  padding: var(--nutui-button-small-padding, 0px 8px);
173
161
  font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
174
- border-radius: var(--nutui-radius-xs, 4px);
162
+ border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
175
163
  }
176
164
  .nut-button-small .nut-icon {
177
165
  font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -185,7 +173,7 @@
185
173
  height: var(--nutui-button-mini-height, 24px);
186
174
  padding: var(--nutui-button-mini-padding, 0px 8px);
187
175
  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
188
- border-radius: var(--nutui-radius-xs, 4px);
176
+ border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
189
177
  }
190
178
  .nut-button-mini .nut-icon {
191
179
  font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "Image", {
10
10
  });
11
11
  var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
12
12
  var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
13
+ var _define_property = require("@swc/helpers/_/_define_property");
13
14
  var _object_spread = require("@swc/helpers/_/_object_spread");
14
15
  var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
15
16
  var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
@@ -57,14 +58,14 @@ var Image = function Image(props) {
57
58
  onError && onError(e);
58
59
  }
59
60
  };
60
- var containerStyle = {
61
- // eslint-disable-next-line no-nested-ternary
62
- height: height ? pxCheck(height) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
63
- // eslint-disable-next-line no-nested-ternary
64
- width: width ? pxCheck(width) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
65
- overflow: radius !== undefined && radius !== null ? 'hidden' : '',
66
- borderRadius: radius !== undefined && radius != null ? pxCheck(radius) : ''
67
- };
61
+ var containerStyle = (0, _object_spread._)({}, height ? {
62
+ height: pxCheck(height)
63
+ } : {}, width ? {
64
+ width: pxCheck(width)
65
+ } : {}, radius !== undefined && radius !== null ? {
66
+ overflow: 'hidden',
67
+ borderRadius: pxCheck(radius)
68
+ } : {});
68
69
  var imgStyle = (0, _object_spread_props._)((0, _object_spread._)({}, style), {
69
70
  width: width,
70
71
  height: height
@@ -105,7 +106,7 @@ var Image = function Image(props) {
105
106
  innerLoading
106
107
  ]);
107
108
  return /*#__PURE__*/ _react.default.createElement(_components.View, {
108
- className: (0, _classnames.default)(classPrefix, className),
109
+ className: (0, _classnames.default)(classPrefix, (0, _define_property._)({}, "".concat(classPrefix, "-basic"), _taro.default.getEnv() !== 'WEB'), className),
109
110
  style: containerStyle
110
111
  }, /*#__PURE__*/ _react.default.createElement(_components.Image, (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
111
112
  className: "".concat(classPrefix, "-default ").concat(className ? "".concat(className, "-image") : ''),
@@ -12,7 +12,10 @@
12
12
  border-radius: 50%;
13
13
  overflow: hidden;
14
14
  }
15
-
15
+ &-basic {
16
+ width: 100%;
17
+ height: 100%;
18
+ }
16
19
  &-loading {
17
20
  width: 100%;
18
21
  height: 100%;
@@ -15,6 +15,10 @@
15
15
  border-radius: 50%;
16
16
  overflow: hidden;
17
17
  }
18
+ .nut-image-basic {
19
+ width: 100%;
20
+ height: 100%;
21
+ }
18
22
  .nut-image-loading {
19
23
  width: 100%;
20
24
  height: 100%;
@@ -15,6 +15,10 @@
15
15
  border-radius: 50%;
16
16
  overflow: hidden;
17
17
  }
18
+ .nut-image-basic {
19
+ width: 100%;
20
+ height: 100%;
21
+ }
18
22
  .nut-image-loading {
19
23
  width: 100%;
20
24
  height: 100%;
@@ -60,7 +60,7 @@
60
60
 
61
61
  .nut-popup {
62
62
  position: fixed;
63
- min-height: 46%;
63
+ min-height: 26%;
64
64
  max-height: 100%;
65
65
  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
66
66
  -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
198
198
  transform: scale(0.8);
199
199
  }
200
200
  }
201
- .nut-popup-slide-default-enter-active {
201
+ .nut-popup-slide-none-enter-active {
202
202
  animation-fill-mode: both;
203
203
  animation-name: popup-scale-fade-in;
204
204
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
205
205
  }
206
- .nut-popup-slide-default-exit-active {
206
+ .nut-popup-slide-none-exit-active {
207
207
  animation-fill-mode: both;
208
208
  animation-name: popup-scale-fade-out;
209
209
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
330
330
  animation-name: popup-slide-left-exit;
331
331
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
332
332
  }
333
- .nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
333
+ .nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
334
334
  display: none;
335
335
  }
336
336
  .nut-popup .nut-overflow-hidden {
@@ -608,6 +608,10 @@
608
608
  border-radius: 50%;
609
609
  overflow: hidden;
610
610
  }
611
+ .nut-image-basic {
612
+ width: 100%;
613
+ height: 100%;
614
+ }
611
615
  .nut-image-loading {
612
616
  width: 100%;
613
617
  height: 100%;
@@ -60,7 +60,7 @@
60
60
 
61
61
  .nut-popup {
62
62
  position: fixed;
63
- min-height: 46%;
63
+ min-height: 26%;
64
64
  max-height: 100%;
65
65
  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
66
66
  -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
198
198
  transform: scale(0.8);
199
199
  }
200
200
  }
201
- .nut-popup-slide-default-enter-active {
201
+ .nut-popup-slide-none-enter-active {
202
202
  animation-fill-mode: both;
203
203
  animation-name: popup-scale-fade-in;
204
204
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
205
205
  }
206
- .nut-popup-slide-default-exit-active {
206
+ .nut-popup-slide-none-exit-active {
207
207
  animation-fill-mode: both;
208
208
  animation-name: popup-scale-fade-out;
209
209
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
330
330
  animation-name: popup-slide-left-exit;
331
331
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
332
332
  }
333
- .nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
333
+ .nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
334
334
  display: none;
335
335
  }
336
336
  .nut-popup .nut-overflow-hidden {
@@ -60,7 +60,7 @@
60
60
 
61
61
  .nut-popup {
62
62
  position: fixed;
63
- min-height: 46%;
63
+ min-height: 26%;
64
64
  max-height: 100%;
65
65
  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
66
66
  -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
198
198
  transform: scale(0.8);
199
199
  }
200
200
  }
201
- .nut-popup-slide-default-enter-active {
201
+ .nut-popup-slide-none-enter-active {
202
202
  animation-fill-mode: both;
203
203
  animation-name: popup-scale-fade-in;
204
204
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
205
205
  }
206
- .nut-popup-slide-default-exit-active {
206
+ .nut-popup-slide-none-exit-active {
207
207
  animation-fill-mode: both;
208
208
  animation-name: popup-scale-fade-out;
209
209
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
330
330
  animation-name: popup-slide-left-exit;
331
331
  animation-duration: var(--nutui-popup-animation-duration, 0.3s);
332
332
  }
333
- .nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
333
+ .nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
334
334
  display: none;
335
335
  }
336
336
  .nut-popup .nut-overflow-hidden {
@@ -1,10 +1,3 @@
1
1
  import React, { FunctionComponent } from 'react';
2
2
  import { TaroPopoverProps } from "../../types";
3
- export interface RootPosition {
4
- width: number;
5
- height: number;
6
- left: number;
7
- top: number;
8
- right: number;
9
- }
10
3
  export declare const Popover: FunctionComponent<Partial<TaroPopoverProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onSelect'>>;