hanzoai/Detox
2
0
Fork 0
mirror of https://github.com/hanzoai/Detox.git synced 2026-09-24 16:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

update logic a bit to first check the objc origional code

Browse Source
This commit is contained in:
Mark de Vocht
2025-09-28 09:57:22 +03:00
parent 2ebf221198
commit 4ed7f3ec02
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
detox/ios/Detox/Utilities/ReactNativeSupport/ReactNativeSupport.m
+5 -6
View File
@@ -70,11 +70,6 @@ static NSString *const RCTReloadNotification = @"RCTReloadNotification";
NSObject *rootViewFactory = nil;
rootViewFactory = [DetoxSwiftBridge getRootViewFactory];
if (rootViewFactory != nil) {
return [rootViewFactory valueForKey:@"reactHost"];
}
@try {
rootViewFactory = [appDelegate valueForKey:@"rootViewFactory"];
} @catch (NSException *exception) {
@@ -82,9 +77,13 @@ static NSString *const RCTReloadNotification = @"RCTReloadNotification";
NSObject *reactNativeFactory = [appDelegate valueForKey:@"reactNativeFactory"];
rootViewFactory = [reactNativeFactory valueForKey:@"rootViewFactory"];
} @catch (NSException *exception) {
[NSException raise:@"Invalid AppDelegate" format:@"Could not access rootViewFactory. Make sure your AppDelegate either: Inherits from RCTAppDelegate or defines 'reactNativeFactory'" ];
rootViewFactory = [DetoxSwiftBridge getRootViewFactory];
if (rootViewFactory == nil) {
[NSException raise:@"Invalid AppDelegate" format:@"Could not access rootViewFactory. Make sure your AppDelegate either: Inherits from RCTAppDelegate or defines 'reactNativeFactory'" ];
}
}
}
return [rootViewFactory valueForKey:@"reactHost"];
}
detox/ios/Detox/Utilities/SwiftSupport/DetoxSwiftBridge.m
+9 -20
View File
@@ -50,23 +50,24 @@ DTX_CREATE_LOG(SwiftBridge);
return nil;
}
Class objectClass = [object class];
@try {
NSObject *value = [object valueForKey:propertyName];
if (value) return value;
} @catch (NSException *exception) {}
Class objectClass = [object class];
while (objectClass) {
unsigned int ivarCount;
Ivar *ivars = class_copyIvarList(objectClass, &ivarCount);
for (unsigned int i = 0; i < ivarCount; i++) {
Ivar ivar = ivars[i];
const char *ivarName = ivar_getName(ivar);
const char *ivarName = ivar_getName(ivars[i]);
if (ivarName) {
NSString *ivarNameString = [NSString stringWithUTF8String:ivarName];
if ([ivarNameString containsString:propertyName]) {
NSObject *value = object_getIvar(object, ivar);
if ([ivarNameString isEqualToString:propertyName] ||
[ivarNameString isEqualToString:[@"_" stringByAppendingString:propertyName]]) {
NSObject *value = object_getIvar(object, ivars[i]);
if (value) {
dtx_log_info(@"Found Swift property '%@' using ivar '%@'", propertyName, ivarNameString);
free(ivars);
return value;
}
@@ -75,21 +76,9 @@ DTX_CREATE_LOG(SwiftBridge);
}
free(ivars);
objectClass = class_getSuperclass(objectClass);
}
@try {
NSObject *value = [object valueForKey:propertyName];
if (value) {
dtx_log_info(@"Found property '%@' using KVC fallback", propertyName);
return value;
}
} @catch (NSException *exception) {
dtx_log_debug(@"KVC fallback failed for property '%@': %@", propertyName, exception.reason);
}
dtx_log_debug(@"Could not find property '%@' in object of class %@", propertyName, NSStringFromClass([object class]));
return nil;
}