提交 612dc687 编写于 作者: Q qiang

feat: uni.getSystemInfo 增加 safeArea 属性支持(h5)

feat: uni.getSystemInfo 增加 safeArea 属性支持(h5)
上级 1cc3ce06
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
}, },
"dependencies": { "dependencies": {
"base64-arraybuffer": "^0.2.0", "base64-arraybuffer": "^0.2.0",
"intersection-observer": "^0.7.0" "intersection-observer": "^0.7.0",
"safe-area-insets": "^1.4.1"
}, },
"private": true, "private": true,
"devDependencies": { "devDependencies": {
......
import getWindowOffset from 'uni-platform/helpers/get-window-offset' import getWindowOffset from 'uni-platform/helpers/get-window-offset'
import safeAreaInsets from 'safe-area-insets'
const ua = navigator.userAgent const ua = navigator.userAgent
/** /**
...@@ -71,6 +72,14 @@ export function getSystemInfoSync () { ...@@ -71,6 +72,14 @@ export function getSystemInfoSync () {
var system = `${osname} ${osversion}` var system = `${osname} ${osversion}`
var platform = osname.toLocaleLowerCase() var platform = osname.toLocaleLowerCase()
var safeArea = {
left: safeAreaInsets.left,
right: windowWidth - safeAreaInsets.right,
top: safeAreaInsets.top,
bottom: windowHeight - safeAreaInsets.bottom,
width: windowWidth - safeAreaInsets.left - safeAreaInsets.right,
height: windowHeight - safeAreaInsets.top - safeAreaInsets.bottom
}
const { const {
top: windowTop, top: windowTop,
...@@ -92,7 +101,8 @@ export function getSystemInfoSync () { ...@@ -92,7 +101,8 @@ export function getSystemInfoSync () {
statusBarHeight, statusBarHeight,
system, system,
platform, platform,
model model,
safeArea
} }
} }
/** /**
......
...@@ -6823,6 +6823,10 @@ rxjs@^6.4.0: ...@@ -6823,6 +6823,10 @@ rxjs@^6.4.0:
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
safe-area-insets@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/safe-area-insets/-/safe-area-insets-1.4.1.tgz#89309e01a516dcd7d2fe012a9c4115182957bd8b"
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2" version "5.1.2"
resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1562349888578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1562349888578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册