react-native 0.71.4 → 0.72.0-rc.0

package/ReactCommon/react/renderer/graphics/{platform/cxx/react/renderer/graphics/Color.cpp → Color.cpp}

@@ -26,7 +26,7 @@ SharedColor colorFromComponents(ColorComponents components) {
       ((int)round(components.blue * ratio) & 0xff)};
 }
 
-ColorComponents colorComponentsFromColor(SharedColor const &sharedColor) {
+ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
   float ratio = 255;
   Color color = *sharedColor;
   return ColorComponents{

package/ReactCommon/react/renderer/graphics/{platform/ios/Color.h → Color.h}

@@ -8,32 +8,29 @@
 #pragma once
 
 #include <cmath>
-#include <optional>
+#include <functional>
+#include <limits>
 
-#include <folly/Hash.h>
 #include <react/renderer/graphics/ColorComponents.h>
-#include <react/renderer/graphics/Float.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Color = int32_t;
 
+/*
+ * On Android, a color can be represented as 32 bits integer, so there is no
+ * need to instantiate complex color objects and then pass them as shared
+ * pointers. Hense instead of using shared_ptr, we use a simple wrapper class
+ * which provides a pointer-like interface.
+ */
 class SharedColor {
  public:
   static const Color UndefinedColor = std::numeric_limits<Color>::max();
 
   SharedColor() : color_(UndefinedColor) {}
 
-  SharedColor(const SharedColor &sharedColor) : color_(sharedColor.color_) {}
-
   SharedColor(Color color) : color_(color) {}
 
-  SharedColor &operator=(const SharedColor &sharedColor) {
-    color_ = sharedColor.color_;
-    return *this;
-  }
-
   Color operator*() const {
     return color_;
   }
@@ -62,12 +59,11 @@ SharedColor clearColor();
 SharedColor blackColor();
 SharedColor whiteColor();
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 template <>
 struct std::hash<facebook::react::SharedColor> {
-  std::size_t operator()(facebook::react::SharedColor const &color) const {
-    return hash<int>()(*color);
+  size_t operator()(facebook::react::SharedColor color) const {
+    return std::hash<decltype(*color)>{}(*color);
   }
 };

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

@@ -13,16 +13,7 @@
 #include <react/renderer/graphics/RectangleCorners.h>
 #include <react/renderer/graphics/RectangleEdges.h>
 #include <react/renderer/graphics/Size.h>
+#include <react/renderer/graphics/Vector.h>
 
-namespace facebook {
-namespace react {
-
-struct Vector {
-  Float x{0};
-  Float y{0};
-  Float z{0};
-  Float w{0};
-};
-
-} // namespace react
-} // namespace facebook
+#warning \
+    "The Geometry.h file is deprecated and will be removed in the next version of React Native. Please update your #include and #import statements to use the specific files. For example, if you imported Geometry.h to use Float.h, replase the #include <react/renderer/graphics/Geometry.h> with #include <react/renderer/graphics/Float.h>"

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

@@ -21,22 +21,37 @@ folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
+  source_files = "**/*.{m,mm,cpp,h}"
+  header_search_paths = [
+    "\"$(PODS_ROOT)/boost\"",
+    "\"$(PODS_TARGET_SRCROOT)/../../../\"",
+    "\"$(PODS_ROOT)/RCT-Folly\"",
+  ]
+
   s.name                   = "React-graphics"
   s.version                = version
   s.summary                = "Fabric for React Native."
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.source_files           = "**/*.{m,mm,cpp,h}"
+  s.source_files           = source_files
   s.exclude_files          = "tests",
                              "platform/android",
                              "platform/cxx"
   s.header_dir             = "react/renderer/graphics"
-  s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/../../../\" \"$(PODS_ROOT)/RCT-Folly\"" }
 
+  if ENV['USE_FRAMEWORKS']
+    s.module_name            = "React_graphics"
+    s.header_mappings_dir  = "../../.."
+    header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
+  end
+
+  s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") }
+
+  s.dependency "glog"
   s.dependency "RCT-Folly/Fabric", folly_version
   s.dependency "React-Core/Default", version
 end

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

@@ -44,7 +44,7 @@ struct RectangleEdges {
 };
 
 template <typename T>
-constexpr RectangleEdges<T> const RectangleEdges<T>::ZERO = {};
+RectangleEdges<T> const RectangleEdges<T>::ZERO = {};
 
 template <typename T>
 RectangleEdges<T> operator+(
@@ -83,6 +83,16 @@ inline Rect insetBy(Rect const &rect, EdgeInsets const &insets) noexcept {
        rect.size.height - insets.top - insets.bottom}};
 }
 
+/*
+ * Adjusts a rectangle by the given edge outsets.
+ */
+inline Rect outsetBy(Rect const &rect, EdgeInsets const &outsets) noexcept {
+  return Rect{
+      {rect.origin.x - outsets.left, rect.origin.y - outsets.top},
+      {rect.size.width + outsets.left + outsets.right,
+       rect.size.height + outsets.top + outsets.bottom}};
+}
+
 } // namespace react
 } // namespace facebook
 

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

@@ -12,7 +12,10 @@
 
 #include <folly/Hash.h>
 #include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/graphics/Point.h>
+#include <react/renderer/graphics/RectangleEdges.h>
+#include <react/renderer/graphics/Size.h>
+#include <react/renderer/graphics/Vector.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
@@ -196,7 +199,7 @@ Size operator*(Size const &size, Transform const &transform);
 Rect operator*(Rect const &rect, Transform const &transform);
 
 /*
- * Applies tranformation to the given EdgeInsets.
+ * Applies transformation to the given EdgeInsets.
  * ONLY SUPPORTS scale transformation.
  */
 EdgeInsets operator*(EdgeInsets const &edgeInsets, Transform const &transform);

package/{ReactAndroid/src/main/jni/react/jni/NativeTime.h → ReactCommon/react/renderer/graphics/Vector.h}

@@ -7,10 +7,17 @@
 
 #pragma once
 
+#include <react/renderer/graphics/Float.h>
+
 namespace facebook {
 namespace react {
 
-double reactAndroidNativePerformanceNowHook();
+struct Vector {
+  Float x{0};
+  Float y{0};
+  Float z{0};
+  Float w{0};
+};
 
 } // namespace react
 } // namespace facebook

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

@@ -7,255 +7,21 @@
 
 #pragma once
 
-#include <butter/map.h>
-#include <glog/logging.h>
-#include <react/debug/react_native_assert.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Geometry.h>
-#include <react/renderer/graphics/PlatformColorParser.h>
-
-namespace facebook {
-namespace react {
-
-#pragma mark - Color
-
-inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    SharedColor &result) {
-  ColorComponents colorComponents = {0, 0, 0, 0};
-
-  if (value.hasType<int>()) {
-    auto argb = (int64_t)value;
-    auto ratio = 255.f;
-    colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;
-    colorComponents.red = ((argb >> 16) & 0xFF) / ratio;
-    colorComponents.green = ((argb >> 8) & 0xFF) / ratio;
-    colorComponents.blue = (argb & 0xFF) / ratio;
-  } else if (value.hasType<std::vector<float>>()) {
-    auto items = (std::vector<float>)value;
-    auto length = items.size();
-    react_native_assert(length == 3 || length == 4);
-    colorComponents.red = items.at(0);
-    colorComponents.green = items.at(1);
-    colorComponents.blue = items.at(2);
-    colorComponents.alpha = length == 4 ? items.at(3) : 1.0f;
-  } else {
-    colorComponents = parsePlatformColor(context, value);
-  }
-
-  result = colorFromComponents(colorComponents);
-}
-
-#ifdef ANDROID
-
-inline int toAndroidRepr(const SharedColor &color) {
-  ColorComponents components = colorComponentsFromColor(color);
-  auto ratio = 255.f;
-  return (
-      ((int)round(components.alpha * ratio) & 0xff) << 24 |
-      ((int)round(components.red * ratio) & 0xff) << 16 |
-      ((int)round(components.green * ratio) & 0xff) << 8 |
-      ((int)round(components.blue * ratio) & 0xff));
-}
-
-#endif
-
-inline std::string toString(const SharedColor &value) {
-  ColorComponents components = colorComponentsFromColor(value);
-  auto ratio = 255.f;
-  return "rgba(" + folly::to<std::string>(round(components.red * ratio)) +
-      ", " + folly::to<std::string>(round(components.green * ratio)) + ", " +
-      folly::to<std::string>(round(components.blue * ratio)) + ", " +
-      folly::to<std::string>(round(components.alpha * ratio)) + ")";
-}
-
-#pragma mark - Geometry
-
-inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    Point &result) {
-  if (value.hasType<butter::map<std::string, Float>>()) {
-    auto map = (butter::map<std::string, Float>)value;
-    for (const auto &pair : map) {
-      if (pair.first == "x") {
-        result.x = pair.second;
-      } else if (pair.first == "y") {
-        result.y = pair.second;
-      }
-    }
-    return;
-  }
-
-  react_native_assert(value.hasType<std::vector<Float>>());
-  if (value.hasType<std::vector<Float>>()) {
-    auto array = (std::vector<Float>)value;
-    react_native_assert(array.size() == 2);
-    if (array.size() >= 2) {
-      result = {array.at(0), array.at(1)};
-    } else {
-      result = {0, 0};
-      LOG(ERROR) << "Unsupported Point vector size: " << array.size();
-    }
-  } else {
-    LOG(ERROR) << "Unsupported Point type";
-  }
-}
-
-inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    Size &result) {
-  if (value.hasType<butter::map<std::string, Float>>()) {
-    auto map = (butter::map<std::string, Float>)value;
-    for (const auto &pair : map) {
-      if (pair.first == "width") {
-        result.width = pair.second;
-      } else if (pair.first == "height") {
-        result.height = pair.second;
-      } else {
-        LOG(ERROR) << "Unsupported Size map key: " << pair.first;
-        react_native_assert(false);
-      }
-    }
-    return;
-  }
-
-  react_native_assert(value.hasType<std::vector<Float>>());
-  if (value.hasType<std::vector<Float>>()) {
-    auto array = (std::vector<Float>)value;
-    react_native_assert(array.size() == 2);
-    if (array.size() >= 2) {
-      result = {array.at(0), array.at(1)};
-    } else {
-      result = {0, 0};
-      LOG(ERROR) << "Unsupported Size vector size: " << array.size();
-    }
-  } else {
-    LOG(ERROR) << "Unsupported Size type";
-  }
-}
-
-inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    EdgeInsets &result) {
-  if (value.hasType<Float>()) {
-    auto number = (Float)value;
-    result = {number, number, number, number};
-    return;
-  }
-
-  if (value.hasType<butter::map<std::string, Float>>()) {
-    auto map = (butter::map<std::string, Float>)value;
-    for (const auto &pair : map) {
-      if (pair.first == "top") {
-        result.top = pair.second;
-      } else if (pair.first == "left") {
-        result.left = pair.second;
-      } else if (pair.first == "bottom") {
-        result.bottom = pair.second;
-      } else if (pair.first == "right") {
-        result.right = pair.second;
-      } else {
-        LOG(ERROR) << "Unsupported EdgeInsets map key: " << pair.first;
-        react_native_assert(false);
-      }
-    }
-    return;
-  }
-
-  react_native_assert(value.hasType<std::vector<Float>>());
-  if (value.hasType<std::vector<Float>>()) {
-    auto array = (std::vector<Float>)value;
-    react_native_assert(array.size() == 4);
-    if (array.size() >= 4) {
-      result = {array.at(0), array.at(1), array.at(2), array.at(3)};
-    } else {
-      result = {0, 0, 0, 0};
-      LOG(ERROR) << "Unsupported EdgeInsets vector size: " << array.size();
-    }
-  } else {
-    LOG(ERROR) << "Unsupported EdgeInsets type";
-  }
-}
-
-inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    CornerInsets &result) {
-  if (value.hasType<Float>()) {
-    auto number = (Float)value;
-    result = {number, number, number, number};
-    return;
-  }
-
-  if (value.hasType<butter::map<std::string, Float>>()) {
-    auto map = (butter::map<std::string, Float>)value;
-    for (const auto &pair : map) {
-      if (pair.first == "topLeft") {
-        result.topLeft = pair.second;
-      } else if (pair.first == "topRight") {
-        result.topRight = pair.second;
-      } else if (pair.first == "bottomLeft") {
-        result.bottomLeft = pair.second;
-      } else if (pair.first == "bottomRight") {
-        result.bottomRight = pair.second;
-      } else {
-        LOG(ERROR) << "Unsupported CornerInsets map key: " << pair.first;
-        react_native_assert(false);
-      }
-    }
-    return;
-  }
-
-  react_native_assert(value.hasType<std::vector<Float>>());
-  if (value.hasType<std::vector<Float>>()) {
-    auto array = (std::vector<Float>)value;
-    react_native_assert(array.size() == 4);
-    if (array.size() >= 4) {
-      result = {array.at(0), array.at(1), array.at(2), array.at(3)};
-    } else {
-      LOG(ERROR) << "Unsupported CornerInsets vector size: " << array.size();
-    }
-  }
-
-  // Error case - we should only here if all other supported cases fail
-  // In dev we would crash on assert before this point
-  result = {0, 0, 0, 0};
-  LOG(ERROR) << "Unsupported CornerInsets type";
-}
-
-inline std::string toString(const Point &point) {
-  return "{" + folly::to<std::string>(point.x) + ", " +
-      folly::to<std::string>(point.y) + "}";
-}
-
-inline std::string toString(const Size &size) {
-  return "{" + folly::to<std::string>(size.width) + ", " +
-      folly::to<std::string>(size.height) + "}";
-}
-
-inline std::string toString(const Rect &rect) {
-  return "{" + toString(rect.origin) + ", " + toString(rect.size) + "}";
-}
-
-inline std::string toString(const EdgeInsets &edgeInsets) {
-  return "{" + folly::to<std::string>(edgeInsets.left) + ", " +
-      folly::to<std::string>(edgeInsets.top) + ", " +
-      folly::to<std::string>(edgeInsets.right) + ", " +
-      folly::to<std::string>(edgeInsets.bottom) + "}";
-}
-
-inline std::string toString(const CornerInsets &cornerInsets) {
-  return "{" + folly::to<std::string>(cornerInsets.topLeft) + ", " +
-      folly::to<std::string>(cornerInsets.topRight) + ", " +
-      folly::to<std::string>(cornerInsets.bottomLeft) + ", " +
-      folly::to<std::string>(cornerInsets.bottomRight) + "}";
-}
-
-} // namespace react
-} // namespace facebook
+#include <react/renderer/core/graphicsConversions.h>
+
+// This file belongs to the React-graphics module.
+// This file also used to have a reference to two files that are located in the
+// react/renderer/core folder. That folder belongs to a module that is called
+// React-Fabric.
+// The React-Fabric module declares an explicit dependency on
+// React-graphics. Including those files in a React-graphics' file created a
+// circular dependency because React-Fabric was explicitly depending on
+// React-graphics, which was implicitly depending on React-Fabric. We break that
+// dependency by moving the old `graphics/conversions.h` file to the
+// React-Fabric module and renaming it `core/graphicsConversions.h`.
+
+#warning \
+    "[DEPRECATION] `graphics/conversions.h` is deprecated and will be removed in the future. \
+    If this warning appears due to a library, please open an issue in that library, and ask for an update. \
+    Please, replace the `#include <react/renderer/graphics/conversions.h>` statements \
+    with `#include <react/renderer/core/graphicsConversions.h>`."

package/ReactCommon/{yoga/yoga/internal/experiments.h → react/renderer/graphics/platform/android/react/renderer/graphics/Float.h}

@@ -7,20 +7,16 @@
 
 #pragma once
 
-#include <cstddef>
+#include <limits>
 
 namespace facebook {
-namespace yoga {
-namespace internal {
+namespace react {
 
-enum struct Experiment : size_t {
-  kDoubleMeasureCallbacks,
-};
-
-void enable(Experiment);
-void disable(Experiment);
-bool toggle(Experiment);
+/*
+ * Exact type of float numbers which ideally should match a type behing
+ * platform- and chip-architecture-specific float type.
+ */
+using Float = float;
 
-} // namespace internal
-} // namespace yoga
+} // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/graphics/ColorComponents.h>

package/ReactCommon/react/renderer/graphics/platform/ios/{RCTPlatformColorUtils.mm → react/renderer/graphics/RCTPlatformColorUtils.mm}

@@ -8,7 +8,6 @@
 #import "RCTPlatformColorUtils.h"
 
 #import <Foundation/Foundation.h>
-#import <React/RCTUtils.h>
 #import <UIKit/UIKit.h>
 
 #include <string>
@@ -180,7 +179,7 @@ static inline NSString *_NSStringFromCString(
 static inline facebook::react::ColorComponents _ColorComponentsFromUIColor(UIColor *color)
 {
   CGFloat rgba[4];
-  RCTGetRGBAColorComponents(color.CGColor, rgba);
+  [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
   return {(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]};
 }
 

package/ReactCommon/react/renderer/imagemanager/BUCK

@@ -13,6 +13,8 @@ load(
     "subdir_glob",
 )
 
+oncall("react_native")
+
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
@@ -49,7 +51,7 @@ rn_xplat_cxx_library(
     ios_exported_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("platform/ios", "RCTImagePrimitivesConversions.h"),
+            ("platform/ios/react/renderer/imagemanager", "RCTImagePrimitivesConversions.h"),
         ],
         prefix = "react/renderer/imagemanager",
     ),
@@ -61,7 +63,7 @@ rn_xplat_cxx_library(
     ios_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("platform/ios", "**/*.h"),
+            ("platform/ios/react/renderer/imagemanager", "**/*.h"),
         ],
         prefix = "",
     ),

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

@@ -86,7 +86,7 @@ class ImageRequest final {
   std::shared_ptr<const ImageTelemetry> telemetry_{};
 
   /*
-   * Event coordinator associated with the reqest.
+   * Event coordinator associated with the request.
    */
   std::shared_ptr<const ImageResponseObserverCoordinator> coordinator_{};
 

package/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec

@@ -0,0 +1,64 @@
+# 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.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+boost_compiler_flags = '-Wno-documentation'
+
+Pod::Spec.new do |s|
+  source_files = "**/*.{m,mm,cpp,h}"
+  header_search_paths = [
+    "\"$(PODS_ROOT)/boost\"",
+    "\"$(PODS_TARGET_SRCROOT)/../../../\"",
+    "\"$(PODS_TARGET_SRCROOT)\"",
+    "\"$(PODS_ROOT)/RCT-Folly\"",
+  ]
+
+  s.name                   = "React-ImageManager"
+  s.version                = version
+  s.summary                = "Fabric for React Native."
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
+  s.platforms              = { :ios => "12.4" }
+  s.source                 = source
+  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.source_files           = source_files
+  s.header_dir             = "react/renderer/imagemanager"
+
+  if ENV['USE_FRAMEWORKS']
+    s.module_name            = "React_ImageManager"
+    s.header_mappings_dir  = "./"
+    header_search_paths = header_search_paths + [
+      "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\"",
+      "\"$(PODS_ROOT)/DoubleConversion\"",
+      "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\"",
+      "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"",
+    ]
+  end
+
+  s.pod_target_xcconfig  = {
+    "USE_HEADERMAP" => "NO",
+    "HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+  }
+
+  s.dependency "RCT-Folly/Fabric"
+  s.dependency "React-Fabric"
+  s.dependency "React-Core/Default"
+  s.dependency "React-RCTImage"
+end

package/ReactCommon/react/renderer/imagemanager/platform/ios/{ImageManager.mm → react/renderer/imagemanager/ImageManager.mm}

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ImageManager.h"
+#import <react/renderer/imagemanager/ImageManager.h>
 
 #import <React/RCTImageLoaderWithAttributionProtocol.h>
 #import <React/RCTUtils.h>

package/ReactCommon/react/renderer/imagemanager/platform/ios/{ImageRequest.cpp → react/renderer/imagemanager/ImageRequest.cpp}

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ImageRequest.h"
+#include <react/renderer/imagemanager/ImageRequest.h>
 
 namespace facebook {
 namespace react {

package/ReactCommon/react/renderer/imagemanager/platform/ios/{RCTImageManager.h → react/renderer/imagemanager/RCTImageManager.h}

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <RCTImageManagerProtocol.h>
+#import "RCTImageManagerProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ReactCommon/react/renderer/imagemanager/platform/ios/{RCTSyncImageManager.h → react/renderer/imagemanager/RCTSyncImageManager.h}

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <RCTImageManagerProtocol.h>
+#import "RCTImageManagerProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN