react-native-tvos 0.83.2-0 → 0.84.0-0

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

@@ -24,9 +24,9 @@
 #include <fbjni/fbjni.h>
 #include <glog/logging.h>
 
+#include <algorithm>
 #include <cfenv>
 #include <cmath>
-#include <unordered_set>
 #include <vector>
 
 namespace facebook::react {
@@ -54,6 +54,80 @@ void FabricMountingManager::onSurfaceStop(SurfaceId surfaceId) {
 
 namespace {
 
+#ifdef REACT_NATIVE_DEBUG
+// List of layout-only props extracted from ViewProps.kt used to filter out
+// component props from Props 1.5 to validate the Props 2.0 output
+inline bool isLayoutOnlyProp(const std::string& propName) {
+  static const std::vector<std::string> layoutOnlyProps = {
+      // Flexbox Alignment
+      "alignItems",
+      "alignSelf",
+      "alignContent",
+
+      // Flexbox Properties
+      "flex",
+      "flexBasis",
+      "flexDirection",
+      "flexGrow",
+      "flexShrink",
+      "flexWrap",
+      "justifyContent",
+
+      // Gaps
+      "rowGap",
+      "columnGap",
+      "gap",
+
+      // Display & Position
+      "display",
+      "position",
+
+      // Positioning
+      "right",
+      "top",
+      "bottom",
+      "left",
+      "start",
+      "end",
+
+      // Dimensions
+      "width",
+      "height",
+      "minWidth",
+      "maxWidth",
+      "minHeight",
+      "maxHeight",
+
+      // Margins
+      "margin",
+      "marginVertical",
+      "marginHorizontal",
+      "marginLeft",
+      "marginRight",
+      "marginTop",
+      "marginBottom",
+      "marginStart",
+      "marginEnd",
+
+      // Paddings
+      "padding",
+      "paddingVertical",
+      "paddingHorizontal",
+      "paddingLeft",
+      "paddingRight",
+      "paddingTop",
+      "paddingBottom",
+      "paddingStart",
+      "paddingEnd",
+
+      // Other
+      "collapsable",
+  };
+  return std::find(layoutOnlyProps.begin(), layoutOnlyProps.end(), propName) !=
+      layoutOnlyProps.end();
+}
+#endif
+
 inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) {
   switch (mountItemType) {
     case CppMountItem::Type::Create:
@@ -232,8 +306,29 @@ jni::local_ref<jobject> getProps(
       strcmp(
           newShadowView.componentName,
           newProps->getDiffPropsImplementationTarget()) == 0) {
-    return ReadableNativeMap::newObjectCxxArgs(
-        newProps->getDiffProps(oldProps));
+    auto diff = newProps->getDiffProps(oldProps);
+
+#ifdef REACT_NATIVE_DEBUG
+    if (oldProps != nullptr) {
+      auto controlDiff =
+          diffDynamicProps(oldProps->rawProps, newProps->rawProps);
+
+      for (const auto& [prop, value] : controlDiff.items()) {
+        if (diff.count(prop) == 0) {
+          // Skip layout-only props since they are not included in Props 2.0
+          if (!isLayoutOnlyProp(prop.asString())) {
+            LOG(ERROR) << "Props diff validation failed: Props 1.5 has prop '"
+                       << prop.asString()
+                       << "' = " << (value != nullptr ? value : "NULL")
+                       << " that Props 2.0 doesn't have for component "
+                       << newShadowView.componentName;
+          }
+        }
+      }
+    }
+#endif
+
+    return ReadableNativeMap::newObjectCxxArgs(std::move(diff));
   }
   if (ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid()) {
     if (oldProps == nullptr) {

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

@@ -24,11 +24,13 @@
 #include <react/renderer/core/EventBeat.h>
 #include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/conversions.h>
+#include <react/renderer/imagemanager/ImageFetcher.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/scheduler/SchedulerDelegate.h>
 #include <react/renderer/scheduler/SchedulerToolbox.h>
 #include <react/renderer/uimanager/primitives.h>
 #include <react/utils/ContextContainer.h>
+#include <string_view>
 
 namespace facebook::react {
 
@@ -166,34 +168,39 @@ void FabricUIManagerBinding::startSurface(
     return;
   }
 
-  auto layoutContext = LayoutContext{};
-  layoutContext.pointScaleFactor = pointScaleFactor_;
+  SurfaceHandler* surfaceHandler = nullptr;
+  {
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
+    auto [it, _] = surfaceHandlerRegistry_.try_emplace(
+        surfaceId,
+        std::in_place_index<0>,
+        moduleName->toStdString(),
+        surfaceId);
+    surfaceHandler = &std::get<SurfaceHandler>(it->second);
+  }
 
-  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
-  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  surfaceHandler->setContextContainer(scheduler->getContextContainer());
   if (initialProps != nullptr) {
-    surfaceHandler.setProps(initialProps->consume());
+    surfaceHandler->setProps(initialProps->consume());
   }
-  surfaceHandler.constraintLayout({}, layoutContext);
 
-  scheduler->registerSurface(surfaceHandler);
+  auto layoutContext = LayoutContext{};
+  layoutContext.pointScaleFactor = pointScaleFactor_;
+  surfaceHandler->constraintLayout({}, layoutContext);
+
+  scheduler->registerSurface(*surfaceHandler);
 
   auto mountingManager = getMountingManager("startSurface");
   if (mountingManager != nullptr) {
     mountingManager->onSurfaceStart(surfaceId);
   }
 
-  surfaceHandler.start();
+  surfaceHandler->start();
 
   if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
-    surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
+    surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
         animationDriver_);
   }
-
-  {
-    std::unique_lock lock(surfaceHandlerRegistryMutex_);
-    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
-  }
 }
 
 jint FabricUIManagerBinding::findNextFocusableElement(
@@ -338,31 +345,36 @@ void FabricUIManagerBinding::startSurfaceWithConstraints(
   constraints.layoutDirection =
       isRTL != 0 ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
 
-  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
-  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  SurfaceHandler* surfaceHandler = nullptr;
+  {
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
+    auto [it, _] = surfaceHandlerRegistry_.try_emplace(
+        surfaceId,
+        std::in_place_index<0>,
+        moduleName->toStdString(),
+        surfaceId);
+    surfaceHandler = &std::get<SurfaceHandler>(it->second);
+  }
+
+  surfaceHandler->setContextContainer(scheduler->getContextContainer());
   if (initialProps != nullptr) {
-    surfaceHandler.setProps(initialProps->consume());
+    surfaceHandler->setProps(initialProps->consume());
   }
-  surfaceHandler.constraintLayout(constraints, context);
+  surfaceHandler->constraintLayout(constraints, context);
 
-  scheduler->registerSurface(surfaceHandler);
+  scheduler->registerSurface(*surfaceHandler);
 
   auto mountingManager = getMountingManager("startSurfaceWithConstraints");
   if (mountingManager != nullptr) {
     mountingManager->onSurfaceStart(surfaceId);
   }
 
-  surfaceHandler.start();
+  surfaceHandler->start();
 
   if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
-    surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
+    surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
         animationDriver_);
   }
-
-  {
-    std::unique_lock lock(surfaceHandlerRegistryMutex_);
-    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
-  }
 }
 
 // Used by non-bridgeless+Fabric
@@ -630,6 +642,19 @@ void FabricUIManagerBinding::schedulerShouldRenderTransactions(
   if (!mountingManager) {
     return;
   }
+
+  if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
+    auto weakImageFetcher =
+        scheduler_->getContextContainer()->find<std::weak_ptr<ImageFetcher>>(
+            ImageFetcherKey);
+    auto imageFetcher = weakImageFetcher.has_value()
+        ? weakImageFetcher.value().lock()
+        : nullptr;
+    if (imageFetcher != nullptr) {
+      imageFetcher->flushImageRequests();
+    }
+  }
+
   if (ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid()) {
     auto mountingTransaction = mountingCoordinator->pullTransaction(
         /* willPerformAsynchronously = */ true);
@@ -662,6 +687,17 @@ void FabricUIManagerBinding::schedulerShouldRenderTransactions(
 
 void FabricUIManagerBinding::schedulerDidRequestPreliminaryViewAllocation(
     const ShadowNode& shadowNode) {
+  using namespace std::literals::string_view_literals;
+
+  if (ReactNativeFeatureFlags::disableViewPreallocationAndroid()) {
+    return;
+  }
+
+  if (ReactNativeFeatureFlags::disableImageViewPreallocationAndroid() &&
+      std::string_view(shadowNode.getComponentName()) == "Image"sv) {
+    return;
+  }
+
   auto mountingManager = getMountingManager("preallocateView");
   if (!mountingManager) {
     return;