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

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

@@ -24,7 +24,7 @@ boost_config = get_boost_config()
 boost_compiler_flags = boost_config[:compiler_flags]
 
 Pod::Spec.new do |s|
-  source_files = "**/*.{m,mm,cpp,h}"
+  source_files = "*.{m,mm,cpp,h}", "platform/ios/**/*.{m,mm,cpp,h}"
   header_search_paths = [
     "\"$(PODS_ROOT)/boost\"",
     "\"$(PODS_TARGET_SRCROOT)/../../../\"",
@@ -44,10 +44,6 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.source_files           = source_files
-  s.exclude_files          = "tests",
-                             "platform/android",
-                             "platform/cxx",
-                             "platform/windows",
   s.header_dir             = "react/renderer/graphics"
   s.framework = "UIKit"
 
@@ -70,4 +66,10 @@ Pod::Spec.new do |s|
   s.dependency "DoubleConversion"
   s.dependency "fast_float", "6.1.4"
   s.dependency "fmt", "9.1.0"
+  
+  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
+    s.dependency "hermes-engine"
+  else
+    s.dependency "React-jsc"
+  end
 end

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

@@ -169,7 +169,8 @@ Transform Transform::Rotate(Float x, Float y, Float z) {
 
 Transform Transform::FromTransformOperation(
     TransformOperation transformOperation,
-    const Size& size) {
+    const Size& size,
+    const Transform& transform) {
   if (transformOperation.type == TransformOperationType::Perspective) {
     return Transform::Perspective(transformOperation.x.resolve(0));
   }
@@ -196,8 +197,16 @@ Transform Transform::FromTransformOperation(
         transformOperation.y.resolve(0),
         transformOperation.z.resolve(0));
   }
+  // when using arbitrary transform, the caller is responsible for applying the
+  // value
+  if (transformOperation.type == TransformOperationType::Arbitrary) {
+    auto arbitraryTransform = Transform{};
+    arbitraryTransform.operations.push_back(transformOperation);
+    arbitraryTransform.matrix = transform.matrix;
+    return arbitraryTransform;
+  }
 
-  // Identity or Arbitrary
+  // Identity
   return Transform::Identity();
 }
 

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

@@ -101,7 +101,8 @@ struct Transform {
    */
   static Transform FromTransformOperation(
       TransformOperation transformOperation,
-      const Size& size);
+      const Size& size,
+      const Transform& transform = Transform::Identity());
   static TransformOperation DefaultTransformOperation(
       TransformOperationType type);
 

package/ReactCommon/react/renderer/imagemanager/CMakeLists.txt

@@ -16,7 +16,7 @@ add_compile_options(
 
 file(GLOB react_render_imagemanager_SRC CONFIGURE_DEPENDS
         *.cpp
-        platform/cxx/react/renderer/imagemanager/*.cpp)
+        platform/android/react/renderer/imagemanager/*.cpp)
 
 add_library(react_render_imagemanager
         OBJECT
@@ -25,16 +25,18 @@ add_library(react_render_imagemanager
 target_include_directories(react_render_imagemanager
         PUBLIC
           ${REACT_COMMON_DIR}
-          ${CMAKE_CURRENT_SOURCE_DIR}/platform/cxx/
+          ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
         PRIVATE
           ${CMAKE_CURRENT_SOURCE_DIR}
         )
 
 target_link_libraries(react_render_imagemanager
         folly_runtime
+        mapbufferjni
         react_debug
         react_render_core
         react_render_debug
         react_render_graphics
         react_render_mounting
+        reactnativejni
         yoga)

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

@@ -11,6 +11,7 @@
 
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/imagemanager/ImageRequest.h>
+#include <react/renderer/imagemanager/ImageRequestParams.h>
 #include <react/renderer/imagemanager/primitives.h>
 #include <react/utils/ContextContainer.h>
 
@@ -33,6 +34,12 @@ class ImageManager {
       const ImageSource& imageSource,
       SurfaceId surfaceId) const;
 
+  virtual ImageRequest requestImage(
+      const ImageSource& imageSource,
+      SurfaceId surfaceId,
+      const ImageRequestParams& imageRequestParams,
+      Tag tag) const;
+
  private:
   void* self_{};
 };

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+#include "ImageFetcher.h"
+#include <react/renderer/imagemanager/conversions.h>
+
+namespace facebook::react {
+
+ImageRequest ImageFetcher::requestImage(
+    const ImageSource& imageSource,
+    const ImageRequestParams& imageRequestParams,
+    SurfaceId surfaceId,
+    Tag tag) const {
+  auto fabricUIManager_ =
+      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+  static auto requestImage =
+      fabricUIManager_->getClass()
+          ->getMethod<void(
+              std::string, SurfaceId, Tag, JReadableMapBuffer::javaobject)>(
+              "experimental_prefetchResource");
+
+  auto serializedImageRequest =
+      serializeImageRequest(imageSource, imageRequestParams);
+
+  auto readableMapBuffer =
+      JReadableMapBuffer::createWithContents(std::move(serializedImageRequest));
+
+  requestImage(
+      fabricUIManager_,
+      "RCTImageView",
+      surfaceId,
+      tag,
+      readableMapBuffer.get());
+
+  auto telemetry = std::make_shared<ImageTelemetry>(surfaceId);
+
+  return {imageSource, telemetry};
+}
+} // namespace facebook::react

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

@@ -0,0 +1,36 @@
+/*
+ * 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 <fbjni/fbjni.h>
+
+#include <react/common/mapbuffer/JReadableMapBuffer.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/imagemanager/ImageRequest.h>
+#include <react/renderer/imagemanager/ImageRequestParams.h>
+#include <react/utils/ContextContainer.h>
+
+#include <utility>
+
+namespace facebook::react {
+
+class ImageFetcher {
+ public:
+  ImageFetcher(ContextContainer::Shared contextContainer)
+      : contextContainer_(std::move(contextContainer)) {}
+
+  ImageRequest requestImage(
+      const ImageSource& imageSource,
+      const ImageRequestParams& imageRequestParams,
+      SurfaceId surfaceId,
+      Tag tag) const;
+
+ private:
+  ContextContainer::Shared contextContainer_;
+};
+} // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageManager.cpp

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+#include "ImageManager.h"
+
+#include <react/featureflags/ReactNativeFeatureFlags.h>
+#include "ImageFetcher.h"
+
+namespace facebook::react {
+
+ImageManager::ImageManager(const ContextContainer::Shared& contextContainer)
+    : self_(new ImageFetcher(contextContainer)) {}
+
+ImageManager::~ImageManager() {
+  // @lint-ignore CLANGTIDY cppcoreguidelines-no-malloc
+  free(self_);
+}
+
+ImageRequest ImageManager::requestImage(
+    const ImageSource& imageSource,
+    SurfaceId surfaceId) const {
+  return requestImage(imageSource, surfaceId, ImageRequestParams{}, {});
+}
+
+ImageRequest ImageManager::requestImage(
+    const ImageSource& imageSource,
+    SurfaceId surfaceId,
+    const ImageRequestParams& imageRequestParams,
+    Tag tag) const {
+  if (ReactNativeFeatureFlags::enableImagePrefetchingAndroid()) {
+    // @lint-ignore CLANGTIDY cppcoreguidelines-pro-type-cstyle-cast
+    return ((ImageFetcher*)self_)
+        ->requestImage(imageSource, imageRequestParams, surfaceId, tag);
+  } else {
+    return {imageSource, nullptr, {}};
+  }
+}
+
+} // namespace facebook::react

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

@@ -0,0 +1,94 @@
+/*
+ * 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 <utility>
+
+#include <react/renderer/graphics/Color.h>
+#include <react/renderer/graphics/Float.h>
+#include <react/renderer/imagemanager/primitives.h>
+
+namespace facebook::react {
+
+class ImageRequestParams {
+ public:
+  ImageRequestParams() = default;
+  ImageRequestParams(
+      Float blurRadius,
+      ImageSource defaultSource,
+      ImageResizeMode resizeMode,
+      std::string resizeMethod,
+      Float resizeMultiplier,
+      bool shouldNotifyLoadEvents,
+      SharedColor overlayColor,
+      SharedColor tintColor,
+      Float fadeDuration,
+      bool progressiveRenderingEnabled,
+      ImageSource loadingIndicatorSource,
+      std::string analyticTag)
+      : blurRadius(blurRadius),
+        defaultSource(std::move(defaultSource)),
+        resizeMode(resizeMode),
+        resizeMethod(std::move(resizeMethod)),
+        resizeMultiplier(resizeMultiplier),
+        shouldNotifyLoadEvents(shouldNotifyLoadEvents),
+        overlayColor(overlayColor),
+        tintColor(tintColor),
+        fadeDuration(fadeDuration),
+        progressiveRenderingEnabled(progressiveRenderingEnabled),
+        loadingIndicatorSource(std::move(loadingIndicatorSource)),
+        analyticTag(std::move(analyticTag)) {}
+
+  Float blurRadius{};
+  ImageSource defaultSource{};
+  ImageResizeMode resizeMode{ImageResizeMode::Stretch};
+  std::string resizeMethod{};
+  Float resizeMultiplier{};
+  bool shouldNotifyLoadEvents{};
+  SharedColor overlayColor{};
+  SharedColor tintColor{};
+  Float fadeDuration{};
+  bool progressiveRenderingEnabled{};
+  ImageSource loadingIndicatorSource{};
+  std::string analyticTag{};
+
+  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) ==
+        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);
+  }
+
+  bool operator!=(const ImageRequestParams& rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+} // namespace facebook::react

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

@@ -0,0 +1,101 @@
+/*
+ * 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 <string>
+
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/imagemanager/ImageRequestParams.h>
+#include <react/renderer/imagemanager/primitives.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+namespace facebook::react {
+
+inline std::string toString(const ImageResizeMode& value) {
+  switch (value) {
+    case ImageResizeMode::Cover:
+      return "cover";
+    case ImageResizeMode::Contain:
+      return "contain";
+    case ImageResizeMode::Stretch:
+      return "stretch";
+    case ImageResizeMode::Center:
+      return "center";
+    case ImageResizeMode::Repeat:
+      return "repeat";
+    case ImageResizeMode::None:
+      return "none";
+  }
+}
+
+constexpr static MapBuffer::Key IS_KEY_URI = 0;
+constexpr static MapBuffer::Key IS_KEY_DEFAULT_SRC = 1;
+constexpr static MapBuffer::Key IS_KEY_RESIZE_MODE = 2;
+constexpr static MapBuffer::Key IS_KEY_RESIZE_METHOD = 3;
+constexpr static MapBuffer::Key IS_KEY_BLUR_RADIUS = 4;
+constexpr static MapBuffer::Key IS_KEY_VIEW_WIDTH = 5;
+constexpr static MapBuffer::Key IS_KEY_VIEW_HEIGHT = 6;
+constexpr static MapBuffer::Key IS_KEY_RESIZE_MULTIPLIER = 7;
+constexpr static MapBuffer::Key IS_KEY_SHOULD_NOTIFY_LOAD_EVENTS = 8;
+constexpr static MapBuffer::Key IS_KEY_OVERLAY_COLOR = 9;
+constexpr static MapBuffer::Key IS_KEY_TINT_COLOR = 10;
+constexpr static MapBuffer::Key IS_KEY_FADE_DURATION = 11;
+constexpr static MapBuffer::Key IS_KEY_PROGRESSIVE_RENDERING_ENABLED = 12;
+constexpr static MapBuffer::Key IS_KEY_LOADING_INDICATOR_SRC = 13;
+constexpr static MapBuffer::Key IS_KEY_ANALYTIC_TAG = 14;
+
+inline void serializeImageSource(
+    MapBufferBuilder& builder,
+    const ImageSource& imageSource) {
+  builder.putString(IS_KEY_URI, imageSource.uri);
+  builder.putDouble(IS_KEY_VIEW_WIDTH, imageSource.size.width);
+  builder.putDouble(IS_KEY_VIEW_HEIGHT, imageSource.size.height);
+}
+
+inline void serializeImageRequestParams(
+    MapBufferBuilder& builder,
+    const ImageRequestParams& imageRequestParams) {
+  builder.putString(IS_KEY_DEFAULT_SRC, imageRequestParams.defaultSource.uri);
+  builder.putString(
+      IS_KEY_RESIZE_MODE, toString(imageRequestParams.resizeMode));
+  builder.putString(IS_KEY_RESIZE_METHOD, imageRequestParams.resizeMethod);
+  builder.putDouble(IS_KEY_BLUR_RADIUS, imageRequestParams.blurRadius);
+  builder.putDouble(
+      IS_KEY_RESIZE_MULTIPLIER, imageRequestParams.resizeMultiplier);
+  builder.putBool(
+      IS_KEY_SHOULD_NOTIFY_LOAD_EVENTS,
+      imageRequestParams.shouldNotifyLoadEvents);
+  if (isColorMeaningful(imageRequestParams.overlayColor)) {
+    builder.putInt(
+        IS_KEY_OVERLAY_COLOR, toAndroidRepr(imageRequestParams.overlayColor));
+  }
+  if (isColorMeaningful(imageRequestParams.tintColor)) {
+    builder.putInt(
+        IS_KEY_TINT_COLOR, toAndroidRepr(imageRequestParams.tintColor));
+  }
+  builder.putDouble(IS_KEY_FADE_DURATION, imageRequestParams.fadeDuration);
+  builder.putBool(
+      IS_KEY_PROGRESSIVE_RENDERING_ENABLED,
+      imageRequestParams.progressiveRenderingEnabled);
+  builder.putString(
+      IS_KEY_LOADING_INDICATOR_SRC,
+      imageRequestParams.loadingIndicatorSource.uri);
+  builder.putString(IS_KEY_ANALYTIC_TAG, imageRequestParams.analyticTag);
+}
+
+inline MapBuffer serializeImageRequest(
+    const ImageSource& imageSource,
+    const ImageRequestParams& imageRequestParams) {
+  auto builder = MapBufferBuilder();
+  serializeImageSource(builder, imageSource);
+  serializeImageRequestParams(builder, imageRequestParams);
+  return builder.build();
+}
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp

@@ -22,7 +22,15 @@ ImageManager::~ImageManager() {
 
 ImageRequest ImageManager::requestImage(
     const ImageSource& imageSource,
-    SurfaceId /*surfaceId*/) const {
+    SurfaceId surfaceId) const {
+  return requestImage(imageSource, surfaceId, ImageRequestParams{}, {});
+}
+
+ImageRequest ImageManager::requestImage(
+    const ImageSource& imageSource,
+    SurfaceId /*surfaceId*/,
+    const ImageRequestParams& /*imageRequestParams*/,
+    Tag /*tag*/) const {
   // Not implemented.
   return {imageSource, nullptr, {}};
 }

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

@@ -0,0 +1,30 @@
+/*
+ * 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 <react/renderer/graphics/Float.h>
+
+namespace facebook::react {
+
+class ImageRequestParams {
+ public:
+  ImageRequestParams() = default;
+  explicit ImageRequestParams(Float blurRadius) : blurRadius(blurRadius) {}
+
+  Float blurRadius{};
+
+  bool operator==(const ImageRequestParams& rhs) const {
+    return this->blurRadius == rhs.blurRadius;
+  }
+
+  bool operator!=(const ImageRequestParams& rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+} // namespace facebook::react

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

@@ -35,6 +35,15 @@ ImageManager::~ImageManager()
 }
 
 ImageRequest ImageManager::requestImage(const ImageSource &imageSource, SurfaceId surfaceId) const
+{
+  return requestImage(imageSource, surfaceId, ImageRequestParams{}, {});
+}
+
+ImageRequest ImageManager::requestImage(
+    const ImageSource &imageSource,
+    SurfaceId surfaceId,
+    const ImageRequestParams & /*imageRequestParams*/,
+    Tag /*tag*/) const
 {
   RCTImageManager *imageManager = (__bridge RCTImageManager *)self_;
   return [imageManager requestImage:imageSource surfaceId:surfaceId];

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

@@ -0,0 +1,30 @@
+/*
+ * 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 <react/renderer/graphics/Float.h>
+
+namespace facebook::react {
+
+class ImageRequestParams {
+ public:
+  ImageRequestParams() {}
+  ImageRequestParams(Float blurRadius) : blurRadius(blurRadius) {}
+
+  Float blurRadius{};
+
+  bool operator==(const ImageRequestParams& rhs) const {
+    return this->blurRadius == rhs.blurRadius;
+  }
+
+  bool operator!=(const ImageRequestParams& rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+} // namespace facebook::react

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

@@ -7,7 +7,7 @@
 
 #import "RCTImageManager.h"
 
-#import <cxxreact/SystraceSection.h>
+#import <cxxreact/TraceSection.h>
 #import <react/utils/ManagedObjectWrapper.h>
 #import <react/utils/SharedFunction.h>
 
@@ -38,7 +38,7 @@ using namespace facebook::react;
 
 - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfaceId
 {
-  SystraceSection s("RCTImageManager::requestImage");
+  TraceSection s("RCTImageManager::requestImage");
 
   NSURLRequest *request = NSURLRequestFromImageSource(imageSource);
   std::shared_ptr<ImageTelemetry> telemetry;