Skip to content

fix(core): prevent goBack from removing topmost frame from stack #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

Merged
NathanWalker merged 3 commits into from
Sep 22, 2026
Merged

fix(core): prevent goBack from removing topmost frame from stack #11437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae56155
fix(core): Add frames back to frame-stack if removed during back press
CatchABus Sep 16, 2026
9b9b25c
fix(core): prevent goBack from removing topmost frame from stack
CatchABus Sep 19, 2026
cec77ba
chore: removed unneeded unit tests
CatchABus Sep 20, 2026
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
24 changes: 1 addition & 23 deletions packages/core/ui/frame/frame-common.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ describe('FrameBase.goBack', () => {
expect(isNavigatingBack(child)).toBe(false);
});

it('reports no navigation and leaves the stack alone when the given frame is not topmost', () => {
it('reports no navigation when the given frame is not topmost', () => {
const first = createFrame(false);
const second = createFrame(true);
_pushInFrameStack(first);
Expand All @@ -106,28 +106,6 @@ describe('FrameBase.goBack', () => {
expect(isNavigatingBack(second)).toBe(false);
});

it('pops the topmost frame when it cannot navigate back', () => {
const first = createFrame(true);
const second = createFrame(false);
_pushInFrameStack(first);
_pushInFrameStack(second);

expect(FrameBase.goBack()).toBe(false);

expect(frameStack).toEqual([first]);
expect(second._isInFrameStack).toBe(false);
});

it('keeps the last frame in the stack when it cannot navigate back', () => {
const only = createFrame(false);
_pushInFrameStack(only);

expect(FrameBase.goBack()).toBe(false);
expect(FrameBase.goBack(only)).toBe(false);

expect(frameStack).toEqual([only]);
});

it("navigates a nested frame with history when given the window's topmost frame", () => {
const window = createWindow('a');
const root = createFrameInWindow(window);
Expand Down
35 changes: 16 additions & 19 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 @@ -82,32 +82,29 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {

static goBack(frame?: FrameBase): boolean {
const top = frame ?? FrameBase.topmost();
if (top && top.canGoBack()) {
top.goBack();
if (!top) {
return false;
}

if (top.canGoBack()) {
top.goBack();
return true;
} else if (top) {
let parentFrameCanGoBack = false;
let parentFrame = getAncestor(top, 'Frame');

while (parentFrame && !parentFrameCanGoBack) {
if (parentFrame && parentFrame.canGoBack()) {
parentFrameCanGoBack = true;
} else {
parentFrame = getAncestor(parentFrame, 'Frame');
}
}
}

if (parentFrame && parentFrameCanGoBack) {
parentFrame.goBack();
let parentFrameCanGoBack = false;
let parentFrame = getAncestor(top, 'Frame');

return true;
while (parentFrame && !parentFrameCanGoBack) {
if (parentFrame && parentFrame.canGoBack()) {
parentFrameCanGoBack = true;
} else {
parentFrame = getAncestor(parentFrame, 'Frame');
}
}

// Popping is only valid for the frame at the top of the stack - an explicitly passed frame may sit lower.
if (frameStack.length > 1 && frameStack[frameStack.length - 1] === top) {
top._popFromFrameStack();
if (parentFrame && parentFrameCanGoBack) {
parentFrame.goBack();
return true;
}

return false;
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() {
Comment thread
farfromrefug marked this conversation as resolved.
Resolved
if (!this._isInFrameStack) {
return;
}

super._popFromFrameStack();
}

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