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

package/ReactAndroid/src/main/java/com/facebook/react/ReactHost.kt

@@ -9,6 +9,7 @@ package com.facebook.react
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.queue.ReactQueueConfiguration
@@ -111,6 +112,14 @@ public interface ReactHost {
    */
   public fun destroy(reason: String, ex: Exception?): TaskInterface<Void>
 
+  /* To be called when the host activity receives an activity result. */
+  public fun onActivityResult(
+      activity: Activity,
+      requestCode: Int,
+      resultCode: Int,
+      data: Intent?,
+  )
+
   public fun addBeforeDestroyListener(onBeforeDestroy: () -> Unit)
 
   public fun removeBeforeDestroyListener(onBeforeDestroy: () -> Unit)

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

@@ -998,6 +998,11 @@ public class ReactInstanceManager {
               if (names != null) {
                 uniqueNames.addAll(names);
               }
+            } else {
+              FLog.w(
+                  ReactConstants.TAG,
+                  "Package %s is not a ViewManagerOnDemandReactPackage, view managers will not be loaded",
+                  reactPackage.getClass().getSimpleName());
             }
             Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
           }

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/bridge/queue/MessageQueueThreadHandler.java

@@ -10,8 +10,6 @@ package com.facebook.react.bridge.queue;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import com.facebook.common.logging.FLog;
-import com.facebook.react.common.ReactConstants;
 
 /** Handler that can catch and dispatch Exceptions to an Exception handler. */
 public class MessageQueueThreadHandler extends Handler {
@@ -28,15 +26,6 @@ public class MessageQueueThreadHandler extends Handler {
     try {
       super.dispatchMessage(msg);
     } catch (Exception e) {
-      if (e instanceof NullPointerException) {
-        FLog.e(
-            ReactConstants.TAG,
-            "Caught NullPointerException when dispatching message in MessageQueueThreadHandler. This is likely caused by runnable"
-                + "(msg.callback) being nulled in Android Handler after dispatching and before handling (see T170239922 for more details)."
-                + "Currently we observe that it only happen once which is during initialisation. Due to fixing probably involve Android "
-                + "System code, we decide to ignore here for now and print an error message for debugging purpose in case this cause more serious issues in future.");
-        return;
-      }
       mExceptionHandler.handleException(e);
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt

@@ -43,7 +43,7 @@ public class DefaultReactHostDelegate(
     override val jsBundleLoader: JSBundleLoader,
     override val reactPackages: List<ReactPackage> = emptyList(),
     override val jsRuntimeFactory: JSRuntimeFactory = HermesInstance(),
-    override val bindingsInstaller: BindingsInstaller = DefaultBindingsInstaller(),
+    override val bindingsInstaller: BindingsInstaller? = null,
     private val reactNativeConfig: ReactNativeConfig = ReactNativeConfig.DEFAULT_CONFIG,
     private val exceptionHandler: (Exception) -> Unit = {},
     override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt

@@ -49,13 +49,18 @@ protected constructor(
           DefaultComponentsRegistry.register(componentFactory)
 
           val viewManagerRegistry =
-              ViewManagerRegistry(
-                  object : ViewManagerResolver {
-                    override fun getViewManager(viewManagerName: String) =
-                        reactInstanceManager.createViewManager(viewManagerName)
+              if (lazyViewManagersEnabled) {
+                ViewManagerRegistry(
+                    object : ViewManagerResolver {
+                      override fun getViewManager(viewManagerName: String) =
+                          reactInstanceManager.createViewManager(viewManagerName)
 
-                    override fun getViewManagerNames() = reactInstanceManager.viewManagerNames
-                  })
+                      override fun getViewManagerNames() = reactInstanceManager.viewManagerNames
+                    })
+              } else {
+                ViewManagerRegistry(
+                    reactInstanceManager.getOrCreateViewManagers(reactApplicationContext))
+              }
 
           FabricUIManagerProviderImpl(
                   componentFactory, ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry)

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.2");
+      "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

@@ -15,6 +15,7 @@ import static java.lang.Boolean.TRUE;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -59,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;
@@ -600,6 +602,51 @@ 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.
+   *
+   * @param activity The host activity
+   */
+  @ThreadConfined(UI)
+  @Override
+  public void onActivityResult(
+      Activity activity, int requestCode, int resultCode, @Nullable Intent data) {
+    final String method =
+        "onActivityResult(activity = \""
+            + activity
+            + "\", requestCode = \""
+            + requestCode
+            + "\", resultCode = \""
+            + resultCode
+            + "\", data = \""
+            + data
+            + "\")";
+    log(method);
+
+    ReactContext currentContext = getCurrentReactContext();
+    if (currentContext != null) {
+      currentContext.onActivityResult(activity, requestCode, resultCode, data);
+    }
+    ReactSoftExceptionLogger.logSoftException(
+        TAG,
+        new ReactNoCrashSoftException(
+            "Tried to access onActivityResult while context is not ready"));
+  }
+
   @Nullable
   JavaScriptContextHolder getJavaScriptContextHolder() {
     final ReactInstance reactInstance = mReactInstanceTaskRef.get().getResult();

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/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp

@@ -10,7 +10,6 @@
 #include <condition_variable>
 #include <mutex>
 
-#include <fb/log.h>
 #include <fbjni/NativeRunnable.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>

package/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h

@@ -42,10 +42,6 @@ class JMessageQueueThread : public MessageQueueThread {
    */
   void quitSynchronous() override;
 
-  JavaMessageQueueThread::javaobject jobj() {
-    return m_jobj.get();
-  }
-
  private:
   jni::global_ref<JavaMessageQueueThread::javaobject> m_jobj;
 };

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.2";
+  std::string_view Prerelease = "rc.4";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/BaseViewProps.cpp

@@ -140,6 +140,14 @@ BaseViewProps::BaseViewProps(
                                                        "shadowRadius",
                                                        sourceProps.shadowRadius,
                                                        {})),
+      cursor(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.cursor
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "cursor",
+                                                       sourceProps.cursor,
+                                                       {})),
       transform(
           CoreFeatures::enablePropIteratorSetter ? sourceProps.transform
                                                  : convertRawProp(
@@ -281,6 +289,7 @@ void BaseViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(collapsable);
     RAW_SET_PROP_SWITCH_CASE_BASIC(removeClippedSubviews);
     RAW_SET_PROP_SWITCH_CASE_BASIC(experimental_layoutConformance);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(cursor);
     // events field
     VIEW_EVENT_CASE(PointerEnter);
     VIEW_EVENT_CASE(PointerEnterCapture);

package/ReactCommon/react/renderer/components/view/BaseViewProps.h

@@ -52,6 +52,8 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps {
   Float shadowOpacity{};
   Float shadowRadius{3};
 
+  Cursor cursor{};
+
   // Transform
   Transform transform{};
   TransformOrigin transformOrigin{};

package/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp

@@ -60,7 +60,7 @@ void ViewShadowNode::initialize() noexcept {
       viewProps.accessibilityElementsHidden ||
       viewProps.accessibilityViewIsModal ||
       viewProps.importantForAccessibility != ImportantForAccessibility::Auto ||
-      viewProps.removeClippedSubviews ||
+      viewProps.removeClippedSubviews || viewProps.cursor != Cursor::Auto ||
       HostPlatformViewTraitsInitializer::formsStackingContext(viewProps);
 
   bool formsView = formsStackingContext ||

package/ReactCommon/react/renderer/components/view/conversions.h

@@ -705,6 +705,28 @@ inline void fromRawValue(
   react_native_expect(false);
 }
 
+inline void fromRawValue(
+    const PropsParserContext& context,
+    const RawValue& value,
+    Cursor& result) {
+  result = Cursor::Auto;
+  react_native_expect(value.hasType<std::string>());
+  if (!value.hasType<std::string>()) {
+    return;
+  }
+  auto stringValue = (std::string)value;
+  if (stringValue == "auto") {
+    result = Cursor::Auto;
+    return;
+  }
+  if (stringValue == "pointer") {
+    result = Cursor::Pointer;
+    return;
+  }
+  LOG(ERROR) << "Could not parse Cursor:" << stringValue;
+  react_native_expect(false);
+}
+
 inline void fromRawValue(
     const PropsParserContext& /*context*/,
     const RawValue& value,

package/ReactCommon/react/renderer/components/view/primitives.h

@@ -91,6 +91,8 @@ enum class BorderCurve : uint8_t { Circular, Continuous };
 
 enum class BorderStyle : uint8_t { Solid, Dotted, Dashed };
 
+enum class Cursor : uint8_t { Auto, Pointer };
+
 enum class LayoutConformance : uint8_t { Undefined, Classic, Strict };
 
 template <typename T>

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];
     }