@tarojs/taro-rn 3.7.0-alpha.20 → 3.7.0-alpha.23
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Platform, Dimensions, PixelRatio } from 'react-native';
|
|
1
|
+
import { Platform, Dimensions, PixelRatio, StatusBar } from 'react-native';
|
|
2
2
|
import { initialWindowMetrics } from 'react-native-safe-area-context';
|
|
3
3
|
import DeviceInfo from 'react-native-device-info';
|
|
4
4
|
export function getSystemInfoSync() {
|
|
@@ -17,7 +17,12 @@ export function getSystemInfoSync() {
|
|
|
17
17
|
const deviceOrientation = screenHeight > screenWidth ? 'portrait' : 'landscape';
|
|
18
18
|
// NOTE：在竖屏正方向下的安全区域
|
|
19
19
|
let safeArea = {};
|
|
20
|
-
|
|
20
|
+
let { top = 0, bottom = 0 } = (initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) || {};
|
|
21
|
+
// NOTE：android 在沉浸式切换时，有几率top值为0。
|
|
22
|
+
// https://github.com/th3rdwave/react-native-safe-area-context/issues/364
|
|
23
|
+
if (Platform.OS === 'android') {
|
|
24
|
+
top = StatusBar.currentHeight || 0;
|
|
25
|
+
}
|
|
21
26
|
try {
|
|
22
27
|
const W = Math.min(screenWidth, screenHeight);
|
|
23
28
|
const H = Math.max(screenWidth, screenHeight);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getSystemInfoSync/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getSystemInfoSync/index.ts"],"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.7.0-alpha.
|
|
3
|
+
"version": "3.7.0-alpha.23",
|
|
4
4
|
"description": "Taro RN framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "types/index.d.ts",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"react-native-safe-area-context": "~4.5.0",
|
|
49
49
|
"react-native-stylekit": "^1.0.0",
|
|
50
50
|
"react-native-syan-image-picker": "0.5.3",
|
|
51
|
-
"@tarojs/runtime-rn": "3.7.0-alpha.
|
|
51
|
+
"@tarojs/runtime-rn": "3.7.0-alpha.23"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@babel/core": "^7.14.5",
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Platform,
|
|
3
3
|
Dimensions,
|
|
4
|
-
PixelRatio
|
|
4
|
+
PixelRatio,
|
|
5
|
+
StatusBar
|
|
5
6
|
} from 'react-native'
|
|
6
7
|
import { initialWindowMetrics } from 'react-native-safe-area-context'
|
|
7
8
|
import DeviceInfo from 'react-native-device-info'
|
|
@@ -24,7 +25,11 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
|
|
|
24
25
|
|
|
25
26
|
// NOTE：在竖屏正方向下的安全区域
|
|
26
27
|
let safeArea = {}
|
|
27
|
-
|
|
28
|
+
let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
|
|
29
|
+
// NOTE：android 在沉浸式切换时，有几率top值为0。
|
|
30
|
+
// https://github.com/th3rdwave/react-native-safe-area-context/issues/364
|
|
31
|
+
if(Platform.OS === 'android') { top = StatusBar.currentHeight || 0; }
|
|
32
|
+
|
|
28
33
|
try {
|
|
29
34
|
const W = Math.min(screenWidth, screenHeight)
|
|
30
35
|
const H = Math.max(screenWidth, screenHeight)
|