detox 20.11.5-smoke.0 → 20.12.0

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-javadoc.jar.md5

@@ -0,0 +1 @@
+fd803ad3b1d79693779077e2d5a030be

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+6e783294674107a7a02ffce8f5fc9bf5b5fa56de

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+250dd66ec2b951c59dd18d382ff84a0e05e9210543d66965d1c3704a36a5f16f

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+b6b8f084acbebaa8057529fe74ce10a2a700ef882f863aecf01a6e263f76164deb3ace7c5aa49164f3345bc3c930d18ca37e704f8814194906f32641187aa0d3

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-sources.jar.md5

@@ -0,0 +1 @@
+47c93868c2f09b970c68a3c21de6c2e8

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-sources.jar.sha1

@@ -0,0 +1 @@
+6513d86c59c32e3b5a0d41e86f55e01c15dc0b8a

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-sources.jar.sha256

@@ -0,0 +1 @@
+dbf7d435856960f5a0440f74248d677c6b7bcec0d9100f1e0f941401bd05f554

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0-sources.jar.sha512

@@ -0,0 +1 @@
+175323a595f1be240650f3d5109f0c7c099e93bdf1e9799b25f6ade82339aa42764dedbedefbfe6a9803cab1c0885f97dcd25ca77dd8840c9d5330bbbb66a9be

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.aar.md5

@@ -0,0 +1 @@
+c90cc85230997f3663da1741d1eabc0e

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.aar.sha1

@@ -0,0 +1 @@
+0e17ccf18dbb2e0295e72b77cae67275591d956a

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.aar.sha256

@@ -0,0 +1 @@
+00528b5d136df63bc93f55c2f890a1ad69179f341663310b520227f6b7aad63b

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.aar.sha512

@@ -0,0 +1 @@
+37984e2491685ede0325d74f460ad2a13dc55bd906124e0932fa09e29e2394a91cbbf691aa854848503113f04dfe148a483e616c736918f6e0077af6aa311a31

package/Detox-android/com/wix/detox/{20.11.5-smoke.0/detox-20.11.5-smoke.0.pom → 20.12.0/detox-20.12.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.11.5-smoke.0</version>
+  <version>20.12.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.pom.md5

@@ -0,0 +1 @@
+f936530422c3b067b14acf6882eb15c8

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.pom.sha1

@@ -0,0 +1 @@
+2528825c4917ba8994b81030daef2f0a7a908227

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.pom.sha256

@@ -0,0 +1 @@
+a0a195aa8f7511f6ee3b1bacc22f29d444e3d3eaacb96bf902c3e06df9afef5d

package/Detox-android/com/wix/detox/20.12.0/detox-20.12.0.pom.sha512

@@ -0,0 +1 @@
+9702d3696a7170e3ac6cc0cdd15490cd1cd954903b602453a4ac53d336feda62822aef2796c83fd33552639f576a0234cb0052a76bd7ed2b2bc67a87df08544a

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.11.5-smoke.0</latest>
-    <release>20.11.5-smoke.0</release>
+    <latest>20.12.0</latest>
+    <release>20.12.0</release>
     <versions>
-      <version>20.11.5-smoke.0</version>
+      <version>20.12.0</version>
     </versions>
-    <lastUpdated>20230830102548</lastUpdated>
+    <lastUpdated>20230912212516</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-b66fe11b8db07e94d8899e61497ff262
+f9657c7ea977fa12455aefb694554e0b

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-5c083ffc3dc0b459da472f94acdf213e32320a29
+e237f10dcfb62432425cceaa085e7abbbccce171

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-2572bcdd8effd233f1ffe93cf27906f4fc2efeac59f00fa2b90bc687051c0c77
+973055b62aa343c2551197a1f9b730cdad4fe64ff6aa327ac43e4de24aea047a

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-ca1b38083670c2cc34bdf67a3a032c0a89f9fb6f6ff766571af6048fc02661013619eeb87817d430933aea0aa149c29396973bd432182f30dab31536dbe186eb
+00e33c2cefd740754934b7635d42ff6933ff1b387d806b3503c08fc16955d49e0297b0f4875d3ccdf532b4409459692e2b367947164e6ac7a75db84259cb0fab

package/android/detox/src/full/java/com/wix/detox/espresso/DetoxAssertion.java

@@ -24,42 +24,57 @@ import static org.hamcrest.Matchers.not;
 
 public class DetoxAssertion {
 
+    private static final double NANOSECONDS_IN_A_SECOND = 1_000_000_000.0;
+
     private DetoxAssertion() {
-        // static class
+        // This is a utility class and shouldn't be instantiated.
     }
 
-    public static ViewInteraction assertMatcher(ViewInteraction i, Matcher<View> m) {
-        return i.check(matches(m));
+    /**
+     * Asserts the given matcher for the provided view interaction.
+     */
+    public static ViewInteraction assertMatcher(ViewInteraction viewInteraction, Matcher<View> viewMatcher) {
+        return viewInteraction.check(matches(viewMatcher));
     }
 
-    public static ViewInteraction assertNotVisible(ViewInteraction i) {
-        ViewInteraction ret;
+    /**
+     * Asserts that the given view interaction is not visible.
+     */
+    public static ViewInteraction assertNotVisible(ViewInteraction viewInteraction) {
+        ViewInteraction result;
         try {
-            ret = i.check(doesNotExist());
-            return ret;
+            result = viewInteraction.check(doesNotExist());
+            return result;
         } catch (AssertionFailedError e) {
-            ret = i.check(matches(not(isDisplayed())));
-            return ret;
+            result = viewInteraction.check(matches(not(isDisplayed())));
+            return result;
         }
     }
 
-    public static ViewInteraction assertNotExists(ViewInteraction i) {
-        return i.check(doesNotExist());
+    /**
+     * Asserts that the given view interaction does not exist.
+     */
+    public static ViewInteraction assertNotExists(ViewInteraction viewInteraction) {
+        return viewInteraction.check(doesNotExist());
     }
 
-    public static void waitForAssertMatcher(final ViewInteraction i, final Matcher<View> m, double timeoutSeconds) {
-        final long originTime = System.nanoTime();
+    /**
+     * Waits until the provided matcher matches the view interaction or a timeout occurs.
+     */
+    public static void waitForAssertMatcher(final ViewInteraction viewInteraction, final Matcher<View> viewMatcher, double timeoutSeconds) {
+        final long startTime = System.nanoTime();
 
         while (true) {
             long currentTime = System.nanoTime();
-            long elapsed = currentTime - originTime;
-            double seconds = (double) elapsed / 1000000000.0;
-            if (seconds >= timeoutSeconds) {
-                throw new DetoxRuntimeException("" + timeoutSeconds + "sec timeout expired without matching of given matcher: " + m);
+            long elapsedTime = currentTime - startTime;
+            double elapsedSeconds = (double) elapsedTime / NANOSECONDS_IN_A_SECOND;
+            if (elapsedSeconds >= timeoutSeconds) {
+                throw new DetoxRuntimeException(
+                    "" + timeoutSeconds + "sec timeout expired without matching of given matcher: " + viewMatcher);
             }
 
             try {
-                i.check(matches(m));
+                viewInteraction.check(matches(viewMatcher));
                 break;
             } catch (AssertionFailedError err) {
                 UiAutomatorHelper.espressoSync(20);
@@ -67,21 +82,25 @@ public class DetoxAssertion {
         }
     }
 
+    /**
+     * Continually asserts the provided matcher until a search action returns a matching view or a
+     * `StaleActionException` error is thrown.
+     */
     public static void waitForAssertMatcherWithSearchAction(
-            final ViewInteraction i,
-            final Matcher<View> vm,
-            final ViewAction searchAction,
-            final Matcher<View> searchMatcher) {
-
+        final ViewInteraction viewInteraction,
+        final Matcher<View> viewMatcher,
+        final ViewAction searchAction,
+        final Matcher<View> searchMatcher
+    ) {
         while (true) {
             try {
-                assertMatcher(i, vm);
+                assertMatcher(viewInteraction, viewMatcher);
                 break;
             } catch (AssertionFailedError err) {
                 try {
                     onView(searchMatcher).perform(searchAction);
                 } catch (StaleActionException exStaleAction) {
-                    assertMatcher(i, vm);
+                    assertMatcher(viewInteraction, viewMatcher);
                     break;
                 }
             }

package/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java

@@ -1,5 +1,7 @@
 package com.wix.detox.espresso;
 
+import com.wix.detox.espresso.performer.ViewActionPerformer;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -20,6 +22,7 @@ import java.util.ArrayList;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import static androidx.test.espresso.Espresso.onView;
@@ -31,13 +34,9 @@ import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
 public class EspressoDetox {
     private static final String LOG_TAG = "detox";
 
-    public static Object perform(ViewInteraction interaction, ViewAction action) {
-        interaction.perform(action);
-
-        if (action instanceof ViewActionWithResult) {
-            return ((ViewActionWithResult) action).getResult();
-        }
-        return null;
+    public static Object perform(Matcher<View> matcher, ViewAction action) {
+        ViewActionPerformer performer = ViewActionPerformer.forAction(action);
+        return performer.performOn(matcher);
     }
 
     public static Activity getActivity(Context context) {

package/android/detox/src/full/java/com/wix/detox/espresso/action/GetAttributesAction.kt

@@ -9,6 +9,7 @@ import android.widget.TextView
 import androidx.test.espresso.UiController
 import com.google.android.material.slider.Slider
 import com.wix.detox.espresso.ViewActionWithResult
+import com.wix.detox.espresso.MultipleViewsAction
 import com.wix.detox.espresso.common.SliderHelper
 import com.wix.detox.reactnative.ui.getAccessibilityLabel
 import org.hamcrest.Matcher
@@ -17,26 +18,25 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.notNullValue
 import org.json.JSONObject
 
-class GetAttributesAction() : ViewActionWithResult<String?> {
+class GetAttributesAction() : ViewActionWithResult<JSONObject?>, MultipleViewsAction {
     private val commonAttributes = CommonAttributes()
     private val textViewAttributes = TextViewAttributes()
     private val checkBoxAttributes = CheckBoxAttributes()
     private val progressBarAttributes = ProgressBarAttributes()
     private val sliderAttributes = SliderAttributes()
-    private var result: String = ""
+    private var result: JSONObject? = null
 
     override fun perform(uiController: UiController?, view: View?) {
         view!!
 
         val json = JSONObject()
-
         commonAttributes.get(json, view)
         textViewAttributes.get(json, view)
         checkBoxAttributes.get(json, view)
         progressBarAttributes.get(json, view)
         sliderAttributes.get(json, view)
 
-        result = json.toString()
+        result = json
     }
 
     override fun getResult() = result

package/android/detox/src/full/java/com/wix/detox/espresso/performer/MultipleViewsActionPerformer.kt

@@ -0,0 +1,43 @@
+package com.wix.detox.espresso.performer
+
+import com.wix.detox.espresso.DetoxMatcher
+import com.wix.detox.espresso.ViewActionWithResult
+
+import android.view.View
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.NoMatchingViewException
+import androidx.test.espresso.ViewAction
+import org.hamcrest.Matcher
+
+class MultipleViewsActionPerformer(
+    private val action: ViewAction
+) : ViewActionPerformer {
+    override fun performOn(matcher: Matcher<View>): Any? {
+        val results = mutableListOf<Any?>()
+        var index = 0
+
+        while (true) {
+            val indexedMatcher = DetoxMatcher.matcherForAtIndex(index, matcher)
+
+            try {
+                onView(indexedMatcher).perform(action)
+
+                (action as? ViewActionWithResult<*>)?.getResult()?.let { results.add(it) }
+
+                index++
+            } catch (e: NoMatchingViewException) {
+                if (index == 0) {
+                    throw e
+                }
+
+                break
+            }
+        }
+
+        return when {
+            results.isEmpty() -> null
+            results.size == 1 -> results.first()
+            else -> mapOf("elements" to results)
+        }
+    }
+}

package/android/detox/src/full/java/com/wix/detox/espresso/performer/SingleViewActionPerformer.kt

@@ -0,0 +1,19 @@
+package com.wix.detox.espresso.performer
+
+import com.wix.detox.espresso.ViewActionWithResult
+
+import android.view.View
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.NoMatchingViewException
+import androidx.test.espresso.ViewAction
+import org.hamcrest.Matcher
+
+class SingleViewActionPerformer(
+    private val action: ViewAction
+) : ViewActionPerformer {
+    override fun performOn(matcher: Matcher<View>): Any? {
+        onView(matcher).perform(action)
+
+        return (action as? ViewActionWithResult<*>)?.getResult()
+    }
+}

package/android/detox/src/full/java/com/wix/detox/espresso/performer/ViewActionPerformer.kt

@@ -0,0 +1,24 @@
+package com.wix.detox.espresso.performer
+
+import com.wix.detox.espresso.MultipleViewsAction
+
+import android.view.View
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.NoMatchingViewException
+import androidx.test.espresso.ViewAction
+import org.hamcrest.Matcher
+
+interface ViewActionPerformer {
+    fun performOn(matcher: Matcher<View>): Any?
+
+    companion object {
+        @JvmStatic
+        fun forAction(action: ViewAction): ViewActionPerformer {
+            return if (action is MultipleViewsAction) {
+                MultipleViewsActionPerformer(action)
+            } else {
+                SingleViewActionPerformer(action)
+            }
+        }
+    }
+}

package/android/detox/src/full/java/com/wix/invoke/types/Invocation.java

@@ -92,9 +92,9 @@ public class Invocation {
                     } else if (type.equals("boolean")) {
                         argument = jsonArgument.optBoolean("value");
                     } else if (type.equals("Invocation")) {
-                        argument = new Invocation(jsonArgument.optJSONObject("value"));                        
+                        argument = new Invocation(jsonArgument.optJSONObject("value"));
                     } else {
-                        throw new RuntimeException("Unhandled arg type" + type);
+                        throw new RuntimeException("Unhandled arg type " + type);
                     }
                 }
             }
@@ -105,6 +105,8 @@ public class Invocation {
     }
 
     public void setArgs(Object[] args) {
+        JsonParser parser = new JsonParser();
+
         for (int i = 0; i < args.length; i++) {
             Object argument = args[i];
             if (argument instanceof HashMap && !((HashMap) argument).isEmpty()) {
@@ -125,10 +127,9 @@ public class Invocation {
                 } else if (type.equals("boolean")) {
                     argument = ((Boolean) value).booleanValue();
                 } else if (type.equals("Invocation")) {
-                    JsonParser parser = new JsonParser();
                     argument = parser.parse((String)value);
                 } else {
-                    throw new RuntimeException("Unhandled arg type" + type);
+                    throw new RuntimeException("Unhandled arg type " + type);
                 }
 
                 args[i] = argument;

package/android/detox/src/main/java/com/wix/detox/espresso/MultipleViewsAction.kt

@@ -0,0 +1,4 @@
+package com.wix.detox.espresso
+
+// Marker interface for actions that should be applied to all matching elements without ambiguity.
+interface MultipleViewsAction

package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt

@@ -1,4 +1,3 @@
-
 package com.wix.detox.espresso
 
 import androidx.test.espresso.UiController

package/android/detox/src/main/java/com/wix/detox/espresso/ViewActionWithResult.kt

@@ -2,6 +2,7 @@ package com.wix.detox.espresso
 
 import androidx.test.espresso.ViewAction
 
-interface ViewActionWithResult<R: Any?>: ViewAction {
+// Interface for actions that return a result.
+interface ViewActionWithResult<R: Any?> : ViewAction {
     fun getResult(): R
 }

package/android/detox/src/testFull/java/com/wix/detox/espresso/action/GetAttributesActionTest.kt

@@ -37,7 +37,7 @@ class GetAttributesActionTest {
 
     private fun perform(v: View = view): JSONObject {
         uut.perform(null, v)
-        return JSONObject(uut.getResult())
+        return uut.getResult()!!
     }
 
     @Test
@@ -135,10 +135,10 @@ class GetAttributesActionTest {
         }
 
         val resultJson = perform()
-        assertThat(resultJson.opt("alpha")).isEqualTo(0.42)
+        assertThat(resultJson.opt("alpha")).isEqualTo(0.42f)
         assertThat(resultJson.opt("width")).isEqualTo(123)
         assertThat(resultJson.opt("height")).isEqualTo(456)
-        assertThat(resultJson.opt("elevation")).isEqualTo(0.314)
+        assertThat(resultJson.opt("elevation")).isEqualTo(0.314f)
     }
 
     @Test
@@ -208,7 +208,8 @@ class GetAttributesActionTest {
         }
 
         val resultJson = perform(slider)
-        assertThat(resultJson.opt("value")).isEqualTo(0.42)
+        android.util.Log.i("TESTS", "should return material-Slider state through value attribute: "+ resultJson)
+        assertThat(resultJson.opt("value")).isEqualTo(0.42f)
     }
 
     @Test
@@ -221,7 +222,7 @@ class GetAttributesActionTest {
 
         val resultJson = perform(textView)
         assertThat(resultJson.opt("text")).isEqualTo("mock-text")
-        assertThat(resultJson.opt("textSize")).isEqualTo(24)
+        assertThat(resultJson.opt("textSize")).isEqualTo(24f)
         assertThat(resultJson.opt("length")).isEqualTo(111)
     }
 

package/android/detox/src/testFull/java/com/wix/detox/espresso/performer/ViewActionPerformerSpec.kt

@@ -0,0 +1,37 @@
+package com.wix.detox.espresso.performer
+
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import androidx.test.espresso.ViewAction
+import com.wix.detox.espresso.MultipleViewsAction
+import org.hamcrest.Matcher
+import org.mockito.Mockito.*
+import org.mockito.kotlin.mock
+
+object ViewActionPerformerSpec : Spek({
+
+    describe("ViewActionPerformer") {
+        context("forAction") {
+            context("given a regular ViewAction") {
+                val action = mock(ViewAction::class.java)
+
+                it("should return a SingleViewActionPerformer") {
+                    val performer = ViewActionPerformer.forAction(action)
+                    assert(performer is SingleViewActionPerformer)
+                }
+            }
+
+            context("given a MultipleViewsAction") {
+                val multipleViewsAction: ViewAction = mock(
+                    ViewAction::class.java,
+                    withSettings().extraInterfaces(MultipleViewsAction::class.java)
+                )
+
+                it("should return a MultipleViewsActionPerformer") {
+                    val performer = ViewActionPerformer.forAction(multipleViewsAction)
+                    assert(performer is MultipleViewsActionPerformer)
+                }
+            }
+        }
+    }
+})

package/index.d.ts

@@ -1430,8 +1430,9 @@ declare global {
             takeScreenshot(name: string): Promise<string>;
 
             /**
-             * Gets the native (OS-dependent) attributes of the element.
-             * For more information, see {@link https://wix.github.io/Detox/docs/api/actions-on-element/#getattributes}
+             * Retrieves the OS-dependent attributes of an element.
+             * If there are multiple matches, it returns an array of attributes for all matched elements.
+             * For detailed information, refer to {@link https://wix.github.io/Detox/docs/api/actions-on-element/#getattributes}
              *
              * @example
              * test('Get the attributes for my text element', async () => {
@@ -1445,7 +1446,7 @@ declare global {
              *    jestExpect(attributes.width).toHaveValue(100);
              * })
              */
-            getAttributes(): Promise<IosElementAttributes | AndroidElementAttributes | { elements: IosElementAttributes[]; }>;
+            getAttributes(): Promise<IosElementAttributes | AndroidElementAttributes | { elements: IosElementAttributes[] } | { elements: AndroidElementAttributes[] } >;
         }
 
         interface WebExpect<R = Promise<void>> {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.11.5-smoke.0",
+  "version": "20.12.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -206,5 +206,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "03762775a345289d7466a1163fb168797da1dc2b"
+  "gitHead": "8102c59b8bf62854f7767c68e35412eb981792d0"
 }

package/src/android/core/NativeElement.js

@@ -15,39 +15,37 @@ class NativeElement {
   constructor(invocationManager, emitter, matcher) {
     this._invocationManager = invocationManager;
     this._emitter = emitter;
-    this._originalMatcher = matcher;
-    this._selectElementWithMatcher(this._originalMatcher);
+    this._matcher = matcher;
   }
 
-  _selectElementWithMatcher(matcher) {
-    this._call = invoke.call(invoke.Espresso, 'onView', matcher._call);
+  get _call() {
+    return invoke.call(invoke.Espresso, 'onView', this._matcher._call);
   }
 
   atIndex(index) {
     if (typeof index !== 'number') throw new DetoxRuntimeError({ message: `Element atIndex argument must be a number, got ${typeof index}` });
-    const matcher = this._originalMatcher;
-    this._originalMatcher._call = invoke.callDirectly(DetoxMatcherApi.matcherForAtIndex(index, matcher._call.value));
+    const matcher = this._matcher;
+    this._matcher._call = invoke.callDirectly(DetoxMatcherApi.matcherForAtIndex(index, matcher._call.value));
 
-    this._selectElementWithMatcher(this._originalMatcher);
     return this;
   }
 
   async tap(value) {
     const action = new actions.TapAction(value);
     const traceDescription = actionDescription.tapAtPoint(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async tapAtPoint(value) {
     const action = new actions.TapAtPointAction(value);
     const traceDescription = actionDescription.tapAtPoint(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async longPress() {
     const action = new actions.LongPressAction();
     const traceDescription = actionDescription.longPress();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async multiTap(times) {
@@ -56,61 +54,61 @@ class NativeElement {
 
     const action = new actions.MultiClickAction(times);
     const traceDescription = actionDescription.multiTap(times);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async tapBackspaceKey() {
     const action = new actions.PressKeyAction(67);
     const traceDescription = actionDescription.tapBackspaceKey();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async tapReturnKey() {
     const action = new actions.TypeTextAction('\n');
     const traceDescription = actionDescription.tapReturnKey();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async typeText(value) {
     const action = new actions.TypeTextAction(value);
     const traceDescription = actionDescription.typeText(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async replaceText(value) {
     const action = new actions.ReplaceTextAction(value);
     const traceDescription = actionDescription.replaceText(value);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async clearText() {
     const action = new actions.ClearTextAction();
     const traceDescription = actionDescription.clearText();
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async scroll(amount, direction = 'down', startPositionX, startPositionY) {
     const action = new actions.ScrollAmountAction(direction, amount, startPositionX, startPositionY);
     const traceDescription = actionDescription.scroll(amount, direction, startPositionX, startPositionY);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async scrollTo(edge) {
     // override the user's element selection with an extended matcher that looks for UIScrollView children
-    this._selectElementWithMatcher(this._originalMatcher._extendToDescendantScrollViews());
+    this._matcher = this._matcher._extendToDescendantScrollViews();
 
     const action = new actions.ScrollEdgeAction(edge);
     const traceDescription = actionDescription.scrollTo(edge);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async scrollToIndex(index) {
     // override the user's element selection with an extended matcher that looks for UIScrollView children
-    this._selectElementWithMatcher(this._originalMatcher._extendToDescendantScrollViews());
+    this._matcher = this._matcher._extendToDescendantScrollViews();
 
     const action = new actions.ScrollToIndex(index);
     const traceDescription = actionDescription.scrollToIndex(index);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async setDatePickerDate(rawDateString, formatString) {
@@ -120,7 +118,7 @@ class NativeElement {
 
     const action = new actions.SetDatePickerDateAction(dateString, formatString);
     const traceDescription = actionDescription.setDatePickerDate(dateString, formatString);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   /**
@@ -134,18 +132,18 @@ class NativeElement {
     normalizedSwipeOffset = Number.isNaN(normalizedSwipeOffset) ? 0.75 : normalizedSwipeOffset;
 
     // override the user's element selection with an extended matcher that avoids RN issues with RCTScrollView
-    this._selectElementWithMatcher(this._originalMatcher._avoidProblematicReactNativeElements());
+    this._matcher = this._matcher._avoidProblematicReactNativeElements();
 
     const action = new actions.SwipeAction(direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY);
     const traceDescription = actionDescription.swipe(direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async takeScreenshot(screenshotName) {
     // TODO this should be moved to a lower-layer handler of this use-case
     const action = new actions.TakeElementScreenshot();
     const traceDescription = actionDescription.takeScreenshot(screenshotName);
-    const resultBase64 = await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    const resultBase64 = await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
     const filePath = tempfile('detox.element-screenshot.png');
     await fs.writeFile(filePath, resultBase64, 'base64');
 
@@ -160,19 +158,18 @@ class NativeElement {
   async getAttributes() {
     const action = new actions.GetAttributes();
     const traceDescription = actionDescription.getAttributes();
-    const result = await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
-    return JSON.parse(result);
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async adjustSliderToPosition(newPosition) {
     const action = new actions.AdjustSliderToPosition(newPosition);
     const traceDescription = actionDescription.adjustSliderToPosition(newPosition);
-    return await new ActionInteraction(this._invocationManager, this, action, traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, action, traceDescription).execute();
   }
 
   async performAccessibilityAction(actionName) {
     const traceDescription = actionDescription.performAccessibilityAction(actionName);
-    return await new ActionInteraction(this._invocationManager, this, new actions.AccessibilityActionAction(actionName), traceDescription).execute();
+    return await new ActionInteraction(this._invocationManager, this._matcher, new actions.AccessibilityActionAction(actionName), traceDescription).execute();
   }
 }
 

package/src/android/espressoapi/DetoxAssertion.js

@@ -14,7 +14,7 @@ function sanitize_matcher(matcher) {
   return originalMatcher.type ? originalMatcher.value : originalMatcher;
 } 
 class DetoxAssertion {
-  static assertMatcher(i, m) {
+  static assertMatcher(viewInteraction, viewMatcher) {
     return {
       target: {
         type: "Class",
@@ -23,15 +23,15 @@ class DetoxAssertion {
       method: "assertMatcher",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }, {
         type: "Invocation",
-        value: sanitize_matcher(m)
+        value: sanitize_matcher(viewMatcher)
       }]
     };
   }
 
-  static assertNotVisible(i) {
+  static assertNotVisible(viewInteraction) {
     return {
       target: {
         type: "Class",
@@ -40,12 +40,12 @@ class DetoxAssertion {
       method: "assertNotVisible",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }]
     };
   }
 
-  static assertNotExists(i) {
+  static assertNotExists(viewInteraction) {
     return {
       target: {
         type: "Class",
@@ -54,12 +54,12 @@ class DetoxAssertion {
       method: "assertNotExists",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }]
     };
   }
 
-  static waitForAssertMatcher(i, m, timeoutSeconds) {
+  static waitForAssertMatcher(viewInteraction, viewMatcher, timeoutSeconds) {
     if (typeof timeoutSeconds !== "number") throw new Error("timeoutSeconds should be a number, but got " + (timeoutSeconds + (" (" + (typeof timeoutSeconds + ")"))));
     return {
       target: {
@@ -69,10 +69,10 @@ class DetoxAssertion {
       method: "waitForAssertMatcher",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }, {
         type: "Invocation",
-        value: sanitize_matcher(m)
+        value: sanitize_matcher(viewMatcher)
       }, {
         type: "Double",
         value: timeoutSeconds
@@ -80,7 +80,8 @@ class DetoxAssertion {
     };
   }
 
-  static waitForAssertMatcherWithSearchAction(i, vm, searchAction, searchMatcher) {
+  static waitForAssertMatcherWithSearchAction(viewInteraction, viewMatcher, searchAction, searchMatcher
+  ) {
     return {
       target: {
         type: "Class",
@@ -89,13 +90,14 @@ class DetoxAssertion {
       method: "waitForAssertMatcherWithSearchAction",
       args: [{
         type: "Invocation",
-        value: i
+        value: viewInteraction
       }, {
         type: "Invocation",
-        value: sanitize_matcher(vm)
+        value: sanitize_matcher(viewMatcher)
       }, searchAction, {
         type: "Invocation",
-        value: sanitize_matcher(searchMatcher)
+        value: sanitize_matcher(searchMatcher
+        )
       }]
     };
   }

package/src/android/espressoapi/EspressoDetox.js

@@ -5,9 +5,16 @@
 */
 
 
+function sanitize_matcher(matcher) {
+  if (!matcher._call) {
+    return matcher;
+  }
 
+  const originalMatcher = typeof matcher._call === 'function' ? matcher._call() : matcher._call;
+  return originalMatcher.type ? originalMatcher.value : originalMatcher;
+} 
 class EspressoDetox {
-  static perform(interaction, action) {
+  static perform(matcher, action) {
     return {
       target: {
         type: "Class",
@@ -16,7 +23,7 @@ class EspressoDetox {
       method: "perform",
       args: [{
         type: "Invocation",
-        value: interaction
+        value: sanitize_matcher(matcher)
       }, action]
     };
   }

package/src/android/interactions/native.js

@@ -25,9 +25,9 @@ class Interaction {
 }
 
 class ActionInteraction extends Interaction {
-  constructor(invocationManager, element, action, traceDescription) {
+  constructor(invocationManager, matcher, action, traceDescription) {
     super(invocationManager, traceDescription);
-    this._call = EspressoDetoxApi.perform(call(element._call), action._call);
+    this._call = EspressoDetoxApi.perform(matcher, action._call);
     // TODO: move this.execute() here from the caller
   }
 }
@@ -48,7 +48,6 @@ class WaitForInteraction extends Interaction {
     super(invocationManager, expectTraceDescription);
     this._element = element;
     this._assertionMatcher = assertionMatcher;
-    this._element._selectElementWithMatcher(this._element._originalMatcher);
   }
 
   async withTimeout(timeout) {

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.md5

@@ -1 +0,0 @@
-235483fd76fb7161631a1afc88d3f9d1

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-89144d2a6b22b7ebfe93beda4a6cf75fc57bda9f

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-ac3fb0fbc41c393e18b1e7ae39a220083248259c7f3323dd6050ee077f9f83b3

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-20d07161d52ebed5ba3b1794b999db267b5b2884f0da5682a6eb85eaebabcbbfeee5a6dee2900f18050c947f0a24aadebc2a716539f96c1e18ae1f4126ebf3fc

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.md5

@@ -1 +0,0 @@
-edfe514aaecdd6062dbe420a987009cb

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.sha1

@@ -1 +0,0 @@
-f21c0c0f7af9925dc3b4d3c632bfb3eae0c79639

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.sha256

@@ -1 +0,0 @@
-d6f76fa01c04a511378b7b8f6f2dbca4d0e99ecc272f4af3a26056e62dcf80f6

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.sha512

@@ -1 +0,0 @@
-c87f17d07fe06d93c080e1e89a10a879d503984998a95f125042f712530f20f8aed49c1ebc345508d3c89e35f2d955cac942d51b9d174be0be0b3ec820392fd7

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.md5

@@ -1 +0,0 @@
-e1d6c5353b93ff848864f887b4763050

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.sha1

@@ -1 +0,0 @@
-809426e1ab6811b1e6a727fdcd22bbbf20f89b02

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.sha256

@@ -1 +0,0 @@
-dadebda11f4a94f751e23277fadbbaef518955f72ba353a5ae5f52ef1ba9acde

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.sha512

@@ -1 +0,0 @@
-ba77a84e27f54bc932e73fac36cf2aa3b2a45fc51975088af59632256b214365fb1decbb77c117e5889013b10e4dc110e074100ac439b201e58ffd7333aa370e

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.md5

@@ -1 +0,0 @@
-64c43d4e57385c7226222c464fdc849c

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.sha1

@@ -1 +0,0 @@
-3e2cf8fb12f021efee7ea5c2c223f50882e3dc84

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.sha256

@@ -1 +0,0 @@
-d05e592024d3ea7c74f749f164fb99ad2f953e545d6cc5526c087342f95eceb5

package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.sha512

@@ -1 +0,0 @@
-58f4e355f0cb537010ea3caa78857445fbfcd47e5c41c990541243cba24f2818d8ab45596e2ddb2c741d0fd65c4f1eaee716e75586c3c4c37a5b6b22e7ec2fa3