react-native-tvos 0.75.4-0 → 0.76.0-0

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

@@ -53,8 +53,6 @@ static inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) {
     case CppMountItem::Type::Insert:
     case CppMountItem::Type::Remove:
       return 3; // tag, parentTag, index
-    case CppMountItem::Type::RemoveDeleteTree:
-      return 3; // tag, parentTag, index
     case CppMountItem::Type::Delete:
     case CppMountItem::Type::UpdateProps:
     case CppMountItem::Type::UpdateState:
@@ -192,7 +190,8 @@ static inline void writeIntBufferTypePreamble(
 
 // TODO: this method will be removed when binding for components are code-gen
 jni::local_ref<jstring> getPlatformComponentName(const ShadowView& shadowView) {
-  static std::string scrollViewComponentName = std::string("ScrollView");
+  constexpr static std::string_view scrollViewComponentName = "ScrollView";
+
   if (scrollViewComponentName == shadowView.componentName) {
     const auto& newViewProps =
         static_cast<const ScrollViewProps&>(*shadowView.props);
@@ -222,6 +221,17 @@ static inline float scale(Float value, Float pointScaleFactor) {
 jni::local_ref<jobject> FabricMountingManager::getProps(
     const ShadowView& oldShadowView,
     const ShadowView& newShadowView) {
+  auto componentName = newShadowView.componentName;
+  // We calculate the diffing between the props of the last mounted ShadowTree
+  // and the Props of the latest commited ShadowTree). ONLY for <View>
+  // components when the "enablePropsUpdateReconciliationAndroid" feature flag
+  // is enabled.
+  if (ReactNativeFeatureFlags::enablePropsUpdateReconciliationAndroid() &&
+      strcmp(componentName, "View") == 0) {
+    const Props* oldProps = oldShadowView.props.get();
+    auto diffProps = newShadowView.props->getDiffProps(oldProps);
+    return ReadableNativeMap::newObjectCxxArgs(diffProps);
+  }
   return ReadableNativeMap::newObjectCxxArgs(newShadowView.props->rawProps);
 }
 
@@ -287,25 +297,15 @@ void FabricMountingManager::executeMount(
           break;
         }
         case ShadowViewMutation::Remove: {
-          if (!isVirtual && !mutation.isRedundantOperation) {
+          if (!isVirtual) {
             cppCommonMountItems.push_back(CppMountItem::RemoveMountItem(
                 parentShadowView, oldChildShadowView, index));
           }
           break;
         }
-        case ShadowViewMutation::RemoveDeleteTree: {
-          if (!isVirtual) {
-            cppCommonMountItems.push_back(
-                CppMountItem::RemoveDeleteTreeMountItem(
-                    parentShadowView, oldChildShadowView, index));
-          }
-          break;
-        }
         case ShadowViewMutation::Delete: {
-          if (!mutation.isRedundantOperation) {
-            cppDeleteMountItems.push_back(
-                CppMountItem::DeleteMountItem(oldChildShadowView));
-          }
+          cppDeleteMountItems.push_back(
+              CppMountItem::DeleteMountItem(oldChildShadowView));
           break;
         }
         case ShadowViewMutation::Update: {
@@ -499,6 +499,7 @@ void FabricMountingManager::executeMount(
   int objBufferPosition = 0;
   int prevMountItemType = -1;
   jint temp[8];
+  // Fill in CREATE instructions.
   for (int i = 0; i < cppCommonMountItems.size(); i++) {
     const auto& mountItem = cppCommonMountItems[i];
     const auto& mountItemType = mountItem.type;
@@ -522,7 +523,6 @@ void FabricMountingManager::executeMount(
     }
     prevMountItemType = mountItemType;
 
-    // TODO: multi-create, multi-insert, etc
     if (mountItemType == CppMountItem::Type::Create) {
       auto componentName =
           getPlatformComponentName(mountItem.newChildShadowView);
@@ -540,7 +540,7 @@ void FabricMountingManager::executeMount(
       if (mountItem.newChildShadowView.state != nullptr) {
         javaStateWrapper = StateWrapperImpl::newObjectJavaArgs();
         StateWrapperImpl* cStateWrapper = cthis(javaStateWrapper);
-        cStateWrapper->state_ = mountItem.newChildShadowView.state;
+        cStateWrapper->setState(mountItem.newChildShadowView.state);
       }
 
       // Do not hold a reference to javaEventEmitter from the C++ side.
@@ -568,16 +568,11 @@ void FabricMountingManager::executeMount(
       temp[2] = mountItem.index;
       env->SetIntArrayRegion(intBufferArray, intBufferPosition, 3, temp);
       intBufferPosition += 3;
-    } else if (mountItemType == CppMountItem::RemoveDeleteTree) {
-      temp[0] = mountItem.oldChildShadowView.tag;
-      temp[1] = mountItem.parentShadowView.tag;
-      temp[2] = mountItem.index;
-      env->SetIntArrayRegion(intBufferArray, intBufferPosition, 3, temp);
-      intBufferPosition += 3;
     } else {
-      LOG(ERROR) << "Unexpected CppMountItem type";
+      LOG(ERROR) << "Unexpected CppMountItem type: " << mountItemType;
     }
   }
+
   if (!cppUpdatePropsMountItems.empty()) {
     writeIntBufferTypePreamble(
         CppMountItem::Type::UpdateProps,
@@ -615,7 +610,7 @@ void FabricMountingManager::executeMount(
       if (state != nullptr) {
         javaStateWrapper = StateWrapperImpl::newObjectJavaArgs();
         StateWrapperImpl* cStateWrapper = cthis(javaStateWrapper);
-        cStateWrapper->state_ = state;
+        cStateWrapper->setState(state);
       }
 
       (*objBufferArray)[objBufferPosition++] =
@@ -784,30 +779,68 @@ void FabricMountingManager::executeMount(
   env->DeleteLocalRef(intBufferArray);
 }
 
-void FabricMountingManager::preallocateShadowView(
+void FabricMountingManager::drainPreallocateViewsQueue() {
+  std::vector<ShadowView> shadowViews;
+
+  {
+    std::lock_guard lock(preallocateMutex_);
+    std::swap(shadowViews, preallocatedViewsQueue_);
+  }
+
+  for (const auto& shadowView : shadowViews) {
+    preallocateShadowView(shadowView);
+  }
+}
+
+void FabricMountingManager::maybePreallocateShadowNode(
     const ShadowNode& shadowNode) {
+  if (!shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
+    return;
+  }
+
+  static thread_local bool onMainThread = isOnMainThread();
+  if (onMainThread) {
+    // View preallocation is not beneficial when rendering on the main thread
+    return;
+  }
+
+  auto shadowView = ShadowView(shadowNode);
+
+  if (ReactNativeFeatureFlags::useOptimisedViewPreallocationOnAndroid()) {
+    // Optimised implementation where FabricUIManager.preallocateView is called
+    // from the main thread.
+    std::lock_guard lock(preallocateMutex_);
+    preallocatedViewsQueue_.push_back(std::move(shadowView));
+  } else {
+    // Old implementation where FabricUIManager.preallocateView is called
+    // immediatelly.
+    preallocateShadowView(shadowView);
+  }
+}
+
+void FabricMountingManager::preallocateShadowView(
+    const ShadowView& shadowView) {
+  SystraceSection section("FabricMountingManager::preallocateShadowView");
+
   {
     std::lock_guard lock(allocatedViewsMutex_);
     auto allocatedViewsIterator =
-        allocatedViewRegistry_.find(shadowNode.getSurfaceId());
+        allocatedViewRegistry_.find(shadowView.surfaceId);
     if (allocatedViewsIterator == allocatedViewRegistry_.end()) {
       return;
     }
     auto& allocatedViews = allocatedViewsIterator->second;
-    if (allocatedViews.find(shadowNode.getTag()) != allocatedViews.end()) {
+    if (allocatedViews.find(shadowView.tag) != allocatedViews.end()) {
       return;
     }
-    allocatedViews.insert(shadowNode.getTag());
+    allocatedViews.insert(shadowView.tag);
   }
 
-  auto shadowView = ShadowView(shadowNode);
-
   bool isLayoutableShadowNode = shadowView.layoutMetrics != EmptyLayoutMetrics;
 
   static auto preallocateView =
       JFabricUIManager::javaClassStatic()
-          ->getMethod<void(
-              jint, jint, jstring, jobject, jobject, jobject, jboolean)>(
+          ->getMethod<void(jint, jint, jstring, jobject, jobject, jboolean)>(
               "preallocateView");
 
   // Do not hold onto Java object from C
@@ -817,27 +850,30 @@ void FabricMountingManager::preallocateShadowView(
   if (shadowView.state != nullptr) {
     javaStateWrapper = StateWrapperImpl::newObjectJavaArgs();
     StateWrapperImpl* cStateWrapper = cthis(javaStateWrapper);
-    cStateWrapper->state_ = shadowView.state;
+    cStateWrapper->setState(shadowView.state);
   }
 
-  // Do not hold a reference to javaEventEmitter from the C++ side.
-  jni::local_ref<EventEmitterWrapper::JavaPart> javaEventEmitter = nullptr;
-
   jni::local_ref<jobject> props = getProps({}, shadowView);
 
   auto component = getPlatformComponentName(shadowView);
 
   preallocateView(
       javaUIManager_,
-      shadowNode.getSurfaceId(),
+      shadowView.surfaceId,
       shadowView.tag,
       component.get(),
       props.get(),
       (javaStateWrapper != nullptr ? javaStateWrapper.get() : nullptr),
-      (javaEventEmitter != nullptr ? javaEventEmitter.get() : nullptr),
       isLayoutableShadowNode);
 }
 
+bool FabricMountingManager::isOnMainThread() {
+  static auto isOnMainThread =
+      JFabricUIManager::javaClassStatic()->getMethod<jboolean()>(
+          "isOnMainThread");
+  return isOnMainThread(javaUIManager_);
+}
+
 void FabricMountingManager::dispatchCommand(
     const ShadowView& shadowView,
     const std::string& commandName,

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

@@ -32,7 +32,13 @@ class FabricMountingManager final {
 
   void onSurfaceStop(SurfaceId surfaceId);
 
-  void preallocateShadowView(const ShadowNode& shadowNode);
+  void maybePreallocateShadowNode(const ShadowNode& shadowNode);
+
+  /*
+   * Drains preallocatedViewsQueue_ by calling preallocateShadowView on each
+   * item in the queue. Can be called by any thread.
+   */
+  void drainPreallocateViewsQueue();
 
   void executeMount(const MountingTransaction& transaction);
 
@@ -55,10 +61,22 @@ class FabricMountingManager final {
   void onAllAnimationsComplete();
 
  private:
+  bool isOnMainThread();
+
   jni::global_ref<JFabricUIManager::javaobject> javaUIManager_;
 
   std::recursive_mutex commitMutex_;
 
+  /*
+   * Protects preallocatedViewsQueue_.
+   */
+  std::mutex preallocateMutex_;
+
+  /*
+   * A queue of views to be preallocated on the Java side.
+   */
+  std::vector<ShadowView> preallocatedViewsQueue_{};
+
   std::unordered_map<SurfaceId, std::unordered_set<Tag>>
       allocatedViewRegistry_{};
   std::recursive_mutex allocatedViewsMutex_;
@@ -66,6 +84,12 @@ class FabricMountingManager final {
   jni::local_ref<jobject> getProps(
       const ShadowView& oldShadowView,
       const ShadowView& newShadowView);
+
+  /*
+   * Calls FabricUIManager.preallocateView() on the Java side if view needs to
+   * be preallocated.
+   */
+  void preallocateShadowView(const ShadowView& shadowView);
 };
 
 } // namespace facebook::react

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

@@ -27,13 +27,6 @@ CppMountItem CppMountItem::RemoveMountItem(
     int index) {
   return {CppMountItem::Type::Remove, parentView, shadowView, {}, index};
 }
-CppMountItem CppMountItem::RemoveDeleteTreeMountItem(
-    const ShadowView& parentView,
-    const ShadowView& shadowView,
-    int index) {
-  return {
-      CppMountItem::Type::RemoveDeleteTree, parentView, shadowView, {}, index};
-}
 CppMountItem CppMountItem::UpdatePropsMountItem(
     const ShadowView& oldShadowView,
     const ShadowView& newShadowView) {

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

@@ -34,11 +34,6 @@ struct CppMountItem final {
       const ShadowView& shadowView,
       int index);
 
-  static CppMountItem RemoveDeleteTreeMountItem(
-      const ShadowView& parentView,
-      const ShadowView& shadowView,
-      int index);
-
   static CppMountItem UpdatePropsMountItem(
       const ShadowView& oldShadowView,
       const ShadowView& newShadowView);
@@ -70,8 +65,7 @@ struct CppMountItem final {
     UpdateLayout = 128,
     UpdateEventEmitter = 256,
     UpdatePadding = 512,
-    UpdateOverflowInset = 1024,
-    RemoveDeleteTree = 2048
+    UpdateOverflowInset = 1024
   };
 
 #pragma mark - Fields

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

@@ -9,7 +9,6 @@
 
 #include "Binding.h"
 #include "ComponentFactory.h"
-#include "CoreComponentsRegistry.h"
 #include "EventBeatManager.h"
 #include "EventEmitterWrapper.h"
 #include "JEmptyReactNativeConfig.h"
@@ -23,7 +22,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
     facebook::react::EventEmitterWrapper::registerNatives();
     facebook::react::StateWrapperImpl::registerNatives();
     facebook::react::ComponentFactory::registerNatives();
-    facebook::react::CoreComponentsRegistry::registerNatives();
     facebook::react::SurfaceHandlerBinding::registerNatives();
     facebook::react::JEmptyReactNativeConfig::registerNatives();
   });

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

@@ -7,6 +7,7 @@
 
 #include "StateWrapperImpl.h"
 #include <fbjni/fbjni.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
@@ -25,30 +26,65 @@ jni::local_ref<StateWrapperImpl::jhybriddata> StateWrapperImpl::initHybrid(
 
 jni::local_ref<ReadableNativeMap::jhybridobject>
 StateWrapperImpl::getStateDataImpl() {
-  if (auto state = state_.lock()) {
-    folly::dynamic map = state->getDynamic();
-    return ReadableNativeMap::newObjectCxxArgs(std::move(map));
+  if (ReactNativeFeatureFlags::fixMissedFabricStateUpdatesOnAndroid()) {
+    if (state_) {
+      folly::dynamic map = state_->getDynamic();
+      return ReadableNativeMap::newObjectCxxArgs(std::move(map));
+    } else {
+      return nullptr;
+    }
   } else {
-    return nullptr;
+    if (auto state = weakState_.lock()) {
+      folly::dynamic map = state->getDynamic();
+      return ReadableNativeMap::newObjectCxxArgs(std::move(map));
+    } else {
+      return nullptr;
+    }
   }
 }
 
 jni::local_ref<JReadableMapBuffer::jhybridobject>
 StateWrapperImpl::getStateMapBufferDataImpl() {
-  if (auto state = state_.lock()) {
-    MapBuffer map = state->getMapBuffer();
-    return JReadableMapBuffer::createWithContents(std::move(map));
+  if (ReactNativeFeatureFlags::fixMissedFabricStateUpdatesOnAndroid()) {
+    if (state_) {
+      MapBuffer map = state_->getMapBuffer();
+      return JReadableMapBuffer::createWithContents(std::move(map));
+    } else {
+      return nullptr;
+    }
   } else {
-    return nullptr;
+    if (auto state = weakState_.lock()) {
+      MapBuffer map = state->getMapBuffer();
+      return JReadableMapBuffer::createWithContents(std::move(map));
+    } else {
+      return nullptr;
+    }
   }
 }
 
 void StateWrapperImpl::updateStateImpl(NativeMap* map) {
-  if (auto state = state_.lock()) {
-    // Get folly::dynamic from map
-    auto dynamicMap = map->consume();
-    // Set state
-    state->updateState(std::move(dynamicMap));
+  if (ReactNativeFeatureFlags::fixMissedFabricStateUpdatesOnAndroid()) {
+    if (state_) {
+      // Get folly::dynamic from map
+      auto dynamicMap = map->consume();
+      // Set state
+      state_->updateState(std::move(dynamicMap));
+    }
+  } else {
+    if (auto state = weakState_.lock()) {
+      // Get folly::dynamic from map
+      auto dynamicMap = map->consume();
+      // Set state
+      state->updateState(std::move(dynamicMap));
+    }
+  }
+}
+
+void StateWrapperImpl::setState(std::shared_ptr<const State> state) {
+  if (ReactNativeFeatureFlags::fixMissedFabricStateUpdatesOnAndroid()) {
+    state_ = state;
+  } else {
+    weakState_ = state;
   }
 }
 

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

@@ -28,11 +28,12 @@ class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
   jni::local_ref<JReadableMapBuffer::jhybridobject> getStateMapBufferDataImpl();
   jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
   void updateStateImpl(NativeMap* map);
-
-  std::weak_ptr<const State> state_;
+  void setState(std::shared_ptr<const State> state);
 
  private:
   jni::alias_ref<StateWrapperImpl::jhybriddata> jhybridobject_;
+  std::weak_ptr<const State> weakState_;
+  std::shared_ptr<const State> state_;
 
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
 };

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

@@ -5,11 +5,13 @@
 
 cmake_minimum_required(VERSION 3.13)
 
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
 file(GLOB react_featureflagsjni_SRCS CONFIGURE_DEPENDS *.cpp)
 
 add_library(
         react_featureflagsjni
-        SHARED
+        OBJECT
         ${react_featureflagsjni_SRCS}
 )
 
@@ -23,6 +25,8 @@ target_link_libraries(
         reactnativejni
 )
 
+target_merge_so(react_featureflagsjni)
+
 target_compile_options(
         react_featureflagsjni
         PRIVATE