react-native 0.75.2 → 0.75.4

package/Libraries/Blob/RCTFileReaderModule.mm

@@ -72,9 +72,10 @@ RCT_EXPORT_METHOD(readAsDataURL
           nil);
     } else {
       NSString *type = [RCTConvert NSString:blob[@"type"]];
-      NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
-                                                  type != nil && [type length] > 0 ? type : @"application/octet-stream",
-                                                  [data base64EncodedStringWithOptions:0]];
+      NSString *text = [NSString
+          stringWithFormat:@"data:%@;base64,%@",
+                           ![type isEqual:[NSNull null]] && [type length] > 0 ? type : @"application/octet-stream",
+                           [data base64EncodedStringWithOptions:0]];
 
       resolve(text);
     }

package/Libraries/Core/ReactNativeVersion.js

@@ -16,7 +16,7 @@ const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 75,
-  patch: 2,
+  patch: 4,
   prerelease: null,
 };
 

package/Libraries/StyleSheet/StyleSheetTypes.d.ts

@@ -182,21 +182,23 @@ type MaximumOneOf<T, K extends keyof T = keyof T> = K extends keyof T
 
 export interface TransformsStyle {
   transform?:
-    | MaximumOneOf<
-        PerspectiveTransform &
-          RotateTransform &
-          RotateXTransform &
-          RotateYTransform &
-          RotateZTransform &
-          ScaleTransform &
-          ScaleXTransform &
-          ScaleYTransform &
-          TranslateXTransform &
-          TranslateYTransform &
-          SkewXTransform &
-          SkewYTransform &
-          MatrixTransform
-      >[]
+    | Readonly<
+        MaximumOneOf<
+          PerspectiveTransform &
+            RotateTransform &
+            RotateXTransform &
+            RotateYTransform &
+            RotateZTransform &
+            ScaleTransform &
+            ScaleXTransform &
+            ScaleYTransform &
+            TranslateXTransform &
+            TranslateYTransform &
+            SkewXTransform &
+            SkewYTransform &
+            MatrixTransform
+        >[]
+      >
     | string
     | undefined;
   transformOrigin?: Array<string | number> | string | undefined;

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(75),
-                  RCTVersionPatch: @(2),
+                  RCTVersionPatch: @(4),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/React/Views/RCTModalHostView.m

@@ -119,6 +119,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
   if (_isPresented) {
     [_delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
     _isPresented = NO;
+    [self setVisible:NO];
   }
 }
 

package/ReactAndroid/api/ReactAndroid.api

@@ -6459,9 +6459,9 @@ public class com/facebook/react/views/imagehelper/ImageSource {
 	public final fun getSize ()D
 	public final fun getSource ()Ljava/lang/String;
 	public static final fun getTransparentBitmapImageSource (Landroid/content/Context;)Lcom/facebook/react/views/imagehelper/ImageSource;
-	public final fun getUri ()Landroid/net/Uri;
+	public fun getUri ()Landroid/net/Uri;
 	public fun hashCode ()I
-	public final fun isResource ()Z
+	public fun isResource ()Z
 }
 
 public final class com/facebook/react/views/imagehelper/ImageSource$Companion {
@@ -7732,6 +7732,7 @@ public class com/facebook/react/views/textinput/ReactEditText : androidx/appcomp
 	public fun setBorderStyle (Ljava/lang/String;)V
 	public fun setBorderWidth (IF)V
 	public fun setContentSizeWatcher (Lcom/facebook/react/views/textinput/ContentSizeWatcher;)V
+	public fun setContextMenuHidden (Z)V
 	public fun setDisableFullscreenUI (Z)V
 	public fun setFontFamily (Ljava/lang/String;)V
 	public fun setFontFeatureSettings (Ljava/lang/String;)V

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.75.2
+VERSION_NAME=0.75.4
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.java

@@ -13,7 +13,6 @@ import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import java.io.Closeable;
-import java.util.OptionalInt;
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -47,7 +46,7 @@ import okhttp3.WebSocketListener;
   private static class WebSocketDelegate implements Closeable {
     private final HybridData mHybridData;
 
-    public native void didFailWithError(OptionalInt posixCode, String error);
+    public native void didFailWithError(@Nullable Integer posixCode, String error);
 
     public native void didReceiveMessage(String message);
 
@@ -103,8 +102,7 @@ import okhttp3.WebSocketListener;
                 @Override
                 public void onFailure(WebSocket _unused, Throwable t, @Nullable Response response) {
                   @Nullable String message = t.getMessage();
-                  delegate.didFailWithError(
-                      OptionalInt.empty(), message != null ? message : "<Unknown error>");
+                  delegate.didFailWithError(null, message != null ? message : "<Unknown error>");
                   // "No further calls to this listener will be made." -OkHttp docs for
                   // WebSocketListener.onFailure
                   delegate.close();

package/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java

@@ -169,26 +169,25 @@ public class HeadlessJsTaskContext {
 
   /**
    * Finish a JS task. Doesn't actually stop the task on the JS side, only removes it from the list
-   * of active tasks and notifies listeners. A task can only be finished once.
+   * of active tasks and notifies listeners.
    *
    * @param taskId the unique id returned by {@link #startTask}.
    */
   public synchronized void finishTask(final int taskId) {
-    Assertions.assertCondition(
-        mActiveTasks.remove(taskId), "Tried to finish non-existent task with id " + taskId + ".");
-    Assertions.assertCondition(
-        mActiveTaskConfigs.remove(taskId) != null,
-        "Tried to remove non-existent task config with id " + taskId + ".");
+    boolean removed = mActiveTasks.remove(taskId);
+    mActiveTaskConfigs.remove(taskId);
     removeTimeout(taskId);
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            for (HeadlessJsTaskEventListener listener : mHeadlessJsTaskEventListeners) {
-              listener.onHeadlessJsTaskFinish(taskId);
+    if (removed) {
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              for (HeadlessJsTaskEventListener listener : mHeadlessJsTaskEventListeners) {
+                listener.onHeadlessJsTaskFinish(taskId);
+              }
             }
-          }
-        });
+          });
+    }
   }
 
   private void removeTimeout(int taskId) {

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

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 75,
-      "patch", 2,
+      "patch", 4,
       "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java

@@ -605,6 +605,7 @@ public class CSSBackgroundDrawable extends Drawable {
     }
 
     // Clip border ONLY if its color is non transparent
+    float pathAdjustment = 0f;
     if (Color.alpha(colorLeft) != 0
         && Color.alpha(colorTop) != 0
         && Color.alpha(colorRight) != 0
@@ -615,6 +616,10 @@ public class CSSBackgroundDrawable extends Drawable {
       mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;
       mInnerClipTempRectForBorderRadius.left += borderWidth.left;
       mInnerClipTempRectForBorderRadius.right -= borderWidth.right;
+
+      // only close gap between border and main path if we draw the border, otherwise
+      // we wind up pixelating small pixel-radius curves
+      pathAdjustment = mGapBetweenPaths;
     }
 
     mTempRectForCenterDrawPath.top += borderWidth.top * 0.5f;
@@ -661,10 +666,10 @@ public class CSSBackgroundDrawable extends Drawable {
     // (mInnerClipTempRectForBorderRadius), ensuring the border can be
     // drawn on top without the gap.
     mBackgroundColorRenderPath.addRoundRect(
-        mInnerClipTempRectForBorderRadius.left - mGapBetweenPaths,
-        mInnerClipTempRectForBorderRadius.top - mGapBetweenPaths,
-        mInnerClipTempRectForBorderRadius.right + mGapBetweenPaths,
-        mInnerClipTempRectForBorderRadius.bottom + mGapBetweenPaths,
+        mInnerClipTempRectForBorderRadius.left - pathAdjustment,
+        mInnerClipTempRectForBorderRadius.top - pathAdjustment,
+        mInnerClipTempRectForBorderRadius.right + pathAdjustment,
+        mInnerClipTempRectForBorderRadius.bottom + pathAdjustment,
         new float[] {
           innerTopLeftRadiusX,
           innerTopLeftRadiusY,

package/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.kt

@@ -23,12 +23,14 @@ constructor(
 ) {
 
   /** Get the URI for this image - can be either a parsed network URI or a resource URI. */
-  public val uri: Uri = computeUri(context)
+  public open val uri: Uri = computeUri(context)
   /** Get the area of this image. */
   public val size: Double = width * height
   /** Get whether this image source represents an Android resource or a network URI. */
-  public var isResource: Boolean = false
-    private set
+  public open val isResource: Boolean
+    get() = _isResource
+
+  private var _isResource: Boolean = false
 
   override fun equals(other: Any?): Boolean {
     if (this === other) {
@@ -58,7 +60,7 @@ constructor(
       }
 
   private fun computeLocalUri(context: Context): Uri {
-    isResource = true
+    _isResource = true
     return ResourceDrawableIdHelper.instance.getResourceDrawableUri(context, source)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -118,6 +118,7 @@ public class ReactEditText extends AppCompatEditText {
   private int mFontWeight = ReactConstants.UNSET;
   private int mFontStyle = ReactConstants.UNSET;
   private boolean mAutoFocus = false;
+  private boolean mContextMenuHidden = false;
   private boolean mDidAttachToWindow = false;
   private @Nullable String mPlaceholder = null;
 
@@ -191,6 +192,9 @@ public class ReactEditText extends AppCompatEditText {
            */
           @Override
           public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            if (mContextMenuHidden) {
+              return false;
+            }
             menu.removeItem(android.R.id.pasteAsPlainText);
             return true;
           }
@@ -1121,6 +1125,10 @@ public class ReactEditText extends AppCompatEditText {
     mAutoFocus = autoFocus;
   }
 
+  public void setContextMenuHidden(boolean contextMenuHidden) {
+    mContextMenuHidden = contextMenuHidden;
+  }
+
   protected void applyTextAttributes() {
     // In general, the `getEffective*` functions return `Float.NaN` if the
     // property hasn't been set.

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -651,14 +651,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
 
   @ReactProp(name = "contextMenuHidden", defaultBoolean = false)
   public void setContextMenuHidden(ReactEditText view, boolean contextMenuHidden) {
-    final boolean _contextMenuHidden = contextMenuHidden;
-    view.setOnLongClickListener(
-        new View.OnLongClickListener() {
-          public boolean onLongClick(View v) {
-            return _contextMenuHidden;
-          }
-          ;
-        });
+    view.setContextMenuHidden(contextMenuHidden);
   }
 
   @ReactProp(name = "selectTextOnFocus", defaultBoolean = false)

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.cpp

@@ -7,6 +7,8 @@
 
 #include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
 
+#include <optional>
+
 using namespace facebook::jni;
 
 namespace facebook::react::jsinspector_modern {
@@ -17,10 +19,17 @@ JCxxInspectorPackagerConnectionWebSocketDelegate::
     : cxxDelegate_(cxxDelegate) {}
 
 void JCxxInspectorPackagerConnectionWebSocketDelegate::didFailWithError(
-    alias_ref<JOptionalInt::javaobject> posixCode,
+    alias_ref<jni::JInteger> posixCode,
     const std::string& error) {
+  std::optional<int> posixCodeVal;
+
+  // Handle @Nullable JInteger param
+  if (posixCode.get() != nullptr) {
+    posixCodeVal = posixCode->intValue();
+  }
+
   if (auto delegate = cxxDelegate_.lock()) {
-    delegate->didFailWithError(*posixCode, error);
+    delegate->didFailWithError(posixCodeVal, error);
   }
 }
 

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "JOptional.h"
-
 #include <fbjni/fbjni.h>
 #include <jsinspector-modern/InspectorPackagerConnection.h>
 
@@ -29,7 +27,7 @@ class JCxxInspectorPackagerConnectionWebSocketDelegate
       "Lcom/facebook/react/devsupport/CxxInspectorPackagerConnection$WebSocketDelegate;";
 
   void didFailWithError(
-      jni::alias_ref<JOptionalInt::javaobject> posixCode,
+      jni::alias_ref<jni::JInteger> posixCode,
       const std::string& error);
 
   void didReceiveMessage(const std::string& message);

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 75;
-  int32_t Patch = 2;
+  int32_t Patch = 4;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.75.2",
+  "version": "0.75.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -109,21 +109,22 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "14.0.0",
-    "@react-native-community/cli-platform-android": "14.0.0",
-    "@react-native-community/cli-platform-ios": "14.0.0",
-    "@react-native/assets-registry": "0.75.2",
-    "@react-native/codegen": "0.75.2",
-    "@react-native/community-cli-plugin": "0.75.2",
-    "@react-native/gradle-plugin": "0.75.2",
-    "@react-native/js-polyfills": "0.75.2",
-    "@react-native/normalize-colors": "0.75.2",
-    "@react-native/virtualized-lists": "0.75.2",
+    "@react-native-community/cli": "14.1.0",
+    "@react-native-community/cli-platform-android": "14.1.0",
+    "@react-native-community/cli-platform-ios": "14.1.0",
+    "@react-native/assets-registry": "0.75.4",
+    "@react-native/codegen": "0.75.4",
+    "@react-native/community-cli-plugin": "0.75.4",
+    "@react-native/gradle-plugin": "0.75.4",
+    "@react-native/js-polyfills": "0.75.4",
+    "@react-native/normalize-colors": "0.75.4",
+    "@react-native/virtualized-lists": "0.75.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
+    "commander": "^9.4.1",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
     "glob": "^7.1.1",

package/scripts/bundle.js

@@ -31,6 +31,8 @@ program
     'npx react-native config',
   )
   .option('--load-config <string>', 'JSON project config')
+  .option('--verbose', 'Additional logs', () => true, false)
+  .allowUnknownOption()
   .action(async function handleAction() {
     let config = null;
     let options = program.opts();

package/scripts/cocoapods/autolinking.rb

@@ -73,6 +73,7 @@ def list_native_modules!(config_command)
     found_pods.push({
       "configurations": configurations,
       "name": name,
+      "root": package["root"],
       "path": relative_path.to_path,
       "podspec_path": podspec_path,
       "script_phases": script_phases
@@ -168,7 +169,7 @@ def link_native_modules!(config)
 
         # Support passing in a path relative to the root of the package
         if phase["path"]
-          phase["script"] = File.read(File.expand_path(phase["path"], package[:path]))
+          phase["script"] = File.read(File.expand_path(phase["path"], package[:root]))
           phase.delete("path")
         end
 

package/scripts/codegen/generate-artifacts-executor.js

@@ -225,7 +225,7 @@ function extractSupportedApplePlatforms(dependency, dependencyPath) {
   return supportedPlatformsMap;
 }
 
-function findExternalLibraries(pkgJson) {
+function findExternalLibraries(pkgJson, projectRoot) {
   const dependencies = {
     ...pkgJson.dependencies,
     ...pkgJson.devDependencies,
@@ -240,6 +240,7 @@ function findExternalLibraries(pkgJson) {
     try {
       const configFilePath = require.resolve(
         path.join(dependency, 'package.json'),
+        {paths: [projectRoot]},
       );
       const configFile = JSON.parse(fs.readFileSync(configFilePath));
       const codegenConfigFileDir = path.dirname(configFilePath);
@@ -533,7 +534,7 @@ function findCodegenEnabledLibraries(pkgJson, projectRoot) {
   } else {
     return [
       ...projectLibraries,
-      ...findExternalLibraries(pkgJson),
+      ...findExternalLibraries(pkgJson, projectRoot),
       ...findLibrariesFromReactNativeConfig(projectRoot),
     ];
   }

package/scripts/react-native-xcode.sh

@@ -92,6 +92,8 @@ fi
 
 [ -z "$CLI_PATH" ] && CLI_PATH="$REACT_NATIVE_DIR/scripts/bundle.js"
 
+[ -z "$BUNDLE_COMMAND" ] && BUNDLE_COMMAND="bundle"
+
 [ -z "$COMPOSE_SOURCEMAP_PATH" ] && COMPOSE_SOURCEMAP_PATH="$REACT_NATIVE_DIR/scripts/compose-source-maps.js"
 
 if [[ -z "$BUNDLE_CONFIG" ]]; then
@@ -141,7 +143,7 @@ fi
 if [[ -n "$CONFIG_JSON" ]]; then
   EXTRA_ARGS+=("--load-config" "$CONFIG_JSON")
 elif [[ -n "$CONFIG_CMD" ]]; then
-  EXTRA_ARGS+=("--config-cmd" "$CONFIG_APP")
+  EXTRA_ARGS+=("--config-cmd" "$CONFIG_CMD")
 else
   EXTRA_ARGS+=("--config-cmd" "$NODE_BINARY $NODE_ARGS $REACT_NATIVE_DIR/cli.js config")
 fi
@@ -149,7 +151,6 @@ fi
 # shellcheck disable=SC2086
 "$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
   $CONFIG_ARG \
-  --config-cmd "$CONFIG" \
   --entry-file "$ENTRY_FILE" \
   --platform "$BUNDLE_PLATFORM" \
   --dev $DEV \

package/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -12,9 +12,9 @@ set -e
 # Given a specific target, retrieve the right architecture for it
 # $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst, xros, xrsimulator
 function get_architecture {
-    if [[ $1 == "iphoneos" || $1 == "xros" || $1 == "xrsimulator" ]]; then
+    if [[ $1 == "iphoneos" || $1 == "xros" ]]; then
       echo "arm64"
-    elif [[ $1 == "iphonesimulator" ]]; then
+    elif [[ $1 == "iphonesimulator" || $1 == "xrsimulator" ]]; then
       echo "x86_64;arm64"
     elif [[ $1 == "catalyst" ]]; then
       echo "x86_64;arm64"

package/ReactAndroid/src/main/jni/react/devsupport/JOptional.cpp

@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-#include "JOptional.h"
-
-namespace facebook::react {
-
-int JOptionalInt::getAsInt() const {
-  static auto method = javaClassStatic()->getMethod<jint()>("getAsInt");
-  return method(self());
-}
-
-bool JOptionalInt::isPresent() const {
-  static auto method = javaClassStatic()->getMethod<jboolean()>("isPresent");
-  return method(self());
-}
-
-JOptionalInt::operator std::optional<int>() const {
-  if (!isPresent()) {
-    return {};
-  }
-  return getAsInt();
-}
-
-} // namespace facebook::react

package/ReactAndroid/src/main/jni/react/devsupport/JOptional.h

@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-
-#include <optional>
-
-// TODO(moti): Consider moving this into fbjni
-
-namespace facebook::react {
-
-class JOptionalInt : public facebook::jni::JavaClass<JOptionalInt> {
- public:
-  static auto constexpr kJavaDescriptor = "Ljava/util/OptionalInt;";
-
-  int getAsInt() const;
-  bool isPresent() const;
-  operator std::optional<int>() const;
-};
-
-} // namespace facebook::react