react-native-tvos 0.79.3-0 → 0.80.0-0

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

@@ -5,18 +5,25 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "TextLayoutManager.h"
+#include <span>
+#include <utility>
 
 #include <react/common/mapbuffer/JReadableMapBuffer.h>
+#include <react/debug/react_native_assert.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #include <react/renderer/telemetry/TransactionTelemetry.h>
+#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
+#include <react/renderer/textlayoutmanager/TextLayoutManagerExtended.h>
 
 namespace facebook::react {
 
+static_assert(TextLayoutManagerExtended::supportsLineMeasurement());
+static_assert(TextLayoutManagerExtended::supportsPreparedLayout());
+
 namespace {
 
 int countAttachments(const AttributedString& attributedString) {
@@ -88,6 +95,7 @@ TextMeasurement doMeasure(
     const ContextContainer::Shared& contextContainer,
     const AttributedString& attributedString,
     const ParagraphAttributes& paragraphAttributes,
+    const TextLayoutContext& layoutContext,
     const LayoutConstraints& layoutConstraints) {
   const int attachmentCount = countAttachments(attributedString);
   auto env = jni::Environment::current();
@@ -107,7 +115,7 @@ TextMeasurement doMeasure(
 
   auto size = measureAndroidComponent(
       contextContainer,
-      -1, // TODO: we should pass rootTag in
+      layoutContext.surfaceId,
       "RCTText",
       std::move(attributedStringMap),
       std::move(paragraphAttributesMap),
@@ -117,33 +125,39 @@ TextMeasurement doMeasure(
       maximumSize.height,
       attachmentPositions);
 
-  jfloat* attachmentData =
-      env->GetFloatArrayElements(attachmentPositions, nullptr);
+  jfloat* attachmentDataElements =
+      env->GetFloatArrayElements(attachmentPositions, nullptr /*isCopy*/);
+  std::span<float> attachmentData{
+      attachmentDataElements, static_cast<size_t>(attachmentCount * 2)};
 
   auto attachments = TextMeasurement::Attachments{};
   if (attachmentCount > 0) {
-    int attachmentIndex = 0;
     for (const auto& fragment : attributedString.getFragments()) {
       if (fragment.isAttachment()) {
-        float top = attachmentData[attachmentIndex * 2];
-        float left = attachmentData[attachmentIndex * 2 + 1];
-        float width = fragment.parentShadowView.layoutMetrics.frame.size.width;
-        float height =
-            fragment.parentShadowView.layoutMetrics.frame.size.height;
-
-        auto rect = facebook::react::Rect{
-            .origin = {.x = left, .y = top},
-            .size = facebook::react::Size{.width = width, .height = height}};
-        attachments.push_back(
-            TextMeasurement::Attachment{.frame = rect, .isClipped = false});
-        attachmentIndex++;
+        float top = attachmentData[attachments.size() * 2];
+        float left = attachmentData[attachments.size() * 2 + 1];
+        if (std::isnan(top) || std::isnan(left)) {
+          attachments.push_back(
+              TextMeasurement::Attachment{.frame = Rect{}, .isClipped = true});
+        } else {
+          float width =
+              fragment.parentShadowView.layoutMetrics.frame.size.width;
+          float height =
+              fragment.parentShadowView.layoutMetrics.frame.size.height;
+
+          auto rect = facebook::react::Rect{
+              .origin = {.x = left, .y = top},
+              .size = facebook::react::Size{.width = width, .height = height}};
+          attachments.push_back(
+              TextMeasurement::Attachment{.frame = rect, .isClipped = false});
+        }
       }
     }
   }
 
   // Clean up allocated ref
   env->ReleaseFloatArrayElements(
-      attachmentPositions, attachmentData, JNI_ABORT);
+      attachmentPositions, attachmentDataElements, JNI_ABORT);
   env->DeleteLocalRef(attachmentPositions);
 
   return TextMeasurement{.size = size, .attachments = attachments};
@@ -176,6 +190,7 @@ TextMeasurement TextLayoutManager::measure(
             contextContainer_,
             attributedString,
             paragraphAttributes,
+            layoutContext,
             layoutConstraints);
 
         if (telemetry != nullptr) {
@@ -192,6 +207,7 @@ TextMeasurement TextLayoutManager::measure(
 TextMeasurement TextLayoutManager::measureCachedSpannableById(
     int64_t cacheId,
     const ParagraphAttributes& paragraphAttributes,
+    const TextLayoutContext& layoutContext,
     const LayoutConstraints& layoutConstraints) const {
   auto env = jni::Environment::current();
   auto attachmentPositions = env->NewFloatArray(0);
@@ -205,7 +221,7 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
 
   auto size = measureAndroidComponent(
       contextContainer_,
-      -1, // TODO: we should pass rootTag in
+      layoutContext.surfaceId,
       "RCTText",
       localDataBuilder.build(),
       toMapBuffer(paragraphAttributes),
@@ -277,4 +293,95 @@ LinesMeasurements TextLayoutManager::measureLines(
   return lineMeasurements;
 }
 
+TextLayoutManager::PreparedLayout TextLayoutManager::prepareLayout(
+    const AttributedString& attributedString,
+    const ParagraphAttributes& paragraphAttributes,
+    const TextLayoutContext& layoutContext,
+    const LayoutConstraints& layoutConstraints) const {
+  const auto& fabricUIManager =
+      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+  static auto prepareLayout =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<JPreparedLayout::javaobject(
+              jint,
+              JReadableMapBuffer::javaobject,
+              JReadableMapBuffer::javaobject,
+              jfloat,
+              jfloat)>("prepareLayout");
+
+  auto attributedStringMB =
+      JReadableMapBuffer::createWithContents(toMapBuffer(attributedString));
+  auto paragraphAttributesMB =
+      JReadableMapBuffer::createWithContents(toMapBuffer(paragraphAttributes));
+
+  // T222682416: We don't have any global cache here. We should investigate
+  // whether that is desirable
+  return {jni::make_global(prepareLayout(
+      fabricUIManager,
+      layoutContext.surfaceId,
+      attributedStringMB.get(),
+      paragraphAttributesMB.get(),
+      layoutConstraints.maximumSize.width,
+      layoutConstraints.maximumSize.height))};
+}
+
+TextMeasurement TextLayoutManager::measurePreparedLayout(
+    const PreparedLayout& preparedLayout,
+    const TextLayoutContext& /*layoutContext*/,
+    const LayoutConstraints& layoutConstraints) const {
+  const auto& fabricUIManager =
+      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+  static auto measurePreparedLayout =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<jni::JArrayFloat(
+              JPreparedLayout::javaobject, jfloat, jfloat, jfloat, jfloat)>(
+              "measurePreparedLayout");
+
+  auto minimumSize = layoutConstraints.minimumSize;
+  auto maximumSize = layoutConstraints.maximumSize;
+
+  auto measurementsArr = measurePreparedLayout(
+      fabricUIManager,
+      preparedLayout.get(),
+      minimumSize.width,
+      maximumSize.width,
+      minimumSize.height,
+      maximumSize.height);
+  auto measurements = measurementsArr->getRegion(
+      0, static_cast<jsize>(measurementsArr->size()));
+
+  react_native_assert(measurementsArr->size() >= 2);
+  react_native_assert((measurementsArr->size() - 2) % 4 == 0);
+
+  TextMeasurement textMeasurement;
+
+  textMeasurement.size.width = measurements[0];
+  textMeasurement.size.height = measurements[1];
+
+  if (measurementsArr->size() > 2) {
+    textMeasurement.attachments.reserve((measurementsArr->size() - 2) / 4);
+    for (size_t i = 2; i < measurementsArr->size(); i += 4) {
+      auto top = measurements[i];
+      auto left = measurements[i + 1];
+      auto width = measurements[i + 2];
+      auto height = measurements[i + 3];
+
+      if (std::isnan(top) || std::isnan(left)) {
+        textMeasurement.attachments.push_back(
+            TextMeasurement::Attachment{.frame = Rect{}, .isClipped = true});
+      } else {
+        textMeasurement.attachments.push_back(TextMeasurement::Attachment{
+            .frame =
+                {.origin = {.x = left, .y = top},
+                 .size = {.width = width, .height = height}},
+            .isClipped = false});
+      }
+    }
+  }
+
+  return textMeasurement;
+}
+
 } // namespace facebook::react

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

@@ -0,0 +1,100 @@
+/*
+ * 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/jni/SafeReleaseJniRef.h>
+#include <react/renderer/attributedstring/AttributedStringBox.h>
+#include <react/renderer/attributedstring/ParagraphAttributes.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/textlayoutmanager/JPreparedLayout.h>
+#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
+#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
+#include <react/utils/ContextContainer.h>
+
+#include <fbjni/fbjni.h>
+#include <memory>
+
+namespace facebook::react {
+
+class TextLayoutManager;
+
+/*
+ * Cross platform facade for text measurement (e.g. Android-specific
+ * TextLayoutManager)
+ */
+class TextLayoutManager {
+ public:
+  using PreparedLayout = SafeReleaseJniRef<jni::global_ref<JPreparedLayout>>;
+
+  TextLayoutManager(const ContextContainer::Shared& contextContainer);
+
+  /*
+   * Not copyable.
+   */
+  TextLayoutManager(const TextLayoutManager&) = delete;
+  TextLayoutManager& operator=(const TextLayoutManager&) = delete;
+
+  /*
+   * Not movable.
+   */
+  TextLayoutManager(TextLayoutManager&&) = delete;
+  TextLayoutManager& operator=(TextLayoutManager&&) = delete;
+
+  /*
+   * Measures `attributedString` using native text rendering infrastructure.
+   */
+  TextMeasurement measure(
+      const AttributedStringBox& attributedStringBox,
+      const ParagraphAttributes& paragraphAttributes,
+      const TextLayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const;
+
+  /**
+   * Measures an AttributedString on the platform, as identified by some
+   * opaque cache ID.
+   */
+  TextMeasurement measureCachedSpannableById(
+      int64_t cacheId,
+      const ParagraphAttributes& paragraphAttributes,
+      const TextLayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const;
+
+  /*
+   * Measures lines of `attributedString` using native text rendering
+   * infrastructure.
+   */
+  LinesMeasurements measureLines(
+      const AttributedStringBox& attributedStringBox,
+      const ParagraphAttributes& paragraphAttributes,
+      const Size& size) const;
+
+  /**
+   * Create a platform representation of fully laid out text, to later be
+   * reused.
+   */
+  PreparedLayout prepareLayout(
+      const AttributedString& attributedString,
+      const ParagraphAttributes& paragraphAttributes,
+      const TextLayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const;
+
+  /**
+   * Derive text and attachment measurements from a PreparedLayout.
+   */
+  TextMeasurement measurePreparedLayout(
+      const PreparedLayout& layout,
+      const TextLayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const;
+
+ private:
+  std::shared_ptr<const ContextContainer> contextContainer_;
+  TextMeasureCache textMeasureCache_;
+  LineMeasureCache lineMeasureCache_;
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/{TextLayoutManager.cpp → react/renderer/textlayoutmanager/TextLayoutManager.cpp}

@@ -11,8 +11,7 @@ namespace facebook::react {
 
 TextLayoutManager::TextLayoutManager(
     const ContextContainer::Shared& /*contextContainer*/)
-    : textMeasureCache_(kSimpleThreadSafeCacheSizeCap),
-      lineMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
+    : textMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
 
 TextMeasurement TextLayoutManager::measure(
     const AttributedStringBox& attributedStringBox,
@@ -29,20 +28,4 @@ TextMeasurement TextLayoutManager::measure(
   return TextMeasurement{{0, 0}, attachments};
 }
 
-#ifdef ANDROID
-TextMeasurement TextLayoutManager::measureCachedSpannableById(
-    int64_t /*cacheId*/,
-    const ParagraphAttributes& /*paragraphAttributes*/,
-    const LayoutConstraints& /*layoutConstraints*/) const {
-  return {};
-}
-#endif
-
-LinesMeasurements TextLayoutManager::measureLines(
-    const AttributedStringBox& /*attributedStringBox*/,
-    const ParagraphAttributes& /*paragraphAttributes*/,
-    const Size& /*size*/) const {
-  return {};
-};
-
 } // namespace facebook::react

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

@@ -0,0 +1,57 @@
+/*
+ * 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/attributedstring/AttributedStringBox.h>
+#include <react/renderer/attributedstring/ParagraphAttributes.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
+#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
+#include <react/utils/ContextContainer.h>
+#include <memory>
+
+namespace facebook::react {
+
+class TextLayoutManager;
+
+/*
+ * Cross platform facade for text measurement (e.g. Android-specific
+ * TextLayoutManager)
+ */
+class TextLayoutManager {
+ public:
+  TextLayoutManager(const ContextContainer::Shared& contextContainer);
+  virtual ~TextLayoutManager() = default;
+
+  /*
+   * Not copyable.
+   */
+  TextLayoutManager(const TextLayoutManager&) = delete;
+  TextLayoutManager& operator=(const TextLayoutManager&) = delete;
+
+  /*
+   * Not movable.
+   */
+  TextLayoutManager(TextLayoutManager&&) = delete;
+  TextLayoutManager& operator=(TextLayoutManager&&) = delete;
+
+  /*
+   * Measures `attributedString` using native text rendering infrastructure.
+   */
+  virtual TextMeasurement measure(
+      const AttributedStringBox& attributedStringBox,
+      const ParagraphAttributes& paragraphAttributes,
+      const TextLayoutContext& layoutContext,
+      const LayoutConstraints& layoutConstraints) const;
+
+ protected:
+  std::shared_ptr<const ContextContainer> contextContainer_;
+  TextMeasureCache textMeasureCache_;
+};
+
+} // namespace facebook::react

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

@@ -10,6 +10,7 @@
 #import <react/renderer/attributedstring/AttributedString.h>
 #import <react/renderer/attributedstring/ParagraphAttributes.h>
 #import <react/renderer/core/LayoutConstraints.h>
+#import <react/renderer/textlayoutmanager/TextLayoutContext.h>
 #import <react/renderer/textlayoutmanager/TextMeasureCache.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,10 +29,12 @@ using RCTTextLayoutFragmentEnumerationBlock =
 
 - (facebook::react::TextMeasurement)measureAttributedString:(facebook::react::AttributedString)attributedString
                                         paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
+                                              layoutContext:(facebook::react::TextLayoutContext)layoutContext
                                           layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints;
 
 - (facebook::react::TextMeasurement)measureNSAttributedString:(NSAttributedString *)attributedString
                                           paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
+                                                layoutContext:(facebook::react::TextLayoutContext)layoutContext
                                             layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints;
 
 - (void)drawAttributedString:(facebook::react::AttributedString)attributedString

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

@@ -37,6 +37,7 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 
 - (TextMeasurement)measureNSAttributedString:(NSAttributedString *)attributedString
                          paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+                               layoutContext:(TextLayoutContext)layoutContext
                            layoutConstraints:(LayoutConstraints)layoutConstraints
 {
   if (attributedString.length == 0) {
@@ -47,32 +48,21 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
   }
 
   CGSize maximumSize = CGSize{layoutConstraints.maximumSize.width, CGFLOAT_MAX};
-
-  // A workaround for the issue with empty line measurement:
-  // When maximumNumberOfLines is set to N and N+1 line is empty, the returned
-  // measurement is for N+1 lines. Adding any character to that line results
-  // in the correct measurement.
-  if (paragraphAttributes.maximumNumberOfLines > 0 && attributedString.length > 0 &&
-      [[attributedString string] characterAtIndex:attributedString.length - 1] == '\n') {
-    NSMutableAttributedString *mutableString =
-        [[NSMutableAttributedString alloc] initWithAttributedString:attributedString];
-    [mutableString replaceCharactersInRange:NSMakeRange(attributedString.length - 1, 1) withString:@"\n "];
-    attributedString = mutableString;
-  }
-
   NSTextStorage *textStorage = [self _textStorageAndLayoutManagerWithAttributesString:attributedString
                                                                   paragraphAttributes:paragraphAttributes
                                                                                  size:maximumSize];
 
-  return [self _measureTextStorage:textStorage];
+  return [self _measureTextStorage:textStorage paragraphAttributes:paragraphAttributes layoutContext:layoutContext];
 }
 
 - (TextMeasurement)measureAttributedString:(AttributedString)attributedString
                        paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+                             layoutContext:(TextLayoutContext)layoutContext
                          layoutConstraints:(LayoutConstraints)layoutConstraints
 {
   return [self measureNSAttributedString:[self _nsAttributedStringFromAttributedString:attributedString]
                      paragraphAttributes:paragraphAttributes
+                           layoutContext:layoutContext
                        layoutConstraints:layoutConstraints];
 }
 
@@ -341,6 +331,8 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 }
 
 - (TextMeasurement)_measureTextStorage:(NSTextStorage *)textStorage
+                   paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+                         layoutContext:(TextLayoutContext)layoutContext
 {
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
@@ -348,6 +340,8 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
   __block BOOL textDidWrap = NO;
+  __block NSUInteger linesEnumerated = 0;
+  __block CGFloat enumeratedLinesHeight = 0;
   [layoutManager
       enumerateLineFragmentsForGlyphRange:glyphRange
                                usingBlock:^(
@@ -363,6 +357,13 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                                      [textStorage.string characterAtIndex:lastCharacterIndex] == '\n';
                                  if (!endsWithNewLine && textStorage.string.length > lastCharacterIndex + 1) {
                                    textDidWrap = YES;
+                                 }
+                                 if (linesEnumerated++ < paragraphAttributes.maximumNumberOfLines) {
+                                   enumeratedLinesHeight = usedRect.origin.y + usedRect.size.height;
+                                 }
+                                 if (textDidWrap &&
+                                     (paragraphAttributes.maximumNumberOfLines == 0 ||
+                                      linesEnumerated >= paragraphAttributes.maximumNumberOfLines)) {
                                    *stop = YES;
                                  }
                                }];
@@ -373,7 +374,21 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
     size.width = textContainer.size.width;
   }
 
-  size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
+  if (paragraphAttributes.maximumNumberOfLines != 0) {
+    // If maximumNumberOfLines is set, we cannot rely on setting it on the NSTextContainer
+    // due to an edge case where it returns wrong height:
+    // When maximumNumberOfLines is set to N and the N+1 line is empty, the measured height
+    // is N+1 lines (incorrect). Adding any characted to the N+1 line, making it non-empty
+    // casuses the measured height to be N lines (correct).
+    if (linesEnumerated < paragraphAttributes.maximumNumberOfLines) {
+      enumeratedLinesHeight += layoutManager.extraLineFragmentUsedRect.size.height;
+    }
+    size.height = enumeratedLinesHeight;
+  }
+
+  size = (CGSize){
+      ceil(size.width * layoutContext.pointScaleFactor) / layoutContext.pointScaleFactor,
+      ceil(size.height * layoutContext.pointScaleFactor) / layoutContext.pointScaleFactor};
 
   __block auto attachments = TextMeasurement::Attachments{};
 
@@ -386,19 +401,27 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                   return;
                 }
 
-                CGSize attachmentSize = attachment.bounds.size;
-                CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range inTextContainer:textContainer];
+                NSRange attachmentGlyphRange = [layoutManager glyphRangeForCharacterRange:range
+                                                                     actualCharacterRange:NULL];
+                NSRange truncatedRange =
+                    [layoutManager truncatedGlyphRangeInLineFragmentForGlyphAtIndex:attachmentGlyphRange.location];
+                if (truncatedRange.location != NSNotFound && attachmentGlyphRange.location >= truncatedRange.location) {
+                  attachments.push_back(TextMeasurement::Attachment{.isClipped = true});
+                } else {
+                  CGSize attachmentSize = attachment.bounds.size;
+                  CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range inTextContainer:textContainer];
 
-                CGRect frame;
-                CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y;
+                  CGRect frame;
+                  CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y;
 
-                frame = {{glyphRect.origin.x, glyphRect.origin.y + baseline - attachmentSize.height}, attachmentSize};
+                  frame = {{glyphRect.origin.x, glyphRect.origin.y + baseline - attachmentSize.height}, attachmentSize};
 
-                auto rect = facebook::react::Rect{
-                    facebook::react::Point{frame.origin.x, frame.origin.y},
-                    facebook::react::Size{frame.size.width, frame.size.height}};
+                  auto rect = facebook::react::Rect{
+                      facebook::react::Point{frame.origin.x, frame.origin.y},
+                      facebook::react::Size{frame.size.width, frame.size.height}};
 
-                attachments.push_back(TextMeasurement::Attachment{rect, false});
+                  attachments.push_back(TextMeasurement::Attachment{.frame = rect, .isClipped = false});
+                }
               }];
 
   return TextMeasurement{{size.width, size.height}, attachments};

package/ReactCommon/react/renderer/textlayoutmanager/{TextLayoutManager.h → platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h}

@@ -17,8 +17,6 @@
 
 namespace facebook::react {
 
-class TextLayoutManager;
-
 /*
  * Cross platform facade for text measurement (e.g. Android-specific
  * TextLayoutManager)
@@ -26,7 +24,6 @@ class TextLayoutManager;
 class TextLayoutManager {
  public:
   TextLayoutManager(const ContextContainer::Shared& contextContainer);
-  virtual ~TextLayoutManager() = default;
 
   /*
    * Not copyable.
@@ -43,54 +40,30 @@ class TextLayoutManager {
   /*
    * Measures `attributedString` using native text rendering infrastructure.
    */
-  virtual TextMeasurement measure(
+  TextMeasurement measure(
       const AttributedStringBox& attributedStringBox,
       const ParagraphAttributes& paragraphAttributes,
       const TextLayoutContext& layoutContext,
       const LayoutConstraints& layoutConstraints) const;
 
-#ifdef ANDROID
-  /**
-   * Measures an AttributedString on the platform, as identified by some
-   * opaque cache ID.
-   */
-  TextMeasurement measureCachedSpannableById(
-      int64_t cacheId,
-      const ParagraphAttributes& paragraphAttributes,
-      const LayoutConstraints& layoutConstraints) const;
-#endif
-
   /*
    * Measures lines of `attributedString` using native text rendering
    * infrastructure.
    */
-  virtual LinesMeasurements measureLines(
-      const AttributedStringBox& attributedStringBox,
-      const ParagraphAttributes& paragraphAttributes,
-      const Size& size) const;
-
-  /*
-   * Calculates baseline of `attributedString` using native text rendering
-   * infrastructure.
-   */
-  Float baseline(
+  LinesMeasurements measureLines(
       const AttributedStringBox& attributedStringBox,
       const ParagraphAttributes& paragraphAttributes,
       const Size& size) const;
 
-#ifdef __APPLE__
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
    * Is used on a native views layer to delegate text rendering to the manager.
    */
   std::shared_ptr<void> getNativeTextLayoutManager() const;
-#endif
 
  protected:
   std::shared_ptr<const ContextContainer> contextContainer_;
-#ifdef __APPLE__
   std::shared_ptr<void> nativeTextLayoutManager_;
-#endif
   TextMeasureCache textMeasureCache_;
   LineMeasureCache lineMeasureCache_;
 };

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

@@ -47,6 +47,7 @@ TextMeasurement TextLayoutManager::measure(
 
             auto measurement = [textLayoutManager measureAttributedString:attributedString
                                                       paragraphAttributes:paragraphAttributes
+                                                            layoutContext:layoutContext
                                                         layoutConstraints:layoutConstraints];
 
             if (telemetry) {
@@ -69,6 +70,7 @@ TextMeasurement TextLayoutManager::measure(
 
       measurement = [textLayoutManager measureNSAttributedString:nsAttributedString
                                              paragraphAttributes:paragraphAttributes
+                                                   layoutContext:layoutContext
                                                layoutConstraints:layoutConstraints];
 
       if (telemetry) {

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

@@ -6,14 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(
-        -fexceptions
-        -frtti
-        -std=c++20
-        -Wall
-        -Wpedantic
-        -Wno-unused-local-typedef
-        -DLOG_TAG=\"Fabric\")
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB react_renderer_uimanager_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_renderer_uimanager OBJECT ${react_renderer_uimanager_SRC})
@@ -41,3 +34,6 @@ target_link_libraries(react_renderer_uimanager
         rrc_view
         runtimeexecutor
 )
+target_compile_reactnative_options(react_renderer_uimanager PRIVATE "Fabric")
+target_compile_options(react_renderer_uimanager PRIVATE -Wno-unused-local-typedef)
+target_compile_options(react_renderer_uimanager PRIVATE -Wpedantic)