Просмотр исходного кода

added testID support in topBar and bottomTabs (#2334)

yogevbd 6 лет назад
Родитель
Сommit
bfdf2cd892

+ 9
- 1
lib/ios/RNNNavigationOptions.m Просмотреть файл

48
 
48
 
49
 -(void)applyOn:(UIViewController*)viewController {
49
 -(void)applyOn:(UIViewController*)viewController {
50
 	if (self.topBar) {
50
 	if (self.topBar) {
51
-		if(self.topBar.backgroundColor) {
51
+		if (self.topBar.backgroundColor) {
52
 			UIColor* backgroundColor = [RCTConvert UIColor:self.topBar.backgroundColor];
52
 			UIColor* backgroundColor = [RCTConvert UIColor:self.topBar.backgroundColor];
53
 			viewController.navigationController.navigationBar.barTintColor = backgroundColor;
53
 			viewController.navigationController.navigationBar.barTintColor = backgroundColor;
54
 		} else {
54
 		} else {
169
 				.shadowImage = nil;
169
 				.shadowImage = nil;
170
 			}
170
 			}
171
 		}
171
 		}
172
+		
173
+		if (self.topBar.testID) {
174
+			viewController.navigationController.navigationBar.accessibilityIdentifier = self.topBar.testID;
175
+		}
172
 	}
176
 	}
173
 	
177
 	
174
 	if (self.popGesture) {
178
 	if (self.popGesture) {
195
 		if (self.bottomTabs.hidden) {
199
 		if (self.bottomTabs.hidden) {
196
 			[((RNNTabBarController *)viewController.tabBarController) setTabBarHidden:[self.bottomTabs.hidden boolValue] animated:[self.bottomTabs.animateHide boolValue]];
200
 			[((RNNTabBarController *)viewController.tabBarController) setTabBarHidden:[self.bottomTabs.hidden boolValue] animated:[self.bottomTabs.animateHide boolValue]];
197
 		}
201
 		}
202
+		
203
+		if (self.bottomTabs.testID) {
204
+			viewController.tabBarController.tabBar.accessibilityIdentifier = self.bottomTabs.testID;
205
+		}
198
 	}
206
 	}
199
 	
207
 	
200
 	if (self.statusBarBlur) {
208
 	if (self.statusBarBlur) {

+ 1
- 0
lib/ios/RNNTabBarOptions.h Просмотреть файл

8
 @property (nonatomic, strong) NSNumber* animateHide;
8
 @property (nonatomic, strong) NSNumber* animateHide;
9
 @property (nonatomic, strong) NSString* tabBadge;
9
 @property (nonatomic, strong) NSString* tabBadge;
10
 @property (nonatomic, strong) NSNumber* currentTabIndex;
10
 @property (nonatomic, strong) NSNumber* currentTabIndex;
11
+@property (nonatomic, strong) NSString* testID;
11
 
12
 
12
 -(instancetype)init;
13
 -(instancetype)init;
13
 -(instancetype)initWithDict:(NSDictionary *)topBarOptions;
14
 -(instancetype)initWithDict:(NSDictionary *)topBarOptions;

+ 1
- 0
lib/ios/RNNTabBarOptions.m Просмотреть файл

13
 	self.animateHide = [tabBarOptions valueForKey:@"animateHide"];
13
 	self.animateHide = [tabBarOptions valueForKey:@"animateHide"];
14
 	self.tabBadge = [tabBarOptions valueForKey:@"tabBadge"];
14
 	self.tabBadge = [tabBarOptions valueForKey:@"tabBadge"];
15
 	self.currentTabIndex = [tabBarOptions valueForKey:@"currentTabIndex"];
15
 	self.currentTabIndex = [tabBarOptions valueForKey:@"currentTabIndex"];
16
+	self.testID = [tabBarOptions valueForKey:@"testID"];
16
 	
17
 	
17
 	return self;
18
 	return self;
18
 }
19
 }

+ 1
- 0
lib/ios/RNNTopBarOptions.h Просмотреть файл

18
 @property (nonatomic, strong) NSNumber* blur;
18
 @property (nonatomic, strong) NSNumber* blur;
19
 @property (nonatomic, strong) NSNumber* animateHide;
19
 @property (nonatomic, strong) NSNumber* animateHide;
20
 @property (nonatomic, strong) NSNumber* largeTitle;
20
 @property (nonatomic, strong) NSNumber* largeTitle;
21
+@property (nonatomic, strong) NSString* testID;
21
 
22
 
22
 -(instancetype)init;
23
 -(instancetype)init;
23
 -(instancetype)initWithDict:(NSDictionary *)topBarOptions;
24
 -(instancetype)initWithDict:(NSDictionary *)topBarOptions;

+ 3
- 2
lib/ios/RNNTopBarOptions.m Просмотреть файл

21
 	self.translucent = [topBarOptions valueForKey:@"translucent"];
21
 	self.translucent = [topBarOptions valueForKey:@"translucent"];
22
 	self.transparent = [topBarOptions valueForKey:@"transparent"];
22
 	self.transparent = [topBarOptions valueForKey:@"transparent"];
23
 	self.noBorder = [topBarOptions valueForKey:@"noBorder"];
23
 	self.noBorder = [topBarOptions valueForKey:@"noBorder"];
24
-	self.animateHide =[topBarOptions valueForKey:@"animateHide"];
25
-	self.largeTitle =[topBarOptions valueForKey:@"largeTitle"];
24
+	self.animateHide = [topBarOptions valueForKey:@"animateHide"];
25
+	self.largeTitle = [topBarOptions valueForKey:@"largeTitle"];
26
+	self.testID = [topBarOptions valueForKey:@"testID"];
26
 	
27
 	
27
 	return self;
28
 	return self;
28
 }
29
 }