Skip to content

fix(core): Add frames back to frame-stack if removed during back press #11437

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

Draft
CatchABus wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −8
Draft

fix(core): Add frames back to frame-stack if removed during back press #11437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 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 @@ -134,6 +134,15 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {

@profile
public onLoaded() {
/**
* In android 12 and newer, back press can exit app without finishing activity but still removes the frame from stack.
* In that case, we rely on loaded lifecycle to add the frame back.
* Also, make sure the loaded lifecycle does not attempt to push the frame when it's already in the stack but is not the topmost.
*/
if (this._currentEntry && !this._isInFrameStack) {
this._pushInFrameStack();
}

super.onLoaded();
this._processNextNavigationEntry();
}
Expand Down
8 changes: 0 additions & 8 deletions packages/core/ui/frame/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,14 +547,6 @@ export class Frame extends FrameBase {
super.disposeNativeView();
}

public _popFromFrameStack() {
if (!this._isInFrameStack) {
return;
}

super._popFromFrameStack();
}

public _getNavBarVisible(page: Page): boolean {
switch (this.actionBarVisibility) {
case 'never':
Expand Down
Loading