fix(ios): support new RCTParagraphComponentView component.

wix · Dec 22, 2024 · d8a5d9c · d8a5d9c
1 parent f458c49
commit d8a5d9c
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 38 deletions.
diff --git a/detox/ios/Detox/Invocation/Predicate.swift b/detox/ios/Detox/Invocation/Predicate.swift
@@ -65,20 +65,32 @@ class Predicate : CustomStringConvertible, CustomDebugStringConvertible {
         if ReactNativeSupport.isReactNativeApp == false {
           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("RCTText") ?? NSClassFromString("RCTTextView")!
-
-          let descendantPredicate = DescendantPredicate(predicate: AndCompoundPredicate(predicates: [
-            try KindOfPredicate(kind: Kind.type, modifiers: [], className: NSStringFromClass(RCTTextViewClass)),
-            ValuePredicate(kind: kind, modifiers: modifiers, value: label, requiresAccessibilityElement: true, isRegex: isRegex)
-          ], modifiers: []), modifiers: [Modifier.not])
-          descendantPredicate.hidden = true
-
-          return AndCompoundPredicate(predicates: [
-            ValuePredicate(kind: kind, modifiers: modifiers, value: label, requiresAccessibilityElement: true, isRegex: isRegex),
-            descendantPredicate
-          ], modifiers: [])
+            let possibleRNClasses: [AnyClass] = [
+                NSClassFromString("RCTParagraphComponentView"),
+                NSClassFromString("RCTText"),
+                NSClassFromString("RCTTextView")
+            ].compactMap { $0 }
+
+            guard !possibleRNClasses.isEmpty else {
+                fatalError("No React Native text component classes found")
+            }
+
+            let typePredicates = possibleRNClasses.map { rnClass in
+                try! KindOfPredicate(kind: Kind.type, modifiers: [], className: NSStringFromClass(rnClass))
+            }
+
+            let descendantPredicate = DescendantPredicate(predicate: AndCompoundPredicate(predicates: [
+                OrCompoundPredicate(predicates: typePredicates, modifiers: []),
+                ValuePredicate(kind: kind, modifiers: modifiers, value: label, requiresAccessibilityElement: true, isRegex: isRegex)
+            ], modifiers: []), modifiers: [Modifier.not])
+            descendantPredicate.hidden = true
+
+            return AndCompoundPredicate(predicates: [
+                ValuePredicate(kind: kind, modifiers: modifiers, value: label, requiresAccessibilityElement: true, isRegex: isRegex),
+                descendantPredicate
+            ], modifiers: [])
         }
+
       case Kind.text:
         let text = dictionaryRepresentation[Keys.value] as! String
         var orPredicates = [
@@ -88,9 +100,21 @@ class Predicate : CustomStringConvertible, CustomDebugStringConvertible {
         ]
 
         if ReactNativeSupport.isReactNativeApp == true {
-          //Will crash if RN app and neither class exists
-          let RCTTextViewClass : AnyClass = NSClassFromString("RCTText") ?? NSClassFromString("RCTTextView")!
-          orPredicates.append(try KindOfPredicate(kind: Kind.type, modifiers: [], className: NSStringFromClass(RCTTextViewClass)))
+            let possibleRNClasses: [AnyClass] = [
+                NSClassFromString("RCTParagraphComponentView"),
+                NSClassFromString("RCTText"),
+                NSClassFromString("RCTTextView")
+            ].compactMap { $0 }
+
+            guard !possibleRNClasses.isEmpty else {
+                fatalError("No React Native text component classes found")
+            }
+
+            possibleRNClasses.forEach { rnClass in
+                let predicate = try! KindOfPredicate(kind: Kind.type, modifiers: [], className: NSStringFromClass(rnClass))
+
+                orPredicates.append(predicate)
+            }
         }
 
         let orCompoundPredicate = OrCompoundPredicate(predicates: orPredicates, modifiers: [])

diff --git a/detox/ios/Detox/Utilities/NSObject+DontCrash.m b/detox/ios/Detox/Utilities/NSObject+DontCrash.m
@@ -11,32 +11,48 @@ @implementation NSObject (DontCrash)
 
 - (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;
+    if([self respondsToSelector:@selector(text)])
+    {
+        return [(UITextView*)self text];
+    }
+
+    static Class RCTParagraphComponentViewClass;
+    static Class RCTTextClass;
+    static Class RCTTextViewClass;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        RCTParagraphComponentViewClass = NSClassFromString(@"RCTParagraphComponentView");
+        RCTTextClass = NSClassFromString(@"RCTText");
+        RCTTextViewClass = NSClassFromString(@"RCTTextView");
+    });
+
+    if(RCTParagraphComponentViewClass != nil && [self isKindOfClass:RCTParagraphComponentViewClass])
+    {
+        NSAttributedString *attributedText = [self valueForKey:@"attributedText"];
+        return [attributedText string];
+    }
+
+    if(RCTTextClass != nil && [self isKindOfClass:RCTTextClass])
+    {
+        return [(NSTextStorage*)[self valueForKey:@"textStorage"] string];
+    }
+
+    if(RCTTextViewClass != nil && [self isKindOfClass:RCTTextViewClass])
+    {
+        return [(NSTextStorage*)[self valueForKey:@"textStorage"] string];
+    }
+
+    return nil;
 }
 
 - (id)_dtx_placeholder
 {
-	if([self respondsToSelector:@selector(placeholder)])
-	{
-		return [(UITextField*)self placeholder];
-	}
-	
-	return nil;
+    if([self respondsToSelector:@selector(placeholder)])
+    {
+        return [(UITextField*)self placeholder];
+    }
+
+    return nil;
 }
 
 @end