Skip to content

Sync Modal system bars visibility with current activity #48516

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

Closed
mateoguzmana wants to merge 2 commits into from
Closed

Sync Modal system bars visibility with current activity #48516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5079303
fix(modal): [android] syncing activity system bars visibility with di…
mateoguzmana Dec 20, 2024
e082132
Merge branch 'master' of github.com:mateoguzmana/react-native into fi…
mateoguzmana Jan 7, 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
18 changes: 18 additions & 0 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import android.view.View
import android.view.ViewGroup
import android.view.ViewStructure
import android.view.Window
import android.view.WindowInsets
import android.view.WindowInsetsController
import android.view.WindowManager
import android.view.accessibility.AccessibilityEvent
Expand Down Expand Up @@ -380,6 +381,9 @@ public class ReactModalHostView(context: ThemedReactContext) :
}
}

/**
* Updates the system appearance of the dialog to match the activity that it is being displayed on.
*/
private fun updateSystemAppearance() {
val currentActivity = getCurrentActivity() ?: return
val dialog = checkNotNull(dialog) { "dialog must exist when we call updateProperties" }
Expand All @@ -390,17 +394,31 @@ public class ReactModalHostView(context: ThemedReactContext) :
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
val insetsController: WindowInsetsController = checkNotNull(activityWindow.insetsController)
val activityAppearance: Int = insetsController.systemBarsAppearance
val rootWindowInsets = activityWindow.decorView.rootWindowInsets

val activityLightStatusBars =
activityAppearance and WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS

dialogWindow.insetsController?.setSystemBarsAppearance(
activityLightStatusBars, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS)

syncSystemBarsVisibility(rootWindowInsets, dialogWindow.insetsController, WindowInsets.Type.statusBars())
syncSystemBarsVisibility(rootWindowInsets, dialogWindow.insetsController, WindowInsets.Type.navigationBars())
} else {
dialogWindow.decorView.systemUiVisibility = activityWindow.decorView.systemUiVisibility
}
}

/**
* Syncs the visibility of the system bars based on their visibility in the root window insets.
* This ensures consistency between the system bars visibility in the activity and the dialog.
*/
private fun syncSystemBarsVisibility(rootWindowInsets: WindowInsets, dialogWindowInsetsController: WindowInsetsController?, type: Int) {
dialogWindowInsetsController?.apply {
if (rootWindowInsets.isVisible(type)) show(type) else hide(type)
}
}

/**
* Sets the testID on the DialogRootViewGroup. Since the accessibility events are not triggered on
* the on the ReactModalHostView, the testID is forwarded to the DialogRootViewGroup to set the
Expand Down