Android: Support RN50-51 changes #652
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.wix.detox; | ||
|
|
||
| import org.joor.Reflect; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public class ReactNativeCompat { | ||
| static Map<String, Object> VERSION; | ||
|
|
||
| static { | ||
| try { | ||
| Class reactNativeVersion = Class.forName("com.facebook.react.modules.systeminfo.ReactNativeVersion"); | ||
| VERSION = Reflect.on(reactNativeVersion).field("VERSION").get(); | ||
| } catch (ClassNotFoundException e) { | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public static int getMinor() { | ||
| return (Integer) VERSION.get("minor"); | ||
| } | ||
|
|
||
| public static void waitForReactNativeLoad(Object reactNativeHostHolder) { | ||
| if (getMinor() >= 50) { | ||
| ReactNativeSupport.waitForReactNativeLoad(reactNativeHostHolder); | ||
| try { | ||
| //TODO- Temp hack to make Detox usable for RN>=50 till we find a better sync solution. | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } else { | ||
| ReactNativeSupport.waitForReactNativeLoad(reactNativeHostHolder); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,11 @@ | |
| import android.util.Log; | ||
| import android.view.Choreographer; | ||
|
|
||
| import com.wix.detox.ReactNativeCompat; | ||
|
|
||
| import org.joor.Reflect; | ||
| import org.joor.ReflectException; | ||
|
|
||
| /** | ||
| * Created by simonracz on 25/08/2017. | ||
| */ | ||
|
|
@@ -18,13 +18,14 @@ | |
| * <p> | ||
| * Espresso IdlingResource for React Native's Animated Module. | ||
| * </p> | ||
| * <p> | ||
| * <p> | ||
| * Hooks up to React Native internals to monitor the state of the animations. | ||
| * </p> | ||
| * <p> | ||
| * This Idling Resource is inherently tied to the UI Module IR. It must be registered after | ||
| * the UI Module IR. This order is not enforced now. | ||
| * | ||
| * @see <a href="https://github.com/facebook/react-native/blob/259eac8c30b536abddab7925f4c51f0bf7ced58d/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java#L143">AnimatedModule</a> | ||
| */ | ||
| public class AnimatedModuleIdlingResource implements IdlingResource, Choreographer.FrameCallback { | ||
|
|
@@ -82,91 +83,102 @@ public boolean isIdleNow() { | |
| return false; | ||
| } | ||
|
|
||
| if (!(boolean) Reflect.on(reactContext).call(METHOD_HAS_NATIVE_MODULE, animModuleClass).get()) { | ||
| Log.e(LOG_TAG, "Can't find Animated Module."); | ||
| if (callback != null) { | ||
| callback.onTransitionToIdle(); | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| if (ReactNativeCompat.getMinor() >= 51) { | ||
| if(isIdleRN51(animModuleClass)) { | ||
| return true; | ||
| } | ||
| } else { | ||
| if (isIdleRNOld(animModuleClass)) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| Log.i(LOG_TAG, "AnimatedModule is busy."); | ||
| Choreographer.getInstance().postFrameCallback(this); | ||
| return false; | ||
| } catch (ReflectException e) { | ||
| Log.e(LOG_TAG, "Couldn't set up RN AnimatedModule listener, old RN version?"); | ||
| Log.e(LOG_TAG, "Can't set up RN AnimatedModule listener", e.getCause()); | ||
| } | ||
|
|
||
| if (callback != null) { | ||
| callback.onTransitionToIdle(); | ||
| } | ||
| Log.i(LOG_TAG, "AnimatedModule is idle."); | ||
| return true; | ||
| } | ||
|
|
||
| private boolean isIdleRN51(Object animModuleClass) { | ||
| Object animModule = Reflect.on(reactContext).call(METHOD_GET_NATIVE_MODULE, animModuleClass).get(); | ||
| Object nodesManager = Reflect.on(animModule).call("getNodesManager").get(); | ||
| boolean hasActiveAnimations = Reflect.on(nodesManager).call("hasActiveAnimations").get(); | ||
| if (!hasActiveAnimations) { | ||
| if (callback != null) { | ||
| callback.onTransitionToIdle(); | ||
| } | ||
| Log.i(LOG_TAG, "AnimatedModule is idle, no operations"); | ||
|
There was a problem hiding this comment. I think we shouldn't log out idle states. Only busy states. Originally, I also logged both states, but after the initial debugging it become overwhelming. There was a problem hiding this comment. I looked at this diff. I am not even sure that we need an animatedIdlingResource at all on later RN versions. It seems, they delegate everything to the UIModule. I don't fully understand the new flow in that code though. The check here certainly doesn't do any harm. There was a problem hiding this comment. Well, it was a trial and error kinda fix :) |
||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private boolean isIdleRNOld(Object animModuleClass) { | ||
| Object animModule = Reflect.on(reactContext).call(METHOD_GET_NATIVE_MODULE, animModuleClass).get(); | ||
| Object operationsLock = Reflect.on(animModule).field(LOCK_OPERATIONS).get(); | ||
| boolean operationsAreEmpty; | ||
| boolean animationsConsideredIdle; | ||
| synchronized (operationsLock) { | ||
| Object operations = Reflect.on(animModule).field(FIELD_OPERATIONS).get(); | ||
| if (operations == null) { | ||
| operationsAreEmpty = true; | ||
| } else { | ||
| operationsAreEmpty = Reflect.on(operations).call(METHOD_IS_EMPTY).get(); | ||
| } | ||
| } | ||
| Object nodesManager = Reflect.on(animModule).field(FIELD_NODES_MANAGER).get(); | ||
|
|
||
| // We do this in this complicated way | ||
| // to not consider looped animations | ||
| // as a busy state. | ||
| int updatedNodesSize = Reflect.on(nodesManager).field(FIELD_UPDATED_NODES).call(METHOD_SIZE).get(); | ||
| if (updatedNodesSize > 0) { | ||
| animationsConsideredIdle = false; | ||
| } else { | ||
| Object activeAnims = Reflect.on(nodesManager).field(FIELD_ACTIVE_ANIMATIONS).get(); | ||
| int activeAnimsSize = Reflect.on(activeAnims).call(METHOD_SIZE).get(); | ||
| if (activeAnimsSize == 0) { | ||
| animationsConsideredIdle = true; | ||
| } else { | ||
| animationsConsideredIdle = true; | ||
| for (int i = 0; i < activeAnimsSize; ++i) { | ||
| int iterations = Reflect.on(activeAnims).call(METHOD_VALUE_AT, i).field(FIELD_ITERATIONS).get(); | ||
| // -1 means it is looped | ||
| if (iterations != -1) { | ||
| animationsConsideredIdle = false; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (operationsAreEmpty && animationsConsideredIdle) { | ||
| if (callback != null) { | ||
| callback.onTransitionToIdle(); | ||
| } | ||
| Log.i(LOG_TAG, "AnimatedModule is idle."); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public void registerIdleTransitionCallback(ResourceCallback callback) { | ||
| this.callback = callback; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class is present only in RN 50 and above.
Later, the getMinor call could fail on these older versions. As we don't actually use this API on older versions, I think we could just set it to 49.5.0 in the catch as a default version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, thanks