Skip to content

fix(core): Page frame reference not unset on native view disposal #10417

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 4 commits into from
Oct 23, 2023
Merged

fix(core): Page frame reference not unset on native view disposal #10417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ff325c
fix(core): Page frame reference not unset on native view disposal
CatchABus Oct 20, 2023
0809c45
chore: Parent unset enhancement for reusable views
CatchABus Oct 21, 2023
f732124
chore: Getting rid of _frame property to use parent instead
CatchABus Oct 21, 2023
6c2ac46
chore: Minor page correction
CatchABus Oct 21, 2023
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
2 changes: 0 additions & 2 deletions packages/core/ui/frame/frame-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ export class FrameBase extends CustomLayoutView {
public _removeEntry(removed: BackstackEntry): void {
const page = removed.resolvedPage;
const frame = page.frame;
page._frame = null;
if (frame) {
frame._removeView(page);
} else {
Expand Down Expand Up @@ -250,7 +249,6 @@ export class FrameBase extends CustomLayoutView {
this._resolvedPage = newPage;

this._addView(newPage);
newPage._frame = this;
}

this._currentEntry = entry;
Expand Down
4 changes: 0 additions & 4 deletions packages/core/ui/page/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,6 @@ export declare class Page extends PageBase {
* @private
*/
hasActionBar: boolean;
/**
* @private
*/
_frame: Frame;

/**
* A method called before navigating to the page.
Expand Down
9 changes: 2 additions & 7 deletions packages/core/ui/page/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ class UIViewControllerImpl extends UIViewController {
frame._resolvedPage = owner;

if (!owner.parent) {
owner._frame = frame;
if (!frame._styleScope) {
// Make sure page will have styleScope even if frame don't.
owner._updateStyleScope();
Expand Down Expand Up @@ -427,10 +426,6 @@ export class Page extends PageBase {
return this._ios;
}

get frame(): Frame {
return this._frame;
}

public layoutNativeView(left: number, top: number, right: number, bottom: number): void {
//
}
Expand All @@ -440,7 +435,7 @@ export class Page extends PageBase {
}

public _shouldDelayLayout(): boolean {
return this._frame && this._frame._animationInProgress;
return this.frame && this.frame._animationInProgress;
}

public onLoaded(): void {
Expand Down Expand Up @@ -469,7 +464,7 @@ export class Page extends PageBase {

public _updateStatusBarStyle(value?: string) {
const frame = this.frame;
if (this.frame && value) {
if (frame && value) {
const navigationController: UINavigationController = frame.ios.controller;
const navigationBar = navigationController.navigationBar;

Expand Down
15 changes: 10 additions & 5 deletions packages/core/ui/page/page-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ export class PageBase extends ContentView {
private _navigationContext: any;
private _actionBar: ActionBar;

public _frame: Frame;

public actionBarHidden: boolean;
public enableSwipeBackNavigation: boolean;
public backgroundSpanUnderStatusBar: boolean;
Expand Down Expand Up @@ -81,6 +79,15 @@ export class PageBase extends ContentView {
return this;
}

public _parentChanged(oldParent: View): void {
const newParent = this.parent;
if (newParent && !isFrame(newParent)) {
throw new Error(`Page can only be nested inside Frame. New parent: ${newParent}`);
}

super._parentChanged(oldParent);
}

public _addChildFromBuilder(name: string, value: any) {
if (value instanceof ActionBar) {
this.actionBar = value;
Expand All @@ -94,9 +101,7 @@ export class PageBase extends ContentView {
}

get frame(): Frame {
const parent = this.parent;

return isFrame(parent) ? (parent as Frame) : undefined;
return <Frame>this.parent;
}

private createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData {
Expand Down