Преглед на файлове

Override parent options state on mergeOptions

yogevbd преди 6 години
родител
ревизия
057335f9fd

+ 2
- 1
lib/ios/RNNNavigationController.m Целия файл

@@ -73,7 +73,8 @@
73 73
 }
74 74
 
75 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 Целия файл

@@ -50,7 +50,8 @@
50 50
 }
51 51
 
52 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 57
 - (UIStatusBarStyle)preferredStatusBarStyle {

+ 2
- 1
lib/ios/RNNSideMenuController.m Целия файл

@@ -111,7 +111,8 @@
111 111
 }
112 112
 
113 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 118
 @end

+ 2
- 1
lib/ios/RNNSplitViewController.m Целия файл

@@ -38,7 +38,8 @@
38 38
 }
39 39
 
40 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 45
 @end

+ 2
- 1
lib/ios/RNNTabBarController.m Целия файл

@@ -78,7 +78,8 @@
78 78
 }
79 79
 
80 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 85
 #pragma mark UITabBarControllerDelegate

+ 2
- 1
lib/ios/RNNTopTabsViewController.m Целия файл

@@ -91,7 +91,8 @@
91 91
 }
92 92
 
93 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 98
 #pragma mark RNNParentProtocol