react-native-edge-to-edge 1.4.1 → 1.4.3-beta.0

package/dist/module/SystemBars.js

@@ -2,16 +2,19 @@
 
 import { useEffect, useMemo, useRef } from "react";
 import { Appearance, Platform, StatusBar, useColorScheme } from "react-native";
-import NativeEdgeToEdgeModule from "./specs/NativeEdgeToEdgeModule";
+import NativeModule from "./specs/NativeEdgeToEdgeModule";
 function getColorScheme() {
   return Appearance?.getColorScheme() ?? "light";
 }
+function toNativeBarStyle(style) {
+  return style === "light" || style === "dark" ? `${style}-content` : "default";
+}
 
 /**
  * Merges the entries stack.
  */
 function mergeEntriesStack(entriesStack) {
-  const mergedEntry = entriesStack.reduce((prev, cur) => {
+  return entriesStack.reduce((prev, cur) => {
     for (const prop in cur) {
       if (cur[prop] != null) {
         // @ts-expect-error
@@ -21,15 +24,10 @@ function mergeEntriesStack(entriesStack) {
     return prev;
   }, {
     statusBarStyle: undefined,
-    statusBarHidden: undefined,
     navigationBarStyle: undefined,
-    navigationBarHidden: undefined
+    statusBarHidden: false,
+    navigationBarHidden: false
   });
-  if (mergedEntry.statusBarStyle == null && mergedEntry.statusBarHidden == null && mergedEntry.navigationBarStyle == null && mergedEntry.navigationBarHidden == null) {
-    return null;
-  } else {
-    return mergedEntry;
-  }
 }
 
 /**
@@ -38,8 +36,8 @@ function mergeEntriesStack(entriesStack) {
 function createStackEntry(props) {
   return {
     statusBarStyle: typeof props.style === "string" ? props.style : props.style?.statusBar,
-    statusBarHidden: typeof props.hidden === "boolean" ? props.hidden : props.hidden?.statusBar,
     navigationBarStyle: typeof props.style === "string" ? props.style : props.style?.navigationBar,
+    statusBarHidden: typeof props.hidden === "boolean" ? props.hidden : props.hidden?.statusBar,
     navigationBarHidden: typeof props.hidden === "boolean" ? props.hidden : props.hidden?.navigationBar
   };
 }
@@ -49,7 +47,12 @@ const entriesStack = [];
 let updateImmediate = null;
 
 // The current merged values from the entries stack.
-let currentMergedEntries = null;
+let currentMergedEntries = {
+  statusBarStyle: undefined,
+  navigationBarStyle: undefined,
+  statusBarHidden: false,
+  navigationBarHidden: false
+};
 
 /**
  * Updates the native system bars with the entries from the stack.
@@ -60,42 +63,39 @@ function updateEntriesStack() {
       clearImmediate(updateImmediate);
     }
     updateImmediate = setImmediate(() => {
+      const autoBarStyle = getColorScheme() === "light" ? "dark" : "light";
       const mergedEntries = mergeEntriesStack(entriesStack);
-      if (mergedEntries != null) {
-        const {
-          statusBarHidden,
-          navigationBarHidden
-        } = mergedEntries;
-        const autoBarStyle = getColorScheme() === "light" ? "dark" : "light";
-        const statusBarStyle = mergedEntries.statusBarStyle === "auto" ? autoBarStyle : mergedEntries.statusBarStyle;
-        const navigationBarStyle = mergedEntries.navigationBarStyle === "auto" ? autoBarStyle : mergedEntries.navigationBarStyle;
-        if (currentMergedEntries?.statusBarStyle !== statusBarStyle || currentMergedEntries?.statusBarHidden !== statusBarHidden || currentMergedEntries?.navigationBarStyle !== navigationBarStyle || currentMergedEntries?.navigationBarHidden !== navigationBarHidden) {
-          if (Platform.OS === "android") {
-            NativeEdgeToEdgeModule?.setSystemBarsConfig({
-              statusBarStyle,
-              statusBarHidden,
-              navigationBarStyle,
-              navigationBarHidden
-            });
-          } else {
-            // Emulate android behavior with react-native StatusBar
-            if (statusBarStyle != null) {
-              StatusBar.setBarStyle(`${statusBarStyle}-content`, true);
-            }
-            if (statusBarHidden != null) {
-              StatusBar.setHidden(statusBarHidden, "fade"); // 'slide' doesn't work in this context
-            }
-          }
+      const statusBarStyle = mergedEntries.statusBarStyle === "auto" ? autoBarStyle : mergedEntries.statusBarStyle;
+      const navigationBarStyle = mergedEntries.navigationBarStyle === "auto" ? autoBarStyle : mergedEntries.navigationBarStyle;
+      const {
+        statusBarHidden,
+        navigationBarHidden
+      } = mergedEntries;
+      if (statusBarStyle !== currentMergedEntries.statusBarStyle) {
+        const style = toNativeBarStyle(statusBarStyle);
+        console.log({
+          style
+        });
+        Platform.OS === "android" ? NativeModule?.setStatusBarStyle(style) : StatusBar.setBarStyle(style, true);
+      }
+      if (statusBarHidden !== currentMergedEntries.statusBarHidden) {
+        Platform.OS === "android" ? NativeModule?.setStatusBarHidden(statusBarHidden) : StatusBar.setHidden(statusBarHidden, "fade"); // 'slide' doesn't work in this context
+      }
+      if (Platform.OS === "android") {
+        if (navigationBarStyle !== currentMergedEntries.navigationBarStyle) {
+          const style = toNativeBarStyle(navigationBarStyle);
+          NativeModule?.setNavigationBarStyle(style);
+        }
+        if (navigationBarHidden !== currentMergedEntries.navigationBarHidden) {
+          NativeModule?.setNavigationBarHidden(navigationBarHidden);
         }
-        currentMergedEntries = {
-          statusBarStyle,
-          statusBarHidden,
-          navigationBarStyle,
-          navigationBarHidden
-        };
-      } else {
-        currentMergedEntries = null;
       }
+      currentMergedEntries = {
+        statusBarStyle,
+        navigationBarStyle,
+        statusBarHidden,
+        navigationBarHidden
+      };
     });
   }
 }
@@ -146,8 +146,8 @@ export function SystemBars({
   style
 }) {
   const statusBarStyle = typeof style === "string" ? style : style?.statusBar;
-  const statusBarHidden = typeof hidden === "boolean" ? hidden : hidden?.statusBar;
   const navigationBarStyle = typeof style === "string" ? style : style?.navigationBar;
+  const statusBarHidden = typeof hidden === "boolean" ? hidden : hidden?.statusBar;
   const navigationBarHidden = typeof hidden === "boolean" ? hidden : hidden?.navigationBar;
   const stableProps = useMemo(() => ({
     style: statusBarStyle === navigationBarStyle ? statusBarStyle : {

package/dist/module/SystemBars.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useMemo","useRef","Appearance","Platform","StatusBar","useColorScheme","NativeEdgeToEdgeModule","getColorScheme","mergeEntriesStack","entriesStack","mergedEntry","reduce","prev","cur","prop","statusBarStyle","undefined","statusBarHidden","navigationBarStyle","navigationBarHidden","createStackEntry","props","style","statusBar","hidden","navigationBar","updateImmediate","currentMergedEntries","updateEntriesStack","OS","clearImmediate","setImmediate","mergedEntries","autoBarStyle","setSystemBarsConfig","setBarStyle","setHidden","pushStackEntry","entry","push","popStackEntry","index","indexOf","splice","replaceStackEntry","newEntry","SystemBars","stableProps","colorScheme","stackEntryRef","current"],"sourceRoot":"../../src","sources":["SystemBars.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useMemo","useRef","Appearance","Platform","StatusBar","useColorScheme","NativeModule","getColorScheme","toNativeBarStyle","style","mergeEntriesStack","entriesStack","reduce","prev","cur","prop","statusBarStyle","undefined","navigationBarStyle","statusBarHidden","navigationBarHidden","createStackEntry","props","statusBar","navigationBar","hidden","updateImmediate","currentMergedEntries","updateEntriesStack","OS","clearImmediate","setImmediate","autoBarStyle","mergedEntries","console","log","setStatusBarStyle","setBarStyle","setStatusBarHidden","setHidden","setNavigationBarStyle","setNavigationBarHidden","pushStackEntry","entry","push","popStackEntry","index","indexOf","splice","replaceStackEntry","newEntry","SystemBars","stableProps","colorScheme","stackEntryRef","current"],"sourceRoot":"../../src","sources":["SystemBars.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/expo.js

@@ -38,14 +38,6 @@ const withAndroidEdgeToEdgeTheme = (config, props = {}) => {
         if (style.item != null) {
           style.item = style.item.filter(item => !cleanupList.has(item.$.name));
         }
-        if (enforceNavigationBarContrast === false) {
-          style.item.push({
-            $: {
-              name: "enforceNavigationBarContrast"
-            },
-            _: String(false)
-          });
-        }
         if (statusBarStyle != null) {
           style.item.push({
             $: {
@@ -61,19 +53,27 @@ const withAndroidEdgeToEdgeTheme = (config, props = {}) => {
             _: String(userInterfaceStyle === "light")
           });
         }
-        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"
+              name: "enforceNavigationBarContrast"
             },
-            _: String(navigationBarStyle === "light")
+            _: String(false)
           });
         }
       }

package/dist/module/expo.js.map

@@ -1 +1 @@
-{"version":3,"names":["createRunOncePlugin","withAndroidStyles","withAndroidEdgeToEdgeTheme","config","props","themes","Default","Material2","Material3","Light","cleanupList","Set","androidNavigationBar","androidStatusBar","userInterfaceStyle","barStyle","navigationBarStyle","statusBarStyle","android","enforceNavigationBarContrast","parentTheme","modResults","resources","style","map","$","name","parent","item","filter","has","push","_","String"],"sourceRoot":"../../src","sources":["expo.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createRunOncePlugin","withAndroidStyles","withAndroidEdgeToEdgeTheme","config","props","themes","Default","Material2","Material3","Light","cleanupList","Set","androidNavigationBar","androidStatusBar","userInterfaceStyle","barStyle","navigationBarStyle","statusBarStyle","android","enforceNavigationBarContrast","parentTheme","modResults","resources","style","map","$","name","parent","item","filter","has","push","_","String"],"sourceRoot":"../../src","sources":["expo.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/specs/NativeEdgeToEdgeModule.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import { Appearance, TurboModuleRegistry } from "react-native";
-const NativeModule = TurboModuleRegistry.get("RNEdgeToEdge");
+import { Appearance, Platform, TurboModuleRegistry } from "react-native";
+const NativeModule = Platform.OS === "android" ? TurboModuleRegistry.getEnforcing("RNEdgeToEdge") : null;
 if (NativeModule != null) {
   Appearance.addChangeListener(() => {
     NativeModule.onColorSchemeChange();

package/dist/module/specs/NativeEdgeToEdgeModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["Appearance","TurboModuleRegistry","NativeModule","get","addChangeListener","onColorSchemeChange"],"sourceRoot":"../../../src","sources":["specs/NativeEdgeToEdgeModule.ts"],"mappings":";;AACA,SAASA,UAAU,EAAEC,mBAAmB,QAAQ,cAAc;AAc9D,MAAMC,YAAY,GAAGD,mBAAmB,CAACE,GAAG,CAAO,cAAc,CAAC;AAElE,IAAID,YAAY,IAAI,IAAI,EAAE;EACxBF,UAAU,CAACI,iBAAiB,CAAC,MAAM;IACjCF,YAAY,CAACG,mBAAmB,CAAC,CAAC;EACpC,CAAC,CAAC;AACJ;AAEA,eAAeH,YAAY","ignoreList":[]}
+{"version":3,"names":["Appearance","Platform","TurboModuleRegistry","NativeModule","OS","getEnforcing","addChangeListener","onColorSchemeChange"],"sourceRoot":"../../../src","sources":["specs/NativeEdgeToEdgeModule.ts"],"mappings":";;AACA,SAASA,UAAU,EAAEC,QAAQ,EAAEC,mBAAmB,QAAQ,cAAc;AAYxE,MAAMC,YAAY,GAChBF,QAAQ,CAACG,EAAE,KAAK,SAAS,GACrBF,mBAAmB,CAACG,YAAY,CAAO,cAAc,CAAC,GACtD,IAAI;AAEV,IAAIF,YAAY,IAAI,IAAI,EAAE;EACxBH,UAAU,CAACM,iBAAiB,CAAC,MAAM;IACjCH,YAAY,CAACI,mBAAmB,CAAC,CAAC;EACpC,CAAC,CAAC;AACJ;AAEA,eAAeJ,YAAY","ignoreList":[]}

package/dist/module/specs/NativeEdgeToEdgeModule.web.js

@@ -1,7 +1,4 @@
 "use strict";
 
-export default {
-  onColorSchemeChange() {},
-  setSystemBarsConfig() {}
-};
+export default null;
 //# sourceMappingURL=NativeEdgeToEdgeModule.web.js.map

package/dist/module/specs/NativeEdgeToEdgeModule.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["onColorSchemeChange","setSystemBarsConfig"],"sourceRoot":"../../../src","sources":["specs/NativeEdgeToEdgeModule.web.ts"],"mappings":";;AAEA,eAAe;EACbA,mBAAmBA,CAAA,EAAG,CAAC,CAAC;EACxBC,mBAAmBA,CAAA,EAAG,CAAC;AACzB,CAAC","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["specs/NativeEdgeToEdgeModule.web.ts"],"mappings":";;AAAA,eAAe,IAAI","ignoreList":[]}

package/dist/typescript/SystemBars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SystemBars.d.ts","sourceRoot":"","sources":["../../src/SystemBars.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAyL3D,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,QAoD5D;yBApDe,UAAU;gCAvCK,eAAe,KAAG,eAAe;+BAYlC,eAAe,KAAG,IAAI;mCAe3C,eAAe,SACf,eAAe,KACrB,eAAe"}
+{"version":3,"file":"SystemBars.d.ts","sourceRoot":"","sources":["../../src/SystemBars.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AA4L3E,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,QAoD5D;yBApDe,UAAU;gCAvCK,eAAe,KAAG,eAAe;+BAYlC,eAAe,KAAG,IAAI;mCAe3C,eAAe,SACf,eAAe,KACrB,eAAe"}

package/dist/typescript/specs/NativeEdgeToEdgeModule.d.ts

@@ -1,13 +1,11 @@
 import type { TurboModule } from "react-native";
-type SystemBarsConfig = {
-    statusBarHidden: boolean | undefined;
-    statusBarStyle: string | undefined;
-    navigationBarHidden: boolean | undefined;
-    navigationBarStyle: string | undefined;
-};
-export interface Spec extends TurboModule {
+type SystemBarStyle = "default" | "light-content" | "dark-content";
+interface Spec extends TurboModule {
     onColorSchemeChange(): void;
-    setSystemBarsConfig(config: SystemBarsConfig): void;
+    setStatusBarStyle(style: SystemBarStyle): void;
+    setNavigationBarStyle(style: SystemBarStyle): void;
+    setStatusBarHidden(hidden: boolean): void;
+    setNavigationBarHidden(hidden: boolean): void;
 }
 declare const NativeModule: Spec | null;
 export default NativeModule;

package/dist/typescript/specs/NativeEdgeToEdgeModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeEdgeToEdgeModule.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeEdgeToEdgeModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,KAAK,gBAAgB,GAAG;IACtB,eAAe,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,mBAAmB,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC,CAAC;AAEF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,mBAAmB,IAAI,IAAI,CAAC;IAC5B,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACrD;AAED,QAAA,MAAM,YAAY,aAAgD,CAAC;AAQnE,eAAe,YAAY,CAAC"}
+{"version":3,"file":"NativeEdgeToEdgeModule.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeEdgeToEdgeModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,KAAK,cAAc,GAAG,SAAS,GAAG,eAAe,GAAG,cAAc,CAAC;AAEnE,UAAU,IAAK,SAAQ,WAAW;IAChC,mBAAmB,IAAI,IAAI,CAAC;IAC5B,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/C,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IACnD,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1C,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;CAC/C;AAED,QAAA,MAAM,YAAY,aAGR,CAAC;AAQX,eAAe,YAAY,CAAC"}

package/dist/typescript/specs/NativeEdgeToEdgeModule.web.d.ts

@@ -1,6 +1,3 @@
-declare const _default: {
-    onColorSchemeChange(): void;
-    setSystemBarsConfig(): void;
-};
+declare const _default: null;
 export default _default;
 //# sourceMappingURL=NativeEdgeToEdgeModule.web.d.ts.map

package/dist/typescript/specs/NativeEdgeToEdgeModule.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeEdgeToEdgeModule.web.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeEdgeToEdgeModule.web.ts"],"names":[],"mappings":";;;;AAEA,wBAGiB"}
+{"version":3,"file":"NativeEdgeToEdgeModule.web.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeEdgeToEdgeModule.web.ts"],"names":[],"mappings":";AAAA,wBAAoB"}

package/dist/typescript/types.d.ts

@@ -4,10 +4,10 @@ type SystemBarsProp<T> = T | {
 };
 export type SystemBarStyle = "auto" | "light" | "dark";
 export type SystemBarsEntry = {
-    statusBarHidden: boolean | undefined;
     statusBarStyle: SystemBarStyle | undefined;
-    navigationBarHidden: boolean | undefined;
     navigationBarStyle: SystemBarStyle | undefined;
+    statusBarHidden: boolean | undefined;
+    navigationBarHidden: boolean | undefined;
 };
 export type SystemBarsProps = {
     style?: SystemBarsProp<SystemBarStyle>;

package/dist/typescript/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAAC,aAAa,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IAC3C,mBAAmB,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,kBAAkB,EAAE,cAAc,GAAG,SAAS,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IACvC,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CAClC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAAC,aAAa,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IAC3C,kBAAkB,EAAE,cAAc,GAAG,SAAS,CAAC;IAC/C,eAAe,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,mBAAmB,EAAE,OAAO,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IACvC,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CAClC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-edge-to-edge",
-  "version": "1.4.1",
+  "version": "1.4.3-beta.0",
   "license": "MIT",
   "description": "Effortlessly enable edge-to-edge display in React Native",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
@@ -63,7 +63,7 @@
     "prettier": "^3.4.2",
     "prettier-plugin-organize-imports": "^4.1.0",
     "react": "18.3.1",
-    "react-native": "0.77.0-rc.6",
+    "react-native": "0.77.0",
     "react-native-builder-bob": "^0.35.2",
     "typescript": "^5.7.2"
   },

package/src/SystemBars.ts

@@ -1,19 +1,30 @@
 import { useEffect, useMemo, useRef } from "react";
 import { Appearance, Platform, StatusBar, useColorScheme } from "react-native";
-import NativeEdgeToEdgeModule from "./specs/NativeEdgeToEdgeModule";
-import { SystemBarsEntry, SystemBarsProps } from "./types";
+import NativeModule from "./specs/NativeEdgeToEdgeModule";
+import { SystemBarsEntry, SystemBarsProps, SystemBarStyle } from "./types";
+
+type MergeableBarStyle = "light" | "dark" | undefined;
 
 function getColorScheme(): "light" | "dark" {
   return Appearance?.getColorScheme() ?? "light";
 }
 
+function toNativeBarStyle(
+  style: MergeableBarStyle,
+): "default" | "light-content" | "dark-content" {
+  return style === "light" || style === "dark" ? `${style}-content` : "default";
+}
+
 /**
  * Merges the entries stack.
  */
-function mergeEntriesStack(
-  entriesStack: SystemBarsEntry[],
-): SystemBarsEntry | null {
-  const mergedEntry = entriesStack.reduce<SystemBarsEntry>(
+function mergeEntriesStack(entriesStack: SystemBarsEntry[]) {
+  return entriesStack.reduce<{
+    statusBarStyle: SystemBarStyle | undefined;
+    navigationBarStyle: SystemBarStyle | undefined;
+    statusBarHidden: boolean;
+    navigationBarHidden: boolean;
+  }>(
     (prev, cur) => {
       for (const prop in cur) {
         if (cur[prop as keyof SystemBarsEntry] != null) {
@@ -25,22 +36,11 @@ function mergeEntriesStack(
     },
     {
       statusBarStyle: undefined,
-      statusBarHidden: undefined,
       navigationBarStyle: undefined,
-      navigationBarHidden: undefined,
+      statusBarHidden: false,
+      navigationBarHidden: false,
     },
   );
-
-  if (
-    mergedEntry.statusBarStyle == null &&
-    mergedEntry.statusBarHidden == null &&
-    mergedEntry.navigationBarStyle == null &&
-    mergedEntry.navigationBarHidden == null
-  ) {
-    return null;
-  } else {
-    return mergedEntry;
-  }
 }
 
 /**
@@ -50,14 +50,14 @@ function createStackEntry(props: SystemBarsProps): SystemBarsEntry {
   return {
     statusBarStyle:
       typeof props.style === "string" ? props.style : props.style?.statusBar,
-    statusBarHidden:
-      typeof props.hidden === "boolean"
-        ? props.hidden
-        : props.hidden?.statusBar,
     navigationBarStyle:
       typeof props.style === "string"
         ? props.style
         : props.style?.navigationBar,
+    statusBarHidden:
+      typeof props.hidden === "boolean"
+        ? props.hidden
+        : props.hidden?.statusBar,
     navigationBarHidden:
       typeof props.hidden === "boolean"
         ? props.hidden
@@ -72,11 +72,16 @@ let updateImmediate: NodeJS.Immediate | null = null;
 
 // The current merged values from the entries stack.
 let currentMergedEntries: {
-  statusBarStyle: "light" | "dark" | undefined;
-  statusBarHidden: boolean | undefined;
-  navigationBarStyle: "light" | "dark" | undefined;
-  navigationBarHidden: boolean | undefined;
-} | null = null;
+  statusBarStyle: MergeableBarStyle;
+  navigationBarStyle: MergeableBarStyle;
+  statusBarHidden: boolean;
+  navigationBarHidden: boolean;
+} = {
+  statusBarStyle: undefined,
+  navigationBarStyle: undefined,
+  statusBarHidden: false,
+  navigationBarHidden: false,
+};
 
 /**
  * Updates the native system bars with the entries from the stack.
@@ -88,55 +93,53 @@ function updateEntriesStack() {
     }
 
     updateImmediate = setImmediate(() => {
+      const autoBarStyle = getColorScheme() === "light" ? "dark" : "light";
       const mergedEntries = mergeEntriesStack(entriesStack);
 
-      if (mergedEntries != null) {
-        const { statusBarHidden, navigationBarHidden } = mergedEntries;
-        const autoBarStyle = getColorScheme() === "light" ? "dark" : "light";
-
-        const statusBarStyle: "light" | "dark" | undefined =
-          mergedEntries.statusBarStyle === "auto"
-            ? autoBarStyle
-            : mergedEntries.statusBarStyle;
-
-        const navigationBarStyle: "light" | "dark" | undefined =
-          mergedEntries.navigationBarStyle === "auto"
-            ? autoBarStyle
-            : mergedEntries.navigationBarStyle;
-
-        if (
-          currentMergedEntries?.statusBarStyle !== statusBarStyle ||
-          currentMergedEntries?.statusBarHidden !== statusBarHidden ||
-          currentMergedEntries?.navigationBarStyle !== navigationBarStyle ||
-          currentMergedEntries?.navigationBarHidden !== navigationBarHidden
-        ) {
-          if (Platform.OS === "android") {
-            NativeEdgeToEdgeModule?.setSystemBarsConfig({
-              statusBarStyle,
-              statusBarHidden,
-              navigationBarStyle,
-              navigationBarHidden,
-            });
-          } else {
-            // Emulate android behavior with react-native StatusBar
-            if (statusBarStyle != null) {
-              StatusBar.setBarStyle(`${statusBarStyle}-content`, true);
-            }
-            if (statusBarHidden != null) {
-              StatusBar.setHidden(statusBarHidden, "fade"); // 'slide' doesn't work in this context
-            }
-          }
+      const statusBarStyle: MergeableBarStyle =
+        mergedEntries.statusBarStyle === "auto"
+          ? autoBarStyle
+          : mergedEntries.statusBarStyle;
+
+      const navigationBarStyle: MergeableBarStyle =
+        mergedEntries.navigationBarStyle === "auto"
+          ? autoBarStyle
+          : mergedEntries.navigationBarStyle;
+
+      const { statusBarHidden, navigationBarHidden } = mergedEntries;
+
+      if (statusBarStyle !== currentMergedEntries.statusBarStyle) {
+        const style = toNativeBarStyle(statusBarStyle);
+        console.log({ style });
+
+        Platform.OS === "android"
+          ? NativeModule?.setStatusBarStyle(style)
+          : StatusBar.setBarStyle(style, true);
+      }
+
+      if (statusBarHidden !== currentMergedEntries.statusBarHidden) {
+        Platform.OS === "android"
+          ? NativeModule?.setStatusBarHidden(statusBarHidden)
+          : StatusBar.setHidden(statusBarHidden, "fade"); // 'slide' doesn't work in this context
+      }
+
+      if (Platform.OS === "android") {
+        if (navigationBarStyle !== currentMergedEntries.navigationBarStyle) {
+          const style = toNativeBarStyle(navigationBarStyle);
+          NativeModule?.setNavigationBarStyle(style);
         }
 
-        currentMergedEntries = {
-          statusBarStyle,
-          statusBarHidden,
-          navigationBarStyle,
-          navigationBarHidden,
-        };
-      } else {
-        currentMergedEntries = null;
+        if (navigationBarHidden !== currentMergedEntries.navigationBarHidden) {
+          NativeModule?.setNavigationBarHidden(navigationBarHidden);
+        }
       }
+
+      currentMergedEntries = {
+        statusBarStyle,
+        navigationBarStyle,
+        statusBarHidden,
+        navigationBarHidden,
+      };
     });
   }
 }
@@ -188,10 +191,10 @@ function replaceStackEntry(
 
 export function SystemBars({ hidden, style }: SystemBarsProps) {
   const statusBarStyle = typeof style === "string" ? style : style?.statusBar;
-  const statusBarHidden =
-    typeof hidden === "boolean" ? hidden : hidden?.statusBar;
   const navigationBarStyle =
     typeof style === "string" ? style : style?.navigationBar;
+  const statusBarHidden =
+    typeof hidden === "boolean" ? hidden : hidden?.statusBar;
   const navigationBarHidden =
     typeof hidden === "boolean" ? hidden : hidden?.navigationBar;
 

package/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),
             });
           }
         }