add insetType prop

Author: kligarski

android/src/main/java/com/swmansion/rnscreens/safearea/InsetType.kt

@@ -0,0 +1,12 @@
+package com.swmansion.rnscreens.safearea
+
+enum class InsetType {
+    ALL,
+    SYSTEM,
+    INTERFACE,
+    ;
+
+    fun containsSystem(): Boolean = this == ALL || this == SYSTEM
+
+    fun containsInterface(): Boolean = this == ALL || this == INTERFACE
+}

android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaView.kt

@@ -37,6 +37,7 @@ class SafeAreaView(
     private var needsInsetsUpdate = false
     private var stateWrapper: StateWrapper? = null
     private var edges: SafeAreaViewEdges? = null
+    private var insetType: InsetType = InsetType.ALL
 
     fun getStateWrapper(): StateWrapper? = stateWrapper
 
@@ -90,7 +91,10 @@ class SafeAreaView(
     fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets) {
         if (newInterfaceInsets != currentInterfaceInsets) {
             currentInterfaceInsets = newInterfaceInsets
-            needsInsetsUpdate = true
+
+            if (insetType.containsInterface()) {
+                needsInsetsUpdate = true
+            }
         }
     }
 
@@ -104,14 +108,20 @@ class SafeAreaView(
 
         if (newSystemInsets != currentSystemInsets) {
             currentSystemInsets = EdgeInsets.fromInsets(newSystemInsets)
-            needsInsetsUpdate = true
+
+            if (insetType.containsSystem()) {
+                needsInsetsUpdate = true
+            }
         }
 
         return WindowInsetsCompat
-            .Builder(insets)
-            .setInsets(WindowInsetsCompat.Type.systemBars(), Insets.NONE)
-//            .setInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars(), Insets.NONE)
-            .setInsets(WindowInsetsCompat.Type.displayCutout(), Insets.NONE)
+            .Builder(insets).apply {
+                if (insetType.containsSystem()) {
+                    setInsets(WindowInsetsCompat.Type.systemBars(), Insets.NONE)
+//                    setInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars(), Insets.NONE)
+                    setInsets(WindowInsetsCompat.Type.displayCutout(), Insets.NONE)
+                }
+            }
             .build()
     }
 
@@ -125,7 +135,11 @@ class SafeAreaView(
     }
 
     private fun updateInsets() {
-        val safeAreaInsets = EdgeInsets.max(currentInterfaceInsets, currentSystemInsets)
+        val safeAreaInsets = EdgeInsets.max(
+            if (insetType.containsInterface()) currentInterfaceInsets else EdgeInsets.NONE,
+            if (insetType.containsSystem()) currentSystemInsets else EdgeInsets.NONE
+        )
+
         val stateWrapper = getStateWrapper()
         if (stateWrapper != null) {
             val insets = Arguments.createMap()
@@ -200,6 +214,16 @@ class SafeAreaView(
         updateInsets()
     }
 
+    fun setInsetType(insetType: InsetType) {
+        this.insetType = insetType
+        requestApplyInsets()
+
+        // We don't want to call updateInsetsIfNeeded here because system insets don't arrive
+        // immediately after requestApplyInsets. We just set the flag to true to make sure the
+        // update is eventually executed, even if we set insetType to `INTERFACE`.
+        needsInsetsUpdate = true
+    }
+
     override fun onPreDraw(): Boolean {
         val didUpdate = updateInsetsIfNeeded()
         if (didUpdate) {

android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaViewManager.kt

@@ -2,6 +2,7 @@
 // https://github.com/AppAndFlow/react-native-safe-area-context/tree/v5.6.1
 package com.swmansion.rnscreens.safearea
 
+import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
@@ -43,6 +44,21 @@ class SafeAreaViewManager :
         }
     }
 
+    @ReactProp(name = "insetType")
+    override fun setInsetType(
+        view: SafeAreaView,
+        value: String?
+    ) {
+        val insetType = when (value) {
+            null, "all" -> InsetType.ALL
+            "system" -> InsetType.SYSTEM
+            "interface" -> InsetType.INTERFACE
+            else -> throw JSApplicationIllegalArgumentException("Unknown inset type $value")
+        }
+
+        view.setInsetType(insetType)
+    }
+
     override fun updateState(
         view: SafeAreaView,
         props: ReactStylesDiffMap?,

android/src/paper/java/com/facebook/react/viewmanagers/RNSSafeAreaViewManagerDelegate.java

@@ -26,6 +26,9 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "edges":
         mViewManager.setEdges(view, (ReadableMap) value);
         break;
+      case "insetType":
+        mViewManager.setInsetType(view, (String) value);
+        break;
       default:
         super.setProperty(view, propName, value);
     }

android/src/paper/java/com/facebook/react/viewmanagers/RNSSafeAreaViewManagerInterface.java

@@ -16,4 +16,5 @@
 
 public interface RNSSafeAreaViewManagerInterface<T extends View>  {
   void setEdges(T view, @Nullable ReadableMap value);
+  void setInsetType(T view, @Nullable String value);
 }

src/components/safe-area/SafeAreaView.types.ts

@@ -4,7 +4,12 @@ import { ViewProps } from 'react-native';
 
 export type Edge = 'top' | 'right' | 'bottom' | 'left';
 
+// Android-only
+export type InsetType = 'all' | 'system' | 'interface';
+
 export interface SafeAreaViewProps extends ViewProps {
   children?: ViewProps['children'];
   edges?: Readonly<Partial<Record<Edge, boolean>>>;
+  // Android-only
+  insetType?: InsetType;
 }

src/fabric/safe-area/SafeAreaViewNativeComponent.ts

@@ -4,6 +4,9 @@
 // eslint-disable-next-line @react-native/no-deep-imports
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import { ViewProps } from 'react-native';
+import { WithDefault } from 'react-native/Libraries/Types/CodegenTypesNamespace';
+
+type InsetType = 'all' | 'system' | 'interface';
 
 export interface NativeProps extends ViewProps {
   edges?: Readonly<{
@@ -12,6 +15,8 @@ export interface NativeProps extends ViewProps {
     bottom: boolean;
     left: boolean;
   }>;
+  // Android-only
+  insetType?: WithDefault<InsetType, 'all'>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNSSafeAreaView', {