react-native-navigation 7.23.1-snapshot.434 → 7.23.1-snapshot.438

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,9 +7,6 @@
7
7
 
8
8
  - (void)applyOptions:(RNNNavigationOptions *)options child:(UIViewController *)child;
9
9
 
10
- - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options
11
- child:(UIViewController *)child;
12
-
13
10
  - (void)createTabBarItem:(UIViewController *)child
14
11
  bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions;
15
12
 
@@ -17,14 +17,6 @@
17
17
  - (void)applyOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
18
18
  RNNNavigationOptions *withDefault = [options withDefault:self.defaultOptions];
19
19
 
20
- [child setTabBarItemBadge:[withDefault.bottomTab.badge withDefault:[NSNull null]]];
21
- [child setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor withDefault:nil]];
22
- }
23
-
24
- - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options
25
- child:(UIViewController *)child {
26
- RNNNavigationOptions *withDefault = [options withDefault:self.defaultOptions];
27
-
28
20
  [self createTabBarItem:child bottomTabOptions:withDefault.bottomTab];
29
21
  [child setTabBarItemBadge:[withDefault.bottomTab.badge withDefault:[NSNull null]]];
30
22
  [child setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor withDefault:nil]];
@@ -24,8 +24,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
24
24
 
25
25
  - (void)applyOptions:(RNNNavigationOptions *)options;
26
26
 
27
- - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options;
28
-
29
27
  - (void)mergeOptions:(RNNNavigationOptions *)options
30
28
  resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
31
29
 
@@ -42,8 +40,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
42
40
 
43
41
  - (UINavigationItem *)currentNavigationItem;
44
42
 
45
- - (void)willMoveToParentViewController:(UIViewController *)parent;
46
-
47
43
  - (UIStatusBarStyle)getStatusBarStyle;
48
44
 
49
45
  - (UIInterfaceOrientationMask)getOrientation;
@@ -40,15 +40,6 @@
40
40
  - (void)componentDidDisappear {
41
41
  }
42
42
 
43
- - (void)willMoveToParentViewController:(UIViewController *)parent {
44
- if (parent) {
45
- RNNNavigationOptions *resolvedOptions = [self.boundViewController resolveOptions];
46
- [self applyOptionsOnWillMoveToParentViewController:resolvedOptions];
47
- [self.boundViewController onChildAddToParent:self.boundViewController
48
- options:resolvedOptions];
49
- }
50
- }
51
-
52
43
  - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {
53
44
  UIViewController *viewController = self.boundViewController;
54
45
  RNNNavigationOptions *withDefault = [initialOptions withDefault:[self defaultOptions]];
@@ -66,9 +57,6 @@
66
57
  - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
67
58
  }
68
59
 
69
- - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
70
- }
71
-
72
60
  - (void)applyOptions:(RNNNavigationOptions *)options {
73
61
  }
74
62
 
@@ -46,6 +46,8 @@
46
46
  }
47
47
  #endif
48
48
 
49
+ [self createTabBarItems:childViewControllers];
50
+
49
51
  self.longPressRecognizer =
50
52
  [[UILongPressGestureRecognizer alloc] initWithTarget:self
51
53
  action:@selector(handleLongPressGesture:)];
@@ -54,16 +56,18 @@
54
56
  return self;
55
57
  }
56
58
 
59
+ - (void)createTabBarItems:(NSArray<UIViewController *> *)childViewControllers {
60
+ for (UIViewController *child in childViewControllers) {
61
+ [_bottomTabPresenter applyOptions:child.resolveOptions child:child];
62
+ }
63
+ }
64
+
57
65
  - (void)viewWillAppear:(BOOL)animated {
58
66
  [super viewWillAppear:animated];
59
67
  _viewWillAppearOnce = YES;
60
68
  [self loadChildren:self.pendingChildViewControllers];
61
69
  }
62
70
 
63
- - (void)onChildAddToParent:(UIViewController *)child options:(RNNNavigationOptions *)options {
64
- [_bottomTabPresenter applyOptionsOnWillMoveToParentViewController:options child:child];
65
- }
66
-
67
71
  - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
68
72
  [super mergeChildOptions:options child:child];
69
73
  UIViewController *childViewController = [self findViewController:child];
@@ -189,10 +193,6 @@
189
193
 
190
194
  #pragma mark - UIViewController overrides
191
195
 
192
- - (void)willMoveToParentViewController:(UIViewController *)parent {
193
- [self.presenter willMoveToParentViewController:parent];
194
- }
195
-
196
196
  - (UIStatusBarStyle)preferredStatusBarStyle {
197
197
  return [self.presenter getStatusBarStyle];
198
198
  }
@@ -41,10 +41,6 @@
41
41
  [_buttonsPresenter componentDidDisappear];
42
42
  }
43
43
 
44
- - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
45
- [super applyOptionsOnWillMoveToParentViewController:options];
46
- }
47
-
48
44
  - (void)applyOptions:(RNNNavigationOptions *)options {
49
45
  [super applyOptions:options];
50
46
 
@@ -224,10 +224,6 @@
224
224
 
225
225
  #pragma mark - UIViewController overrides
226
226
 
227
- - (void)willMoveToParentViewController:(UIViewController *)parent {
228
- [self.presenter willMoveToParentViewController:parent];
229
- }
230
-
231
227
  - (UIStatusBarStyle)preferredStatusBarStyle {
232
228
  return [self.presenter getStatusBarStyle];
233
229
  }
@@ -63,10 +63,6 @@
63
63
 
64
64
  #pragma mark - UIViewController overrides
65
65
 
66
- - (void)willMoveToParentViewController:(UIViewController *)parent {
67
- [self.presenter willMoveToParentViewController:parent];
68
- }
69
-
70
66
  - (UIStatusBarStyle)preferredStatusBarStyle {
71
67
  return [self.presenter getStatusBarStyle];
72
68
  }
@@ -64,10 +64,6 @@
64
64
 
65
65
  #pragma mark - UIViewController overrides
66
66
 
67
- - (void)willMoveToParentViewController:(UIViewController *)parent {
68
- [self.presenter willMoveToParentViewController:parent];
69
- }
70
-
71
67
  - (UIStatusBarStyle)preferredStatusBarStyle {
72
68
  return [self.presenter getStatusBarStyle];
73
69
  }
@@ -170,10 +170,6 @@
170
170
 
171
171
  #pragma mark - UIViewController overrides
172
172
 
173
- - (void)willMoveToParentViewController:(UIViewController *)parent {
174
- [self.presenter willMoveToParentViewController:parent];
175
- }
176
-
177
173
  - (UIStatusBarStyle)preferredStatusBarStyle {
178
174
  return [self.presenter getStatusBarStyle];
179
175
  }
@@ -15,10 +15,6 @@
15
15
 
16
16
  #pragma mark - UIViewController overrides
17
17
 
18
- - (void)willMoveToParentViewController:(UIViewController *)parent {
19
- [self.presenter willMoveToParentViewController:parent];
20
- }
21
-
22
18
  - (UIStatusBarStyle)preferredStatusBarStyle {
23
19
  return [self.presenter getStatusBarStyle];
24
20
  }
@@ -73,10 +73,6 @@
73
73
 
74
74
  #pragma mark - UIViewController overrides
75
75
 
76
- - (void)willMoveToParentViewController:(UIViewController *)parent {
77
- [self.presenter willMoveToParentViewController:parent];
78
- }
79
-
80
76
  - (UIStatusBarStyle)preferredStatusBarStyle {
81
77
  return [self.presenter getStatusBarStyle];
82
78
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-navigation",
3
- "version": "7.23.1-snapshot.434",
3
+ "version": "7.23.1-snapshot.438",
4
4
  "description": "React Native Navigation - truly native navigation for iOS and Android",
5
5
  "license": "MIT",
6
6
  "nativePackage": true,