@tarojs/taro-rn 4.0.0-canary.2 → 4.0.0-canary.3
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/chooseImage/index.js +32 -33
- package/dist/lib/chooseImage/index.js.map +1 -1
- package/dist/lib/chooseVideo/index.js +32 -47
- package/dist/lib/chooseVideo/index.js.map +1 -1
- package/dist/lib/media.js +9 -12
- package/dist/lib/media.js.map +1 -1
- package/dist/lib/showActionSheet/index.js +3 -21
- package/dist/lib/showActionSheet/index.js.map +1 -1
- package/package.json +2 -2
- package/src/lib/chooseImage/index.ts +22 -34
- package/src/lib/chooseVideo/index.ts +23 -48
- package/src/lib/media.ts +17 -13
- package/src/lib/showActionSheet/index.tsx +3 -33
|
@@ -1,44 +1,43 @@
|
|
|
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
|
+
};
|
|
1
10
|
import { chooseMedia, MEDIA_TYPE } from '../media';
|
|
2
11
|
import { showActionSheet } from '../showActionSheet';
|
|
3
12
|
export function chooseImage(opts) {
|
|
4
|
-
const { sourceType } = opts;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
case '["album"]':
|
|
11
|
-
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), MEDIA_TYPE.IMAGES);
|
|
12
|
-
default:
|
|
13
|
-
return showImagePicker(opts);
|
|
13
|
+
const { sourceType = ['album', 'camera'], } = opts;
|
|
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);
|
|
14
19
|
}
|
|
20
|
+
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), MEDIA_TYPE.IMAGES);
|
|
15
21
|
}
|
|
16
22
|
function showImagePicker(options) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
if (res.tapIndex === 1) {
|
|
26
|
-
resolve(chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['album'] }), MEDIA_TYPE.IMAGES));
|
|
27
|
-
}
|
|
28
|
-
},
|
|
29
|
-
fail: function () {
|
|
30
|
-
const res = { errMsg: 'chooseImage:fail cancel' };
|
|
31
|
-
reject(res);
|
|
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);
|
|
32
31
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (/showActionSheet:fail cancel/.test(err.errMsg)) {
|
|
36
|
-
const res = { errMsg: 'chooseImage:fail cancel' };
|
|
37
|
-
fail === null || fail === void 0 ? void 0 : fail(res);
|
|
38
|
-
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
39
|
-
reject(res);
|
|
32
|
+
if (res.tapIndex === 1) {
|
|
33
|
+
return chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['album'] }), MEDIA_TYPE.IMAGES);
|
|
40
34
|
}
|
|
41
|
-
}
|
|
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
|
+
}
|
|
42
41
|
});
|
|
43
42
|
}
|
|
44
43
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
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;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,MAAM,UAAU,WAAW,CAAC,IAA6B;IACvD,MAAM,
|
|
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;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,MAAM,UAAU,WAAW,CAAC,IAA6B;IACvD,MAAM,EACJ,UAAU,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,GACjC,GAAG,IAAI,CAAA;IACR,IAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,QAAQ,CAAC,MAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAE;QAClE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAA;KAC7B;SAAM,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACzC,OAAO,WAAW,iCAAK,IAAI,KAAE,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;KACzE;IACD,OAAO,WAAW,iCAAK,IAAI,KAAE,UAAU,EAAE,CAAC,OAAO,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;AACzE,CAAC;AAED,SAAe,eAAe,CAAC,OAAgC;;QAC7D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAClC,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC;gBAChC,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC;aAC5B,CAAC,CAAA;YACF,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;gBACtB,OAAO,WAAW,iCAAK,OAAO,KAAE,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;aAC5E;YACD,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;gBACtB,OAAO,WAAW,iCAAK,OAAO,KAAE,UAAU,EAAE,CAAC,OAAO,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;aAC3E;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAA;YAC3C,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;YACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;SAChB;IACH,CAAC;CAAA"}
|
|
@@ -1,59 +1,44 @@
|
|
|
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
|
+
};
|
|
1
10
|
import { chooseMedia, MEDIA_TYPE } from '../media';
|
|
2
11
|
import { showActionSheet } from '../showActionSheet';
|
|
3
|
-
/**
|
|
4
|
-
* 拍摄视频或从手机相册中选视频。
|
|
5
|
-
* @param {Object} opts
|
|
6
|
-
* @param {Array} [opts.sourceType=['album', 'camera']] ✔
|
|
7
|
-
* @param {boolean} [opts.compressed=true] ✔
|
|
8
|
-
* @param {number} [opts.maxDuration=60] - 拍摄视频最长拍摄时间，单位秒 ✖
|
|
9
|
-
* @param {string} [opts.camera='back'] - 默认拉起的是前置或者后置摄像头。✖
|
|
10
|
-
* @returns {Promise<*>}
|
|
11
|
-
*/
|
|
12
12
|
export function chooseVideo(opts) {
|
|
13
|
-
const { sourceType, compressed } = opts;
|
|
13
|
+
const { sourceType = ['album', 'camera'], compressed } = opts;
|
|
14
14
|
opts = Object.assign(opts, { sizeType: compressed ? ['compressed'] : [] });
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
case '["album"]':
|
|
21
|
-
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), MEDIA_TYPE.VIDEOS);
|
|
22
|
-
default:
|
|
23
|
-
return showVideoPicker(opts);
|
|
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);
|
|
24
20
|
}
|
|
21
|
+
return chooseMedia(Object.assign(Object.assign({}, opts), { sourceType: ['album'] }), MEDIA_TYPE.VIDEOS);
|
|
25
22
|
}
|
|
26
|
-
/**
|
|
27
|
-
* 视频选择器
|
|
28
|
-
* @param options
|
|
29
|
-
* @returns {Promise}
|
|
30
|
-
*/
|
|
31
23
|
function showVideoPicker(options) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
if (res.tapIndex === 1) {
|
|
41
|
-
resolve(chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['album'] }), MEDIA_TYPE.VIDEOS));
|
|
42
|
-
}
|
|
43
|
-
},
|
|
44
|
-
fail: function () {
|
|
45
|
-
const res = { errMsg: 'chooseVideo:fail cancel' };
|
|
46
|
-
reject(res);
|
|
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);
|
|
47
32
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (/showActionSheet:fail cancel/.test(err.errMsg)) {
|
|
51
|
-
const res = { errMsg: 'chooseVideo:fail cancel' };
|
|
52
|
-
fail === null || fail === void 0 ? void 0 : fail(res);
|
|
53
|
-
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
54
|
-
reject(res);
|
|
33
|
+
if (res.tapIndex === 1) {
|
|
34
|
+
return chooseMedia(Object.assign(Object.assign({}, options), { sourceType: ['album'] }), MEDIA_TYPE.VIDEOS);
|
|
55
35
|
}
|
|
56
|
-
}
|
|
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
|
+
}
|
|
57
42
|
});
|
|
58
43
|
}
|
|
59
44
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
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;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD
|
|
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;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,MAAM,UAAU,WAAW,CAAC,IAA6B;IACvD,MAAM,EACJ,UAAU,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,EAChC,UAAU,EACX,GAAG,IAAI,CAAA;IACR,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1E,IAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,QAAQ,CAAC,MAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAE;QAClE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAA;KAC7B;SAAM,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACzC,OAAO,WAAW,iCAAK,IAAI,KAAE,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;KACzE;IACD,OAAO,WAAW,iCAAK,IAAI,KAAE,UAAU,EAAE,CAAC,OAAO,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;AACzE,CAAC;AAED,SAAe,eAAe,CAAC,OAAgC;;QAC7D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAClC,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC;gBAChC,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC;aAC5B,CAAC,CAAA;YACF,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;gBACtB,OAAO,WAAW,iCAAK,OAAO,KAAE,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;aAC5E;YACD,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;gBACtB,OAAO,WAAW,iCAAK,OAAO,KAAE,UAAU,EAAE,CAAC,OAAO,CAAC,KAAG,UAAU,CAAC,MAAM,CAAC,CAAA;aAC3E;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAA;YAC3C,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;YACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;SAChB;IACH,CAAC;CAAA"}
|
package/dist/lib/media.js
CHANGED
|
@@ -37,15 +37,18 @@ export function saveMedia(opts, type, API) {
|
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
export function chooseMedia(opts, mediaTypes) {
|
|
40
|
+
var _a, _b, _c;
|
|
40
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
42
|
if (!opts || typeof opts !== 'object') {
|
|
42
43
|
opts = {};
|
|
43
44
|
}
|
|
44
|
-
const { sizeType = [], sourceType = [], success, fail, complete, maxDuration } = opts;
|
|
45
|
+
const { sizeType = [], sourceType = [], success, fail, complete, maxDuration, count } = opts;
|
|
45
46
|
const options = {
|
|
46
47
|
mediaTypes,
|
|
47
48
|
quality: sizeType[0] === 'compressed' ? 0.7 : 1,
|
|
48
|
-
videoMaxDuration: maxDuration
|
|
49
|
+
videoMaxDuration: maxDuration,
|
|
50
|
+
allowsMultipleSelection: (mediaTypes === MEDIA_TYPE.IMAGES && count > 1) ? true : false,
|
|
51
|
+
selectionLimit: mediaTypes === MEDIA_TYPE.VIDEOS ? 1 : (count || 9),
|
|
49
52
|
};
|
|
50
53
|
const isCamera = sourceType[0] === 'camera';
|
|
51
54
|
const { granted } = isCamera ? yield requestCameraPermissionsAsync() : yield ImagePicker.requestMediaLibraryPermissionsAsync();
|
|
@@ -56,21 +59,15 @@ export function chooseMedia(opts, mediaTypes) {
|
|
|
56
59
|
let launchMediaAsync = isCamera ? ImagePicker.launchCameraAsync : ImagePicker.launchImageLibraryAsync;
|
|
57
60
|
try {
|
|
58
61
|
const resp = yield launchMediaAsync(options);
|
|
59
|
-
const { uri, duration, width, height } = resp;
|
|
60
|
-
resp.path = uri;
|
|
61
62
|
let res = {};
|
|
62
63
|
if (mediaTypes === MEDIA_TYPE.VIDEOS) {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
duration,
|
|
66
|
-
width,
|
|
67
|
-
height
|
|
68
|
-
};
|
|
64
|
+
const asset = (_a = resp.assets) === null || _a === void 0 ? void 0 : _a[0];
|
|
65
|
+
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 });
|
|
69
66
|
}
|
|
70
67
|
else {
|
|
71
68
|
res = {
|
|
72
|
-
tempFilePaths:
|
|
73
|
-
tempFiles:
|
|
69
|
+
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) => (Object.assign(Object.assign({}, item), { path: item.uri, size: item.fileSize, type: item.mimeType })))
|
|
74
71
|
};
|
|
75
72
|
}
|
|
76
73
|
if (res.tempFilePath || (!!res.tempFilePaths && res.tempFilePaths.length > 0)) {
|
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,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvD,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;CACjB,CAAA;AAED,MAAM,UAAgB,SAAS,CAAC,IAA6E,EAAE,IAAW,EAAE,GAAU;;QACpI,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAClD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CAAC,mCAAmC,EAAE,CAAA;QAC3E,IAAI,CAAC,OAAO,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,MAAM,GAAG,GAAQ,EAAE,MAAM,EAAE,GAAG,GAAG,KAAK,EAAE,CAAA;QACxC,MAAM,QAAQ,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAA;QACvE,IAAI;YACF,MAAM,GAAG,GAAW,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;YACvE,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC;YACf,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;SAC9C;QAAC,OAAO,GAAG,EAAE;YACZ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAA;YACxB,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;SACzC;IACH,CAAC;CAAA;AAED,MAAM,UAAgB,WAAW,CAAC,IAAuD,EAAE,
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,39 +23,21 @@ function showActionSheet(obj) {
|
|
|
23
23
|
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
24
24
|
reject(res);
|
|
25
25
|
}
|
|
26
|
-
sibling = new RootSiblings(React.createElement(ActionSheet, { autoDectect: autoDectect, type: type, visible:
|
|
26
|
+
sibling = new RootSiblings(React.createElement(ActionSheet, { autoDectect: autoDectect, type: type, visible: true, onClose: onFail, menus: itemList.map((item, index) => {
|
|
27
27
|
return {
|
|
28
28
|
type: 'default',
|
|
29
29
|
label: item,
|
|
30
30
|
textStyle: { color: itemColor },
|
|
31
|
-
onPress: onSuccess
|
|
31
|
+
onPress: () => onSuccess(index)
|
|
32
32
|
};
|
|
33
33
|
}), actions: [
|
|
34
34
|
{
|
|
35
35
|
type: 'default',
|
|
36
36
|
label: '取消',
|
|
37
37
|
textStyle: { color: itemColor },
|
|
38
|
-
onPress: onFail
|
|
38
|
+
onPress: onFail
|
|
39
39
|
}
|
|
40
40
|
] }));
|
|
41
|
-
// hack 的做法。不推荐
|
|
42
|
-
setTimeout(() => {
|
|
43
|
-
sibling.update(React.createElement(ActionSheet, { autoDectect: autoDectect, type: type, visible: true, onClose: onFail, menus: itemList.map((item, index) => {
|
|
44
|
-
return {
|
|
45
|
-
type: 'default',
|
|
46
|
-
label: item,
|
|
47
|
-
textStyle: { color: itemColor },
|
|
48
|
-
onPress: onSuccess.bind(this, index)
|
|
49
|
-
};
|
|
50
|
-
}), actions: [
|
|
51
|
-
{
|
|
52
|
-
type: 'default',
|
|
53
|
-
label: '取消',
|
|
54
|
-
textStyle: { color: itemColor },
|
|
55
|
-
onPress: onFail.bind(this)
|
|
56
|
-
}
|
|
57
|
-
] }));
|
|
58
|
-
}, 100);
|
|
59
41
|
});
|
|
60
42
|
}
|
|
61
43
|
export { showActionSheet };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/showActionSheet/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,YAAY,MAAM,4BAA4B,CAAA;AACrD,OAAO,WAAW,MAAM,eAAe,CAAA;AAEvC,SAAS,eAAe,CAAE,GAAgC;IACxD,MAAM,EACJ,QAAQ,GAAG,EAAE,EACb,SAAS,GAAG,SAAS,EACrB,OAAO,EACP,IAAI,EACJ,QAAQ,EACT,GAAG,GAAG,IAAI,EAAE,CAAA;IAEb,MAAM,WAAW,GAAG,IAAI,CAAA;IACxB,MAAM,IAAI,GAAG,KAAK,CAAA;IAElB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,OAAY,CAAA;QAChB,SAAS,SAAS,CAAE,QAAQ;YAC1B,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;YAC5B,OAAO,GAAG,SAAS,CAAA;YACnB,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAA;YACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;YACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;YACf,OAAO,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED,SAAS,MAAM;YACb,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAA;YACrD,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;YAC5B,OAAO,GAAG,SAAS,CAAA;YACnB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;YACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;YACf,MAAM,CAAC,GAAG,CAAC,CAAA;QACb,CAAC;QAED,OAAO,GAAG,IAAI,YAAY,CACxB,oBAAC,WAAW,IACV,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/showActionSheet/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,YAAY,MAAM,4BAA4B,CAAA;AACrD,OAAO,WAAW,MAAM,eAAe,CAAA;AAEvC,SAAS,eAAe,CAAE,GAAgC;IACxD,MAAM,EACJ,QAAQ,GAAG,EAAE,EACb,SAAS,GAAG,SAAS,EACrB,OAAO,EACP,IAAI,EACJ,QAAQ,EACT,GAAG,GAAG,IAAI,EAAE,CAAA;IAEb,MAAM,WAAW,GAAG,IAAI,CAAA;IACxB,MAAM,IAAI,GAAG,KAAK,CAAA;IAElB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,OAAY,CAAA;QAChB,SAAS,SAAS,CAAE,QAAQ;YAC1B,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;YAC5B,OAAO,GAAG,SAAS,CAAA;YACnB,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAA;YACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;YACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;YACf,OAAO,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED,SAAS,MAAM;YACb,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAA;YACrD,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;YAC5B,OAAO,GAAG,SAAS,CAAA;YACnB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;YACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;YACf,MAAM,CAAC,GAAG,CAAC,CAAA;QACb,CAAC;QAED,OAAO,GAAG,IAAI,YAAY,CACxB,oBAAC,WAAW,IACV,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EACH,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAC3B,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,IAAI;oBACX,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;oBAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC;iBAChC,CAAA;YACH,CAAC,CAAQ,EAEX,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,IAAI;oBACX,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;oBAC/B,OAAO,EAAE,MAAM;iBAChB;aACK,GACR,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-rn",
|
|
3
|
-
"version": "4.0.0-canary.
|
|
3
|
+
"version": "4.0.0-canary.3",
|
|
4
4
|
"description": "Taro RN framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "types/index.d.ts",
|
|
@@ -47,7 +47,7 @@
|
|
|
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-canary.
|
|
50
|
+
"@tarojs/runtime-rn": "4.0.0-canary.3"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@babel/core": "^7.14.5",
|
|
@@ -2,44 +2,32 @@ import { chooseMedia, MEDIA_TYPE } from '../media'
|
|
|
2
2
|
import { showActionSheet } from '../showActionSheet'
|
|
3
3
|
|
|
4
4
|
export function chooseImage(opts: Taro.chooseImage.Option): Promise<any> {
|
|
5
|
-
const {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.IMAGES)
|
|
13
|
-
default:
|
|
14
|
-
return showImagePicker(opts)
|
|
5
|
+
const {
|
|
6
|
+
sourceType = ['album', 'camera'],
|
|
7
|
+
} = opts
|
|
8
|
+
if(sourceType?.includes('camera') && sourceType?.includes('album')) {
|
|
9
|
+
return showImagePicker(opts)
|
|
10
|
+
} else if (sourceType?.includes('camera')) {
|
|
11
|
+
return chooseMedia({...opts, sourceType: ['camera']}, MEDIA_TYPE.IMAGES)
|
|
15
12
|
}
|
|
13
|
+
return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.IMAGES)
|
|
16
14
|
}
|
|
17
15
|
|
|
18
|
-
function showImagePicker(options: Taro.chooseImage.Option):any {
|
|
16
|
+
async function showImagePicker(options: Taro.chooseImage.Option):Promise<any> {
|
|
19
17
|
const { fail, complete } = options
|
|
20
|
-
|
|
21
|
-
showActionSheet({
|
|
18
|
+
try {
|
|
19
|
+
const res = await showActionSheet({
|
|
22
20
|
itemList: ['拍照', '从手机相册选择'],
|
|
23
|
-
success: function (res) {
|
|
24
|
-
if (res.tapIndex === 0) {
|
|
25
|
-
resolve(chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.IMAGES))
|
|
26
|
-
}
|
|
27
|
-
if (res.tapIndex === 1) {
|
|
28
|
-
resolve(chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.IMAGES))
|
|
29
|
-
}
|
|
30
|
-
},
|
|
31
|
-
fail: function () {
|
|
32
|
-
const res = { errMsg: 'chooseImage:fail cancel' }
|
|
33
|
-
reject(res)
|
|
34
|
-
}
|
|
35
|
-
}).catch(err => {
|
|
36
|
-
console.log('error: ', err.errMsg)
|
|
37
|
-
if (/showActionSheet:fail cancel/.test(err.errMsg)) {
|
|
38
|
-
const res = { errMsg: 'chooseImage:fail cancel' }
|
|
39
|
-
fail?.(res)
|
|
40
|
-
complete?.(res)
|
|
41
|
-
reject(res)
|
|
42
|
-
}
|
|
43
21
|
})
|
|
44
|
-
|
|
22
|
+
if (res.tapIndex === 0) {
|
|
23
|
+
return chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.IMAGES)
|
|
24
|
+
}
|
|
25
|
+
if (res.tapIndex === 1) {
|
|
26
|
+
return chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.IMAGES)
|
|
27
|
+
}
|
|
28
|
+
} catch (err) {
|
|
29
|
+
const res = { errMsg: 'chooseImage: fail' }
|
|
30
|
+
fail?.(res)
|
|
31
|
+
complete?.(res)
|
|
32
|
+
}
|
|
45
33
|
}
|
|
@@ -1,60 +1,35 @@
|
|
|
1
1
|
import { chooseMedia, MEDIA_TYPE } from '../media'
|
|
2
2
|
import { showActionSheet } from '../showActionSheet'
|
|
3
3
|
|
|
4
|
-
/**
|
|
5
|
-
* 拍摄视频或从手机相册中选视频。
|
|
6
|
-
* @param {Object} opts
|
|
7
|
-
* @param {Array} [opts.sourceType=['album', 'camera']] ✔
|
|
8
|
-
* @param {boolean} [opts.compressed=true] ✔
|
|
9
|
-
* @param {number} [opts.maxDuration=60] - 拍摄视频最长拍摄时间，单位秒 ✖
|
|
10
|
-
* @param {string} [opts.camera='back'] - 默认拉起的是前置或者后置摄像头。✖
|
|
11
|
-
* @returns {Promise<*>}
|
|
12
|
-
*/
|
|
13
4
|
export function chooseVideo(opts: Taro.chooseVideo.Option): Promise<any> {
|
|
14
|
-
const {
|
|
5
|
+
const {
|
|
6
|
+
sourceType = ['album', 'camera'],
|
|
7
|
+
compressed
|
|
8
|
+
} = opts
|
|
15
9
|
opts = Object.assign(opts, { sizeType: compressed ? ['compressed'] : [] })
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
case '[\'album\']':
|
|
21
|
-
case '["album"]':
|
|
22
|
-
return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.VIDEOS)
|
|
23
|
-
default:
|
|
24
|
-
return showVideoPicker(opts)
|
|
10
|
+
if(sourceType?.includes('camera') && sourceType?.includes('album')) {
|
|
11
|
+
return showVideoPicker(opts)
|
|
12
|
+
} else if (sourceType?.includes('camera')) {
|
|
13
|
+
return chooseMedia({...opts, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS)
|
|
25
14
|
}
|
|
15
|
+
return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.VIDEOS)
|
|
26
16
|
}
|
|
27
17
|
|
|
28
|
-
|
|
29
|
-
* 视频选择器
|
|
30
|
-
* @param options
|
|
31
|
-
* @returns {Promise}
|
|
32
|
-
*/
|
|
33
|
-
function showVideoPicker(options: Taro.chooseVideo.Option):any {
|
|
18
|
+
async function showVideoPicker(options: Taro.chooseVideo.Option):Promise<any> {
|
|
34
19
|
const { fail, complete } = options
|
|
35
|
-
|
|
36
|
-
showActionSheet({
|
|
20
|
+
try {
|
|
21
|
+
const res = await showActionSheet({
|
|
37
22
|
itemList: ['拍摄', '从手机相册选择'],
|
|
38
|
-
success: function (res) {
|
|
39
|
-
if (res.tapIndex === 0) {
|
|
40
|
-
resolve(chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS))
|
|
41
|
-
}
|
|
42
|
-
if (res.tapIndex === 1) {
|
|
43
|
-
resolve(chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.VIDEOS))
|
|
44
|
-
}
|
|
45
|
-
},
|
|
46
|
-
fail: function () {
|
|
47
|
-
const res = { errMsg: 'chooseVideo:fail cancel' }
|
|
48
|
-
reject(res)
|
|
49
|
-
}
|
|
50
|
-
}).catch(err => {
|
|
51
|
-
console.log('error: ', err.errMsg)
|
|
52
|
-
if (/showActionSheet:fail cancel/.test(err.errMsg)) {
|
|
53
|
-
const res = { errMsg: 'chooseVideo:fail cancel' }
|
|
54
|
-
fail?.(res)
|
|
55
|
-
complete?.(res)
|
|
56
|
-
reject(res)
|
|
57
|
-
}
|
|
58
23
|
})
|
|
59
|
-
|
|
24
|
+
if (res.tapIndex === 0) {
|
|
25
|
+
return chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS)
|
|
26
|
+
}
|
|
27
|
+
if (res.tapIndex === 1) {
|
|
28
|
+
return chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.VIDEOS)
|
|
29
|
+
}
|
|
30
|
+
} catch (err) {
|
|
31
|
+
const res = { errMsg: 'chooseVideo: fail' }
|
|
32
|
+
fail?.(res)
|
|
33
|
+
complete?.(res)
|
|
34
|
+
}
|
|
60
35
|
}
|
package/src/lib/media.ts
CHANGED
|
@@ -28,15 +28,17 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option, mediaTypes:
|
|
31
|
+
export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option, mediaTypes: any): Promise<TaroGeneral.CallbackResult> {
|
|
32
32
|
if (!opts || typeof opts !== 'object') {
|
|
33
33
|
opts = {}
|
|
34
34
|
}
|
|
35
|
-
const { sizeType = [], sourceType = [], success, fail, complete, maxDuration } = opts as any
|
|
35
|
+
const { sizeType = [], sourceType = [], success, fail, complete, maxDuration, count } = opts as any
|
|
36
36
|
const options = {
|
|
37
37
|
mediaTypes,
|
|
38
38
|
quality: sizeType[0] === 'compressed' ? 0.7 : 1,
|
|
39
|
-
videoMaxDuration: maxDuration
|
|
39
|
+
videoMaxDuration: maxDuration,
|
|
40
|
+
allowsMultipleSelection: (mediaTypes === MEDIA_TYPE.IMAGES && count > 1) ? true : false,
|
|
41
|
+
selectionLimit: mediaTypes === MEDIA_TYPE.VIDEOS ? 1 : (count || 9),
|
|
40
42
|
}
|
|
41
43
|
const isCamera = sourceType[0] === 'camera'
|
|
42
44
|
const { granted } = isCamera ? await requestCameraPermissionsAsync() : await ImagePicker.requestMediaLibraryPermissionsAsync()
|
|
@@ -47,22 +49,24 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
|
|
|
47
49
|
|
|
48
50
|
let launchMediaAsync = isCamera ? ImagePicker.launchCameraAsync : ImagePicker.launchImageLibraryAsync
|
|
49
51
|
try {
|
|
50
|
-
const resp
|
|
51
|
-
const { uri, duration, width, height } = resp
|
|
52
|
-
resp.path = uri
|
|
53
|
-
|
|
52
|
+
const resp = await launchMediaAsync(options)
|
|
54
53
|
let res: any = {}
|
|
55
54
|
if (mediaTypes === MEDIA_TYPE.VIDEOS) {
|
|
55
|
+
const asset = resp.assets?.[0]
|
|
56
56
|
res = {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
height
|
|
57
|
+
...asset,
|
|
58
|
+
tempFilePath: asset?.uri,
|
|
59
|
+
size: asset?.fileSize,
|
|
61
60
|
}
|
|
62
61
|
} else {
|
|
63
62
|
res = {
|
|
64
|
-
tempFilePaths:
|
|
65
|
-
tempFiles:
|
|
63
|
+
tempFilePaths: resp.assets?.map((item) => item.uri),
|
|
64
|
+
tempFiles: resp.assets?.map((item) => ({
|
|
65
|
+
...item,
|
|
66
|
+
path: item.uri,
|
|
67
|
+
size: item.fileSize,
|
|
68
|
+
type: item.mimeType,
|
|
69
|
+
}))
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
if (res.tempFilePath || (!!res.tempFilePaths && res.tempFilePaths.length > 0)) {
|
|
@@ -38,7 +38,7 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
|
|
|
38
38
|
<ActionSheet
|
|
39
39
|
autoDectect={autoDectect}
|
|
40
40
|
type={type}
|
|
41
|
-
visible={
|
|
41
|
+
visible={true}
|
|
42
42
|
onClose={onFail}
|
|
43
43
|
menus={
|
|
44
44
|
itemList.map((item, index) => {
|
|
@@ -46,7 +46,7 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
|
|
|
46
46
|
type: 'default',
|
|
47
47
|
label: item,
|
|
48
48
|
textStyle: { color: itemColor },
|
|
49
|
-
onPress: onSuccess
|
|
49
|
+
onPress: () => onSuccess(index)
|
|
50
50
|
}
|
|
51
51
|
}) as any
|
|
52
52
|
}
|
|
@@ -55,41 +55,11 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
|
|
|
55
55
|
type: 'default',
|
|
56
56
|
label: '取消',
|
|
57
57
|
textStyle: { color: itemColor },
|
|
58
|
-
onPress: onFail
|
|
58
|
+
onPress: onFail
|
|
59
59
|
}
|
|
60
60
|
] as any}
|
|
61
61
|
/>
|
|
62
62
|
)
|
|
63
|
-
|
|
64
|
-
// hack 的做法。不推荐
|
|
65
|
-
setTimeout(() => {
|
|
66
|
-
sibling.update(
|
|
67
|
-
<ActionSheet
|
|
68
|
-
autoDectect={autoDectect}
|
|
69
|
-
type={type}
|
|
70
|
-
visible
|
|
71
|
-
onClose={onFail}
|
|
72
|
-
menus={
|
|
73
|
-
itemList.map((item, index) => {
|
|
74
|
-
return {
|
|
75
|
-
type: 'default',
|
|
76
|
-
label: item,
|
|
77
|
-
textStyle: { color: itemColor },
|
|
78
|
-
onPress: onSuccess.bind(this, index)
|
|
79
|
-
}
|
|
80
|
-
}) as any
|
|
81
|
-
}
|
|
82
|
-
actions={[
|
|
83
|
-
{
|
|
84
|
-
type: 'default',
|
|
85
|
-
label: '取消',
|
|
86
|
-
textStyle: { color: itemColor },
|
|
87
|
-
onPress: onFail.bind(this)
|
|
88
|
-
}
|
|
89
|
-
] as any}
|
|
90
|
-
/>
|
|
91
|
-
)
|
|
92
|
-
}, 100)
|
|
93
63
|
})
|
|
94
64
|
}
|
|
95
65
|
|