Add check if UIBarButtonItem is RNNUIBarButtonItem (#5850)

wix · Jan 15, 2020 · 233820e · 233820e
1 parent 721ad9b
commit 233820e
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/lib/ios/RNNNavigationButtons.m b/lib/ios/RNNNavigationButtons.m
@@ -73,23 +73,33 @@ - (NSArray *)currentButtons {
 }
 
 - (void)componentDidAppear {
-    for (RNNUIBarButtonItem* barButtonItem in [self currentButtons]) {
-        [barButtonItem notifyDidAppear];
+    for (UIBarButtonItem* barButtonItem in [self currentButtons]) {
+	  if ([self isRNNUIBarButton:barButtonItem]) {
+		  [(RNNUIBarButtonItem *)barButtonItem notifyDidAppear];
+	  }
     }
 }
 
 - (void)componentDidDisappear {
-    for (RNNUIBarButtonItem* barButtonItem in [self currentButtons]) {
-        [barButtonItem notifyDidDisappear];
+    for (UIBarButtonItem* barButtonItem in [self currentButtons]) {
+	  if ([self isRNNUIBarButton:barButtonItem]) {
+		  [(RNNUIBarButtonItem *)barButtonItem notifyDidDisappear];
+	  }
     }
 }
 
 - (void)notifyButtonsDidAppear:(NSArray *)barButtonItems {
-    for (RNNUIBarButtonItem* barButtonItem in barButtonItems) {
-        [barButtonItem notifyDidAppear];
+    for (UIBarButtonItem* barButtonItem in barButtonItems) {
+	  if ([self isRNNUIBarButton:barButtonItem]) {
+		  [(RNNUIBarButtonItem *)barButtonItem notifyDidAppear];
+	  }
     }
 }
 
+- (BOOL)isRNNUIBarButton:(UIBarButtonItem *)barButtonItem {
+    return [barButtonItem isKindOfClass:[RNNUIBarButtonItem class]];
+}
+
 - (void)clearPreviousButtonViews:(NSArray<UIBarButtonItem *> *)newButtons oldButtons:(NSArray<UIBarButtonItem *> *)oldButtons {
     NSArray<UIBarButtonItem *>* removedButtons = [oldButtons difference:newButtons withPropertyName:@"customView"];