react-native-tvos 0.83.9-0 → 0.83.10-1

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -775,12 +775,23 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 
 - (void)_setAttributedString:(NSAttributedString *)attributedString
 {
+#if TARGET_OS_TV
+  // Attribute-free string prevents the tvOS keyboard from inheriting the component's small font.
+  if ([attributedString.string isEqualToString:_backedTextInputView.attributedText.string]) {
+    return;
+  }
+#else
   if ([self _textOf:attributedString equals:_backedTextInputView.attributedText]) {
     return;
   }
+#endif
   UITextRange *selectedRange = _backedTextInputView.selectedTextRange;
   NSInteger oldTextLength = _backedTextInputView.attributedText.string.length;
+#if TARGET_OS_TV
+  _backedTextInputView.attributedText = [[NSAttributedString alloc] initWithString:attributedString.string];
+#else
   _backedTextInputView.attributedText = attributedString;
+#endif
   // Updating the UITextView attributedText, for example changing the lineHeight, the color or adding
   // a new paragraph with \n, causes the cursor to move to the end of the Text and scroll.
   // This is fixed by restoring the cursor position and scrolling to that position (iOS issue 652653).
@@ -805,7 +816,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
 // Ensure that newly typed text will inherit any custom attributes. We follow the logic of RN Android, where attributes
 // to the left of the cursor are copied into new text, unless we are at the start of the field, in which case we will
 // copy the attributes from text to the right. This allows consistency between backed input and new AttributedText
-// https://github.com/facebook/react-native/blob/3102a58df38d96f3dacef0530e4dbb399037fcd2/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt#L30
+// https://github.com/react/react-native/blob/3102a58df38d96f3dacef0530e4dbb399037fcd2/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt#L30
 - (void)_updateTypingAttributes
 {
   if (_backedTextInputView.attributedText.length > 0 && _backedTextInputView.selectedTextRange != nil) {

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -697,11 +697,18 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
     [_reactSubviews removeObjectAtIndex:index];
   } else {
     RCTAssert(
-        childComponentView.superview == self.currentContainerView,
-        @"Attempt to unmount a view which is mounted inside different view. (parent: %@, child: %@, index: %@)",
+        childComponentView.superview != nil,
+        @"Attempt to unmount a view which is not mounted. (parent: %@, child: %@, index: %@)",
         self,
         childComponentView,
         @(index));
+    RCTAssert(
+        childComponentView.superview == self.currentContainerView,
+        @"Attempt to unmount a view which is mounted inside a different view. (parent: %@, child: %@, index: %@, existing parent: %@)",
+        self,
+        childComponentView,
+        @(index),
+        @([childComponentView.superview tag]));
     RCTAssert(
         (self.currentContainerView.subviews.count > index) &&
             [self.currentContainerView.subviews objectAtIndex:index] == childComponentView,
@@ -716,6 +723,30 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   [childComponentView removeFromSuperview];
 }
 
+- (void)_updateRemoveClippedSubviewsState
+{
+  if (_removeClippedSubviews) {
+    // Toggled ON: populate _reactSubviews from the current view hierarchy.
+    // Actual clipping will happen on the next scroll event.
+    RCTAssert(
+        _reactSubviews.count == 0,
+        @"_reactSubviews should be empty when toggling removeClippedSubviews on. (view: %@, count: %@)",
+        self,
+        @(_reactSubviews.count));
+    if (self.currentContainerView.subviews.count > 0) {
+      _reactSubviews = [NSMutableArray arrayWithArray:self.currentContainerView.subviews];
+    }
+  } else {
+    // Toggled OFF: re-mount all children in the correct order, then clear the tracking array.
+    // addSubview: on an already-present child moves it to the front, so iterating in order
+    // produces the correct subview ordering.
+    for (UIView *view in _reactSubviews) {
+      [self.currentContainerView addSubview:view];
+    }
+    [_reactSubviews removeAllObjects];
+  }
+}
+
 - (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView
 {
   if (!_removeClippedSubviews) {
@@ -781,9 +812,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   if (!ReactNativeFeatureFlags::enableViewCulling()) {
     if (oldViewProps.removeClippedSubviews != newViewProps.removeClippedSubviews) {
       _removeClippedSubviews = newViewProps.removeClippedSubviews;
-      if (_removeClippedSubviews && self.currentContainerView.subviews.count > 0) {
-        _reactSubviews = [NSMutableArray arrayWithArray:self.currentContainerView.subviews];
-      }
+      [self _updateRemoveClippedSubviewsState];
     }
   }
 

package/React/React-RCTFBReactNativeSpec.podspec

@@ -11,7 +11,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/React-RCTFabric.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/Runtime/React-RCTRuntime.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/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

@@ -366,7 +366,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

@@ -749,7 +749,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-0
+VERSION_NAME=0.83.10-1
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/hermes-engine/build.gradle.kts

@@ -392,3 +392,9 @@ tasks.withType<JavaCompile>().configureEach {
   options.compilerArgs.add("-Xlint:deprecation,unchecked")
   options.compilerArgs.add("-Werror")
 }
+
+/* Publishing Configuration */
+// Reuses the publish.gradle template applied to ReactAndroid; the file is
+// generated by the build-android-artifacts EAS workflow. Resulting artifact
+// coordinate: io.github.react-native-tvos:hermes-engine:<version>.
+apply(from = "../publish.gradle")

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/AndroidManifest.xml

@@ -8,7 +8,7 @@
    up from the file to lint until it find an AndroidManifest with a minSdkVersion. This is then used
    as the min SDK to lint the file.-->
   <uses-sdk
-      android:minSdkVersion="24"
+      android:minSdkVersion="22"
       android:targetSdkVersion="36"
       />
 

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

@@ -49,5 +49,5 @@ public class DebugCorePackage public constructor() :
       reactContext: ReactApplicationContext,
       viewManagerName: String,
   ): ViewManager<*, *>? =
-      viewManagersMap.getOrDefault(viewManagerName, null)?.provider?.get() as? ViewManager<*, *>
+      viewManagersMap[viewManagerName]?.provider?.get() as? ViewManager<*, *>
 }

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

@@ -252,7 +252,11 @@ public class ReactActivityDelegate {
   public void requestPermissions(
       String[] permissions, int requestCode, @Nullable PermissionListener listener) {
     mPermissionListener = listener;
-    getPlainActivity().requestPermissions(permissions, requestCode);
+    // Runtime permissions were introduced in API 23 (M). On older platforms permissions are
+    // granted at install time, so there is nothing to request.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      getPlainActivity().requestPermissions(permissions, requestCode);
+    }
   }
 
   public void onRequestPermissionsResult(

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

@@ -9,7 +9,9 @@ package com.facebook.react
 
 import android.app.Activity
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.os.Process
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
@@ -160,7 +162,11 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity {
       activity?.checkPermission(permission, pid, uid) ?: 0
 
   override fun checkSelfPermission(permission: String): Int =
-      activity?.checkSelfPermission(permission) ?: 0
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        activity?.checkSelfPermission(permission) ?: 0
+      } else {
+        activity?.checkPermission(permission, Process.myPid(), Process.myUid()) ?: 0
+      }
 
   @Suppress("DEPRECATION")
   override fun requestPermissions(
@@ -169,7 +175,10 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity {
       listener: PermissionListener?,
   ) {
     permissionListener = listener
-    requestPermissions(permissions, requestCode)
+    // Runtime permissions were introduced in API 23 (M); on older platforms they are install-time.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      requestPermissions(permissions, requestCode)
+    }
   }
 
   /** Builder class to help instantiate a ReactFragment. */

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.bridge.queue
 
+import android.os.Build
 import android.os.Looper
 import android.os.Process
 import com.facebook.common.logging.FLog
@@ -104,7 +105,10 @@ private constructor(
     }
   }
 
-  public override fun isIdle(): Boolean = looper.queue.isIdle
+  public override fun isIdle(): Boolean =
+      // Looper.getQueue()/MessageQueue.isIdle() require API 23 (M); there is no pre-M way to
+      // introspect another thread's queue, so report idle to avoid blocking instrumentation.
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) looper.queue.isIdle else true
 
   public companion object {
     @JvmStatic

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

@@ -200,7 +200,8 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
                   // The http status code for each separate chunk is in the X-Http-Status header.
                   var status = response.code()
                   if (headers.containsKey("X-Http-Status")) {
-                    status = headers.getOrDefault("X-Http-Status", "0").toInt()
+                    // Map.getOrDefault requires API 24; use Kotlin get-with-default (API 1).
+                    status = (headers["X-Http-Status"] ?: "0").toInt()
                   }
                   processBundleResult(
                       url,

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/DebugOverlayController.kt

@@ -11,6 +11,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.PixelFormat
 import android.net.Uri
+import android.os.Build
 import android.provider.Settings
 import android.view.WindowManager
 import android.widget.FrameLayout
@@ -60,6 +61,11 @@ internal class DebugOverlayController(private val reactContext: ReactContext) {
     @JvmStatic
     fun requestPermission(context: Context) {
       // Get permission to show debug overlay in dev builds.
+      // Settings.canDrawOverlays / ACTION_MANAGE_OVERLAY_PERMISSION were introduced in API 23 (M);
+      // on older platforms the overlay permission is granted at install time.
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        return
+      }
       if (!Settings.canDrawOverlays(context)) {
         val intent =
             Intent(
@@ -79,8 +85,8 @@ internal class DebugOverlayController(private val reactContext: ReactContext) {
 
     private fun permissionCheck(context: Context): Boolean {
       // Get permission to show debug overlay in dev builds.
-      // overlay permission not yet granted
-      return Settings.canDrawOverlays(context)
+      // overlay permission not yet granted (always granted at install time before API 23 (M))
+      return Build.VERSION.SDK_INT < Build.VERSION_CODES.M || Settings.canDrawOverlays(context)
     }
 
     private fun canHandleIntent(context: Context, intent: Intent): Boolean {

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

@@ -155,7 +155,8 @@ internal class MultipartStreamReader(
     val currentTime = System.currentTimeMillis()
     if (currentTime - lastProgressEvent > 16 || isFinal) {
       lastProgressEvent = currentTime
-      val headersContentLength = headers.getOrDefault("Content-Length", "0").toLong()
+      // Map.getOrDefault requires API 24; use Kotlin's get-with-default (API 1) instead.
+      val headersContentLength = (headers["Content-Length"] ?: "0").toLong()
       listener.onChunkProgress(headers, contentLength, headersContentLength)
     }
   }