npm
/
react-native-navigation
Watch 11
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Override parent options state on mergeOptions

yogevbd 6 years ago
parent
b840dd4181
commit
057335f9fd
6 changed files with 12 additions and 6 deletions
Unified View Show Diff Stats
  1. 2
    1
      lib/ios/RNNNavigationController.m
  2. 2
    1
      lib/ios/RNNSideMenuChildVC.m
  3. 2
    1
      lib/ios/RNNSideMenuController.m
  4. 2
    1
      lib/ios/RNNSplitViewController.m
  5. 2
    1
      lib/ios/RNNTabBarController.m
  6. 2
    1
      lib/ios/RNNTopTabsViewController.m

+ 2
- 1
lib/ios/RNNNavigationController.m View File

73 
 }
 73 
 }
74
74
75 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 75 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
76 
-	[self.presenter present:options onViewControllerWillAppear:self];
76 
+	[self.options mergeOptions:options overrideOptions:YES];
77 
+	[self.presenter present:self.options onViewControllerWillAppear:self];
77 
 }
 78 
 }
78
79
79
80

+ 2
- 1
lib/ios/RNNSideMenuChildVC.m View File

50 
 }
 50 
 }
51
51
52 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 52 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
53 
-	[self.presenter present:options onViewControllerWillAppear:self];
53 
+	[self.options mergeOptions:options overrideOptions:YES];
54 
+	[self.presenter present:self.options onViewControllerWillAppear:self];
54 
 }
 55 
 }
55
56
56 
 - (UIStatusBarStyle)preferredStatusBarStyle {
 57 
 - (UIStatusBarStyle)preferredStatusBarStyle {

+ 2
- 1
lib/ios/RNNSideMenuController.m View File

111 
 }
 111 
 }
112
112
113 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 113 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
114 
-	[self.presenter present:options onViewControllerWillAppear:self];
114 
+	[self.options mergeOptions:options overrideOptions:YES];
115 
+	[self.presenter present:self.options onViewControllerWillAppear:self];
115 
 }
 116 
 }
116
117
117 
 @end
 118 
 @end

+ 2
- 1
lib/ios/RNNSplitViewController.m View File

38 
 }
 38 
 }
39
39
40 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 40 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
41 
-	[self.presenter present:options onViewControllerWillAppear:self];
41 
+	[self.options mergeOptions:options overrideOptions:YES];
42 
+	[self.presenter present:self.options onViewControllerWillAppear:self];
42 
 }
 43 
 }
43
44
44 
 @end
 45 
 @end

+ 2
- 1
lib/ios/RNNTabBarController.m View File

78 
 }
 78 
 }
79
79
80 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 80 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
81 
-	[self.presenter present:options onViewControllerWillAppear:self];
81 
+	[self.options mergeOptions:options overrideOptions:YES];
82 
+	[self.presenter present:self.options onViewControllerWillAppear:self];
82 
 }
 83 
 }
83
84
84 
 #pragma mark UITabBarControllerDelegate
 85 
 #pragma mark UITabBarControllerDelegate

+ 2
- 1
lib/ios/RNNTopTabsViewController.m View File

91 
 }
 91 
 }
92
92
93 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 93 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
94 
-	[self.presenter present:options onViewControllerWillAppear:self];
94 
+	[self.options mergeOptions:options overrideOptions:YES];
95 
+	[self.presenter present:self.options onViewControllerWillAppear:self];
95 
 }
 96 
 }
96
97
97 
 #pragma mark RNNParentProtocol
 98 
 #pragma mark RNNParentProtocol