@tarojs/taro-rn 3.3.18 → 3.3.19

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.
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  import { SafeAreaView } from 'react-native-safe-area-context';
11
11
  import { Camera } from 'expo-camera';
12
12
  import { BarCodeScanner } from 'expo-barcode-scanner';
13
- import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform } from 'react-native';
13
+ import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform, StatusBar } from 'react-native';
14
14
  import iconClose from './icon_close.png';
15
15
  import iconPic from './icon_pic.png';
16
16
  import * as Permissions from 'expo-permissions';
@@ -49,7 +49,7 @@ const BarCodeType = BarCodeScanner.Constants.BarCodeType;
49
49
  function findKey(value, data, compare = (a, b) => a === b) {
50
50
  return Object.keys(data).find(k => compare(data[k], value)) || '';
51
51
  }
52
- const { width, height } = Dimensions.get('window');
52
+ const { width, height } = Dimensions.get('screen');
53
53
  function getBarCodeTypes(types) {
54
54
  const result = [];
55
55
  for (const t of types) {
@@ -97,6 +97,7 @@ const styles = StyleSheet.create({
97
97
  closeImg: {
98
98
  width: 25,
99
99
  height: 25,
100
+ marginTop: StatusBar.currentHeight,
100
101
  },
101
102
  closeBtnBg: {
102
103
  width: 40,
@@ -149,8 +150,10 @@ export function scanCode(option = {}) {
149
150
  return Promise.reject(res);
150
151
  }
151
152
  const barCodeTypes = getBarCodeTypes(scanType);
153
+ const cameraRef = React.createRef();
152
154
  return new Promise((resolve, reject) => {
153
155
  scannerView = new RootSiblings((React.createElement(View, { style: [styles.container] },
156
+ React.createElement(StatusBar, { backgroundColor: "rgba(0, 0, 0, 0)", translucent: true, hidden: Platform.OS === 'ios' }),
154
157
  React.createElement(Camera, { onBarCodeScanned: ({ type, data }) => {
155
158
  const res = {
156
159
  charSet: 'UTF-8',
@@ -164,7 +167,7 @@ export function scanCode(option = {}) {
164
167
  complete === null || complete === void 0 ? void 0 : complete(res);
165
168
  hide(scannerView);
166
169
  resolve(res);
167
- }, barCodeScannerSettings: {
170
+ }, ref: cameraRef, barCodeScannerSettings: {
168
171
  barCodeTypes,
169
172
  }, style: { width, height }, ratio: '16:9' }),
170
173
  React.createElement(TouchableOpacity, { style: styles.closeIcon, onPress: () => hide(scannerView) }, safeViewWrapper(React.createElement(Image, { source: iconClose, style: styles.closeImg }))),
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/scanCode/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/scanCode/index.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": "3.3.18",
3
+ "version": "3.3.19",
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.3.18",
40
+ "@tarojs/runtime-rn": "3.3.19",
41
41
  "babel-preset-expo": "~8.5.1",
42
42
  "base64-js": "^1.3.0",
43
43
  "expo-av": "~9.2.3",
@@ -61,7 +61,7 @@
61
61
  "react-native-unimodules": "~0.14.10"
62
62
  },
63
63
  "devDependencies": {
64
- "@tarojs/taro": "3.3.18",
64
+ "@tarojs/taro": "3.3.19",
65
65
  "@types/react-native": "0.66.5",
66
66
  "babel-plugin-jest-hoist": "^26.6.2",
67
67
  "cpy-cli": "^3.1.1",
@@ -95,5 +95,5 @@
95
95
  "@types/react": "17.0.11",
96
96
  "@types/node": "^14.14.41"
97
97
  },
98
- "gitHead": "38f05e581a538309b42c8a118de933fd4b998811"
98
+ "gitHead": "e5152ac3ba4c46d5cc7af3c27a1e98ce73c2af17"
99
99
  }
@@ -1,7 +1,7 @@
1
1
  import { SafeAreaView } from 'react-native-safe-area-context'
2
2
  import { Camera } from 'expo-camera'
3
3
  import { BarCodeScanner } from 'expo-barcode-scanner'
4
- import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform } from 'react-native'
4
+ import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform, StatusBar } from 'react-native'
5
5
  import iconClose from './icon_close.png'
6
6
  import iconPic from './icon_pic.png'
7
7
  import * as Permissions from 'expo-permissions'
@@ -46,7 +46,7 @@ function findKey (value:string, data, compare = (a, b) => a === b):string {
46
46
  return Object.keys(data).find(k => compare(data[k], value)) || ''
47
47
  }
48
48
 
49
- const { width, height } = Dimensions.get('window')
49
+ const { width, height } = Dimensions.get('screen')
50
50
 
51
51
  function getBarCodeTypes(types:string[]):string[] {
52
52
  const result:string[] = []
@@ -101,6 +101,7 @@ const styles = StyleSheet.create({
101
101
  closeImg: {
102
102
  width: 25,
103
103
  height: 25,
104
+ marginTop: StatusBar.currentHeight,
104
105
  },
105
106
  closeBtnBg: {
106
107
  width: 40,
@@ -154,61 +155,64 @@ export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.
154
155
  return Promise.reject(res)
155
156
  }
156
157
  const barCodeTypes = getBarCodeTypes(scanType)
158
+ const cameraRef = React.createRef<Camera>()
157
159
  return new Promise((resolve, reject) => {
158
160
  scannerView = new RootSiblings(
159
161
  (<View style={[styles.container]}>
160
- <Camera
161
- onBarCodeScanned={({ type, data }: {type: string, data: string}) => {
162
- const res = {
163
- charSet: 'UTF-8', // todo
164
- path: '', // todo
165
- rawData: '', // todo
166
- errMsg: 'scanCode:ok',
167
- result: data,
168
- scanType: formatCodeType(type),
169
- }
170
- success?.(res)
171
- complete?.(res)
172
- hide(scannerView)
173
- resolve(res)
174
- }}
175
- barCodeScannerSettings={{
176
- barCodeTypes,
177
- }}
178
- style={{ width, height }}
179
- ratio='16:9'
180
- />
181
- <TouchableOpacity style={styles.closeIcon} onPress={() => hide(scannerView)}>
182
- {safeViewWrapper(<Image source={iconClose} style={styles.closeImg}/>)}
183
- </TouchableOpacity>
184
- {!onlyFromCamera && (<TouchableOpacity style={styles.albumIcon} onPress={() => {
185
- scanFromPhoto((data, type) => {
186
- const res = {
187
- charSet: 'UTF-8', // todo
188
- path: '', // todo
189
- rawData: '', // todo
190
- errMsg: 'scanCode:ok',
191
- result: data,
192
- scanType: formatCodeType(type),
193
- }
194
- success?.(res)
195
- complete?.(res)
196
- hide(scannerView)
197
- resolve(res)
198
- }, (err) => {
199
- const res = {
200
- errMsg: 'scanCode fail',
201
- err
202
- }
203
- fail?.(res)
204
- complete?.(res)
205
- hide(scannerView)
206
- reject(res)
207
- })
208
- }}>
209
- {safeViewWrapper(<Image source={iconPic} style={styles.albumImg}/>)}
210
- </TouchableOpacity>)}
211
- </View>)
162
+ <StatusBar backgroundColor="rgba(0, 0, 0, 0)" translucent hidden={Platform.OS === 'ios'} />
163
+ <Camera
164
+ onBarCodeScanned={({ type, data }: {type: string, data: string}) => {
165
+ const res = {
166
+ charSet: 'UTF-8', // todo
167
+ path: '', // todo
168
+ rawData: '', // todo
169
+ errMsg: 'scanCode:ok',
170
+ result: data,
171
+ scanType: formatCodeType(type),
172
+ }
173
+ success?.(res)
174
+ complete?.(res)
175
+ hide(scannerView)
176
+ resolve(res)
177
+ }}
178
+ ref={cameraRef}
179
+ barCodeScannerSettings={{
180
+ barCodeTypes,
181
+ }}
182
+ style={{ width, height }}
183
+ ratio='16:9'
184
+ />
185
+ <TouchableOpacity style={styles.closeIcon} onPress={() => hide(scannerView)}>
186
+ {safeViewWrapper(<Image source={iconClose} style={styles.closeImg}/>)}
187
+ </TouchableOpacity>
188
+ {!onlyFromCamera && (<TouchableOpacity style={styles.albumIcon} onPress={() => {
189
+ scanFromPhoto((data, type) => {
190
+ const res = {
191
+ charSet: 'UTF-8', // todo
192
+ path: '', // todo
193
+ rawData: '', // todo
194
+ errMsg: 'scanCode:ok',
195
+ result: data,
196
+ scanType: formatCodeType(type),
197
+ }
198
+ success?.(res)
199
+ complete?.(res)
200
+ hide(scannerView)
201
+ resolve(res)
202
+ }, (err) => {
203
+ const res = {
204
+ errMsg: 'scanCode fail',
205
+ err
206
+ }
207
+ fail?.(res)
208
+ complete?.(res)
209
+ hide(scannerView)
210
+ reject(res)
211
+ })
212
+ }}>
213
+ {safeViewWrapper(<Image source={iconPic} style={styles.albumImg}/>)}
214
+ </TouchableOpacity>)}
215
+ </View>)
212
216
  )
213
217
  BackHandler.addEventListener('hardwareBackPress', backAction)
214
218
  })