react-native-navigation 7.39.2 → 7.40.0

package/lib/Mock/Components/TopBar.tsx

@@ -26,13 +26,16 @@ export const TopBar = class extends Component<TopBarProps> {
 
   render() {
     const topBarOptions = this.props.topBarOptions;
+    const topbarTestId = topBarOptions?.testID;
+    const titleTestId = topbarTestId ? { testID: `${topbarTestId}.title` } : {};
+    const subtitleTestId = topbarTestId ? { testID: `${topbarTestId}.subtitle` } : {};
     if (topBarOptions?.visible === false) return null;
     else {
       const component = topBarOptions?.title?.component;
       return (
-        <View testID={topBarOptions?.testID}>
-          <Text>{topBarOptions?.title?.text}</Text>
-          <Text>{topBarOptions?.subtitle?.text}</Text>
+        <View testID={topbarTestId}>
+          <Text {...titleTestId}>{topBarOptions?.title?.text}</Text>
+          <Text {...subtitleTestId}>{topBarOptions?.subtitle?.text}</Text>
           {this.renderButtons(topBarOptions?.leftButtons)}
           {this.renderButtons(topBarOptions?.rightButtons)}
           {component &&

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/TopBar.java

@@ -181,6 +181,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
 
     public void setTestId(String testId) {
         setTag(testId);
+        titleAndButtonsContainer.setTestId(testId);
     }
 
     public void setTitleTextColor(@ColorInt int color) {

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleAndButtonsContainer.kt

@@ -99,6 +99,10 @@ class TitleAndButtonsContainer(context: Context) : ViewGroup(context) {
         clearComponent()
     }
 
+    fun setTestId(testId: String) {
+        titleSubTitleBar.setTestId(testId)
+    }
+
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         val titleComponent = getTitleComponent()
         val isCenter = titleComponentAlignment == Alignment.Center

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleSubTitleLayout.kt

@@ -75,6 +75,16 @@ class TitleSubTitleLayout(context: Context) : LinearLayout(context) {
         }
     }
 
+    fun setTestId(testId: String) {
+        if (testId.isEmpty()) {
+            this.titleTextView.tag = null
+            this.subTitleTextView.tag = null
+        } else {
+            this.titleTextView.tag = "$testId.title"
+            this.subTitleTextView.tag = "$testId.subtitle"
+        }
+    }
+
     fun getTitle() = (this.titleTextView.text ?: "").toString()
 
     fun clear() {

package/lib/dist/Mock/Components/TopBar.js

@@ -15,13 +15,16 @@ const TopBar = class extends react_1.Component {
     }
     render() {
         const topBarOptions = this.props.topBarOptions;
+        const topbarTestId = topBarOptions?.testID;
+        const titleTestId = topbarTestId ? { testID: `${topbarTestId}.title` } : {};
+        const subtitleTestId = topbarTestId ? { testID: `${topbarTestId}.subtitle` } : {};
         if (topBarOptions?.visible === false)
             return null;
         else {
             const component = topBarOptions?.title?.component;
-            return (react_1.default.createElement(react_native_1.View, { testID: topBarOptions?.testID },
-                react_1.default.createElement(react_native_1.Text, null, topBarOptions?.title?.text),
-                react_1.default.createElement(react_native_1.Text, null, topBarOptions?.subtitle?.text),
+            return (react_1.default.createElement(react_native_1.View, { testID: topbarTestId },
+                react_1.default.createElement(react_native_1.Text, { ...titleTestId }, topBarOptions?.title?.text),
+                react_1.default.createElement(react_native_1.Text, { ...subtitleTestId }, topBarOptions?.subtitle?.text),
                 this.renderButtons(topBarOptions?.leftButtons),
                 this.renderButtons(topBarOptions?.rightButtons),
                 component &&

package/lib/ios/RNNTitleViewHelper.h

@@ -18,9 +18,11 @@
 
 @property(nonatomic, strong) RNNTitleOptions *titleOptions;
 @property(nonatomic, strong) RNNSubtitleOptions *subtitleOptions;
+@property(nonatomic, strong) Text *parentTestID;
 
 - (instancetype)initWithTitleViewOptions:(RNNOptions *)titleOptions
                          subTitleOptions:(RNNOptions *)subtitleOptions
+                            parentTestID:(Text *)parentTestID
                           viewController:(UIViewController *)viewController;
 
 - (void)setup;

package/lib/ios/RNNTitleViewHelper.m

@@ -38,12 +38,14 @@
 
 - (instancetype)initWithTitleViewOptions:(RNNTitleOptions *)titleOptions
                          subTitleOptions:(RNNSubtitleOptions *)subtitleOptions
+                            parentTestID:(Text *)parentTestID
                           viewController:(UIViewController *)viewController {
     self = [super init];
     if (self) {
         self.viewController = viewController;
         self.titleOptions = titleOptions;
         self.subtitleOptions = subtitleOptions;
+        self.parentTestID = parentTestID;
     }
     return self;
 }
@@ -81,7 +83,7 @@
     if (self.title) {
         self.titleView.titleLabel = [self setupTitle];
     }
-
+	
     [self centerTitleView:navigationBarBounds
                titleLabel:self.titleView.titleLabel
             subtitleLabel:self.titleView.subtitleLabel];
@@ -135,6 +137,11 @@
         subtitleLabel.textColor = color;
     }
 
+    if (_parentTestID && _parentTestID.hasValue && ((NSString *)_parentTestID.get).length > 0) {
+        subtitleLabel.accessibilityIdentifier =
+            [NSString stringWithFormat:@"%@.subtitle", _parentTestID.get];
+    }
+
     [self.titleView addSubview:subtitleLabel];
 
     return subtitleLabel;
@@ -174,6 +181,11 @@
         titleLabel.textColor = color;
     }
 
+    if (_parentTestID && _parentTestID.hasValue && ((NSString *)_parentTestID.get).length > 0) {
+        titleLabel.accessibilityIdentifier =
+            [NSString stringWithFormat:@"%@.title", _parentTestID.get];
+    }
+
     [self.titleView addSubview:titleLabel];
 
     return titleLabel;

package/lib/ios/TopBarTitlePresenter.m

@@ -47,6 +47,7 @@
         _titleViewHelper =
             [[RNNTitleViewHelper alloc] initWithTitleViewOptions:options.title
                                                  subTitleOptions:options.subtitle
+                                                    parentTestID:options.testID
                                                   viewController:self.boundViewController];
 
         if (options.title.text.hasValue) {

package/package.json

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