react-native-reanimated 2.9.1 → 3.0.0-rc.2

package/android/src/main/java/com/swmansion/reanimated/NodesManager.java

@@ -1,11 +1,10 @@
 package com.swmansion.reanimated;
 
-import android.util.SparseArray;
+import static java.lang.Float.NaN;
+
 import android.view.View;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.GuardedRunnable;
-import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -28,30 +27,8 @@ import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcherListener;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.swmansion.reanimated.layoutReanimation.AnimationsManager;
-import com.swmansion.reanimated.nodes.AlwaysNode;
-import com.swmansion.reanimated.nodes.BezierNode;
-import com.swmansion.reanimated.nodes.BlockNode;
-import com.swmansion.reanimated.nodes.CallFuncNode;
-import com.swmansion.reanimated.nodes.ClockNode;
-import com.swmansion.reanimated.nodes.ClockOpNode;
-import com.swmansion.reanimated.nodes.ConcatNode;
-import com.swmansion.reanimated.nodes.CondNode;
-import com.swmansion.reanimated.nodes.DebugNode;
-import com.swmansion.reanimated.nodes.EventNode;
-import com.swmansion.reanimated.nodes.FunctionNode;
-import com.swmansion.reanimated.nodes.JSCallNode;
-import com.swmansion.reanimated.nodes.Node;
-import com.swmansion.reanimated.nodes.NoopNode;
-import com.swmansion.reanimated.nodes.OperatorNode;
-import com.swmansion.reanimated.nodes.ParamNode;
-import com.swmansion.reanimated.nodes.PropsNode;
-import com.swmansion.reanimated.nodes.SetNode;
-import com.swmansion.reanimated.nodes.StyleNode;
-import com.swmansion.reanimated.nodes.TransformNode;
-import com.swmansion.reanimated.nodes.ValueNode;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -64,8 +41,6 @@ import javax.annotation.Nullable;
 
 public class NodesManager implements EventDispatcherListener {
 
-  private static final Double ZERO = Double.valueOf(0);
-
   public void scrollTo(int viewTag, double x, double y, boolean animated) {
     View view;
     try {
@@ -83,7 +58,7 @@ public class NodesManager implements EventDispatcherListener {
       view = mUIManager.resolveView(viewTag);
     } catch (IllegalViewOperationException e) {
       e.printStackTrace();
-      return (new float[] {});
+      return (new float[] {NaN, NaN, NaN, NaN, NaN, NaN});
     }
     return NativeMethodsHelper.measure(view);
   }
@@ -92,28 +67,23 @@ public class NodesManager implements EventDispatcherListener {
     void onAnimationFrame(double timestampMs);
   }
 
-  private AnimationsManager mAnimationManager = null;
-  private final SparseArray<Node> mAnimatedNodes = new SparseArray<>();
-  private final Map<String, EventNode> mEventMapping = new HashMap<>();
+  private AnimationsManager mAnimationManager;
   private final UIImplementation mUIImplementation;
   private final DeviceEventManagerModule.RCTDeviceEventEmitter mEventEmitter;
   private final ReactChoreographer mReactChoreographer;
   private final GuardedFrameCallback mChoreographerCallback;
   protected final UIManagerModule.CustomEventNamesResolver mCustomEventNamesResolver;
   private final AtomicBoolean mCallbackPosted = new AtomicBoolean();
-  private final NoopNode mNoopNode;
   private final ReactContext mContext;
   private final UIManagerModule mUIManager;
-
+  private ReactApplicationContext mReactApplicationContext;
   private RCTEventEmitter mCustomEventHandler;
   private List<OnAnimationFrame> mFrameCallbacks = new ArrayList<>();
   private ConcurrentLinkedQueue<CopiedEvent> mEventQueue = new ConcurrentLinkedQueue<>();
-  private boolean mWantRunUpdates;
-
   public double currentFrameTimeMs;
-  public final UpdateContext updateContext;
   public Set<String> uiProps = Collections.emptySet();
   public Set<String> nativeProps = Collections.emptySet();
+  private ReaCompatibility compatibility;
 
   public NativeProxy getNativeProxy() {
     return mNativeProxy;
@@ -137,8 +107,11 @@ public class NodesManager implements EventDispatcherListener {
   }
 
   public void initWithContext(ReactApplicationContext reactApplicationContext) {
+    mReactApplicationContext = reactApplicationContext;
     mNativeProxy = new NativeProxy(reactApplicationContext);
     mAnimationManager.setScheduler(getNativeProxy().getScheduler());
+    compatibility = new ReaCompatibility(reactApplicationContext);
+    compatibility.registerFabricEventListener(this);
   }
 
   private final class NativeUpdateOperation {
@@ -157,7 +130,6 @@ public class NodesManager implements EventDispatcherListener {
   public NodesManager(ReactContext context) {
     mContext = context;
     mUIManager = context.getNativeModule(UIManagerModule.class);
-    updateContext = new UpdateContext();
     mUIImplementation = mUIManager.getUIImplementation();
     mCustomEventNamesResolver = mUIManager.getDirectEventNamesResolver();
     mEventEmitter = context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
@@ -171,8 +143,6 @@ public class NodesManager implements EventDispatcherListener {
           }
         };
 
-    mNoopNode = new NoopNode(this);
-
     // We register as event listener at the end, because we pass `this` and we haven't finished
     // contructing an object yet.
     // This lead to a crash described in
@@ -214,7 +184,9 @@ public class NodesManager implements EventDispatcherListener {
   }
 
   private void performOperations() {
-    if (!mOperationsInBatch.isEmpty()) {
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      mNativeProxy.performOperations();
+    } else if (!mOperationsInBatch.isEmpty()) {
       final Queue<NativeUpdateOperation> copiedOperationsQueue = mOperationsInBatch;
       mOperationsInBatch = new LinkedList<>();
       final boolean trySynchronously = mTryRunBatchUpdatesSynchronously;
@@ -274,13 +246,9 @@ public class NodesManager implements EventDispatcherListener {
       }
     }
 
-    if (mWantRunUpdates) {
-      Node.runUpdates(updateContext);
-    }
     performOperations();
 
     mCallbackPosted.set(false);
-    mWantRunUpdates = false;
 
     if (!mFrameCallbacks.isEmpty() || !mEventQueue.isEmpty()) {
       // enqueue next frame
@@ -288,153 +256,6 @@ public class NodesManager implements EventDispatcherListener {
     }
   }
 
-  /**
-   * Null-safe way of getting node's value. If node is not present we return 0. This also matches
-   * iOS behavior when the app won't just crash.
-   */
-  public Object getNodeValue(int nodeID) {
-    Node node = mAnimatedNodes.get(nodeID);
-    if (node != null) {
-      return node.value();
-    }
-    return ZERO;
-  }
-
-  /**
-   * Null-safe way of getting node reference. This method always returns non-null instance. If the
-   * node is not present we try to return a "no-op" node that allows for "set" calls and always
-   * returns 0 as a value.
-   */
-  public <T extends Node> T findNodeById(int id, Class<T> type) {
-    Node node = mAnimatedNodes.get(id);
-    if (node == null) {
-      if (type == Node.class || type == ValueNode.class) {
-        return (T) mNoopNode;
-      }
-      throw new IllegalArgumentException(
-          "Requested node with id " + id + " of type " + type + " cannot be found");
-    }
-    if (type.isInstance(node)) {
-      return (T) node;
-    }
-    throw new IllegalArgumentException(
-        "Node with id "
-            + id
-            + " is of incompatible type "
-            + node.getClass()
-            + ", requested type was "
-            + type);
-  }
-
-  public void createNode(int nodeID, ReadableMap config) {
-    if (mAnimatedNodes.get(nodeID) != null) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node with ID " + nodeID + " already exists");
-    }
-    String type = config.getString("type");
-    final Node node;
-    if ("props".equals(type)) {
-      node = new PropsNode(nodeID, config, this, mUIImplementation);
-    } else if ("style".equals(type)) {
-      node = new StyleNode(nodeID, config, this);
-    } else if ("transform".equals(type)) {
-      node = new TransformNode(nodeID, config, this);
-    } else if ("value".equals(type)) {
-      node = new ValueNode(nodeID, config, this);
-    } else if ("block".equals(type)) {
-      node = new BlockNode(nodeID, config, this);
-    } else if ("cond".equals(type)) {
-      node = new CondNode(nodeID, config, this);
-    } else if ("op".equals(type)) {
-      node = new OperatorNode(nodeID, config, this);
-    } else if ("set".equals(type)) {
-      node = new SetNode(nodeID, config, this);
-    } else if ("debug".equals(type)) {
-      node = new DebugNode(nodeID, config, this);
-    } else if ("clock".equals(type)) {
-      node = new ClockNode(nodeID, config, this);
-    } else if ("clockStart".equals(type)) {
-      node = new ClockOpNode.ClockStartNode(nodeID, config, this);
-    } else if ("clockStop".equals(type)) {
-      node = new ClockOpNode.ClockStopNode(nodeID, config, this);
-    } else if ("clockTest".equals(type)) {
-      node = new ClockOpNode.ClockTestNode(nodeID, config, this);
-    } else if ("call".equals(type)) {
-      node = new JSCallNode(nodeID, config, this);
-    } else if ("bezier".equals(type)) {
-      node = new BezierNode(nodeID, config, this);
-    } else if ("event".equals(type)) {
-      node = new EventNode(nodeID, config, this);
-    } else if ("always".equals(type)) {
-      node = new AlwaysNode(nodeID, config, this);
-    } else if ("concat".equals(type)) {
-      node = new ConcatNode(nodeID, config, this);
-    } else if ("param".equals(type)) {
-      node = new ParamNode(nodeID, config, this);
-    } else if ("func".equals(type)) {
-      node = new FunctionNode(nodeID, config, this);
-    } else if ("callfunc".equals(type)) {
-      node = new CallFuncNode(nodeID, config, this);
-    } else {
-      throw new JSApplicationIllegalArgumentException("Unsupported node type: " + type);
-    }
-    mAnimatedNodes.put(nodeID, node);
-  }
-
-  public void dropNode(int tag) {
-    Node node = mAnimatedNodes.get(tag);
-    if (node != null) {
-      node.onDrop();
-    }
-    mAnimatedNodes.remove(tag);
-  }
-
-  public void connectNodes(int parentID, int childID) {
-    Node parentNode = mAnimatedNodes.get(parentID);
-    Node childNode = mAnimatedNodes.get(childID);
-    if (childNode == null) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node with ID " + childID + " does not exists");
-    }
-    parentNode.addChild(childNode);
-  }
-
-  public void disconnectNodes(int parentID, int childID) {
-    Node parentNode = mAnimatedNodes.get(parentID);
-    Node childNode = mAnimatedNodes.get(childID);
-    if (childNode == null) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node with ID " + childID + " does not exists");
-    }
-    parentNode.removeChild(childNode);
-  }
-
-  public void connectNodeToView(int nodeID, int viewTag) {
-    Node node = mAnimatedNodes.get(nodeID);
-    if (node == null) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node with ID " + nodeID + " does not exists");
-    }
-    if (!(node instanceof PropsNode)) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node connected to view should be" + "of type " + PropsNode.class.getName());
-    }
-    ((PropsNode) node).connectToView(viewTag);
-  }
-
-  public void disconnectNodeFromView(int nodeID, int viewTag) {
-    Node node = mAnimatedNodes.get(nodeID);
-    if (node == null) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node with ID " + nodeID + " does not exists");
-    }
-    if (!(node instanceof PropsNode)) {
-      throw new JSApplicationIllegalArgumentException(
-          "Animated node connected to view should be" + "of type " + PropsNode.class.getName());
-    }
-    ((PropsNode) node).disconnectFromView(viewTag);
-  }
-
   public void enqueueUpdateViewOnNativeThread(
       int viewTag, WritableMap nativeProps, boolean trySynchronously) {
     if (trySynchronously) {
@@ -443,41 +264,11 @@ public class NodesManager implements EventDispatcherListener {
     mOperationsInBatch.add(new NativeUpdateOperation(viewTag, nativeProps));
   }
 
-  public void attachEvent(int viewTag, String eventName, int eventNodeID) {
-    String key = viewTag + eventName;
-
-    EventNode node = (EventNode) mAnimatedNodes.get(eventNodeID);
-    if (node == null) {
-      throw new JSApplicationIllegalArgumentException(
-          "Event node " + eventNodeID + " does not exists");
-    }
-    if (mEventMapping.containsKey(key)) {
-      throw new JSApplicationIllegalArgumentException(
-          "Event handler already set for the given view and event type");
-    }
-
-    mEventMapping.put(key, node);
-  }
-
-  public void detachEvent(int viewTag, String eventName, int eventNodeID) {
-    String key = viewTag + eventName;
-    mEventMapping.remove(key);
-  }
-
   public void configureProps(Set<String> uiPropsSet, Set<String> nativePropsSet) {
     uiProps = uiPropsSet;
     nativeProps = nativePropsSet;
   }
 
-  public void getValue(int nodeID, Callback callback) {
-    callback.invoke(mAnimatedNodes.get(nodeID).value());
-  }
-
-  public void postRunUpdatesAfterAnimation() {
-    mWantRunUpdates = true;
-    startUpdatingOnAnimationFrame();
-  }
-
   public void postOnAnimation(OnAnimationFrame onAnimationFrame) {
     mFrameCallbacks.add(onAnimationFrame);
     startUpdatingOnAnimationFrame();
@@ -511,33 +302,15 @@ public class NodesManager implements EventDispatcherListener {
     // If the event has a different name in native, convert it to it's JS name.
     String eventName = mCustomEventNamesResolver.resolveCustomEventName(event.getEventName());
     int viewTag = event.getViewTag();
-    String key = viewTag + eventName;
-
     if (mCustomEventHandler != null) {
       event.dispatch(mCustomEventHandler);
     }
-
-    if (!mEventMapping.isEmpty()) {
-      EventNode node = mEventMapping.get(key);
-      if (node != null) {
-        event.dispatch(node);
-      }
-    }
   }
 
   private void handleEvent(int targetTag, String eventName, @Nullable WritableMap event) {
     if (mCustomEventHandler != null) {
       mCustomEventHandler.receiveEvent(targetTag, eventName, event);
     }
-
-    String key = targetTag + eventName;
-
-    if (!mEventMapping.isEmpty()) {
-      EventNode node = mEventMapping.get(key);
-      if (node != null) {
-        node.receiveEvent(targetTag, eventName, event);
-      }
-    }
   }
 
   public UIManagerModule.CustomEventNamesResolver getEventNameResolver() {
@@ -552,13 +325,6 @@ public class NodesManager implements EventDispatcherListener {
     mEventEmitter.emit(name, body);
   }
 
-  public void setValue(int nodeID, Double newValue) {
-    Node node = mAnimatedNodes.get(nodeID);
-    if (node != null) {
-      ((ValueNode) node).setValue(newValue);
-    }
-  }
-
   public void updateProps(int viewTag, Map<String, Object> props) {
     // TODO: update PropsNode to use this method instead of its own way of updating props
     boolean hasUIProps = false;
@@ -600,6 +366,10 @@ public class NodesManager implements EventDispatcherListener {
     }
   }
 
+  public void synchronouslyUpdateUIProps(int viewTag, ReadableMap uiProps) {
+    compatibility.synchronouslyUpdateUIProps(viewTag, uiProps);
+  }
+
   public String obtainProp(int viewTag, String propName) {
     View view = mUIManager.resolveView(viewTag);
     String result =

package/android/src/main/java/com/swmansion/reanimated/ReanimatedModule.java

@@ -1,18 +1,15 @@
 package com.swmansion.reanimated;
 
 import android.util.Log;
-import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.UIBlock;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.UIManagerModuleListener;
-import com.swmansion.reanimated.transitions.TransitionModule;
 import java.util.ArrayList;
 import javax.annotation.Nullable;
 
@@ -27,11 +24,7 @@ public class ReanimatedModule extends ReactContextBaseJavaModule
   }
 
   private ArrayList<UIThreadOperation> mOperations = new ArrayList<>();
-
   private @Nullable NodesManager mNodesManager;
-  private @Nullable TransitionModule mTransitionManager;
-
-  private UIManagerModule mUIManager;
 
   public ReanimatedModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -43,9 +36,6 @@ public class ReanimatedModule extends ReactContextBaseJavaModule
     UIManagerModule uiManager = reactCtx.getNativeModule(UIManagerModule.class);
     reactCtx.addLifecycleEventListener(this);
     uiManager.addUIManagerListener(this);
-    mTransitionManager = new TransitionModule(uiManager);
-
-    mUIManager = uiManager;
   }
 
   @Override
@@ -115,121 +105,6 @@ public class ReanimatedModule extends ReactContextBaseJavaModule
     }
   }
 
-  @ReactMethod
-  public void animateNextTransition(int tag, ReadableMap config) {
-    mTransitionManager.animateNextTransition(tag, config);
-  }
-
-  @ReactMethod
-  public void createNode(final int tag, final ReadableMap config) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.createNode(tag, config);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void dropNode(final int tag) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.dropNode(tag);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void connectNodes(final int parentID, final int childID) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.connectNodes(parentID, childID);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void disconnectNodes(final int parentID, final int childID) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.disconnectNodes(parentID, childID);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void connectNodeToView(final int nodeID, final int viewTag) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.connectNodeToView(nodeID, viewTag);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void disconnectNodeFromView(final int nodeID, final int viewTag) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.disconnectNodeFromView(nodeID, viewTag);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void attachEvent(final int viewTag, final String eventName, final int eventNodeID) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.attachEvent(viewTag, eventName, eventNodeID);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void detachEvent(final int viewTag, final String eventName, final int eventNodeID) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.detachEvent(viewTag, eventName, eventNodeID);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void getValue(final int nodeID, final Callback callback) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.getValue(nodeID, callback);
-          }
-        });
-  }
-
-  @ReactMethod
-  public void setValue(final int nodeID, final Double newValue) {
-    mOperations.add(
-        new UIThreadOperation() {
-          @Override
-          public void execute(NodesManager nodesManager) {
-            nodesManager.setValue(nodeID, newValue);
-          }
-        });
-  }
-
   @ReactMethod
   public void addListener(String eventName) {
     // Keep: Required for RN built in Event Emitter Calls.