react-native-tvos 0.84.1-0 → 0.85.0-0

package/ReactCommon/react/renderer/graphics/LinearGradient.h

@@ -18,37 +18,25 @@
 
 namespace facebook::react {
 
-enum class GradientDirectionType { Angle, Keyword };
+enum class [[deprecated("Use std::holds_alternative")]] GradientDirectionType {
+  Angle,
+  Keyword,
+};
 
-enum class GradientKeyword {
+enum class GradientKeyword : uint8_t {
   ToTopRight,
   ToBottomRight,
   ToTopLeft,
   ToBottomLeft,
 };
 
-struct GradientDirection {
-  GradientDirectionType type;
-  std::variant<Float, GradientKeyword> value;
-
-  bool operator==(const GradientDirection &other) const
-  {
-    return type == other.type && value == other.value;
-  }
-
-#ifdef RN_SERIALIZABLE_STATE
-  folly::dynamic toDynamic() const;
-#endif
-};
+using GradientDirection = std::variant<Float, GradientKeyword>;
 
 struct LinearGradient {
   GradientDirection direction;
   std::vector<ColorStop> colorStops;
 
-  bool operator==(const LinearGradient &other) const
-  {
-    return direction == other.direction && colorStops == other.colorStops;
-  }
+  bool operator==(const LinearGradient &other) const = default;
 
 #ifdef RN_SERIALIZABLE_STATE
   folly::dynamic toDynamic() const;

package/ReactCommon/react/renderer/graphics/Point.h

@@ -64,8 +64,6 @@ struct Point {
   }
 
   inline bool operator==(const Point &rhs) const = default;
-
-  inline bool operator!=(const Point &rhs) const = default;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/graphics/RadialGradient.h

@@ -31,15 +31,7 @@ struct RadialGradientSize {
     ValueUnit x;
     ValueUnit y;
 
-    bool operator==(const Dimensions &other) const
-    {
-      return x == other.x && y == other.y;
-    }
-
-    bool operator!=(const Dimensions &other) const
-    {
-      return !(*this == other);
-    }
+    bool operator==(const Dimensions &other) const = default;
 
 #ifdef RN_SERIALIZABLE_STATE
     folly::dynamic toDynamic() const;
@@ -48,15 +40,7 @@ struct RadialGradientSize {
 
   std::variant<SizeKeyword, Dimensions> value;
 
-  bool operator==(const RadialGradientSize &other) const
-  {
-    return value == other.value;
-  }
-
-  bool operator!=(const RadialGradientSize &other) const
-  {
-    return !(*this == other);
-  }
+  bool operator==(const RadialGradientSize &other) const = default;
 
 #ifdef RN_SERIALIZABLE_STATE
   folly::dynamic toDynamic() const;
@@ -69,15 +53,7 @@ struct RadialGradientPosition {
   std::optional<ValueUnit> right;
   std::optional<ValueUnit> bottom;
 
-  bool operator==(const RadialGradientPosition &other) const
-  {
-    return top == other.top && left == other.left && right == other.right && bottom == other.bottom;
-  }
-
-  bool operator!=(const RadialGradientPosition &other) const
-  {
-    return !(*this == other);
-  }
+  bool operator==(const RadialGradientPosition &other) const = default;
 
 #ifdef RN_SERIALIZABLE_STATE
   folly::dynamic toDynamic() const;
@@ -90,14 +66,7 @@ struct RadialGradient {
   RadialGradientPosition position;
   std::vector<ColorStop> colorStops;
 
-  bool operator==(const RadialGradient &other) const
-  {
-    return shape == other.shape && size == other.size && position == other.position && colorStops == other.colorStops;
-  }
-  bool operator!=(const RadialGradient &other) const
-  {
-    return !(*this == other);
-  }
+  bool operator==(const RadialGradient &other) const = default;
 
 #ifdef RN_SERIALIZABLE_STATE
   folly::dynamic toDynamic() const;

package/ReactCommon/react/renderer/graphics/React-graphics.podspec

@@ -47,6 +47,7 @@ Pod::Spec.new do |s|
 
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
+  s.dependency "React-featureflags"
   s.dependency "React-utils"
 
   depend_on_js_engine(s)

package/ReactCommon/react/renderer/graphics/Rect.h

@@ -24,15 +24,7 @@ struct Rect {
   Point origin{.x = 0, .y = 0};
   Size size{.width = 0, .height = 0};
 
-  bool operator==(const Rect &rhs) const noexcept
-  {
-    return std::tie(this->origin, this->size) == std::tie(rhs.origin, rhs.size);
-  }
-
-  bool operator!=(const Rect &rhs) const noexcept
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const Rect &rhs) const noexcept = default;
 
   Float getMaxX() const noexcept
   {

package/ReactCommon/react/renderer/graphics/RectangleCorners.h

@@ -25,16 +25,7 @@ struct RectangleCorners {
   T bottomLeft{};
   T bottomRight{};
 
-  bool operator==(const RectangleCorners<T> &rhs) const noexcept
-  {
-    return std::tie(this->topLeft, this->topRight, this->bottomLeft, this->bottomRight) ==
-        std::tie(rhs.topLeft, rhs.topRight, rhs.bottomLeft, rhs.bottomRight);
-  }
-
-  bool operator!=(const RectangleCorners<T> &rhs) const noexcept
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const RectangleCorners<T> &rhs) const noexcept = default;
 
   bool isUniform() const noexcept
   {

package/ReactCommon/react/renderer/graphics/RectangleEdges.h

@@ -26,16 +26,7 @@ struct RectangleEdges {
   T right{};
   T bottom{};
 
-  bool operator==(const RectangleEdges<T> &rhs) const noexcept
-  {
-    return std::tie(this->left, this->top, this->right, this->bottom) ==
-        std::tie(rhs.left, rhs.top, rhs.right, rhs.bottom);
-  }
-
-  bool operator!=(const RectangleEdges<T> &rhs) const noexcept
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const RectangleEdges<T> &rhs) const noexcept = default;
 
   bool isUniform() const noexcept
   {

package/ReactCommon/react/renderer/graphics/Size.h

@@ -42,11 +42,6 @@ inline bool operator==(const Size &rhs, const Size &lhs) noexcept
   return std::tie(lhs.width, lhs.height) == std::tie(rhs.width, rhs.height);
 }
 
-inline bool operator!=(const Size &rhs, const Size &lhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
 } // namespace facebook::react
 
 namespace std {

package/ReactCommon/react/renderer/graphics/Transform.cpp

@@ -356,10 +356,6 @@ bool Transform::operator==(const Transform& rhs) const noexcept {
   return true;
 }
 
-bool Transform::operator!=(const Transform& rhs) const noexcept {
-  return !(*this == rhs);
-}
-
 Transform Transform::operator*(const Transform& rhs) const {
   if (*this == Transform::Identity()) {
     return rhs;

package/ReactCommon/react/renderer/graphics/Transform.h

@@ -19,9 +19,7 @@
 #include <react/renderer/graphics/Vector.h>
 #include <react/utils/hash_combine.h>
 
-#ifdef ANDROID
 #include <folly/dynamic.h>
-#endif
 
 namespace facebook::react {
 
@@ -51,14 +49,7 @@ struct TransformOrigin {
   std::array<ValueUnit, 2> xy = {ValueUnit(0.0f, UnitType::Undefined), ValueUnit(0.0f, UnitType::Undefined)};
   float z = 0.0f;
 
-  bool operator==(const TransformOrigin &other) const
-  {
-    return xy[0] == other.xy[0] && xy[1] == other.xy[1] && z == other.z;
-  }
-  bool operator!=(const TransformOrigin &other) const
-  {
-    return !(*this == other);
-  }
+  bool operator==(const TransformOrigin &other) const = default;
   bool isSet() const
   {
     return xy[0].value != 0.0f || xy[0].unit != UnitType::Undefined || xy[1].value != 0.0f ||
@@ -159,7 +150,6 @@ struct Transform {
    * Equality operators.
    */
   bool operator==(const Transform &rhs) const noexcept;
-  bool operator!=(const Transform &rhs) const noexcept;
 
   /*
    * Matrix subscript.
@@ -177,7 +167,6 @@ struct Transform {
   /**
    * Convert to folly::dynamic.
    */
-#ifdef ANDROID
   operator folly::dynamic() const
   {
     return folly::dynamic::array(
@@ -198,7 +187,6 @@ struct Transform {
         matrix[14],
         matrix[15]);
   }
-#endif
 };
 
 /*

package/ReactCommon/react/renderer/graphics/TransformUtils.h

@@ -0,0 +1,95 @@
+/*
+ * 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 <folly/dynamic.h>
+#include <react/renderer/graphics/Transform.h>
+#include <react/renderer/graphics/ValueUnit.h>
+
+namespace facebook::react {
+
+/**
+ * Serializes a ValueUnit to a folly::dynamic object and appends it to the
+ * result array. Handles percentage values by converting them to strings
+ * (e.g., "50%").
+ */
+inline void serializeTransformOperationValue(
+    const std::string &operationName,
+    const ValueUnit &valueUnit,
+    folly::dynamic &resultArray)
+{
+  folly::dynamic result = folly::dynamic::object();
+  if (valueUnit.unit == UnitType::Percent) {
+    result[operationName] = std::to_string(valueUnit.value) + "%";
+  } else {
+    result[operationName] = valueUnit.value;
+  }
+  resultArray.push_back(std::move(result));
+}
+
+inline void serializeTransformAxis(
+    const TransformOperation &operation,
+    const std::string &operationName,
+    float defaultValue,
+    folly::dynamic &resultTranslateArray)
+{
+  if (operation.x.value != defaultValue) {
+    serializeTransformOperationValue(operationName + "X", operation.x, resultTranslateArray);
+  }
+  if (operation.y.value != defaultValue) {
+    serializeTransformOperationValue(operationName + "Y", operation.y, resultTranslateArray);
+  }
+  if (operation.z.value != defaultValue) {
+    serializeTransformOperationValue(operationName + "Z", operation.z, resultTranslateArray);
+  }
+}
+
+inline void updateTransformProps(
+    const Transform &transform,
+    const TransformOperation &operation,
+    folly::dynamic &resultTranslateArray)
+{
+  // See serialization rules in:
+  // react-native-github/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h?lines=592
+  std::string operationName;
+  switch (operation.type) {
+    case TransformOperationType::Scale:
+      operationName = "scale";
+      if (operation.x == operation.y && operation.x == operation.z) {
+        serializeTransformOperationValue(operationName, operation.x, resultTranslateArray);
+      } else {
+        serializeTransformAxis(operation, operationName, 1.0f, resultTranslateArray);
+      }
+      return;
+    case TransformOperationType::Translate:
+      serializeTransformAxis(operation, "translate", 0, resultTranslateArray);
+      return;
+    case TransformOperationType::Rotate:
+      serializeTransformAxis(operation, "rotate", 0, resultTranslateArray);
+      return;
+    case TransformOperationType::Perspective:
+      serializeTransformAxis(operation, "perspective", 0, resultTranslateArray);
+      return;
+    case TransformOperationType::Arbitrary: {
+      folly::dynamic result = folly::dynamic::object();
+      result["matrix"] = transform;
+      resultTranslateArray.push_back(std::move(result));
+      return;
+    }
+    case TransformOperationType::Identity:
+      // Do nothing
+      return;
+    case TransformOperationType::Skew:
+      serializeTransformAxis(operation, "skew", 0, resultTranslateArray);
+      return;
+    default:
+      return;
+  }
+}
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/graphics/ValueUnit.h

@@ -26,18 +26,10 @@ struct ValueUnit {
   float value{0.0f};
   UnitType unit{UnitType::Undefined};
 
-  ValueUnit() = default;
-  ValueUnit(float v, UnitType u) : value(v), unit(u) {}
+  constexpr ValueUnit() = default;
+  constexpr ValueUnit(float v, UnitType u) : value(v), unit(u) {}
 
-  bool operator==(const ValueUnit &other) const
-  {
-    return value == other.value && unit == other.unit;
-  }
-
-  bool operator!=(const ValueUnit &other) const
-  {
-    return !(*this == other);
-  }
+  constexpr bool operator==(const ValueUnit &other) const = default;
 
   constexpr float resolve(float referenceLength) const
   {

package/ReactCommon/react/renderer/graphics/fromRawValueShared.h

@@ -6,7 +6,10 @@
  */
 
 #include <react/debug/react_native_expect.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/core/RawValue.h>
+#include <react/renderer/css/CSSColor.h>
+#include <react/renderer/css/CSSValueParser.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/utils/ContextContainer.h>
 
@@ -24,7 +27,16 @@ inline void fromRawValueShared(
 {
   ColorComponents colorComponents = {0, 0, 0, 0};
 
-  if (value.hasType<int>()) {
+  if (ReactNativeFeatureFlags::enableNativeCSSParsing() && value.hasType<std::string>()) {
+    auto cssColor = parseCSSProperty<CSSColor>((std::string)value);
+    if (std::holds_alternative<CSSColor>(cssColor)) {
+      auto c = std::get<CSSColor>(cssColor);
+      result = hostPlatformColorFromRGBA(c.r, c.g, c.b, c.a);
+      return;
+    }
+    // Unparseable string - fall through to parsePlatformColor
+    result = parsePlatformColor(contextContainer, surfaceId, value);
+  } else if (value.hasType<int>()) {
     auto argb = (int64_t)value;
     auto ratio = 255.f;
     colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;

package/ReactCommon/react/renderer/imagemanager/ImageManager.h

@@ -17,10 +17,6 @@
 
 namespace facebook::react {
 
-class ImageManager;
-
-using SharedImageManager [[deprecated("Use std::shared_ptr<ImageManager> instead.")]] = std::shared_ptr<ImageManager>;
-
 /*
  * Cross platform facade for image management (e.g. iOS-specific
  * RCTImageManager)

package/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp

@@ -21,11 +21,11 @@ ImageResponseObserverCoordinator::ImageResponseObserverCoordinator(
       cancelRequest_(std::move(cancelationFunction)) {}
 
 void ImageResponseObserverCoordinator::addObserver(
-    const ImageResponseObserver& observer) const {
+    std::shared_ptr<const ImageResponseObserver> observer) const {
   mutex_.lock();
   switch (status_) {
     case ImageResponse::Status::Loading: {
-      observers_.push_back(&observer);
+      observers_.push_back(observer);
       mutex_.unlock();
       break;
     }
@@ -34,18 +34,18 @@ void ImageResponseObserverCoordinator::addObserver(
       auto imageMetadata = imageMetadata_;
       consumeResponse();
       mutex_.unlock();
-      observer.didReceiveImage(ImageResponse{imageData, imageMetadata});
+      observer->didReceiveImage(ImageResponse{imageData, imageMetadata});
       break;
     }
     case ImageResponse::Status::Failed: {
       auto imageErrorData = imageErrorData_;
       mutex_.unlock();
-      observer.didReceiveFailure(ImageLoadError{imageErrorData});
+      observer->didReceiveFailure(ImageLoadError{imageErrorData});
       break;
     }
     case ImageResponse::Status::Cancelled:
     case ImageResponse::Status::Consumed: {
-      observers_.push_back(&observer);
+      observers_.push_back(observer);
       status_ = ImageResponse::Status::Loading;
       mutex_.unlock();
       resumeRequest_();
@@ -55,13 +55,12 @@ void ImageResponseObserverCoordinator::addObserver(
 }
 
 void ImageResponseObserverCoordinator::removeObserver(
-    const ImageResponseObserver& observer) const {
+    const std::shared_ptr<const ImageResponseObserver>& observer) const {
   std::scoped_lock lock(mutex_);
 
-  // We remove only one element to maintain a balance between add/remove calls.
-  auto position = std::find(observers_.begin(), observers_.end(), &observer);
+  auto position = std::find(observers_.begin(), observers_.end(), observer);
   if (position != observers_.end()) {
-    observers_.erase(position, observers_.end());
+    observers_.erase(position);
 
     if (observers_.empty() && status_ == ImageResponse::Status::Loading) {
       status_ = ImageResponse::Status::Cancelled;
@@ -81,7 +80,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseProgress(
       status_ == ImageResponse::Status::Cancelled);
   mutex_.unlock();
 
-  for (auto observer : observers) {
+  for (const auto& observer : observers) {
     observer->didReceiveProgress(progress, loaded, total);
   }
 }
@@ -101,7 +100,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseComplete(
   }
   mutex_.unlock();
 
-  for (auto observer : observers) {
+  for (const auto& observer : observers) {
     observer->didReceiveImage(imageResponse);
   }
 }
@@ -117,7 +116,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseFailed(
   auto observers = observers_;
   mutex_.unlock();
 
-  for (auto observer : observers) {
+  for (const auto& observer : observers) {
     observer->didReceiveFailure(loadError);
   }
 }

package/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h

@@ -11,6 +11,7 @@
 #include <react/renderer/imagemanager/ImageResponseObserver.h>
 #include <react/utils/SharedFunction.h>
 
+#include <memory>
 #include <mutex>
 #include <vector>
 
@@ -31,12 +32,12 @@ class ImageResponseObserverCoordinator {
    * If the current image request status is not equal to `Loading`, the observer
    * will be called immediately.
    */
-  void addObserver(const ImageResponseObserver &observer) const;
+  void addObserver(std::shared_ptr<const ImageResponseObserver> observer) const;
 
   /*
    * Interested parties may stop observing the image response.
    */
-  void removeObserver(const ImageResponseObserver &observer) const;
+  void removeObserver(const std::shared_ptr<const ImageResponseObserver> &observer) const;
 
   /*
    * Platform-specific image loader will call this method with progress updates.
@@ -65,7 +66,7 @@ class ImageResponseObserverCoordinator {
    * List of observers.
    * Mutable: protected by mutex_.
    */
-  mutable std::vector<const ImageResponseObserver *> observers_;
+  mutable std::vector<std::shared_ptr<const ImageResponseObserver>> observers_;
 
   /*
    * Current status of image loading.

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h

@@ -62,42 +62,7 @@ class ImageRequestParams {
   std::string analyticTag{};
   Size size{};
 
-  bool operator==(const ImageRequestParams &rhs) const
-  {
-    return std::tie(
-               this->blurRadius,
-               this->defaultSource,
-               this->resizeMode,
-               this->resizeMethod,
-               this->resizeMultiplier,
-               this->shouldNotifyLoadEvents,
-               this->overlayColor,
-               this->tintColor,
-               this->fadeDuration,
-               this->progressiveRenderingEnabled,
-               this->loadingIndicatorSource,
-               this->analyticTag,
-               this->size) ==
-        std::tie(
-               rhs.blurRadius,
-               rhs.defaultSource,
-               rhs.resizeMode,
-               rhs.resizeMethod,
-               rhs.resizeMultiplier,
-               rhs.shouldNotifyLoadEvents,
-               rhs.overlayColor,
-               rhs.tintColor,
-               rhs.fadeDuration,
-               rhs.progressiveRenderingEnabled,
-               rhs.loadingIndicatorSource,
-               rhs.analyticTag,
-               rhs.size);
-  }
-
-  bool operator!=(const ImageRequestParams &rhs) const
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const ImageRequestParams &rhs) const = default;
 };
 
 struct ImageRequestItem {

package/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h

@@ -18,15 +18,7 @@ class ImageRequestParams {
 
   Float blurRadius{};
 
-  bool operator==(const ImageRequestParams &rhs) const
-  {
-    return this->blurRadius == rhs.blurRadius;
-  }
-
-  bool operator!=(const ImageRequestParams &rhs) const
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const ImageRequestParams &rhs) const = default;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h

@@ -18,15 +18,7 @@ class ImageRequestParams {
 
   Float blurRadius{};
 
-  bool operator==(const ImageRequestParams &rhs) const
-  {
-    return this->blurRadius == rhs.blurRadius;
-  }
-
-  bool operator!=(const ImageRequestParams &rhs) const
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const ImageRequestParams &rhs) const = default;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.mm

@@ -90,7 +90,7 @@ using namespace facebook::react;
                                  partialLoadBlock:nil
                                   completionBlock:completionBlock];
 
-  auto result = dispatch_group_wait(imageWaitGroup, dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC));
+  auto result = dispatch_group_wait(imageWaitGroup, dispatch_time(DISPATCH_TIME_NOW, 20 * NSEC_PER_SEC));
   if (result != 0) {
     RCTLogError(@"Image timed out in test environment for url: %@", loaderRequest.imageURL);
   }

package/ReactCommon/react/renderer/imagemanager/primitives.h

@@ -39,11 +39,6 @@ class ImageSource {
     return std::tie(this->type, this->uri) == std::tie(rhs.type, rhs.uri);
   }
 
-  bool operator!=(const ImageSource &rhs) const
-  {
-    return !(*this == rhs);
-  }
-
 #ifdef RN_SERIALIZABLE_STATE
   folly::dynamic toDynamic() const
   {