Only allow nav bar style override if enforceNavigationBarContrast is …

…set to false
zoontek · Jan 19, 2025 · be4a0b0 · be4a0b0
1 parent 474df0a
commit be4a0b0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-edge-to-edge",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "license": "MIT",
   "description": "Effortlessly enable edge-to-edge display in React Native",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",

diff --git a/src/expo.ts b/src/expo.ts
@@ -75,13 +75,6 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
             );
           }
 
-          if (enforceNavigationBarContrast === false) {
-            style.item.push({
-              $: { name: "enforceNavigationBarContrast" },
-              _: String(false),
-            });
-          }
-
           if (statusBarStyle != null) {
             style.item.push({
               $: { name: "android:windowLightStatusBar" },
@@ -94,15 +87,22 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
             });
           }
 
-          if (navigationBarStyle != null) {
-            style.item.push({
-              $: { name: "android:windowLightNavigationBar" },
-              _: String(navigationBarStyle === "dark-content"),
-            });
-          } else if (userInterfaceStyle !== "automatic") {
+          if (enforceNavigationBarContrast === false) {
+            if (navigationBarStyle != null) {
+              style.item.push({
+                $: { name: "android:windowLightNavigationBar" },
+                _: String(navigationBarStyle === "dark-content"),
+              });
+            } else if (userInterfaceStyle !== "automatic") {
+              style.item.push({
+                $: { name: "android:windowLightNavigationBar" },
+                _: String(navigationBarStyle === "light"),
+              });
+            }
+
             style.item.push({
-              $: { name: "android:windowLightNavigationBar" },
-              _: String(navigationBarStyle === "light"),
+              $: { name: "enforceNavigationBarContrast" },
+              _: String(false),
             });
           }
         }