@sdcx/overlay 0.4.0 → 0.5.0

package/RNOverlay.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage     = package["homepage"]
   s.license      = package["license"]
   s.authors      = package["author"]
-  s.platforms    = { :ios => "10.0" }
+  s.platforms    = { :ios => "11.0" }
   s.source       = { :git => "https://github.com/github-account/overlay.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/Overlay/**/*.{h,m,mm}"

package/android/build.gradle

@@ -32,4 +32,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.facebook.react:react-native:+'
+    implementation "androidx.appcompat:appcompat:1.3.1"
 }

package/android/src/main/java/com/reactnative/overlay/OverlayModule.java

@@ -3,10 +3,13 @@ package com.reactnative.overlay;
 import android.app.Activity;
 
 import androidx.annotation.NonNull;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.facebook.common.logging.FLog;
 import com.facebook.react.ReactNativeHost;
-import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -14,6 +17,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.PixelUtil;
 
 import java.util.HashMap;
 public class OverlayModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
@@ -69,14 +73,14 @@ public class OverlayModule extends ReactContextBaseJavaModule implements Lifecyc
             }
             
             int id = options.getInt("id");
-            WritableMap props = Arguments.createMap();
-            props.putInt("id", id);
+            WritableMap props = JavaOnlyMap.deepClone(options);
+            props.putMap("insets", getInsets(activity));
             overlay = new Overlay(activity, moduleName, reactNativeHost.getReactInstanceManager());
             overlay.show(props, options);
             overlays.put(genOverlayKey(moduleName, id), overlay);
         });
     }
-
+    
     @ReactMethod
     public void hide(String moduleName, int id) {
         UiThreadUtil.runOnUiThread(() -> {
@@ -108,4 +112,18 @@ public class OverlayModule extends ReactContextBaseJavaModule implements Lifecyc
     private String genOverlayKey(String moduleName, int id) {
         return moduleName + "-" + id;
     }
+    
+    private ReadableMap getInsets(Activity activity) {
+        WindowInsetsCompat windowInsets = ViewCompat.getRootWindowInsets(activity.getWindow().getDecorView());
+        assert windowInsets != null;
+        Insets navigationBarInsets = windowInsets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.navigationBars());
+        Insets statusBarInsets = windowInsets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.statusBars());
+        Insets displayCutoutInsets = windowInsets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.displayCutout());
+        WritableMap insets = new JavaOnlyMap();
+        insets.putDouble("left", PixelUtil.toDIPFromPixel(Math.max(navigationBarInsets.left, displayCutoutInsets.left)));
+        insets.putDouble("top", PixelUtil.toDIPFromPixel(statusBarInsets.top));
+        insets.putDouble("right", PixelUtil.toDIPFromPixel(Math.max(navigationBarInsets.right, displayCutoutInsets.right)));
+        insets.putDouble("bottom", PixelUtil.toDIPFromPixel(navigationBarInsets.bottom));
+        return insets;
+    }
 }

package/ios/Overlay/RNOverlayModule.m

@@ -61,7 +61,18 @@ RCT_EXPORT_METHOD(show:(NSString *)moduleName options:(NSDictionary *)options) {
     overlay = [[RNOverlay alloc] initWithModuleName:moduleName bridge:self.bridge];
     self.overlays[key] = overlay;
     
-    [overlay show:@{@"id": options[@"id"]} options:options];
+    UIWindow *window = RCTKeyWindow();
+    UIEdgeInsets safeAreaInsets = window.safeAreaInsets;
+    NSDictionary* insets = @{
+      @"top" : @(safeAreaInsets.top),
+      @"right" : @(safeAreaInsets.right),
+      @"bottom" : @(safeAreaInsets.bottom),
+      @"left" : @(safeAreaInsets.left),
+    };
+    
+    NSMutableDictionary *props = [options mutableCopy];
+    [props setObject:insets forKey:@"insets"];
+    [overlay show:props options:options];
 }
 
 RCT_EXPORT_METHOD(hide:(NSString *)moduleName id:(nonnull NSNumber *)id) {

package/lib/index.d.ts

@@ -1,7 +1,11 @@
+import { Insets } from 'react-native';
 export interface OverlayOptions {
     id: number;
     passThroughTouches?: boolean;
 }
+export interface OverlayProps extends OverlayOptions {
+    insets: Insets;
+}
 declare function show(moduleName: string, options: OverlayOptions): void;
 declare function hide(moduleName: string, id: number): void;
 declare const Overlay: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sdcx/overlay",
   "description": "A react-native Overlay component.",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "react-native": "src/index",

package/src/index.ts

@@ -1,10 +1,14 @@
-import { NativeModule, NativeModules } from 'react-native'
+import { Insets, NativeModule, NativeModules } from 'react-native'
 
 export interface OverlayOptions {
   id: number
   passThroughTouches?: boolean
 }
 
+export interface OverlayProps extends OverlayOptions {
+  insets: Insets
+}
+
 interface OverlayInterface extends NativeModule {
   show(moduleName: string, options: OverlayOptions): void
   hide(moduleName: string, id: number): void