react-native 0.83.9 → 0.83.10

package/React/Tests/Mounting/RCTViewComponentViewTests.mm

@@ -0,0 +1,145 @@
+/*
+ * 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.
+ */
+
+#import <React/RCTViewComponentView.h>
+#import <XCTest/XCTest.h>
+#import <react/renderer/components/view/ViewProps.h>
+#import <react/renderer/components/view/ViewShadowNode.h>
+
+using namespace facebook::react;
+
+static Props::Shared makeViewProps(bool removeClippedSubviews)
+{
+  auto props = std::make_shared<ViewProps>();
+  props->removeClippedSubviews = removeClippedSubviews;
+  return props;
+}
+
+@interface RCTViewComponentViewTests : XCTestCase
+@end
+
+@implementation RCTViewComponentViewTests
+
+#pragma mark - removeClippedSubviews toggle
+
+- (void)testToggleRemoveClippedSubviewsOffRemountsClippedChildren
+{
+  RCTViewComponentView *parent = [RCTViewComponentView new];
+  UIView *child1 = [UIView new];
+  child1.frame = CGRectMake(0, 0, 50, 50);
+  UIView *child2 = [UIView new];
+  child2.frame = CGRectMake(0, 200, 50, 50);
+  UIView *child3 = [UIView new];
+  child3.frame = CGRectMake(0, 400, 50, 50);
+
+  // Mount children normally
+  [parent mountChildComponentView:(id)child1 index:0];
+  [parent mountChildComponentView:(id)child2 index:1];
+  [parent mountChildComponentView:(id)child3 index:2];
+
+  XCTAssertEqual(parent.subviews.count, 3u);
+
+  // Toggle removeClippedSubviews ON via props
+  auto propsOn = makeViewProps(true);
+  [parent updateProps:propsOn oldProps:ViewShadowNode::defaultSharedProps()];
+
+  // Simulate clipping: remove child2 and child3 from superview (as updateClippedSubviewsWithClipRect would)
+  [child2 removeFromSuperview];
+  [child3 removeFromSuperview];
+  XCTAssertEqual(parent.subviews.count, 1u);
+  XCTAssertNil(child2.superview);
+  XCTAssertNil(child3.superview);
+
+  // Toggle removeClippedSubviews OFF via props
+  auto propsOff = makeViewProps(false);
+  [parent updateProps:propsOff oldProps:propsOn];
+
+  // All children should be re-mounted
+  XCTAssertEqual(parent.subviews.count, 3u);
+  XCTAssertEqual(child1.superview, parent);
+  XCTAssertEqual(child2.superview, parent);
+  XCTAssertEqual(child3.superview, parent);
+}
+
+- (void)testToggleRemoveClippedSubviewsOffPreservesOrder
+{
+  RCTViewComponentView *parent = [RCTViewComponentView new];
+  UIView *child1 = [UIView new];
+  child1.frame = CGRectMake(0, 0, 50, 50);
+  UIView *child2 = [UIView new];
+  child2.frame = CGRectMake(0, 100, 50, 50);
+  UIView *child3 = [UIView new];
+  child3.frame = CGRectMake(0, 200, 50, 50);
+
+  [parent mountChildComponentView:(id)child1 index:0];
+  [parent mountChildComponentView:(id)child2 index:1];
+  [parent mountChildComponentView:(id)child3 index:2];
+
+  // Toggle ON and clip child1 (first child)
+  auto propsOn = makeViewProps(true);
+  [parent updateProps:propsOn oldProps:ViewShadowNode::defaultSharedProps()];
+  [child1 removeFromSuperview];
+  XCTAssertEqual(parent.subviews.count, 2u);
+
+  // Toggle OFF — all children re-mounted in correct order
+  auto propsOff = makeViewProps(false);
+  [parent updateProps:propsOff oldProps:propsOn];
+
+  XCTAssertEqual(parent.subviews.count, 3u);
+  XCTAssertEqual(parent.subviews[0], child1);
+  XCTAssertEqual(parent.subviews[1], child2);
+  XCTAssertEqual(parent.subviews[2], child3);
+}
+
+- (void)testToggleRemoveClippedSubviewsOffClearsReactSubviews
+{
+  RCTViewComponentView *parent = [RCTViewComponentView new];
+  UIView *child1 = [UIView new];
+  child1.frame = CGRectMake(0, 0, 50, 50);
+
+  [parent mountChildComponentView:(id)child1 index:0];
+
+  // Toggle ON
+  auto propsOn = makeViewProps(true);
+  [parent updateProps:propsOn oldProps:ViewShadowNode::defaultSharedProps()];
+
+  // Toggle OFF
+  auto propsOff = makeViewProps(false);
+  [parent updateProps:propsOff oldProps:propsOn];
+
+  // _reactSubviews should be cleared
+  NSMutableArray *reactSubviews = [parent valueForKey:@"_reactSubviews"];
+  XCTAssertEqual(reactSubviews.count, 0u);
+}
+
+- (void)testUnmountAfterToggleOffCleansUpReactSubviews
+{
+  RCTViewComponentView *parent = [RCTViewComponentView new];
+  UIView *child1 = [UIView new];
+  child1.frame = CGRectMake(0, 0, 50, 50);
+  UIView *child2 = [UIView new];
+  child2.frame = CGRectMake(0, 100, 50, 50);
+
+  // Toggle ON first, then mount children
+  auto propsOn = makeViewProps(true);
+  [parent updateProps:propsOn oldProps:ViewShadowNode::defaultSharedProps()];
+  [parent mountChildComponentView:(id)child1 index:0];
+  [parent mountChildComponentView:(id)child2 index:1];
+
+  // Toggle OFF — re-mounts children
+  auto propsOff = makeViewProps(false);
+  [parent updateProps:propsOff oldProps:propsOn];
+
+  XCTAssertEqual(parent.subviews.count, 2u);
+
+  // Unmount child2 — should succeed without assert failures
+  [parent unmountChildComponentView:(id)child2 index:1];
+  XCTAssertEqual(parent.subviews.count, 1u);
+  XCTAssertNil(child2.superview);
+}
+
+@end

package/React/Views/ScrollView/RCTScrollView.m

@@ -342,7 +342,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   if (@available(iOS 14.0, *)) {
     // On iOS when Prefer Cross-Fade Transitions is enabled, the keyboard position
     // & height is reported differently (0 instead of Y position value matching height of frame)
-    // Fixes similar issue we saw with https://github.com/facebook/react-native/pull/34503
+    // Fixes similar issue we saw with https://github.com/react/react-native/pull/34503
     if (UIAccessibilityPrefersCrossFadeTransitions() && endFrame.size.height == 0) {
       newContentOffset.y = 0;
       newEdgeInsets.bottom = 0;

package/React-Core.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/React.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactAndroid/build.gradle.kts

@@ -747,7 +747,7 @@ apply(from = "./publish.gradle")
 // We need to override the artifact ID as this project is called `ReactAndroid` but
 // the maven coordinates are on `react-android`.
 // Please note that the original coordinates, `react-native`, have been voided
-// as they caused https://github.com/facebook/react-native/issues/35210
+// as they caused https://github.com/react/react-native/issues/35210
 publishing {
   publications { getByName("release", MavenPublication::class) { artifactId = "react-android" } }
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.9
+VERSION_NAME=0.83.10
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/publish.gradle

@@ -37,7 +37,7 @@ publishing {
             pom {
                 name = "react-native"
                 description = "A framework for building native apps with React"
-                url = "https://github.com/facebook/react-native"
+                url = "https://github.com/react/react-native"
 
                 developers {
                     developer {
@@ -49,15 +49,15 @@ publishing {
                 licenses {
                     license {
                         name = "MIT License"
-                        url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
+                        url = "https://github.com/react/react-native/blob/HEAD/LICENSE"
                         distribution = "repo"
                     }
                 }
 
                 scm {
-                    url = "https://github.com/facebook/react-native.git"
-                    connection = "scm:git:https://github.com/facebook/react-native.git"
-                    developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                    url = "https://github.com/react/react-native.git"
+                    connection = "scm:git:https://github.com/react/react-native.git"
+                    developerConnection = "scm:git:git@github.com:react/react-native.git"
                 }
             }
         }

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

@@ -9,12 +9,18 @@ package com.facebook.react.devsupport
 
 import android.os.Handler
 import android.os.Looper
+import com.facebook.common.logging.FLog
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.proguard.annotations.DoNotStripAny
+import com.facebook.react.common.annotations.VisibleForTesting
 import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.soloader.SoLoader
 import java.io.Closeable
+import java.nio.ByteBuffer
+import java.nio.charset.StandardCharsets
+import java.util.ArrayDeque
+import java.util.Queue
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -66,7 +72,7 @@ internal class CxxInspectorPackagerConnection(
    */
   @DoNotStripAny
   private interface IWebSocket : Closeable {
-    fun send(message: String)
+    fun send(chunk: ByteBuffer)
 
     /**
      * Close the WebSocket connection. NOTE: There is no close() method in the C++ interface.
@@ -75,6 +81,95 @@ internal class CxxInspectorPackagerConnection(
     override fun close()
   }
 
+  /**
+   * A simple WebSocket wrapper that prevents having more than 16MiB of messages queued
+   * simultaneously. This is done to stop OkHttp from closing the WebSocket connection.
+   *
+   * https://github.com/react/react-native/issues/39651.
+   * https://github.com/square/okhttp/blob/4e7dbec1ea6c9cf8d80422ac9d44b9b185c749a3/okhttp/src/commonJvmAndroid/kotlin/okhttp3/internal/ws/RealWebSocket.kt#L684.
+   */
+  private class InspectorPackagerWebSocketImpl(
+      private val nativeWebSocket: WebSocket,
+      private val handler: Handler,
+  ) : IWebSocket {
+    private val messageQueue: Queue<Pair<String, Int>> = ArrayDeque()
+    private val queueLock = Any()
+    private val drainRunnable =
+        object : Runnable {
+          override fun run() {
+            FLog.d(TAG, "Attempting to drain the message queue after ${drainDelayMs}ms")
+            tryDrainQueue()
+          }
+        }
+
+    /**
+     * We are providing a String to OkHttp's WebSocket, because there is no guarantee that all CDP
+     * clients will support binary data format.
+     */
+    override fun send(chunk: ByteBuffer) {
+      synchronized(queueLock) {
+        val messageSize = chunk.capacity()
+        val message = StandardCharsets.UTF_8.decode(chunk).toString()
+        val currentQueueSize = nativeWebSocket.queueSize()
+
+        if (currentQueueSize + messageSize > MAX_QUEUE_SIZE) {
+          FLog.d(TAG, "Reached queue size limit. Queueing the message.")
+          messageQueue.offer(Pair(message, messageSize))
+          scheduleDrain()
+        } else {
+          if (messageQueue.isEmpty()) {
+            nativeWebSocket.send(message)
+          } else {
+            messageQueue.offer(Pair(message, messageSize))
+            tryDrainQueue()
+          }
+        }
+      }
+    }
+
+    override fun close() {
+      synchronized(queueLock) {
+        handler.removeCallbacks(drainRunnable)
+        messageQueue.clear()
+        nativeWebSocket.close(1000, "End of session")
+      }
+    }
+
+    private fun tryDrainQueue() {
+      synchronized(queueLock) {
+        while (messageQueue.isNotEmpty()) {
+          val (nextMessage, nextMessageSize) = messageQueue.peek() ?: break
+          val currentQueueSize = nativeWebSocket.queueSize()
+
+          if (currentQueueSize + nextMessageSize <= MAX_QUEUE_SIZE) {
+            messageQueue.poll()
+            if (!nativeWebSocket.send(nextMessage)) {
+              // The WebSocket is closing, closed, or cancelled.
+              handler.removeCallbacks(drainRunnable)
+              messageQueue.clear()
+
+              break
+            }
+          } else {
+            scheduleDrain()
+            break
+          }
+        }
+      }
+    }
+
+    private fun scheduleDrain() {
+      FLog.d(TAG, "Scheduled a task to drain messages queue.")
+      handler.removeCallbacks(drainRunnable)
+      handler.postDelayed(drainRunnable, drainDelayMs)
+    }
+
+    companion object {
+      private val TAG: String = InspectorPackagerWebSocketImpl::class.java.simpleName
+      private const val drainDelayMs: Long = 100
+    }
+  }
+
   /** Java implementation of the C++ InspectorPackagerConnectionDelegate interface. */
   private class DelegateImpl {
     private val httpClient = DevSupportHttpClient.websocketClient
@@ -124,15 +219,8 @@ internal class CxxInspectorPackagerConnection(
                 }
               },
           )
-      return object : IWebSocket {
-        override fun send(message: String) {
-          webSocket.send(message)
-        }
 
-        override fun close() {
-          webSocket.close(1000, "End of session")
-        }
-      }
+      return InspectorPackagerWebSocketImpl(webSocket, handler)
     }
 
     @DoNotStrip
@@ -146,6 +234,8 @@ internal class CxxInspectorPackagerConnection(
       SoLoader.loadLibrary("react_devsupportjni")
     }
 
+    @VisibleForTesting internal const val MAX_QUEUE_SIZE = 16L * 1024 * 1024 // 16MiB
+
     @JvmStatic
     private external fun initHybrid(
         url: String,

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt

@@ -55,7 +55,7 @@ internal object InspectorNetworkHelper {
               response.body().use { responseBody ->
                 if (responseBody != null) {
                   val inputStream = responseBody.byteStream()
-                  val chunkSize = 1024
+                  val chunkSize = 8 * 1024 // 8Kb
                   val buffer = ByteArray(chunkSize)
                   var bytesRead: Int
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -1190,8 +1190,8 @@ public class SurfaceMountingManager {
       // If the view that went offscreen is still being touched, we can't delete it yet.
       // We have to delay the deletion till the touch is completed.
       // This is causing bugs like those otherwise:
-      // - https://github.com/facebook/react-native/issues/44610
-      // - https://github.com/facebook/react-native/issues/45126
+      // - https://github.com/react/react-native/issues/44610
+      // - https://github.com/react/react-native/issues/45126
       mViewsToDeleteAfterTouchFinishes.add(reactTag);
     } else {
       // To delete we simply remove the tag from the registry.

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt

@@ -326,7 +326,7 @@ public open class JavaTimerManager(
 
       // If the JS thread is busy for multiple frames we cancel any other pending runnable.
       // We also capture the idleCallbackRunnable to tentatively fix:
-      // https://github.com/facebook/react-native/issues/44842
+      // https://github.com/react/react-native/issues/44842
       currentIdleCallbackRunnable?.cancel()
       currentIdleCallbackRunnable = IdleCallbackRunnable(frameTimeNanos)
       reactApplicationContext.runOnJSQueueThread(currentIdleCallbackRunnable)

package/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.kt

@@ -223,7 +223,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
             }
             ReadableType.Number -> {
               // We cannot know from JS if is an Integer or Double
-              // See: https://github.com/facebook/react-native/issues/4141
+              // See: https://github.com/react/react-native/issues/4141
               // We might need to find a workaround if this is really an issue
               val number = map.getDouble(EXTRA_MAP_KEY_FOR_VALUE)
               intent.putExtra(name, number)

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -165,7 +165,7 @@ public class NetworkingModule(
 
   @Deprecated(
       """To be removed in a future release. See
-        https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914"""
+        https://github.com/react/react-native/pull/37798#pullrequestreview-1518338914"""
   )
   public interface CustomClientBuilder : com.facebook.react.modules.network.CustomClientBuilder
 
@@ -479,7 +479,7 @@ public class NetworkingModule(
         } else {
           // Use getBytes() to convert the body into a byte[], preventing okhttp from
           // appending the character set to the Content-Type header when otherwise unspecified
-          // https://github.com/facebook/react-native/issues/8237
+          // https://github.com/react/react-native/issues/8237
           val charset =
               if (contentMediaType == null) {
                 StandardCharsets.UTF_8
@@ -636,7 +636,7 @@ public class NetworkingModule(
                     reactApplicationContext,
                     requestId,
                     devToolsRequestId,
-                    url,
+                    response.request().url().toString(),
                     response.code(),
                     NetworkEventUtil.okHttpHeadersToMap(response.headers()),
                     response.body()?.contentLength() ?: 0L,

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

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 83,
-    "patch" to 9,
+    "patch" to 10,
     "prerelease" to null
   )
 }

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

@@ -563,7 +563,7 @@ internal class ReactInstance(
             // We need to null check here because some Java implementation of the
             // `ViewManagerOnDemandReactPackage` interface could still return null even
             // if the method is marked as returning a non-nullable collection in Kotlin.
-            // See https://github.com/facebook/react-native/issues/52014
+            // See https://github.com/react/react-native/issues/52014
             @Suppress("SENSELESS_COMPARISON")
             if (names == null) {
               RNLog.w(

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -631,7 +631,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       // The native Android implementation removed the screen density from the
       // calculation, so squaring and a normalization value of
       // sqrt(5) produces an exact replica with iOS.
-      // For more information, see https://github.com/facebook/react-native/pull/18302
+      // For more information, see https://github.com/react/react-native/pull/18302
       float normalizedCameraDistance =
           sanitizeFloatPropertyValue(
               scale * scale * cameraDistance * CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt

@@ -425,7 +425,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     // be on the wrong side. Thus we are moving it to the other side, when the list
     // is inverted.
     // See also:
-    //  - https://github.com/facebook/react-native/issues/35350
+    //  - https://github.com/react/react-native/issues/35350
     //  - https://issuetracker.google.com/issues/287304310
     if (applyFix) {
       view.verticalScrollbarPosition = View.SCROLLBAR_POSITION_LEFT

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

@@ -380,7 +380,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
       mContainsImages = update.containsImages();
       // Android's TextView crashes when it tries to relayout if LayoutParams are
       // null; explicitly set the LayoutParams to prevent this crash. See:
-      // https://github.com/facebook/react-native/pull/7011
+      // https://github.com/react/react-native/pull/7011
       if (getLayoutParams() == null) {
         setLayoutParams(EMPTY_LAYOUT_PARAMS);
       }

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

@@ -746,7 +746,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   /**
    * Remove spans from the SpannableStringBuilder which can be represented by TextAppearance
    * attributes on the underlying EditText. This works around instability on Samsung devices with
-   * the presence of spans https://github.com/facebook/react-native/issues/35936 (S318090)
+   * the presence of spans https://github.com/react/react-native/issues/35936 (S318090)
    */
   private fun stripStyleEquivalentSpans(sb: SpannableStringBuilder) {
     stripSpansOfKind(sb, ReactAbsoluteSizeSpan::class.java) { span: ReactAbsoluteSizeSpan ->
@@ -987,7 +987,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     val selectionEnd = selectionEnd
 
     // Used to ensure that text is selectable inside of removeClippedSubviews
-    // See https://github.com/facebook/react-native/issues/6805 for original
+    // See https://github.com/react/react-native/issues/6805 for original
     // fix that was ported to here.
     super.setTextIsSelectable(true)
 

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

@@ -414,7 +414,7 @@ public open class ReactTextInputManager public constructor() :
       return
     }
 
-    // Based on https://github.com/facebook/react-native/pull/31007
+    // Based on https://github.com/react/react-native/pull/31007
     if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
       return
     }
@@ -770,7 +770,7 @@ public open class ReactTextInputManager public constructor() :
       // crash happens when focusing on a email EditText, during which a prompt will be triggered
       // but
       // the system fail to locate it properly. Here is an example post discussing about this
-      // issue: https://github.com/facebook/react-native/issues/27204
+      // issue: https://github.com/react/react-native/issues/27204
       if (shouldHideCursorForEmailTextInput()) {
         view.isCursorVisible = false
       }

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

@@ -30,7 +30,7 @@ internal class ReactTextSelectionWatcher(private val editText: ReactEditText) :
     // forward it on if we have new values
 
     // Apparently Android might call this with an end value that is less than the start value
-    // Lets normalize them. See https://github.com/facebook/react-native/issues/18579
+    // Lets normalize them. See https://github.com/react/react-native/issues/18579
     val realStart = min(start.toDouble(), end.toDouble()).toInt()
     val realEnd = max(start.toDouble(), end.toDouble()).toInt()
 

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

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <fbjni/ByteBuffer.h>
+
 #include "JCxxInspectorPackagerConnectionWebSocket.h"
 
 using namespace facebook::jni;
@@ -12,10 +14,35 @@ using namespace facebook::react::jsinspector_modern;
 
 namespace facebook::react::jsinspector_modern {
 
+namespace {
+
+local_ref<JByteBuffer::javaobject> getReadOnlyByteBufferFromStringView(
+    std::string_view sv) {
+  auto buffer = JByteBuffer::wrapBytes(
+      const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(sv.data())),
+      sv.size());
+
+  /**
+   * Return a read-only buffer that shares the underlying contents.
+   * This guards from accidential mutations on the Java side, since we did
+   * casting above.
+   *
+   * https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html#asReadOnlyBuffer--
+   */
+  static auto method =
+      buffer->javaClassStatic()->getMethod<JByteBuffer::javaobject()>(
+          "asReadOnlyBuffer");
+  return method(buffer);
+}
+
+} // namespace
+
 void JCxxInspectorPackagerConnectionWebSocket::send(std::string_view message) {
   static auto method =
-      javaClassStatic()->getMethod<void(const std::string&)>("send");
-  method(self(), std::string(message));
+      javaClassStatic()->getMethod<void(local_ref<JByteBuffer::javaobject>)>(
+          "send");
+  auto byteBuffer = getReadOnlyByteBufferFromStringView(message);
+  method(self(), byteBuffer);
 }
 
 void JCxxInspectorPackagerConnectionWebSocket::close() {

package/ReactApple/Libraries/RCTFoundation/RCTDeprecation/RCTDeprecation.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.author                 = "Meta Platforms, Inc. and its affiliates"
     s.license                = package["license"]
     s.homepage               = "https://reactnative.dev/"
-    s.source                 = { :git => 'https://github.com/facebook/react-native.git', :tag => 'v#{version}' }
+    s.source                 = { :git => 'https://github.com/react/react-native.git', :tag => 'v#{version}' }
     s.summary                = "Macros for marking APIs as deprecated"
     s.source_files           = podspec_sources(["Exported/*.h", "RCTDeprecation.m"], "Exported/*.h")
     s.pod_target_xcconfig    = {

package/ReactApple/RCTSwiftUI/RCTSwiftUI.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIWrapper.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/React-Fabric.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/React-FabricComponents.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/React-FabricImage.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")