Compat with RN 0.59 on Android

th3rdwave · Jun 9, 2020 · 883bc24 · 883bc24
1 parent 43cb259
commit 883bc24
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewShadowNode.java b/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewShadowNode.java
@@ -123,14 +123,21 @@ private void resetInsets(SafeAreaViewMode mode) {
     }
   }
 
-  @Override
-  public void onBeforeLayout(NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {
+  // The signature for onBeforeLayout is different in RN 0.59.
+  // Remove when we drop support for this version and add back @Override and super call to
+  // onBeforeLayout(NativeViewHierarchyOptimizer).
+  public void onBeforeLayout() {
     if (mNeedsUpdate) {
       mNeedsUpdate = false;
       updateInsets();
     }
+  }
 
-    super.onBeforeLayout(nativeViewHierarchyOptimizer);
+  public void onBeforeLayout(NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {
+    if (mNeedsUpdate) {
+      mNeedsUpdate = false;
+      updateInsets();
+    }
   }
 
   @Override