react-native-edge-to-edge 1.1.3 → 1.3.0

package/src/expo.ts

@@ -4,19 +4,37 @@ import {
   withAndroidStyles,
 } from "@expo/config-plugins";
 
-type Theme = "Material2" | "Material3";
-type Props = { android?: { parentTheme?: Theme } } | undefined;
+type ParentTheme =
+  | "Default"
+  | "Material2"
+  | "Material3"
+  | "Light"
+  | "Material2.Light"
+  | "Material3.Light";
+
+type AndroidProps = {
+  enforceNavigationBarContrast?: boolean;
+  parentTheme?: ParentTheme;
+};
+
+type Props = { android?: AndroidProps } | undefined;
 
 const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
   config,
   props = {},
 ) => {
-  const themes: Record<string, string> = {
+  const themes: Record<ParentTheme, string> = {
+    Default: "Theme.EdgeToEdge",
     Material2: "Theme.EdgeToEdge.Material2",
     Material3: "Theme.EdgeToEdge.Material3",
-  } satisfies Record<Theme, string>;
 
-  const ignoreList = new Set([
+    Light: "Theme.EdgeToEdge.Light",
+    "Material2.Light": "Theme.EdgeToEdge.Material2.Light",
+    "Material3.Light": "Theme.EdgeToEdge.Material3.Light",
+  };
+
+  const cleanupList = new Set([
+    "enforceNavigationBarContrast",
     "android:enforceNavigationBarContrast",
     "android:enforceStatusBarContrast",
     "android:fitsSystemWindows",
@@ -34,19 +52,26 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
     const { androidStatusBar = {}, userInterfaceStyle = "light" } = config;
     const { barStyle } = androidStatusBar;
     const { android = {} } = props;
-    const { parentTheme = "Default" } = android;
+    const { enforceNavigationBarContrast, parentTheme = "Default" } = android;
 
     config.modResults.resources.style = config.modResults.resources.style?.map(
       (style): typeof style => {
         if (style.$.name === "AppTheme") {
-          style.$.parent = themes[parentTheme] ?? "Theme.EdgeToEdge";
+          style.$.parent = themes[parentTheme] ?? themes["Default"];
 
           if (style.item != null) {
             style.item = style.item.filter(
-              (item) => !ignoreList.has(item.$.name),
+              (item) => !cleanupList.has(item.$.name),
             );
           }
 
+          if (enforceNavigationBarContrast === false) {
+            style.item.push({
+              $: { name: "enforceNavigationBarContrast" },
+              _: String(false),
+            });
+          }
+
           if (barStyle != null) {
             style.item.push({
               $: { name: "android:windowLightStatusBar" },

package/src/specs/NativeEdgeToEdgeModule.ts

@@ -5,6 +5,7 @@ type SystemBarsConfig = {
   statusBarHidden: boolean | undefined;
   statusBarStyle: string | undefined;
   navigationBarHidden: boolean | undefined;
+  navigationBarStyle: string | undefined;
 };
 
 export interface Spec extends TurboModule {

package/src/types.ts

@@ -1,12 +1,15 @@
+type SystemBarsProp<T> = T | { statusBar?: T; navigationBar?: T };
+
 export type SystemBarStyle = "auto" | "light" | "dark";
 
 export type SystemBarsEntry = {
   statusBarHidden: boolean | undefined;
   statusBarStyle: SystemBarStyle | undefined;
   navigationBarHidden: boolean | undefined;
+  navigationBarStyle: SystemBarStyle | undefined;
 };
 
 export type SystemBarsProps = {
-  style?: SystemBarStyle;
-  hidden?: boolean | { statusBar?: boolean; navigationBar?: boolean };
+  style?: SystemBarsProp<SystemBarStyle>;
+  hidden?: SystemBarsProp<boolean>;
 };

package/android/src/main/res/values-v29/colors.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="navigationBarColor">@android:color/transparent</color>
-</resources>