react-native-tvos 0.73.7-1 → 0.74.0-0

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java

@@ -38,6 +38,7 @@ import com.facebook.react.bridge.ReactNoCrashSoftException;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.touch.OnInterceptTouchEventListener;
 import com.facebook.react.touch.ReactHitSlopView;
@@ -594,7 +595,11 @@ public class ReactViewGroup extends ViewGroup
     if (getId() == NO_ID) {
       return false;
     }
-    return ViewUtil.getUIManagerType(getId()) == UIManagerType.FABRIC;
+    if (ViewUtil.getUIManagerType(getId()) != UIManagerType.FABRIC) {
+      return false;
+    }
+
+    return !ReactNativeFeatureFlags.enableCustomDrawOrderFabric();
   }
 
   private void handleAddView(View view) {
@@ -617,7 +622,6 @@ public class ReactViewGroup extends ViewGroup
     } else {
       setChildrenDrawingOrderEnabled(false);
     }
-    recoverFocus(view);
   }
 
   private void handleRemoveViews(int start, int count) {
@@ -647,12 +651,14 @@ public class ReactViewGroup extends ViewGroup
   @Override
   public void removeView(View view) {
     handleRemoveView(view);
+    recoverFocus(view);
     super.removeView(view);
   }
 
   @Override
   public void removeViewAt(int index) {
     handleRemoveView(getChildAt(index));
+    recoverFocus(getChildAt(index));
     super.removeViewAt(index);
   }
 
@@ -780,7 +786,9 @@ public class ReactViewGroup extends ViewGroup
     }
   }
 
-  /*package*/ void removeViewWithSubviewClippingEnabled(View view) {
+  // TODO: make this method package only once we remove Android's mounting layer retry mechanism.
+  @VisibleForTesting
+  public void removeViewWithSubviewClippingEnabled(View view) {
     UiThreadUtil.assertOnUiThread();
 
     Assertions.assertCondition(mRemoveClippedSubviews);
@@ -848,7 +856,6 @@ public class ReactViewGroup extends ViewGroup
     }
   }
 
-  // This method also sets the child's mParent to null
   private void removeFromArray(int index) {
     final View[] children = Assertions.assertNotNull(mAllChildren);
     final int count = mAllChildrenCount;

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -7,9 +7,7 @@
 
 package com.facebook.react.views.view;
 
-import android.annotation.TargetApi;
 import android.graphics.Rect;
-import android.os.Build;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -207,7 +205,6 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
             : ReactDrawableHelper.createDrawableFromJSDescription(view.getContext(), bg));
   }
 
-  @TargetApi(Build.VERSION_CODES.M)
   @ReactProp(name = "nativeForegroundAndroid")
   public void setNativeForeground(ReactViewGroup view, @Nullable ReadableMap fg) {
     view.setForeground(

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java

@@ -8,12 +8,14 @@
 package com.facebook.react.views.view;
 
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.Event;
 
 /** Represents a Click on the ReactViewGroup */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ViewGroupClickEvent extends Event<ViewGroupClickEvent> {
   private static final String EVENT_NAME = "topClick";
 

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java

@@ -17,7 +17,8 @@ public enum YogaAlign {
   STRETCH(4),
   BASELINE(5),
   SPACE_BETWEEN(6),
-  SPACE_AROUND(7);
+  SPACE_AROUND(7),
+  SPACE_EVENLY(8);
 
   private final int mIntValue;
 
@@ -39,6 +40,7 @@ public enum YogaAlign {
       case 5: return BASELINE;
       case 6: return SPACE_BETWEEN;
       case 7: return SPACE_AROUND;
+      case 8: return SPACE_EVENLY;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);
     }
   }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java

@@ -15,8 +15,6 @@ public abstract class YogaConfig {
 
   public abstract void setUseWebDefaults(boolean useWebDefaults);
 
-  public abstract void setPrintTreeFlag(boolean enable);
-
   public abstract void setPointScaleFactor(float pixelsInPoint);
 
   public abstract void setErrata(YogaErrata errata);
@@ -27,5 +25,5 @@ public abstract class YogaConfig {
 
   public abstract YogaLogger getLogger();
 
-  abstract long getNativePointer();
+  protected abstract long getNativePointer();
 }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfigJNIBase.java

@@ -35,10 +35,6 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
     YogaNative.jni_YGConfigSetUseWebDefaultsJNI(mNativePointer, useWebDefaults);
   }
 
-  public void setPrintTreeFlag(boolean enable) {
-    YogaNative.jni_YGConfigSetPrintTreeFlagJNI(mNativePointer, enable);
-  }
-
   public void setPointScaleFactor(float pixelsInPoint) {
     YogaNative.jni_YGConfigSetPointScaleFactorJNI(mNativePointer, pixelsInPoint);
   }
@@ -60,7 +56,7 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
     return mLogger;
   }
 
-  long getNativePointer() {
+  protected long getNativePointer() {
     return mNativePointer;
   }
 }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaErrata.java

@@ -12,6 +12,8 @@ package com.facebook.yoga;
 public enum YogaErrata {
   NONE(0),
   STRETCH_FLEX_BASIS(1),
+  ABSOLUTE_POSITIONING_INCORRECT(2),
+  ABSOLUTE_PERCENT_AGAINST_INNER_SIZE(4),
   ALL(2147483647),
   CLASSIC(2147483646);
 
@@ -29,6 +31,8 @@ public enum YogaErrata {
     switch (value) {
       case 0: return NONE;
       case 1: return STRETCH_FLEX_BASIS;
+      case 2: return ABSOLUTE_POSITIONING_INCORRECT;
+      case 4: return ABSOLUTE_PERCENT_AGAINST_INNER_SIZE;
       case 2147483647: return ALL;
       case 2147483646: return CLASSIC;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java

@@ -10,8 +10,7 @@
 package com.facebook.yoga;
 
 public enum YogaExperimentalFeature {
-  WEB_FLEX_BASIS(0),
-  ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE(1);
+  WEB_FLEX_BASIS(0);
 
   private final int mIntValue;
 
@@ -26,7 +25,6 @@ public enum YogaExperimentalFeature {
   public static YogaExperimentalFeature fromInt(int value) {
     switch (value) {
       case 0: return WEB_FLEX_BASIS;
-      case 1: return ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);
     }
   }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java

@@ -22,7 +22,6 @@ public class YogaNative {
   static native void jni_YGConfigFreeJNI(long nativePointer);
   static native void jni_YGConfigSetExperimentalFeatureEnabledJNI(long nativePointer, int feature, boolean enabled);
   static native void jni_YGConfigSetUseWebDefaultsJNI(long nativePointer, boolean useWebDefaults);
-  static native void jni_YGConfigSetPrintTreeFlagJNI(long nativePointer, boolean enable);
   static native void jni_YGConfigSetPointScaleFactorJNI(long nativePointer, float pixelsInPoint);
   static native void jni_YGConfigSetErrataJNI(long nativePointer, int errata);
   static native int jni_YGConfigGetErrataJNI(long nativePointer);
@@ -31,7 +30,7 @@ public class YogaNative {
   // YGNode related
   static native long jni_YGNodeNewJNI();
   static native long jni_YGNodeNewWithConfigJNI(long configPointer);
-  static native void jni_YGNodeDeallocateJNI(long nativePointer);
+  static native void jni_YGNodeFinalizeJNI(long nativePointer);
   static native void jni_YGNodeResetJNI(long nativePointer);
   static native void jni_YGNodeInsertChildJNI(long nativePointer, long childPointer, int index);
   static native void jni_YGNodeSwapChildJNI(long nativePointer, long childPointer, int index);
@@ -41,7 +40,6 @@ public class YogaNative {
   static native void jni_YGNodeRemoveChildJNI(long nativePointer, long childPointer);
   static native void jni_YGNodeCalculateLayoutJNI(long nativePointer, float width, float height, long[] nativePointers, YogaNodeJNIBase[] nodes);
   static native void jni_YGNodeMarkDirtyJNI(long nativePointer);
-  static native void jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI(long nativePointer);
   static native boolean jni_YGNodeIsDirtyJNI(long nativePointer);
   static native void jni_YGNodeCopyStyleJNI(long dstNativePointer, long srcNativePointer);
   static native int jni_YGNodeStyleGetDirectionJNI(long nativePointer);
@@ -112,7 +110,7 @@ public class YogaNative {
   static native void jni_YGNodeStyleSetGapJNI(long nativePointer, int gutter, float gapLength);
   static native void jni_YGNodeSetHasMeasureFuncJNI(long nativePointer, boolean hasMeasureFunc);
   static native void jni_YGNodeSetHasBaselineFuncJNI(long nativePointer, boolean hasMeasureFunc);
-  static native void jni_YGNodePrintJNI(long nativePointer);
   static native void jni_YGNodeSetStyleInputsJNI(long nativePointer, float[] styleInputsArray, int size);
   static native long jni_YGNodeCloneJNI(long nativePointer);
+  static native void jni_YGNodeSetAlwaysFormsContainingBlockJNI(long nativePointer, boolean alwaysFormContainingBlock);
 }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java

@@ -221,9 +221,9 @@ public abstract class YogaNode implements YogaProps {
   @Nullable
   public abstract Object getData();
 
-  public abstract void print();
-
   public abstract YogaNode cloneWithoutChildren();
 
   public abstract YogaNode cloneWithChildren();
+
+  public abstract void setAlwaysFormsContainingBlock(boolean alwaysFormsContainingBlock);
 }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java

@@ -231,10 +231,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     YogaNative.jni_YGNodeMarkDirtyJNI(mNativePointer);
   }
 
-  public void dirtyAllDescendants() {
-    YogaNative.jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI(mNativePointer);
-  }
-
   public boolean isDirty() {
     return YogaNative.jni_YGNodeIsDirtyJNI(mNativePointer);
   }
@@ -508,6 +504,11 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     YogaNative.jni_YGNodeSetHasMeasureFuncJNI(mNativePointer, measureFunction != null);
   }
 
+  @Override
+  public void setAlwaysFormsContainingBlock(boolean alwaysFormsContainingBlock) {
+    YogaNative.jni_YGNodeSetAlwaysFormsContainingBlockJNI(mNativePointer, alwaysFormsContainingBlock);
+  }
+
   // Implementation Note: Why this method needs to stay final
   //
   // We cache the jmethodid for this method in Yoga code. This means that even if a subclass
@@ -555,14 +556,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     return mData;
   }
 
-  /**
-   * Use the set logger (defaults to adb log) to print out the styles, children, and computed layout
-   * of the tree rooted at this node.
-   */
-  public void print() {
-    YogaNative.jni_YGNodePrintJNI(mNativePointer);
-  }
-
   /**
    * This method replaces the child at childIndex position with the newNode received by parameter.
    * This is different than calling removeChildAt and addChildAt because this method ONLY replaces

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIFinalizer.java

@@ -29,7 +29,7 @@ public class YogaNodeJNIFinalizer extends YogaNodeJNIBase {
     if (mNativePointer != 0) {
       long nativePointer = mNativePointer;
       mNativePointer = 0;
-      YogaNative.jni_YGNodeDeallocateJNI(nativePointer);
+      YogaNative.jni_YGNodeFinalizeJNI(nativePointer);
     }
   }
 }

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

@@ -50,7 +50,6 @@ add_react_third_party_ndk_subdir(glog)
 add_react_third_party_ndk_subdir(boost)
 add_react_third_party_ndk_subdir(double-conversion)
 add_react_third_party_ndk_subdir(fmt)
-add_react_third_party_ndk_subdir(libevent)
 add_react_third_party_ndk_subdir(folly)
 add_react_third_party_ndk_subdir(jsc)
 add_react_third_party_ndk_subdir(googletest)
@@ -71,13 +70,13 @@ add_react_common_subdir(hermes/inspector-modern)
 add_react_common_subdir(react/renderer/runtimescheduler)
 add_react_common_subdir(react/debug)
 add_react_common_subdir(react/config)
+add_react_common_subdir(react/featureflags)
 add_react_common_subdir(react/renderer/animations)
 add_react_common_subdir(react/renderer/attributedstring)
 add_react_common_subdir(react/renderer/componentregistry)
 add_react_common_subdir(react/renderer/mounting)
 add_react_common_subdir(react/renderer/scheduler)
 add_react_common_subdir(react/renderer/telemetry)
-add_react_common_subdir(react/renderer/templateprocessor)
 add_react_common_subdir(react/renderer/uimanager)
 add_react_common_subdir(react/renderer/core)
 add_react_common_subdir(react/renderer/element)
@@ -120,12 +119,15 @@ add_react_android_subdir(src/main/jni/react/uimanager)
 add_react_android_subdir(src/main/jni/react/mapbuffer)
 add_react_android_subdir(src/main/jni/react/reactnativeblob)
 add_react_android_subdir(src/main/jni/react/fabric)
+add_react_android_subdir(src/main/jni/react/featureflags)
 add_react_android_subdir(src/main/jni/react/newarchdefaults)
 add_react_android_subdir(src/main/jni/react/hermes/reactexecutor)
 add_react_android_subdir(src/main/jni/react/hermes/instrumentation/)
+add_react_android_subdir(src/main/jni/react/runtime/cxxreactpackage)
 add_react_android_subdir(src/main/jni/react/runtime/jni)
 add_react_android_subdir(src/main/jni/react/runtime/hermes/jni)
 add_react_android_subdir(src/main/jni/react/runtime/jsc/jni)
+add_react_android_subdir(src/main/jni/react/devsupport)
 
 # GTest dependencies
 add_executable(reactnative_unittest
@@ -152,7 +154,6 @@ add_executable(reactnative_unittest
   ${REACT_COMMON_DIR}/react/renderer/core/tests/PrimitivesTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/core/tests/RawPropsTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/core/tests/ShadowNodeFamilyTest.cpp
-  ${REACT_COMMON_DIR}/react/renderer/core/tests/traitCastTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/debug/tests/DebugStringConvertibleTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/element/tests/ElementTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/graphics/tests/GraphicsTest.cpp
@@ -164,7 +165,6 @@ add_executable(reactnative_unittest
   ${REACT_COMMON_DIR}/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/runtimescheduler/tests/SchedulerPriorityTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/telemetry/tests/TransactionTelemetryTest.cpp
-  ${REACT_COMMON_DIR}/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp
   ${REACT_COMMON_DIR}/react/renderer/uimanager/tests/FabricUIManagerTest.cpp
 
@@ -192,7 +192,6 @@ add_executable(reactnative_unittest
 
   target_link_libraries(reactnative_unittest
   folly_runtime
-  folly_futures
   glog
   glog_init
   gtest_main
@@ -209,7 +208,6 @@ add_executable(reactnative_unittest
   react_render_graphics
   react_render_mapbuffer
   react_render_mounting
-  react_render_templateprocessor
   react_render_textlayoutmanager
   react_render_uimanager
   react_utils

package/ReactAndroid/src/main/jni/first-party/fb/CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_library(fb
-        SHARED
+        STATIC
         assert.cpp
         log.cpp)
 

package/ReactAndroid/src/main/jni/first-party/fbgloginit/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_compile_options(-fexceptions -fno-omit-frame-pointer)
 
-add_library(glog_init SHARED glog_init.cpp)
+add_library(glog_init STATIC glog_init.cpp)
 
 target_include_directories(glog_init PUBLIC .)
 

package/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "YGJNIVanilla.h"
+#include <bit>
 #include <cstring>
 #include <iostream>
 #include <memory>
@@ -16,9 +17,6 @@
 #include "common.h"
 #include "jni.h"
 
-#include <yoga/Yoga-internal.h>
-#include <yoga/bits/BitCast.h>
-
 using namespace facebook;
 using namespace facebook::yoga;
 using namespace facebook::yoga::vanillajni;
@@ -68,15 +66,6 @@ static void jni_YGConfigSetUseWebDefaultsJNI(
   YGConfigSetUseWebDefaults(config, useWebDefaults);
 }
 
-static void jni_YGConfigSetPrintTreeFlagJNI(
-    JNIEnv* /*env*/,
-    jobject /*obj*/,
-    jlong nativePointer,
-    jboolean enable) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetPrintTreeFlag(config, enable);
-}
-
 static void jni_YGConfigSetPointScaleFactorJNI(
     JNIEnv* /*env*/,
     jobject /*obj*/,
@@ -190,12 +179,12 @@ static void jni_YGConfigSetLoggerJNI(
 }
 
 static void
-jni_YGNodeDeallocateJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) {
+jni_YGNodeFinalizeJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) {
   if (nativePointer == 0) {
     return;
   }
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
-  YGNodeDeallocate(node);
+  YGNodeFinalize(node);
 }
 
 static void
@@ -385,13 +374,6 @@ jni_YGNodeMarkDirtyJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) {
   YGNodeMarkDirty(_jlong2YGNodeRef(nativePointer));
 }
 
-static void jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI(
-    JNIEnv* /*env*/,
-    jobject /*obj*/,
-    jlong nativePointer) {
-  YGNodeMarkDirtyAndPropagateToDescendants(_jlong2YGNodeRef(nativePointer));
-}
-
 static jboolean
 jni_YGNodeIsDirtyJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) {
   return (jboolean)YGNodeIsDirty(_jlong2YGNodeRef(nativePointer));
@@ -644,9 +626,8 @@ static YGSize YGJNIMeasureFunc(
 
     uint32_t wBits = 0xFFFFFFFF & (measureResult >> 32);
     uint32_t hBits = 0xFFFFFFFF & measureResult;
-
-    const float measuredWidth = yoga::bit_cast<float>(wBits);
-    const float measuredHeight = yoga::bit_cast<float>(hBits);
+    float measuredWidth = std::bit_cast<float>(wBits);
+    float measuredHeight = std::bit_cast<float>(hBits);
 
     return YGSize{measuredWidth, measuredHeight};
   } else {
@@ -691,16 +672,13 @@ static void jni_YGNodeSetHasBaselineFuncJNI(
       hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
 }
 
-static void
-jni_YGNodePrintJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) {
-#ifdef DEBUG
-  const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
-  YGNodePrint(
-      node,
-      (YGPrintOptions)(YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren));
-#else
-  (void)nativePointer;
-#endif
+static void jni_YGNodeSetAlwaysFormsContainingBlockJNI(
+    JNIEnv* /*env*/,
+    jobject /*obj*/,
+    jlong nativePointer,
+    jboolean alwaysFormsContainingBlock) {
+  YGNodeSetAlwaysFormsContainingBlock(
+      _jlong2YGNodeRef(nativePointer), alwaysFormsContainingBlock);
 }
 
 static jlong
@@ -745,9 +723,6 @@ static JNINativeMethod methods[] = {
     {"jni_YGConfigSetUseWebDefaultsJNI",
      "(JZ)V",
      (void*)jni_YGConfigSetUseWebDefaultsJNI},
-    {"jni_YGConfigSetPrintTreeFlagJNI",
-     "(JZ)V",
-     (void*)jni_YGConfigSetPrintTreeFlagJNI},
     {"jni_YGConfigSetPointScaleFactorJNI",
      "(JF)V",
      (void*)jni_YGConfigSetPointScaleFactorJNI},
@@ -758,7 +733,7 @@ static JNINativeMethod methods[] = {
      (void*)jni_YGConfigSetLoggerJNI},
     {"jni_YGNodeNewJNI", "()J", (void*)jni_YGNodeNewJNI},
     {"jni_YGNodeNewWithConfigJNI", "(J)J", (void*)jni_YGNodeNewWithConfigJNI},
-    {"jni_YGNodeDeallocateJNI", "(J)V", (void*)jni_YGNodeDeallocateJNI},
+    {"jni_YGNodeFinalizeJNI", "(J)V", (void*)jni_YGNodeFinalizeJNI},
     {"jni_YGNodeResetJNI", "(J)V", (void*)jni_YGNodeResetJNI},
     {"jni_YGNodeInsertChildJNI", "(JJI)V", (void*)jni_YGNodeInsertChildJNI},
     {"jni_YGNodeSwapChildJNI", "(JJI)V", (void*)jni_YGNodeSwapChildJNI},
@@ -776,9 +751,6 @@ static JNINativeMethod methods[] = {
      "(JFF[J[Lcom/facebook/yoga/YogaNodeJNIBase;)V",
      (void*)jni_YGNodeCalculateLayoutJNI},
     {"jni_YGNodeMarkDirtyJNI", "(J)V", (void*)jni_YGNodeMarkDirtyJNI},
-    {"jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI",
-     "(J)V",
-     (void*)jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI},
     {"jni_YGNodeIsDirtyJNI", "(J)Z", (void*)jni_YGNodeIsDirtyJNI},
     {"jni_YGNodeCopyStyleJNI", "(JJ)V", (void*)jni_YGNodeCopyStyleJNI},
     {"jni_YGNodeStyleGetDirectionJNI",
@@ -971,7 +943,9 @@ static JNINativeMethod methods[] = {
     {"jni_YGNodeSetHasBaselineFuncJNI",
      "(JZ)V",
      (void*)jni_YGNodeSetHasBaselineFuncJNI},
-    {"jni_YGNodePrintJNI", "(J)V", (void*)jni_YGNodePrintJNI},
+    {"jni_YGNodeSetAlwaysFormsContainingBlockJNI",
+     "(JZ)V",
+     (void*)jni_YGNodeSetAlwaysFormsContainingBlockJNI},
     {"jni_YGNodeCloneJNI", "(J)J", (void*)jni_YGNodeCloneJNI},
 };
 

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

@@ -0,0 +1,19 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"ReactNative\")
+
+file(GLOB react_devsupportjni_SRC CONFIGURE_DEPENDS *.cpp)
+
+add_library(react_devsupportjni SHARED ${react_devsupportjni_SRC})
+
+target_include_directories(react_devsupportjni PUBLIC .)
+
+target_link_libraries(react_devsupportjni
+        fbjni
+        jsinspector)

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

@@ -0,0 +1,55 @@
+/*
+ * 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 "JCxxInspectorPackagerConnection.h"
+
+#include <fbjni/NativeRunnable.h>
+
+using namespace facebook::jni;
+
+namespace facebook::react::jsinspector_modern {
+
+JCxxInspectorPackagerConnection::JCxxInspectorPackagerConnection(
+    const std::string& url,
+    const std::string& packageName,
+    alias_ref<JDelegateImpl::javaobject> delegate)
+    : cxxImpl_(url, packageName, delegate->wrapInUniquePtr()) {}
+
+local_ref<JCxxInspectorPackagerConnection::jhybriddata>
+JCxxInspectorPackagerConnection::initHybrid(
+    alias_ref<jclass>,
+    const std::string& url,
+    const std::string& packageName,
+    alias_ref<JDelegateImpl::javaobject> delegate) {
+  return makeCxxInstance(url, packageName, delegate);
+}
+
+void JCxxInspectorPackagerConnection::connect() {
+  cxxImpl_.connect();
+}
+
+void JCxxInspectorPackagerConnection::closeQuietly() {
+  cxxImpl_.closeQuietly();
+}
+
+void JCxxInspectorPackagerConnection::sendEventToAllConnections(
+    const std::string& event) {
+  cxxImpl_.sendEventToAllConnections(event);
+}
+
+void JCxxInspectorPackagerConnection::registerNatives() {
+  registerHybrid(
+      {makeNativeMethod(
+           "initHybrid", JCxxInspectorPackagerConnection::initHybrid),
+       makeNativeMethod("connect", JCxxInspectorPackagerConnection::connect),
+       makeNativeMethod(
+           "closeQuietly", JCxxInspectorPackagerConnection::closeQuietly),
+       makeNativeMethod(
+           "sendEventToAllConnections",
+           JCxxInspectorPackagerConnection::sendEventToAllConnections)});
+}
+} // namespace facebook::react::jsinspector_modern

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

@@ -0,0 +1,62 @@
+/*
+ * 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 "JCxxInspectorPackagerConnectionDelegateImpl.h"
+
+#include <fbjni/fbjni.h>
+#include <jsinspector-modern/InspectorPackagerConnection.h>
+
+#include <string>
+
+namespace facebook::react::jsinspector_modern {
+
+/**
+ * A hybrid Java/C++ class that exposes an instance of
+ * InspectorPackagerConnection to Java.
+ */
+class JCxxInspectorPackagerConnection
+    : public jni::HybridClass<JCxxInspectorPackagerConnection> {
+ public:
+  constexpr static auto kJavaDescriptor =
+      "Lcom/facebook/react/devsupport/CxxInspectorPackagerConnection;";
+
+  static void registerNatives();
+
+  // InspectorPackagerConnection's public API
+
+  void connect();
+  void closeQuietly();
+  void sendEventToAllConnections(const std::string& event);
+
+ private:
+  friend HybridBase;
+
+  using JDelegateImpl = JCxxInspectorPackagerConnectionDelegateImpl;
+
+  /**
+   * Private constructor since this class can only be created from Java.
+   */
+  JCxxInspectorPackagerConnection(
+      const std::string& url,
+      const std::string& packageName,
+      jni::alias_ref<JDelegateImpl::javaobject> delegate);
+
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      const std::string& url,
+      const std::string& packageName,
+      jni::alias_ref<JDelegateImpl::javaobject> delegate);
+
+  /**
+   * The actual C++ implementation wrapped by this hybrid class.
+   */
+  InspectorPackagerConnection cxxImpl_;
+};
+
+} // namespace facebook::react::jsinspector_modern