react-native 0.70.6 → 0.71.0-rc.1

package/ReactCommon/react/renderer/templateprocessor/BUCK

@@ -31,12 +31,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/templateprocessor",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -49,9 +49,8 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
+        "//xplat/folly:json",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/renderer/core:core"),
@@ -77,7 +76,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":templateprocessor",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/components/image:image"),

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

@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_templateprocessor_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_templateprocessor SHARED ${react_render_templateprocessor_SRC})

package/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp

@@ -18,8 +18,7 @@
 #include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 bool constexpr DEBUG_FLY = false;
 
@@ -151,5 +150,4 @@ ShadowNode::Shared UITemplateProcessor::buildShadowTree(
   return ShadowNode::Shared{};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h

@@ -46,7 +46,7 @@ class UITemplateProcessor {
  public:
   static ShadowNode::Shared buildShadowTree(
       const std::string &jsonStr,
-      int rootTag,
+      int surfaceId,
       const folly::dynamic &params,
       const ComponentDescriptorRegistry &componentDescriptorRegistry,
       const NativeModuleRegistry &nativeModuleRegistry,
@@ -55,7 +55,7 @@ class UITemplateProcessor {
  private:
   static ShadowNode::Shared runCommand(
       const folly::dynamic &command,
-      Tag rootTag,
+      Tag surfaceId,
       std::vector<ShadowNode::Shared> &nodes,
       std::vector<folly::dynamic> &registers,
       const ComponentDescriptorRegistry &componentDescriptorRegistry,

package/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp

@@ -23,8 +23,7 @@ using namespace facebook::react;
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
 #include <react/utils/ContextContainer.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static ComponentRegistryFactory getComponentRegistryFactory() {
   return [](const EventDispatcher::Weak &eventDispatcher,
@@ -48,7 +47,8 @@ NativeModuleRegistry buildNativeModuleRegistry();
 NativeModuleRegistry buildNativeModuleRegistry() {
   NativeModuleRegistry nMR;
   nMR.registerModule(
-      "MobileConfig", [&](const std::string &, const folly::dynamic &) {
+      "MobileConfig",
+      [&](const std::string & /*unused*/, const folly::dynamic & /*unused*/) {
         return mockSimpleTestValue_;
       });
   return nMR;
@@ -57,19 +57,19 @@ NativeModuleRegistry buildNativeModuleRegistry() {
 class MockReactNativeConfig : public ReactNativeConfig {
  public:
   MockReactNativeConfig() = default;
-  bool getBool(const std::string &param) const override {
+  bool getBool(const std::string & /*param*/) const override {
     return mockSimpleTestValue_;
   }
 
-  std::string getString(const std::string &) const override {
+  std::string getString(const std::string & /*param*/) const override {
     return "";
   }
 
-  int64_t getInt64(const std::string &) const override {
+  int64_t getInt64(const std::string & /*param*/) const override {
     return 0;
   }
 
-  double getDouble(const std::string &) const override {
+  double getDouble(const std::string & /*param*/) const override {
     return 0.0;
   }
 };
@@ -77,8 +77,7 @@ class MockReactNativeConfig : public ReactNativeConfig {
 std::shared_ptr<const ReactNativeConfig> mockReactNativeConfig_ =
     std::make_shared<const MockReactNativeConfig>();
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 TEST(UITemplateProcessorTest, testSimpleBytecode) {
   auto surfaceId = 11;

package/ReactCommon/react/renderer/textlayoutmanager/BUCK

@@ -36,6 +36,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/textlayoutmanager",
     ),
+    compiler_flags_pedantic = True,
     cxx_exported_headers = subdir_glob(
         [
             ("platform/cxx", "*.h"),
@@ -105,7 +106,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -117,9 +117,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -151,7 +148,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":textlayoutmanager",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )

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

@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_textlayourmanager_SRC CONFIGURE_DEPENDS
         *.cpp

package/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp

@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static Rect rectFromDynamic(folly::dynamic const &data) {
   Point origin;
@@ -66,5 +65,4 @@ bool LineMeasurement::operator==(LineMeasurement const &rhs) const {
              rhs.xHeight);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h

@@ -71,7 +71,7 @@ class TextMeasureCacheKey final {
  * The number was empirically chosen based on approximation of an average amount
  * of meaningful measures per surface.
  */
-constexpr auto kSimpleThreadSafeCacheSizeCap = size_t{256};
+constexpr auto kSimpleThreadSafeCacheSizeCap = size_t{1024};
 
 /*
  * Thread-safe, evicting hash table designed to store text measurement
@@ -94,6 +94,7 @@ inline bool areTextAttributesEquivalentLayoutWise(
              lhs.fontStyle,
              lhs.fontVariant,
              lhs.allowFontScaling,
+             lhs.dynamicTypeRamp,
              lhs.alignment) ==
       std::tie(
              rhs.fontFamily,
@@ -101,6 +102,7 @@ inline bool areTextAttributesEquivalentLayoutWise(
              rhs.fontStyle,
              rhs.fontVariant,
              rhs.allowFontScaling,
+             rhs.dynamicTypeRamp,
              rhs.alignment) &&
       floatEquality(lhs.fontSize, rhs.fontSize) &&
       floatEquality(lhs.fontSizeMultiplier, rhs.fontSizeMultiplier) &&
@@ -121,6 +123,7 @@ inline size_t textAttributesHashLayoutWise(
       textAttributes.fontStyle,
       textAttributes.fontVariant,
       textAttributes.allowFontScaling,
+      textAttributes.dynamicTypeRamp,
       textAttributes.letterSpacing,
       textAttributes.lineHeight,
       textAttributes.alignment);

package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -19,8 +19,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size measureAndroidComponent(
     ContextContainer::Shared const &contextContainer,
@@ -147,12 +146,7 @@ Size measureAndroidComponentMapBuffer(
 TextLayoutManager::TextLayoutManager(
     const ContextContainer::Shared &contextContainer)
     : contextContainer_(contextContainer),
-      mapBufferSerializationEnabled_(
-          contextContainer->at<bool>("MapBufferSerializationEnabled")),
-      measureCache_(
-          contextContainer->at<bool>("EnableLargeTextMeasureCache")
-              ? 1024
-              : kSimpleThreadSafeCacheSizeCap) {}
+      measureCache_(kSimpleThreadSafeCacheSizeCap) {}
 
 void *TextLayoutManager::getNativeTextLayoutManager() const {
   return self_;
@@ -166,19 +160,16 @@ TextMeasurement TextLayoutManager::measure(
 
   auto measurement = measureCache_.get(
       {attributedString, paragraphAttributes, layoutConstraints},
-      [&](TextMeasureCacheKey const &key) {
+      [&](TextMeasureCacheKey const & /*key*/) {
         auto telemetry = TransactionTelemetry::threadLocalTelemetry();
-        if (telemetry) {
+        if (telemetry != nullptr) {
           telemetry->willMeasureText();
         }
 
-        auto measurement = mapBufferSerializationEnabled_
-            ? doMeasureMapBuffer(
-                  attributedString, paragraphAttributes, layoutConstraints)
-            : doMeasure(
-                  attributedString, paragraphAttributes, layoutConstraints);
+        auto measurement = doMeasureMapBuffer(
+            attributedString, paragraphAttributes, layoutConstraints);
 
-        if (telemetry) {
+        if (telemetry != nullptr) {
           telemetry->didMeasureText();
         }
 
@@ -228,60 +219,6 @@ LinesMeasurements TextLayoutManager::measureLines(
     AttributedString const &attributedString,
     ParagraphAttributes const &paragraphAttributes,
     Size size) const {
-  if (mapBufferSerializationEnabled_) {
-    return measureLinesMapBuffer(attributedString, paragraphAttributes, size);
-  }
-
-  const jni::global_ref<jobject> &fabricUIManager =
-      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-  static auto measureLines =
-      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-          ->getMethod<NativeArray::javaobject(
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              jfloat,
-              jfloat)>("measureLines");
-
-  auto serializedAttributedString = toDynamic(attributedString);
-
-  local_ref<ReadableNativeMap::javaobject> attributedStringRNM =
-      ReadableNativeMap::newObjectCxxArgs(serializedAttributedString);
-  local_ref<ReadableNativeMap::javaobject> paragraphAttributesRNM =
-      ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes));
-
-  local_ref<ReadableMap::javaobject> attributedStringRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(attributedStringRNM.get()));
-  local_ref<ReadableMap::javaobject> paragraphAttributesRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(paragraphAttributesRNM.get()));
-
-  auto array = measureLines(
-      fabricUIManager,
-      attributedStringRM.get(),
-      paragraphAttributesRM.get(),
-      size.width,
-      size.height);
-
-  auto dynamicArray = cthis(array)->consume();
-  LinesMeasurements lineMeasurements;
-  lineMeasurements.reserve(dynamicArray.size());
-
-  for (auto const &data : dynamicArray) {
-    lineMeasurements.push_back(LineMeasurement(data));
-  }
-
-  // Explicitly release smart pointers to free up space faster in JNI tables
-  attributedStringRM.reset();
-  attributedStringRNM.reset();
-  paragraphAttributesRM.reset();
-  paragraphAttributesRNM.reset();
-
-  return lineMeasurements;
-}
-
-LinesMeasurements TextLayoutManager::measureLinesMapBuffer(
-    AttributedString const &attributedString,
-    ParagraphAttributes const &paragraphAttributes,
-    Size size) const {
   const jni::global_ref<jobject> &fabricUIManager =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
   static auto measureLines =
@@ -446,5 +383,4 @@ TextMeasurement TextLayoutManager::doMeasureMapBuffer(
   return TextMeasurement{size, attachments};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -88,9 +88,8 @@ class TextLayoutManager {
       ParagraphAttributes const &paragraphAttributes,
       Size size) const;
 
-  void *self_;
+  void *self_{};
   ContextContainer::Shared contextContainer_;
-  bool mapBufferSerializationEnabled_;
   TextMeasureCache measureCache_;
 };
 

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm

@@ -55,6 +55,83 @@ inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
   return weights[(fontWeight + 50) / 100 - 1];
 }
 
+inline static UIFontTextStyle RCTUIFontTextStyleForDynamicTypeRamp(const DynamicTypeRamp &dynamicTypeRamp)
+{
+  switch (dynamicTypeRamp) {
+    case DynamicTypeRamp::Caption2:
+      return UIFontTextStyleCaption2;
+    case DynamicTypeRamp::Caption1:
+      return UIFontTextStyleCaption1;
+    case DynamicTypeRamp::Footnote:
+      return UIFontTextStyleFootnote;
+    case DynamicTypeRamp::Subheadline:
+      return UIFontTextStyleSubheadline;
+    case DynamicTypeRamp::Callout:
+      return UIFontTextStyleCallout;
+    case DynamicTypeRamp::Body:
+      return UIFontTextStyleBody;
+    case DynamicTypeRamp::Headline:
+      return UIFontTextStyleHeadline;
+    case DynamicTypeRamp::Title3:
+      return UIFontTextStyleTitle3;
+    case DynamicTypeRamp::Title2:
+      return UIFontTextStyleTitle2;
+    case DynamicTypeRamp::Title1:
+      return UIFontTextStyleTitle1;
+    case DynamicTypeRamp::LargeTitle:
+      return UIFontTextStyleLargeTitle;
+  }
+}
+
+inline static CGFloat RCTBaseSizeForDynamicTypeRamp(const DynamicTypeRamp &dynamicTypeRamp)
+{
+  // Values taken from
+  // https://developer.apple.com/design/human-interface-guidelines/foundations/typography/#specifications
+  switch (dynamicTypeRamp) {
+    case DynamicTypeRamp::Caption2:
+      return 11.0;
+    case DynamicTypeRamp::Caption1:
+      return 12.0;
+    case facebook::react::DynamicTypeRamp::Footnote:
+      return 13.0;
+    case facebook::react::DynamicTypeRamp::Subheadline:
+      return 15.0;
+    case facebook::react::DynamicTypeRamp::Callout:
+      return 16.0;
+    case facebook::react::DynamicTypeRamp::Body:
+      return 17.0;
+    case facebook::react::DynamicTypeRamp::Headline:
+      return 17.0;
+    case facebook::react::DynamicTypeRamp::Title3:
+      return 20.0;
+    case facebook::react::DynamicTypeRamp::Title2:
+      return 22.0;
+    case facebook::react::DynamicTypeRamp::Title1:
+      return 28.0;
+    case facebook::react::DynamicTypeRamp::LargeTitle:
+      return 34.0;
+  }
+}
+
+inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const TextAttributes &textAttributes)
+{
+  if (textAttributes.allowFontScaling.value_or(true)) {
+    if (textAttributes.dynamicTypeRamp.has_value()) {
+      DynamicTypeRamp dynamicTypeRamp = textAttributes.dynamicTypeRamp.value();
+      UIFontMetrics *fontMetrics =
+          [UIFontMetrics metricsForTextStyle:RCTUIFontTextStyleForDynamicTypeRamp(dynamicTypeRamp)];
+      // Using a specific font size reduces rounding errors from -scaledValueForValue:
+      CGFloat requestedSize =
+          isnan(textAttributes.fontSize) ? RCTBaseSizeForDynamicTypeRamp(dynamicTypeRamp) : textAttributes.fontSize;
+      return [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
+    } else {
+      return textAttributes.fontSizeMultiplier;
+    }
+  } else {
+    return 1.0;
+  }
+}
+
 inline static UIFont *RCTEffectiveFontFromTextAttributes(const TextAttributes &textAttributes)
 {
   NSString *fontFamily = [NSString stringWithCString:textAttributes.fontFamily.c_str() encoding:NSUTF8StringEncoding];
@@ -71,18 +148,11 @@ inline static UIFont *RCTEffectiveFontFromTextAttributes(const TextAttributes &t
   fontProperties.weight = textAttributes.fontWeight.has_value()
       ? RCTUIFontWeightFromInteger((NSInteger)textAttributes.fontWeight.value())
       : NAN;
-  fontProperties.sizeMultiplier = textAttributes.fontSizeMultiplier;
+  fontProperties.sizeMultiplier = RCTEffectiveFontSizeMultiplierFromTextAttributes(textAttributes);
 
   return RCTFontWithFontProperties(fontProperties);
 }
 
-inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const TextAttributes &textAttributes)
-{
-  return textAttributes.allowFontScaling.value_or(true) && !isnan(textAttributes.fontSizeMultiplier)
-      ? textAttributes.fontSizeMultiplier
-      : 1.0;
-}
-
 inline static UIColor *RCTEffectiveForegroundColorFromTextAttributes(const TextAttributes &textAttributes)
 {
   UIColor *effectiveForegroundColor = RCTUIColorFromSharedColor(textAttributes.foregroundColor) ?: [UIColor blackColor];
@@ -156,6 +226,12 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
     isParagraphStyleUsed = YES;
   }
 
+  if (textAttributes.lineBreakStrategy.has_value()) {
+    paragraphStyle.lineBreakStrategy =
+        RCTNSLineBreakStrategyFromLineBreakStrategy(textAttributes.lineBreakStrategy.value());
+    isParagraphStyleUsed = YES;
+  }
+
   if (!isnan(textAttributes.lineHeight)) {
     CGFloat lineHeight = textAttributes.lineHeight * RCTEffectiveFontSizeMultiplierFromTextAttributes(textAttributes);
     paragraphStyle.minimumLineHeight = lineHeight;

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h

@@ -10,68 +10,91 @@
 #include <react/renderer/textlayoutmanager/RCTFontProperties.h>
 #include <react/renderer/textlayoutmanager/RCTFontUtils.h>
 
-using namespace facebook::react;
-
-inline static NSTextAlignment RCTNSTextAlignmentFromTextAlignment(TextAlignment textAlignment)
+inline static NSTextAlignment RCTNSTextAlignmentFromTextAlignment(facebook::react::TextAlignment textAlignment)
 {
   switch (textAlignment) {
-    case TextAlignment::Natural:
+    case facebook::react::TextAlignment::Natural:
       return NSTextAlignmentNatural;
-    case TextAlignment::Left:
+    case facebook::react::TextAlignment::Left:
       return NSTextAlignmentLeft;
-    case TextAlignment::Right:
+    case facebook::react::TextAlignment::Right:
       return NSTextAlignmentRight;
-    case TextAlignment::Center:
+    case facebook::react::TextAlignment::Center:
       return NSTextAlignmentCenter;
-    case TextAlignment::Justified:
+    case facebook::react::TextAlignment::Justified:
       return NSTextAlignmentJustified;
   }
 }
 
-inline static NSWritingDirection RCTNSWritingDirectionFromWritingDirection(WritingDirection writingDirection)
+inline static NSWritingDirection RCTNSWritingDirectionFromWritingDirection(
+    facebook::react::WritingDirection writingDirection)
 {
   switch (writingDirection) {
-    case WritingDirection::Natural:
+    case facebook::react::WritingDirection::Natural:
       return NSWritingDirectionNatural;
-    case WritingDirection::LeftToRight:
+    case facebook::react::WritingDirection::LeftToRight:
       return NSWritingDirectionLeftToRight;
-    case WritingDirection::RightToLeft:
+    case facebook::react::WritingDirection::RightToLeft:
       return NSWritingDirectionRightToLeft;
   }
 }
 
-inline static RCTFontStyle RCTFontStyleFromFontStyle(FontStyle fontStyle)
+inline static NSLineBreakStrategy RCTNSLineBreakStrategyFromLineBreakStrategy(
+    facebook::react::LineBreakStrategy lineBreakStrategy)
+{
+  switch (lineBreakStrategy) {
+    case facebook::react::LineBreakStrategy::None:
+      return NSLineBreakStrategyNone;
+    case facebook::react::LineBreakStrategy::PushOut:
+      return NSLineBreakStrategyPushOut;
+    case facebook::react::LineBreakStrategy::HangulWordPriority:
+      if (@available(iOS 14.0, *)) {
+        return NSLineBreakStrategyHangulWordPriority;
+      } else {
+        return NSLineBreakStrategyNone;
+      }
+    case facebook::react::LineBreakStrategy::Standard:
+      if (@available(iOS 14.0, *)) {
+        return NSLineBreakStrategyStandard;
+      } else {
+        return NSLineBreakStrategyNone;
+      }
+  }
+}
+
+inline static RCTFontStyle RCTFontStyleFromFontStyle(facebook::react::FontStyle fontStyle)
 {
   switch (fontStyle) {
-    case FontStyle::Normal:
+    case facebook::react::FontStyle::Normal:
       return RCTFontStyleNormal;
-    case FontStyle::Italic:
+    case facebook::react::FontStyle::Italic:
       return RCTFontStyleItalic;
-    case FontStyle::Oblique:
+    case facebook::react::FontStyle::Oblique:
       return RCTFontStyleOblique;
   }
 }
 
-inline static RCTFontVariant RCTFontVariantFromFontVariant(FontVariant fontVariant)
+inline static RCTFontVariant RCTFontVariantFromFontVariant(facebook::react::FontVariant fontVariant)
 {
   return (RCTFontVariant)fontVariant;
 }
 
-inline static NSUnderlineStyle RCTNSUnderlineStyleFromTextDecorationStyle(TextDecorationStyle textDecorationStyle)
+inline static NSUnderlineStyle RCTNSUnderlineStyleFromTextDecorationStyle(
+    facebook::react::TextDecorationStyle textDecorationStyle)
 {
   switch (textDecorationStyle) {
-    case TextDecorationStyle::Solid:
+    case facebook::react::TextDecorationStyle::Solid:
       return NSUnderlineStyleSingle;
-    case TextDecorationStyle::Double:
+    case facebook::react::TextDecorationStyle::Double:
       return NSUnderlineStyleDouble;
-    case TextDecorationStyle::Dashed:
+    case facebook::react::TextDecorationStyle::Dashed:
       return NSUnderlinePatternDash | NSUnderlineStyleSingle;
-    case TextDecorationStyle::Dotted:
+    case facebook::react::TextDecorationStyle::Dotted:
       return NSUnderlinePatternDot | NSUnderlineStyleSingle;
   }
 }
 
-inline static UIColor *RCTUIColorFromSharedColor(const SharedColor &sharedColor)
+inline static UIColor *RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)
 {
   if (!sharedColor) {
     return nil;

package/ReactCommon/react/renderer/timeline/BUCK

@@ -31,8 +31,9 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/timeline",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
-    fbobjc_labels = ["supermodule:ios/isolation/infra.react_native"],
+    fbobjc_labels = [],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     macosx_tests_override = [],
@@ -46,9 +47,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         react_native_xplat_target("react/utils:utils"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -72,7 +70,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":timeline",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )

package/ReactCommon/react/renderer/timeline/Timeline.cpp

@@ -9,8 +9,7 @@
 
 #include <react/renderer/uimanager/UIManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Timeline::Timeline(ShadowTree const &shadowTree) : shadowTree_(&shadowTree) {
   record(shadowTree.getCurrentRevision().rootShadowNode);
@@ -31,7 +30,7 @@ void Timeline::pause() const noexcept {
 void Timeline::resume() const noexcept {
   std::lock_guard<std::recursive_mutex> lock(mutex_);
 
-  if (snapshots_.size() > 0) {
+  if (!snapshots_.empty()) {
     rewind(snapshots_.at(snapshots_.size() - 1));
   }
 
@@ -66,8 +65,8 @@ void Timeline::rewind(TimelineFrame const &frame) const noexcept {
 }
 
 RootShadowNode::Unshared Timeline::shadowTreeWillCommit(
-    ShadowTree const &shadowTree,
-    RootShadowNode::Shared const &oldRootShadowNode,
+    ShadowTree const & /*shadowTree*/,
+    RootShadowNode::Shared const & /*oldRootShadowNode*/,
     RootShadowNode::Unshared const &newRootShadowNode) const noexcept {
   std::lock_guard<std::recursive_mutex> lock(mutex_);
 
@@ -107,7 +106,8 @@ void Timeline::rewind(TimelineSnapshot const &snapshot) const noexcept {
   auto rootShadowNode = snapshot.getRootShadowNode();
 
   shadowTree_->commit(
-      [&](RootShadowNode const &oldRootShadowNode) -> RootShadowNode::Unshared {
+      [&](RootShadowNode const & /*oldRootShadowNode*/)
+          -> RootShadowNode::Unshared {
         return std::static_pointer_cast<RootShadowNode>(
             rootShadowNode->ShadowNode::clone({}));
       });
@@ -116,5 +116,4 @@ void Timeline::rewind(TimelineSnapshot const &snapshot) const noexcept {
   rewinding_ = false;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react