@tarojs/taro-rn 4.0.0-beta.8 → 4.0.0-beta.80
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/lib/Popup.js +17 -10
- package/dist/lib/Popup.js.map +1 -1
- package/dist/lib/getLocation/index.js +6 -2
- package/dist/lib/getLocation/index.js.map +1 -1
- package/dist/lib/request/index.js +1 -1
- package/dist/lib/request/index.js.map +1 -1
- package/dist/lib/showActionSheet/ActionSheet.js +8 -20
- package/dist/lib/showActionSheet/ActionSheet.js.map +1 -1
- package/dist/lib/showModal/Dialog.js +19 -33
- package/dist/lib/showModal/Dialog.js.map +1 -1
- package/dist/lib/showModal/toast.js +1 -1
- package/dist/lib/showModal/toast.js.map +1 -1
- package/package.json +5 -4
- package/src/lib/Popup.tsx +21 -16
- package/src/lib/getLocation/index.ts +7 -3
- package/src/lib/request/index.ts +1 -1
- package/src/lib/showActionSheet/ActionSheet.tsx +27 -37
- package/src/lib/showModal/Dialog.tsx +27 -33
- package/src/lib/showModal/toast.tsx +3 -3
- package/types/runtime.d.ts +3 -0
package/dist/lib/Popup.js
CHANGED
|
@@ -34,17 +34,24 @@ class Popup extends Component {
|
|
|
34
34
|
}).start(() => this.setState({ visible: false }));
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
+
componentWillUnmount() {
|
|
38
|
+
this.timer && clearTimeout(this.timer);
|
|
39
|
+
}
|
|
37
40
|
handleLayout() {
|
|
38
|
-
this.
|
|
39
|
-
|
|
40
|
-
this.
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
this.timer = setTimeout(() => {
|
|
42
|
+
var _a;
|
|
43
|
+
(_a = this.popup) === null || _a === void 0 ? void 0 : _a.measure((_x, _y, _w, h) => {
|
|
44
|
+
this.height = h;
|
|
45
|
+
this.setState({ translateY: new Animated.Value(h) }, () => {
|
|
46
|
+
Animated.timing(this.state.translateY, {
|
|
47
|
+
toValue: 0,
|
|
48
|
+
duration: 300,
|
|
49
|
+
easing: Easing.easeInOut,
|
|
50
|
+
useNativeDriver: true
|
|
51
|
+
}).start();
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
}); // 处理鸿蒙系统handleLayout 回调 this.popup为空的情况
|
|
48
55
|
}
|
|
49
56
|
render() {
|
|
50
57
|
const { style, maskStyle, onShow, onClose, children } = this.props;
|
package/dist/lib/Popup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Popup.js","sourceRoot":"","sources":["../../src/lib/Popup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAExC,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAClD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,CAAC;QACP,KAAK;QACL,eAAe,EAAE,SAAS;KAC3B;CACF,CAAC,CAAA;AAMF,MAAM,KAAM,SAAQ,SAAmB;IAarC,
|
|
1
|
+
{"version":3,"file":"Popup.js","sourceRoot":"","sources":["../../src/lib/Popup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,15 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import Geolocation from '@react-native-community/geolocation';
|
|
11
|
-
import { requestForegroundPermissionsAsync } from 'expo-location';
|
|
12
11
|
import { errorHandler } from '../../utils';
|
|
13
12
|
export function getLocation(opts = {}) {
|
|
14
13
|
return __awaiter(this, void 0, void 0, function* () {
|
|
15
14
|
const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts;
|
|
15
|
+
const requestAuthorization = () => {
|
|
16
|
+
return new Promise((resolve, reject) => {
|
|
17
|
+
Geolocation.requestAuthorization(() => resolve({ granted: true }), (err) => reject(err));
|
|
18
|
+
});
|
|
19
|
+
};
|
|
16
20
|
try {
|
|
17
21
|
// @ts-ignore
|
|
18
22
|
// todo: fix types
|
|
19
|
-
const { granted } = yield
|
|
23
|
+
const { granted } = yield requestAuthorization();
|
|
20
24
|
if (!granted) {
|
|
21
25
|
const res = { errMsg: 'Permissions denied!' };
|
|
22
26
|
return errorHandler(fail, complete)(res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getLocation/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,WAAW,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getLocation/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,WAAW,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,UAAgB,WAAW,CAAC,OAAgC,EAAE;;QAClE,MAAM,EAAE,cAAc,GAAG,KAAK,EAAE,sBAAsB,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAC/F,MAAM,oBAAoB,GAAG,GAAG,EAAE;YAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,WAAW,CAAC,oBAAoB,CAAC,GAAE,EAAE,CAAA,OAAO,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,EAAE,CAAC,GAAG,EAAC,EAAE,CAAA,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;YACpF,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,IAAI;YACF,aAAa;YACb,kBAAkB;YAClB,MAAM,EAAC,OAAO,EAAC,GAAG,MAAM,oBAAoB,EAAE,CAAA;YAC9C,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAA;gBAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;aACzC;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAA;YAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;SACzC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,WAAW,CAAC,kBAAkB,CAC5B,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBACb,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;gBACjE,MAAM,GAAG,GAAG;oBACV,QAAQ;oBACR,SAAS;oBACT,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC;oBACjB,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,CAAC;oBACvB,QAAQ;oBACR,gBAAgB,EAAE,CAAC;oBACnB,kBAAkB,EAAE,CAAC;oBACrB,MAAM,EAAE,gBAAgB;iBACzB,CAAA;gBACD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;gBACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;gBACf,OAAO,CAAC,GAAG,CAAC,CAAA;YACd,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,MAAM,GAAG,GAAG;oBACV,MAAM,EAAE,kBAAkB;oBAC1B,GAAG;iBACJ,CAAA;gBACD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;gBACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;gBACf,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,EACD;gBACE,qDAAqD;gBACrD,OAAO,EAAE,sBAAsB;gBAC/B,4CAA4C;gBAC5C,UAAU,EAAE,CAAC;gBACb,kBAAkB,EAAE,cAAc;aACnC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA"}
|
|
@@ -77,7 +77,7 @@ function _request(options) {
|
|
|
77
77
|
controller === null || controller === void 0 ? void 0 : controller.abort();
|
|
78
78
|
reject(Error('request:fail timeout'));
|
|
79
79
|
clearTimeout === null || clearTimeout === void 0 ? void 0 : clearTimeout(timer);
|
|
80
|
-
}, (_a = options.timeout) !== null && _a !== void 0 ? _a :
|
|
80
|
+
}, (_a = options.timeout) !== null && _a !== void 0 ? _a : 60000);
|
|
81
81
|
});
|
|
82
82
|
const p = Promise.race([fetchPromise, timeoutPromise]).then(resData => {
|
|
83
83
|
res.data = resData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/request/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/request/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ import { initialWindowMetrics } from 'react-native-safe-area-context';
|
|
|
17
17
|
import { Popup } from '../Popup';
|
|
18
18
|
import V from '../variable';
|
|
19
19
|
const styles = StyleSheet.create({
|
|
20
|
-
|
|
20
|
+
actionsheet: {
|
|
21
21
|
backgroundColor: V.weuiBgColorDefault
|
|
22
22
|
},
|
|
23
23
|
androidActionsheetWrapper: {
|
|
@@ -25,11 +25,6 @@ const styles = StyleSheet.create({
|
|
|
25
25
|
alignItems: 'center',
|
|
26
26
|
justifyContent: 'center'
|
|
27
27
|
},
|
|
28
|
-
androidActionsheet: {
|
|
29
|
-
width: 274,
|
|
30
|
-
backgroundColor: V.weuiBgColorDefault,
|
|
31
|
-
borderRadius: V.weuiActionSheetAndroidBorderRadius
|
|
32
|
-
},
|
|
33
28
|
actionsheetMenu: {
|
|
34
29
|
backgroundColor: '#fff'
|
|
35
30
|
},
|
|
@@ -40,29 +35,22 @@ const styles = StyleSheet.create({
|
|
|
40
35
|
actionsheetCell: {
|
|
41
36
|
borderTopWidth: StyleSheet.hairlineWidth,
|
|
42
37
|
borderColor: V.weuiCellBorderColor,
|
|
43
|
-
borderStyle: 'solid'
|
|
44
|
-
},
|
|
45
|
-
iosActionsheetCell: {
|
|
38
|
+
borderStyle: 'solid',
|
|
46
39
|
paddingTop: 10,
|
|
47
|
-
paddingBottom: 10
|
|
48
|
-
},
|
|
49
|
-
androidActionsheetCell: {
|
|
50
|
-
paddingTop: 13,
|
|
51
|
-
paddingBottom: 13,
|
|
40
|
+
paddingBottom: 10,
|
|
52
41
|
paddingLeft: 24,
|
|
53
42
|
paddingRight: 24
|
|
54
43
|
},
|
|
55
44
|
firstActionsheetCell: {
|
|
56
45
|
borderTopWidth: 0
|
|
57
46
|
},
|
|
58
|
-
|
|
47
|
+
actionSheetCellText: {
|
|
59
48
|
textAlign: 'center',
|
|
60
49
|
fontSize: 18,
|
|
61
50
|
marginTop: ((18 * V.baseLineHeight) - 18) / 2,
|
|
62
51
|
marginBottom: ((18 * V.baseLineHeight) - 18) / 2
|
|
63
52
|
},
|
|
64
53
|
androidActionsheetCellText: {
|
|
65
|
-
textAlign: 'center',
|
|
66
54
|
fontSize: 16,
|
|
67
55
|
marginTop: ((16 * 1.4) - 16) / 2,
|
|
68
56
|
marginBottom: ((16 * 1.4) - 16) / 2
|
|
@@ -94,11 +82,11 @@ const Index = ({ visible, style, maskStyle, onShow, onClose, menus = [], actions
|
|
|
94
82
|
var { type: btnType, label, style: btnStyle, textStyle } = _a, others = __rest(_a, ["type", "label", "style", "textStyle"]);
|
|
95
83
|
return React.createElement(TouchableHighlight, Object.assign({ key: idx, underlayColor: underlayColor, style: [
|
|
96
84
|
styles.actionsheetCell,
|
|
97
|
-
styles[`${_type}ActionsheetCell`],
|
|
98
85
|
idx === 0 ? styles.firstActionsheetCell : {},
|
|
99
86
|
btnStyle
|
|
100
87
|
] }, others),
|
|
101
88
|
React.createElement(Text, { style: [
|
|
89
|
+
styles.actionSheetCellText,
|
|
102
90
|
styles[`${_type}ActionsheetCellText`],
|
|
103
91
|
styles[`${btnType}ActionsheetCellText`],
|
|
104
92
|
textStyle
|
|
@@ -108,17 +96,17 @@ const Index = ({ visible, style, maskStyle, onShow, onClose, menus = [], actions
|
|
|
108
96
|
var { type: btnType, label, style: btnStyle, textStyle } = _a, others = __rest(_a, ["type", "label", "style", "textStyle"]);
|
|
109
97
|
return React.createElement(TouchableHighlight, Object.assign({ key: idx, underlayColor: underlayColor, style: [
|
|
110
98
|
styles.actionsheetCell,
|
|
111
|
-
styles[`${_type}ActionsheetCell`],
|
|
112
99
|
idx === 0 ? styles.firstActionsheetCell : {},
|
|
113
100
|
btnStyle
|
|
114
101
|
] }, others),
|
|
115
102
|
React.createElement(Text, { style: [
|
|
103
|
+
styles.actionSheetCellText,
|
|
116
104
|
styles[`${_type}ActionsheetCellText`],
|
|
117
105
|
styles[`${btnType}ActionsheetCellText`],
|
|
118
106
|
textStyle
|
|
119
107
|
] }, label));
|
|
120
108
|
});
|
|
121
|
-
return React.createElement(Popup, { visible: visible, style: [styles.
|
|
109
|
+
return React.createElement(Popup, { visible: visible, style: [styles.actionsheet, style], maskStyle: maskStyle, onShow: onShow, onClose: onClose },
|
|
122
110
|
menus.length
|
|
123
111
|
? React.createElement(View, { style: [styles.actionsheetMenu] }, _renderMenuItems())
|
|
124
112
|
: false,
|
|
@@ -129,7 +117,7 @@ const Index = ({ visible, style, maskStyle, onShow, onClose, menus = [], actions
|
|
|
129
117
|
};
|
|
130
118
|
Index.propTypes = {
|
|
131
119
|
autoDectect: PropTypes.bool,
|
|
132
|
-
type: PropTypes.oneOf(['ios', 'android']),
|
|
120
|
+
type: PropTypes.oneOf(['ios', 'android', 'harmony']),
|
|
133
121
|
menus: PropTypes.any,
|
|
134
122
|
actions: PropTypes.any,
|
|
135
123
|
visible: PropTypes.bool,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActionSheet.js","sourceRoot":"","sources":["../../../src/lib/showActionSheet/ActionSheet.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EACL,IAAI,EACJ,IAAI,EACJ,kBAAkB,EAClB,UAAU,EACV,QAAQ,EACT,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,CAAC,MAAM,aAAa,CAAA;AAE3B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,
|
|
1
|
+
{"version":3,"file":"ActionSheet.js","sourceRoot":"","sources":["../../../src/lib/showActionSheet/ActionSheet.tsx"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,8 @@ const styles = create({
|
|
|
36
36
|
paddingRight: V.weuiDialogGapWidth
|
|
37
37
|
},
|
|
38
38
|
dialogTitle: {
|
|
39
|
-
fontWeight: '
|
|
40
|
-
|
|
41
|
-
iosDialogTitle: {
|
|
42
|
-
fontSize: 18,
|
|
39
|
+
fontWeight: '700',
|
|
40
|
+
fontSize: 17,
|
|
43
41
|
textAlign: 'center'
|
|
44
42
|
},
|
|
45
43
|
androidDialogTitle: {
|
|
@@ -48,37 +46,28 @@ const styles = create({
|
|
|
48
46
|
},
|
|
49
47
|
dialogBody: {
|
|
50
48
|
paddingLeft: V.weuiDialogGapWidth,
|
|
51
|
-
paddingRight: V.weuiDialogGapWidth
|
|
52
|
-
|
|
53
|
-
iosDialogBody: {
|
|
54
|
-
paddingBottom: (0.8 * 15) + 20
|
|
55
|
-
},
|
|
56
|
-
androidDialogBody: {
|
|
57
|
-
paddingTop: 0.25 * 17,
|
|
58
|
-
paddingBottom: (17 * 2) + 20
|
|
49
|
+
paddingRight: V.weuiDialogGapWidth,
|
|
50
|
+
marginBottom: 32
|
|
59
51
|
},
|
|
60
52
|
dialogBodyText: {
|
|
61
53
|
color: V.weuiTextColorGray,
|
|
62
|
-
|
|
54
|
+
fontSize: 17,
|
|
55
|
+
textAlign: 'center',
|
|
56
|
+
lineHeight: 17 * 1.4,
|
|
63
57
|
android: {
|
|
64
|
-
lineHeight: Math.round(
|
|
58
|
+
lineHeight: Math.round(17 * 1.4)
|
|
65
59
|
}
|
|
66
60
|
},
|
|
67
|
-
iosDialogBodyText: {
|
|
68
|
-
fontSize: 15,
|
|
69
|
-
textAlign: 'center'
|
|
70
|
-
},
|
|
71
61
|
androidDialogBodyText: {
|
|
72
|
-
fontSize: 17,
|
|
73
62
|
textAlign: 'left'
|
|
74
63
|
},
|
|
75
64
|
dialogFooter: {
|
|
76
|
-
flexDirection: 'row'
|
|
77
|
-
},
|
|
78
|
-
iosDialogFooter: {
|
|
65
|
+
flexDirection: 'row',
|
|
79
66
|
height: 48,
|
|
80
67
|
alignItems: 'center',
|
|
81
68
|
justifyContent: 'center',
|
|
69
|
+
},
|
|
70
|
+
dialogFooterBorder: {
|
|
82
71
|
borderTopWidth: StyleSheet.hairlineWidth,
|
|
83
72
|
borderColor: V.weuiDialogLineColor,
|
|
84
73
|
borderStyle: 'solid'
|
|
@@ -93,11 +82,9 @@ const styles = create({
|
|
|
93
82
|
},
|
|
94
83
|
dialogFooterOpr: {
|
|
95
84
|
alignItems: 'center',
|
|
96
|
-
justifyContent: 'center'
|
|
97
|
-
},
|
|
98
|
-
iosDialogFooterOpr: {
|
|
85
|
+
justifyContent: 'center',
|
|
99
86
|
height: 48,
|
|
100
|
-
flex: 1
|
|
87
|
+
flex: 1,
|
|
101
88
|
},
|
|
102
89
|
androidDialogFooterOpr: {
|
|
103
90
|
height: 42,
|
|
@@ -112,7 +99,7 @@ const styles = create({
|
|
|
112
99
|
borderColor: V.weuiDialogLineColor,
|
|
113
100
|
borderStyle: 'solid'
|
|
114
101
|
},
|
|
115
|
-
|
|
102
|
+
dialogFooterOprText: {
|
|
116
103
|
fontSize: 18
|
|
117
104
|
},
|
|
118
105
|
androidDialogFooterOprText: {
|
|
@@ -153,10 +140,9 @@ const Index = ({ visible = false, buttons = [], title, style, maskStyle, headerS
|
|
|
153
140
|
return React.createElement(TouchableHighlight, Object.assign({ key: idx, style: [
|
|
154
141
|
styles.dialogFooterOpr,
|
|
155
142
|
styles[`${_type}DialogFooterOpr`],
|
|
156
|
-
_type === '
|
|
157
|
-
_type === 'android' && idx === buttons.length - 1 ? styles.dialogFooterOprWithNegativeMarginRight : {}
|
|
143
|
+
_type === 'android' && idx === buttons.length - 1 ? styles.dialogFooterOprWithNegativeMarginRight : (idx > 0 ? styles.dialogFooterOprWithBorder : {}),
|
|
158
144
|
], underlayColor: underlayColor }, others),
|
|
159
|
-
React.createElement(Text, { style: [styles[`${_type}DialogFooterOprText`], { color: btnType }] }, label));
|
|
145
|
+
React.createElement(Text, { style: [styles.dialogFooterOprText, styles[`${_type}DialogFooterOprText`], { color: btnType }] }, label));
|
|
160
146
|
});
|
|
161
147
|
const childrenWithProps = React.Children.map(children, (child) => {
|
|
162
148
|
if (child.type.displayName === 'Text') {
|
|
@@ -171,12 +157,12 @@ const Index = ({ visible = false, buttons = [], title, style, maskStyle, headerS
|
|
|
171
157
|
React.createElement(View, { style: [styles.dialog, style] },
|
|
172
158
|
React.createElement(View, { style: [styles.dialogHeader, headerStyle] },
|
|
173
159
|
React.createElement(Text, { style: [styles.dialogTitle, styles[`${_type}DialogTitle`], titleStyle] }, title)),
|
|
174
|
-
React.createElement(View, { style: [styles.dialogBody,
|
|
175
|
-
React.createElement(View, { style: [styles.dialogFooter, styles[`${_type}DialogFooter`], footerStyle] }, _renderButtons())))));
|
|
160
|
+
React.createElement(View, { style: [styles.dialogBody, bodyStyle] }, childrenWithProps),
|
|
161
|
+
React.createElement(View, { style: [styles.dialogFooter, styles[`${_type}DialogFooter`], _type !== 'android' ? styles.dialogFooterBorder : {}, footerStyle] }, _renderButtons())))));
|
|
176
162
|
};
|
|
177
163
|
Index.propTypes = {
|
|
178
164
|
autoDectect: PropTypes.bool,
|
|
179
|
-
type: PropTypes.oneOf(['ios', 'android']),
|
|
165
|
+
type: PropTypes.oneOf(['ios', 'android', 'harmony']),
|
|
180
166
|
title: PropTypes.string,
|
|
181
167
|
buttons: PropTypes.arrayOf(PropTypes.object),
|
|
182
168
|
visible: PropTypes.bool,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dialog.js","sourceRoot":"","sources":["../../../src/lib/showModal/Dialog.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EACL,IAAI,EACJ,IAAI,EACJ,kBAAkB,EAClB,UAAU,EACV,UAAU,EACV,QAAQ,EACT,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,CAAC,MAAM,aAAa,CAAA;AAE3B,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC1C,MAAM,MAAM,GAAG,MAAM,CAAC;IACpB,aAAa,EAAE;QACb,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,MAAM,EAAE;QACN,KAAK,EAAE,KAAK,GAAG,EAAE;QACjB,eAAe,EAAE,CAAC,CAAC,yBAAyB;QAC5C,YAAY,EAAE,CAAC;QACf,QAAQ,EAAE,QAAQ;KACnB;IACD,YAAY,EAAE;QACZ,UAAU,EAAE,GAAG,GAAG,CAAC,CAAC,YAAY;QAChC,aAAa,EAAE,GAAG,GAAG,CAAC,CAAC,YAAY;QACnC,WAAW,EAAE,CAAC,CAAC,kBAAkB;QACjC,YAAY,EAAE,CAAC,CAAC,kBAAkB;KACnC;IACD,WAAW,EAAE;QACX,UAAU,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"Dialog.js","sourceRoot":"","sources":["../../../src/lib/showModal/Dialog.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EACL,IAAI,EACJ,IAAI,EACJ,kBAAkB,EAClB,UAAU,EACV,UAAU,EACV,QAAQ,EACT,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,CAAC,MAAM,aAAa,CAAA;AAE3B,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC1C,MAAM,MAAM,GAAG,MAAM,CAAC;IACpB,aAAa,EAAE;QACb,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,MAAM,EAAE;QACN,KAAK,EAAE,KAAK,GAAG,EAAE;QACjB,eAAe,EAAE,CAAC,CAAC,yBAAyB;QAC5C,YAAY,EAAE,CAAC;QACf,QAAQ,EAAE,QAAQ;KACnB;IACD,YAAY,EAAE;QACZ,UAAU,EAAE,GAAG,GAAG,CAAC,CAAC,YAAY;QAChC,aAAa,EAAE,GAAG,GAAG,CAAC,CAAC,YAAY;QACnC,WAAW,EAAE,CAAC,CAAC,kBAAkB;QACjC,YAAY,EAAE,CAAC,CAAC,kBAAkB;KACnC;IACD,WAAW,EAAE;QACX,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,QAAQ;KACpB;IAED,kBAAkB,EAAE;QAClB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;KAClB;IAED,UAAU,EAAE;QACV,WAAW,EAAE,CAAC,CAAC,kBAAkB;QACjC,YAAY,EAAE,CAAC,CAAC,kBAAkB;QAClC,YAAY,EAAE,EAAE;KACjB;IAED,cAAc,EAAE;QACd,KAAK,EAAE,CAAC,CAAC,iBAAiB;QAC1B,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,EAAE,GAAG,GAAG;QACpB,OAAO,EAAE;YACP,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,GAAG,CAAC;SACjC;KACF;IAED,qBAAqB,EAAE;QACrB,SAAS,EAAE,MAAM;KAClB;IACD,YAAY,EAAE;QACZ,aAAa,EAAE,KAAK;QACpB,MAAM,EAAE,EAAE;QACV,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,kBAAkB,EAAE;QAClB,cAAc,EAAE,UAAU,CAAC,aAAa;QACxC,WAAW,EAAE,CAAC,CAAC,mBAAmB;QAClC,WAAW,EAAE,OAAO;KACrB;IACD,mBAAmB,EAAE;QACnB,MAAM,EAAE,EAAE;QACV,UAAU,EAAE,UAAU;QACtB,cAAc,EAAE,UAAU;QAC1B,WAAW,EAAE,CAAC,CAAC,kBAAkB;QACjC,YAAY,EAAE,CAAC,CAAC,kBAAkB;QAClC,aAAa,EAAE,EAAE,GAAG,GAAG;KACxB;IACD,eAAe,EAAE;QACf,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,CAAC;KACR;IACD,sBAAsB,EAAE;QACtB,MAAM,EAAE,EAAE;QACV,WAAW,EAAE,EAAE,GAAG,GAAG;QACrB,YAAY,EAAE,EAAE,GAAG,GAAG;KACvB;IAED,sCAAsC,EAAE;QACtC,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC;KAC5B;IACD,yBAAyB,EAAE;QACzB,eAAe,EAAE,UAAU,CAAC,aAAa;QACzC,WAAW,EAAE,CAAC,CAAC,mBAAmB;QAClC,WAAW,EAAE,OAAO;KACrB;IACD,mBAAmB,EAAE;QACnB,QAAQ,EAAE,EAAE;KACb;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,EAAE;KACb;IAED,0BAA0B,EAAE;QAC1B,KAAK,EAAE,SAAS;KACjB;IACD,0BAA0B,EAAE;QAC1B,KAAK,EAAE,SAAS;KACjB;IACD,uBAAuB,EAAE;QACvB,KAAK,EAAE,CAAC,CAAC,aAAa;KACvB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC;QACN,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,eAAe,EAAE,aAAa;KAC/B;IACD,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;KAChB;IACD,MAAM,EAAE;QACN,OAAO,EAAE,MAAM;KAChB;CACF,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC,sBAAsB,CAAA;AAE9C,OAAO;AACP,MAAM,KAAK,GAAkB,CAC3B,EACE,OAAO,GAAG,KAAK,EACf,OAAO,GAAG,EAAE,EACZ,KAAK,EACL,KAAK,EACL,SAAS,EACT,WAAW,EACX,UAAU,EACV,SAAS,EACT,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,WAAW,GAAG,IAAI,EAClB,IAAI,GAAG,KAAK,EACb,EAAE,EAAE;IACL,IAAI,KAAK,GAAG,IAAI,CAAA;IAChB,IAAI,WAAW;QAAE,KAAK,GAAG,QAAQ,CAAC,EAAE,CAAA;IAEpC,MAAM,cAAc,GAAG,GAAG,EAAE,CAC1B,OAAO,CAAC,GAAG,CAAC,CAAC,EAAwC,EAAE,GAAG,EAAE,EAAE;YAAjD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,OAAkB,EAAb,MAAM,cAAjC,iBAAmC,CAAF;QAC5C,OAAA,oBAAC,kBAAkB,kBACjB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE;gBACL,MAAM,CAAC,eAAe;gBACtB,MAAM,CAAC,GAAG,KAAK,iBAAiB,CAAC;gBACjC,KAAK,KAAK,SAAS,IAAI,GAAG,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,sCAAsC,CAAC,CAAC,CAAC,CAClG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAChD;aACF,EACD,aAAa,EAAE,aAAa,IACxB,MAAM;YAEV,oBAAC,IAAI,IACH,KAAK,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,GAAG,KAAK,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,IAC9F,KAAK,CAAQ,CACI,CAAA;KAAA,CACtB,CAAA;IAEH,MAAM,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;QAC/D,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,KAAK,MAAM,EAAE;YACrC,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE;gBAC/B,KAAK,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,KAAK,gBAAgB,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;aACnG,CAAC,CAAA;SACH;QACD,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;IAEF,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QAE/D,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO;YAC9D,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;gBACjC,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC;oBAC7C,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,KAAK,aAAa,CAAC,EAAE,UAAU,CAAC,IAAG,KAAK,CAAQ,CACvF;gBACP,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IACxC,iBAAiB,CACb;gBACP,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,KAAK,cAAc,CAAC,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,IAClI,cAAc,EAAE,CACZ,CACF,CACF,CACF,CACR,CAAA;AACH,CAAC,CAAA;AAED,KAAK,CAAC,SAAS,GAAG;IAChB,WAAW,EAAE,SAAS,CAAC,IAAI;IAC3B,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC,MAAM;IACvB,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;IAC5C,OAAO,EAAE,SAAS,CAAC,IAAI;IACvB,MAAM,EAAE,SAAS,CAAC,IAAI;IACtB,OAAO,EAAE,SAAS,CAAC,IAAI;IACvB,KAAK,EAAE,aAAa,CAAC,KAAK;IAC1B,SAAS,EAAE,aAAa,CAAC,KAAK;IAC9B,WAAW,EAAE,aAAa,CAAC,KAAK;IAChC,UAAU,EAAE,aAAa,CAAC,KAAK;IAC/B,SAAS,EAAE,aAAa,CAAC,KAAK;IAC9B,aAAa,EAAE,aAAa,CAAC,KAAK;IAClC,WAAW,EAAE,aAAa,CAAC,KAAK;IAChC,QAAQ,EAAE,SAAS,CAAC,IAAI;CACzB,CAAA;AAED,eAAe,KAAK,CAAA"}
|
|
@@ -146,7 +146,7 @@ function showToast(options) {
|
|
|
146
146
|
return errorHandler(fail, complete)(res);
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
|
-
function showLoading(options) {
|
|
149
|
+
function showLoading(options = { title: "加载中" }) {
|
|
150
150
|
const isObject = shouldBeObject(options);
|
|
151
151
|
if (!isObject.res) {
|
|
152
152
|
const res = { errMsg: `showLoading${isObject.msg}` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toast.js","sourceRoot":"","sources":["../../../src/lib/showModal/toast.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"toast.js","sourceRoot":"","sources":["../../../src/lib/showModal/toast.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-rn",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.80",
|
|
4
4
|
"description": "Taro RN framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "types/index.d.ts",
|
|
@@ -47,15 +47,16 @@
|
|
|
47
47
|
"react-native-root-toast": "^3.5.1",
|
|
48
48
|
"react-native-safe-area-context": "~4.8.0",
|
|
49
49
|
"react-native-stylekit": "^1.0.0",
|
|
50
|
-
"@tarojs/runtime-rn": "4.0.0-beta.
|
|
50
|
+
"@tarojs/runtime-rn": "4.0.0-beta.80"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@babel/core": "^7.
|
|
54
|
-
"@babel/preset-env": "^7.
|
|
53
|
+
"@babel/core": "^7.23.0",
|
|
54
|
+
"@babel/preset-env": "^7.20.0",
|
|
55
55
|
"@react-native/babel-preset": "^0.73.18",
|
|
56
56
|
"@testing-library/jest-native": "^5.4.2",
|
|
57
57
|
"@testing-library/react-native": "^12.4.1",
|
|
58
58
|
"@types/jest": "^27.4.1",
|
|
59
|
+
"dpdm": "^3.14.0",
|
|
59
60
|
"expo": "~50.0.2",
|
|
60
61
|
"fbjs-scripts": "^3.0.1",
|
|
61
62
|
"jest": "^29.3.1",
|
package/src/lib/Popup.tsx
CHANGED
|
@@ -32,14 +32,14 @@ class Popup extends Component<any, any> {
|
|
|
32
32
|
|
|
33
33
|
height
|
|
34
34
|
popup
|
|
35
|
-
|
|
36
|
-
constructor
|
|
35
|
+
timer
|
|
36
|
+
constructor(props: Props) {
|
|
37
37
|
super(props)
|
|
38
38
|
this.state = { visible: props.visible ?? false, translateY: new Animated.Value(height) }
|
|
39
39
|
this.handleLayout = this.handleLayout.bind(this)
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
UNSAFE_componentWillReceiveProps (nextProp:Props):void {
|
|
42
|
+
UNSAFE_componentWillReceiveProps (nextProp: Props): void {
|
|
43
43
|
if (this.props.visible !== nextProp.visible) {
|
|
44
44
|
if (nextProp.visible) {
|
|
45
45
|
this.setState({ visible: true })
|
|
@@ -53,21 +53,26 @@ class Popup extends Component<any, any> {
|
|
|
53
53
|
}).start(() => this.setState({ visible: false }))
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
56
|
+
componentWillUnmount (): void {
|
|
57
|
+
this.timer && clearTimeout(this.timer);
|
|
58
|
+
}
|
|
59
|
+
handleLayout (): void {
|
|
60
|
+
this.timer = setTimeout(() => {
|
|
61
|
+
this.popup?.measure((_x, _y, _w, h) => {
|
|
62
|
+
this.height = h
|
|
63
|
+
this.setState({ translateY: new Animated.Value(h) }, () => {
|
|
64
|
+
Animated.timing(this.state.translateY, {
|
|
65
|
+
toValue: 0,
|
|
66
|
+
duration: 300,
|
|
67
|
+
easing: (Easing as any).easeInOut,
|
|
68
|
+
useNativeDriver: true
|
|
69
|
+
}).start()
|
|
70
|
+
})
|
|
71
|
+
})
|
|
72
|
+
},); // 处理鸿蒙系统handleLayout 回调 this.popup为空的情况
|
|
68
73
|
}
|
|
69
74
|
|
|
70
|
-
render ():JSX.Element {
|
|
75
|
+
render (): JSX.Element {
|
|
71
76
|
const {
|
|
72
77
|
style,
|
|
73
78
|
maskStyle,
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import Geolocation from '@react-native-community/geolocation'
|
|
2
|
-
import { requestForegroundPermissionsAsync } from 'expo-location'
|
|
3
2
|
import { errorHandler } from '../../utils'
|
|
4
3
|
|
|
5
4
|
export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<Taro.getLocation.SuccessCallbackResult> {
|
|
6
5
|
const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
|
|
7
|
-
|
|
6
|
+
const requestAuthorization = () => {
|
|
7
|
+
return new Promise((resolve, reject) => {
|
|
8
|
+
Geolocation.requestAuthorization(()=>resolve({granted: true}), (err)=>reject(err))
|
|
9
|
+
})
|
|
10
|
+
}
|
|
11
|
+
|
|
8
12
|
try {
|
|
9
13
|
// @ts-ignore
|
|
10
14
|
// todo: fix types
|
|
11
|
-
const {
|
|
15
|
+
const {granted} = await requestAuthorization()
|
|
12
16
|
if (!granted) {
|
|
13
17
|
const res = { errMsg: 'Permissions denied!' }
|
|
14
18
|
return errorHandler(fail, complete)(res)
|
package/src/lib/request/index.ts
CHANGED
|
@@ -83,7 +83,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
|
|
|
83
83
|
controller?.abort()
|
|
84
84
|
reject(Error('request:fail timeout'))
|
|
85
85
|
clearTimeout?.(timer)
|
|
86
|
-
}, options.timeout ??
|
|
86
|
+
}, options.timeout ?? 60000)
|
|
87
87
|
})
|
|
88
88
|
|
|
89
89
|
const p: any = Promise.race([fetchPromise, timeoutPromise]).then(resData => {
|
|
@@ -13,7 +13,7 @@ import { Popup } from '../Popup'
|
|
|
13
13
|
import V from '../variable'
|
|
14
14
|
|
|
15
15
|
const styles = StyleSheet.create({
|
|
16
|
-
|
|
16
|
+
actionsheet: {
|
|
17
17
|
backgroundColor: V.weuiBgColorDefault
|
|
18
18
|
},
|
|
19
19
|
androidActionsheetWrapper: {
|
|
@@ -21,11 +21,6 @@ const styles = StyleSheet.create({
|
|
|
21
21
|
alignItems: 'center',
|
|
22
22
|
justifyContent: 'center'
|
|
23
23
|
},
|
|
24
|
-
androidActionsheet: {
|
|
25
|
-
width: 274,
|
|
26
|
-
backgroundColor: V.weuiBgColorDefault,
|
|
27
|
-
borderRadius: V.weuiActionSheetAndroidBorderRadius
|
|
28
|
-
},
|
|
29
24
|
actionsheetMenu: {
|
|
30
25
|
backgroundColor: '#fff'
|
|
31
26
|
},
|
|
@@ -36,29 +31,23 @@ const styles = StyleSheet.create({
|
|
|
36
31
|
actionsheetCell: {
|
|
37
32
|
borderTopWidth: StyleSheet.hairlineWidth,
|
|
38
33
|
borderColor: V.weuiCellBorderColor,
|
|
39
|
-
borderStyle: 'solid'
|
|
40
|
-
},
|
|
41
|
-
iosActionsheetCell: {
|
|
34
|
+
borderStyle: 'solid',
|
|
42
35
|
paddingTop: 10,
|
|
43
|
-
paddingBottom: 10
|
|
44
|
-
},
|
|
45
|
-
androidActionsheetCell: {
|
|
46
|
-
paddingTop: 13,
|
|
47
|
-
paddingBottom: 13,
|
|
36
|
+
paddingBottom: 10,
|
|
48
37
|
paddingLeft: 24,
|
|
49
38
|
paddingRight: 24
|
|
50
39
|
},
|
|
40
|
+
|
|
51
41
|
firstActionsheetCell: {
|
|
52
42
|
borderTopWidth: 0
|
|
53
43
|
},
|
|
54
|
-
|
|
44
|
+
actionSheetCellText: {
|
|
55
45
|
textAlign: 'center',
|
|
56
46
|
fontSize: 18,
|
|
57
47
|
marginTop: ((18 * V.baseLineHeight) - 18) / 2,
|
|
58
48
|
marginBottom: ((18 * V.baseLineHeight) - 18) / 2
|
|
59
49
|
},
|
|
60
50
|
androidActionsheetCellText: {
|
|
61
|
-
textAlign: 'center',
|
|
62
51
|
fontSize: 16,
|
|
63
52
|
marginTop: ((16 * 1.4) - 16) / 2,
|
|
64
53
|
marginBottom: ((16 * 1.4) - 16) / 2
|
|
@@ -105,7 +94,6 @@ const Index: React.FC<any> = ({
|
|
|
105
94
|
underlayColor={underlayColor}
|
|
106
95
|
style={[
|
|
107
96
|
styles.actionsheetCell,
|
|
108
|
-
styles[`${_type}ActionsheetCell`],
|
|
109
97
|
idx === 0 ? styles.firstActionsheetCell : {},
|
|
110
98
|
btnStyle
|
|
111
99
|
]}
|
|
@@ -113,6 +101,8 @@ const Index: React.FC<any> = ({
|
|
|
113
101
|
>
|
|
114
102
|
<Text
|
|
115
103
|
style={[
|
|
104
|
+
|
|
105
|
+
styles.actionSheetCellText,
|
|
116
106
|
styles[`${_type}ActionsheetCellText`],
|
|
117
107
|
styles[`${btnType}ActionsheetCellText`],
|
|
118
108
|
textStyle
|
|
@@ -128,7 +118,6 @@ const Index: React.FC<any> = ({
|
|
|
128
118
|
underlayColor={underlayColor}
|
|
129
119
|
style={[
|
|
130
120
|
styles.actionsheetCell,
|
|
131
|
-
styles[`${_type}ActionsheetCell`],
|
|
132
121
|
idx === 0 ? styles.firstActionsheetCell : {},
|
|
133
122
|
btnStyle
|
|
134
123
|
]}
|
|
@@ -136,6 +125,7 @@ const Index: React.FC<any> = ({
|
|
|
136
125
|
>
|
|
137
126
|
<Text
|
|
138
127
|
style={[
|
|
128
|
+
styles.actionSheetCellText,
|
|
139
129
|
styles[`${_type}ActionsheetCellText`],
|
|
140
130
|
styles[`${btnType}ActionsheetCellText`],
|
|
141
131
|
textStyle
|
|
@@ -145,29 +135,29 @@ const Index: React.FC<any> = ({
|
|
|
145
135
|
)
|
|
146
136
|
|
|
147
137
|
return <Popup
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
138
|
+
visible={visible}
|
|
139
|
+
style={[styles.actionsheet, style]}
|
|
140
|
+
maskStyle={maskStyle}
|
|
141
|
+
onShow={onShow}
|
|
142
|
+
onClose={onClose}
|
|
143
|
+
>
|
|
144
|
+
{menus.length
|
|
145
|
+
? <View style={[styles.actionsheetMenu]}>
|
|
146
|
+
{_renderMenuItems()}
|
|
147
|
+
</View>
|
|
148
|
+
: false}
|
|
149
|
+
{actions.length
|
|
150
|
+
? <View style={[styles.actionsheetAction]}>
|
|
151
|
+
{_renderActions()}
|
|
152
|
+
</View>
|
|
153
|
+
: false}
|
|
154
|
+
<View style={{ paddingBottom: Math.max(initialWindowMetrics?.insets.bottom || 0, 16), backgroundColor: '#fff' }}></View>
|
|
155
|
+
</Popup>
|
|
166
156
|
}
|
|
167
157
|
|
|
168
158
|
Index.propTypes = {
|
|
169
159
|
autoDectect: PropTypes.bool,
|
|
170
|
-
type: PropTypes.oneOf(['ios', 'android']),
|
|
160
|
+
type: PropTypes.oneOf(['ios', 'android', 'harmony']),
|
|
171
161
|
menus: PropTypes.any,
|
|
172
162
|
actions: PropTypes.any,
|
|
173
163
|
visible: PropTypes.bool,
|
|
@@ -33,49 +33,42 @@ const styles = create({
|
|
|
33
33
|
paddingRight: V.weuiDialogGapWidth
|
|
34
34
|
},
|
|
35
35
|
dialogTitle: {
|
|
36
|
-
fontWeight: '
|
|
37
|
-
|
|
38
|
-
iosDialogTitle: {
|
|
39
|
-
fontSize: 18,
|
|
36
|
+
fontWeight: '700',
|
|
37
|
+
fontSize: 17,
|
|
40
38
|
textAlign: 'center'
|
|
41
39
|
},
|
|
40
|
+
|
|
42
41
|
androidDialogTitle: {
|
|
43
42
|
fontSize: 21,
|
|
44
43
|
textAlign: 'left'
|
|
45
44
|
},
|
|
45
|
+
|
|
46
46
|
dialogBody: {
|
|
47
47
|
paddingLeft: V.weuiDialogGapWidth,
|
|
48
|
-
paddingRight: V.weuiDialogGapWidth
|
|
49
|
-
|
|
50
|
-
iosDialogBody: {
|
|
51
|
-
paddingBottom: (0.8 * 15) + 20
|
|
52
|
-
},
|
|
53
|
-
androidDialogBody: {
|
|
54
|
-
paddingTop: 0.25 * 17,
|
|
55
|
-
paddingBottom: (17 * 2) + 20
|
|
48
|
+
paddingRight: V.weuiDialogGapWidth,
|
|
49
|
+
marginBottom: 32
|
|
56
50
|
},
|
|
51
|
+
|
|
57
52
|
dialogBodyText: {
|
|
58
53
|
color: V.weuiTextColorGray,
|
|
59
|
-
|
|
54
|
+
fontSize: 17,
|
|
55
|
+
textAlign: 'center',
|
|
56
|
+
lineHeight: 17 * 1.4,
|
|
60
57
|
android: {
|
|
61
|
-
lineHeight: Math.round(
|
|
58
|
+
lineHeight: Math.round(17 * 1.4)
|
|
62
59
|
}
|
|
63
60
|
},
|
|
64
|
-
|
|
65
|
-
fontSize: 15,
|
|
66
|
-
textAlign: 'center'
|
|
67
|
-
},
|
|
61
|
+
|
|
68
62
|
androidDialogBodyText: {
|
|
69
|
-
fontSize: 17,
|
|
70
63
|
textAlign: 'left'
|
|
71
64
|
},
|
|
72
65
|
dialogFooter: {
|
|
73
|
-
flexDirection: 'row'
|
|
74
|
-
},
|
|
75
|
-
iosDialogFooter: {
|
|
66
|
+
flexDirection: 'row',
|
|
76
67
|
height: 48,
|
|
77
68
|
alignItems: 'center',
|
|
78
69
|
justifyContent: 'center',
|
|
70
|
+
},
|
|
71
|
+
dialogFooterBorder: {
|
|
79
72
|
borderTopWidth: StyleSheet.hairlineWidth,
|
|
80
73
|
borderColor: V.weuiDialogLineColor,
|
|
81
74
|
borderStyle: 'solid'
|
|
@@ -90,17 +83,16 @@ const styles = create({
|
|
|
90
83
|
},
|
|
91
84
|
dialogFooterOpr: {
|
|
92
85
|
alignItems: 'center',
|
|
93
|
-
justifyContent: 'center'
|
|
94
|
-
},
|
|
95
|
-
iosDialogFooterOpr: {
|
|
86
|
+
justifyContent: 'center',
|
|
96
87
|
height: 48,
|
|
97
|
-
flex: 1
|
|
88
|
+
flex: 1,
|
|
98
89
|
},
|
|
99
90
|
androidDialogFooterOpr: {
|
|
100
91
|
height: 42,
|
|
101
92
|
paddingLeft: 16 * 0.8,
|
|
102
93
|
paddingRight: 16 * 0.8
|
|
103
94
|
},
|
|
95
|
+
|
|
104
96
|
dialogFooterOprWithNegativeMarginRight: {
|
|
105
97
|
marginRight: 0 - (16 * 0.8)
|
|
106
98
|
},
|
|
@@ -109,12 +101,13 @@ const styles = create({
|
|
|
109
101
|
borderColor: V.weuiDialogLineColor,
|
|
110
102
|
borderStyle: 'solid'
|
|
111
103
|
},
|
|
112
|
-
|
|
104
|
+
dialogFooterOprText: {
|
|
113
105
|
fontSize: 18
|
|
114
106
|
},
|
|
115
107
|
androidDialogFooterOprText: {
|
|
116
108
|
fontSize: 16
|
|
117
109
|
},
|
|
110
|
+
|
|
118
111
|
defaultDialogFooterOprText: {
|
|
119
112
|
color: '#353535'
|
|
120
113
|
},
|
|
@@ -170,14 +163,15 @@ const Index: React.FC<any> = (
|
|
|
170
163
|
style={[
|
|
171
164
|
styles.dialogFooterOpr,
|
|
172
165
|
styles[`${_type}DialogFooterOpr`],
|
|
173
|
-
_type === '
|
|
174
|
-
|
|
166
|
+
_type === 'android' && idx === buttons.length - 1 ? styles.dialogFooterOprWithNegativeMarginRight : (
|
|
167
|
+
idx > 0 ? styles.dialogFooterOprWithBorder : {}
|
|
168
|
+
),
|
|
175
169
|
]}
|
|
176
170
|
underlayColor={underlayColor}
|
|
177
171
|
{...others}
|
|
178
172
|
>
|
|
179
173
|
<Text
|
|
180
|
-
style={[styles[`${_type}DialogFooterOprText`], { color: btnType }]}
|
|
174
|
+
style={[styles.dialogFooterOprText, styles[`${_type}DialogFooterOprText`], { color: btnType }]}
|
|
181
175
|
>{label}</Text>
|
|
182
176
|
</TouchableHighlight>
|
|
183
177
|
)
|
|
@@ -200,10 +194,10 @@ const Index: React.FC<any> = (
|
|
|
200
194
|
<View style={[styles.dialogHeader, headerStyle]}>
|
|
201
195
|
<Text style={[styles.dialogTitle, styles[`${_type}DialogTitle`], titleStyle]}>{title}</Text>
|
|
202
196
|
</View>
|
|
203
|
-
<View style={[styles.dialogBody,
|
|
197
|
+
<View style={[styles.dialogBody, bodyStyle]}>
|
|
204
198
|
{childrenWithProps}
|
|
205
199
|
</View>
|
|
206
|
-
<View style={[styles.dialogFooter, styles[`${_type}DialogFooter`], footerStyle]}>
|
|
200
|
+
<View style={[styles.dialogFooter, styles[`${_type}DialogFooter`], _type !== 'android' ? styles.dialogFooterBorder : {}, footerStyle]}>
|
|
207
201
|
{_renderButtons()}
|
|
208
202
|
</View>
|
|
209
203
|
</View>
|
|
@@ -214,7 +208,7 @@ const Index: React.FC<any> = (
|
|
|
214
208
|
|
|
215
209
|
Index.propTypes = {
|
|
216
210
|
autoDectect: PropTypes.bool,
|
|
217
|
-
type: PropTypes.oneOf(['ios', 'android']),
|
|
211
|
+
type: PropTypes.oneOf(['ios', 'android', 'harmony']),
|
|
218
212
|
title: PropTypes.string,
|
|
219
213
|
buttons: PropTypes.arrayOf(PropTypes.object),
|
|
220
214
|
visible: PropTypes.bool,
|
|
@@ -118,7 +118,7 @@ function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.Callbac
|
|
|
118
118
|
return Promise.reject(res)
|
|
119
119
|
}
|
|
120
120
|
|
|
121
|
-
let {title = '', icon = 'success', image, duration = 1500, mask = false, success, fail, complete} = options || {} // eslint-disable-line
|
|
121
|
+
let { title = '', icon = 'success', image, duration = 1500, mask = false, success, fail, complete } = options || {} // eslint-disable-line
|
|
122
122
|
|
|
123
123
|
const isLoading = (icon === 'loading')
|
|
124
124
|
|
|
@@ -138,7 +138,7 @@ function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.Callbac
|
|
|
138
138
|
</View>
|
|
139
139
|
</View>
|
|
140
140
|
} else if (isLoading) {
|
|
141
|
-
ToastView = <WXLoading title={title} mask={mask}/>
|
|
141
|
+
ToastView = <WXLoading title={title} mask={mask} />
|
|
142
142
|
} else if (icon === 'none') {
|
|
143
143
|
ToastView = <View style={maskStyle}>
|
|
144
144
|
<View style={styles.textGrayBlock}>
|
|
@@ -177,7 +177,7 @@ function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.Callbac
|
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
179
|
|
|
180
|
-
function showLoading (options: Taro.showLoading.Option): Promise<TaroGeneral.CallbackResult> {
|
|
180
|
+
function showLoading (options: Taro.showLoading.Option = { title: "加载中" }): Promise<TaroGeneral.CallbackResult> {
|
|
181
181
|
const isObject = shouldBeObject(options)
|
|
182
182
|
if (!isObject.res) {
|
|
183
183
|
const res = { errMsg: `showLoading${isObject.msg}` }
|