Fix Could not locate shadow view errors (#340)

* Update RNCSafeAreaView.m * Update RNCSafeAreaView.m
th3rdwave · Jan 19, 2023 · a403ff3 · a403ff3
1 parent 3402b4a
commit a403ff3
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/ios/RNCSafeAreaView.m b/ios/RNCSafeAreaView.m
@@ -14,7 +14,7 @@ @implementation RNCSafeAreaView {
   UIEdgeInsets _currentSafeAreaInsets;
   RNCSafeAreaViewMode _mode;
   RNCSafeAreaViewEdges _edges;
-  __weak UIView *_Nullable _providerView;
+  __weak RNCSafeAreaProvider *_Nullable _providerView;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
@@ -55,15 +55,20 @@ - (void)didMoveToWindow
   [self invalidateSafeAreaInsets];
 
   if (previousProviderView != _providerView) {
-    [NSNotificationCenter.defaultCenter
-     removeObserver:self
-     name:RNCSafeAreaDidChange
-     object:previousProviderView];
-    [NSNotificationCenter.defaultCenter
-     addObserver:self
-     selector:@selector(safeAreaProviderInsetsDidChange:)
-     name:RNCSafeAreaDidChange
-     object:_providerView];
+    if (previousProviderView != nil) {
+      [NSNotificationCenter.defaultCenter
+       removeObserver:self
+       name:RNCSafeAreaDidChange
+       object:previousProviderView];
+    }
+
+    if (_providerView != nil) {
+      [NSNotificationCenter.defaultCenter
+       addObserver:self
+       selector:@selector(safeAreaProviderInsetsDidChange:)
+       name:RNCSafeAreaDidChange
+       object:_providerView];
+    }
   }
 }
 
@@ -87,16 +92,16 @@ - (void)invalidateSafeAreaInsets
   [self updateLocalData];
 }
 
-- (UIView *)findNearestProvider
+- (nullable RNCSafeAreaProvider *)findNearestProvider
 {
   UIView *current = self.reactSuperview;
   while (current != nil) {
     if ([current isKindOfClass:RNCSafeAreaProvider.class]) {
-      return current;
+      return (RNCSafeAreaProvider *)current;
     }
     current = current.reactSuperview;
   }
-  return self;
+  return nil;
 }
 
 - (void)updateLocalData