fix(ios): temporary remove text fix for predicate.

wix · Dec 17, 2024 · eec9b5f · eec9b5f
1 parent 6bb0fba
commit eec9b5f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 77 deletions.
diff --git a/detox/ios/Detox/Invocation/Predicate.swift b/detox/ios/Detox/Invocation/Predicate.swift
@@ -66,9 +66,7 @@ class Predicate : CustomStringConvertible, CustomDebugStringConvertible {
           return ValuePredicate(kind: kind, modifiers: modifiers, value: label, requiresAccessibilityElement: true, isRegex: isRegex)
         } else {
           //Will crash if RN app and neither class exists
-          let RCTTextViewClass : AnyClass =
-            NSClassFromString("RCTParagraphComponentView") ??
-            NSClassFromString("RCTText") ?? NSClassFromString("RCTTextView")!
+          let RCTTextViewClass : AnyClass = NSClassFromString("RCTText") ?? NSClassFromString("RCTTextView")!
 
           let descendantPredicate = DescendantPredicate(predicate: AndCompoundPredicate(predicates: [
             try KindOfPredicate(kind: Kind.type, modifiers: [], className: NSStringFromClass(RCTTextViewClass)),
@@ -91,9 +89,7 @@ class Predicate : CustomStringConvertible, CustomDebugStringConvertible {
 
         if ReactNativeSupport.isReactNativeApp == true {
           //Will crash if RN app and neither class exists
-          let RCTTextViewClass : AnyClass =
-            NSClassFromString("RCTParagraphComponentView") ??
-            NSClassFromString("RCTText") ?? NSClassFromString("RCTTextView")!
+          let RCTTextViewClass : AnyClass = NSClassFromString("RCTText") ?? NSClassFromString("RCTTextView")!
           orPredicates.append(try KindOfPredicate(kind: Kind.type, modifiers: [], className: NSStringFromClass(RCTTextViewClass)))
         }
 

diff --git a/detox/ios/Detox/Utilities/NSObject+DontCrash.m b/detox/ios/Detox/Utilities/NSObject+DontCrash.m
@@ -7,81 +7,36 @@
 
 #import "NSObject+DontCrash.h"
 
-@interface NSObject (DontCrashPrivate)
-+ (Class)dtx_classForName:(NSString *)className;
-- (nullable NSString *)dtx_extractTextFromRCTComponent;
-@end
-
 @implementation NSObject (DontCrash)
 
-#pragma mark - Public Methods
-
-- (id)_dtx_text {
-    if ([self respondsToSelector:@selector(text)]) {
-        return [(UITextView *)self text];
-    }
-
-    NSString *reactText = [self dtx_extractTextFromRCTComponent];
-    if (reactText) {
-        return reactText;
-    }
-
-    return nil;
-}
-
-- (id)_dtx_placeholder {
-    if ([self respondsToSelector:@selector(placeholder)]) {
-        return [(UITextField *)self placeholder];
-    }
-    return nil;
-}
-
-@end
-
-@implementation NSObject (DontCrashPrivate)
-
-#pragma mark - Private Methods
-
-+ (Class)dtx_classForName:(NSString *)className {
-    static NSMutableDictionary<NSString *, Class> *classCache;
-    static dispatch_once_t onceToken;
-
-    dispatch_once(&onceToken, ^{
-        classCache = [NSMutableDictionary dictionary];
-    });
-
-    Class cachedClass = classCache[className];
-    if (!cachedClass) {
-        cachedClass = NSClassFromString(className);
-        if (cachedClass) {
-            classCache[className] = cachedClass;
-        }
-    }
-
-    return cachedClass;
+- (id)_dtx_text
+{
+	if([self respondsToSelector:@selector(text)])
+	{
+		return [(UITextView*)self text];
+	}
+
+	static Class RCTTextView;
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		RCTTextView = NSClassFromString(@"RCTTextView");
+	});
+	if(RCTTextView != nil && [self isKindOfClass:RCTTextView])
+	{
+		return [(NSTextStorage*)[self valueForKey:@"textStorage"] string];
+	}
+
+	return nil;
 }
 
-- (nullable NSString *)dtx_extractTextFromRCTComponent {
-    static Class RCTTextViewClass;
-    static Class RCTParagraphComponentViewClass;
-    static dispatch_once_t onceToken;
-
-    dispatch_once(&onceToken, ^{
-        RCTTextViewClass = [self.class dtx_classForName:@"RCTTextView"];
-        RCTParagraphComponentViewClass = [self.class dtx_classForName:@"RCTParagraphComponentView"];
-    });
-
-    if (RCTTextViewClass && [self isKindOfClass:RCTTextViewClass]) {
-        NSTextStorage *textStorage = [self valueForKey:@"textStorage"];
-        return [textStorage string];
-    }
-
-    if (RCTParagraphComponentViewClass && [self isKindOfClass:RCTParagraphComponentViewClass]) {
-        NSAttributedString *attributedText = [self valueForKey:@"attributedText"];
-        return [attributedText string];
-    }
-
-    return nil;
+- (id)_dtx_placeholder
+{
+	if([self respondsToSelector:@selector(placeholder)])
+	{
+		return [(UITextField*)self placeholder];
+	}
+
+	return nil;
 }
 
 @end