react-native-edge-to-edge 1.4.0 → 1.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/commonjs/expo.js +29 -10
  2. package/dist/commonjs/expo.js.map +1 -1
  3. package/dist/module/expo.js +29 -10
  4. package/dist/module/expo.js.map +1 -1
  5. package/dist/typescript/expo.d.ts.map +1 -1
  6. package/package.json +1 -1
  7. package/src/expo.ts +29 -11
package/dist/commonjs/expo.js CHANGED
@@ -19,11 +19,15 @@ const withAndroidEdgeToEdgeTheme = (config, props = {}) => {
19
19
  const cleanupList = new Set(["enforceNavigationBarContrast", "android:enforceNavigationBarContrast", "android:enforceStatusBarContrast", "android:fitsSystemWindows", "android:navigationBarColor", "android:statusBarColor", "android:windowDrawsSystemBarBackgrounds", "android:windowLayoutInDisplayCutoutMode", "android:windowLightNavigationBar", "android:windowLightStatusBar", "android:windowTranslucentNavigation", "android:windowTranslucentStatus"]);
20
20
  return (0, _configPlugins.withAndroidStyles)(config, config => {
21
21
  const {
22
+ androidNavigationBar = {},
22
23
  androidStatusBar = {},
23
24
  userInterfaceStyle = "light"
24
25
  } = config;
25
26
  const {
26
- barStyle
27
+ barStyle: navigationBarStyle
28
+ } = androidNavigationBar;
29
+ const {
30
+ barStyle: statusBarStyle
27
31
  } = androidStatusBar;
28
32
  const {
29
33
  android = {}
@@ -38,27 +42,42 @@ const withAndroidEdgeToEdgeTheme = (config, props = {}) => {
38
42
  if (style.item != null) {
39
43
  style.item = style.item.filter(item => !cleanupList.has(item.$.name));
40
44
  }
41
- if (enforceNavigationBarContrast === false) {
45
+ if (statusBarStyle != null) {
42
46
  style.item.push({
43
47
  $: {
44
- name: "enforceNavigationBarContrast"
48
+ name: "android:windowLightStatusBar"
45
49
  },
46
- _: String(false)
50
+ _: String(statusBarStyle === "dark-content")
47
51
  });
48
- }
49
- if (barStyle != null) {
52
+ } else if (userInterfaceStyle !== "automatic") {
50
53
  style.item.push({
51
54
  $: {
52
55
  name: "android:windowLightStatusBar"
53
56
  },
54
- _: String(barStyle === "dark-content")
57
+ _: String(userInterfaceStyle === "light")
55
58
  });
56
- } else if (userInterfaceStyle !== "automatic") {
59
+ }
60
+ if (enforceNavigationBarContrast === false) {
61
+ if (navigationBarStyle != null) {
62
+ style.item.push({
63
+ $: {
64
+ name: "android:windowLightNavigationBar"
65
+ },
66
+ _: String(navigationBarStyle === "dark-content")
67
+ });
68
+ } else if (userInterfaceStyle !== "automatic") {
69
+ style.item.push({
70
+ $: {
71
+ name: "android:windowLightNavigationBar"
72
+ },
73
+ _: String(navigationBarStyle === "light")
74
+ });
75
+ }
57
76
  style.item.push({
58
77
  $: {
59
- name: "android:windowLightStatusBar"
78
+ name: "enforceNavigationBarContrast"
60
79
  },
61
- _: String(userInterfaceStyle === "light")
80
+ _: String(false)
62
81
  });
63
82
  }
64
83
  }
package/dist/commonjs/expo.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_configPlugins","require","withAndroidEdgeToEdgeTheme","config","props","themes","Default","Material2","Material3","Light","cleanupList","Set","withAndroidStyles","androidStatusBar","userInterfaceStyle","barStyle","android","enforceNavigationBarContrast","parentTheme","modResults","resources","style","map","$","name","parent","item","filter","has","push","_","String","_default","exports","default","createRunOncePlugin"],"sourceRoot":"../../src","sources":["expo.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAuBA,MAAMC,0BAA+C,GAAGA,CACtDC,MAAM,EACNC,KAAK,GAAG,CAAC,CAAC,KACP;EACH,MAAMC,MAAmC,GAAG;IAC1CC,OAAO,EAAE,kBAAkB;IAC3BC,SAAS,EAAE,4BAA4B;IACvCC,SAAS,EAAE,4BAA4B;IACvC,mBAAmB,EAAE,oCAAoC;IAEzDC,KAAK,EAAE,wBAAwB;IAC/B,iBAAiB,EAAE,kCAAkC;IACrD,iBAAiB,EAAE,kCAAkC;IACrD,yBAAyB,EAAE;EAC7B,CAAC;EAED,MAAMC,WAAW,GAAG,IAAIC,GAAG,CAAC,CAC1B,8BAA8B,EAC9B,sCAAsC,EACtC,kCAAkC,EAClC,2BAA2B,EAC3B,4BAA4B,EAC5B,wBAAwB,EACxB,yCAAyC,EACzC,yCAAyC,EACzC,kCAAkC,EAClC,8BAA8B,EAC9B,qCAAqC,EACrC,iCAAiC,CAClC,CAAC;EAEF,OAAO,IAAAC,gCAAiB,EAACT,MAAM,EAAGA,MAAM,IAAK;IAC3C,MAAM;MAAEU,gBAAgB,GAAG,CAAC,CAAC;MAAEC,kBAAkB,GAAG;IAAQ,CAAC,GAAGX,MAAM;IACtE,MAAM;MAAEY;IAAS,CAAC,GAAGF,gBAAgB;IACrC,MAAM;MAAEG,OAAO,GAAG,CAAC;IAAE,CAAC,GAAGZ,KAAK;IAC9B,MAAM;MAAEa,4BAA4B;MAAEC,WAAW,GAAG;IAAU,CAAC,GAAGF,OAAO;IAEzEb,MAAM,CAACgB,UAAU,CAACC,SAAS,CAACC,KAAK,GAAGlB,MAAM,CAACgB,UAAU,CAACC,SAAS,CAACC,KAAK,EAAEC,GAAG,CACvED,KAAK,IAAmB;MACvB,IAAIA,KAAK,CAACE,CAAC,CAACC,IAAI,KAAK,UAAU,EAAE;QAC/BH,KAAK,CAACE,CAAC,CAACE,MAAM,GAAGpB,MAAM,CAACa,WAAW,CAAC,IAAIb,MAAM,CAAC,SAAS,CAAC;QAEzD,IAAIgB,KAAK,CAACK,IAAI,IAAI,IAAI,EAAE;UACtBL,KAAK,CAACK,IAAI,GAAGL,KAAK,CAACK,IAAI,CAACC,MAAM,CAC3BD,IAAI,IAAK,CAAChB,WAAW,CAACkB,GAAG,CAACF,IAAI,CAACH,CAAC,CAACC,IAAI,CACxC,CAAC;QACH;QAEA,IAAIP,4BAA4B,KAAK,KAAK,EAAE;UAC1CI,KAAK,CAACK,IAAI,CAACG,IAAI,CAAC;YACdN,CAAC,EAAE;cAAEC,IAAI,EAAE;YAA+B,CAAC;YAC3CM,CAAC,EAAEC,MAAM,CAAC,KAAK;UACjB,CAAC,CAAC;QACJ;QAEA,IAAIhB,QAAQ,IAAI,IAAI,EAAE;UACpBM,KAAK,CAACK,IAAI,CAACG,IAAI,CAAC;YACdN,CAAC,EAAE;cAAEC,IAAI,EAAE;YAA+B,CAAC;YAC3CM,CAAC,EAAEC,MAAM,CAAChB,QAAQ,KAAK,cAAc;UACvC,CAAC,CAAC;QACJ,CAAC,MAAM,IAAID,kBAAkB,KAAK,WAAW,EAAE;UAC7CO,KAAK,CAACK,IAAI,CAACG,IAAI,CAAC;YACdN,CAAC,EAAE;cAAEC,IAAI,EAAE;YAA+B,CAAC;YAC3CM,CAAC,EAAEC,MAAM,CAACjB,kBAAkB,KAAK,OAAO;UAC1C,CAAC,CAAC;QACJ;MACF;MAEA,OAAOO,KAAK;IACd,CACF,CAAC;IAED,OAAOlB,MAAM;EACf,CAAC,CAAC;AACJ,CAAC;AAAC,IAAA6B,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa,IAAAC,kCAAmB,EAChCjC,0BAA0B,EAC1B,2BACF,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_configPlugins","require","withAndroidEdgeToEdgeTheme","config","props","themes","Default","Material2","Material3","Light","cleanupList","Set","withAndroidStyles","androidNavigationBar","androidStatusBar","userInterfaceStyle","barStyle","navigationBarStyle","statusBarStyle","android","enforceNavigationBarContrast","parentTheme","modResults","resources","style","map","$","name","parent","item","filter","has","push","_","String","_default","exports","default","createRunOncePlugin"],"sourceRoot":"../../src","sources":["expo.ts"],"mappings":"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","ignoreList":[]}
package/dist/module/expo.js CHANGED
@@ -15,11 +15,15 @@ const withAndroidEdgeToEdgeTheme = (config, props = {}) => {
15
15
  const cleanupList = new Set(["enforceNavigationBarContrast", "android:enforceNavigationBarContrast", "android:enforceStatusBarContrast", "android:fitsSystemWindows", "android:navigationBarColor", "android:statusBarColor", "android:windowDrawsSystemBarBackgrounds", "android:windowLayoutInDisplayCutoutMode", "android:windowLightNavigationBar", "android:windowLightStatusBar", "android:windowTranslucentNavigation", "android:windowTranslucentStatus"]);
16
16
  return withAndroidStyles(config, config => {
17
17
  const {
18
+ androidNavigationBar = {},
18
19
  androidStatusBar = {},
19
20
  userInterfaceStyle = "light"
20
21
  } = config;
21
22
  const {
22
- barStyle
23
+ barStyle: navigationBarStyle
24
+ } = androidNavigationBar;
25
+ const {
26
+ barStyle: statusBarStyle
23
27
  } = androidStatusBar;
24
28
  const {
25
29
  android = {}
@@ -34,27 +38,42 @@ const withAndroidEdgeToEdgeTheme = (config, props = {}) => {
34
38
  if (style.item != null) {
35
39
  style.item = style.item.filter(item => !cleanupList.has(item.$.name));
36
40
  }
37
- if (enforceNavigationBarContrast === false) {
41
+ if (statusBarStyle != null) {
38
42
  style.item.push({
39
43
  $: {
40
- name: "enforceNavigationBarContrast"
44
+ name: "android:windowLightStatusBar"
41
45
  },
42
- _: String(false)
46
+ _: String(statusBarStyle === "dark-content")
43
47
  });
44
- }
45
- if (barStyle != null) {
48
+ } else if (userInterfaceStyle !== "automatic") {
46
49
  style.item.push({
47
50
  $: {
48
51
  name: "android:windowLightStatusBar"
49
52
  },
50
- _: String(barStyle === "dark-content")
53
+ _: String(userInterfaceStyle === "light")
51
54
  });
52
- } else if (userInterfaceStyle !== "automatic") {
55
+ }
56
+ if (enforceNavigationBarContrast === false) {
57
+ if (navigationBarStyle != null) {
58
+ style.item.push({
59
+ $: {
60
+ name: "android:windowLightNavigationBar"
61
+ },
62
+ _: String(navigationBarStyle === "dark-content")
63
+ });
64
+ } else if (userInterfaceStyle !== "automatic") {
65
+ style.item.push({
66
+ $: {
67
+ name: "android:windowLightNavigationBar"
68
+ },
69
+ _: String(navigationBarStyle === "light")
70
+ });
71
+ }
53
72
  style.item.push({
54
73
  $: {
55
- name: "android:windowLightStatusBar"
74
+ name: "enforceNavigationBarContrast"
56
75
  },
57
- _: String(userInterfaceStyle === "light")
76
+ _: String(false)
58
77
  });
59
78
  }
60
79
  }
package/dist/module/expo.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["createRunOncePlugin","withAndroidStyles","withAndroidEdgeToEdgeTheme","config","props","themes","Default","Material2","Material3","Light","cleanupList","Set","androidStatusBar","userInterfaceStyle","barStyle","android","enforceNavigationBarContrast","parentTheme","modResults","resources","style","map","$","name","parent","item","filter","has","push","_","String"],"sourceRoot":"../../src","sources":["expo.ts"],"mappings":";;AAAA,SAEEA,mBAAmB,EACnBC,iBAAiB,QACZ,sBAAsB;AAmB7B,MAAMC,0BAA+C,GAAGA,CACtDC,MAAM,EACNC,KAAK,GAAG,CAAC,CAAC,KACP;EACH,MAAMC,MAAmC,GAAG;IAC1CC,OAAO,EAAE,kBAAkB;IAC3BC,SAAS,EAAE,4BAA4B;IACvCC,SAAS,EAAE,4BAA4B;IACvC,mBAAmB,EAAE,oCAAoC;IAEzDC,KAAK,EAAE,wBAAwB;IAC/B,iBAAiB,EAAE,kCAAkC;IACrD,iBAAiB,EAAE,kCAAkC;IACrD,yBAAyB,EAAE;EAC7B,CAAC;EAED,MAAMC,WAAW,GAAG,IAAIC,GAAG,CAAC,CAC1B,8BAA8B,EAC9B,sCAAsC,EACtC,kCAAkC,EAClC,2BAA2B,EAC3B,4BAA4B,EAC5B,wBAAwB,EACxB,yCAAyC,EACzC,yCAAyC,EACzC,kCAAkC,EAClC,8BAA8B,EAC9B,qCAAqC,EACrC,iCAAiC,CAClC,CAAC;EAEF,OAAOV,iBAAiB,CAACE,MAAM,EAAGA,MAAM,IAAK;IAC3C,MAAM;MAAES,gBAAgB,GAAG,CAAC,CAAC;MAAEC,kBAAkB,GAAG;IAAQ,CAAC,GAAGV,MAAM;IACtE,MAAM;MAAEW;IAAS,CAAC,GAAGF,gBAAgB;IACrC,MAAM;MAAEG,OAAO,GAAG,CAAC;IAAE,CAAC,GAAGX,KAAK;IAC9B,MAAM;MAAEY,4BAA4B;MAAEC,WAAW,GAAG;IAAU,CAAC,GAAGF,OAAO;IAEzEZ,MAAM,CAACe,UAAU,CAACC,SAAS,CAACC,KAAK,GAAGjB,MAAM,CAACe,UAAU,CAACC,SAAS,CAACC,KAAK,EAAEC,GAAG,CACvED,KAAK,IAAmB;MACvB,IAAIA,KAAK,CAACE,CAAC,CAACC,IAAI,KAAK,UAAU,EAAE;QAC/BH,KAAK,CAACE,CAAC,CAACE,MAAM,GAAGnB,MAAM,CAACY,WAAW,CAAC,IAAIZ,MAAM,CAAC,SAAS,CAAC;QAEzD,IAAIe,KAAK,CAACK,IAAI,IAAI,IAAI,EAAE;UACtBL,KAAK,CAACK,IAAI,GAAGL,KAAK,CAACK,IAAI,CAACC,MAAM,CAC3BD,IAAI,IAAK,CAACf,WAAW,CAACiB,GAAG,CAACF,IAAI,CAACH,CAAC,CAACC,IAAI,CACxC,CAAC;QACH;QAEA,IAAIP,4BAA4B,KAAK,KAAK,EAAE;UAC1CI,KAAK,CAACK,IAAI,CAACG,IAAI,CAAC;YACdN,CAAC,EAAE;cAAEC,IAAI,EAAE;YAA+B,CAAC;YAC3CM,CAAC,EAAEC,MAAM,CAAC,KAAK;UACjB,CAAC,CAAC;QACJ;QAEA,IAAIhB,QAAQ,IAAI,IAAI,EAAE;UACpBM,KAAK,CAACK,IAAI,CAACG,IAAI,CAAC;YACdN,CAAC,EAAE;cAAEC,IAAI,EAAE;YAA+B,CAAC;YAC3CM,CAAC,EAAEC,MAAM,CAAChB,QAAQ,KAAK,cAAc;UACvC,CAAC,CAAC;QACJ,CAAC,MAAM,IAAID,kBAAkB,KAAK,WAAW,EAAE;UAC7CO,KAAK,CAACK,IAAI,CAACG,IAAI,CAAC;YACdN,CAAC,EAAE;cAAEC,IAAI,EAAE;YAA+B,CAAC;YAC3CM,CAAC,EAAEC,MAAM,CAACjB,kBAAkB,KAAK,OAAO;UAC1C,CAAC,CAAC;QACJ;MACF;MAEA,OAAOO,KAAK;IACd,CACF,CAAC;IAED,OAAOjB,MAAM;EACf,CAAC,CAAC;AACJ,CAAC;AAED,eAAeH,mBAAmB,CAChCE,0BAA0B,EAC1B,2BACF,CAAC","ignoreList":[]}
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":[]}
package/dist/typescript/expo.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expo.d.ts","sourceRoot":"","sources":["../../src/expo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GACZ,SAAS,GACT,WAAW,GACX,WAAW,GACX,mBAAmB,GACnB,OAAO,GACP,iBAAiB,GACjB,iBAAiB,GACjB,yBAAyB,CAAC;AAE9B,KAAK,YAAY,GAAG;IAClB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,KAAK,KAAK,GAAG;IAAE,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,GAAG,SAAS,CAAC;;AA8EpD,wBAGE"}
1
+ {"version":3,"file":"expo.d.ts","sourceRoot":"","sources":["../../src/expo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GACZ,SAAS,GACT,WAAW,GACX,WAAW,GACX,mBAAmB,GACnB,OAAO,GACP,iBAAiB,GACjB,iBAAiB,GACjB,yBAAyB,CAAC;AAE9B,KAAK,YAAY,GAAG;IAClB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,KAAK,KAAK,GAAG;IAAE,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,GAAG,SAAS,CAAC;;AAgGpD,wBAGE"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-edge-to-edge",
3
- "version": "1.4.0",
3
+ "version": "1.4.2",
4
4
  "license": "MIT",
5
5
  "description": "Effortlessly enable edge-to-edge display in React Native",
6
6
  "author": "Mathieu Acthernoene <zoontek@gmail.com>",
package/src/expo.ts CHANGED
@@ -53,8 +53,14 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
53
53
  ]);
54
54
 
55
55
  return withAndroidStyles(config, (config) => {
56
- const { androidStatusBar = {}, userInterfaceStyle = "light" } = config;
57
- const { barStyle } = androidStatusBar;
56
+ const {
57
+ androidNavigationBar = {},
58
+ androidStatusBar = {},
59
+ userInterfaceStyle = "light",
60
+ } = config;
61
+
62
+ const { barStyle: navigationBarStyle } = androidNavigationBar;
63
+ const { barStyle: statusBarStyle } = androidStatusBar;
58
64
  const { android = {} } = props;
59
65
  const { enforceNavigationBarContrast, parentTheme = "Default" } = android;
60
66
 
@@ -69,17 +75,10 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
69
75
  );
70
76
  }
71
77
 
72
- if (enforceNavigationBarContrast === false) {
73
- style.item.push({
74
- $: { name: "enforceNavigationBarContrast" },
75
- _: String(false),
76
- });
77
- }
78
-
79
- if (barStyle != null) {
78
+ if (statusBarStyle != null) {
80
79
  style.item.push({
81
80
  $: { name: "android:windowLightStatusBar" },
82
- _: String(barStyle === "dark-content"),
81
+ _: String(statusBarStyle === "dark-content"),
83
82
  });
84
83
  } else if (userInterfaceStyle !== "automatic") {
85
84
  style.item.push({
@@ -87,6 +86,25 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
87
86
  _: String(userInterfaceStyle === "light"),
88
87
  });
89
88
  }
89
+
90
+ if (enforceNavigationBarContrast === false) {
91
+ if (navigationBarStyle != null) {
92
+ style.item.push({
93
+ $: { name: "android:windowLightNavigationBar" },
94
+ _: String(navigationBarStyle === "dark-content"),
95
+ });
96
+ } else if (userInterfaceStyle !== "automatic") {
97
+ style.item.push({
98
+ $: { name: "android:windowLightNavigationBar" },
99
+ _: String(navigationBarStyle === "light"),
100
+ });
101
+ }
102
+
103
+ style.item.push({
104
+ $: { name: "enforceNavigationBarContrast" },
105
+ _: String(false),
106
+ });
107
+ }
90
108
  }
91
109
 
92
110
  return style;