@nutui/nutui-react-taro 3.0.19-cpp.22-2 → 3.0.19-cpp.22-4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/hooks/taro/use-custom-event.js +5 -5
- package/dist/cjs/hooks/use-ref-state.js +3 -3
- package/dist/cjs/hooks/use-touch.js +2 -1
- package/dist/cjs/packages/address/utils.js +3 -3
- package/dist/cjs/packages/avatarcropper/avatarcropper.js +28 -16
- package/dist/cjs/packages/badge/badge.js +7 -4
- package/dist/cjs/packages/barrage/barrage.js +24 -14
- package/dist/cjs/packages/calendar/style/calendar.scss +32 -1
- package/dist/cjs/packages/calendar/style/style.css +21 -1
- package/dist/cjs/packages/calendar/style/style.harmony.css +21 -1
- package/dist/cjs/packages/calendar/style-jmapp/calendar.scss +32 -1
- package/dist/cjs/packages/calendar/style-jmapp/style.css +21 -1
- package/dist/cjs/packages/calendar/style-jrkf/calendar.scss +32 -1
- package/dist/cjs/packages/calendar/style-jrkf/style.css +21 -1
- package/dist/cjs/packages/calendar/utils.js +8 -8
- package/dist/cjs/packages/calendarcard/icon.js +9 -15
- package/dist/cjs/packages/calendarcard/style/calendarcard.scss +13 -0
- package/dist/cjs/packages/calendarcard/style/style.css +8 -0
- package/dist/cjs/packages/calendarcard/style/style.harmony.css +8 -0
- package/dist/cjs/packages/calendarcard/style-jmapp/calendarcard.scss +13 -0
- package/dist/cjs/packages/calendarcard/style-jmapp/style.css +8 -0
- package/dist/cjs/packages/calendarcard/style-jrkf/calendarcard.scss +13 -0
- package/dist/cjs/packages/calendarcard/style-jrkf/style.css +8 -0
- package/dist/cjs/packages/calendarcard/utils.js +6 -6
- package/dist/cjs/packages/cascader/cascader.js +21 -12
- package/dist/cjs/packages/cascader/utils.js +3 -3
- package/dist/cjs/packages/collapseitem/collapseitem.js +7 -4
- package/dist/cjs/packages/configprovider/configprovider.js +7 -7
- package/dist/cjs/packages/configprovider/index.js +6 -6
- package/dist/cjs/packages/countdown/countdown.js +2 -1
- package/dist/cjs/packages/datepicker/utils.js +9 -9
- package/dist/cjs/packages/dialog/content.js +3 -3
- package/dist/cjs/packages/dialog/dialog.js +11 -8
- package/dist/cjs/packages/drag/drag.js +7 -4
- package/dist/cjs/packages/elevator/elevator.js +10 -7
- package/dist/cjs/packages/ellipsis/ellipsis.js +30 -17
- package/dist/cjs/packages/form/index.js +2 -0
- package/dist/cjs/packages/form/useform.js +57 -50
- package/dist/cjs/packages/infiniteloading/infiniteloading.js +14 -8
- package/dist/cjs/packages/inputnumber/inputnumber.js +28 -16
- package/dist/cjs/packages/lottie/types.js +2 -0
- package/dist/cjs/packages/menuitem/menuitem.js +22 -24
- package/dist/cjs/packages/noticebar/noticebar.js +70 -74
- package/dist/cjs/packages/notify/notify.js +4 -4
- package/dist/cjs/packages/nutui.react.build.js +105 -105
- package/dist/cjs/packages/nutui.react.js +105 -105
- package/dist/cjs/packages/overlay/overlay.js +3 -3
- package/dist/cjs/packages/pickerview/pickerroller.js +7 -4
- package/dist/cjs/packages/pickerview/pickerview.js +2 -1
- package/dist/cjs/packages/pickerview/utils.js +3 -3
- package/dist/cjs/packages/popover/popover.js +77 -75
- package/dist/cjs/packages/popup/popup.js +14 -8
- package/dist/cjs/packages/price/price.js +6 -4
- package/dist/cjs/packages/pulltorefresh/pulltorefresh.js +56 -52
- package/dist/cjs/packages/radio/index.js +2 -0
- package/dist/cjs/packages/range/range.js +28 -16
- package/dist/cjs/packages/shortpassword/shortpassword.js +3 -3
- package/dist/cjs/packages/sticky/sticky.js +7 -4
- package/dist/cjs/packages/swipe/swipe.js +14 -8
- package/dist/cjs/packages/swiper/index.js +1 -0
- package/dist/cjs/packages/switch/switch.js +7 -4
- package/dist/cjs/packages/toast/toast.js +4 -4
- package/dist/cjs/packages/uploader/uploader.js +51 -38
- package/dist/cjs/packages/virtuallist/utils.js +6 -6
- package/dist/cjs/packages/watermark/watermark.js +8 -4
- package/dist/cjs/types/spec/address/base.js +2 -0
- package/dist/cjs/types/spec/price/base.d.ts +1 -0
- package/dist/cjs/utils/date.js +5 -5
- package/dist/cjs/utils/event-mocker.js +18 -10
- package/dist/cjs/utils/get-rect.js +4 -4
- package/dist/cjs/utils/get-scroll-parent.js +3 -3
- package/dist/cjs/utils/merge-props.js +3 -3
- package/dist/cjs/utils/merge.js +6 -6
- package/dist/cjs/utils/raf.js +3 -3
- package/dist/cjs/utils/render.js +9 -5
- package/dist/cjs/utils/rubberband.js +3 -3
- package/dist/cjs/utils/should-render-price-raw.d.ts +1 -0
- package/dist/cjs/utils/should-render-price-raw.js +17 -6
- package/dist/cjs/utils/taro/get-rect.js +24 -14
- package/dist/cjs/utils/taro/get-system-info.js +4 -4
- package/dist/cjs/utils/taro/platform.js +5 -5
- package/dist/es/hooks/use-touch.js +1 -1
- package/dist/es/packages/avatarcropper/avatarcropper.js +28 -16
- package/dist/es/packages/badge/badge.js +7 -4
- package/dist/es/packages/barrage/barrage.js +24 -14
- package/dist/es/packages/calendar/style/calendar.scss +32 -1
- package/dist/es/packages/calendar/style/style.css +21 -1
- package/dist/es/packages/calendar/style/style.harmony.css +21 -1
- package/dist/es/packages/calendar/style-jmapp/calendar.scss +32 -1
- package/dist/es/packages/calendar/style-jmapp/style.css +21 -1
- package/dist/es/packages/calendar/style-jrkf/calendar.scss +32 -1
- package/dist/es/packages/calendar/style-jrkf/style.css +21 -1
- package/dist/es/packages/calendarcard/icon.js +5 -11
- package/dist/es/packages/calendarcard/style/calendarcard.scss +13 -0
- package/dist/es/packages/calendarcard/style/style.css +8 -0
- package/dist/es/packages/calendarcard/style/style.harmony.css +8 -0
- package/dist/es/packages/calendarcard/style-jmapp/calendarcard.scss +13 -0
- package/dist/es/packages/calendarcard/style-jmapp/style.css +8 -0
- package/dist/es/packages/calendarcard/style-jrkf/calendarcard.scss +13 -0
- package/dist/es/packages/calendarcard/style-jrkf/style.css +8 -0
- package/dist/es/packages/cascader/cascader.js +21 -12
- package/dist/es/packages/collapseitem/collapseitem.js +7 -4
- package/dist/es/packages/countdown/countdown.js +2 -1
- package/dist/es/packages/dialog/dialog.js +7 -4
- package/dist/es/packages/drag/drag.js +7 -4
- package/dist/es/packages/elevator/elevator.js +7 -4
- package/dist/es/packages/ellipsis/ellipsis.js +30 -17
- package/dist/es/packages/form/index.js +1 -0
- package/dist/es/packages/form/useform.js +53 -46
- package/dist/es/packages/infiniteloading/infiniteloading.js +14 -8
- package/dist/es/packages/inputnumber/inputnumber.js +28 -16
- package/dist/es/packages/lottie/types.js +1 -1
- package/dist/es/packages/menuitem/menuitem.js +22 -24
- package/dist/es/packages/noticebar/noticebar.js +70 -74
- package/dist/es/packages/pickerview/pickerroller.js +7 -4
- package/dist/es/packages/pickerview/pickerview.js +2 -1
- package/dist/es/packages/popover/popover.js +77 -75
- package/dist/es/packages/popup/popup.js +14 -8
- package/dist/es/packages/price/price.js +7 -5
- package/dist/es/packages/pulltorefresh/pulltorefresh.js +56 -52
- package/dist/es/packages/radio/index.js +1 -0
- package/dist/es/packages/range/range.js +28 -16
- package/dist/es/packages/sticky/sticky.js +7 -4
- package/dist/es/packages/swipe/swipe.js +14 -8
- package/dist/es/packages/swiper/index.js +1 -0
- package/dist/es/packages/switch/switch.js +7 -4
- package/dist/es/packages/uploader/uploader.js +51 -38
- package/dist/es/packages/watermark/watermark.js +8 -4
- package/dist/es/types/spec/address/base.js +1 -1
- package/dist/es/types/spec/price/base.d.ts +1 -0
- package/dist/es/utils/event-mocker.js +12 -4
- package/dist/es/utils/render.js +6 -2
- package/dist/es/utils/should-render-price-raw.d.ts +1 -0
- package/dist/es/utils/should-render-price-raw.js +6 -3
- package/dist/es/utils/taro/get-rect.js +20 -10
- package/dist/nutui.react.umd.js +871 -663
- package/dist/style-jmapp.css +1 -1
- package/dist/style-jmapp.scss +41 -41
- package/dist/style-jrkf.css +1 -1
- package/dist/style-jrkf.scss +24 -24
- package/dist/style.css +1 -1
- package/dist/style.scss +31 -31
- package/package.json +1 -1
|
@@ -126,51 +126,49 @@ export var NoticeBar = function(props) {
|
|
|
126
126
|
if (showNoticeBar === false) {
|
|
127
127
|
return;
|
|
128
128
|
}
|
|
129
|
-
nextTick(function() {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
if (!wrapRef.current || !contentRef.current) {
|
|
136
|
-
return [
|
|
137
|
-
2
|
|
138
|
-
];
|
|
139
|
-
}
|
|
129
|
+
nextTick(/*#__PURE__*/ _async_to_generator(function() {
|
|
130
|
+
var warpRes, contentRes, wrapW, offsetW, canScroll;
|
|
131
|
+
return _ts_generator(this, function(_state) {
|
|
132
|
+
switch(_state.label){
|
|
133
|
+
case 0:
|
|
134
|
+
if (!wrapRef.current || !contentRef.current) {
|
|
140
135
|
return [
|
|
141
|
-
4,
|
|
142
|
-
getRectInMultiPlatform(wrapRef.current, wrapRefId)
|
|
143
|
-
];
|
|
144
|
-
case 1:
|
|
145
|
-
warpRes = _state.sent();
|
|
146
|
-
return [
|
|
147
|
-
4,
|
|
148
|
-
getRectInMultiPlatform(contentRef.current, contentRefId)
|
|
149
|
-
];
|
|
150
|
-
case 2:
|
|
151
|
-
contentRes = _state.sent();
|
|
152
|
-
if (!warpRes || !contentRes) return [
|
|
153
136
|
2
|
|
154
137
|
];
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
138
|
+
}
|
|
139
|
+
return [
|
|
140
|
+
4,
|
|
141
|
+
getRectInMultiPlatform(wrapRef.current, wrapRefId)
|
|
142
|
+
];
|
|
143
|
+
case 1:
|
|
144
|
+
warpRes = _state.sent();
|
|
145
|
+
return [
|
|
146
|
+
4,
|
|
147
|
+
getRectInMultiPlatform(contentRef.current, contentRefId)
|
|
148
|
+
];
|
|
149
|
+
case 2:
|
|
150
|
+
contentRes = _state.sent();
|
|
151
|
+
if (!warpRes || !contentRes) return [
|
|
152
|
+
2
|
|
153
|
+
];
|
|
154
|
+
wrapW = warpRes.width;
|
|
155
|
+
offsetW = contentRes.width;
|
|
156
|
+
canScroll = align === 'left' && scrollable == null ? offsetW > wrapW : scrollable;
|
|
157
|
+
SetIsCanScroll(canScroll);
|
|
158
|
+
if (canScroll) {
|
|
159
|
+
SetWrapWidth(wrapW);
|
|
160
|
+
SetOffsetW(offsetW);
|
|
161
|
+
SetAnimationDuration(offsetW / speed);
|
|
162
|
+
SetAnimationClass('play');
|
|
163
|
+
} else {
|
|
164
|
+
SetAnimationClass('');
|
|
165
|
+
}
|
|
166
|
+
return [
|
|
167
|
+
2
|
|
168
|
+
];
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
}));
|
|
174
172
|
};
|
|
175
173
|
var handleClick = function(event) {
|
|
176
174
|
click && click(event);
|
|
@@ -232,38 +230,36 @@ export var NoticeBar = function(props) {
|
|
|
232
230
|
var init = function() {
|
|
233
231
|
var activeIndex = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
|
|
234
232
|
if (!(container === null || container === void 0 ? void 0 : container.current)) return;
|
|
235
|
-
setTimeout(function() {
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
})();
|
|
266
|
-
}, 0);
|
|
233
|
+
setTimeout(/*#__PURE__*/ _async_to_generator(function() {
|
|
234
|
+
var rects, _active, _height, targetOffset;
|
|
235
|
+
return _ts_generator(this, function(_state) {
|
|
236
|
+
switch(_state.label){
|
|
237
|
+
case 0:
|
|
238
|
+
return [
|
|
239
|
+
4,
|
|
240
|
+
getRectInMultiPlatform(container === null || container === void 0 ? void 0 : container.current)
|
|
241
|
+
];
|
|
242
|
+
case 1:
|
|
243
|
+
rects = _state.sent();
|
|
244
|
+
_active = Math.max(Math.min(childCount - 1, activeIndex), 0);
|
|
245
|
+
_height = rects === null || rects === void 0 ? void 0 : rects.height;
|
|
246
|
+
trackSize = childCount * Number(_height);
|
|
247
|
+
targetOffset = getOffset(_active);
|
|
248
|
+
activeRef.current = _active;
|
|
249
|
+
setRect(rects);
|
|
250
|
+
setOffset(targetOffset);
|
|
251
|
+
setChildOffset(new Array(childCount).fill(0));
|
|
252
|
+
// 关闭动画并立即设置样式
|
|
253
|
+
swiperRef.current.moving = true;
|
|
254
|
+
setStyle(targetOffset, rects);
|
|
255
|
+
swiperRef.current.moving = false;
|
|
256
|
+
setReady(true);
|
|
257
|
+
return [
|
|
258
|
+
2
|
|
259
|
+
];
|
|
260
|
+
}
|
|
261
|
+
});
|
|
262
|
+
}), 0);
|
|
267
263
|
};
|
|
268
264
|
useEffect(function() {
|
|
269
265
|
if (ready) {
|
|
@@ -114,8 +114,8 @@ var InternalPickerRoller = function(props, ref) {
|
|
|
114
114
|
setTouchTime(0);
|
|
115
115
|
selectValue(scrollDistance);
|
|
116
116
|
};
|
|
117
|
-
var getReactHeight = function() {
|
|
118
|
-
|
|
117
|
+
var getReactHeight = /*#__PURE__*/ function() {
|
|
118
|
+
var _ref = _async_to_generator(function() {
|
|
119
119
|
var placeholder, placeholderHeight, error;
|
|
120
120
|
return _ts_generator(this, function(_state) {
|
|
121
121
|
switch(_state.label){
|
|
@@ -150,8 +150,11 @@ var InternalPickerRoller = function(props, ref) {
|
|
|
150
150
|
];
|
|
151
151
|
}
|
|
152
152
|
});
|
|
153
|
-
})
|
|
154
|
-
|
|
153
|
+
});
|
|
154
|
+
return function getReactHeight() {
|
|
155
|
+
return _ref.apply(this, arguments);
|
|
156
|
+
};
|
|
157
|
+
}();
|
|
155
158
|
// lineSpacing.current CSS variable
|
|
156
159
|
useEffect(function() {
|
|
157
160
|
var element = pickerRollerRef.current;
|
|
@@ -54,7 +54,8 @@ var InternalPickerView = function(props, ref) {
|
|
|
54
54
|
var index = currentOptions.findIndex(function(columnItem) {
|
|
55
55
|
return columnItem.value === currentValue;
|
|
56
56
|
});
|
|
57
|
-
columnOptions = currentOptions[index === -1 ? 0 : index]
|
|
57
|
+
columnOptions = currentOptions[index === -1 ? 0 : index] // 如果未找到,默认取第一个
|
|
58
|
+
;
|
|
58
59
|
} else {
|
|
59
60
|
return "break" // 如果 currentValue 不存在,终止循环
|
|
60
61
|
;
|
|
@@ -74,91 +74,93 @@ export var Popover = function(props) {
|
|
|
74
74
|
]);
|
|
75
75
|
var uid = useUuid();
|
|
76
76
|
var popoverId = "popover-".concat(uid);
|
|
77
|
-
var getWrapperPosition = function() {
|
|
78
|
-
|
|
77
|
+
var getWrapperPosition = /*#__PURE__*/ function() {
|
|
78
|
+
var _ref = _async_to_generator(function() {
|
|
79
79
|
return _ts_generator(this, function(_state) {
|
|
80
|
-
nextTick(function() {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
})();
|
|
125
|
-
});
|
|
80
|
+
nextTick(/*#__PURE__*/ _async_to_generator(function() {
|
|
81
|
+
var rect, _tmp, width, height, right, left, top;
|
|
82
|
+
return _ts_generator(this, function(_state) {
|
|
83
|
+
switch(_state.label){
|
|
84
|
+
case 0:
|
|
85
|
+
if (!targetId) return [
|
|
86
|
+
3,
|
|
87
|
+
2
|
|
88
|
+
];
|
|
89
|
+
return [
|
|
90
|
+
4,
|
|
91
|
+
getRectInMultiPlatform(document.querySelector("#".concat(targetId)), targetId)
|
|
92
|
+
];
|
|
93
|
+
case 1:
|
|
94
|
+
_tmp = _state.sent();
|
|
95
|
+
return [
|
|
96
|
+
3,
|
|
97
|
+
4
|
|
98
|
+
];
|
|
99
|
+
case 2:
|
|
100
|
+
return [
|
|
101
|
+
4,
|
|
102
|
+
getRectInMultiPlatform(popoverRef.current, popoverId)
|
|
103
|
+
];
|
|
104
|
+
case 3:
|
|
105
|
+
_tmp = _state.sent();
|
|
106
|
+
_state.label = 4;
|
|
107
|
+
case 4:
|
|
108
|
+
rect = _tmp;
|
|
109
|
+
width = rect.width, height = rect.height, right = rect.right, left = rect.left, top = rect.top;
|
|
110
|
+
setWrapperPosition({
|
|
111
|
+
width: width,
|
|
112
|
+
height: height,
|
|
113
|
+
left: rtl ? right : left,
|
|
114
|
+
top: top,
|
|
115
|
+
right: rtl ? left : right
|
|
116
|
+
});
|
|
117
|
+
getPopoverContentW();
|
|
118
|
+
return [
|
|
119
|
+
2
|
|
120
|
+
];
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
}));
|
|
126
124
|
return [
|
|
127
125
|
2
|
|
128
126
|
];
|
|
129
127
|
});
|
|
130
|
-
})
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
128
|
+
});
|
|
129
|
+
return function getWrapperPosition() {
|
|
130
|
+
return _ref.apply(this, arguments);
|
|
131
|
+
};
|
|
132
|
+
}();
|
|
133
|
+
var getPopoverContentW = /*#__PURE__*/ function() {
|
|
134
|
+
var _ref = _async_to_generator(function() {
|
|
134
135
|
return _ts_generator(this, function(_state) {
|
|
135
|
-
nextTick(function() {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
})();
|
|
155
|
-
});
|
|
136
|
+
nextTick(/*#__PURE__*/ _async_to_generator(function() {
|
|
137
|
+
var rectContent;
|
|
138
|
+
return _ts_generator(this, function(_state) {
|
|
139
|
+
switch(_state.label){
|
|
140
|
+
case 0:
|
|
141
|
+
return [
|
|
142
|
+
4,
|
|
143
|
+
getRectInMultiPlatform(popoverContentRef.current)
|
|
144
|
+
];
|
|
145
|
+
case 1:
|
|
146
|
+
rectContent = _state.sent();
|
|
147
|
+
setPopWidth(rectContent.width);
|
|
148
|
+
setPopHeight(rectContent.height);
|
|
149
|
+
return [
|
|
150
|
+
2
|
|
151
|
+
];
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
}));
|
|
156
155
|
return [
|
|
157
156
|
2
|
|
158
157
|
];
|
|
159
158
|
});
|
|
160
|
-
})
|
|
161
|
-
|
|
159
|
+
});
|
|
160
|
+
return function getPopoverContentW() {
|
|
161
|
+
return _ref.apply(this, arguments);
|
|
162
|
+
};
|
|
163
|
+
}();
|
|
162
164
|
var clickAway = function() {
|
|
163
165
|
if (closeOnOutsideClick) {
|
|
164
166
|
onClick === null || onClick === void 0 ? void 0 : onClick();
|
|
@@ -95,8 +95,8 @@ export var Popup = function(props) {
|
|
|
95
95
|
}
|
|
96
96
|
onOpen && onOpen();
|
|
97
97
|
};
|
|
98
|
-
var getPopupHeight = function() {
|
|
99
|
-
|
|
98
|
+
var getPopupHeight = /*#__PURE__*/ function() {
|
|
99
|
+
var _ref = _async_to_generator(function() {
|
|
100
100
|
var _nodeRef_current, rect, height;
|
|
101
101
|
return _ts_generator(this, function(_state) {
|
|
102
102
|
switch(_state.label){
|
|
@@ -114,8 +114,11 @@ export var Popup = function(props) {
|
|
|
114
114
|
];
|
|
115
115
|
}
|
|
116
116
|
});
|
|
117
|
-
})
|
|
118
|
-
|
|
117
|
+
});
|
|
118
|
+
return function getPopupHeight() {
|
|
119
|
+
return _ref.apply(this, arguments);
|
|
120
|
+
};
|
|
121
|
+
}();
|
|
119
122
|
useEffect(function() {
|
|
120
123
|
if (innerVisible && topNodeRef.current && nodeRef.current) {
|
|
121
124
|
nextTick(function() {
|
|
@@ -184,8 +187,8 @@ export var Popup = function(props) {
|
|
|
184
187
|
return renderCloseIcon();
|
|
185
188
|
}
|
|
186
189
|
};
|
|
187
|
-
var handleTouchStart = function(
|
|
188
|
-
|
|
190
|
+
var handleTouchStart = /*#__PURE__*/ function() {
|
|
191
|
+
var _ref = _async_to_generator(function(event) {
|
|
189
192
|
var _nodeRef_current, _rootRect_current, e, rect;
|
|
190
193
|
return _ts_generator(this, function(_state) {
|
|
191
194
|
switch(_state.label){
|
|
@@ -213,8 +216,11 @@ export var Popup = function(props) {
|
|
|
213
216
|
];
|
|
214
217
|
}
|
|
215
218
|
});
|
|
216
|
-
})
|
|
217
|
-
|
|
219
|
+
});
|
|
220
|
+
return function handleTouchStart(event) {
|
|
221
|
+
return _ref.apply(this, arguments);
|
|
222
|
+
};
|
|
223
|
+
}();
|
|
218
224
|
var handleTouchMove = function(event) {
|
|
219
225
|
if (position !== 'bottom' || !resizable || !nodeRef.current || !rootRect.current) return;
|
|
220
226
|
var e = event;
|
|
@@ -8,7 +8,7 @@ import { ComponentDefaults } from "../../utils/typings";
|
|
|
8
8
|
import { useRtl } from "../configprovider/index";
|
|
9
9
|
import { PriceColorEnum } from "../../types";
|
|
10
10
|
import { harmony } from "../../utils/taro/platform";
|
|
11
|
-
import { shouldRenderPriceAsRaw } from "../../utils/should-render-price-raw";
|
|
11
|
+
import { shouldRenderPriceAsRaw, hasNonPriceChars } from "../../utils/should-render-price-raw";
|
|
12
12
|
var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
13
13
|
color: 'primary',
|
|
14
14
|
price: 0,
|
|
@@ -17,16 +17,18 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
|
17
17
|
thousands: false,
|
|
18
18
|
position: 'before',
|
|
19
19
|
size: 'normal',
|
|
20
|
-
line: false
|
|
20
|
+
line: false,
|
|
21
|
+
raw: false
|
|
21
22
|
});
|
|
22
23
|
export var Price = function(props) {
|
|
23
|
-
var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
|
|
24
|
+
var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, raw = _$_object_spread.raw, className = _$_object_spread.className, style = _$_object_spread.style;
|
|
24
25
|
var classPrefix = 'nut-price';
|
|
25
26
|
var rtl = useRtl();
|
|
26
27
|
var isRenderPriceRaw = useMemo(function() {
|
|
27
|
-
return typeof originalPrice === 'string' && shouldRenderPriceAsRaw(originalPrice);
|
|
28
|
+
return typeof originalPrice === 'string' && shouldRenderPriceAsRaw(originalPrice) || raw && typeof originalPrice === 'string' && hasNonPriceChars(originalPrice);
|
|
28
29
|
}, [
|
|
29
|
-
originalPrice
|
|
30
|
+
originalPrice,
|
|
31
|
+
raw
|
|
30
32
|
]);
|
|
31
33
|
var price = useMemo(function() {
|
|
32
34
|
if (isRenderPriceRaw) return '';
|
|
@@ -31,58 +31,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
|
31
31
|
});
|
|
32
32
|
export var PullToRefresh = function(p) {
|
|
33
33
|
var doRefresh = function doRefresh() {
|
|
34
|
-
return
|
|
35
|
-
var e;
|
|
36
|
-
return _ts_generator(this, function(_state) {
|
|
37
|
-
switch(_state.label){
|
|
38
|
-
case 0:
|
|
39
|
-
setHeight(headHeight);
|
|
40
|
-
setStatus('refreshing');
|
|
41
|
-
_state.label = 1;
|
|
42
|
-
case 1:
|
|
43
|
-
_state.trys.push([
|
|
44
|
-
1,
|
|
45
|
-
3,
|
|
46
|
-
,
|
|
47
|
-
4
|
|
48
|
-
]);
|
|
49
|
-
return [
|
|
50
|
-
4,
|
|
51
|
-
props.onRefresh()
|
|
52
|
-
];
|
|
53
|
-
case 2:
|
|
54
|
-
_state.sent();
|
|
55
|
-
setStatus('complete');
|
|
56
|
-
return [
|
|
57
|
-
3,
|
|
58
|
-
4
|
|
59
|
-
];
|
|
60
|
-
case 3:
|
|
61
|
-
e = _state.sent();
|
|
62
|
-
setHeight(0);
|
|
63
|
-
setStatus('pulling');
|
|
64
|
-
throw e;
|
|
65
|
-
case 4:
|
|
66
|
-
if (!(props.completeDelay > 0)) return [
|
|
67
|
-
3,
|
|
68
|
-
6
|
|
69
|
-
];
|
|
70
|
-
return [
|
|
71
|
-
4,
|
|
72
|
-
sleep(props.completeDelay)
|
|
73
|
-
];
|
|
74
|
-
case 5:
|
|
75
|
-
_state.sent();
|
|
76
|
-
_state.label = 6;
|
|
77
|
-
case 6:
|
|
78
|
-
setHeight(0);
|
|
79
|
-
setStatus('pulling');
|
|
80
|
-
return [
|
|
81
|
-
2
|
|
82
|
-
];
|
|
83
|
-
}
|
|
84
|
-
});
|
|
85
|
-
})();
|
|
34
|
+
return _doRefresh.apply(this, arguments);
|
|
86
35
|
};
|
|
87
36
|
var classPrefix = 'nut-pulltorefresh';
|
|
88
37
|
var locale = useConfig().locale;
|
|
@@ -139,6 +88,61 @@ export var PullToRefresh = function(p) {
|
|
|
139
88
|
}
|
|
140
89
|
clearTimeout(timer.current);
|
|
141
90
|
};
|
|
91
|
+
function _doRefresh() {
|
|
92
|
+
_doRefresh = _async_to_generator(function() {
|
|
93
|
+
var e;
|
|
94
|
+
return _ts_generator(this, function(_state) {
|
|
95
|
+
switch(_state.label){
|
|
96
|
+
case 0:
|
|
97
|
+
setHeight(headHeight);
|
|
98
|
+
setStatus('refreshing');
|
|
99
|
+
_state.label = 1;
|
|
100
|
+
case 1:
|
|
101
|
+
_state.trys.push([
|
|
102
|
+
1,
|
|
103
|
+
3,
|
|
104
|
+
,
|
|
105
|
+
4
|
|
106
|
+
]);
|
|
107
|
+
return [
|
|
108
|
+
4,
|
|
109
|
+
props.onRefresh()
|
|
110
|
+
];
|
|
111
|
+
case 2:
|
|
112
|
+
_state.sent();
|
|
113
|
+
setStatus('complete');
|
|
114
|
+
return [
|
|
115
|
+
3,
|
|
116
|
+
4
|
|
117
|
+
];
|
|
118
|
+
case 3:
|
|
119
|
+
e = _state.sent();
|
|
120
|
+
setHeight(0);
|
|
121
|
+
setStatus('pulling');
|
|
122
|
+
throw e;
|
|
123
|
+
case 4:
|
|
124
|
+
if (!(props.completeDelay > 0)) return [
|
|
125
|
+
3,
|
|
126
|
+
6
|
|
127
|
+
];
|
|
128
|
+
return [
|
|
129
|
+
4,
|
|
130
|
+
sleep(props.completeDelay)
|
|
131
|
+
];
|
|
132
|
+
case 5:
|
|
133
|
+
_state.sent();
|
|
134
|
+
_state.label = 6;
|
|
135
|
+
case 6:
|
|
136
|
+
setHeight(0);
|
|
137
|
+
setStatus('pulling');
|
|
138
|
+
return [
|
|
139
|
+
2
|
|
140
|
+
];
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
return _doRefresh.apply(this, arguments);
|
|
145
|
+
}
|
|
142
146
|
var handleTouchEnd = function() {
|
|
143
147
|
if (props.disabled) return;
|
|
144
148
|
pullingRef.current = false;
|