javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-14 18:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: fix safe area tests on iOS (#10240)

Browse Source
This commit is contained in:
Eduardo Speroni
2023-03-22 12:14:21 -03:00
committed by GitHub
parent e560cb1374
commit 5f96ffe7d9
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/automated/src/ui/layouts/safe-area-tests.ts
View File

@ -70,10 +70,14 @@ export class SafeAreaTests extends testModule.UITest<any> {
} }
private layout_insets_top_action_bar_test(layout: view.View) { private layout_insets_top_action_bar_test(layout: view.View) {
const app = UIApplication.sharedApplication; // const app = UIApplication.sharedApplication;
const statusBarHeight = round(dipToDp(app.statusBarFrame.size.height)); // const statusBarHeight = round(dipToDp(app.statusBarFrame.size.height));
const actionBarHeight = round(dipToDp(layout.page.actionBar.nativeViewProtected.frame.size.height)); // const actionBarHeight = round(dipToDp(layout.page.actionBar.nativeViewProtected.frame.size.height));
const topInset = statusBarHeight + actionBarHeight; // const topInset = statusBarHeight + actionBarHeight;
const view: UIView = layout.page.actionBar.nativeViewProtected;
// use the action bar position and size instead of the status bar and action bar heights as those are unreliable on iOS 16+
const topInset = round(dipToDp(view.frame.origin.y + view.frame.size.height));
const insets = layout.getSafeAreaInsets(); const insets = layout.getSafeAreaInsets();
equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`); equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`);
@ -81,8 +85,9 @@ export class SafeAreaTests extends testModule.UITest<any> {
private layout_insets_top_action_bar_hidden_test(layout: view.View) { private layout_insets_top_action_bar_hidden_test(layout: view.View) {
const app = UIApplication.sharedApplication; const app = UIApplication.sharedApplication;
const statusBarHeight = round(dipToDp(app.statusBarFrame.size.height)); // const statusBarHeight = round(dipToDp(app.statusBarFrame.size.height));
const topInset = statusBarHeight; // use window inset instead of status bar frame as that's unreliable on iOS 16+
const topInset = round(dipToDp(app.keyWindow.safeAreaInsets.top));
const insets = layout.getSafeAreaInsets(); const insets = layout.getSafeAreaInsets();
equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`); equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`);