diff --git a/package.json b/package.json index 8ac1e13477bc096163aa8fe5fe81bff3962d6e54..2b279dc37dcb88b7684afa066dfe673ef0e672be 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ }, "dependencies": { "base64-arraybuffer": "^0.2.0", - "intersection-observer": "^0.7.0" + "intersection-observer": "^0.7.0", + "safe-area-insets": "^1.4.1" }, "private": true, "devDependencies": { diff --git a/src/platforms/h5/service/api/device/get-system-info.js b/src/platforms/h5/service/api/device/get-system-info.js index a9096d5bcec4259c0cdca28bd1dc9fefa824ed19..0bb3f96a558db473ad08bc217def20769b6fdf50 100644 --- a/src/platforms/h5/service/api/device/get-system-info.js +++ b/src/platforms/h5/service/api/device/get-system-info.js @@ -1,4 +1,5 @@ import getWindowOffset from 'uni-platform/helpers/get-window-offset' +import safeAreaInsets from 'safe-area-insets' const ua = navigator.userAgent /** @@ -71,6 +72,14 @@ export function getSystemInfoSync () { var system = `${osname} ${osversion}` 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 { top: windowTop, @@ -92,7 +101,8 @@ export function getSystemInfoSync () { statusBarHeight, system, platform, - model + model, + safeArea } } /** diff --git a/yarn.lock b/yarn.lock index 212bbc0ed52b970905039b7590c9c72e1fd9b32b..c1bea7d8c942426554e6b73f8cd8d7bd2b746a40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6823,6 +6823,10 @@ rxjs@^6.4.0: dependencies: 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: 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"