Rename prop names

Author: kmichalikk

android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabScreen.kt

@@ -58,7 +58,7 @@ class TabScreen(
     }
 
     // Accessibility
-    var tabBarItemTestId: String? by Delegates.observable(null) { _, oldValue, newValue ->
+    var tabBarItemTestID: String? by Delegates.observable(null) { _, oldValue, newValue ->
         updateMenuItemAttributesIfNeeded(oldValue, newValue)
     }
 

android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabScreenViewManager.kt

@@ -181,12 +181,12 @@ class TabScreenViewManager :
         value: String?,
     ) = Unit
 
-    @ReactProp(name = "tabBarItemTestId")
-    override fun setTabBarItemTestId(
+    @ReactProp(name = "tabBarItemTestID")
+    override fun setTabBarItemTestID(
         view: TabScreen,
         value: String?,
     ) {
-        view.tabBarItemTestId = value
+        view.tabBarItemTestID = value
     }
 
     @ReactProp(name = "tabBarItemAccessibilityLabel")

android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabsHostA11yCoordinator.kt

@@ -20,7 +20,7 @@ class TabsHostA11yCoordinator(
         }
 
         // when matching view by id, espresso driver seems to look for tag property
-        menuView.tag = tabScreen.tabBarItemTestId
+        menuView.tag = tabScreen.tabBarItemTestID
     }
 
     fun setA11yPropertiesToTabItems() {

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerDelegate.java

@@ -41,8 +41,8 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "badgeValue":
         mViewManager.setBadgeValue(view, value == null ? null : (String) value);
         break;
-      case "tabBarItemTestId":
-        mViewManager.setTabBarItemTestId(view, value == null ? null : (String) value);
+      case "tabBarItemTestID":
+        mViewManager.setTabBarItemTestID(view, value == null ? null : (String) value);
         break;
       case "tabBarItemAccessibilityLabel":
         mViewManager.setTabBarItemAccessibilityLabel(view, value == null ? null : (String) value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerInterface.java

@@ -21,7 +21,7 @@ public interface RNSBottomTabsScreenManagerInterface<T extends View> extends Vie
   void setTitle(T view, @Nullable String value);
   void setIsTitleUndefined(T view, boolean value);
   void setBadgeValue(T view, @Nullable String value);
-  void setTabBarItemTestId(T view, @Nullable String value);
+  void setTabBarItemTestID(T view, @Nullable String value);
   void setTabBarItemAccessibilityLabel(T view, @Nullable String value);
   void setOrientation(T view, @Nullable String value);
   void setDrawableIconResourceName(T view, @Nullable String value);

apps/src/tests/TestBottomTabs/index.tsx

@@ -31,9 +31,9 @@ const TAB_CONFIGS: TabConfiguration[] = [
           },
         },
       },
-      screenTestId: 'tab-screen-1-id',
-      tabBarItemTestId: 'tab-item-1-id',
-      screenAccessibilityLabel: 'First Tab Screen',
+      testID: 'tab-screen-1-id',
+      accessibilityLabel: 'First Tab Screen',
+      tabBarItemTestID: 'tab-item-1-id',
       tabBarItemAccessibilityLabel: 'First Tab Item',
       tabKey: 'Tab1',
       title: 'Tab1',
@@ -59,9 +59,9 @@ const TAB_CONFIGS: TabConfiguration[] = [
     tabScreenProps: {
       tabKey: 'Tab2',
       badgeValue: 'NEW',
-      screenTestId: 'tab-screen-2-id',
-      tabBarItemTestId: 'tab-item-2-id',
-      screenAccessibilityLabel: 'Second Tab Screen',
+      testID: 'tab-screen-2-id',
+      accessibilityLabel: 'Second Tab Screen',
+      tabBarItemTestID: 'tab-item-2-id',
       tabBarItemAccessibilityLabel: 'Second Tab Item',
       scrollEdgeAppearance: {
         tabBarBackgroundColor: Colors.NavyDark140,
@@ -137,9 +137,9 @@ const TAB_CONFIGS: TabConfiguration[] = [
     tabScreenProps: {
       tabKey: 'Tab3',
       badgeValue: '2137',
-      screenTestId: 'tab-screen-3-id',
-      tabBarItemTestId: 'tab-item-3-id',
-      screenAccessibilityLabel: 'Third Tab Screen',
+      testID: 'tab-screen-3-id',
+      accessibilityLabel: 'Third Tab Screen',
+      tabBarItemTestID: 'tab-item-3-id',
       tabBarItemAccessibilityLabel: 'Third Tab Item',
       scrollEdgeEffects: { bottom: 'hard' },
       tabBarItemBadgeBackgroundColor: Colors.RedDark40,
@@ -176,9 +176,9 @@ const TAB_CONFIGS: TabConfiguration[] = [
   {
     tabScreenProps: {
       tabKey: 'Tab4',
-      screenTestId: 'tab-screen-4-id',
-      tabBarItemTestId: 'tab-item-4-id',
-      screenAccessibilityLabel: 'Fourth Tab Screen',
+      testID: 'tab-screen-4-id',
+      accessibilityLabel: 'Fourth Tab Screen',
+      tabBarItemTestID: 'tab-item-4-id',
       tabBarItemAccessibilityLabel: 'Fourth Tab Item',
       icon: {
         ios: {

ios/bottom-tabs/screen/RNSBottomTabsScreenComponentView.h

@@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable) NSString *tabKey;
 @property (nonatomic, nullable) NSString *badgeValue;
 
-@property (nonatomic, nullable) NSString *tabBarItemTestId;
+@property (nonatomic, nullable) NSString *tabBarItemTestID;
 @property (nonatomic, nullable) NSString *tabBarItemAccessibilityLabel;
 
 @property (nonatomic, readonly) RNSBottomTabsIconType iconType;

ios/bottom-tabs/screen/RNSBottomTabsScreenComponentView.mm

@@ -294,8 +294,8 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     tabBarItemNeedsUpdate = YES;
   }
 
-  if (newComponentProps.tabBarItemTestId != oldComponentProps.tabBarItemTestId) {
-    _tabBarItemTestId = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTestId);
+  if (newComponentProps.tabBarItemTestID != oldComponentProps.tabBarItemTestID) {
+    _tabBarItemTestID = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTestID);
     tabBarItemNeedsRecreation = YES;
   }
 
@@ -351,8 +351,8 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     tabItemNeedsAppearanceUpdate = YES;
   }
 
-  if (newComponentProps.tabBarItemTestId != oldComponentProps.tabBarItemTestId) {
-    _controller.tabItemTestId = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTestId);
+  if (newComponentProps.tabBarItemTestID != oldComponentProps.tabBarItemTestID) {
+    _controller.tabItemTestID = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTestID);
     tabBarItemNeedsA11yUpdate = YES;
   }
 

ios/bottom-tabs/screen/RNSTabsScreenViewController.h

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong, readonly, nullable) RNSBottomTabsScreenComponentView *tabScreenComponentView;
 @property (nonatomic, weak, readonly, nullable) id<RNSBottomTabsSpecialEffectsSupporting> tabsSpecialEffectsDelegate;
-@property (nonatomic, nullable) NSString *tabItemTestId;
+@property (nonatomic, nullable) NSString *tabItemTestID;
 @property (nonatomic, nullable) NSString *tabItemAccessibilityLabel;
 
 /**

ios/bottom-tabs/screen/RNSTabsScreenViewController.mm

@@ -132,7 +132,7 @@ - (RNSOrientation)evaluateOrientation
 
 - (void)updateTabItemA11yProps
 {
-  self.tabBarItem.accessibilityIdentifier = _tabItemTestId;
+  self.tabBarItem.accessibilityIdentifier = _tabItemTestID;
   self.tabBarItem.accessibilityLabel = _tabItemAccessibilityLabel;
 }