react-native-tvos 0.79.2-0 → 0.80.0-0

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

@@ -12,6 +12,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.graphics.Rect
 import android.view.View
+import android.view.View.OnFocusChangeListener
 import android.view.ViewGroup
 import android.view.accessibility.AccessibilityManager
 import com.facebook.common.logging.FLog
@@ -38,6 +39,8 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.uimanager.annotations.ReactPropGroup
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.common.ViewUtil
+import com.facebook.react.uimanager.events.BlurEvent
+import com.facebook.react.uimanager.events.FocusEvent
 import com.facebook.react.uimanager.style.BackgroundImageLayer
 import com.facebook.react.uimanager.style.BorderRadiusProp
 import com.facebook.react.uimanager.style.BorderStyle
@@ -78,11 +81,15 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   override fun prepareToRecycleView(
       reactContext: ThemedReactContext,
       view: ReactViewGroup
-  ): ReactViewGroup {
+  ): ReactViewGroup? {
+    // We don't want to run the view clipping when the view is being prepared for recycling to avoid
+    // have size changes iterate over child view that should be removed anyway
+    view.removeClippedSubviews = false
+
     // BaseViewManager
     val preparedView = super.prepareToRecycleView(reactContext, view)
     preparedView?.recycleView()
-    return view
+    return preparedView
   }
 
 
@@ -164,8 +171,10 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
         val backgroundImageLayers = ArrayList<BackgroundImageLayer>(backgroundImage.size())
         for (i in 0 until backgroundImage.size()) {
           val backgroundImageMap = backgroundImage.getMap(i)
-          val layer = BackgroundImageLayer(backgroundImageMap, reactApplicationContext)
-          backgroundImageLayers.add(layer)
+          val layer = BackgroundImageLayer.parse(backgroundImageMap, view.context)
+          if (layer != null) {
+            backgroundImageLayers.add(layer)
+          }
         }
         BackgroundStyleApplicator.setBackgroundImage(view, backgroundImageLayers)
       } else {
@@ -248,6 +257,10 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
     when (hitSlop.type) {
       ReadableType.Map -> {
         val hitSlopMap = hitSlop.asMap()
+        if (hitSlopMap == null) {
+          view.setHitSlopRect(null)
+          return
+        }
         view.setHitSlopRect(
             Rect(
                 hitSlopMap.px("left"),
@@ -396,6 +409,40 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   public override fun createViewInstance(context: ThemedReactContext): ReactViewGroup =
       ReactViewGroup(context)
 
+  override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
+    val baseEventTypeConstants = super.getExportedCustomBubblingEventTypeConstants()
+    val eventTypeConstants = baseEventTypeConstants ?: mutableMapOf()
+    eventTypeConstants.putAll(
+        mapOf(
+            FocusEvent.EVENT_NAME to
+                mapOf(
+                    "phasedRegistrationNames" to
+                        mapOf("bubbled" to "onFocus", "captured" to "onFocusCapture")),
+            BlurEvent.EVENT_NAME to
+                mapOf(
+                    "phasedRegistrationNames" to
+                        mapOf("bubbled" to "onBlur", "captured" to "onBlurCapture")),
+        ))
+    return eventTypeConstants
+  }
+
+  override fun addEventEmitters(reactContext: ThemedReactContext, view: ReactViewGroup) {
+    view.onFocusChangeListener = OnFocusChangeListener { _: View?, hasFocus: Boolean ->
+      val surfaceId = UIManagerHelper.getSurfaceId(view.context)
+      if (surfaceId == View.NO_ID) {
+        return@OnFocusChangeListener
+      }
+      val eventDispatcher =
+          UIManagerHelper.getEventDispatcherForReactTag((view.context as ReactContext), view.id)
+              ?: return@OnFocusChangeListener
+      if (hasFocus) {
+        eventDispatcher.dispatchEvent(FocusEvent(surfaceId, view.id))
+      } else {
+        eventDispatcher.dispatchEvent(BlurEvent(surfaceId, view.id))
+      }
+    }
+  }
+
   override fun getCommandsMap(): MutableMap<String, Int> =
       mutableMapOf(HOTSPOT_UPDATE_KEY to CMD_HOTSPOT_UPDATE,
         "setPressed" to CMD_SET_PRESSED,

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

@@ -13,15 +13,15 @@ import com.facebook.react.uimanager.common.ViewUtil
 import com.facebook.react.uimanager.events.Event
 
 /** Represents a Click on the ReactViewGroup */
-public class ViewGroupClickEvent(surfaceId: Int, viewId: Int) :
+internal class ViewGroupClickEvent(surfaceId: Int, viewId: Int) :
     Event<ViewGroupClickEvent>(surfaceId, viewId) {
 
   @Deprecated("Use the constructor with surfaceId and viewId parameters.")
-  public constructor(viewId: Int) : this(ViewUtil.NO_SURFACE_ID, viewId)
+  constructor(viewId: Int) : this(ViewUtil.NO_SURFACE_ID, viewId)
 
-  public override fun getEventName(): String = EVENT_NAME
+  override fun getEventName(): String = EVENT_NAME
 
-  public override fun canCoalesce(): Boolean = false
+  override fun canCoalesce(): Boolean = false
 
   protected override fun getEventData(): WritableMap = Arguments.createMap()
 

package/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.kt

@@ -16,24 +16,20 @@ import kotlin.text.StringBuilder
  * internal version of this file has not been opensourced yet.
  */
 @Suppress("UNUSED_PARAMETER")
-public object Systrace {
+internal object Systrace {
 
-  public const val TRACE_TAG_REACT_JAVA_BRIDGE: Long = 0L
-  public const val TRACE_TAG_REACT_APPS: Long = 0L
-  public const val TRACE_TAG_REACT_FRESCO: Long = 0L
-  public const val TRACE_TAG_REACT_VIEW: Long = 0L
-  public const val TRACE_TAG_REACT_JS_VM_CALLS: Long = 0L
+  public const val TRACE_TAG_REACT: Long = 0L
 
-  @JvmStatic public fun registerListener(listener: TraceListener?): Unit = Unit
+  @JvmStatic fun registerListener(listener: TraceListener?): Unit = Unit
 
-  @JvmStatic public fun unregisterListener(listener: TraceListener?): Unit = Unit
+  @JvmStatic fun unregisterListener(listener: TraceListener?): Unit = Unit
 
-  @JvmStatic public fun isTracing(tag: Long): Boolean = false
+  @JvmStatic fun isTracing(tag: Long): Boolean = false
 
-  @JvmStatic public fun traceInstant(tag: Long, title: String?, scope: EventScope?): Unit = Unit
+  @JvmStatic fun traceInstant(tag: Long, title: String?, scope: EventScope?): Unit = Unit
 
   @JvmStatic
-  public fun traceSection(tag: Long, sectionName: String, block: Runnable) {
+  fun traceSection(tag: Long, sectionName: String, block: Runnable) {
     beginSection(tag, sectionName)
     try {
       block.run()
@@ -43,12 +39,12 @@ public object Systrace {
   }
 
   @JvmStatic
-  public fun beginSection(tag: Long, sectionName: String) {
+  fun beginSection(tag: Long, sectionName: String) {
     Trace.beginSection(sectionName)
   }
 
   @JvmStatic
-  public fun beginSection(tag: Long, sectionName: String, args: Array<String>, argsLength: Int) {
+  fun beginSection(tag: Long, sectionName: String, args: Array<String>, argsLength: Int) {
     Trace.beginSection(sectionName + "|" + convertArgsToText(args, argsLength))
   }
 
@@ -70,48 +66,48 @@ public object Systrace {
   }
 
   @JvmStatic
-  public fun endSection(tag: Long) {
+  fun endSection(tag: Long) {
     Trace.endSection()
   }
 
   @JvmStatic
-  public fun beginAsyncSection(tag: Long, sectionName: String, cookie: Int) {
+  fun beginAsyncSection(tag: Long, sectionName: String, cookie: Int) {
     Trace.beginAsyncSection(sectionName, cookie)
   }
 
   @JvmStatic
-  public fun beginAsyncSection(tag: Long, sectionName: String, cookie: Int, startNanos: Long) {
+  fun beginAsyncSection(tag: Long, sectionName: String, cookie: Int, startNanos: Long) {
     beginAsyncSection(tag, sectionName, cookie)
   }
 
   @JvmStatic
-  public fun endAsyncSection(tag: Long, sectionName: String, cookie: Int) {
+  fun endAsyncSection(tag: Long, sectionName: String, cookie: Int) {
     Trace.endAsyncSection(sectionName, cookie)
   }
 
   @JvmStatic
-  public fun endAsyncSection(tag: Long, sectionName: String, cookie: Int, endNanos: Long) {
+  fun endAsyncSection(tag: Long, sectionName: String, cookie: Int, endNanos: Long) {
     endAsyncSection(tag, sectionName, cookie)
   }
 
   @JvmStatic
-  public fun traceCounter(tag: Long, counterName: String, counterValue: Int) {
+  fun traceCounter(tag: Long, counterName: String, counterValue: Int) {
     Trace.setCounter(counterName, counterValue)
   }
 
   @JvmStatic
-  public fun startAsyncFlow(tag: Long, sectionName: String, cookie: Int) {
+  fun startAsyncFlow(tag: Long, sectionName: String, cookie: Int) {
     beginAsyncSection(tag, sectionName, cookie)
   }
 
-  @JvmStatic public fun stepAsyncFlow(tag: Long, sectionName: String, cookie: Int): Unit = Unit
+  @JvmStatic fun stepAsyncFlow(tag: Long, sectionName: String, cookie: Int): Unit = Unit
 
   @JvmStatic
-  public fun endAsyncFlow(tag: Long, sectionName: String, cookie: Int) {
+  fun endAsyncFlow(tag: Long, sectionName: String, cookie: Int) {
     endAsyncSection(tag, sectionName, cookie)
   }
 
-  public enum class EventScope(public val code: Char) {
+  enum class EventScope(val code: Char) {
     THREAD('t'),
     PROCESS('p'),
     GLOBAL('g')

package/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.kt

@@ -10,26 +10,25 @@ package com.facebook.systrace
 import java.util.ArrayList
 import kotlin.jvm.JvmField
 
-public object SystraceMessage {
+internal object SystraceMessage {
 
-  @JvmField public var INCLUDE_ARGS: Boolean = false
+  @JvmField var INCLUDE_ARGS: Boolean = false
 
   @JvmStatic
-  public fun beginSection(tag: Long, sectionName: String): Builder =
-      StartSectionBuilder(tag, sectionName)
+  fun beginSection(tag: Long, sectionName: String): Builder = StartSectionBuilder(tag, sectionName)
 
-  @JvmStatic public fun endSection(tag: Long): Builder = EndSectionBuilder(tag)
+  @JvmStatic fun endSection(tag: Long): Builder = EndSectionBuilder(tag)
 
-  public abstract class Builder {
-    public abstract fun flush()
+  abstract class Builder {
+    abstract fun flush()
 
-    public abstract fun arg(key: String, value: Any): Builder
+    abstract fun arg(key: String, value: Any): Builder
 
-    public abstract fun arg(key: String, value: Int): Builder
+    abstract fun arg(key: String, value: Int): Builder
 
-    public abstract fun arg(key: String, value: Long): Builder
+    abstract fun arg(key: String, value: Long): Builder
 
-    public abstract fun arg(key: String, value: Double): Builder
+    abstract fun arg(key: String, value: Double): Builder
   }
 
   private class StartSectionBuilder(private val tag: Long, private val sectionName: String) :

package/ReactAndroid/src/main/java/com/facebook/systrace/TraceListener.kt

@@ -7,9 +7,9 @@
 
 package com.facebook.systrace
 
-public interface TraceListener {
+internal interface TraceListener {
 
-  public fun onTraceStarted()
+  fun onTraceStarted()
 
-  public fun onTraceStopped()
+  fun onTraceStopped()
 }

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

@@ -8,6 +8,15 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 project(ReactAndroid)
 
+include(CheckIPOSupported)
+check_ipo_supported(RESULT IPO_SUPPORT)
+if (IPO_SUPPORT)
+  message(STATUS "LTO support is enabled")
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif()
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
 # Convert input paths to CMake format (with forward slashes)
 file(TO_CMAKE_PATH "${REACT_ANDROID_DIR}" REACT_ANDROID_DIR)
 file(TO_CMAKE_PATH "${REACT_BUILD_DIR}" REACT_BUILD_DIR)
@@ -22,7 +31,6 @@ endif(CCACHE_FOUND)
 
 # Make sure every shared lib includes a .note.gnu.build-id header
 add_link_options(-Wl,--build-id)
-add_compile_options(-Wall -Werror)
 
 function(add_react_android_subdir relative_path)
   add_subdirectory(${REACT_ANDROID_DIR}/${relative_path} ReactAndroid/${relative_path})
@@ -69,6 +77,8 @@ add_react_common_subdir(jsi)
 add_react_common_subdir(callinvoker)
 add_react_common_subdir(oscompat)
 add_react_common_subdir(jsinspector-modern)
+add_react_common_subdir(jsinspector-modern/cdp)
+add_react_common_subdir(jsinspector-modern/network)
 add_react_common_subdir(jsinspector-modern/tracing)
 add_react_common_subdir(hermes/executor)
 add_react_common_subdir(hermes/inspector-modern)
@@ -166,6 +176,8 @@ add_library(reactnative
           $<TARGET_OBJECTS:jserrorhandler>
           $<TARGET_OBJECTS:jsinspector>
           $<TARGET_OBJECTS:jsitooling>
+          $<TARGET_OBJECTS:jsinspector_cdp>
+          $<TARGET_OBJECTS:jsinspector_network>
           $<TARGET_OBJECTS:jsinspector_tracing>
           $<TARGET_OBJECTS:jsireact>
           $<TARGET_OBJECTS:logger>
@@ -209,6 +221,7 @@ add_library(reactnative
           $<TARGET_OBJECTS:react_utils>
           $<TARGET_OBJECTS:reactnativeblob>
           $<TARGET_OBJECTS:reactnativejni>
+          $<TARGET_OBJECTS:reactnativejni_common>
           $<TARGET_OBJECTS:reactperflogger>
           $<TARGET_OBJECTS:rninstance>
           $<TARGET_OBJECTS:rrc_image>
@@ -242,6 +255,8 @@ target_link_libraries(reactnative
             yogacore
 )
 
+target_compile_reactnative_options(reactnative PRIVATE)
+
 target_include_directories(reactnative
         PUBLIC
         $<TARGET_PROPERTY:bridgeless,INTERFACE_INCLUDE_DIRECTORIES>
@@ -251,6 +266,8 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:glog_init,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:jserrorhandler,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:jsinspector,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:jsinspector_cdp,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:jsinspector_network,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:jsinspector_tracing,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:jsireact,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:mapbufferjni,INTERFACE_INCLUDE_DIRECTORIES>
@@ -294,6 +311,7 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:react_utils,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:reactnativeblob,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:reactnativejni,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:reactnativejni_common,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:reactperflogger,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:rninstance,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:rrc_image,INTERFACE_INCLUDE_DIRECTORIES>
@@ -361,14 +379,9 @@ add_executable(reactnative_unittest
   # ${REACT_COMMON_DIR}/react/renderer/core/tests/ConcreteShadowNodeTest.cpp
   # ${REACT_COMMON_DIR}/react/renderer/core/tests/ComponentDescriptorTest.cpp
   )
-  target_compile_options(reactnative_unittest
-    PRIVATE
-    -Wall
-    -Werror
-    -fexceptions
-    -frtti
-    -std=c++20
-    -DHERMES_ENABLE_DEBUGGER)
+
+target_compile_reactnative_options(reactnative_unittest PRIVATE)
+target_compile_options(reactnative_unittest PRIVATE -DHERMES_ENABLE_DEBUGGER)
 
 target_link_libraries(reactnative_unittest
   fabricjni

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

@@ -8,8 +8,11 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_compile_options(-fexceptions -fno-omit-frame-pointer)
 
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
 add_library(glog_init OBJECT glog_init.cpp)
 
 target_include_directories(glog_init PUBLIC .)
 
 target_link_libraries(glog_init log glog)
+target_compile_reactnative_options(glog_init PRIVATE)

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

@@ -6,6 +6,8 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
 # This is the 'glue' library responsible of allowing to do so-merging in React Native
 # OSS. This library contains just a .c file that is included in every merged library.
 #
@@ -16,9 +18,9 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_library(jni_lib_merge_glue OBJECT jni_lib_merge.c)
 
-add_compile_options(-fexceptions -Wall)
 add_definitions(-DJNI_MERGE_PRINT_ONLOAD)
 
 target_include_directories(jni_lib_merge_glue PUBLIC jni-lib-merge)
 
 target_link_libraries(jni_lib_merge_glue PUBLIC log)
+target_compile_options(jni_lib_merge_glue PRIVATE -frtti -fexceptions)

package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/jni_lib_merge.h

@@ -58,8 +58,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad_Weak(JavaVM* vm, void* reserved);
                                                                                \
   /* We rename the declared JNI_OnLoad to this so we can call it */            \
   /* from either our weak JNI_OnLoad or our merge-friendly init function. */   \
-  static jint pre_merge_original_JNI_OnLoad(                                   \
-      JavaVM* vm, void* _Nullable reserved);                                   \
+  static jint pre_merge_original_JNI_OnLoad(JavaVM* vm, void* reserved);       \
                                                                                \
   /* Merge-friendly wrapper for the original JNI_OnLoad, called by JNI. */     \
   /* Return non-zero to indicate failure. */                                   \

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

@@ -7,13 +7,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
-
-add_compile_options(
-        -fvisibility=hidden
-        -fexceptions
-        -frtti
-        -std=c++20
-        -O3)
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB yoga_SRC CONFIGURE_DEPENDS jni/*.cpp)
 add_library(yoga OBJECT ${yoga_SRC})
@@ -27,3 +21,6 @@ target_link_libraries(yoga
         log
         android
 )
+
+target_compile_reactnative_options(yoga PRIVATE)
+target_compile_options(yoga PRIVATE -fvisibility=hidden -O3)

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

@@ -6,9 +6,8 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"ReactNative\")
-
 include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB react_devsupportjni_SRC CONFIGURE_DEPENDS *.cpp)
 
@@ -21,3 +20,5 @@ target_include_directories(react_devsupportjni PUBLIC .)
 target_link_libraries(react_devsupportjni
         fbjni
         jsinspector)
+
+target_compile_reactnative_options(react_devsupportjni PRIVATE "ReactNative")

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

@@ -6,6 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB fabricjni_SRCS CONFIGURE_DEPENDS *.cpp)
 
@@ -63,12 +64,4 @@ target_link_libraries(
         yoga
 )
 
-target_compile_options(
-        fabricjni
-        PRIVATE
-        -DLOG_TAG=\"Fabric\"
-        -fexceptions
-        -frtti
-        -std=c++20
-        -Wall
-)
+target_compile_reactnative_options(fabricjni PRIVATE "Fabric")

package/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp

@@ -6,18 +6,13 @@
  */
 
 #include "EventBeatManager.h"
-#include <fbjni/fbjni.h>
+
 using namespace facebook::jni;
 
 namespace facebook::react {
 
-EventBeatManager::EventBeatManager(
-    jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject)
-    : jhybridobject_(jhybridobject) {}
-
-jni::local_ref<EventBeatManager::jhybriddata> EventBeatManager::initHybrid(
-    jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject) {
-  return makeCxxInstance(jhybridobject);
+void EventBeatManager::initHybrid(jni::alias_ref<jhybridobject> jobj) {
+  setCxxInstance(jobj);
 }
 
 void EventBeatManager::addObserver(

package/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h

@@ -10,9 +10,7 @@
 #include <mutex>
 #include <unordered_set>
 
-#include <ReactCommon/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
-#include <react/renderer/core/EventBeat.h>
 
 namespace facebook::react {
 
@@ -34,9 +32,6 @@ class EventBeatManager : public jni::HybridClass<EventBeatManager> {
 
   static void registerNatives();
 
-  explicit EventBeatManager(
-      jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject);
-
   /*
    * Adds (or removes) observers.
    * `EventBeatManager` does not own/retain observers; observers must overlive
@@ -51,15 +46,12 @@ class EventBeatManager : public jni::HybridClass<EventBeatManager> {
    */
   void tick();
 
-  jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject_;
-
   mutable std::unordered_set<const EventBeatManagerObserver*>
       observers_{}; // Protected by `mutex_`
 
   mutable std::mutex mutex_;
 
-  static jni::local_ref<EventBeatManager::jhybriddata> initHybrid(
-      jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject);
+  static void initHybrid(jni::alias_ref<jhybridobject> jobj);
 };
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp

@@ -1068,4 +1068,16 @@ void FabricMountingManager::onAllAnimationsComplete() {
   allAnimationsCompleteJNI(javaUIManager_);
 }
 
+void FabricMountingManager::synchronouslyUpdateViewOnUIThread(
+    Tag viewTag,
+    const folly::dynamic& props) {
+  static auto synchronouslyUpdateViewOnUIThreadJNI =
+      JFabricUIManager::javaClassStatic()
+          ->getMethod<void(jint, ReadableMap::javaobject)>(
+              "synchronouslyUpdateViewOnUIThread");
+  auto propsMap = reinterpret_cast<ReadableMap::javaobject>(
+      ReadableNativeMap::newObjectCxxArgs(props).release());
+  synchronouslyUpdateViewOnUIThreadJNI(javaUIManager_, viewTag, propsMap);
+}
+
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h

@@ -60,6 +60,10 @@ class FabricMountingManager final {
 
   void onAllAnimationsComplete();
 
+  void synchronouslyUpdateViewOnUIThread(
+      Tag viewTag,
+      const folly::dynamic& props);
+
  private:
   bool isOnMainThread();