react-native-navigation 8.7.9-snapshot.2367 → 8.7.9

package/ios/RNNBottomTabsController.mm

@@ -1,5 +1,4 @@
 #import "RNNBottomTabsController.h"
-#import "UITabBarController+RNNOptions.h"
 #import "UITabBarController+RNNUtils.h"
 
 @interface RNNBottomTabsController ()
@@ -101,8 +100,6 @@
     for (UIViewController *child in childViewControllers) {
         [_bottomTabPresenter applyOptions:child.resolveOptions child:child];
     }
-
-    [self syncTabBarItemTestIDs];
 }
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
@@ -114,8 +111,6 @@
     [_dotIndicatorPresenter mergeOptions:options
                          resolvedOptions:childViewController.resolveOptions
                                    child:childViewController];
-
-    [self syncTabBarItemTestIDs];
 }
 
 - (id<UITabBarControllerDelegate>)delegate {
@@ -128,7 +123,6 @@
 
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
-    [self syncTabBarItemTestIDs];
     [self.presenter viewDidLayoutSubviews];
     [_dotIndicatorPresenter bottomTabsDidLayoutSubviews:self];
 }

package/ios/UITabBarController+RNNOptions.h

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

package/ios/UITabBarController+RNNOptions.mm

@@ -1,85 +1,9 @@
 #import "RNNBottomTabsController.h"
 #import "UITabBar+utils.h"
 #import "UITabBarController+RNNOptions.h"
-#import <objc/runtime.h>
-
-static const NSTimeInterval RNNTabBarTestIDRetryDelay = 0.15;
-static const NSUInteger RNNTabBarTestIDMaxRetryAttempts = 5;
-static const void *RNNTabBarTestIDRetryScheduledKey = &RNNTabBarTestIDRetryScheduledKey;
-static const void *RNNTabBarTestIDRetryAttemptsKey = &RNNTabBarTestIDRetryAttemptsKey;
-static const void *RNNOriginalTabBarViewAccessibilityIdentifierKey =
-    &RNNOriginalTabBarViewAccessibilityIdentifierKey;
 
 @implementation UITabBarController (RNNOptions)
 
-- (void)rnn_storeOriginalAccessibilityIdentifierIfNeededForTabView:(UIView *)tabView {
-    if (objc_getAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey))
-        return;
-
-    id originalAccessibilityIdentifier = tabView.accessibilityIdentifier ?: [NSNull null];
-    objc_setAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey,
-                             originalAccessibilityIdentifier,
-                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)rnn_applyTestID:(NSString *)testID toTabView:(UIView *)tabView {
-    [self rnn_storeOriginalAccessibilityIdentifierIfNeededForTabView:tabView];
-    tabView.accessibilityIdentifier = testID;
-}
-
-- (void)rnn_restoreOriginalAccessibilityIdentifierForTabView:(UIView *)tabView {
-    id originalAccessibilityIdentifier =
-        objc_getAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey);
-    if (!originalAccessibilityIdentifier)
-        return;
-
-    tabView.accessibilityIdentifier =
-        [originalAccessibilityIdentifier isKindOfClass:NSNull.class]
-            ? nil
-            : originalAccessibilityIdentifier;
-    objc_setAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey, nil,
-                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (BOOL)rnn_isTabBarTestIDRetryScheduled {
-    return [objc_getAssociatedObject(self, RNNTabBarTestIDRetryScheduledKey) boolValue];
-}
-
-- (void)rnn_setTabBarTestIDRetryScheduled:(BOOL)scheduled {
-    objc_setAssociatedObject(self, RNNTabBarTestIDRetryScheduledKey, @(scheduled),
-                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (NSUInteger)rnn_tabBarTestIDRetryAttempts {
-    NSNumber *retryAttempts = objc_getAssociatedObject(self, RNNTabBarTestIDRetryAttemptsKey);
-    return retryAttempts.unsignedIntegerValue;
-}
-
-- (void)rnn_setTabBarTestIDRetryAttempts:(NSUInteger)retryAttempts {
-    objc_setAssociatedObject(self, RNNTabBarTestIDRetryAttemptsKey, @(retryAttempts),
-                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (BOOL)rnn_applyTabBarItemTestIDs {
-    NSArray<UITabBarItem *> *items = self.tabBar.items ?: @[];
-    BOOL appliedAllKnownTestIDs = YES;
-
-    for (NSUInteger tabIndex = 0; tabIndex < items.count; tabIndex++) {
-        UITabBarItem *item = items[tabIndex];
-        NSString *testID = item.accessibilityIdentifier;
-        UIView *tabView = [self.tabBar tabBarItemViewAtIndex:tabIndex];
-        if (testID.length > 0 && tabView) {
-            [self rnn_applyTestID:testID toTabView:tabView];
-        } else if (tabView) {
-            [self rnn_restoreOriginalAccessibilityIdentifierForTabView:tabView];
-        } else if (testID.length > 0) {
-            appliedAllKnownTestIDs = NO;
-        }
-    }
-
-    return appliedAllKnownTestIDs;
-}
-
 - (void)setCurrentTabIndex:(NSUInteger)currentTabIndex {
     [self setSelectedIndex:currentTabIndex];
 }
@@ -92,38 +16,6 @@ static const void *RNNOriginalTabBarViewAccessibilityIdentifierKey =
     self.tabBar.accessibilityIdentifier = testID;
 }
 
-- (void)syncTabBarItemTestIDs {
-    if ([self rnn_applyTabBarItemTestIDs]) {
-        [self rnn_setTabBarTestIDRetryScheduled:NO];
-        [self rnn_setTabBarTestIDRetryAttempts:0];
-        return;
-    }
-
-    if ([self rnn_isTabBarTestIDRetryScheduled])
-        return;
-
-    NSUInteger retryAttempts = [self rnn_tabBarTestIDRetryAttempts];
-    if (retryAttempts >= RNNTabBarTestIDMaxRetryAttempts) {
-        [self rnn_setTabBarTestIDRetryAttempts:0];
-        return;
-    }
-
-    [self rnn_setTabBarTestIDRetryScheduled:YES];
-    [self rnn_setTabBarTestIDRetryAttempts:retryAttempts + 1];
-
-    __weak UITabBarController *weakSelf = self;
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
-                                 (int64_t)(RNNTabBarTestIDRetryDelay * NSEC_PER_SEC)),
-                   dispatch_get_main_queue(), ^{
-        UITabBarController *controller = weakSelf;
-        if (!controller)
-            return;
-
-        [controller rnn_setTabBarTestIDRetryScheduled:NO];
-        [controller syncTabBarItemTestIDs];
-    });
-}
-
 - (void)setTabBarStyle:(UIBarStyle)barStyle {
     self.tabBar.barStyle = barStyle;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.7.9-snapshot.2367",
+  "version": "8.7.9",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,