Merge pull request #4681 from wix/feat/bridgeless-mode

feat(iOS): support bridgeless mode (new-arch).

Author: asafkorem

.buildkite/jobs/pipeline.android_rn_73.yml

@@ -1,4 +1,4 @@
-  - label: ":android::detox: (Old Arch) - RN .73 + Android: Tests app"
+  - label: ":android::detox: (Old Arch) RN .73 + Android: Tests app"
     command:
       - "nvm install"
       - "./scripts/ci.android.sh"

.buildkite/jobs/pipeline.android_rn_76_old_arch.yml

@@ -1,4 +1,4 @@
-  - label: ":android::detox: (Old Arch) - RN .76 + Android: Tests app"
+  - label: ":android::detox: (Old Arch) RN .76 + Android: Tests app"
     command:
       - "nvm install"
       - "./scripts/ci.android.sh"

.buildkite/jobs/pipeline.ios_demo_app_rn_76_new_arch.yml

@@ -1,4 +1,4 @@
-  - label: ":new::ios::react: RN .76 + iOS: Demo app"
+  - label: ":ios::react: RN .76 + iOS: Demo app"
     command:
       - "nvm install"
       - "./scripts/demo-projects.ios.sh"

.buildkite/jobs/pipeline.ios_rn_73.yml

@@ -1,9 +1,10 @@
-  - label: ":ios::detox: RN .73 + iOS: Tests app"
+  - label: ":ios::detox: (Old Arch) RN .73 + iOS: Tests app"
     command:
       - "nvm install"
       - "./scripts/ci.ios.sh"
     env:
       REACT_NATIVE_VERSION: 0.73.2
+      RCT_NEW_ARCH_ENABLED: 0
     artifact_paths:
       - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
       - "/Users/builder/uibuilder/work/**/allure-report-*.html"

.buildkite/jobs/pipeline.ios_rn_76.yml

@@ -1,4 +1,4 @@
-  - label: ":ios::detox: RN .76 + iOS: Tests app"
+  - label: ":ios::detox: (Old Arch) RN .76 + iOS: Tests app"
     command:
       - "nvm install"
       - "./scripts/ci.ios.sh"

.buildkite/jobs/pipeline.ios_rn_76_new_arch.yml

@@ -1,4 +1,4 @@
-  - label: ":new::ios::detox: RN .76 + New Arch + iOS: Tests app"
+  - label: ":ios::detox: RN .76 + iOS: Tests app"
     command:
       - "nvm install"
       - "./scripts/ci.ios.sh"

detox/ios/Detox/Actions/NSObject+DetoxActions.m

@@ -101,10 +101,10 @@ - (void)dtx_tapAtAccessibilityActivationPointWithNumberOfTaps:(NSUInteger)number
 
 - (void)dtx_tapAtPoint:(CGPoint)point numberOfTaps:(NSUInteger)numberOfTaps
 {
-    if([self isKindOfClass:UISwitch.class] && numberOfTaps == 1)
+    if(self.dtx_switchView != nil && numberOfTaps == 1)
     {
         //Attempt a long press on the switch, rather than tap.
-        [self dtx_longPressAtPoint:point duration:0.7];
+        [self.dtx_switchView dtx_longPressAtPoint:point duration:0.7];
         return;
     }
 

detox/ios/Detox/Actions/UIScrollView+DetoxActions.m

@@ -23,7 +23,7 @@ - (void)_scrollViewWillEndDraggingWithDeceleration:(BOOL)arg1;
 
 @interface UIScrollView (DetoxScrolling)
 
-- (BOOL)_dtx_scrollViewWillEndDraggingWithDeceleration:(BOOL)arg1;
+- (void)_dtx_scrollViewWillEndDraggingWithDeceleration:(BOOL)arg1;
 @property (nonatomic, assign, setter=dtx_setDisableDecelerationForScroll:) BOOL dtx_disableDecelerationForScroll;
 
 @end
@@ -47,7 +47,7 @@ - (BOOL)dtx_disableDecelerationForScroll
 	return [objc_getAssociatedObject(self, "dtx_disableDecelerationForScroll") boolValue];
 }
 
-- (BOOL)_dtx_scrollViewWillEndDraggingWithDeceleration:(BOOL)arg1
+- (void)_dtx_scrollViewWillEndDraggingWithDeceleration:(BOOL)arg1
 {
 	BOOL deceleration = arg1;
 	if(self.dtx_disableDecelerationForScroll == YES &&
@@ -60,8 +60,8 @@ - (BOOL)_dtx_scrollViewWillEndDraggingWithDeceleration:(BOOL)arg1
 	{
 		deceleration = NO;
 	}
-	
-	return [self _dtx_scrollViewWillEndDraggingWithDeceleration:deceleration];
+
+    [self _dtx_scrollViewWillEndDraggingWithDeceleration:deceleration];
 }
 
 @end

detox/ios/Detox/Invocation/Element.swift

@@ -85,7 +85,7 @@ class Element : NSObject {
         if ReactNativeSupport.isReactNativeApp {
             let className = NSStringFromClass(type(of: view))
             switch className {
-                case "RCTScrollView", "RCTScrollViewComponentView":
+                case "RCTScrollView", "RCTScrollViewComponentView", "RCTEnhancedScrollView":
                     return (view.value(forKey: "scrollView") as! UIScrollView)
                 default:
                     break
@@ -189,23 +189,34 @@ class Element : NSObject {
 	}
 
 	func adjust(toDate date: Date) {
-		if let view = view as? UIDatePicker {
-			view.dtx_adjust(to: date)
-		} else {
-			dtx_fatalError("View “\(view.dtx_shortDescription)” is not an instance of “UIDatePicker”", viewDescription: debugAttributes)
-		}
+        var didSetPicker = false
+
+        view.dtx_ifDatePicker { view in
+            view.dtx_adjust(to: date)
+            didSetPicker = true
+        }
+
+        guard didSetPicker else {
+            dtx_fatalError("View “\(view.dtx_shortDescription)” is not an instance of “UIDatePicker”", viewDescription: debugAttributes)
+        }
+
 	}
 
 	func setComponent(_ component: Int, toValue value: Any) {
-		if let view = view as? UIPickerView {
-			view.dtx_setComponent(component, toValue: value)
-		} else {
-			dtx_fatalError("View “\(view.dtx_shortDescription)” is not an instance of “UIPickerView”", viewDescription: debugAttributes)
-		}
+        var didSetPicker = false
+
+        view.dtx_ifPicker { view in
+            view.dtx_setComponent(component, toValue: value)
+            didSetPicker = true
+        }
+
+        guard didSetPicker else {
+            dtx_fatalError("View “\(view.dtx_shortDescription)” is not an instance of “UIPickerView”", viewDescription: debugAttributes)
+        }
 	}
 
 	func adjust(toNormalizedSliderPosition normalizedSliderPosition: Double) {
-		guard let slider = view as? UISlider else {
+        guard let slider = view.dtx_sliderView else {
 			dtx_fatalError("View \(view.dtx_shortDescription) is not instance of “UISlider”", viewDescription: debugAttributes)
 		}
 
@@ -267,17 +278,34 @@ class Element : NSObject {
 		return view.accessibilityValue
 	}
 
-	@objc
-	var normalizedSliderPosition: Double {
-		get {
-			guard let slider = view as? UISlider else {
-				dtx_fatalError("View \(view.dtx_shortDescription) is not instance of “UISlider”", viewDescription: debugAttributes)
-			}
-			
-			return slider.dtx_normalizedSliderPosition
-		}
-	}
-	
+    @objc
+    var normalizedSliderPosition: Double {
+        get {
+            if let slider = view.dtx_sliderView {
+                return slider.dtx_normalizedSliderPosition
+            }
+
+            dtx_fatalError(
+                "View \(view.dtx_shortDescription) is not instance or wrapper of “UISlider”",
+                viewDescription: debugAttributes
+            )
+        }
+    }
+
+    @objc
+    var toggleValue: Double {
+        get {
+            if let toggle = view.dtx_switchView {
+                return toggle.isOn ? 1.0 : 0.0
+            }
+
+            dtx_fatalError(
+                "View \(view.dtx_shortDescription) is not instance or wrapper of “UISwitch”",
+                viewDescription: debugAttributes
+            )
+        }
+    }
+
 	@objc
 	var attributes: [String : Any] {
 		let views = self.views

detox/ios/Detox/Invocation/Expectation.swift

@@ -57,6 +57,7 @@ class Expectation : CustomStringConvertible {
 		static let toHaveValue = "toHaveValue"
 		static let toHavePlaceholder = "toHavePlaceholder"
 		static let toHaveSliderPosition = "toHaveSliderPosition"
+        static let toHaveToggleValue = "toHaveToggleValue"
 	}
 
 	let element : Element
@@ -81,7 +82,8 @@ class Expectation : CustomStringConvertible {
 		Kind.toHaveId: ValueExpectation.self,
 		Kind.toHaveValue: ValueExpectation.self,
 		Kind.toHavePlaceholder: ValueExpectation.self,
-		Kind.toHaveSliderPosition: SliderPositionExpectation.self
+		Kind.toHaveSliderPosition: SliderPositionExpectation.self,
+        Kind.toHaveToggleValue: ToggleValueExpectation.self
 	]
 
 	static let keyMapping : [String: String] = [
@@ -106,7 +108,10 @@ class Expectation : CustomStringConvertible {
 
 		let element = try Element.with(dictionaryRepresentation: dictionaryRepresentation)
 		let expectationClass = mapping[kind]!
-		if expectationClass == SliderPositionExpectation.self {
+        if expectationClass == ToggleValueExpectation.self {
+            return ToggleValueExpectation(kind: kind, modifiers: modifiers, element: element, timeout: timeout, value: params!.first! as! Double, tolerance: params!.count > 1 ? (params![1] as! Double) : nil)
+
+        } else if expectationClass == SliderPositionExpectation.self {
 			return SliderPositionExpectation(kind: kind, modifiers: modifiers, element: element, timeout: timeout, value: params!.first! as! Double, tolerance: params!.count > 1 ? (params![1] as! Double) : nil)
 		} else if expectationClass == ValueExpectation.self {
 			return ValueExpectation(kind: kind, modifiers: modifiers, element: element, timeout: timeout, key: keyMapping[kind]!, value: params!.first!)
@@ -312,3 +317,15 @@ class SliderPositionExpectation : DoubleExpectation {
 		}
 	}
 }
+
+class ToggleValueExpectation : DoubleExpectation {
+    override func valueToTest(from element: Element) -> Double {
+        return element.toggleValue
+    }
+
+    override var additionalDescription: String {
+        get {
+            return "(toggleValue \(tolerance != nil ? "(~\(tolerance!))" : "")== \(value == 1.0 ? "ON" : "OFF"))"
+        }
+    }
+}