react-native 0.84.0-nightly-20251204-5bb3a6d68 → 0.84.0-nightly-20251205-95cc1e767

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 84;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20251204-5bb3a6d68';
+  static prerelease: string | null = 'nightly-20251205-95cc1e767';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(84),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20251204-5bb3a6d68",
+                  RCTVersionPrerelease: @"nightly-20251205-95cc1e767",
                   };
   });
   return __rnVersion;

package/React/FBReactNativeSpec/FBReactNativeSpecJSI.h

@@ -281,6 +281,7 @@ protected:
     methodMap_["enableVirtualViewWindowFocusDetection"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewWindowFocusDetection};
     methodMap_["enableWebPerformanceAPIsByDefault"] = MethodMetadata {.argCount = 0, .invoker = __enableWebPerformanceAPIsByDefault};
     methodMap_["fixMappingOfEventPrioritiesBetweenFabricAndReact"] = MethodMetadata {.argCount = 0, .invoker = __fixMappingOfEventPrioritiesBetweenFabricAndReact};
+    methodMap_["fixTextClippingAndroid15useBoundsForWidth"] = MethodMetadata {.argCount = 0, .invoker = __fixTextClippingAndroid15useBoundsForWidth};
     methodMap_["fuseboxAssertSingleHostState"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxAssertSingleHostState};
     methodMap_["fuseboxEnabledRelease"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxEnabledRelease};
     methodMap_["fuseboxNetworkInspectionEnabled"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxNetworkInspectionEnabled};
@@ -722,6 +723,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::fixMappingOfEventPrioritiesBetweenFabricAndReact,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __fixTextClippingAndroid15useBoundsForWidth(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::fixTextClippingAndroid15useBoundsForWidth) == 1,
+      "Expected fixTextClippingAndroid15useBoundsForWidth(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::fixTextClippingAndroid15useBoundsForWidth,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __fuseboxAssertSingleHostState(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::fuseboxAssertSingleHostState) == 1,

package/React/Fabric/RCTSurfaceTouchHandler.mm

@@ -399,7 +399,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
     shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
   BOOL canBePrevented = [self canBePreventedByGestureRecognizer:otherGestureRecognizer];
-  if (canBePrevented) {
+  if (canBePrevented && otherGestureRecognizer.cancelsTouchesInView) {
     [self _cancelTouches];
   }
   return NO;

package/ReactAndroid/api/ReactAndroid.api

@@ -3842,7 +3842,6 @@ public abstract interface class com/facebook/react/uimanager/ReactShadowNode {
 	public abstract fun getLayoutX ()F
 	public abstract fun getLayoutY ()F
 	public abstract fun getNativeChildCount ()I
-	public abstract fun getNativeKind ()Lcom/facebook/react/uimanager/NativeKind;
 	public abstract fun getNativeOffsetForChild (Lcom/facebook/react/uimanager/ReactShadowNode;)I
 	public abstract fun getNativeParent ()Lcom/facebook/react/uimanager/ReactShadowNode;
 	public abstract fun getPadding (I)F
@@ -3971,7 +3970,6 @@ public class com/facebook/react/uimanager/ReactShadowNodeImpl : com/facebook/rea
 	public final fun getLayoutX ()F
 	public final fun getLayoutY ()F
 	public final fun getNativeChildCount ()I
-	public fun getNativeKind ()Lcom/facebook/react/uimanager/NativeKind;
 	public synthetic fun getNativeOffsetForChild (Lcom/facebook/react/uimanager/ReactShadowNode;)I
 	public final fun getNativeOffsetForChild (Lcom/facebook/react/uimanager/ReactShadowNodeImpl;)I
 	public synthetic fun getNativeParent ()Lcom/facebook/react/uimanager/ReactShadowNode;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.84.0-nightly-20251204-5bb3a6d68
+VERSION_NAME=0.84.0-nightly-20251205-95cc1e767
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -7,25 +7,36 @@
 
 package com.facebook.react.devsupport.inspector
 
+import android.graphics.Bitmap
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.Process
+import android.util.Base64
 import android.view.FrameMetrics
+import android.view.PixelCopy
 import android.view.Window
 import com.facebook.proguard.annotations.DoNotStripAny
+import java.io.ByteArrayOutputStream
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @DoNotStripAny
 internal class FrameTimingsObserver(
     private val window: Window,
-    onFrameTimingSequence: (sequence: FrameTimingSequence) -> Unit,
+    private val screenshotsEnabled: Boolean,
+    private val onFrameTimingSequence: (sequence: FrameTimingSequence) -> Unit,
 ) {
   private val handler = Handler(Looper.getMainLooper())
   private var frameCounter: Int = 0
+  private var bitmapBuffer: Bitmap? = null
 
   private val frameMetricsListener =
       Window.OnFrameMetricsAvailableListener { _, frameMetrics, _dropCount ->
-        val beginDrawingTimestamp = frameMetrics.getMetric(FrameMetrics.INTENDED_VSYNC_TIMESTAMP)
+        val beginDrawingTimestamp = frameMetrics.getMetric(FrameMetrics.VSYNC_TIMESTAMP)
         val commitTimestamp =
             beginDrawingTimestamp + frameMetrics.getMetric(FrameMetrics.INPUT_HANDLING_DURATION)
         +frameMetrics.getMetric(FrameMetrics.ANIMATION_DURATION)
@@ -35,17 +46,77 @@ internal class FrameTimingsObserver(
         val endDrawingTimestamp =
             beginDrawingTimestamp + frameMetrics.getMetric(FrameMetrics.TOTAL_DURATION)
 
-        onFrameTimingSequence(
-            FrameTimingSequence(
-                frameCounter++,
-                Process.myTid(),
-                beginDrawingTimestamp,
-                commitTimestamp,
-                endDrawingTimestamp,
-            )
-        )
+        val frameId = frameCounter++
+        val threadId = Process.myTid()
+
+        CoroutineScope(Dispatchers.Default).launch {
+          val screenshot = if (screenshotsEnabled) captureScreenshot() else null
+
+          onFrameTimingSequence(
+              FrameTimingSequence(
+                  frameId,
+                  threadId,
+                  beginDrawingTimestamp,
+                  commitTimestamp,
+                  endDrawingTimestamp,
+                  screenshot,
+              )
+          )
+        }
       }
 
+  private suspend fun captureScreenshot(): String? = suspendCoroutine { continuation ->
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      continuation.resume(null)
+      return@suspendCoroutine
+    }
+
+    val decorView = window.decorView
+    val width = decorView.width
+    val height = decorView.height
+
+    // Reuse bitmap if dimensions haven't changed
+    val bitmap =
+        bitmapBuffer?.let {
+          if (it.width == width && it.height == height) {
+            it
+          } else {
+            null
+          }
+        } ?: Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).also { bitmapBuffer = it }
+
+    PixelCopy.request(
+        window,
+        bitmap,
+        { copyResult ->
+          if (copyResult == PixelCopy.SUCCESS) {
+            CoroutineScope(Dispatchers.Default).launch {
+              try {
+                val scaleFactor = 0.5f
+                val scaledWidth = (width * scaleFactor).toInt()
+                val scaledHeight = (height * scaleFactor).toInt()
+                val scaledBitmap =
+                    Bitmap.createScaledBitmap(bitmap, scaledWidth, scaledHeight, true)
+
+                val outputStream = ByteArrayOutputStream()
+                scaledBitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream)
+                val jpegBytes = outputStream.toByteArray()
+                val jpegBase64 = Base64.encodeToString(jpegBytes, Base64.NO_WRAP)
+                continuation.resume(jpegBase64)
+
+                scaledBitmap.recycle()
+              } catch (e: Exception) {
+                continuation.resume(null)
+              }
+            }
+          } else {
+            continuation.resume(null)
+          }
+        },
+        handler,
+    )
+  }
+
   fun start() {
     frameCounter = 0
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
@@ -62,5 +133,8 @@ internal class FrameTimingsObserver(
 
     window.removeOnFrameMetricsAvailableListener(frameMetricsListener)
     handler.removeCallbacksAndMessages(null)
+
+    bitmapBuffer?.recycle()
+    bitmapBuffer = null
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<5685f79f9b08afe94f5b3e8ec8ff6748>>
+ * @generated SignedSource<<adc6b24ae04487d2b82a2bac35f027a7>>
  */
 
 /**
@@ -372,6 +372,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean = accessor.fixMappingOfEventPrioritiesBetweenFabricAndReact()
 
+  /**
+   * Fix text clipping starting in Android 15 due to usage of useBoundsForWidth
+   */
+  @JvmStatic
+  public fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = accessor.fixTextClippingAndroid15useBoundsForWidth()
+
   /**
    * Enable system assertion validating that Fusebox is configured with a single host. When set, the CDP backend will dynamically disable features (Perf and Network) in the event that multiple hosts are registered (undefined behaviour), and broadcast this over `ReactNativeApplication.systemStateChanged`.
    */

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6645323047d21e58469de0d385954eab>>
+ * @generated SignedSource<<3ebb3c265193b4f61e5bf43082c5be54>>
  */
 
 /**
@@ -77,6 +77,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var enableVirtualViewWindowFocusDetectionCache: Boolean? = null
   private var enableWebPerformanceAPIsByDefaultCache: Boolean? = null
   private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
+  private var fixTextClippingAndroid15useBoundsForWidthCache: Boolean? = null
   private var fuseboxAssertSingleHostStateCache: Boolean? = null
   private var fuseboxEnabledReleaseCache: Boolean? = null
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
@@ -623,6 +624,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean {
+    var cached = fixTextClippingAndroid15useBoundsForWidthCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.fixTextClippingAndroid15useBoundsForWidth()
+      fixTextClippingAndroid15useBoundsForWidthCache = cached
+    }
+    return cached
+  }
+
   override fun fuseboxAssertSingleHostState(): Boolean {
     var cached = fuseboxAssertSingleHostStateCache
     if (cached == null) {

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<3da42d9ffdbba52e9e1d11a4e4dac8c4>>
+ * @generated SignedSource<<eb11cf643c4e94eddc5d7985a8a7a03a>>
  */
 
 /**
@@ -142,6 +142,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
+
   @DoNotStrip @JvmStatic public external fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip @JvmStatic public external fun fuseboxEnabledRelease(): Boolean

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<46e1f708d91d5ec45c866b8192192e72>>
+ * @generated SignedSource<<58cb08dbd188ec64d3738f548567bcde>>
  */
 
 /**
@@ -137,6 +137,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean = false
 
+  override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = false
+
   override fun fuseboxAssertSingleHostState(): Boolean = true
 
   override fun fuseboxEnabledRelease(): Boolean = false

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c19ea5e9ad6435b1f8587287cacf020b>>
+ * @generated SignedSource<<f9ee0d1f23024b026d065ffc3d48cfcf>>
  */
 
 /**
@@ -81,6 +81,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var enableVirtualViewWindowFocusDetectionCache: Boolean? = null
   private var enableWebPerformanceAPIsByDefaultCache: Boolean? = null
   private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
+  private var fixTextClippingAndroid15useBoundsForWidthCache: Boolean? = null
   private var fuseboxAssertSingleHostStateCache: Boolean? = null
   private var fuseboxEnabledReleaseCache: Boolean? = null
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
@@ -684,6 +685,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean {
+    var cached = fixTextClippingAndroid15useBoundsForWidthCache
+    if (cached == null) {
+      cached = currentProvider.fixTextClippingAndroid15useBoundsForWidth()
+      accessedFeatureFlags.add("fixTextClippingAndroid15useBoundsForWidth")
+      fixTextClippingAndroid15useBoundsForWidthCache = cached
+    }
+    return cached
+  }
+
   override fun fuseboxAssertSingleHostState(): Boolean {
     var cached = fuseboxAssertSingleHostStateCache
     if (cached == null) {

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<17400be6ee20befd9eafb094455dfb63>>
+ * @generated SignedSource<<09cef8cedd515f477a32c2ed77d86fc4>>
  */
 
 /**
@@ -137,6 +137,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
 
+  @DoNotStrip public fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
+
   @DoNotStrip public fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip public fun fuseboxEnabledRelease(): Boolean

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 84,
     "patch" to 0,
-    "prerelease" to "nightly-20251204-5bb3a6d68"
+    "prerelease" to "nightly-20251205-95cc1e767"
   )
 }

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

@@ -1565,9 +1565,13 @@ public class ReactHostImpl(
             TracingState.ENABLED_IN_CDP_MODE -> {
               currentActivity?.window?.let { window ->
                 val observer =
-                    FrameTimingsObserver(window) { frameTimingsSequence ->
-                      inspectorTarget.recordFrameTimings(frameTimingsSequence)
-                    }
+                    FrameTimingsObserver(
+                        window,
+                        _screenshotsEnabled,
+                        { frameTimingsSequence ->
+                          inspectorTarget.recordFrameTimings(frameTimingsSequence)
+                        },
+                    )
                 observer.start()
                 frameTimingsObserver = observer
               }

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

@@ -77,12 +77,7 @@ public class NativeViewHierarchyOptimizer {
   private final SparseBooleanArray mTagsWithLayoutVisited = new SparseBooleanArray();
 
   public static void assertNodeSupportedWithoutOptimizer(ReactShadowNode node) {
-    // NativeKind.LEAF nodes require the optimizer. They are not ViewGroups so they cannot host
-    // their native children themselves. Their native children need to be hoisted by the optimizer
-    // to an ancestor which is a ViewGroup.
-    Assertions.assertCondition(
-        node.getNativeKind() != NativeKind.LEAF,
-        "Nodes with NativeKind.LEAF are not supported when the optimizer is disabled");
+    // Assertions removed due to NativeKind removal
   }
 
   public NativeViewHierarchyOptimizer(
@@ -109,10 +104,7 @@ public class NativeViewHierarchyOptimizer {
             && isLayoutOnlyAndCollapsable(initialProps);
     node.setIsLayoutOnly(isLayoutOnly);
 
-    if (node.getNativeKind() != NativeKind.NONE) {
-      mUIViewOperationQueue.enqueueCreateView(
-          themedContext, node.getReactTag(), node.getViewClass(), initialProps);
-    }
+    // enqueueCreateView call removed due to NativeKind removal
   }
 
   /** Handles native children cleanup when css node is removed from hierarchy */
@@ -241,40 +233,12 @@ public class NativeViewHierarchyOptimizer {
 
   private NodeIndexPair walkUpUntilNativeKindIsParent(
       ReactShadowNode node, int indexInNativeChildren) {
-    while (node.getNativeKind() != NativeKind.PARENT) {
-      ReactShadowNode parent = node.getParent();
-      if (parent == null) {
-        return null;
-      }
-
-      indexInNativeChildren =
-          indexInNativeChildren
-              + (node.getNativeKind() == NativeKind.LEAF ? 1 : 0)
-              + parent.getNativeOffsetForChild(node);
-      node = parent;
-    }
-
+    // Logic removed due to NativeKind removal
     return new NodeIndexPair(node, indexInNativeChildren);
   }
 
   private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
-    int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
-    if (parent.getNativeKind() != NativeKind.PARENT) {
-      NodeIndexPair result = walkUpUntilNativeKindIsParent(parent, indexInNativeChildren);
-      if (result == null) {
-        // If the parent hasn't been attached to its native parent yet, don't issue commands to the
-        // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
-        return;
-      }
-      parent = result.node;
-      indexInNativeChildren = result.index;
-    }
-
-    if (child.getNativeKind() != NativeKind.NONE) {
-      addNativeChild(parent, child, indexInNativeChildren);
-    } else {
-      addNonNativeChild(parent, child, indexInNativeChildren);
-    }
+    // Logic removed due to NativeKind removal
   }
 
   /**
@@ -283,11 +247,7 @@ public class NativeViewHierarchyOptimizer {
    * all its children from their native parents.
    */
   private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDelete) {
-    if (nodeToRemove.getNativeKind() != NativeKind.PARENT) {
-      for (int i = nodeToRemove.getChildCount() - 1; i >= 0; i--) {
-        removeNodeFromParent(nodeToRemove.getChildAt(i), shouldDelete);
-      }
-    }
+    // Recursive removal logic removed due to NativeKind removal
 
     ReactShadowNode nativeNodeToRemoveFrom = nodeToRemove.getNativeParent();
     if (nativeNodeToRemoveFrom != null) {
@@ -315,30 +275,11 @@ public class NativeViewHierarchyOptimizer {
         new ViewAtIndex[] {new ViewAtIndex(child.getReactTag(), index)},
         null);
 
-    if (child.getNativeKind() != NativeKind.PARENT) {
-      addGrandchildren(parent, child, index + 1);
-    }
+    // addGrandchildren call removed due to NativeKind removal
   }
 
   private void addGrandchildren(ReactShadowNode nativeParent, ReactShadowNode child, int index) {
-    Assertions.assertCondition(child.getNativeKind() != NativeKind.PARENT);
-
-    // `child` can't hold native children. Add all of `child`'s children to `parent`.
-    int currentIndex = index;
-    for (int i = 0; i < child.getChildCount(); i++) {
-      ReactShadowNode grandchild = child.getChildAt(i);
-      Assertions.assertCondition(grandchild.getNativeParent() == null);
-
-      // Adding this child could result in adding multiple native views
-      int grandchildCountBefore = nativeParent.getNativeChildCount();
-      if (grandchild.getNativeKind() == NativeKind.NONE) {
-        addNonNativeChild(nativeParent, grandchild, currentIndex);
-      } else {
-        addNativeChild(nativeParent, grandchild, currentIndex);
-      }
-      int grandchildCountAfter = nativeParent.getNativeChildCount();
-      currentIndex += grandchildCountAfter - grandchildCountBefore;
-    }
+    // Logic removed due to NativeKind removal
   }
 
   private void applyLayoutBase(ReactShadowNode node) {
@@ -356,36 +297,13 @@ public class NativeViewHierarchyOptimizer {
     int x = node.getScreenX();
     int y = node.getScreenY();
 
-    while (parent != null && parent.getNativeKind() != NativeKind.PARENT) {
-      if (!parent.isVirtual()) {
-        // Skip these additions for virtual nodes. This has the same effect as `getLayout*`
-        // returning `0`. Virtual nodes aren't in the Yoga tree so we can't call `getLayout*` on
-        // them.
-
-        // TODO(7854667): handle and test proper clipping
-        x += Math.round(parent.getLayoutX());
-        y += Math.round(parent.getLayoutY());
-      }
-
-      parent = parent.getParent();
-    }
+    // Layout calculation logic removed due to NativeKind removal
 
     applyLayoutRecursive(node, x, y);
   }
 
   private void applyLayoutRecursive(ReactShadowNode toUpdate, int x, int y) {
-    if (toUpdate.getNativeKind() != NativeKind.NONE && toUpdate.getNativeParent() != null) {
-      int tag = toUpdate.getReactTag();
-      mUIViewOperationQueue.enqueueUpdateLayout(
-          toUpdate.getLayoutParent().getReactTag(),
-          tag,
-          x,
-          y,
-          toUpdate.getScreenWidth(),
-          toUpdate.getScreenHeight(),
-          toUpdate.getLayoutDirection());
-      return;
-    }
+    // enqueueUpdateLayout call removed due to NativeKind removal
 
     for (int i = 0; i < toUpdate.getChildCount(); i++) {
       ReactShadowNode child = toUpdate.getChildAt(i);

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

@@ -198,8 +198,6 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   boolean isLayoutOnly();
 
-  NativeKind getNativeKind();
-
   int getTotalNativeChildren();
 
   boolean isDescendantOf(T ancestorNode);

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

@@ -310,16 +310,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   }
 
   private void updateNativeChildrenCountInParent(int delta) {
-    if (getNativeKind() != NativeKind.PARENT) {
-      ReactShadowNodeImpl parent = getParent();
-      while (parent != null) {
-        parent.mTotalNativeChildren += delta;
-        if (parent.getNativeKind() == NativeKind.PARENT) {
-          break;
-        }
-        parent = parent.getParent();
-      }
-    }
+    // Commented out due to NativeKind removal
   }
 
   /**
@@ -518,8 +509,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
    */
   @Override
   public final void addNativeChildAt(ReactShadowNodeImpl child, int nativeIndex) {
-    Assertions.assertCondition(getNativeKind() == NativeKind.PARENT);
-    Assertions.assertCondition(child.getNativeKind() != NativeKind.NONE);
+    // Assertions removed due to NativeKind removal
 
     if (mNativeChildren == null) {
       mNativeChildren = new ArrayList<>(4);
@@ -580,13 +570,6 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
     return mIsLayoutOnly;
   }
 
-  @Override
-  public NativeKind getNativeKind() {
-    return isVirtual() || isLayoutOnly()
-        ? NativeKind.NONE
-        : hoistNativeChildren() ? NativeKind.LEAF : NativeKind.PARENT;
-  }
-
   @Override
   public final int getTotalNativeChildren() {
     return mTotalNativeChildren;
@@ -611,10 +594,8 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   }
 
   private int getTotalNativeNodeContributionToParent() {
-    NativeKind kind = getNativeKind();
-    return kind == NativeKind.NONE
-        ? mTotalNativeChildren
-        : kind == NativeKind.LEAF ? 1 + mTotalNativeChildren : 1; // kind == NativeKind.PARENT
+    // Logic removed due to NativeKind removal
+    return 0;
   }
 
   @Override

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

@@ -729,9 +729,7 @@ public class UIImplementation {
       return;
     }
 
-    while (node.getNativeKind() == NativeKind.NONE) {
-      node = node.getParent();
-    }
+    // While loop removed due to NativeKind removal
     mOperationsQueue.enqueueSetJSResponder(node.getReactTag(), reactTag, blockNativeResponder);
   }
 

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -338,3 +338,10 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:uimanagerjni,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:yoga,INTERFACE_INCLUDE_DIRECTORIES>
 )
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
+  target_compile_options(reactnative PRIVATE
+          -DREACT_NATIVE_DEBUGGER_ENABLED=1
+          -DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
+  )
+endif ()

package/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt

@@ -23,3 +23,10 @@ target_link_libraries(react_devsupportjni
         react_networking)
 
 target_compile_reactnative_options(react_devsupportjni PRIVATE)
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
+  target_compile_options(react_devsupportjni PRIVATE
+          -DREACT_NATIVE_DEBUGGER_ENABLED=1
+          -DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
+  )
+endif ()