react-native 0.74.0-rc.3 → 0.74.0-rc.4

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 74,
   patch: 0,
-  prerelease: 'rc.3',
+  prerelease: 'rc.4',
 };
 
 module.exports = {version};

package/Libraries/Core/registerCallableModule.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ *
+ * @format
+ */
+
+type Module = Object;
+type RegisterCallableModule = (
+  name: string,
+  moduleOrFactory: Module | (() => Module),
+) => void;
+
+export const registerCallableModule: RegisterCallableModule;

package/React/Base/RCTBridgeProxy+Cxx.h

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+#ifdef __cplusplus
+#import <ReactCommon/CallInvoker.h>
+#endif
+
+#import "RCTBridgeProxy.h"
+
+@interface RCTBridgeProxy (Cxx)
+
+#ifdef __cplusplus
+@property (nonatomic, readwrite) std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker;
+#endif
+
+@end

package/React/Base/RCTBridgeProxy.h

@@ -15,6 +15,7 @@
 @class RCTViewRegistry;
 
 @interface RCTBridgeProxy : NSProxy
+
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                       moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                        bundleManager:(RCTBundleManager *)bundleManager
@@ -34,4 +35,5 @@
  */
 - (id)moduleForClass:(Class)moduleClass;
 - (id)moduleForName:(NSString *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
+
 @end

package/React/Base/RCTBridgeProxy.mm

@@ -6,10 +6,13 @@
  */
 
 #import "RCTBridgeProxy.h"
+#import "RCTBridgeProxy+Cxx.h"
+
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
+#import <ReactCommon/CallInvoker.h>
 #import <jsi/jsi.h>
 
 using namespace facebook;
@@ -21,6 +24,12 @@ using namespace facebook;
 - (void)forwardInvocation:(NSInvocation *)invocation;
 @end
 
+@interface RCTBridgeProxy ()
+
+@property (nonatomic, readwrite) std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker;
+
+@end
+
 @implementation RCTBridgeProxy {
   RCTUIManagerProxy *_uiManagerProxy;
   RCTModuleRegistry *_moduleRegistry;
@@ -84,6 +93,12 @@ using namespace facebook;
   return _runtime;
 }
 
+- (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker
+{
+  [self logWarning:@"Please migrate to RuntimeExecutor" cmd:_cmd];
+  return _jsCallInvoker;
+}
+
 /**
  * RCTModuleRegistry
  */

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(74),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.3",
+                  RCTVersionPrerelease: @"rc.4",
                   };
   });
   return __rnVersion;

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

@@ -56,6 +56,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, copy, nullable) RCTSurfaceHostingViewActivityIndicatorViewFactory activityIndicatorViewFactory;
 
+/**
+ * When set to `YES`, the activity indicator is not automatically hidden when the Surface stage changes.
+ * In this scenario, users should invoke `hideActivityIndicator` to remove it.
+ *
+ * @param disabled: if `YES`, the auto-hide is disabled. Otherwise the loading view will be hidden automatically
+ */
+- (void)disableActivityIndicatorAutoHide:(BOOL)disabled;
 @end
 
 NS_ASSUME_NONNULL_END

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -24,6 +24,7 @@
   UIView *_Nullable _activityIndicatorView;
   UIView *_Nullable _surfaceView;
   RCTSurfaceStage _stage;
+  BOOL _autoHideDisabled;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)init)
@@ -36,6 +37,7 @@ RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
   if (self = [super initWithFrame:CGRectZero]) {
     _surface = surface;
     _sizeMeasureMode = sizeMeasureMode;
+    _autoHideDisabled = NO;
 
     _surface.delegate = self;
     _stage = surface.stage;
@@ -124,6 +126,10 @@ RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
   _sizeMeasureMode = sizeMeasureMode;
   [self _invalidateLayout];
 }
+- (void)disableActivityIndicatorAutoHide:(BOOL)disabled
+{
+  _autoHideDisabled = disabled;
+}
 
 #pragma mark - isActivityIndicatorViewVisible
 
@@ -162,7 +168,16 @@ RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
     _surfaceView = _surface.view;
     _surfaceView.frame = self.bounds;
     _surfaceView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [self addSubview:_surfaceView];
+    if (_activityIndicatorView && _autoHideDisabled) {
+      // The activity indicator is still showing and the surface is set to
+      // prevent the auto hide. This means that the application will take care of
+      // hiding it when it's ready.
+      // Let's add the surfaceView below the activity indicator so it's ready once
+      // the activity indicator is hidden.
+      [self insertSubview:_surfaceView belowSubview:_activityIndicatorView];
+    } else {
+      [self addSubview:_surfaceView];
+    }
   } else {
     [_surfaceView removeFromSuperview];
     _surfaceView = nil;
@@ -204,7 +219,7 @@ RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
 - (void)_updateViews
 {
   self.isSurfaceViewVisible = RCTSurfaceStageIsRunning(_stage);
-  self.isActivityIndicatorViewVisible = RCTSurfaceStageIsPreparing(_stage);
+  self.isActivityIndicatorViewVisible = _autoHideDisabled || RCTSurfaceStageIsPreparing(_stage);
 }
 
 - (void)didMoveToWindow

package/ReactAndroid/api/ReactAndroid.api

@@ -950,6 +950,10 @@ public abstract class com/facebook/react/bridge/NativeArray : com/facebook/react
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract interface class com/facebook/react/bridge/NativeArrayInterface {
+	public abstract fun toString ()Ljava/lang/String;
+}
+
 public abstract class com/facebook/react/bridge/NativeMap {
 	public fun <init> (Lcom/facebook/jni/HybridData;)V
 	public fun toString ()Ljava/lang/String;
@@ -3576,6 +3580,43 @@ public abstract class com/facebook/react/runtime/BindingsInstaller {
 	public fun <init> (Lcom/facebook/jni/HybridData;)V
 }
 
+public final class com/facebook/react/runtime/BridgelessCatalystInstance : com/facebook/react/bridge/CatalystInstance {
+	public fun <init> (Lcom/facebook/react/runtime/ReactHostImpl;)V
+	public fun addBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
+	public fun addJSIModules (Ljava/util/List;)V
+	public fun callFunction (Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/NativeArray;)V
+	public fun destroy ()V
+	public fun extendNativeModules (Lcom/facebook/react/bridge/NativeModuleRegistry;)V
+	public fun getFabricUIManager ()Lcom/facebook/react/bridge/UIManager;
+	public fun getJSCallInvokerHolder ()Lcom/facebook/react/turbomodule/core/interfaces/CallInvokerHolder;
+	public fun getJSIModule (Lcom/facebook/react/bridge/JSIModuleType;)Lcom/facebook/react/bridge/JSIModule;
+	public fun getJSModule (Ljava/lang/Class;)Lcom/facebook/react/bridge/JavaScriptModule;
+	public fun getJavaScriptContextHolder ()Lcom/facebook/react/bridge/JavaScriptContextHolder;
+	public fun getNativeMethodCallInvokerHolder ()Lcom/facebook/react/turbomodule/core/interfaces/NativeMethodCallInvokerHolder;
+	public fun getNativeModule (Ljava/lang/Class;)Lcom/facebook/react/bridge/NativeModule;
+	public fun getNativeModule (Ljava/lang/String;)Lcom/facebook/react/bridge/NativeModule;
+	public fun getNativeModules ()Ljava/util/Collection;
+	public fun getReactQueueConfiguration ()Lcom/facebook/react/bridge/queue/ReactQueueConfiguration;
+	public fun getRuntimeExecutor ()Lcom/facebook/react/bridge/RuntimeExecutor;
+	public fun getRuntimeScheduler ()Lcom/facebook/react/bridge/RuntimeScheduler;
+	public fun getSourceURL ()Ljava/lang/String;
+	public fun handleMemoryPressure (I)V
+	public fun hasNativeModule (Ljava/lang/Class;)Z
+	public fun hasRunJSBundle ()Z
+	public fun invokeCallback (ILcom/facebook/react/bridge/NativeArrayInterface;)V
+	public fun isDestroyed ()Z
+	public fun loadScriptFromAssets (Landroid/content/res/AssetManager;Ljava/lang/String;Z)V
+	public fun loadScriptFromFile (Ljava/lang/String;Ljava/lang/String;Z)V
+	public fun loadSplitBundleFromFile (Ljava/lang/String;Ljava/lang/String;)V
+	public fun registerSegment (ILjava/lang/String;)V
+	public fun removeBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
+	public fun runJSBundle ()V
+	public fun setFabricUIManager (Lcom/facebook/react/bridge/UIManager;)V
+	public fun setSourceURLs (Ljava/lang/String;Ljava/lang/String;)V
+	public fun setTurboModuleManager (Lcom/facebook/react/bridge/JSIModule;)V
+	public fun setTurboModuleRegistry (Lcom/facebook/react/internal/turbomodule/core/interfaces/TurboModuleRegistry;)V
+}
+
 public class com/facebook/react/runtime/CoreReactPackage$$ReactModuleInfoProvider : com/facebook/react/module/model/ReactModuleInfoProvider {
 	public fun <init> ()V
 	public fun getReactModuleInfos ()Ljava/util/Map;
@@ -7044,6 +7085,7 @@ public class com/facebook/react/views/text/TextAttributeProps : com/facebook/rea
 	public static final field TA_KEY_TEXT_SHADOW_OFFSET_DY S
 	public static final field TA_KEY_TEXT_SHADOW_RADIUS S
 	public static final field TA_KEY_TEXT_TRANSFORM S
+	public static final field UNSET I
 	protected field mAccessibilityRole Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole;
 	protected field mAllowFontScaling Z
 	protected field mBackgroundColor I

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.74.0-rc.3
+VERSION_NAME=0.74.0-rc.4
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

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

@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.devsupport.DoubleTapReloadRecognizer;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.interfaces.fabric.ReactSurface;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 
@@ -195,22 +196,28 @@ public class ReactDelegate {
    *     application.
    */
   public boolean shouldShowDevMenuOrReload(int keyCode, KeyEvent event) {
-    if (ReactFeatureFlags.enableBridgelessArchitecture) {
-      // TODO T156475655: Implement shouldShowDevMenuOrReload for Bridgeless
-      return false;
+    DevSupportManager devSupportManager = null;
+    if (ReactFeatureFlags.enableBridgelessArchitecture
+        && mReactHost != null
+        && mReactHost.getDevSupportManager() != null) {
+      devSupportManager = mReactHost.getDevSupportManager();
     } else if (getReactNativeHost().hasInstance()
         && getReactNativeHost().getUseDeveloperSupport()) {
-      if (keyCode == KeyEvent.KEYCODE_MENU) {
-        getReactNativeHost().getReactInstanceManager().showDevOptionsDialog();
-        return true;
-      }
-      boolean didDoubleTapR =
-          Assertions.assertNotNull(mDoubleTapReloadRecognizer)
-              .didDoubleTapR(keyCode, mActivity.getCurrentFocus());
-      if (didDoubleTapR) {
-        getReactNativeHost().getReactInstanceManager().getDevSupportManager().handleReloadJS();
-        return true;
-      }
+      devSupportManager = getReactNativeHost().getReactInstanceManager().getDevSupportManager();
+    } else {
+      return false;
+    }
+
+    if (keyCode == KeyEvent.KEYCODE_MENU) {
+      devSupportManager.showDevOptionsDialog();
+      return true;
+    }
+    boolean didDoubleTapR =
+        Assertions.assertNotNull(mDoubleTapReloadRecognizer)
+            .didDoubleTapR(keyCode, mActivity.getCurrentFocus());
+    if (didDoubleTapR) {
+      devSupportManager.handleReloadJS();
+      return true;
     }
     return false;
   }

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

@@ -120,7 +120,7 @@ public interface CatalystInstance
   RuntimeScheduler getRuntimeScheduler();
 
   @Deprecated
-  void addJSIModules(List<JSIModuleSpec> jsiModules);
+  <T extends JSIModule> void addJSIModules(List<JSIModuleSpec<T>> jsiModules);
 
   /**
    * Returns a hybrid object that contains a pointer to a JS CallInvoker, which is used to schedule

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

@@ -537,7 +537,8 @@ public class CatalystInstanceImpl implements CatalystInstance {
   public native RuntimeScheduler getRuntimeScheduler();
 
   @Override
-  public void addJSIModules(List<JSIModuleSpec> jsiModules) {
+  @Deprecated
+  public <T extends JSIModule> void addJSIModules(List<JSIModuleSpec<T>> jsiModules) {
     mJSIModuleRegistry.registerModules(jsiModules);
   }
 

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

@@ -26,8 +26,8 @@ class JSIModuleRegistry {
     return Assertions.assertNotNull(jsiModuleHolder.getJSIModule());
   }
 
-  public void registerModules(List<JSIModuleSpec> jsiModules) {
-    for (JSIModuleSpec spec : jsiModules) {
+  public <T extends JSIModule> void registerModules(List<JSIModuleSpec<T>> jsiModules) {
+    for (JSIModuleSpec<T> spec : jsiModules) {
       mModules.put(spec.getJSIModuleType(), new JSIModuleHolder(spec));
     }
   }

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

@@ -7,7 +7,7 @@
 
 package com.facebook.react.bridge;
 
-interface NativeArrayInterface {
+public interface NativeArrayInterface {
   @Override
   String toString();
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 74,
       "patch", 0,
-      "prerelease", "rc.3");
+      "prerelease", "rc.4");
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -0,0 +1,201 @@
+/*
+ * 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.runtime
+
+import android.content.res.AssetManager
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.bridge.JSIModule
+import com.facebook.react.bridge.JSIModuleSpec
+import com.facebook.react.bridge.JSIModuleType
+import com.facebook.react.bridge.JavaScriptContextHolder
+import com.facebook.react.bridge.JavaScriptModule
+import com.facebook.react.bridge.NativeArray
+import com.facebook.react.bridge.NativeArrayInterface
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.NativeModuleRegistry
+import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
+import com.facebook.react.bridge.RuntimeExecutor
+import com.facebook.react.bridge.RuntimeScheduler
+import com.facebook.react.bridge.UIManager
+import com.facebook.react.bridge.queue.ReactQueueConfiguration
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
+import com.facebook.react.common.annotations.VisibleForTesting
+import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
+import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder
+
+@DoNotStrip
+@DeprecatedInNewArchitecture
+public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) : CatalystInstance {
+
+  override fun handleMemoryPressure(level: Int) {
+    throw UnsupportedOperationException("Unimplemented method 'handleMemoryPressure'")
+  }
+
+  override fun loadScriptFromAssets(
+      assetManager: AssetManager,
+      assetURL: String,
+      loadSynchronously: Boolean
+  ) {
+    throw UnsupportedOperationException("Unimplemented method 'loadScriptFromAssets'")
+  }
+
+  override fun loadScriptFromFile(fileName: String, sourceURL: String, loadSynchronously: Boolean) {
+    throw UnsupportedOperationException("Unimplemented method 'loadScriptFromFile'")
+  }
+
+  override fun loadSplitBundleFromFile(fileName: String, sourceURL: String) {
+    throw UnsupportedOperationException("Unimplemented method 'loadSplitBundleFromFile'")
+  }
+
+  override fun setSourceURLs(deviceURL: String, remoteURL: String) {
+    throw UnsupportedOperationException("Unimplemented method 'setSourceURLs'")
+  }
+
+  override fun runJSBundle() {
+    throw UnsupportedOperationException("Unimplemented method 'runJSBundle'")
+  }
+
+  override fun hasRunJSBundle(): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'hasRunJSBundle'")
+  }
+
+  override fun getSourceURL(): String? {
+    throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
+  }
+
+  @DoNotStrip
+  override fun invokeCallback(callbackID: Int, arguments: NativeArrayInterface) {
+    throw UnsupportedOperationException("Unimplemented method 'invokeCallback'")
+  }
+
+  override fun callFunction(module: String, method: String, arguments: NativeArray) {
+    throw UnsupportedOperationException("Unimplemented method 'callFunction'")
+  }
+
+  override fun destroy() {
+    throw UnsupportedOperationException("Unimplemented method 'destroy'")
+  }
+
+  override fun isDestroyed(): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'isDestroyed'")
+  }
+
+  @VisibleForTesting
+  override fun initialize() {
+    throw UnsupportedOperationException("Unimplemented method 'initialize'")
+  }
+
+  override fun getReactQueueConfiguration(): ReactQueueConfiguration {
+    throw UnsupportedOperationException("Unimplemented method 'getReactQueueConfiguration'")
+  }
+
+  override fun <T : JavaScriptModule> getJSModule(jsInterface: Class<T>): T {
+    throw UnsupportedOperationException("Unimplemented method 'getJSModule'")
+  }
+
+  override fun <T : NativeModule> hasNativeModule(nativeModuleInterface: Class<T>): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'hasNativeModule'")
+  }
+
+  override fun <T : NativeModule> getNativeModule(nativeModuleInterface: Class<T>): T? {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModule'")
+  }
+
+  override fun getNativeModule(moduleName: String): NativeModule? {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModule'")
+  }
+
+  @Deprecated(
+      message =
+          "getJSIModule(JSIModuleType moduleType) is deprecated and will be deleted in the future. Please use ReactInstanceEventListener to subscribe for react instance events instead.")
+  override fun getJSIModule(moduleType: JSIModuleType): JSIModule {
+    throw UnsupportedOperationException("Unimplemented method 'getJSIModule'")
+  }
+
+  override fun getNativeModules(): Collection<NativeModule> {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModules'")
+  }
+
+  override fun extendNativeModules(modules: NativeModuleRegistry) {
+    throw UnsupportedOperationException("Unimplemented method 'extendNativeModules'")
+  }
+
+  override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
+    throw UnsupportedOperationException("Unimplemented method 'addBridgeIdleDebugListener'")
+  }
+
+  override fun removeBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
+    throw UnsupportedOperationException("Unimplemented method 'removeBridgeIdleDebugListener'")
+  }
+
+  override fun registerSegment(segmentId: Int, path: String) {
+    throw UnsupportedOperationException("Unimplemented method 'registerSegment'")
+  }
+
+  @VisibleForTesting
+  override fun setGlobalVariable(propName: String, jsonValue: String) {
+    throw UnsupportedOperationException("Unimplemented method 'setGlobalVariable'")
+  }
+
+  @Deprecated(message = "This API is unsupported in the New Architecture.")
+  override fun getJavaScriptContextHolder(): JavaScriptContextHolder {
+    throw UnsupportedOperationException("Unimplemented method 'getJavaScriptContextHolder'")
+  }
+
+  override fun getRuntimeExecutor(): RuntimeExecutor {
+    throw UnsupportedOperationException("Unimplemented method 'getRuntimeExecutor'")
+  }
+
+  override fun getRuntimeScheduler(): RuntimeScheduler {
+    throw UnsupportedOperationException("Unimplemented method 'getRuntimeScheduler'")
+  }
+
+  @Deprecated(message = "This API is unsupported in the New Architecture.")
+  override fun <T : JSIModule> addJSIModules(jsiModules: List<JSIModuleSpec<T>>) {
+    throw UnsupportedOperationException("Unimplemented method 'addJSIModules'")
+  }
+
+  override fun getJSCallInvokerHolder(): CallInvokerHolder? {
+    return reactHost.getJSCallInvokerHolder()
+  }
+
+  override fun getNativeMethodCallInvokerHolder(): NativeMethodCallInvokerHolder {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeMethodCallInvokerHolder'")
+  }
+
+  @Deprecated(
+      message =
+          "setTurboModuleManager(JSIModule getter) is deprecated and will be deleted in the future. Please use setTurboModuleRegistry(TurboModuleRegistry turboModuleRegistry) instead.",
+      replaceWith = ReplaceWith("setTurboModuleRegistry(turboModuleRegistry)"))
+  override fun setTurboModuleManager(getter: JSIModule) {
+    throw UnsupportedOperationException("Unimplemented method 'setTurboModuleManager'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun setTurboModuleRegistry(turboModuleRegistry: TurboModuleRegistry) {
+    throw UnsupportedOperationException("Unimplemented method 'setTurboModuleRegistry'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun setFabricUIManager(fabricUIManager: UIManager) {
+    throw UnsupportedOperationException("Unimplemented method 'setFabricUIManager'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun getFabricUIManager(): UIManager {
+    throw UnsupportedOperationException("Unimplemented method 'getFabricUIManager'")
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.java

@@ -8,6 +8,7 @@
 package com.facebook.react.runtime;
 
 import android.content.Context;
+import android.util.Log;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -18,8 +19,6 @@ import com.facebook.react.bridge.JavaScriptModuleRegistry;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactNoCrashBridgeNotAllowedSoftException;
-import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.RuntimeExecutor;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableNativeArray;
@@ -84,11 +83,10 @@ class BridgelessReactContext extends ReactApplicationContext implements EventDis
 
   @Override
   public CatalystInstance getCatalystInstance() {
-    ReactSoftExceptionLogger.logSoftExceptionVerbose(
+    Log.w(
         TAG,
-        new ReactNoCrashBridgeNotAllowedSoftException(
-            "getCatalystInstance() cannot be called when the bridge is disabled"));
-    throw new UnsupportedOperationException("There is no Catalyst instance in bridgeless mode.");
+        "[WARNING] Bridgeless doesn't support CatalystInstance. Accessing an API that's not part of the new architecture is not encouraged usage.");
+    return new BridgelessCatalystInstance(mReactHost);
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java

@@ -60,6 +60,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.runtime.internal.bolts.Continuation;
 import com.facebook.react.runtime.internal.bolts.Task;
 import com.facebook.react.runtime.internal.bolts.TaskCompletionSource;
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.BlackHoleEventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -601,6 +602,20 @@ public class ReactHostImpl implements ReactHost {
     return null;
   }
 
+  /* package */
+  @Nullable
+  CallInvokerHolder getJSCallInvokerHolder() {
+    final ReactInstance reactInstance = mReactInstanceTaskRef.get().getResult();
+    if (reactInstance != null) {
+      return reactInstance.getJSCallInvokerHolder();
+    }
+    ReactSoftExceptionLogger.logSoftException(
+        TAG,
+        new ReactNoCrashSoftException(
+            "Tried to get JSCallInvokerHolder while instance is not ready"));
+    return null;
+  }
+
   /**
    * To be called when the host activity receives an activity result.
    *

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java

@@ -475,7 +475,7 @@ final class ReactInstance {
 
   private native void loadJSBundleFromAssets(AssetManager assetManager, String assetURL);
 
-  private native CallInvokerHolderImpl getJSCallInvokerHolder();
+  /* package */ native CallInvokerHolderImpl getJSCallInvokerHolder();
 
   private native NativeMethodCallInvokerHolderImpl getNativeMethodCallInvokerHolder();
 

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java

@@ -62,6 +62,8 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
   public static final short TA_KEY_ROLE = 26;
   public static final short TA_KEY_TEXT_TRANSFORM = 27;
 
+  public static final int UNSET = -1;
+
   private static final String PROP_SHADOW_OFFSET = "textShadowOffset";
   private static final String PROP_SHADOW_OFFSET_WIDTH = "width";
   private static final String PROP_SHADOW_OFFSET_HEIGHT = "height";

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 74;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.3";
+  std::string_view Prerelease = "rc.4";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h

@@ -48,10 +48,10 @@ inline static NSURL *NSURLFromImageSource(const facebook::react::ImageSource &im
 {
   // `NSURL` has a history of crashing with bad input, so let's be safe.
   @try {
-    NSString *urlString = [NSString stringWithCString:imageSource.uri.c_str() encoding:NSASCIIStringEncoding];
+    NSString *urlString = [NSString stringWithUTF8String:imageSource.uri.c_str()];
 
     if (!imageSource.bundle.empty()) {
-      NSString *bundle = [NSString stringWithCString:imageSource.bundle.c_str() encoding:NSASCIIStringEncoding];
+      NSString *bundle = [NSString stringWithUTF8String:imageSource.bundle.c_str()];
       urlString = [NSString stringWithFormat:@"%@.bundle/%@", bundle, urlString];
     }
 

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -6,7 +6,6 @@
  */
 
 #import "RCTInstance.h"
-#import <React/RCTBridgeProxy.h>
 
 #import <memory>
 
@@ -16,6 +15,8 @@
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTBridgeModuleDecorator.h>
+#import <React/RCTBridgeProxy+Cxx.h>
+#import <React/RCTBridgeProxy.h>
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTConstants.h>
 #import <React/RCTCxxUtils.h>
@@ -256,6 +257,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   RuntimeExecutor bufferedRuntimeExecutor = _reactInstance->getBufferedRuntimeExecutor();
   timerManager->setRuntimeExecutor(bufferedRuntimeExecutor);
 
+  auto jsCallInvoker = make_shared<BridgelessJSCallInvoker>(bufferedRuntimeExecutor);
   RCTBridgeProxy *bridgeProxy =
       [[RCTBridgeProxy alloc] initWithViewRegistry:_bridgeModuleDecorator.viewRegistry_DEPRECATED
           moduleRegistry:_bridgeModuleDecorator.moduleRegistry
@@ -274,14 +276,14 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
             }
           }
           runtime:_reactInstance->getJavaScriptContext()];
+  bridgeProxy.jsCallInvoker = jsCallInvoker;
   [RCTBridge setCurrentBridge:(RCTBridge *)bridgeProxy];
 
   // Set up TurboModules
-  _turboModuleManager = [[RCTTurboModuleManager alloc]
-        initWithBridgeProxy:bridgeProxy
-      bridgeModuleDecorator:_bridgeModuleDecorator
-                   delegate:self
-                  jsInvoker:std::make_shared<BridgelessJSCallInvoker>(bufferedRuntimeExecutor)];
+  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridgeProxy:bridgeProxy
+                                                     bridgeModuleDecorator:_bridgeModuleDecorator
+                                                                  delegate:self
+                                                                 jsInvoker:jsCallInvoker];
   _turboModuleManager.runtimeHandler = self;
 
 #if RCT_DEV

package/ReactCommon/yoga/yoga/algorithm/AbsoluteLayout.cpp

@@ -480,14 +480,10 @@ void layoutAbsoluteDescendants(
     LayoutData& layoutMarkerData,
     uint32_t currentDepth,
     uint32_t generationCount,
-    float currentNodeMainOffsetFromContainingBlock,
-    float currentNodeCrossOffsetFromContainingBlock,
+    float currentNodeLeftOffsetFromContainingBlock,
+    float currentNodeTopOffsetFromContainingBlock,
     float containingNodeAvailableInnerWidth,
     float containingNodeAvailableInnerHeight) {
-  const FlexDirection mainAxis = resolveDirection(
-      currentNode->style().flexDirection(), currentNodeDirection);
-  const FlexDirection crossAxis =
-      resolveCrossDirection(mainAxis, currentNodeDirection);
   for (auto child : currentNode->getChildren()) {
     if (child->style().display() == Display::None) {
       continue;
@@ -516,45 +512,73 @@ void layoutAbsoluteDescendants(
           currentDepth,
           generationCount);
 
-      const bool isMainAxisRow = isRow(mainAxis);
-      const bool mainInsetsDefined = isMainAxisRow
-          ? child->style().horizontalInsetsDefined()
-          : child->style().verticalInsetsDefined();
-      const bool crossInsetsDefined = isMainAxisRow
-          ? child->style().verticalInsetsDefined()
-          : child->style().horizontalInsetsDefined();
-
-      const float childMainOffsetFromParent = mainInsetsDefined
-          ? (child->getLayout().position(flexStartEdge(mainAxis)) -
-             currentNodeMainOffsetFromContainingBlock)
-          : child->getLayout().position(flexStartEdge(mainAxis));
-      const float childCrossOffsetFromParent = crossInsetsDefined
-          ? (child->getLayout().position(flexStartEdge(crossAxis)) -
-             currentNodeCrossOffsetFromContainingBlock)
-          : child->getLayout().position(flexStartEdge(crossAxis));
-
-      child->setLayoutPosition(
-          childMainOffsetFromParent, flexStartEdge(mainAxis));
-      child->setLayoutPosition(
-          childCrossOffsetFromParent, flexStartEdge(crossAxis));
-
-      if (needsTrailingPosition(mainAxis)) {
-        setChildTrailingPosition(currentNode, child, mainAxis);
+      /*
+       * At this point the child has its position set but only on its the
+       * parent's flexStart edge. Additionally, this position should be
+       * interpreted relative to the containing block of the child if it had
+       * insets defined. So we need to adjust the position by subtracting the
+       * the parents offset from the containing block. However, getting that
+       * offset is complicated since the two nodes can have different main/cross
+       * axes.
+       */
+      const FlexDirection parentMainAxis = resolveDirection(
+          currentNode->style().flexDirection(), currentNodeDirection);
+      const FlexDirection parentCrossAxis =
+          resolveCrossDirection(parentMainAxis, currentNodeDirection);
+
+      if (needsTrailingPosition(parentMainAxis)) {
+        const bool mainInsetsDefined = isRow(parentMainAxis)
+            ? child->style().horizontalInsetsDefined()
+            : child->style().verticalInsetsDefined();
+        setChildTrailingPosition(
+            mainInsetsDefined ? containingNode : currentNode,
+            child,
+            parentMainAxis);
       }
-      if (needsTrailingPosition(crossAxis)) {
-        setChildTrailingPosition(currentNode, child, crossAxis);
+      if (needsTrailingPosition(parentCrossAxis)) {
+        const bool crossInsetsDefined = isRow(parentCrossAxis)
+            ? child->style().horizontalInsetsDefined()
+            : child->style().verticalInsetsDefined();
+        setChildTrailingPosition(
+            crossInsetsDefined ? containingNode : currentNode,
+            child,
+            parentCrossAxis);
       }
+
+      /*
+       * At this point we know the left and top physical edges of the child are
+       * set with positions that are relative to the containing block if insets
+       * are defined
+       */
+      const float childLeftPosition =
+          child->getLayout().position(PhysicalEdge::Left);
+      const float childTopPosition =
+          child->getLayout().position(PhysicalEdge::Top);
+
+      const float childLeftOffsetFromParent =
+          child->style().horizontalInsetsDefined()
+          ? (childLeftPosition - currentNodeLeftOffsetFromContainingBlock)
+          : childLeftPosition;
+      const float childTopOffsetFromParent =
+          child->style().verticalInsetsDefined()
+          ? (childTopPosition - currentNodeTopOffsetFromContainingBlock)
+          : childTopPosition;
+
+      child->setLayoutPosition(childLeftOffsetFromParent, PhysicalEdge::Left);
+      child->setLayoutPosition(childTopOffsetFromParent, PhysicalEdge::Top);
     } else if (
         child->style().positionType() == PositionType::Static &&
         !child->alwaysFormsContainingBlock()) {
       const Direction childDirection =
           child->resolveDirection(currentNodeDirection);
-      const float childMainOffsetFromContainingBlock =
-          currentNodeMainOffsetFromContainingBlock +
-          child->getLayout().position(flexStartEdge(mainAxis));
-      const float childCrossOffsetFromContainingBlock =
-          currentNodeCrossOffsetFromContainingBlock +
-          child->getLayout().position(flexStartEdge(crossAxis));
+      // By now all descendants of the containing block that are not absolute
+      // will have their positions set for left and top.
+      const float childLeftOffsetFromContainingBlock =
+          currentNodeLeftOffsetFromContainingBlock +
+          child->getLayout().position(PhysicalEdge::Left);
+      const float childTopOffsetFromContainingBlock =
+          currentNodeTopOffsetFromContainingBlock +
+          child->getLayout().position(PhysicalEdge::Top);
 
       layoutAbsoluteDescendants(
           containingNode,
@@ -564,8 +588,8 @@ void layoutAbsoluteDescendants(
           layoutMarkerData,
           currentDepth + 1,
           generationCount,
-          childMainOffsetFromContainingBlock,
-          childCrossOffsetFromContainingBlock,
+          childLeftOffsetFromContainingBlock,
+          childTopOffsetFromContainingBlock,
           containingNodeAvailableInnerWidth,
           containingNodeAvailableInnerHeight);
     }

package/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp

@@ -2045,26 +2045,7 @@ static void calculateLayoutImpl(
   }
 
   if (performLayout) {
-    // STEP 10: SIZING AND POSITIONING ABSOLUTE CHILDREN
-    // Let the containing block layout its absolute descendants. By definition
-    // the containing block will not be static unless we are at the root.
-    if (node->style().positionType() != PositionType::Static ||
-        node->alwaysFormsContainingBlock() || depth == 1) {
-      layoutAbsoluteDescendants(
-          node,
-          node,
-          isMainAxisRow ? sizingModeMainDim : sizingModeCrossDim,
-          direction,
-          layoutMarkerData,
-          depth,
-          generationCount,
-          0.0f,
-          0.0f,
-          availableInnerWidth,
-          availableInnerHeight);
-    }
-
-    // STEP 11: SETTING TRAILING POSITIONS FOR CHILDREN
+    // STEP 10: SETTING TRAILING POSITIONS FOR CHILDREN
     const bool needsMainTrailingPos = needsTrailingPosition(mainAxis);
     const bool needsCrossTrailingPos = needsTrailingPosition(crossAxis);
 
@@ -2087,6 +2068,24 @@ static void calculateLayoutImpl(
         }
       }
     }
+
+    // STEP 11: SIZING AND POSITIONING ABSOLUTE CHILDREN
+    // Let the containing block layout its absolute descendants.
+    if (node->style().positionType() != PositionType::Static ||
+        node->alwaysFormsContainingBlock() || depth == 1) {
+      layoutAbsoluteDescendants(
+          node,
+          node,
+          isMainAxisRow ? sizingModeMainDim : sizingModeCrossDim,
+          direction,
+          layoutMarkerData,
+          depth,
+          generationCount,
+          0.0f,
+          0.0f,
+          availableInnerWidth,
+          availableInnerHeight);
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.74.0-rc.3",
+  "version": "0.74.0-rc.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -98,16 +98,16 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "13.6.1",
-    "@react-native-community/cli-platform-android": "13.6.1",
-    "@react-native-community/cli-platform-ios": "13.6.1",
-    "@react-native/assets-registry": "0.74.0",
-    "@react-native/codegen": "0.74.2",
-    "@react-native/community-cli-plugin": "0.74.5",
-    "@react-native/gradle-plugin": "0.74.1",
-    "@react-native/js-polyfills": "0.74.0",
-    "@react-native/normalize-colors": "0.74.1",
-    "@react-native/virtualized-lists": "0.74.1",
+    "@react-native-community/cli": "13.6.2",
+    "@react-native-community/cli-platform-android": "13.6.2",
+    "@react-native-community/cli-platform-ios": "13.6.2",
+    "@react-native/assets-registry": "0.74.75",
+    "@react-native/codegen": "0.74.75",
+    "@react-native/community-cli-plugin": "0.74.75",
+    "@react-native/gradle-plugin": "0.74.75",
+    "@react-native/js-polyfills": "0.74.75",
+    "@react-native/normalize-colors": "0.74.75",
+    "@react-native/virtualized-lists": "0.74.75",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/template/package.json

@@ -11,16 +11,16 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.74.0-rc.3"
+    "react-native": "0.74.0-rc.4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
-    "@react-native/babel-preset": "0.74.2",
-    "@react-native/eslint-config": "0.74.1",
-    "@react-native/metro-config": "0.74.2",
-    "@react-native/typescript-config": "0.74.1",
+    "@react-native/babel-preset": "0.74.75",
+    "@react-native/eslint-config": "0.74.75",
+    "@react-native/metro-config": "0.74.75",
+    "@react-native/typescript-config": "0.74.75",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.6.3",

package/types/index.d.ts

@@ -103,6 +103,7 @@ export * from '../Libraries/Components/View/View';
 export * from '../Libraries/Components/View/ViewAccessibility';
 export * from '../Libraries/Components/View/ViewPropTypes';
 export * from '../Libraries/Components/Button';
+export * from '../Libraries/Core/registerCallableModule';
 export * from '../Libraries/DevToolsSettings/DevToolsSettingsManager';
 export * from '../Libraries/EventEmitter/NativeEventEmitter';
 export * from '../Libraries/EventEmitter/RCTDeviceEventEmitter';