react-native-tvos 0.77.1-0 → 0.78.0-0

package/ReactCommon/react/renderer/core/Props.cpp

@@ -7,29 +7,40 @@
 
 #include "Props.h"
 
-#include <folly/dynamic.h>
 #include <react/renderer/core/propsConversions.h>
 
 #include <react/featureflags/ReactNativeFeatureFlags.h>
+#include "DynamicPropsUtilities.h"
 
 namespace facebook::react {
 
 Props::Props(
     const PropsParserContext& context,
     const Props& sourceProps,
-    const RawProps& rawProps) {
-  initialize(context, sourceProps, rawProps);
+    const RawProps& rawProps,
+    const std::function<bool(const std::string&)>& filterObjectKeys) {
+  initialize(context, sourceProps, rawProps, filterObjectKeys);
 }
 
 void Props::initialize(
     const PropsParserContext& context,
     const Props& sourceProps,
-    const RawProps& rawProps) {
+    const RawProps& rawProps,
+    [[maybe_unused]] const std::function<bool(const std::string&)>&
+        filterObjectKeys) {
   nativeId = ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
       ? sourceProps.nativeId
       : convertRawProp(context, rawProps, "nativeID", sourceProps.nativeId, {});
 #ifdef ANDROID
-  this->rawProps = (folly::dynamic)rawProps;
+  if (ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid()) {
+    auto& oldRawProps = sourceProps.rawProps;
+    auto newRawProps = rawProps.toDynamic(filterObjectKeys);
+    auto mergedRawProps = mergeDynamicProps(
+        oldRawProps, newRawProps, NullValueStrategy::Override);
+    this->rawProps = mergedRawProps;
+  } else {
+    this->rawProps = rawProps.toDynamic(filterObjectKeys);
+  }
 #endif
 }
 

package/ReactCommon/react/renderer/core/Props.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <folly/dynamic.h>
-
 #include <react/renderer/core/PropsMacros.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
@@ -17,6 +15,7 @@
 #include <react/renderer/debug/DebugStringConvertible.h>
 
 #ifdef ANDROID
+#include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
@@ -33,7 +32,9 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
   Props(
       const PropsParserContext& context,
       const Props& sourceProps,
-      const RawProps& rawProps);
+      const RawProps& rawProps,
+      const std::function<bool(const std::string&)>& filterObjectKeys =
+          nullptr);
   virtual ~Props() = default;
 
   Props(const Props& other) = delete;
@@ -71,7 +72,13 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
   void initialize(
       const PropsParserContext& context,
       const Props& sourceProps,
-      const RawProps& rawProps);
+      const RawProps& rawProps,
+      /**
+       * Filter object keys to be excluded when converting the RawProps to
+       * folly::dynamic (android only)
+       */
+      const std::function<bool(const std::string&)>& filterObjectKeys =
+          nullptr);
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/core/RawProps.cpp

@@ -7,7 +7,7 @@
 
 #include "RawProps.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/RawPropsKey.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -172,13 +172,38 @@ void RawProps::parse(const RawPropsParser& parser) noexcept {
  * The support for explicit conversion to `folly::dynamic` is deprecated and
  * will be removed as soon Android implementation does not need it.
  */
-RawProps::operator folly::dynamic() const noexcept {
+RawProps::operator folly::dynamic() const {
+  return toDynamic();
+}
+
+/*
+ * Deprecated. Do not use.
+ * The support for explicit conversion to `folly::dynamic` is deprecated and
+ * will be removed as soon Android implementation does not need it.
+ */
+folly::dynamic RawProps::toDynamic(
+    const std::function<bool(const std::string&)>& filterObjectKeys) const {
   switch (mode_) {
     case Mode::Empty:
       return folly::dynamic::object();
-    case Mode::JSI:
-      return jsi::dynamicFromValue(
-          *runtime_, value_, ignoreYogaStyleProps_ ? isYogaStyleProp : nullptr);
+    case Mode::JSI: {
+      if (ignoreYogaStyleProps_ || filterObjectKeys != nullptr) {
+        // We need to filter props
+        return jsi::dynamicFromValue(
+            *runtime_, value_, [&](const std::string& key) {
+              if (ignoreYogaStyleProps_ && isYogaStyleProp(key)) {
+                return true;
+              }
+              if (filterObjectKeys) {
+                return filterObjectKeys(key);
+              }
+              return false;
+            });
+      } else {
+        // We don't need to filter, just include all props by default
+        return jsi::dynamicFromValue(*runtime_, value_, nullptr);
+      }
+    }
     case Mode::Dynamic:
       return dynamic_;
   }

package/ReactCommon/react/renderer/core/RawProps.h

@@ -71,7 +71,16 @@ class RawProps final {
    * The support for explicit conversion to `folly::dynamic` is deprecated and
    * will be removed as soon Android implementation does not need it.
    */
-  explicit operator folly::dynamic() const noexcept;
+  explicit operator folly::dynamic() const;
+
+  /*
+   * Deprecated. Do not use.
+   * The support for explicit conversion to `folly::dynamic` is deprecated and
+   * will be removed as soon Android implementation does not need it.
+   */
+  folly::dynamic toDynamic(
+      const std::function<bool(const std::string&)>& filterObjectKeys =
+          nullptr) const;
 
   /*
    * Once called, Yoga style props will be filtered out during conversion to

package/ReactCommon/react/renderer/core/RawPropsParser.cpp

@@ -136,8 +136,13 @@ void RawPropsParser::preparse(const RawProps& rawProps) const noexcept {
         rawProps.keyIndexToValueIndex_[keyIndex] = valueIndex;
 
         auto value = object.getProperty(runtime, nameValue);
-        rawProps.values_.push_back(
-            RawValue(jsi::dynamicFromValue(runtime, value)));
+        RawValue rawValue;
+        if (useRawPropsJsiValue_) {
+          rawValue = RawValue(runtime, std::move(value));
+        } else {
+          rawValue = RawValue(jsi::dynamicFromValue(runtime, value));
+        }
+        rawProps.values_.push_back(std::move(rawValue));
         valueIndex++;
       }
 

package/ReactCommon/react/renderer/core/RawPropsParser.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
@@ -26,8 +27,12 @@ class RawPropsParser final {
   /*
    * Default constructor.
    * To be used by `ConcreteComponentDescriptor` only.
+   * If `useRawPropsJsiValue` is `true`, the parser will use `jsi::Value`
+   * directly for RawValues instead of converting them to `folly::dynamic`.
    */
-  RawPropsParser() = default;
+  RawPropsParser(
+      bool useRawPropsJsiValue = ReactNativeFeatureFlags::useRawPropsJsiValue())
+      : useRawPropsJsiValue_(useRawPropsJsiValue){};
 
   /*
    * To be used by `ConcreteComponentDescriptor` only.
@@ -56,6 +61,7 @@ class RawPropsParser final {
   template <class ShadowNodeT>
   friend class ConcreteComponentDescriptor;
   friend class RawProps;
+  bool useRawPropsJsiValue_{false};
 
   /*
    * To be used by `RawProps` only.

package/ReactCommon/react/renderer/core/RawPropsPrimitives.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <limits>
 
 namespace facebook::react {