Skip to content

fix(ios): ensure view layout when using large titles #10044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 3 commits into from
Nov 2, 2022
Merged

fix(ios): ensure view layout when using large titles #10044

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2150a
fix(ios): ensure view layout when using large titles
edusperoni Sep 30, 2022
db9d607
Merge branch 'main' into fix/safe-area-layout-issue
edusperoni Oct 13, 2022
ff472fa
Merge branch 'main' into fix/safe-area-layout-issue
NathanWalker Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion packages/core/ui/page/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,24 @@ class UIViewControllerImpl extends UIViewController {

public isBackstackSkipped: boolean;
public isBackstackCleared: boolean;
private _isRunningLayout = 0;
Comment thread
CatchABus marked this conversation as resolved.
Resolved
private get isRunningLayout() {
return this._isRunningLayout === 0;
Comment thread
CatchABus marked this conversation as resolved.
Resolved
}
private startRunningLayout() {
this._isRunningLayout++;
}
private finishRunningLayout() {
this._isRunningLayout--;
}
private runLayout(cb: () => void) {
try {
this.startRunningLayout();
cb();
} finally {
this.finishRunningLayout();
}
}

public static initWithOwner(owner: WeakRef<Page>): UIViewControllerImpl {
const controller = <UIViewControllerImpl>UIViewControllerImpl.new();
Expand Down Expand Up @@ -254,7 +272,19 @@ class UIViewControllerImpl extends UIViewController {
}
}

public viewSafeAreaInsetsDidChange(): void {
super.viewSafeAreaInsetsDidChange();
if (this.isRunningLayout) {
return;
}
const owner = this._owner.get();
if (owner) {
this.runLayout(() => IOSHelper.layoutView(this, owner));
}
}

public viewDidLayoutSubviews(): void {
this.startRunningLayout();
super.viewDidLayoutSubviews();
const owner = this._owner.get();
if (owner) {
Expand Down Expand Up @@ -306,6 +336,7 @@ class UIViewControllerImpl extends UIViewController {

IOSHelper.layoutView(this, owner);
}
this.finishRunningLayout();
}

// Mind implementation for other controllerss
Expand Down Expand Up @@ -407,7 +438,7 @@ export class Page extends PageBase {
updateWithWillAppear(animated: boolean) {
// this method is important because it allows plugins to react to modal page close
// for example allowing updating status bar background color
if (this.hasActionBar) {
if (this.hasActionBar) {
this.actionBar.update();
}
this.updateStatusBar();
Expand Down