Skip to content

Fix actionbar insets #10960

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

Open
vardhan30016 wants to merge 2 commits into
base: main
Choose a base branch
from
+75 −21
Open

Fix actionbar insets #10960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f29507f
fix(navigation): forward NavigationEntry.context to page and bindingC…
vardhan30016 Nov 24, 2025
bdc3d57
fix(android-actionbar): apply WindowInsets padding to prevent ActionB…
vardhan30016 Nov 24, 2025
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
40 changes: 38 additions & 2 deletions packages/core/ui/action-bar/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,44 @@ export class ActionBar extends ActionBarBase {
}

public createNativeView() {
return new androidx.appcompat.widget.Toolbar(this._context);
}
const toolbar = new androidx.appcompat.widget.Toolbar(this._context);

// --- PATCH: Fix ActionBar overlaying status bar on Android 16+ ---
try {
const apiLevel = android.os.Build.VERSION.SDK_INT;
if (apiLevel >= 29) {
toolbar.setFitsSystemWindows(true);

toolbar.setOnApplyWindowInsetsListener(
new android.view.View.OnApplyWindowInsetsListener({
onApplyWindowInsets(view, insets) {
try {
const topInset = (typeof insets.getSystemWindowInsetTop === "function")
? insets.getSystemWindowInsetTop()
: (insets.getInsets ? insets.getInsets(android.view.WindowInsets.Type.statusBars()).top : 0);

view.setPadding(
view.getPaddingLeft(),
topInset,
view.getPaddingRight(),
view.getPaddingBottom()
);
} catch (e) {
console.log("ActionBar inset patch error:", e);
}
return insets;
}
})
);
}
} catch (err) {
console.log("Failed to apply ActionBar status bar fix:", err);
}
// --- END PATCH ---

return toolbar;
}


public initNativeView(): void {
super.initNativeView();
Expand Down
56 changes: 37 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 @@ -427,25 +427,43 @@ export class FrameBase extends CustomLayoutView {

@profile
public performNavigation(navigationContext: NavigationContext) {
this._executingContext = navigationContext;

const backstackEntry = navigationContext.entry;
const isBackNavigation = navigationContext.navigationType === NavigationType.back;
this._onNavigatingTo(backstackEntry, isBackNavigation);
const navigationTransition = this._getNavigationTransition(backstackEntry.entry);
if (navigationTransition?.instance) {
const state = SharedTransition.getState(navigationTransition?.instance.id);
SharedTransition.updateState(navigationTransition?.instance.id, {
// Allow setting custom page context to override default (from) page
// helpful for deeply nested frame navigation setups (eg: Nested Tab Navigation)
// when sharing elements in this condition, the (from) page would
// get overridden on each frame preventing shared element matching
page: state?.page || this.currentPage,
toPage: this,
});
}
this._navigateCore(backstackEntry);
}
this._executingContext = navigationContext;

const backstackEntry = navigationContext.entry;
const isBackNavigation = navigationContext.navigationType === NavigationType.Back;

// --- PATCH START ---
try {
const entryContext = backstackEntry?.entry?.context;
const entryBindingContext = backstackEntry?.entry?.bindingContext;
const resolvedPage = backstackEntry?.resolvedPage;

if (resolvedPage && entryContext !== undefined && entryContext !== null) {
(resolvedPage as any)._navigationContext = entryContext;

if (entryBindingContext == null && resolvedPage.bindingContext == null) {
try {
resolvedPage.bindingContext = entryContext;
} catch (_) {}
}
}
} catch (_) {}
// --- PATCH END ---

this._onNavigatingTo(backstackEntry, isBackNavigation);

const navigationTransition = this._getNavigationTransition(backstackEntry);
if (navigationTransition?.instance) {
const state = SharedTransition.getState(navigationTransition?.instance.id);
SharedTransition.updateState(navigationTransition?.instance.id, {
page: state?.page || this.currentPage,
toPage: this,
});
}

this._navigateCore(backstackEntry);
}


@profile
performGoBack(navigationContext: NavigationContext) {
Expand Down