react-native-navigation 8.8.11 → 8.9.0

package/ios/BottomTabsBasePresenter.mm

@@ -3,12 +3,30 @@
 #import "RNNConvert.h"
 #import "UIImage+utils.h"
 
-@implementation BottomTabsBasePresenter
+@implementation BottomTabsBasePresenter {
+    BOOL _didApplyInitialTabBarVisibility;
+}
+
+- (BOOL)tabBarVisibilityAnimation:(BOOL)animated {
+    if (@available(iOS 18.0, *)) {
+        return animated;
+    }
+    if (_didApplyInitialTabBarVisibility) {
+        return animated;
+    }
+
+    _didApplyInitialTabBarVisibility = YES;
+    return NO;
+}
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
     [super applyOptionsOnInit:options];
-    UITabBarController *bottomTabs = self.tabBarController;
+    RNNBottomTabsController *bottomTabs = self.tabBarController;
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+    if (@available(iOS 18.0, *)) {
+        [bottomTabs setTabBarVisible:[withDefault.bottomTabs.visible withDefault:YES]
+                            animated:NO];
+    }
     [bottomTabs setCurrentTabIndex:[withDefault.bottomTabs.currentTabIndex withDefault:0]];
     if (withDefault.bottomTabs.currentTabId.hasValue) {
         [bottomTabs setCurrentTabID:withDefault.bottomTabs.currentTabId.get];
@@ -24,7 +42,9 @@
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
 
     [bottomTabs setTabBarTestID:[withDefault.bottomTabs.testID withDefault:nil]];
-    [bottomTabs setTabBarVisible:[withDefault.bottomTabs.visible withDefault:YES]];
+    [bottomTabs reconcileTabBarVisible:[withDefault.bottomTabs.visible withDefault:YES]
+                              animated:[self tabBarVisibilityAnimation:
+                                                 [withDefault.bottomTabs.animate withDefault:YES]]];
 
     [bottomTabs.view setBackgroundColor:[withDefault.layout.backgroundColor withDefault:nil]];
     [bottomTabs setTabBarHideShadow:[withDefault.bottomTabs.hideShadow withDefault:NO]];
@@ -74,12 +94,8 @@
     }
 
     if (mergeOptions.bottomTabs.visible.hasValue) {
-        if (mergeOptions.bottomTabs.animate.hasValue) {
-            [bottomTabs setTabBarVisible:mergeOptions.bottomTabs.visible.get
-                                animated:[mergeOptions.bottomTabs.animate withDefault:NO]];
-        } else {
-            [bottomTabs setTabBarVisible:mergeOptions.bottomTabs.visible.get animated:NO];
-        }
+        [bottomTabs setTabBarVisible:mergeOptions.bottomTabs.visible.get
+                            animated:[withDefault.bottomTabs.animate withDefault:YES]];
     }
 
     if (mergeOptions.layout.backgroundColor.hasValue) {

package/ios/RNNBottomTabsController.h

@@ -28,6 +28,8 @@
 
 - (void)setTabBarVisible:(BOOL)visible;
 
+- (void)reconcileTabBarVisible:(BOOL)visible animated:(BOOL)animated;
+
 - (void)handleTabBarLongPress:(CGPoint)locationInTabBar;
 
 @end

package/ios/RNNBottomTabsController.mm

@@ -290,7 +290,7 @@
                                  tabBarInView.size.width, desiredHeight);
 
     _customRow.frame = rowFrame;
-    _customRow.hidden = self.tabBar.hidden;
+    _customRow.hidden = [self rnn_isTabBarHidden];
     [_customRow setSelectedIndex:_currentTabIndex];
 }
 
@@ -414,8 +414,21 @@
 }
 
 - (void)setTabBarVisible:(BOOL)visible {
+    [self reconcileTabBarVisible:visible animated:NO];
+}
+
+- (void)reconcileTabBarVisible:(BOOL)visible animated:(BOOL)animated {
+    if (@available(iOS 18.0, *)) {
+        BOOL shouldHide = !visible;
+        if (self.tabBarHidden != shouldHide) {
+            [self setTabBarVisible:visible animated:animated];
+        }
+        _tabBarNeedsRestore = NO;
+        return;
+    }
+
     if (_tabBarNeedsRestore || !self.presentedComponentViewController.navigationController) {
-        [self setTabBarVisible:visible animated:NO];
+        [self setTabBarVisible:visible animated:animated];
         _tabBarNeedsRestore = NO;
     }
 }

package/ios/RNNComponentViewController.mm

@@ -1,5 +1,6 @@
 #import "RNNComponentViewController.h"
 #import "AnimationObserver.h"
+#import "UITabBarController+RNNOptions.h"
 
 @implementation RNNComponentViewController {
     NSArray *_reactViewConstraints;
@@ -126,7 +127,7 @@
 }
 
 - (BOOL)shouldDrawBehindBottomTabs {
-    return !self.tabBarController.tabBar || self.tabBarController.tabBar.isHidden ||
+    return !self.tabBarController.tabBar || [self.tabBarController rnn_isTabBarHidden] ||
            _drawBehindBottomTabs;
 }
 

package/ios/UITabBarController+RNNOptions.h

@@ -20,6 +20,8 @@
 
 - (void)hideTabBar:(BOOL)animated;
 
+- (BOOL)rnn_isTabBarHidden;
+
 - (void)syncTabBarItemTestIDs;
 
 @end

package/ios/UITabBarController+RNNOptions.mm

@@ -141,6 +141,11 @@ static const void *RNNOriginalTabBarViewAccessibilityIdentifierKey =
 }
 
 - (void)showTabBar:(BOOL)animated {
+    if (@available(iOS 18.0, *)) {
+        [self setTabBarHidden:NO animated:animated];
+        return;
+    }
+
     static const CGFloat animationDuration = 0.15;
     const CGRect tabBarVisibleFrame = CGRectMake(
         self.tabBar.frame.origin.x, self.view.frame.size.height - self.tabBar.frame.size.height,
@@ -161,6 +166,11 @@ static const void *RNNOriginalTabBarViewAccessibilityIdentifierKey =
 }
 
 - (void)hideTabBar:(BOOL)animated {
+    if (@available(iOS 18.0, *)) {
+        [self setTabBarHidden:YES animated:animated];
+        return;
+    }
+
     static const CGFloat animationDuration = 0.15;
     const CGRect tabBarHiddenFrame =
         CGRectMake(self.tabBar.frame.origin.x, self.view.frame.size.height,
@@ -182,6 +192,14 @@ static const void *RNNOriginalTabBarViewAccessibilityIdentifierKey =
     }
 }
 
+- (BOOL)rnn_isTabBarHidden {
+    if (@available(iOS 18.0, *)) {
+        return self.tabBarHidden;
+    }
+
+    return self.tabBar.hidden;
+}
+
 - (void)forEachTab:(void (^)(UIView *, UIViewController *tabViewController,
                              int tabIndex))performOnTab {
     int tabIndex = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.8.11",
+  "version": "8.9.0",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -183,4 +183,4 @@
       ]
     ]
   }
-}
+}