-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix
CallInvokerHolderImpl backwards compatibility (#6601)
## Summary This PR changes the way `CallInvokerHandlerImpl` is obtained on older versions of RN. It seems that there is a bug in our build checking CI, since calling `context.getJSCallInvokerHolder()` is not valid on older versions of RN. ## Test plan
- Loading branch information
1 parent
84d8d3a
commit 1e6ed83
Showing
6 changed files
with
166 additions
and
6 deletions.
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
File renamed without changes.
152 changes: 152 additions & 0 deletions
152
...src/reactNativeVersionPatch/NativeProxyPaper/74/com/swmansion/reanimated/NativeProxy.java
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,152 @@ | ||
| package com.swmansion.reanimated; | ||
|
|
||
| import static com.swmansion.reanimated.Utils.simplifyStringNumbersList; | ||
|
|
||
| import androidx.annotation.OptIn; | ||
| import com.facebook.jni.HybridData; | ||
| import com.facebook.proguard.annotations.DoNotStrip; | ||
| import com.facebook.react.bridge.ReactApplicationContext; | ||
| import com.facebook.react.bridge.queue.MessageQueueThread; | ||
| import com.facebook.react.common.annotations.FrameworkAPI; | ||
| import com.facebook.react.turbomodule.core.CallInvokerHolderImpl; | ||
| import com.swmansion.reanimated.layoutReanimation.LayoutAnimations; | ||
| import com.swmansion.reanimated.layoutReanimation.NativeMethodsHolder; | ||
| import com.swmansion.reanimated.nativeProxy.NativeProxyCommon; | ||
| import java.lang.ref.WeakReference; | ||
| import java.util.HashMap; | ||
| import java.util.Objects; | ||
|
|
||
| public class NativeProxy extends NativeProxyCommon { | ||
| @DoNotStrip | ||
| @SuppressWarnings("unused") | ||
| private final HybridData mHybridData; | ||
|
|
||
| @OptIn(markerClass = FrameworkAPI.class) | ||
| public NativeProxy(ReactApplicationContext context, String valueUnpackerCode) { | ||
| super(context); | ||
| CallInvokerHolderImpl holder = | ||
| (CallInvokerHolderImpl) context.getCatalystInstance().getJSCallInvokerHolder(); | ||
| LayoutAnimations LayoutAnimations = new LayoutAnimations(context); | ||
| ReanimatedMessageQueueThread messageQueueThread = new ReanimatedMessageQueueThread(); | ||
| mHybridData = | ||
| initHybrid( | ||
| Objects.requireNonNull(context.getJavaScriptContextHolder()).get(), | ||
| holder, | ||
| mAndroidUIScheduler, | ||
| LayoutAnimations, | ||
| messageQueueThread, | ||
| valueUnpackerCode); | ||
| prepareLayoutAnimations(LayoutAnimations); | ||
| installJSIBindings(); | ||
| if (BuildConfig.DEBUG) { | ||
| checkCppVersion(); | ||
| } | ||
| } | ||
|
|
||
| @OptIn(markerClass = FrameworkAPI.class) | ||
| private native HybridData initHybrid( | ||
| long jsContext, | ||
| CallInvokerHolderImpl jsCallInvokerHolder, | ||
| AndroidUIScheduler androidUIScheduler, | ||
| LayoutAnimations LayoutAnimations, | ||
| MessageQueueThread messageQueueThread, | ||
| String valueUnpackerCode); | ||
|
|
||
| public native boolean isAnyHandlerWaitingForEvent(String eventName, int emitterReactTag); | ||
|
|
||
| public native void performOperations(); | ||
|
|
||
| @Override | ||
| protected HybridData getHybridData() { | ||
| return mHybridData; | ||
| } | ||
|
|
||
| public static NativeMethodsHolder createNativeMethodsHolder(LayoutAnimations layoutAnimations) { | ||
| WeakReference<LayoutAnimations> weakLayoutAnimations = new WeakReference<>(layoutAnimations); | ||
| return new NativeMethodsHolder() { | ||
| @Override | ||
| public void startAnimation(int tag, int type, HashMap<String, Object> values) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| HashMap<String, String> preparedValues = new HashMap<>(); | ||
| for (String key : values.keySet()) { | ||
| String stringValue = values.get(key).toString(); | ||
| if (key.endsWith("TransformMatrix")) { | ||
| preparedValues.put(key, simplifyStringNumbersList(stringValue)); | ||
| } else { | ||
| preparedValues.put(key, stringValue); | ||
| } | ||
| } | ||
| layoutAnimations.startAnimationForTag(tag, type, preparedValues); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean shouldAnimateExiting(int tag, boolean shouldAnimate) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| return layoutAnimations.shouldAnimateExiting(tag, shouldAnimate); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isLayoutAnimationEnabled() { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| return layoutAnimations.isLayoutAnimationEnabled(); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasAnimation(int tag, int type) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| return layoutAnimations.hasAnimationForTag(tag, type); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public void clearAnimationConfig(int tag) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| layoutAnimations.clearAnimationConfigForTag(tag); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void cancelAnimation(int tag) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| layoutAnimations.cancelAnimationForTag(tag); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public int findPrecedingViewTagForTransition(int tag) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| return layoutAnimations.findPrecedingViewTagForTransition(tag); | ||
| } | ||
| return -1; | ||
| } | ||
|
|
||
| public void checkDuplicateSharedTag(int viewTag, int screenTag) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| layoutAnimations.checkDuplicateSharedTag(viewTag, screenTag); | ||
| } | ||
| } | ||
|
|
||
| public int[] getSharedGroup(int viewTag) { | ||
| LayoutAnimations layoutAnimations = weakLayoutAnimations.get(); | ||
| if (layoutAnimations != null) { | ||
| return layoutAnimations.getSharedGroup(viewTag); | ||
| } | ||
| return new int[] {}; | ||
| } | ||
| }; | ||
| } | ||
| } |
File renamed without changes.