Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
import android.graphics.Color
import android.os.Build
import android.view.KeyEvent
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.view.ViewStructure
import android.view.Window
import android.view.WindowManager
import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityNodeInfo
Expand Down Expand Up @@ -401,8 +403,18 @@ public class ReactModalHostView(context: ThemedReactContext) :
// Navigation bar cannot be translucent without status bar being translucent too
if (navigationBarTranslucent) {
dialogWindow.enableEdgeToEdge()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && transparent) {
dialogWindow.isNavigationBarContrastEnforced = false
if (transparent) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
dialogWindow.isNavigationBarContrastEnforced = false
} else {
// Before Android 10, enableEdgeToEdge adds the contrast scrim as a window color.
dialogWindow.navigationBarColor = Color.TRANSPARENT
}
if (activityWindow != null) {
// enableEdgeToEdge resets the button style from the system theme on every update.
WindowInsetsControllerCompat(dialogWindow, dialogWindow.decorView)
.isAppearanceLightNavigationBars = isAppearanceLightNavigationBars(activityWindow)
}
}
} else {
dialogWindow.disableEdgeToEdge()
Expand Down Expand Up @@ -462,6 +474,18 @@ public class ReactModalHostView(context: ThemedReactContext) :
}
}

private fun isAppearanceLightNavigationBars(window: Window): Boolean =
when {
Build.VERSION.SDK_INT > Build.VERSION_CODES.R ->
WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightNavigationBars
// SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR exists from API 26. On Android 11 the compat getter
// marks the window appearance as app-controlled, after which the systemUiVisibility light
// flags (used up to R, e.g. by StatusBar) are ignored.
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ->
(window.decorView.systemUiVisibility and SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0
else -> false
}

/**
* 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

@file:Suppress("DEPRECATION")

package com.facebook.react.views.modal

import android.app.Activity
import android.graphics.Color
import android.view.Window
import androidx.core.view.WindowInsetsControllerCompat
import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
import com.facebook.react.uimanager.ThemedReactContext
import com.facebook.react.views.view.LightNavigationBarColor
import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
import com.facebook.testutils.shadows.ShadowSoLoader
import org.assertj.core.api.Assertions.assertThat
import org.junit.After
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.robolectric.android.controller.ActivityController
import org.robolectric.annotation.Config

@RunWith(RobolectricTestRunner::class)
@Config(sdk = [28], qualifiers = "notnight", shadows = [ShadowSoLoader::class])
class ReactModalHostViewNavigationBarTest {
private lateinit var activityController: ActivityController<Activity>
private lateinit var modal: ReactModalHostView
private var previousEdgeToEdgeFlag = false

@Before
fun setUp() {
ReactNativeFeatureFlagsForTests.setUp()
previousEdgeToEdgeFlag = isEdgeToEdgeFeatureFlagOn
isEdgeToEdgeFeatureFlagOn = false
activityController = Robolectric.buildActivity(Activity::class.java).setup()
val activity = activityController.get()
val reactContext = createTestReactApplicationContext()
reactContext.onHostResume(activity)
modal = ReactModalHostView(ThemedReactContext(reactContext, activity, "ModalTest", 1))
}

@After
fun tearDown() {
modal.onDropInstance()
activityController.pause().stop().destroy()
isEdgeToEdgeFeatureFlagOn = previousEdgeToEdgeFlag
}

private fun showModal(transparent: Boolean): Window {
modal.transparent = transparent
modal.statusBarTranslucent = true
modal.navigationBarTranslucent = true
modal.showOrUpdate()
return requireNotNull(modal.dialog?.window)
}

@Test
fun transparentModalDoesNotAddALightScrim() {
val activityWindow = activityController.get().window
activityWindow.navigationBarColor = Color.BLACK

assertThat(showModal(transparent = true).navigationBarColor).isEqualTo(Color.TRANSPARENT)
assertThat(activityWindow.navigationBarColor).isEqualTo(Color.BLACK)
}

@Test
@Config(qualifiers = "night")
fun transparentModalDoesNotAddADarkScrim() {
assertThat(showModal(transparent = true).navigationBarColor).isEqualTo(Color.TRANSPARENT)
}

@Test
@Config(sdk = [28, 29, 33])
fun transparentModalKeepsHostNavigationButtonStyleAcrossUpdates() {
val activityWindow = activityController.get().window
val hostController = WindowInsetsControllerCompat(activityWindow, activityWindow.decorView)
hostController.isAppearanceLightNavigationBars = false

val window = showModal(transparent = true)
val modalController = WindowInsetsControllerCompat(window, window.decorView)
assertThat(modalController.isAppearanceLightNavigationBars).isFalse()

modal.showOrUpdate()
assertThat(modalController.isAppearanceLightNavigationBars).isFalse()

hostController.isAppearanceLightNavigationBars = true
modal.showOrUpdate()
assertThat(modalController.isAppearanceLightNavigationBars).isTrue()
}

@Test
fun opaqueModalKeepsTheScrim() {
assertThat(showModal(transparent = false).navigationBarColor).isEqualTo(LightNavigationBarColor)
}

@Test
fun changingTransparencyUpdatesTheScrim() {
val window = showModal(transparent = false)

modal.transparent = true
modal.showOrUpdate()
assertThat(window.navigationBarColor).isEqualTo(Color.TRANSPARENT)

modal.transparent = false
modal.showOrUpdate()
assertThat(window.navigationBarColor).isEqualTo(LightNavigationBarColor)
}
}
Loading