Browse Source

fix flaky top bar transition

yogevbd 6 years ago
parent
commit
3fd9cdfe5b
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      lib/ios/RNNRootViewController.m

+ 3
- 3
lib/ios/RNNRootViewController.m View File

100
 		} if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
100
 		} if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
101
 			self.navigationItem.title = nil;
101
 			self.navigationItem.title = nil;
102
 		}
102
 		}
103
-    } else if (_customTitleView.superview == nil) {
103
+    } else if (_customTitleView && _customTitleView.superview == nil) {
104
         if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
104
         if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
105
             self.navigationItem.title = nil;
105
             self.navigationItem.title = nil;
106
         }
106
         }
120
 		} else if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
120
 		} else if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
121
 			[[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
121
 			[[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
122
 		}
122
 		}
123
-    } else if (_customTopBar.superview == nil) {
123
+    } else if (_customTopBar && _customTopBar.superview == nil) {
124
         if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
124
         if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
125
             [[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
125
             [[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
126
         }
126
         }
140
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
140
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
141
 			self.navigationController.navigationBar.clipsToBounds = NO;
141
 			self.navigationController.navigationBar.clipsToBounds = NO;
142
 		}
142
 		}
143
-    } if (_customTopBarBackground.superview == nil) {
143
+    } if (_customTopBarBackground && _customTopBarBackground.superview == nil) {
144
         if ([[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
144
         if ([[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
145
             [[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
145
             [[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
146
         }
146
         }