javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-19 06:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure it works when no viewControllerView

Browse Source
This commit is contained in:
Martin Guillon
2020-12-07 16:35:37 +01:00
parent 1582f6c035
commit ee544d7885
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/ui/core/view/view-helper/index.ios.ts
View File

@ -338,10 +338,12 @@ export class IOSHelper {
let fullscreen = null;
let safeArea = null;
let controllerInWindow = {x: 0, y: 0};
if (viewControllerView) {
safeArea = viewControllerView.safeAreaLayoutGuide.layoutFrame;
fullscreen = viewControllerView.frame;
controllerInWindow = viewControllerView.convertPointToView(viewControllerView.bounds.origin, null);
} else if (scrollView) {
const insets = scrollView.safeAreaInsets;
safeArea = CGRectMake(insets.left, insets.top, scrollView.contentSize.width - insets.left - insets.right, scrollView.contentSize.height - insets.top - insets.bottom);
@ -350,7 +352,6 @@ export class IOSHelper {
// We take into account the controller position inside the window.
// for example with a bottomsheet the controller will be "offset"
const controllerInWindow = viewControllerView.convertPointToView(viewControllerView.bounds.origin, null);
const locationInWindow = view.getLocationInWindow();
let inWindowLeft = locationInWindow.x - controllerInWindow.x;
let inWindowTop = locationInWindow.y - controllerInWindow.y;