react-native 0.71.6 → 0.72.0-rc.1

package/ReactCommon/react/utils/ContextContainer.h

@@ -10,10 +10,10 @@
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <shared_mutex>
 #include <string>
 
 #include <butter/map.h>
-#include <butter/mutex.h>
 
 #include <react/debug/flags.h>
 #include <react/debug/react_native_assert.h>
@@ -38,11 +38,11 @@ class ContextContainer final {
    * example if the type `T` is `std::shared_ptr<const ReactNativeConfig>`,
    * then one would use `"ReactNativeConfig"` for the `key`, even if the
    * instance is actually a `shared_ptr` of derived class
-   *`EmptyReactNativeConfig`.
+   *`ReactNativeConfig`.
    */
   template <typename T>
   void insert(std::string const &key, T const &instance) const {
-    std::unique_lock<butter::shared_mutex> lock(mutex_);
+    std::unique_lock lock(mutex_);
 
     instances_.insert({key, std::make_shared<T>(instance)});
   }
@@ -52,7 +52,7 @@ class ContextContainer final {
    * Does nothing if the instance was not found.
    */
   void erase(std::string const &key) const {
-    std::unique_lock<butter::shared_mutex> lock(mutex_);
+    std::unique_lock lock(mutex_);
 
     instances_.erase(key);
   }
@@ -63,7 +63,7 @@ class ContextContainer final {
    * values from the given container.
    */
   void update(ContextContainer const &contextContainer) const {
-    std::unique_lock<butter::shared_mutex> lock(mutex_);
+    std::unique_lock lock(mutex_);
 
     for (auto const &pair : contextContainer.instances_) {
       instances_.erase(pair.first);
@@ -78,7 +78,7 @@ class ContextContainer final {
    */
   template <typename T>
   T at(std::string const &key) const {
-    std::shared_lock<butter::shared_mutex> lock(mutex_);
+    std::shared_lock lock(mutex_);
 
     react_native_assert(
         instances_.find(key) != instances_.end() &&
@@ -93,7 +93,7 @@ class ContextContainer final {
    */
   template <typename T>
   std::optional<T> find(std::string const &key) const {
-    std::shared_lock<butter::shared_mutex> lock(mutex_);
+    std::shared_lock lock(mutex_);
 
     auto iterator = instances_.find(key);
     if (iterator == instances_.end()) {
@@ -104,7 +104,7 @@ class ContextContainer final {
   }
 
  private:
-  mutable butter::shared_mutex mutex_;
+  mutable std::shared_mutex mutex_;
   // Protected by mutex_`.
   mutable butter::map<std::string, std::shared_ptr<void>> instances_;
 };

package/ReactCommon/react/utils/SharedFunction.h

@@ -7,9 +7,7 @@
 
 #include <functional>
 #include <memory>
-#include <mutex>
-
-#include <butter/mutex.h>
+#include <shared_mutex>
 
 namespace facebook {
 namespace react {
@@ -31,7 +29,7 @@ class SharedFunction {
   struct Pair {
     Pair(std::function<T> &&function) : function(std::move(function)) {}
     std::function<T> function;
-    butter::shared_mutex mutex{};
+    std::shared_mutex mutex{};
   };
 
  public:
@@ -45,12 +43,12 @@ class SharedFunction {
   SharedFunction &operator=(SharedFunction &&other) noexcept = default;
 
   void assign(std::function<T> function) const {
-    std::unique_lock<butter::shared_mutex> lock(pair_->mutex);
+    std::unique_lock lock(pair_->mutex);
     pair_->function = function;
   }
 
   ReturnT operator()(ArgumentT... args) const {
-    std::shared_lock<butter::shared_mutex> lock(pair_->mutex);
+    std::shared_lock lock(pair_->mutex);
     return pair_->function(args...);
   }
 

package/ReactCommon/reactperflogger/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactCommon/reactperflogger/React-perflogger.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.summary                = "-"  # TODO
   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.source_files           = "**/*.{cpp,h}"

package/ReactCommon/runtimeexecutor/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.summary                = "-"  # TODO
   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.source_files           = "**/*.{cpp,h}"

package/ReactCommon/yoga/yoga/CMakeLists.txt

@@ -0,0 +1,41 @@
+# 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)
+project(yogacore)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+if(TARGET yogacore)
+    return()
+endif()
+
+include(CheckIPOSupported)
+
+set(YOGA_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
+include(${YOGA_ROOT}/cmake/project-defaults.cmake)
+
+
+file(GLOB SOURCES CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/**/*.cpp)
+
+add_library(yogacore STATIC ${SOURCES})
+
+# Yoga conditionally uses <android/log> when building for Android
+if (ANDROID)
+    target_link_libraries(yogacore log)
+endif()
+
+check_ipo_supported(RESULT result)
+if(result)
+  set_target_properties(yogacore PROPERTIES
+    CMAKE_INTERPROCEDURAL_OPTIMIZATION true)
+endif()
+
+target_include_directories(yogacore
+    PUBLIC
+    $<BUILD_INTERFACE:${YOGA_ROOT}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/yoga>)

package/ReactCommon/yoga/yoga/CompactValue.h

@@ -9,6 +9,14 @@
 
 #ifdef __cplusplus
 
+#if defined(__has_include) && __has_include(<version>)
+// needed to be able to evaluate defined(__cpp_lib_bit_cast)
+#include <version>
+#else
+// needed to be able to evaluate defined(__cpp_lib_bit_cast)
+#include <ciso646>
+#endif
+
 #ifdef __cpp_lib_bit_cast
 #include <bit>
 #else

package/ReactCommon/yoga/yoga/Utils.cpp

@@ -74,7 +74,7 @@ YGFloatOptional YGFloatOptionalMax(YGFloatOptional op1, YGFloatOptional op2) {
   return op1.isUndefined() ? op2 : op1;
 }
 
-void throwLogicalErrorWithMessage(const char* message) {
+void yoga::throwLogicalErrorWithMessage(const char* message) {
 #if defined(__cpp_exceptions)
   throw std::logic_error(message);
 #else // !defined(__cpp_exceptions)

package/ReactCommon/yoga/yoga/Utils.h

@@ -117,7 +117,7 @@ inline YGFloatOptional YGResolveValue(
 }
 
 inline YGFloatOptional YGResolveValue(
-    yoga::detail::CompactValue value,
+    facebook::yoga::detail::CompactValue value,
     float ownerSize) {
   return YGResolveValue((YGValue) value, ownerSize);
 }
@@ -142,11 +142,9 @@ inline YGFlexDirection YGResolveFlexDirection(
 }
 
 inline YGFloatOptional YGResolveValueMargin(
-    yoga::detail::CompactValue value,
+    facebook::yoga::detail::CompactValue value,
     const float ownerSize) {
   return value.isAuto() ? YGFloatOptional{0} : YGResolveValue(value, ownerSize);
 }
 
-void throwLogicalErrorWithMessage(const char* message);
-
 #endif

package/ReactCommon/yoga/yoga/YGEnums.cpp

@@ -91,6 +91,10 @@ const char* YGExperimentalFeatureToString(const YGExperimentalFeature value) {
   switch (value) {
     case YGExperimentalFeatureWebFlexBasis:
       return "web-flex-basis";
+    case YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge:
+      return "absolute-percentage-against-padding-edge";
+    case YGExperimentalFeatureFixAbsoluteTrailingColumnMargin:
+      return "fix-absolute-trailing-column-margin";
   }
   return "unknown";
 }

package/ReactCommon/yoga/yoga/YGEnums.h

@@ -56,7 +56,9 @@ YG_ENUM_SEQ_DECL(
 
 YG_ENUM_SEQ_DECL(
     YGExperimentalFeature,
-    YGExperimentalFeatureWebFlexBasis)
+    YGExperimentalFeatureWebFlexBasis,
+    YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge,
+    YGExperimentalFeatureFixAbsoluteTrailingColumnMargin)
 
 YG_ENUM_SEQ_DECL(
     YGFlexDirection,

package/ReactCommon/yoga/yoga/YGLayout.h

@@ -13,8 +13,6 @@
 #include "YGFloatOptional.h"
 #include "Yoga-internal.h"
 
-using namespace facebook::yoga;
-
 struct YGLayout {
   std::array<float, 4> position = {};
   std::array<float, 2> dimensions = {{YGUndefined, YGUndefined}};
@@ -24,12 +22,8 @@ struct YGLayout {
 
 private:
   static constexpr size_t directionOffset = 0;
-  static constexpr size_t didUseLegacyFlagOffset =
-      directionOffset + facebook::yoga::detail::bitWidthFn<YGDirection>();
-  static constexpr size_t doesLegacyStretchFlagAffectsLayoutOffset =
-      didUseLegacyFlagOffset + 1;
   static constexpr size_t hadOverflowOffset =
-      doesLegacyStretchFlagAffectsLayoutOffset + 1;
+      directionOffset + facebook::yoga::detail::bitWidthFn<YGDirection>();
   uint8_t flags = 0;
 
 public:
@@ -58,25 +52,6 @@ public:
         flags, directionOffset, direction);
   }
 
-  bool didUseLegacyFlag() const {
-    return facebook::yoga::detail::getBooleanData(
-        flags, didUseLegacyFlagOffset);
-  }
-
-  void setDidUseLegacyFlag(bool val) {
-    facebook::yoga::detail::setBooleanData(flags, didUseLegacyFlagOffset, val);
-  }
-
-  bool doesLegacyStretchFlagAffectsLayout() const {
-    return facebook::yoga::detail::getBooleanData(
-        flags, doesLegacyStretchFlagAffectsLayoutOffset);
-  }
-
-  void setDoesLegacyStretchFlagAffectsLayout(bool val) {
-    facebook::yoga::detail::setBooleanData(
-        flags, doesLegacyStretchFlagAffectsLayoutOffset, val);
-  }
-
   bool hadOverflow() const {
     return facebook::yoga::detail::getBooleanData(flags, hadOverflowOffset);
   }

package/ReactCommon/yoga/yoga/YGNode.cpp

@@ -560,53 +560,6 @@ YGFloatOptional YGNode::getTrailingPaddingAndBorder(
       YGFloatOptional(getTrailingBorder(axis));
 }
 
-bool YGNode::didUseLegacyFlag() {
-  bool didUseLegacyFlag = layout_.didUseLegacyFlag();
-  if (didUseLegacyFlag) {
-    return true;
-  }
-  for (const auto& child : children_) {
-    if (child->layout_.didUseLegacyFlag()) {
-      didUseLegacyFlag = true;
-      break;
-    }
-  }
-  return didUseLegacyFlag;
-}
-
-void YGNode::setLayoutDoesLegacyFlagAffectsLayout(
-    bool doesLegacyFlagAffectsLayout) {
-  layout_.setDoesLegacyStretchFlagAffectsLayout(doesLegacyFlagAffectsLayout);
-}
-
-void YGNode::setLayoutDidUseLegacyFlag(bool didUseLegacyFlag) {
-  layout_.setDidUseLegacyFlag(didUseLegacyFlag);
-}
-
-bool YGNode::isLayoutTreeEqualToNode(const YGNode& node) const {
-  if (children_.size() != node.children_.size()) {
-    return false;
-  }
-  if (layout_ != node.layout_) {
-    return false;
-  }
-  if (children_.size() == 0) {
-    return true;
-  }
-
-  bool isLayoutTreeEqual = true;
-  YGNodeRef otherNodeChildren = nullptr;
-  for (std::vector<YGNodeRef>::size_type i = 0; i < children_.size(); ++i) {
-    otherNodeChildren = node.children_[i];
-    isLayoutTreeEqual =
-        children_[i]->isLayoutTreeEqualToNode(*otherNodeChildren);
-    if (!isLayoutTreeEqual) {
-      return false;
-    }
-  }
-  return isLayoutTreeEqual;
-}
-
 void YGNode::reset() {
   YGAssertWithNode(
       this,

package/ReactCommon/yoga/yoga/YGNode.h

@@ -327,8 +327,6 @@ public:
       const float mainSize,
       const float crossSize,
       const float ownerWidth);
-  void setLayoutDoesLegacyFlagAffectsLayout(bool doesLegacyFlagAffectsLayout);
-  void setLayoutDidUseLegacyFlag(bool didUseLegacyFlag);
   void markDirtyAndPropogateDownwards();
 
   // Other methods
@@ -351,8 +349,6 @@ public:
   float resolveFlexGrow() const;
   float resolveFlexShrink() const;
   bool isNodeFlexible();
-  bool didUseLegacyFlag();
-  bool isLayoutTreeEqualToNode(const YGNode& node) const;
   void reset();
 };
 

package/ReactCommon/yoga/yoga/YGNodePrint.cpp

@@ -90,7 +90,9 @@ static void appendEdges(
     const string& key,
     const YGStyle::Edges& edges) {
   if (areFourValuesEqual(edges)) {
-    appendNumberIfNotZero(base, key, edges[YGEdgeLeft]);
+    auto edgeValue = YGNode::computeEdgeValueForColumn(
+        edges, YGEdgeLeft, detail::CompactValue::ofZero());
+    appendNumberIfNotZero(base, key, edgeValue);
   } else {
     for (int edge = YGEdgeLeft; edge != YGEdgeAll; ++edge) {
       string str = key + "-" + YGEdgeToString(static_cast<YGEdge>(edge));

package/ReactCommon/yoga/yoga/Yoga-internal.h

@@ -40,11 +40,11 @@ inline bool isUndefined(double value) {
   return std::isnan(value);
 }
 
+void throwLogicalErrorWithMessage(const char* message);
+
 } // namespace yoga
 } // namespace facebook
 
-using namespace facebook;
-
 extern const std::array<YGEdge, 4> trailing;
 extern const std::array<YGEdge, 4> leading;
 extern const YGValue YGValueUndefined;
@@ -69,6 +69,8 @@ struct YGCachedMeasurement {
         computedHeight(-1) {}
 
   bool operator==(YGCachedMeasurement measurement) const {
+    using namespace facebook;
+
     bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
         heightMeasureMode == measurement.heightMeasureMode;
 
@@ -108,6 +110,8 @@ private:
 
 public:
   Values() = default;
+  Values(const Values& other) = default;
+
   explicit Values(const YGValue& defaultValue) noexcept {
     values_.fill(defaultValue);
   }
@@ -141,7 +145,6 @@ public:
 
   Values& operator=(const Values& other) = default;
 };
-
 } // namespace detail
 } // namespace yoga
 } // namespace facebook