react-native-tvos 0.74.3-0 → 0.75.2-0

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -51,6 +51,7 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.BridgeReactContext;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
@@ -64,6 +65,7 @@ import com.facebook.react.bridge.ProxyJavaScriptExecutor;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactCxxErrorHandler;
+import com.facebook.react.bridge.ReactInstanceManagerInspectorTarget;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
@@ -80,14 +82,18 @@ import com.facebook.react.common.annotations.StableReactNativeAPI;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
+import com.facebook.react.devsupport.InspectorFlags;
 import com.facebook.react.devsupport.ReactInstanceDevHelper;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.internal.turbomodule.core.TurboModuleManager;
 import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
 import com.facebook.react.modules.appearance.AppearanceModule;
@@ -167,12 +173,14 @@ public class ReactInstanceManager {
   private final DevSupportManager mDevSupportManager;
   private final boolean mUseDeveloperSupport;
   private final boolean mRequireActivity;
+  private final boolean mKeepActivity;
   private final @Nullable NotThreadSafeBridgeIdleDebugListener mBridgeIdleDebugListener;
   private final Object mReactContextLock = new Object();
   private @Nullable volatile ReactContext mCurrentReactContext;
   private final Context mApplicationContext;
   private @Nullable @ThreadConfined(UI) DefaultHardwareBackBtnHandler mDefaultBackButtonImpl;
   private @Nullable Activity mCurrentActivity;
+  private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
   private final Collection<com.facebook.react.ReactInstanceEventListener>
       mReactInstanceEventListeners =
           Collections.synchronizedList(
@@ -224,6 +232,7 @@ public class ReactInstanceManager {
       boolean useDeveloperSupport,
       DevSupportManagerFactory devSupportManagerFactory,
       boolean requireActivity,
+      boolean keepActivity,
       @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
       LifecycleState initialLifecycleState,
       JSExceptionHandler jSExceptionHandler,
@@ -237,7 +246,8 @@ public class ReactInstanceManager {
       @Nullable ReactPackageTurboModuleManagerDelegate.Builder tmmDelegateBuilder,
       @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
       @Nullable DevLoadingViewManager devLoadingViewManager,
-      @Nullable ChoreographerProvider choreographerProvider) {
+      @Nullable ChoreographerProvider choreographerProvider,
+      @Nullable PausedInDebuggerOverlayManager pausedInDebuggerOverlayManager) {
     FLog.d(TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -253,6 +263,7 @@ public class ReactInstanceManager {
     mPackages = new ArrayList<>();
     mUseDeveloperSupport = useDeveloperSupport;
     mRequireActivity = requireActivity;
+    mKeepActivity = keepActivity;
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.initDevSupportManager");
     mDevSupportManager =
@@ -266,7 +277,8 @@ public class ReactInstanceManager {
             minNumShakes,
             customPackagerCommandHandlers,
             surfaceDelegateFactory,
-            devLoadingViewManager);
+            devLoadingViewManager,
+            pausedInDebuggerOverlayManager);
     Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     mBridgeIdleDebugListener = bridgeIdleDebugListener;
     mLifecycleState = initialLifecycleState;
@@ -695,7 +707,9 @@ public class ReactInstanceManager {
     }
 
     moveToBeforeCreateLifecycleState();
-    mCurrentActivity = null;
+    if (!mKeepActivity) {
+      mCurrentActivity = null;
+    }
   }
 
   /**
@@ -748,15 +762,34 @@ public class ReactInstanceManager {
     unregisterCxxErrorHandlerFunc();
 
     mCreateReactContextThread = null;
-    synchronized (mReactContextLock) {
-      if (mCurrentReactContext != null) {
-        mCurrentReactContext.destroy();
-        mCurrentReactContext = null;
+    synchronized (mAttachedReactRoots) {
+      synchronized (mReactContextLock) {
+        if (mCurrentReactContext != null) {
+          if (ReactNativeFeatureFlags.destroyFabricSurfacesInReactInstanceManager()) {
+            for (ReactRoot reactRoot : mAttachedReactRoots) {
+              // Fabric surfaces must be cleaned up when React Native is destroyed.
+              if (reactRoot.getUIManagerType() == UIManagerType.FABRIC) {
+                detachRootViewFromInstance(reactRoot, mCurrentReactContext);
+              }
+            }
+          }
+
+          mCurrentReactContext.destroy();
+          mCurrentReactContext = null;
+        }
       }
     }
 
+    // If the host is being destroyed, now that the current context/instance
+    // has been destroyed, we can safely destroy the host's inspector target.
+    if (mLifecycleState == LifecycleState.BEFORE_CREATE) {
+      destroyInspectorHostTarget();
+    }
+
     mHasStartedCreatingInitialContext = false;
-    mCurrentActivity = null;
+    if (!mKeepActivity) {
+      mCurrentActivity = null;
+    }
 
     ResourceDrawableIdHelper.getInstance().clear();
 
@@ -804,8 +837,12 @@ public class ReactInstanceManager {
         mLifecycleState = LifecycleState.BEFORE_RESUME;
       }
       if (mLifecycleState == LifecycleState.BEFORE_RESUME) {
-        currentContext.onHostDestroy();
+        currentContext.onHostDestroy(mKeepActivity);
       }
+    } else {
+      // There's no current context that requires the host inspector target to
+      // be kept alive, so we can destroy it immediately.
+      destroyInspectorHostTarget();
     }
     mLifecycleState = LifecycleState.BEFORE_CREATE;
   }
@@ -1001,7 +1038,8 @@ public class ReactInstanceManager {
             } else {
               FLog.w(
                   ReactConstants.TAG,
-                  "Package %s is not a ViewManagerOnDemandReactPackage, view managers will not be loaded",
+                  "Package %s is not a ViewManagerOnDemandReactPackage, view managers will not be"
+                      + " loaded",
                   reactPackage.getClass().getSimpleName());
             }
             Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
@@ -1027,7 +1065,9 @@ public class ReactInstanceManager {
     mReactInstanceEventListeners.remove(listener);
   }
 
-  /** @return current ReactApplicationContext */
+  /**
+   * @return current ReactApplicationContext
+   */
   @VisibleForTesting
   public @Nullable ReactContext getCurrentReactContext() {
     synchronized (mReactContextLock) {
@@ -1336,12 +1376,14 @@ public class ReactInstanceManager {
     mDevSupportManager.onReactInstanceDestroyed(reactContext);
   }
 
-  /** @return instance of {@link ReactContext} configured a {@link CatalystInstance} set */
+  /**
+   * @return instance of {@link ReactContext} configured a {@link CatalystInstance} set
+   */
   private ReactApplicationContext createReactContext(
       JavaScriptExecutor jsExecutor, JSBundleLoader jsBundleLoader) {
     FLog.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()");
     ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName());
-    final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
+    final BridgeReactContext reactContext = new BridgeReactContext(mApplicationContext);
 
     JSExceptionHandler exceptionHandler =
         mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager;
@@ -1355,7 +1397,8 @@ public class ReactInstanceManager {
             .setJSExecutor(jsExecutor)
             .setRegistry(nativeModuleRegistry)
             .setJSBundleLoader(jsBundleLoader)
-            .setJSExceptionHandler(exceptionHandler);
+            .setJSExceptionHandler(exceptionHandler)
+            .setInspectorTarget(getOrCreateInspectorTarget());
 
     ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
     // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
@@ -1471,4 +1514,47 @@ public class ReactInstanceManager {
     }
     SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
   }
+
+  private @Nullable ReactInstanceManagerInspectorTarget getOrCreateInspectorTarget() {
+    if (mInspectorTarget == null && InspectorFlags.getFuseboxEnabled()) {
+
+      mInspectorTarget =
+          new ReactInstanceManagerInspectorTarget(
+              new ReactInstanceManagerInspectorTarget.TargetDelegate() {
+                @Override
+                public void onReload() {
+                  UiThreadUtil.runOnUiThread(() -> mDevSupportManager.handleReloadJS());
+                }
+
+                @Override
+                public void onSetPausedInDebuggerMessage(@Nullable String message) {
+                  if (message == null) {
+                    mDevSupportManager.hidePausedInDebuggerOverlay();
+                  } else {
+                    mDevSupportManager.showPausedInDebuggerOverlay(
+                        message,
+                        new PausedInDebuggerOverlayCommandListener() {
+                          @Override
+                          public void onResume() {
+                            UiThreadUtil.assertOnUiThread();
+                            if (mInspectorTarget != null) {
+                              mInspectorTarget.sendDebuggerResumeCommand();
+                            }
+                          }
+                        });
+                  }
+                }
+              });
+    }
+
+    return mInspectorTarget;
+  }
+
+  @ThreadConfined(UI)
+  private void destroyInspectorHostTarget() {
+    if (mInspectorTarget != null) {
+      mInspectorTarget.close();
+      mInspectorTarget = null;
+    }
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java

@@ -31,6 +31,7 @@ import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.jscexecutor.JSCExecutor;
@@ -57,6 +58,7 @@ public class ReactInstanceManagerBuilder {
   private boolean mUseDeveloperSupport;
   private @Nullable DevSupportManagerFactory mDevSupportManagerFactory;
   private boolean mRequireActivity;
+  private boolean mKeepActivity;
   private @Nullable LifecycleState mInitialLifecycleState;
   private @Nullable JSExceptionHandler mJSExceptionHandler;
   private @Nullable Activity mCurrentActivity;
@@ -74,6 +76,7 @@ public class ReactInstanceManagerBuilder {
   private @Nullable DevLoadingViewManager mDevLoadingViewManager;
   private @Nullable JSEngineResolutionAlgorithm mJSEngineResolutionAlgorithm = null;
   private @Nullable ChoreographerProvider mChoreographerProvider = null;
+  private @Nullable PausedInDebuggerOverlayManager mPausedInDebuggerOverlayManager = null;
 
   /* package protected */ ReactInstanceManagerBuilder() {}
 
@@ -208,6 +211,11 @@ public class ReactInstanceManagerBuilder {
     return this;
   }
 
+  public ReactInstanceManagerBuilder setKeepActivity(boolean keepActivity) {
+    mKeepActivity = keepActivity;
+    return this;
+  }
+
   /**
    * When the {@link SurfaceDelegateFactory} is provided, it will be used for native modules to get
    * a {@link SurfaceDelegate} to interact with the platform specific surface that they that needs
@@ -229,6 +237,12 @@ public class ReactInstanceManagerBuilder {
     return this;
   }
 
+  public ReactInstanceManagerBuilder setPausedInDebuggerOverlayManager(
+      @Nullable PausedInDebuggerOverlayManager pausedInDebuggerOverlayManager) {
+    mPausedInDebuggerOverlayManager = pausedInDebuggerOverlayManager;
+    return this;
+  }
+
   /**
    * Sets the initial lifecycle state of the host. For example, if the host is already resumed at
    * creation time, we wouldn't expect an onResume call until we get an onPause call.
@@ -244,7 +258,7 @@ public class ReactInstanceManagerBuilder {
    * DevSupportManager} will be used, which shows a redbox in dev mode and rethrows (crashes the
    * app) in prod mode.
    */
-  public ReactInstanceManagerBuilder setJSExceptionHandler(JSExceptionHandler handler) {
+  public ReactInstanceManagerBuilder setJSExceptionHandler(@Nullable JSExceptionHandler handler) {
     mJSExceptionHandler = handler;
     return this;
   }
@@ -345,6 +359,7 @@ public class ReactInstanceManagerBuilder {
             ? new DefaultDevSupportManagerFactory()
             : mDevSupportManagerFactory,
         mRequireActivity,
+        mKeepActivity,
         mBridgeIdleDebugListener,
         Assertions.assertNotNull(mInitialLifecycleState, "Initial lifecycle state was not set"),
         mJSExceptionHandler,
@@ -358,7 +373,8 @@ public class ReactInstanceManagerBuilder {
         mTMMDelegateBuilder,
         mSurfaceDelegateFactory,
         mDevLoadingViewManager,
-        mChoreographerProvider);
+        mChoreographerProvider,
+        mPausedInDebuggerOverlayManager);
   }
 
   private JavaScriptExecutorFactory getDefaultJSExecutorFactory(

package/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java

@@ -10,6 +10,7 @@ package com.facebook.react;
 import android.app.Application;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -20,6 +21,7 @@ import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.internal.ChoreographerProvider;
 import java.util.List;
@@ -30,7 +32,8 @@ import java.util.List;
  */
 @DeprecatedInNewArchitecture(
     message =
-        "This class will be replaced by com.facebook.react.ReactHost in the new architecture of React Native.")
+        "This class will be replaced by com.facebook.react.ReactHost in the new architecture of"
+            + " React Native.")
 public abstract class ReactNativeHost {
 
   private final Application mApplication;
@@ -72,6 +75,12 @@ public abstract class ReactNativeHost {
 
   protected ReactInstanceManager createReactInstanceManager() {
     ReactMarker.logMarker(ReactMarkerConstants.BUILD_REACT_INSTANCE_MANAGER_START);
+    ReactInstanceManagerBuilder builder = getBaseReactInstanceManagerBuilder();
+    ReactMarker.logMarker(ReactMarkerConstants.BUILD_REACT_INSTANCE_MANAGER_END);
+    return builder.build();
+  }
+
+  protected ReactInstanceManagerBuilder getBaseReactInstanceManagerBuilder() {
     ReactInstanceManagerBuilder builder =
         ReactInstanceManager.builder()
             .setApplication(mApplication)
@@ -81,6 +90,7 @@ public abstract class ReactNativeHost {
             .setDevLoadingViewManager(getDevLoadingViewManager())
             .setRequireActivity(getShouldRequireActivity())
             .setSurfaceDelegateFactory(getSurfaceDelegateFactory())
+            .setJSExceptionHandler(getJSExceptionHandler())
             .setLazyViewManagersEnabled(getLazyViewManagersEnabled())
             .setRedBoxHandler(getRedBoxHandler())
             .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
@@ -89,7 +99,8 @@ public abstract class ReactNativeHost {
             .setReactPackageTurboModuleManagerDelegateBuilder(
                 getReactPackageTurboModuleManagerDelegateBuilder())
             .setJSEngineResolutionAlgorithm(getJSEngineResolutionAlgorithm())
-            .setChoreographerProvider(getChoreographerProvider());
+            .setChoreographerProvider(getChoreographerProvider())
+            .setPausedInDebuggerOverlayManager(getPausedInDebuggerOverlayManager());
 
     for (ReactPackage reactPackage : getPackages()) {
       builder.addPackage(reactPackage);
@@ -101,9 +112,7 @@ public abstract class ReactNativeHost {
     } else {
       builder.setBundleAssetName(Assertions.assertNotNull(getBundleAssetName()));
     }
-    ReactInstanceManager reactInstanceManager = builder.build();
-    ReactMarker.logMarker(ReactMarkerConstants.BUILD_REACT_INSTANCE_MANAGER_END);
-    return reactInstanceManager;
+    return builder;
   }
 
   /** Get the {@link RedBoxHandler} to send RedBox-related callbacks to. */
@@ -111,6 +120,10 @@ public abstract class ReactNativeHost {
     return null;
   }
 
+  protected @Nullable JSExceptionHandler getJSExceptionHandler() {
+    return null;
+  }
+
   /** Get the {@link JavaScriptExecutorFactory}. Override this to use a custom Executor. */
   protected @Nullable JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
     return null;
@@ -166,6 +179,10 @@ public abstract class ReactNativeHost {
     return null;
   }
 
+  protected @Nullable PausedInDebuggerOverlayManager getPausedInDebuggerOverlayManager() {
+    return null;
+  }
+
   /**
    * Returns the name of the main module. Determines the URL used to fetch the JS bundle from Metro.
    * It is only used when dev support is enabled. This is the first file to be executed once the

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java

@@ -46,7 +46,9 @@ public interface ReactPackage {
   @DeprecatedInNewArchitecture
   List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext);
 
-  /** @return a list of view managers that should be registered with {@link UIManagerModule} */
+  /**
+   * @return a list of view managers that should be registered with {@link UIManagerModule}
+   */
   @NonNull
   List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext);
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java

@@ -8,14 +8,12 @@
 package com.facebook.react;
 
 import androidx.annotation.Nullable;
-import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.jni.HybridData;
 import com.facebook.react.bridge.CxxModuleWrapper;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.common.ReactConstants;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
 import com.facebook.react.module.annotations.ReactModule;
@@ -164,25 +162,15 @@ public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModule
     NativeModule resolvedModule = null;
 
     for (final ModuleProvider moduleProvider : mModuleProviders) {
-      try {
-        final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(moduleProvider).get(moduleName);
-        if (moduleInfo != null
-            && moduleInfo.isTurboModule()
-            && (resolvedModule == null || moduleInfo.canOverrideExistingModule())) {
-
-          final NativeModule module = moduleProvider.getModule(moduleName);
-          if (module != null) {
-            resolvedModule = module;
-          }
-        }
+      final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(moduleProvider).get(moduleName);
+      if (moduleInfo != null
+          && moduleInfo.isTurboModule()
+          && (resolvedModule == null || moduleInfo.canOverrideExistingModule())) {
 
-      } catch (IllegalArgumentException ex) {
-        // TODO T170570617: remove this catch statement and let exception bubble up
-        FLog.e(
-            ReactConstants.TAG,
-            ex,
-            "Caught exception while constructing module '%s'. This was previously ignored but will not be caught in the future.",
-            moduleName);
+        final NativeModule module = moduleProvider.getModule(moduleName);
+        if (module != null) {
+          resolvedModule = module;
+        }
       }
     }
 
@@ -227,24 +215,15 @@ public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModule
     NativeModule resolvedModule = null;
 
     for (final ModuleProvider moduleProvider : mModuleProviders) {
-      try {
-        final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(moduleProvider).get(moduleName);
-        if (moduleInfo != null
-            && !moduleInfo.isTurboModule()
-            && (resolvedModule == null || moduleInfo.canOverrideExistingModule())) {
-
-          final NativeModule module = moduleProvider.getModule(moduleName);
-          if (module != null) {
-            resolvedModule = module;
-          }
+      final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(moduleProvider).get(moduleName);
+      if (moduleInfo != null
+          && !moduleInfo.isTurboModule()
+          && (resolvedModule == null || moduleInfo.canOverrideExistingModule())) {
+
+        final NativeModule module = moduleProvider.getModule(moduleName);
+        if (module != null) {
+          resolvedModule = module;
         }
-      } catch (IllegalArgumentException ex) {
-        // TODO T170570617: remove this catch statement and let exception bubble up
-        FLog.e(
-            ReactConstants.TAG,
-            ex,
-            "Caught exception while constructing module '%s'. This was previously ignored but will not be caught in the future.",
-            moduleName);
       }
     }
 
@@ -294,10 +273,12 @@ public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModule
     public ReactPackageTurboModuleManagerDelegate build() {
       Assertions.assertNotNull(
           mContext,
-          "The ReactApplicationContext must be provided to create ReactPackageTurboModuleManagerDelegate");
+          "The ReactApplicationContext must be provided to create"
+              + " ReactPackageTurboModuleManagerDelegate");
       Assertions.assertNotNull(
           mPackages,
-          "A set of ReactPackages must be provided to create ReactPackageTurboModuleManagerDelegate");
+          "A set of ReactPackages must be provided to create"
+              + " ReactPackageTurboModuleManagerDelegate");
       return build(mContext, mPackages);
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -318,7 +318,8 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {
       FLog.w(
           TAG,
-          "Unable to handle child focus changed event as the catalyst instance has not been attached");
+          "Unable to handle child focus changed event as the catalyst instance has not been"
+              + " attached");
       super.requestChildFocus(child, focused);
       return;
     }
@@ -421,8 +422,9 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
                 ReactSoftExceptionLogger.logSoftException(
                     TAG,
                     new ReactNoCrashSoftException(
-                        "A view was illegally added as a child of a ReactRootView. "
-                            + "This View should not be a direct child of a ReactRootView, because it is not visible and will never be reachable. Child: "
+                        "A view was illegally added as a child of a ReactRootView. This View should"
+                            + " not be a direct child of a ReactRootView, because it is not visible"
+                            + " and will never be reachable. Child: "
                             + child.getClass().getCanonicalName().toString()
                             + " child ID: "
                             + child.getId()));
@@ -451,7 +453,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   /**
    * Schedule rendering of the react component rendered by the JS application from the given JS
    * module (@{param moduleName}) using provided {@param reactInstanceManager} to attach to the JS
-   * context of that manager. Extra parameter {@param launchOptions} can be used to pass initial
+   * context of that manager. Extra parameter {@param initialProperties} can be used to pass initial
    * properties for the react component.
    */
   @ThreadConfined(UI)
@@ -757,11 +759,11 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     super.finalize();
     Assertions.assertCondition(
         !mIsAttachedToInstance,
-        "The application this ReactRootView was rendering was not unmounted before the "
-            + "ReactRootView was garbage collected. This usually means that your application is "
-            + "leaking large amounts of memory. To solve this, make sure to call "
-            + "ReactRootView#unmountReactApplication in the onDestroy() of your hosting Activity or in "
-            + "the onDestroyView() of your hosting Fragment.");
+        "The application this ReactRootView was rendering was not unmounted before the"
+            + " ReactRootView was garbage collected. This usually means that your application is"
+            + " leaking large amounts of memory. To solve this, make sure to call"
+            + " ReactRootView#unmountReactApplication in the onDestroy() of your hosting Activity"
+            + " or in the onDestroyView() of your hosting Fragment.");
   }
 
   public int getRootViewTag() {

package/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java

@@ -18,6 +18,7 @@ public interface ViewManagerOnDemandReactPackage {
    * Typically, this is ViewManager.getName().
    */
   Collection<String> getViewManagerNames(ReactApplicationContext reactContext);
+
   /**
    * Creates and returns a ViewManager with a specific name {@param viewManagerName}. It's up to an
    * implementing package how to interpret the name.

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

@@ -30,6 +30,7 @@ class FrameBasedAnimationDriver extends AnimationDriver {
   private double mFromValue;
   private int mIterations;
   private int mCurrentLoop;
+  private int logCount = 0;
 
   FrameBasedAnimationDriver(ReadableMap config) {
     resetConfig(config);
@@ -81,7 +82,10 @@ class FrameBasedAnimationDriver extends AnimationDriver {
       if (ReactBuildConfig.DEBUG) {
         throw new IllegalStateException(message);
       } else {
-        FLog.w(ReactConstants.TAG, message);
+        if (logCount < 100) {
+          FLog.w(ReactConstants.TAG, message);
+          logCount++;
+        }
         return;
       }
     } else if (mHasFinished) {

package/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.kt

@@ -0,0 +1,35 @@
+/*
+ * 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.animated
+
+import com.facebook.react.bridge.JSApplicationCausedNativeException
+import com.facebook.react.bridge.ReadableMap
+
+internal class ModulusAnimatedNode(
+    config: ReadableMap,
+    private val nativeAnimatedNodesManager: NativeAnimatedNodesManager
+) : ValueAnimatedNode() {
+
+  private val inputNode: Int = config.getInt("input")
+  private val modulus: Double = config.getDouble("modulus")
+
+  override public fun update() {
+    val animatedNode = nativeAnimatedNodesManager.getNodeById(inputNode)
+    if (animatedNode is ValueAnimatedNode) {
+      val animatedNodeValue = animatedNode.value
+      mValue = (animatedNodeValue % modulus + modulus) % modulus
+    } else {
+      throw JSApplicationCausedNativeException(
+          "Illegal node ID set as an input for Animated.modulus node")
+    }
+  }
+
+  override public fun prettyPrint(): String {
+    return "NativeAnimatedNodesManager[$mTag] inputNode: $inputNode modulus: $modulus super: ${super.prettyPrint()}"
+  }
+}