1diff --git a/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaView.kt b/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaView.kt 2index ca5646c..fa9c68c 100644 3--- a/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaView.kt 4+++ b/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaView.kt 5@@ -5,27 +5,21 @@ import android.util.Log 6 import android.view.View 7 import android.view.ViewTreeObserver 8 import com.facebook.react.bridge.Arguments 9-import com.facebook.react.uimanager.FabricViewStateManager 10-import com.facebook.react.uimanager.FabricViewStateManager.HasFabricViewStateManager 11+import com.facebook.react.uimanager.StateWrapper 12 import com.facebook.react.uimanager.UIManagerModule 13 import com.facebook.react.views.view.ReactViewGroup 14-import java.util.* 15 import java.util.concurrent.locks.ReentrantLock 16 import kotlin.concurrent.withLock 17 18 private const val MAX_WAIT_TIME_NANO = 500000000L // 500ms 19 20 class SafeAreaView(context: Context?) : 21- ReactViewGroup(context), ViewTreeObserver.OnPreDrawListener, HasFabricViewStateManager { 22+ ReactViewGroup(context), ViewTreeObserver.OnPreDrawListener { 23 private var mMode = SafeAreaViewMode.PADDING 24 private var mInsets: EdgeInsets? = null 25 private var mEdges: SafeAreaViewEdges? = null 26 private var mProviderView: View? = null 27- private val mFabricViewStateManager = FabricViewStateManager() 28- 29- override fun getFabricViewStateManager(): FabricViewStateManager { 30- return mFabricViewStateManager 31- } 32+ var stateWrapper: StateWrapper? = null 33 34 private fun updateInsets() { 35 val insets = mInsets 36@@ -37,12 +31,10 @@ class SafeAreaView(context: Context?) : 37 SafeAreaViewEdgeModes.ADDITIVE, 38 SafeAreaViewEdgeModes.ADDITIVE, 39 SafeAreaViewEdgeModes.ADDITIVE) 40- if (mFabricViewStateManager.hasStateWrapper()) { 41- mFabricViewStateManager.setState { 42- val map = Arguments.createMap() 43- map.putMap("insets", edgeInsetsToJsMap(insets)) 44- map 45- } 46+ if (stateWrapper != null) { 47+ val map = Arguments.createMap() 48+ map.putMap("insets", edgeInsetsToJsMap(insets)) 49+ stateWrapper?.updateState(map) 50 } else { 51 val localData = SafeAreaViewLocalData(insets = insets, mode = mMode, edges = edges) 52 val reactContext = getReactContext(this) 53diff --git a/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt b/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt 54index 114e892..41082b1 100644 55--- a/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt 56+++ b/node_modules/react-native-safe-area-context/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt 57@@ -64,7 +64,7 @@ class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface< 58 props: ReactStylesDiffMap?, 59 stateWrapper: StateWrapper? 60 ): Any? { 61- (view as SafeAreaView).fabricViewStateManager.setStateWrapper(stateWrapper) 62+ (view as SafeAreaView).stateWrapper = stateWrapper 63 return null 64 } 65 66