@tarojs/taro-rn 4.0.0-beta.5 → 4.0.0-beta.51
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/chooseImage/index.js +1 -39
- package/dist/lib/chooseImage/index.js.map +1 -1
- package/dist/lib/chooseMedia/index.js +19 -0
- package/dist/lib/chooseMedia/index.js.map +1 -0
- package/dist/lib/chooseVideo/index.js +1 -40
- package/dist/lib/chooseVideo/index.js.map +1 -1
- package/dist/lib/getLocation/index.js +6 -2
- package/dist/lib/getLocation/index.js.map +1 -1
- package/dist/lib/index.js +1 -0
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/media.js +52 -20
- package/dist/lib/media.js.map +1 -1
- package/dist/lib/request/index.js +1 -1
- package/dist/lib/request/index.js.map +1 -1
- package/dist/lib/scanCode/index.js +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/libList.js +1 -0
- package/package.json +3 -2
- package/src/lib/Popup.tsx +21 -16
- package/src/lib/chooseImage/index.ts +1 -29
- package/src/lib/chooseMedia/index.ts +15 -0
- package/src/lib/chooseVideo/index.ts +1 -31
- package/src/lib/getLocation/index.ts +7 -3
- package/src/lib/index.ts +1 -0
- package/src/lib/media.ts +64 -19
- package/src/lib/request/index.ts +1 -1
- package/src/lib/scanCode/index.tsx +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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"}
|
|
@@ -1,43 +1,5 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { chooseMedia, MEDIA_TYPE } from '../media';
|
|
11
|
-
import { showActionSheet } from '../showActionSheet';
|
|
12
2
|
export function chooseImage(opts) {
|
|
13
|
-
|
|
14
|
-
if ((sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('camera')) && (sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('album'))) {
|
|
15
|
-
return showImagePicker(opts);
|
|
16
|
-
}
|
|
17
|
-
else if (sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('camera')) {
|
|
18
|
-
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['camera'] }), MEDIA_TYPE.IMAGES);
|
|
19
|
-
}
|
|
20
|
-
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), MEDIA_TYPE.IMAGES);
|
|
21
|
-
}
|
|
22
|
-
function showImagePicker(options) {
|
|
23
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const { fail, complete } = options;
|
|
25
|
-
try {
|
|
26
|
-
const res = yield showActionSheet({
|
|
27
|
-
itemList: ['拍照', '从手机相册选择'],
|
|
28
|
-
});
|
|
29
|
-
if (res.tapIndex === 0) {
|
|
30
|
-
return chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['camera'] }), MEDIA_TYPE.IMAGES);
|
|
31
|
-
}
|
|
32
|
-
if (res.tapIndex === 1) {
|
|
33
|
-
return chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['album'] }), MEDIA_TYPE.IMAGES);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
catch (err) {
|
|
37
|
-
const res = { errMsg: 'chooseImage: fail' };
|
|
38
|
-
fail === null || fail === void 0 ? void 0 : fail(res);
|
|
39
|
-
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
40
|
-
}
|
|
41
|
-
});
|
|
3
|
+
return chooseMedia(opts, MEDIA_TYPE.Images);
|
|
42
4
|
}
|
|
43
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/chooseImage/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/chooseImage/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAElD,MAAM,UAAU,WAAW,CAAC,IAA6B;IACvD,OAAO,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { chooseMedia as _chooseMedia, MEDIA_TYPE } from '../media';
|
|
2
|
+
export function chooseMedia(opts) {
|
|
3
|
+
var _a;
|
|
4
|
+
if (((_a = opts.mediaType) === null || _a === void 0 ? void 0 : _a.length) === 1) {
|
|
5
|
+
if (opts.mediaType[0] === 'video') {
|
|
6
|
+
return _chooseMedia(opts, MEDIA_TYPE.Videos);
|
|
7
|
+
}
|
|
8
|
+
else if (opts.mediaType[0] === 'image') {
|
|
9
|
+
return _chooseMedia(opts, MEDIA_TYPE.Images);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
return _chooseMedia(opts, MEDIA_TYPE.All);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
return _chooseMedia(opts, MEDIA_TYPE.All);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/chooseMedia/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAElE,MAAM,UAAU,WAAW,CAAE,IAA6B;;IACxD,IAAI,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,MAAM,MAAK,CAAC,EAAE;QAChC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;YACjC,OAAO,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;SAC7C;aAAM,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;YACxC,OAAO,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;SAC7C;aAAM;YACL,OAAO,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAA;SAC1C;KACF;SAAM;QACL,OAAO,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAA;KAC1C;AACH,CAAC"}
|
|
@@ -1,44 +1,5 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { chooseMedia, MEDIA_TYPE } from '../media';
|
|
11
|
-
import { showActionSheet } from '../showActionSheet';
|
|
12
2
|
export function chooseVideo(opts) {
|
|
13
|
-
|
|
14
|
-
opts = Object.assign(opts, { sizeType: compressed ? ['compressed'] : [] });
|
|
15
|
-
if ((sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('camera')) && (sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('album'))) {
|
|
16
|
-
return showVideoPicker(opts);
|
|
17
|
-
}
|
|
18
|
-
else if (sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('camera')) {
|
|
19
|
-
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['camera'] }), MEDIA_TYPE.VIDEOS);
|
|
20
|
-
}
|
|
21
|
-
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), MEDIA_TYPE.VIDEOS);
|
|
22
|
-
}
|
|
23
|
-
function showVideoPicker(options) {
|
|
24
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const { fail, complete } = options;
|
|
26
|
-
try {
|
|
27
|
-
const res = yield showActionSheet({
|
|
28
|
-
itemList: ['拍摄', '从手机相册选择'],
|
|
29
|
-
});
|
|
30
|
-
if (res.tapIndex === 0) {
|
|
31
|
-
return chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['camera'] }), MEDIA_TYPE.VIDEOS);
|
|
32
|
-
}
|
|
33
|
-
if (res.tapIndex === 1) {
|
|
34
|
-
return chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['album'] }), MEDIA_TYPE.VIDEOS);
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
catch (err) {
|
|
38
|
-
const res = { errMsg: 'chooseVideo: fail' };
|
|
39
|
-
fail === null || fail === void 0 ? void 0 : fail(res);
|
|
40
|
-
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
41
|
-
}
|
|
42
|
-
});
|
|
3
|
+
return chooseMedia(opts, MEDIA_TYPE.Videos);
|
|
43
4
|
}
|
|
44
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/chooseVideo/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/chooseVideo/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAElD,MAAM,UAAU,WAAW,CAAC,IAA6B;IACvD,OAAO,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -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"}
|
package/dist/lib/index.js
CHANGED
|
@@ -5,6 +5,7 @@ export * from './authorize';
|
|
|
5
5
|
export * from './base64ToArrayBuffer';
|
|
6
6
|
export * from './canIUse';
|
|
7
7
|
export * from './chooseImage';
|
|
8
|
+
export * from './chooseMedia';
|
|
8
9
|
export * from './chooseVideo';
|
|
9
10
|
export * from './clearStorage';
|
|
10
11
|
export * from './clearStorageSync';
|
package/dist/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,cAAc,YAAY,CAAA;AAC1B,cAAc,uBAAuB,CAAA;AACrC,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA;AACrC,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA;AAC7B,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,cAAc,YAAY,CAAA;AAC1B,cAAc,uBAAuB,CAAA;AACrC,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA;AACrC,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA;AAC7B,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA"}
|
package/dist/lib/media.js
CHANGED
|
@@ -9,16 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { CameraRoll } from "@react-native-camera-roll/camera-roll";
|
|
11
11
|
import { requestCameraPermissionsAsync } from 'expo-camera';
|
|
12
|
-
import
|
|
12
|
+
import { requestMediaLibraryPermissionsAsync, launchImageLibraryAsync, launchCameraAsync, MediaTypeOptions, } from 'expo-image-picker';
|
|
13
13
|
import { successHandler, errorHandler } from '../utils';
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
IMAGES: 'Images'
|
|
17
|
-
};
|
|
14
|
+
import { showActionSheet } from "./showActionSheet";
|
|
15
|
+
export const MEDIA_TYPE = MediaTypeOptions;
|
|
18
16
|
export function saveMedia(opts, type, API) {
|
|
19
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
18
|
const { filePath, success, fail, complete } = opts;
|
|
21
|
-
const { granted } = yield
|
|
19
|
+
const { granted } = yield requestMediaLibraryPermissionsAsync();
|
|
22
20
|
if (!granted) {
|
|
23
21
|
const res = { errMsg: 'Permissions denied!' };
|
|
24
22
|
return errorHandler(fail, complete)(res);
|
|
@@ -36,38 +34,72 @@ export function saveMedia(opts, type, API) {
|
|
|
36
34
|
}
|
|
37
35
|
});
|
|
38
36
|
}
|
|
39
|
-
|
|
40
|
-
|
|
37
|
+
function showPicker(opts, mediaTypes) {
|
|
38
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
const { fail, complete } = opts;
|
|
40
|
+
try {
|
|
41
|
+
const res = yield showActionSheet({
|
|
42
|
+
itemList: ['拍摄', '从手机相册选择'],
|
|
43
|
+
});
|
|
44
|
+
if (res.tapIndex === 0) {
|
|
45
|
+
return _chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['camera'] }), mediaTypes);
|
|
46
|
+
}
|
|
47
|
+
if (res.tapIndex === 1) {
|
|
48
|
+
return _chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), mediaTypes);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
const res = { errMsg: `choose${mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'} fail` };
|
|
53
|
+
fail === null || fail === void 0 ? void 0 : fail(res);
|
|
54
|
+
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
export function chooseMedia(opts = {}, mediaTypes) {
|
|
41
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
|
|
43
|
-
|
|
60
|
+
const { sourceType = ['album', 'camera'], } = opts;
|
|
61
|
+
if ((sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('camera')) && (sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('album'))) {
|
|
62
|
+
return showPicker(opts, mediaTypes);
|
|
63
|
+
}
|
|
64
|
+
else if (sourceType === null || sourceType === void 0 ? void 0 : sourceType.includes('camera')) {
|
|
65
|
+
return _chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['camera'] }), mediaTypes);
|
|
44
66
|
}
|
|
45
|
-
|
|
67
|
+
return _chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), mediaTypes);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
export function _chooseMedia(opts = {}, mediaTypes) {
|
|
71
|
+
var _a, _b, _c;
|
|
72
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
73
|
+
const { sizeType = [], sourceType = [], success, fail, complete, maxDuration, count = (mediaTypes === MEDIA_TYPE.Videos ? 1 : 9), compressed } = opts;
|
|
46
74
|
const options = {
|
|
47
75
|
mediaTypes,
|
|
48
|
-
quality: sizeType[0] === 'compressed' ? 0.7 : 1,
|
|
76
|
+
quality: (sizeType[0] === 'compressed' || compressed) ? 0.7 : 1,
|
|
49
77
|
videoMaxDuration: maxDuration,
|
|
50
|
-
allowsMultipleSelection:
|
|
51
|
-
selectionLimit:
|
|
78
|
+
allowsMultipleSelection: count > 1,
|
|
79
|
+
selectionLimit: count,
|
|
52
80
|
};
|
|
81
|
+
const messString = mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media';
|
|
53
82
|
const isCamera = sourceType[0] === 'camera';
|
|
54
|
-
const { granted } = isCamera ? yield requestCameraPermissionsAsync() : yield
|
|
83
|
+
const { granted } = isCamera ? yield requestCameraPermissionsAsync() : yield requestMediaLibraryPermissionsAsync();
|
|
55
84
|
if (!granted) {
|
|
56
85
|
const res = { errMsg: 'Permissions denied!' };
|
|
57
86
|
return errorHandler(fail, complete)(res);
|
|
58
87
|
}
|
|
59
|
-
let launchMediaAsync = isCamera ?
|
|
88
|
+
let launchMediaAsync = isCamera ? launchCameraAsync : launchImageLibraryAsync;
|
|
60
89
|
try {
|
|
61
90
|
const resp = yield launchMediaAsync(options);
|
|
62
91
|
let res = {};
|
|
63
|
-
if (mediaTypes === MEDIA_TYPE.
|
|
92
|
+
if (mediaTypes === MEDIA_TYPE.Videos) {
|
|
64
93
|
const asset = (_a = resp.assets) === null || _a === void 0 ? void 0 : _a[0];
|
|
65
94
|
res = Object.assign(Object.assign({}, asset), { tempFilePath: asset === null || asset === void 0 ? void 0 : asset.uri, size: asset === null || asset === void 0 ? void 0 : asset.fileSize });
|
|
66
95
|
}
|
|
67
96
|
else {
|
|
68
97
|
res = {
|
|
69
98
|
tempFilePaths: (_b = resp.assets) === null || _b === void 0 ? void 0 : _b.map((item) => item.uri),
|
|
70
|
-
tempFiles: (_c = resp.assets) === null || _c === void 0 ? void 0 : _c.map((item) =>
|
|
99
|
+
tempFiles: (_c = resp.assets) === null || _c === void 0 ? void 0 : _c.map((item) => {
|
|
100
|
+
var _a;
|
|
101
|
+
return (Object.assign(Object.assign({}, item), { path: item.uri, size: item.fileSize, type: item.mimeType, fileType: ((_a = item.mimeType) === null || _a === void 0 ? void 0 : _a.startsWith('video')) ? 'video' : 'image' }));
|
|
102
|
+
})
|
|
71
103
|
};
|
|
72
104
|
}
|
|
73
105
|
if (res.tempFilePath || (!!res.tempFilePaths && res.tempFilePaths.length > 0)) {
|
|
@@ -75,14 +107,14 @@ export function chooseMedia(opts, mediaTypes) {
|
|
|
75
107
|
}
|
|
76
108
|
else {
|
|
77
109
|
const res = {
|
|
78
|
-
errMsg:
|
|
110
|
+
errMsg: `choose${messString}:fail cancel`
|
|
79
111
|
};
|
|
80
112
|
return errorHandler(fail, complete)(res);
|
|
81
113
|
}
|
|
82
114
|
}
|
|
83
115
|
catch (err) {
|
|
84
116
|
const res = {
|
|
85
|
-
errMsg:
|
|
117
|
+
errMsg: `choose${messString}:fail`,
|
|
86
118
|
err
|
|
87
119
|
};
|
|
88
120
|
return errorHandler(fail, complete)(res);
|
package/dist/lib/media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAA;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -138,7 +138,7 @@ function scanFromPhoto(callback, errorCallBack) {
|
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
-
}, MEDIA_TYPE.
|
|
141
|
+
}, MEDIA_TYPE.Images).catch(errorCallBack);
|
|
142
142
|
}
|
|
143
143
|
export function scanCode(option = {}) {
|
|
144
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -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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"}
|