react-native 0.68.2 → 0.69.0-rc.2

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.animated;
 
+import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -23,6 +24,7 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -33,6 +35,8 @@ import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
@@ -102,16 +106,87 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
     }
   }
 
+  private class ConcurrentOperationQueue {
+    private final Queue<UIThreadOperation> mQueue = new ConcurrentLinkedQueue<>();
+    @Nullable private UIThreadOperation mPeekedOperation = null;
+    private boolean mSynchronizedAccess = false;
+
+    @AnyThread
+    boolean isEmpty() {
+      return mQueue.isEmpty();
+    }
+
+    void setSynchronizedAccess(boolean isSynchronizedAccess) {
+      mSynchronizedAccess = isSynchronizedAccess;
+    }
+
+    @AnyThread
+    void add(UIThreadOperation operation) {
+      if (mSynchronizedAccess) {
+        synchronized (this) {
+          mQueue.add(operation);
+        }
+      } else {
+        mQueue.add(operation);
+      }
+    }
+
+    @UiThread
+    void executeBatch(long maxBatchNumber, NativeAnimatedNodesManager nodesManager) {
+
+      List<UIThreadOperation> operations;
+
+      if (mSynchronizedAccess) {
+        synchronized (this) {
+          operations = drainQueueIntoList(maxBatchNumber);
+        }
+      } else {
+        operations = drainQueueIntoList(maxBatchNumber);
+      }
+      for (UIThreadOperation operation : operations) {
+        operation.execute(nodesManager);
+      }
+    }
+
+    @UiThread
+    private List<UIThreadOperation> drainQueueIntoList(long maxBatchNumber) {
+      List<UIThreadOperation> operations = new ArrayList<>();
+      while (true) {
+        // Due to a race condition, we manually "carry-over" a polled item from previous batch
+        // instead of peeking the queue itself for consistency.
+        // TODO(T112522554): Clean up the queue access
+        if (mPeekedOperation != null) {
+          if (mPeekedOperation.getBatchNumber() > maxBatchNumber) {
+            break;
+          }
+          operations.add(mPeekedOperation);
+          mPeekedOperation = null;
+        }
+
+        UIThreadOperation polledOperation = mQueue.poll();
+        if (polledOperation == null) {
+          // This is the same as mQueue.isEmpty()
+          break;
+        }
+
+        if (polledOperation.getBatchNumber() > maxBatchNumber) {
+          // Because the operation is already retrieved from the queue, there's no way of placing it
+          // back as the head element, so we remember it manually here
+          mPeekedOperation = polledOperation;
+          break;
+        }
+        operations.add(polledOperation);
+      }
+
+      return operations;
+    }
+  }
+
   @NonNull private final GuardedFrameCallback mAnimatedFrameCallback;
   private final ReactChoreographer mReactChoreographer;
 
-  @NonNull
-  private final ConcurrentLinkedQueue<UIThreadOperation> mOperations =
-      new ConcurrentLinkedQueue<>();
-
-  @NonNull
-  private final ConcurrentLinkedQueue<UIThreadOperation> mPreOperations =
-      new ConcurrentLinkedQueue<>();
+  @NonNull private final ConcurrentOperationQueue mOperations = new ConcurrentOperationQueue();
+  @NonNull private final ConcurrentOperationQueue mPreOperations = new ConcurrentOperationQueue();
 
   private final AtomicReference<NativeAnimatedNodesManager> mNodesManager = new AtomicReference<>();
 
@@ -156,6 +231,10 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
             }
           }
         };
+
+    // If shipping this flag, make sure to migrate to non-concurrent queue for efficiency
+    mOperations.setSynchronizedAccess(ReactFeatureFlags.enableSynchronizationForAnimated);
+    mPreOperations.setSynchronizedAccess(ReactFeatureFlags.enableSynchronizationForAnimated);
   }
 
   @Override
@@ -221,42 +300,8 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
       }
     }
 
-    executeAllOperations(mPreOperations, batchNumber);
-    executeAllOperations(mOperations, batchNumber);
-  }
-
-  @UiThread
-  private void executeAllOperations(Queue<UIThreadOperation> operationQueue, long maxBatchNumber) {
-    NativeAnimatedNodesManager nodesManager = getNodesManager();
-    while (true) {
-      // There is a race condition where `peek` may return a non-null value and isEmpty() is false,
-      // but `poll` returns a null value - it's not clear why since we only peek and poll on the UI
-      // thread, but it might be something that happens during teardown or a crash. Regardless, the
-      // root cause is not currently known so we're extra cautious here.
-      // It happens equally in Fabric and non-Fabric.
-      UIThreadOperation peekedOperation = operationQueue.peek();
-
-      // This is the same as operationQueue.isEmpty()
-      if (peekedOperation == null) {
-        return;
-      }
-      // The rest of the operations are for the next frame.
-      if (peekedOperation.getBatchNumber() > maxBatchNumber) {
-        return;
-      }
-
-      // Since we apparently can't guarantee that there is still an operation on the queue,
-      // much less the same operation, we do a poll and another null check. If this isn't
-      // the same operation as the peeked operation, we can't do anything about it - we still
-      // need to execute it, we have no mechanism to put it at the front of the queue, and it
-      // won't cause any errors to execute it earlier than expected (just a bit of UI jank at worst)
-      // so we just continue happily along.
-      UIThreadOperation polledOperation = operationQueue.poll();
-      if (polledOperation == null) {
-        return;
-      }
-      polledOperation.execute(nodesManager);
-    }
+    mPreOperations.executeBatch(batchNumber, getNodesManager());
+    mOperations.executeBatch(batchNumber, getNodesManager());
   }
 
   // For non-FabricUIManager only
@@ -276,7 +321,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
         new UIBlock() {
           @Override
           public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-            executeAllOperations(mPreOperations, frameNo);
+            mPreOperations.executeBatch(frameNo, getNodesManager());
           }
         };
 
@@ -284,7 +329,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
         new UIBlock() {
           @Override
           public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-            executeAllOperations(mOperations, frameNo);
+            mOperations.executeBatch(frameNo, getNodesManager());
           }
         };
 
@@ -460,6 +505,32 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
         });
   }
 
+  @Override
+  public void updateAnimatedNodeConfig(final double tagDouble, final ReadableMap config) {
+    final int tag = (int) tagDouble;
+    if (ANIMATED_MODULE_DEBUG) {
+      FLog.d(
+          NAME,
+          "queue updateAnimatedNodeConfig: " + tag + " config: " + config.toHashMap().toString());
+    }
+
+    addOperation(
+        new UIThreadOperation() {
+          @Override
+          public void execute(NativeAnimatedNodesManager animatedNodesManager) {
+            if (ANIMATED_MODULE_DEBUG) {
+              FLog.d(
+                  NAME,
+                  "execute updateAnimatedNodeConfig: "
+                      + tag
+                      + " config: "
+                      + config.toHashMap().toString());
+            }
+            animatedNodesManager.updateAnimatedNodeConfig(tag, config);
+          }
+        });
+  }
+
   @Override
   public void startListeningToAnimatedNodeValue(final double tagDouble) {
     final int tag = (int) tagDouble;

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java

@@ -129,6 +129,8 @@ import java.util.Queue;
       node = new StyleAnimatedNode(config, this);
     } else if ("value".equals(type)) {
       node = new ValueAnimatedNode(config);
+    } else if ("color".equals(type)) {
+      node = new ColorAnimatedNode(config, this, mReactApplicationContext);
     } else if ("props".equals(type)) {
       node = new PropsAnimatedNode(config, this);
     } else if ("interpolation".equals(type)) {
@@ -157,6 +159,21 @@ import java.util.Queue;
     mUpdatedNodes.put(tag, node);
   }
 
+  @UiThread
+  public void updateAnimatedNodeConfig(int tag, ReadableMap config) {
+    AnimatedNode node = mAnimatedNodes.get(tag);
+    if (node == null) {
+      throw new JSApplicationIllegalArgumentException(
+          "updateAnimatedNode: Animated node [" + tag + "] does not exist");
+    }
+
+    if (node instanceof AnimatedNodeWithUpdateableConfig) {
+      stopAnimationsForNode(node);
+      ((AnimatedNodeWithUpdateableConfig) node).onUpdateConfig(config);
+      mUpdatedNodes.put(tag, node);
+    }
+  }
+
   @UiThread
   public void dropAnimatedNode(int tag) {
     mAnimatedNodes.remove(tag);

package/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java

@@ -7,12 +7,14 @@
 
 package com.facebook.react.animated;
 
+import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.UIManager;
+import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
 import java.util.HashMap;
@@ -105,6 +107,8 @@ import java.util.Map;
         } else {
           mPropMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());
         }
+      } else if (node instanceof ColorAnimatedNode) {
+        mPropMap.putInt(entry.getKey(), ((ColorAnimatedNode) node).getColor());
       } else {
         throw new IllegalArgumentException(
             "Unsupported type of node used in property node " + node.getClass());
@@ -114,6 +118,16 @@ import java.util.Map;
     mUIManager.synchronouslyUpdateViewOnUIThread(mConnectedViewTag, mPropMap);
   }
 
+  public View getConnectedView() {
+    try {
+      return mUIManager.resolveView(mConnectedViewTag);
+    } catch (IllegalViewOperationException ex) {
+      // resolveView throws an {@link IllegalViewOperationException} when the view doesn't exist
+      // (this can happen if the surface is being deallocated).
+      return null;
+    }
+  }
+
   public String prettyPrint() {
     return "PropsAnimatedNode["
         + mTag

package/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java

@@ -43,6 +43,8 @@ import java.util.Map;
         ((TransformAnimatedNode) node).collectViewUpdates(propsMap);
       } else if (node instanceof ValueAnimatedNode) {
         propsMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());
+      } else if (node instanceof ColorAnimatedNode) {
+        propsMap.putInt(entry.getKey(), ((ColorAnimatedNode) node).getColor());
       } else {
         throw new IllegalArgumentException(
             "Unsupported type of node used in property node " + node.getClass());

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java

@@ -9,6 +9,7 @@ package com.facebook.react.bridge;
 
 import android.app.Activity;
 import android.content.Intent;
+import androidx.annotation.Nullable;
 
 /**
  * Listener for receiving activity events. Consider using {@link BaseActivityEventListener} if
@@ -17,7 +18,7 @@ import android.content.Intent;
 public interface ActivityEventListener {
 
   /** Called when host (activity/service) receives an {@link Activity#onActivityResult} call. */
-  void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data);
+  void onActivityResult(Activity activity, int requestCode, int resultCode, @Nullable Intent data);
 
   /** Called when a new intent is passed to the activity */
   void onNewIntent(Intent intent);

package/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK

@@ -22,7 +22,10 @@ rn_android_library(
     ),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     proguard_config = "reactnative.pro",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
@@ -68,7 +71,10 @@ rn_android_library(
     srcs = glob(INTERFACES),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     proguard_config = "reactnative.pro",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),

package/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java

@@ -9,6 +9,7 @@ package com.facebook.react.bridge;
 
 import android.app.Activity;
 import android.content.Intent;
+import androidx.annotation.Nullable;
 
 /** An empty implementation of {@link ActivityEventListener} */
 public class BaseActivityEventListener implements ActivityEventListener {
@@ -18,7 +19,8 @@ public class BaseActivityEventListener implements ActivityEventListener {
   public void onActivityResult(int requestCode, int resultCode, Intent data) {}
 
   @Override
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {}
+  public void onActivityResult(
+      Activity activity, int requestCode, int resultCode, @Nullable Intent data) {}
 
   @Override
   public void onNewIntent(Intent intent) {}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java

@@ -31,6 +31,10 @@ public class JavaOnlyMap implements ReadableMap, WritableMap {
     return new JavaOnlyMap(keysAndValues);
   }
 
+  public static JavaOnlyMap from(Map<String, Object> map) {
+    return new JavaOnlyMap(map);
+  }
+
   public static JavaOnlyMap deepClone(ReadableMap map) {
     JavaOnlyMap res = new JavaOnlyMap();
     ReadableMapKeySetIterator iter = map.keySetIterator();

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

@@ -24,6 +24,7 @@ import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
 import java.lang.ref.WeakReference;
+import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
@@ -167,6 +168,13 @@ public class ReactContext extends ContextWrapper {
     return mCatalystInstance.hasNativeModule(nativeModuleInterface);
   }
 
+  public Collection<NativeModule> getNativeModules() {
+    if (mCatalystInstance == null) {
+      raiseCatalystInstanceMissingException();
+    }
+    return mCatalystInstance.getNativeModules();
+  }
+
   /** @return the instance of the specified module interface associated with this ReactContext. */
   @Nullable
   public <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface) {
@@ -254,6 +262,7 @@ public class ReactContext extends ContextWrapper {
   }
 
   /** Should be called by the hosting Fragment in {@link Fragment#onResume} */
+  @ThreadConfined(UI)
   public void onHostResume(@Nullable Activity activity) {
     mLifecycleState = LifecycleState.RESUMED;
     mCurrentActivity = new WeakReference(activity);
@@ -282,6 +291,7 @@ public class ReactContext extends ContextWrapper {
   }
 
   /** Should be called by the hosting Fragment in {@link Fragment#onPause} */
+  @ThreadConfined(UI)
   public void onHostPause() {
     mLifecycleState = LifecycleState.BEFORE_RESUME;
     ReactMarker.logMarker(ReactMarkerConstants.ON_HOST_PAUSE_START);
@@ -322,7 +332,8 @@ public class ReactContext extends ContextWrapper {
   }
 
   /** Should be called by the hosting Fragment in {@link Fragment#onActivityResult} */
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+  public void onActivityResult(
+      Activity activity, int requestCode, int resultCode, @Nullable Intent data) {
     for (ActivityEventListener listener : mActivityEventListeners) {
       try {
         listener.onActivityResult(activity, requestCode, resultCode, data);

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.bridge;
 
+import android.os.SystemClock;
 import androidx.annotation.Nullable;
 import com.facebook.proguard.annotations.DoNotStrip;
 import java.util.List;
@@ -91,7 +92,7 @@ public class ReactMarker {
   @DoNotStrip
   public static void logFabricMarker(
       ReactMarkerConstants name, @Nullable String tag, int instanceKey) {
-    logFabricMarker(name, tag, instanceKey, -1);
+    logFabricMarker(name, tag, instanceKey, SystemClock.uptimeMillis());
   }
 
   @DoNotStrip

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNoCrashBridgeNotAllowedSoftException.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+/**
+ * Extends RuntimeException so that it may be caught by a {@link ReactSoftExceptionListener}. Any
+ * {@link ReactSoftExceptionListener} that catches a ReactNoCrashBridgeNotAllowedSoftException
+ * should log it only and not crash, no matter what.
+ */
+public class ReactNoCrashBridgeNotAllowedSoftException extends ReactNoCrashSoftException {
+  public ReactNoCrashBridgeNotAllowedSoftException(String m) {
+    super(m);
+  }
+
+  public ReactNoCrashBridgeNotAllowedSoftException(Throwable e) {
+    super(e);
+  }
+
+  public ReactNoCrashBridgeNotAllowedSoftException(String m, Throwable e) {
+    super(m, e);
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.java

@@ -40,6 +40,12 @@ public class ReactSoftExceptionLogger {
     sListeners.clear();
   }
 
+  @DoNotStrip
+  public static void logSoftExceptionVerbose(final String category, final Throwable cause) {
+    logSoftException(
+        category + "|" + cause.getClass().getSimpleName() + ":" + cause.getMessage(), cause);
+  }
+
   @DoNotStrip
   public static void logSoftException(final String category, final Throwable cause) {
     if (sListeners.size() > 0) {

package/ReactAndroid/src/main/java/com/facebook/react/common/BUCK

@@ -13,7 +13,10 @@ rn_android_library(
     ),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),

package/ReactAndroid/src/main/java/com/facebook/react/common/SurfaceDelegate.java

@@ -37,4 +37,7 @@ public interface SurfaceDelegate {
 
   /** Hide the surface containing the React content view */
   void hide();
+
+  /** Check if the surface is currently showing */
+  boolean isShowing();
 }

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK

@@ -4,11 +4,17 @@ rn_android_library(
     name = "mapbuffer",
     srcs = glob([
         "*.java",
+        "*.kt",
     ]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    language = "KOTLIN",
     provided_deps = [],
+    pure_kotlin = False,
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
@@ -21,9 +27,9 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
         # dependencies used for systraces
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
     ],
-    exported_deps = [],
 )