react-native 0.68.2 → 0.69.0-rc.2

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

@@ -9,6 +9,7 @@
 
 #include <react/renderer/core/BatchedEventQueue.h>
 #include <react/renderer/core/EventBeat.h>
+#include <react/renderer/core/EventListener.h>
 #include <react/renderer/core/EventPriority.h>
 #include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/StateUpdate.h>
@@ -52,6 +53,18 @@ class EventDispatcher {
   void dispatchStateUpdate(StateUpdate &&stateUpdate, EventPriority priority)
       const;
 
+#pragma mark - Event listeners
+  /*
+   * Adds provided event listener to the event dispatcher.
+   */
+  void addListener(const std::shared_ptr<EventListener const> &listener) const;
+
+  /*
+   * Removes provided event listener to the event dispatcher.
+   */
+  void removeListener(
+      const std::shared_ptr<EventListener const> &listener) const;
+
  private:
   EventQueue const &getEventQueue(EventPriority priority) const;
 
@@ -59,6 +72,8 @@ class EventDispatcher {
   std::unique_ptr<BatchedEventQueue> synchronousBatchedQueue_;
   std::unique_ptr<UnbatchedEventQueue> asynchronousUnbatchedQueue_;
   std::unique_ptr<BatchedEventQueue> asynchronousBatchedQueue_;
+
+  mutable EventListenerContainer eventListeners_;
 };
 
 } // namespace react

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

@@ -22,9 +22,9 @@ namespace react {
  * Capitalizes the first letter of the event type and adds "top" prefix if
  * necessary (e.g. "layout" becames "topLayout").
  */
-static std::string normalizeEventType(const std::string &type) {
-  auto prefixedType = type;
-  if (type.find("top", 0) != 0) {
+static std::string normalizeEventType(std::string type) {
+  auto prefixedType = std::move(type);
+  if (prefixedType.find("top", 0) != 0) {
     prefixedType.insert(0, "top");
     prefixedType[3] = static_cast<char>(toupper(prefixedType[3]));
   }
@@ -50,12 +50,12 @@ EventEmitter::EventEmitter(
       eventDispatcher_(std::move(eventDispatcher)) {}
 
 void EventEmitter::dispatchEvent(
-    const std::string &type,
+    std::string type,
     const folly::dynamic &payload,
     EventPriority priority,
     RawEvent::Category category) const {
   dispatchEvent(
-      type,
+      std::move(type),
       [payload](jsi::Runtime &runtime) {
         return valueFromDynamic(runtime, payload);
       },
@@ -64,19 +64,19 @@ void EventEmitter::dispatchEvent(
 }
 
 void EventEmitter::dispatchUniqueEvent(
-    const std::string &type,
+    std::string type,
     const folly::dynamic &payload) const {
-  dispatchUniqueEvent(type, [payload](jsi::Runtime &runtime) {
+  dispatchUniqueEvent(std::move(type), [payload](jsi::Runtime &runtime) {
     return valueFromDynamic(runtime, payload);
   });
 }
 
 void EventEmitter::dispatchEvent(
-    const std::string &type,
+    std::string type,
     const ValueFactory &payloadFactory,
     EventPriority priority,
     RawEvent::Category category) const {
-  SystraceSection s("EventEmitter::dispatchEvent");
+  SystraceSection s("EventEmitter::dispatchEvent", "type", type);
 
   auto eventDispatcher = eventDispatcher_.lock();
   if (!eventDispatcher) {
@@ -85,12 +85,15 @@ void EventEmitter::dispatchEvent(
 
   eventDispatcher->dispatchEvent(
       RawEvent(
-          normalizeEventType(type), payloadFactory, eventTarget_, category),
+          normalizeEventType(std::move(type)),
+          payloadFactory,
+          eventTarget_,
+          category),
       priority);
 }
 
 void EventEmitter::dispatchUniqueEvent(
-    const std::string &type,
+    std::string type,
     const ValueFactory &payloadFactory) const {
   SystraceSection s("EventEmitter::dispatchUniqueEvent");
 
@@ -100,7 +103,7 @@ void EventEmitter::dispatchUniqueEvent(
   }
 
   eventDispatcher->dispatchUniqueEvent(RawEvent(
-      normalizeEventType(type),
+      normalizeEventType(std::move(type)),
       payloadFactory,
       eventTarget_,
       RawEvent::Category::Continuous));

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

@@ -68,24 +68,23 @@ class EventEmitter {
    * Is used by particular subclasses only.
    */
   void dispatchEvent(
-      const std::string &type,
+      std::string type,
       const ValueFactory &payloadFactory =
           EventEmitter::defaultPayloadFactory(),
       EventPriority priority = EventPriority::AsynchronousBatched,
       RawEvent::Category category = RawEvent::Category::Unspecified) const;
 
   void dispatchEvent(
-      const std::string &type,
+      std::string type,
       const folly::dynamic &payload,
       EventPriority priority = EventPriority::AsynchronousBatched,
       RawEvent::Category category = RawEvent::Category::Unspecified) const;
 
-  void dispatchUniqueEvent(
-      const std::string &type,
-      const folly::dynamic &payload) const;
+  void dispatchUniqueEvent(std::string type, const folly::dynamic &payload)
+      const;
 
   void dispatchUniqueEvent(
-      const std::string &type,
+      std::string type,
       const ValueFactory &payloadFactory =
           EventEmitter::defaultPayloadFactory()) const;
 

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

@@ -0,0 +1,39 @@
+/*
+ * 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 "EventListener.h"
+
+namespace facebook::react {
+
+bool EventListenerContainer::willDispatchEvent(const RawEvent &event) {
+  std::shared_lock<butter::shared_mutex> lock(mutex_);
+
+  bool handled = false;
+  for (auto const &listener : eventListeners_) {
+    handled = handled || listener->operator()(event);
+  }
+  return handled;
+}
+
+void EventListenerContainer::addListener(
+    const std::shared_ptr<EventListener const> &listener) {
+  std::unique_lock<butter::shared_mutex> lock(mutex_);
+
+  eventListeners_.push_back(listener);
+}
+
+void EventListenerContainer::removeListener(
+    const std::shared_ptr<EventListener const> &listener) {
+  std::unique_lock<butter::shared_mutex> lock(mutex_);
+
+  auto it = std::find(eventListeners_.begin(), eventListeners_.end(), listener);
+  if (it != eventListeners_.end()) {
+    eventListeners_.erase(it);
+  }
+}
+
+} // namespace facebook::react

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

@@ -0,0 +1,44 @@
+/*
+ * 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/RawEvent.h>
+
+#include <butter/mutex.h>
+
+namespace facebook {
+namespace react {
+
+/**
+ * Listener for events dispatched to JS runtime.
+ * Return `true` to interrupt default dispatch to JS event emitter, `false` to
+ * pass through to default handlers.
+ */
+using EventListener = std::function<bool(const RawEvent &event)>;
+
+class EventListenerContainer {
+ public:
+  /*
+   * Invoke listeners in this container with the event.
+   * Returns true if event was handled by the listener, false to continue
+   * default dispatch.
+   */
+  bool willDispatchEvent(const RawEvent &event);
+
+  void addListener(const std::shared_ptr<EventListener const> &listener);
+  void removeListener(const std::shared_ptr<EventListener const> &listener);
+
+ private:
+  butter::shared_mutex mutex_;
+  std::vector<std::shared_ptr<EventListener const>> eventListeners_;
+};
+
+} // namespace react
+} // namespace facebook

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

@@ -16,7 +16,8 @@ namespace react {
 Props::Props(
     const PropsParserContext &context,
     const Props &sourceProps,
-    const RawProps &rawProps)
+    const RawProps &rawProps,
+    const bool shouldSetRawProps)
     : nativeId(convertRawProp(
           context,
           rawProps,
@@ -26,7 +27,9 @@ Props::Props(
       revision(sourceProps.revision + 1)
 #ifdef ANDROID
       ,
-      rawProps((folly::dynamic)rawProps)
+      rawProps(
+          shouldSetRawProps ? (folly::dynamic)rawProps
+                            : /* null */ folly::dynamic())
 #endif
           {};
 

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

@@ -33,7 +33,8 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
   Props(
       const PropsParserContext &context,
       const Props &sourceProps,
-      RawProps const &rawProps);
+      RawProps const &rawProps,
+      bool shouldSetRawProps = true);
   virtual ~Props() = default;
 
   std::string nativeId;

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

@@ -8,9 +8,9 @@
 #pragma once
 
 #include <limits>
+#include <optional>
 
 #include <butter/map.h>
-#include <butter/optional.h>
 #include <butter/small_vector.h>
 
 #include <folly/dynamic.h>

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

@@ -56,7 +56,7 @@ static bool areFieldsEqual(char const *lhs, char const *rhs) {
   if (lhs == nullptr || rhs == nullptr) {
     return lhs == rhs;
   }
-  return std::string(lhs) == std::string(rhs);
+  return lhs == rhs || strcmp(lhs, rhs) == 0;
 }
 
 bool operator==(RawPropsKey const &lhs, RawPropsKey const &rhs) noexcept {

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

@@ -33,7 +33,8 @@ RawValue const *RawPropsParser::at(
     // 1))) or n*n - (1/2)(n*(n+1)). If there are 100 props, this will result in
     // 4950 lookups and equality checks on initialization of the parser, which
     // happens exactly once per component.
-    for (int i = 0; i < size_; i++) {
+    size_t size = keys_.size();
+    for (int i = 0; i < size; i++) {
       if (keys_[i] == key) {
         return nullptr;
       }
@@ -41,8 +42,7 @@ RawValue const *RawPropsParser::at(
     // This is not thread-safe part; this happens only during initialization of
     // a `ComponentDescriptor` where it is actually safe.
     keys_.push_back(key);
-    nameToIndex_.insert(key, static_cast<RawPropsValueIndex>(size_));
-    size_++;
+    nameToIndex_.insert(key, static_cast<RawPropsValueIndex>(size));
     return nullptr;
   }
 
@@ -69,7 +69,7 @@ RawValue const *RawPropsParser::at(
   do {
     rawProps.keyIndexCursor_++;
 
-    if (UNLIKELY(rawProps.keyIndexCursor_ >= size_)) {
+    if (UNLIKELY(rawProps.keyIndexCursor_ >= keys_.size())) {
 #ifdef REACT_NATIVE_DEBUG
       if (resetLoop) {
         LOG(ERROR) << "Looked up RawProps key that does not exist: "
@@ -93,10 +93,11 @@ void RawPropsParser::postPrepare() noexcept {
 }
 
 void RawPropsParser::preparse(RawProps const &rawProps) const noexcept {
-  rawProps.keyIndexToValueIndex_.resize(size_, kRawPropsValueIndexEmpty);
+  const size_t keyCount = keys_.size();
+  rawProps.keyIndexToValueIndex_.resize(keyCount, kRawPropsValueIndexEmpty);
 
   // Resetting the cursor, the next increment will give `0`.
-  rawProps.keyIndexCursor_ = size_ - 1;
+  rawProps.keyIndexCursor_ = static_cast<int>(keyCount - 1);
 
   switch (rawProps.mode_) {
     case RawProps::Mode::Empty:

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

@@ -79,7 +79,6 @@ class RawPropsParser final {
   mutable butter::small_vector<RawPropsKey, kNumberOfPropsPerComponentSoftCap>
       keys_{};
   mutable RawPropsKeyMap nameToIndex_{};
-  mutable int size_{0};
   mutable bool ready_{false};
 };
 

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

@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include <butter/optional.h>
+#include <optional>
+
 #include <folly/Likely.h>
 #include <folly/dynamic.h>
 #include <react/renderer/core/PropsParserContext.h>
@@ -106,12 +107,12 @@ T convertRawProp(
 }
 
 template <typename T>
-static butter::optional<T> convertRawProp(
+static std::optional<T> convertRawProp(
     const PropsParserContext &context,
     RawProps const &rawProps,
     char const *name,
-    butter::optional<T> const &sourceValue,
-    butter::optional<T> const &defaultValue,
+    std::optional<T> const &sourceValue,
+    std::optional<T> const &defaultValue,
     char const *namePrefix = nullptr,
     char const *nameSuffix = nullptr) {
   const auto *rawValue = rawProps.at(name, namePrefix, nameSuffix);
@@ -128,7 +129,7 @@ static butter::optional<T> convertRawProp(
 
   T result;
   fromRawValue(context, *rawValue, result);
-  return butter::optional<T>{result};
+  return std::optional<T>{result};
 }
 
 } // namespace react

package/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp

@@ -45,9 +45,9 @@ TEST(FindNodeAtPointTest, withoutTransform) {
           })
         })
     });
-  
+
   auto parentShadowNode = builder.build(element);
-  
+
   EXPECT_EQ(
             LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {115, 115})->getTag(), 3);
   EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {105, 105})->getTag(), 2);
@@ -91,7 +91,7 @@ TEST(FindNodeAtPointTest, viewIsTranslated) {
           })
         })
     });
-  
+
   auto parentShadowNode = builder.build(element);
 
   EXPECT_EQ(
@@ -125,7 +125,7 @@ TEST(FindNodeAtPointTest, viewIsScaled) {
           Element<ViewShadowNode>()
           .tag(3)
           .props([] {
-            auto sharedProps = std::make_shared<ViewProps>();
+            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
             sharedProps->transform = Transform::Scale(0.5, 0.5, 0);
             return sharedProps;
           })
@@ -137,7 +137,7 @@ TEST(FindNodeAtPointTest, viewIsScaled) {
           })
         })
     });
-  
+
   auto parentShadowNode = builder.build(element);
 
   EXPECT_EQ(
@@ -175,9 +175,9 @@ TEST(FindNodeAtPointTest, overlappingViews) {
           shadowNode.setLayoutMetrics(layoutMetrics);
         })
     });
-  
+
   auto parentShadowNode = builder.build(element);
-  
+
   EXPECT_EQ(
             LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {50, 50})->getTag(), 3);
 }
@@ -198,7 +198,7 @@ TEST(FindNodeAtPointTest, overlappingViewsWithZIndex) {
         Element<ViewShadowNode>()
         .tag(2)
         .props([] {
-          auto sharedProps = std::make_shared<ViewProps>();
+          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
           sharedProps->zIndex = 1;
           auto &yogaStyle = sharedProps->yogaStyle;
           yogaStyle.positionType() = YGPositionTypeAbsolute;
@@ -219,11 +219,9 @@ TEST(FindNodeAtPointTest, overlappingViewsWithZIndex) {
           shadowNode.setLayoutMetrics(layoutMetrics);
         })
     });
-  
+
   auto parentShadowNode = builder.build(element);
-  
+
   EXPECT_EQ(
             LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {50, 50})->getTag(), 2);
 }
-
-

package/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp

@@ -148,7 +148,7 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnTransformedNode) {
           shadowNode.setLayoutMetrics(layoutMetrics);
         })
         .props([] {
-          auto sharedProps = std::make_shared<ViewProps>();
+          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
           sharedProps->transform = Transform::Scale(0.5, 0.5, 1);
           return sharedProps;
         })
@@ -199,7 +199,7 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnTransformedParent) {
       .children({
         Element<ViewShadowNode>()
         .props([] {
-          auto sharedProps = std::make_shared<ViewProps>();
+          auto sharedProps = std::make_shared<ViewShadowNodeProps>();
           sharedProps->transform = Transform::Scale(0.5, 0.5, 1);
           return sharedProps;
         })
@@ -280,7 +280,7 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnSameTransformedNode) {
   auto element =
     Element<ViewShadowNode>()
       .props([] {
-        auto sharedProps = std::make_shared<ViewProps>();
+        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
         sharedProps->transform = Transform::Scale(2, 2, 1);
         return sharedProps;
       })

package/ReactCommon/react/renderer/debug/Android.mk

@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_runtime
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"

package/ReactCommon/react/renderer/debug/BUCK

@@ -36,7 +36,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

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

@@ -0,0 +1,15 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_debug_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_render_debug SHARED ${react_render_debug_SRC})
+
+target_include_directories(react_render_debug PUBLIC ${REACT_COMMON_DIR})
+target_link_libraries(react_render_debug folly_runtime)

package/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <butter/optional.h>
 #include <limits>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -34,9 +34,9 @@ debugStringConvertibleItem(std::string name, T value, T defaultValue = {}) {
 template <typename T>
 inline SharedDebugStringConvertible debugStringConvertibleItem(
     std::string name,
-    butter::optional<T> value,
+    std::optional<T> value,
     T defaultValue = {}) {
-  if (!value.hasValue()) {
+  if (!value.has_value()) {
     return nullptr;
   }
 

package/ReactCommon/react/renderer/element/BUCK

@@ -34,7 +34,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/element/tests/ElementTest.cpp

@@ -26,7 +26,7 @@ TEST(ElementTest, testNormalCases) {
   auto shadowNodeAB = std::shared_ptr<ViewShadowNode>{};
   auto shadowNodeABA = std::shared_ptr<ViewShadowNode>{};
 
-  auto propsAA = std::make_shared<ViewProps>();
+  auto propsAA = std::make_shared<ViewShadowNodeProps>();
   propsAA->nativeId = "node AA";
 
   // clang-format off
@@ -51,7 +51,7 @@ TEST(ElementTest, testNormalCases) {
             .reference(shadowNodeAB)
             .tag(3)
             .props([]() {
-               auto props = std::make_shared<ViewProps>();
+               auto props = std::make_shared<ViewShadowNodeProps>();
                props->nativeId = "node AB";
                return props;
             })
@@ -60,7 +60,7 @@ TEST(ElementTest, testNormalCases) {
                 .reference(shadowNodeABA)
                 .tag(4)
                 .props([]() {
-                  auto props = std::make_shared<ViewProps>();
+                  auto props = std::make_shared<ViewShadowNodeProps>();
                   props->nativeId = "node ABA";
                   return props;
                 })

package/ReactCommon/react/renderer/graphics/Android.mk

@@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \
   glog \
   libfb \
   libfbjni \
-  libfolly_json \
-  libfolly_json \
+  libfolly_runtime \
   libreact_debug
 
 LOCAL_STATIC_LIBRARIES :=

package/ReactCommon/react/renderer/graphics/BUCK

@@ -91,7 +91,10 @@ rn_xplat_cxx_library(
             "platform/ios/**/*.mm",
         ],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

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

@@ -0,0 +1,25 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_graphics_SRC CONFIGURE_DEPENDS
+        *.cpp
+        platform/cxx/react/renderer/graphics/*.cpp)
+
+add_library(react_render_graphics
+        SHARED
+        ${react_render_graphics_SRC})
+
+target_include_directories(react_render_graphics
+        PUBLIC
+          ${REACT_COMMON_DIR}
+          ${CMAKE_CURRENT_SOURCE_DIR}/platform/cxx/
+        )
+
+target_link_libraries(react_render_graphics glog fb fbjni folly_runtime react_debug)

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

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
+  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
   s.source                 = source
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.source_files           = "**/*.{m,mm,cpp,h}"

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

@@ -360,6 +360,14 @@ Rect operator*(Rect const &rect, Transform const &transform) {
       transformedA, transformedB, transformedC, transformedD);
 }
 
+EdgeInsets operator*(EdgeInsets const &edgeInsets, Transform const &transform) {
+  return EdgeInsets{
+      edgeInsets.left * transform.matrix[0],
+      edgeInsets.top * transform.matrix[5],
+      edgeInsets.right * transform.matrix[0],
+      edgeInsets.bottom * transform.matrix[5]};
+}
+
 Vector operator*(Transform const &transform, Vector const &vector) {
   return {
       vector.x * transform.at(0, 0) + vector.y * transform.at(1, 0) +