Skip to content

fix(ios): Added null-check for action bar updates #11003

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 1 commit into from
Dec 5, 2025
Merged

fix(ios): Added null-check for action bar updates #11003

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
17 changes: 11 additions & 6 deletions packages/core/ui/frame/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export class Frame extends FrameBase {
public _updateActionBar(page?: Page, disableNavBarAnimation = false): void {
super._updateActionBar(page);

if (page && this.currentPage && this.currentPage.modal === page) {
if (!this._ios || (page && this.currentPage && this.currentPage.modal === page)) {
return;
}

Expand Down Expand Up @@ -597,18 +597,23 @@ class UINavigationControllerImpl extends UINavigationController {

@profile
public setViewControllersAnimated(viewControllers: NSArray<any>, animated: boolean): void {
const viewController = viewControllers.lastObject;
const navigationTransition = <NavigationTransition>viewController[TRANSITION];
const owner = this._owner?.deref?.();
const viewController = viewControllers?.lastObject;
const navigationTransition = viewController ? <NavigationTransition>viewController[TRANSITION] : null;

if (Trace.isEnabled()) {
Trace.write(`UINavigationControllerImpl.setViewControllersAnimated(${viewControllers}, ${animated}); transition: ${JSON.stringify(navigationTransition)}`, Trace.categories.NativeLifecycle);
}

const nativeTransition = _getNativeTransition(navigationTransition, true, owner?.direction);
if (!animated || !navigationTransition || !nativeTransition) {
if (!animated || !navigationTransition) {
super.setViewControllersAnimated(viewControllers, animated);
return;
}

const owner = this._owner?.deref?.();
const nativeTransition = _getNativeTransition(navigationTransition, true, owner?.direction);

if (!nativeTransition) {
super.setViewControllersAnimated(viewControllers, animated);
return;
}

Expand Down