@tarojs/taro-rn 3.4.6 → 3.4.9
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/previewImage/index.js +2 -8
- package/dist/lib/previewImage/index.js.map +1 -1
- package/dist/lib/setClipboardData/index.js +1 -0
- package/dist/lib/setClipboardData/index.js.map +1 -1
- package/dist/lib/showModal/error.png +0 -0
- package/dist/lib/showModal/toast.js +2 -1
- package/dist/lib/showModal/toast.js.map +1 -1
- package/package.json +4 -4
- package/src/lib/previewImage/index.tsx +3 -9
- package/src/lib/setClipboardData/index.ts +1 -0
- package/src/lib/showModal/error.png +0 -0
- package/src/lib/showModal/toast.tsx +2 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { View, ActivityIndicator, StyleSheet, Alert,
|
|
2
|
+
import { View, ActivityIndicator, StyleSheet, Alert, Modal } from 'react-native';
|
|
3
3
|
import RootSiblings from 'react-native-root-siblings';
|
|
4
4
|
import ImageViewer from 'react-native-image-zoom-viewer';
|
|
5
5
|
import { saveMedia } from '../media';
|
|
@@ -22,12 +22,7 @@ export function previewImage(obj) {
|
|
|
22
22
|
throw new Error('"current" or "urls" is invalid');
|
|
23
23
|
}
|
|
24
24
|
let sibling;
|
|
25
|
-
function backhandler() {
|
|
26
|
-
onSwipeDown();
|
|
27
|
-
return true;
|
|
28
|
-
}
|
|
29
25
|
function onSwipeDown() {
|
|
30
|
-
BackHandler.removeEventListener('hardwareBackPress', backhandler);
|
|
31
26
|
sibling === null || sibling === void 0 ? void 0 : sibling.destroy();
|
|
32
27
|
sibling = undefined;
|
|
33
28
|
}
|
|
@@ -69,7 +64,7 @@ export function previewImage(obj) {
|
|
|
69
64
|
});
|
|
70
65
|
}
|
|
71
66
|
try {
|
|
72
|
-
sibling = new RootSiblings(React.createElement(
|
|
67
|
+
sibling = new RootSiblings(React.createElement(Modal, { style: styles.mask, onRequestClose: onSwipeDown },
|
|
73
68
|
React.createElement(ImageViewer, { imageUrls: urls.map((item) => {
|
|
74
69
|
return {
|
|
75
70
|
url: item,
|
|
@@ -82,7 +77,6 @@ export function previewImage(obj) {
|
|
|
82
77
|
return (React.createElement(View, { style: { flex: 1, justifyContent: 'center', alignItems: 'center' } },
|
|
83
78
|
React.createElement(ActivityIndicator, { size: "large", color: '#999' })));
|
|
84
79
|
} })));
|
|
85
|
-
BackHandler.addEventListener('hardwareBackPress', backhandler);
|
|
86
80
|
}
|
|
87
81
|
catch (e) {
|
|
88
82
|
onFail(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/previewImage/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/previewImage/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/setClipboardData/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mCAAmC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1D,MAAM,UAAU,gBAAgB,CAAC,IAAkC;IACjE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAE9C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,GAAG,GAAG;YACV,MAAM,EAAE,wEAAwE;SACjF,CAAA;QACD,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;IAED,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACzB,MAAM,GAAG,GAAG;QACV,MAAM,EAAE,qBAAqB;QAC7B,IAAI;KACL,CAAA;IACD,SAAS,CAAC;QACR,KAAK,EAAE,OAAO;KACf,CAAC,CAAA;IACF,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;AAC/C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/setClipboardData/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mCAAmC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1D,MAAM,UAAU,gBAAgB,CAAC,IAAkC;IACjE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAE9C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,GAAG,GAAG;YACV,MAAM,EAAE,wEAAwE;SACjF,CAAA;QACD,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;IAED,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACzB,MAAM,GAAG,GAAG;QACV,MAAM,EAAE,qBAAqB;QAC7B,IAAI;KACL,CAAA;IACD,SAAS,CAAC;QACR,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,OAAO;KACf,CAAC,CAAA;IACF,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;AAC/C,CAAC"}
|
|
Binary file
|
|
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
|
|
|
3
3
|
import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native';
|
|
4
4
|
import RootSiblings from 'react-native-root-siblings';
|
|
5
5
|
import successPng from './success.png';
|
|
6
|
+
import errorPng from './error.png';
|
|
6
7
|
import { errorHandler, shouldBeObject, successHandler } from '../../utils';
|
|
7
8
|
const globalAny = global;
|
|
8
9
|
const styles = StyleSheet.create({
|
|
@@ -122,7 +123,7 @@ function showToast(options) {
|
|
|
122
123
|
ToastView = React.createElement(View, { style: maskStyle },
|
|
123
124
|
React.createElement(View, { style: styles.grayBlock },
|
|
124
125
|
React.createElement(View, { style: styles.toastView },
|
|
125
|
-
React.createElement(Image, { source: successPng, style: styles.toastIcon }),
|
|
126
|
+
React.createElement(Image, { source: icon === 'error' ? errorPng : successPng, style: styles.toastIcon }),
|
|
126
127
|
React.createElement(Text, { style: styles.toastContent }, title || ''))));
|
|
127
128
|
}
|
|
128
129
|
try {
|
|
@@ -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":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAC/E,OAAO,YAAY,MAAM,4BAA4B,CAAA;AACrD,OAAO,UAAU,MAAM,eAAe,CAAA;AACtC,OAAO,QAAQ,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAE1E,MAAM,SAAS,GAAQ,MAAM,CAAA;AAE7B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,EAAE;QACV,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;KACrB;IACD,SAAS,EAAE;QACT,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,EAAE;KACX;IACD,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,QAAQ;KACpB;IACD,gBAAgB,EAAE;QAChB,UAAU,EAAE,EAAE;QACd,aAAa,EAAE,EAAE;QACjB,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,QAAQ;KACpB;IACD,SAAS,EAAE;QACT,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,eAAe,EAAE;QACf,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,GAAG;QACX,UAAU,EAAE,CAAC,EAAE;QACf,SAAS,EAAE,CAAC,EAAE;QACd,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,QAAQ,EAAE;QACR,eAAe,EAAE,MAAM;QACvB,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,MAAM;QACb,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,iBAAiB;KACrC;IACD,SAAS,EAAE;QACT,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,GAAG;QACX,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,eAAe,EAAE,oBAAoB;QACrC,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,QAAQ;KACxB;IACD,aAAa,EAAE;QACb,KAAK,EAAE,GAAG;QACV,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,eAAe,EAAE,oBAAoB;QACrC,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,QAAQ;KACxB;CACF,CAAC,CAAA;AAEF,MAAM,SAAS,GAAG,CAAC,EACjB,KAAK,EACL,IAAI,EACL,EAAE,EAAE;IACH,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe;QAC3D,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;YAC3B,oBAAC,iBAAiB,IAChB,SAAS,QACT,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAClB,IAAI,EAAC,OAAO,EACZ,KAAK,EAAC,MAAM,GACZ;YACF,oBAAC,IAAI,IAAC,KAAK,EAAE;oBACX,UAAU,EAAE,EAAE;oBACd,QAAQ,EAAE,UAAU;oBACpB,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,OAAO;oBACd,QAAQ,EAAE,EAAE;iBACb,IACC,KAAK,CAAQ,CACV,CACF,CACR,CAAA;AACH,CAAC,CAAA;AAED,SAAS,CAAC,SAAS,GAAG;IACpB,KAAK,EAAE,SAAS,CAAC,MAAM;IACvB,IAAI,EAAE,SAAS,CAAC,IAAI;CACrB,CAAA;AAED,SAAS,SAAS,CAAE,OAA8B;IAChD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;QACjB,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,YAAY,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAA;QAClD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACzB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KAC3B;IAED,IAAI,EAAC,KAAK,GAAG,EAAE,EAAE,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAC,GAAG,OAAO,IAAI,EAAE,CAAA,CAAC,sBAAsB;IAExI,MAAM,SAAS,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;IAEtC,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;IAEjF,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAA;IAElE,IAAI,SAAS,CAAA;IAEb,IAAI,KAAK,EAAE;QACT,SAAS,GAAG,oBAAC,IAAI,IAAC,KAAK,EAAE,SAAS;YAChC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;gBAC3B,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;oBAC3B,oBAAC,KAAK,IAAC,MAAM,EAAE,KAAY,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,GAAI;oBACxD,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,YAAY,IAAG,KAAK,IAAI,EAAE,CAAQ,CACjD,CACF,CACF,CAAA;KACR;SAAM,IAAI,SAAS,EAAE;QACpB,SAAS,GAAG,oBAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,CAAA;KACnD;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE;QAC1B,SAAS,GAAG,oBAAC,IAAI,IAAC,KAAK,EAAE,SAAS;YAChC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC/B,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,gBAAgB,IAAG,KAAK,IAAI,EAAE,CAAQ,CACrD,CACF,CAAA;KACR;SAAM;QACL,SAAS,GAAG,oBAAC,IAAI,IAAC,KAAK,EAAE,SAAS;YAChC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;gBAC3B,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;oBAC3B,oBAAC,KAAK,IAAC,MAAM,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,GAAI;oBACpF,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,YAAY,IAAG,KAAK,IAAI,EAAE,CAAQ,CACjD,CACF,CACF,CAAA;KACR;IAED,IAAI;QACF,6DAA6D;QAC7D,uDAAuD;QACvD,SAAS,CAAC,mBAAmB,IAAI,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAEzE,SAAS,CAAC,mBAAmB,GAAG,IAAI,YAAY,CAAC,SAAS,CAAC,CAAA;QAC3D,UAAU,CAAC,GAAG,EAAE;YACd,SAAS,CAAC,mBAAmB,IAAI,SAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAClF,CAAC,EAAE,GAAG,CAAC,CAAA;QACP,IAAI,QAAQ,GAAG,CAAC,EAAE;YAChB,UAAU,CAAC,GAAG,EAAE;gBACd,SAAS,CAAC,mBAAmB,IAAI,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAA;YAC1E,CAAC,EAAE,QAAQ,CAAC,CAAA;SACb;QACD,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,CAAC,EAAE;QACV,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,EAAE,CAAA;QACxF,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AAED,SAAS,WAAW,CAAE,OAAgC;IACpD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;QACjB,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,cAAc,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAA;QACpD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACzB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KAC3B;IAED,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAEnE,OAAO,SAAS,CAAC;QACf,KAAK;QACL,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,CAAC;QACX,IAAI;QACJ,OAAO;QACP,IAAI;QACJ,QAAQ;KACT,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,SAAS,CAAE,OAA8B,EAAE;IAClD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAExC,IAAI;QACF,SAAS,CAAC,mBAAmB,IAAI,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACzE,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAA;QACzC,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;QACtC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;QACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAA;QACzB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;QACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;KAChB;AACH,CAAC;AAED,SAAS,WAAW,CAAE,OAAgC,EAAE;IACtD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAExC,IAAI;QACF,SAAS,CAAC,mBAAmB,IAAI,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACzE,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAA;QACzC,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAA;QACxC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;QACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAA;QACzB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;QACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;KAChB;AACH,CAAC;AAED,OAAO,EACL,SAAS,EACT,WAAW,EACX,SAAS,EACT,WAAW,EACZ,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-rn",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.9",
|
|
4
4
|
"description": "Taro RN framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "types/index.d.ts",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@react-native-community/clipboard": "~1.5.1",
|
|
38
38
|
"@react-native-community/geolocation": "~2.0.2",
|
|
39
39
|
"@react-native-community/netinfo": "~7.1.2",
|
|
40
|
-
"@tarojs/runtime-rn": "3.4.
|
|
40
|
+
"@tarojs/runtime-rn": "3.4.9",
|
|
41
41
|
"babel-preset-expo": "~8.5.1",
|
|
42
42
|
"base64-js": "^1.3.0",
|
|
43
43
|
"expo-av": "~9.2.3",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"react-native-syan-image-picker": "0.5.3"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@tarojs/taro": "3.4.
|
|
63
|
+
"@tarojs/taro": "3.4.9",
|
|
64
64
|
"@types/react-native": "0.67.0",
|
|
65
65
|
"cpy-cli": "^3.1.1",
|
|
66
66
|
"fbjs-scripts": "^3.0.1",
|
|
@@ -92,5 +92,5 @@
|
|
|
92
92
|
"@types/react": "17.0.11",
|
|
93
93
|
"@types/node": "^14.14.41"
|
|
94
94
|
},
|
|
95
|
-
"gitHead": "
|
|
95
|
+
"gitHead": "6461e41999b9e2b26a7ec30b8979fa8b6e94198d"
|
|
96
96
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import { View, ActivityIndicator, StyleSheet, Alert,
|
|
2
|
+
import { View, ActivityIndicator, StyleSheet, Alert, Modal } from 'react-native'
|
|
3
3
|
import RootSiblings from 'react-native-root-siblings'
|
|
4
4
|
import ImageViewer from 'react-native-image-zoom-viewer'
|
|
5
5
|
import { saveMedia } from '../media'
|
|
@@ -31,13 +31,8 @@ export function previewImage(obj: Taro.previewImage.Option): void {
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
let sibling
|
|
34
|
-
function backhandler() {
|
|
35
|
-
onSwipeDown()
|
|
36
|
-
return true
|
|
37
|
-
}
|
|
38
34
|
|
|
39
35
|
function onSwipeDown() {
|
|
40
|
-
BackHandler.removeEventListener('hardwareBackPress', backhandler)
|
|
41
36
|
sibling?.destroy()
|
|
42
37
|
sibling = undefined
|
|
43
38
|
}
|
|
@@ -92,7 +87,7 @@ export function previewImage(obj: Taro.previewImage.Option): void {
|
|
|
92
87
|
}
|
|
93
88
|
try {
|
|
94
89
|
sibling = new RootSiblings(
|
|
95
|
-
<
|
|
90
|
+
<Modal style={styles.mask} onRequestClose={onSwipeDown}>
|
|
96
91
|
<ImageViewer
|
|
97
92
|
imageUrls={urls.map((item: string) => {
|
|
98
93
|
return {
|
|
@@ -119,9 +114,8 @@ export function previewImage(obj: Taro.previewImage.Option): void {
|
|
|
119
114
|
)
|
|
120
115
|
}}
|
|
121
116
|
/>
|
|
122
|
-
</
|
|
117
|
+
</Modal>
|
|
123
118
|
)
|
|
124
|
-
BackHandler.addEventListener('hardwareBackPress', backhandler)
|
|
125
119
|
} catch (e) {
|
|
126
120
|
onFail(e)
|
|
127
121
|
}
|
|
Binary file
|
|
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
|
|
|
3
3
|
import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native'
|
|
4
4
|
import RootSiblings from 'react-native-root-siblings'
|
|
5
5
|
import successPng from './success.png'
|
|
6
|
+
import errorPng from './error.png'
|
|
6
7
|
import { errorHandler, shouldBeObject, successHandler } from '../../utils'
|
|
7
8
|
|
|
8
9
|
const globalAny: any = global
|
|
@@ -148,7 +149,7 @@ function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.Callbac
|
|
|
148
149
|
ToastView = <View style={maskStyle}>
|
|
149
150
|
<View style={styles.grayBlock}>
|
|
150
151
|
<View style={styles.toastView}>
|
|
151
|
-
<Image source={successPng} style={styles.toastIcon} />
|
|
152
|
+
<Image source={icon === 'error' ? errorPng : successPng} style={styles.toastIcon} />
|
|
152
153
|
<Text style={styles.toastContent}>{title || ''}</Text>
|
|
153
154
|
</View>
|
|
154
155
|
</View>
|