react-native-tvos 0.77.0-0rc5 → 0.78.0-0rc4

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

@@ -0,0 +1,26 @@
+/*
+ * 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 "TextLayoutManager.h"
+
+namespace facebook::react {
+
+Float TextLayoutManager::baseline(
+    const AttributedStringBox& attributedStringBox,
+    const ParagraphAttributes& paragraphAttributes,
+    const Size& size) const {
+  auto lines =
+      this->measureLines(attributedStringBox, paragraphAttributes, size);
+
+  if (!lines.empty()) {
+    return lines[0].ascender;
+  } else {
+    return 0;
+  }
+}
+
+} // namespace facebook::react

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

@@ -7,26 +7,26 @@
 
 #pragma once
 
-#include <react/config/ReactNativeConfig.h>
-#include <react/renderer/attributedstring/AttributedString.h>
 #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;
 
-using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
-
 /*
- * Cross platform facade for Android-specific 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.
@@ -43,12 +43,13 @@ class TextLayoutManager {
   /*
    * Measures `attributedString` using native text rendering infrastructure.
    */
-  TextMeasurement measure(
+  virtual 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.
@@ -57,12 +58,13 @@ class TextLayoutManager {
       int64_t cacheId,
       const ParagraphAttributes& paragraphAttributes,
       const LayoutConstraints& layoutConstraints) const;
+#endif
 
   /*
    * Measures lines of `attributedString` using native text rendering
    * infrastructure.
    */
-  LinesMeasurements measureLines(
+  virtual LinesMeasurements measureLines(
       const AttributedStringBox& attributedStringBox,
       const ParagraphAttributes& paragraphAttributes,
       const Size& size) const;
@@ -76,20 +78,19 @@ class TextLayoutManager {
       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.
    */
-  void* getNativeTextLayoutManager() const;
-
- private:
-  TextMeasurement doMeasure(
-      const AttributedString& attributedString,
-      const ParagraphAttributes& paragraphAttributes,
-      const LayoutConstraints& layoutConstraints) const;
-
-  void* self_{};
-  ContextContainer::Shared contextContainer_;
+  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/TextMeasureCache.h

@@ -208,8 +208,7 @@ inline bool operator==(
   return areAttributedStringsEquivalentLayoutWise(
              lhs.attributedString, rhs.attributedString) &&
       lhs.paragraphAttributes == rhs.paragraphAttributes &&
-      lhs.layoutConstraints.maximumSize.width ==
-      rhs.layoutConstraints.maximumSize.width;
+      lhs.layoutConstraints == rhs.layoutConstraints;
 }
 
 inline bool operator!=(
@@ -243,7 +242,7 @@ struct hash<facebook::react::TextMeasureCacheKey> {
     return facebook::react::hash_combine(
         attributedStringHashLayoutWise(key.attributedString),
         key.paragraphAttributes,
-        key.layoutConstraints.maximumSize.width);
+        key.layoutConstraints);
   }
 };
 

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

@@ -7,8 +7,6 @@
 
 #include "TextLayoutManager.h"
 
-#include <limits>
-
 #include <react/common/mapbuffer/JReadableMapBuffer.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/conversions.h>
@@ -17,11 +15,11 @@
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #include <react/renderer/telemetry/TransactionTelemetry.h>
 
-using namespace facebook::jni;
-
 namespace facebook::react {
 
-static int countAttachments(const AttributedString& attributedString) {
+namespace {
+
+int countAttachments(const AttributedString& attributedString) {
   int count = 0;
 
   for (const auto& fragment : attributedString.getFragments()) {
@@ -46,7 +44,7 @@ Size measureAndroidComponent(
     jfloatArray attachmentPositions) {
   const jni::global_ref<jobject>& fabricUIManager =
       contextContainer->at<jni::global_ref<jobject>>("FabricUIManager");
-  auto componentNameRef = make_jstring(componentName);
+  auto componentNameRef = jni::make_jstring(componentName);
 
   static auto measure =
       jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
@@ -86,16 +84,79 @@ Size measureAndroidComponent(
   return size;
 }
 
+TextMeasurement doMeasure(
+    const ContextContainer::Shared& contextContainer,
+    const AttributedString& attributedString,
+    const ParagraphAttributes& paragraphAttributes,
+    const LayoutConstraints& layoutConstraints) {
+  const int attachmentCount = countAttachments(attributedString);
+  auto env = jni::Environment::current();
+  auto attachmentPositions = env->NewFloatArray(attachmentCount * 2);
+
+  auto minimumSize = layoutConstraints.minimumSize;
+  auto maximumSize = layoutConstraints.maximumSize;
+
+  // We assume max height will have no effect on measurement, so we override it
+  // with a constant value with no constraints, to enable cache reuse later down
+  // in the stack.
+  // TODO: This is suss, and not at the right layer
+  maximumSize.height = std::numeric_limits<Float>::infinity();
+
+  auto attributedStringMap = toMapBuffer(attributedString);
+  auto paragraphAttributesMap = toMapBuffer(paragraphAttributes);
+
+  auto size = measureAndroidComponent(
+      contextContainer,
+      -1, // TODO: we should pass rootTag in
+      "RCTText",
+      std::move(attributedStringMap),
+      std::move(paragraphAttributesMap),
+      minimumSize.width,
+      maximumSize.width,
+      minimumSize.height,
+      maximumSize.height,
+      attachmentPositions);
+
+  jfloat* attachmentData =
+      env->GetFloatArrayElements(attachmentPositions, nullptr);
+
+  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++;
+      }
+    }
+  }
+
+  // Clean up allocated ref
+  env->ReleaseFloatArrayElements(
+      attachmentPositions, attachmentData, JNI_ABORT);
+  env->DeleteLocalRef(attachmentPositions);
+
+  return TextMeasurement{.size = size, .attachments = attachments};
+}
+
+} // namespace
+
 TextLayoutManager::TextLayoutManager(
     const ContextContainer::Shared& contextContainer)
     : contextContainer_(contextContainer),
       textMeasureCache_(kSimpleThreadSafeCacheSizeCap),
       lineMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
 
-void* TextLayoutManager::getNativeTextLayoutManager() const {
-  return self_;
-}
-
 TextMeasurement TextLayoutManager::measure(
     const AttributedStringBox& attributedStringBox,
     const ParagraphAttributes& paragraphAttributes,
@@ -111,8 +172,11 @@ TextMeasurement TextLayoutManager::measure(
           telemetry->willMeasureText();
         }
 
-        auto measurement =
-            doMeasure(attributedString, paragraphAttributes, layoutConstraints);
+        auto measurement = doMeasure(
+            contextContainer_,
+            attributedString,
+            paragraphAttributes,
+            layoutConstraints);
 
         if (telemetry != nullptr) {
           telemetry->didMeasureText();
@@ -129,7 +193,7 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
     int64_t cacheId,
     const ParagraphAttributes& paragraphAttributes,
     const LayoutConstraints& layoutConstraints) const {
-  auto env = Environment::current();
+  auto env = jni::Environment::current();
   auto attachmentPositions = env->NewFloatArray(0);
   auto minimumSize = layoutConstraints.minimumSize;
   auto maximumSize = layoutConstraints.maximumSize;
@@ -213,80 +277,4 @@ LinesMeasurements TextLayoutManager::measureLines(
   return lineMeasurements;
 }
 
-Float TextLayoutManager::baseline(
-    const AttributedStringBox& attributedStringBox,
-    const ParagraphAttributes& paragraphAttributes,
-    const Size& size) const {
-  auto lines =
-      this->measureLines(attributedStringBox, paragraphAttributes, size);
-
-  if (!lines.empty()) {
-    return lines[0].ascender;
-  } else {
-    return 0;
-  }
-}
-
-TextMeasurement TextLayoutManager::doMeasure(
-    const AttributedString& attributedString,
-    const ParagraphAttributes& paragraphAttributes,
-    const LayoutConstraints& layoutConstraints) const {
-  const int attachmentCount = countAttachments(attributedString);
-  auto env = Environment::current();
-  auto attachmentPositions = env->NewFloatArray(attachmentCount * 2);
-
-  auto minimumSize = layoutConstraints.minimumSize;
-  auto maximumSize = layoutConstraints.maximumSize;
-
-  // We assume max height will have no effect on measurement, so we override it
-  // with a constant value with no constraints, to enable cache reuse later down
-  // in the stack.
-  // TODO: This is suss, and not at the right layer
-  maximumSize.height = std::numeric_limits<Float>::infinity();
-
-  auto attributedStringMap = toMapBuffer(attributedString);
-  auto paragraphAttributesMap = toMapBuffer(paragraphAttributes);
-
-  auto size = measureAndroidComponent(
-      contextContainer_,
-      -1, // TODO: we should pass rootTag in
-      "RCTText",
-      std::move(attributedStringMap),
-      std::move(paragraphAttributesMap),
-      minimumSize.width,
-      maximumSize.width,
-      minimumSize.height,
-      maximumSize.height,
-      attachmentPositions);
-
-  jfloat* attachmentData =
-      env->GetFloatArrayElements(attachmentPositions, nullptr);
-
-  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{
-            {left, top}, facebook::react::Size{width, height}};
-        attachments.push_back(TextMeasurement::Attachment{rect, false});
-        attachmentIndex++;
-      }
-    }
-  }
-
-  // Clean up allocated ref
-  env->ReleaseFloatArrayElements(
-      attachmentPositions, attachmentData, JNI_ABORT);
-  env->DeleteLocalRef(attachmentPositions);
-
-  return TextMeasurement{size, attachments};
-}
-
 } // namespace facebook::react

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

@@ -9,9 +9,10 @@
 
 namespace facebook::react {
 
-void* TextLayoutManager::getNativeTextLayoutManager() const {
-  return (void*)this;
-}
+TextLayoutManager::TextLayoutManager(
+    const ContextContainer::Shared& /*contextContainer*/)
+    : textMeasureCache_(kSimpleThreadSafeCacheSizeCap),
+      lineMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
 
 TextMeasurement TextLayoutManager::measure(
     const AttributedStringBox& attributedStringBox,
@@ -28,12 +29,14 @@ 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*/,
@@ -42,11 +45,4 @@ LinesMeasurements TextLayoutManager::measureLines(
   return {};
 };
 
-Float TextLayoutManager::baseline(
-    const AttributedStringBox& /*attributedStringBox*/,
-    const ParagraphAttributes& /*paragraphAttributes*/,
-    const Size& /*size*/) const {
-  return 0;
-}
-
 } // namespace facebook::react

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

@@ -139,6 +139,7 @@ inline static CGFloat RCTBaseSizeForDynamicTypeRamp(const DynamicTypeRamp &dynam
 inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const TextAttributes &textAttributes)
 {
   if (textAttributes.allowFontScaling.value_or(true)) {
+    CGFloat fontSizeMultiplier = !isnan(textAttributes.fontSizeMultiplier) ? textAttributes.fontSizeMultiplier : 1.0;
     if (textAttributes.dynamicTypeRamp.has_value()) {
       DynamicTypeRamp dynamicTypeRamp = textAttributes.dynamicTypeRamp.value();
       UIFontMetrics *fontMetrics =
@@ -146,10 +147,11 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
       // 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;
+      fontSizeMultiplier = [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
     }
+    CGFloat maxFontSizeMultiplier =
+        !isnan(textAttributes.maxFontSizeMultiplier) ? textAttributes.maxFontSizeMultiplier : 0.0;
+    return maxFontSizeMultiplier >= 1.0 ? fminf(maxFontSizeMultiplier, fontSizeMultiplier) : fontSizeMultiplier;
   } else {
     return 1.0;
   }
@@ -307,8 +309,12 @@ NSMutableDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttri
     auto textShadowOffset = textAttributes.textShadowOffset.value();
     NSShadow *shadow = [NSShadow new];
     shadow.shadowOffset = CGSize{textShadowOffset.width, textShadowOffset.height};
-    shadow.shadowBlurRadius = textAttributes.textShadowRadius;
-    shadow.shadowColor = RCTUIColorFromSharedColor(textAttributes.textShadowColor);
+    if (!isnan(textAttributes.textShadowRadius)) {
+      shadow.shadowBlurRadius = textAttributes.textShadowRadius;
+    }
+    if (textAttributes.textShadowColor) {
+      shadow.shadowColor = RCTUIColorFromSharedColor(textAttributes.textShadowColor);
+    }
     attributes[NSShadowAttributeName] = shadow;
   }
 

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

@@ -146,6 +146,19 @@ static UIFont *RCTDefaultFontWithFontProperties(RCTFontProperties fontProperties
   return font;
 }
 
+static UIFontDescriptorSystemDesign RCTGetFontDescriptorSystemDesign(NSString *family)
+{
+  static NSDictionary<NSString *, NSString *> *systemDesigns = @{
+    @"system-ui" : UIFontDescriptorSystemDesignDefault,
+    @"ui-sans-serif" : UIFontDescriptorSystemDesignDefault,
+    @"ui-serif" : UIFontDescriptorSystemDesignSerif,
+    @"ui-rounded" : UIFontDescriptorSystemDesignRounded,
+    @"ui-monospace" : UIFontDescriptorSystemDesignMonospaced
+  };
+
+  return systemDesigns[family];
+}
+
 UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
 {
   RCTFontProperties defaultFontProperties = RCTDefaultFontProperties();
@@ -154,7 +167,16 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
   assert(!isnan(fontProperties.sizeMultiplier));
   CGFloat effectiveFontSize = fontProperties.sizeMultiplier * fontProperties.size;
   UIFont *font;
-  if ([fontProperties.family isEqualToString:defaultFontProperties.family]) {
+  UIFontDescriptorSystemDesign design = RCTGetFontDescriptorSystemDesign([fontProperties.family lowercaseString]);
+  if (design) {
+    // Create a system font which `-fontDescriptorWithDesign:` asks for
+    // (see:
+    // https://developer.apple.com/documentation/uikit/uifontdescriptor/3151797-fontdescriptorwithdesign?language=objc)
+    // It's OK to use `RCTDefaultFontWithFontProperties` which creates a system font
+    font = RCTDefaultFontWithFontProperties(fontProperties);
+    UIFontDescriptor *descriptor = [font.fontDescriptor fontDescriptorWithDesign:design];
+    font = [UIFont fontWithDescriptor:descriptor size:effectiveFontSize];
+  } else if ([fontProperties.family isEqualToString:defaultFontProperties.family]) {
     // Handle system font as special case. This ensures that we preserve
     // the specific metrics of the standard system font as closely as possible.
     font = RCTDefaultFontWithFontProperties(fontProperties);

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

@@ -203,27 +203,15 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                                                 facebook::react::Point{usedRect.origin.x, usedRect.origin.y},
                                                 facebook::react::Size{usedRect.size.width, usedRect.size.height}};
 
-                                            if (ReactNativeFeatureFlags::enableAlignItemsBaselineOnFabricIOS()) {
-                                              CGFloat baseline =
-                                                  [layoutManager locationForGlyphAtIndex:range.location].y;
-                                              auto line = LineMeasurement{
-                                                  std::string([renderedString UTF8String]),
-                                                  rect,
-                                                  overallRect.size.height - baseline,
-                                                  font.capHeight,
-                                                  baseline,
-                                                  font.xHeight};
-                                              blockParagraphLines->push_back(line);
-                                            } else {
-                                              auto line = LineMeasurement{
-                                                  std::string([renderedString UTF8String]),
-                                                  rect,
-                                                  -font.descender,
-                                                  font.capHeight,
-                                                  font.ascender,
-                                                  font.xHeight};
-                                              blockParagraphLines->push_back(line);
-                                            }
+                                            CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y;
+                                            auto line = LineMeasurement{
+                                                std::string([renderedString UTF8String]),
+                                                rect,
+                                                overallRect.size.height - baseline,
+                                                font.capHeight,
+                                                baseline,
+                                                font.xHeight};
+                                            blockParagraphLines->push_back(line);
                                           }];
   return paragraphLines;
 }
@@ -391,18 +379,9 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                 CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range inTextContainer:textContainer];
 
                 CGRect frame;
-                if (ReactNativeFeatureFlags::enableAlignItemsBaselineOnFabricIOS()) {
-                  CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y;
+                CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y;
 
-                  frame = {{glyphRect.origin.x, glyphRect.origin.y + baseline - attachmentSize.height}, attachmentSize};
-                } else {
-                  UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
-
-                  frame = {
-                      {glyphRect.origin.x,
-                       glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender},
-                      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},

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

@@ -5,23 +5,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "TextLayoutManager.h"
-#include <react/renderer/telemetry/TransactionTelemetry.h>
-#include <react/utils/ManagedObjectWrapper.h>
-
+#import "TextLayoutManager.h"
 #import "RCTTextLayoutManager.h"
 
+#import <react/renderer/telemetry/TransactionTelemetry.h>
+#import <react/utils/ManagedObjectWrapper.h>
+
 namespace facebook::react {
 
 TextLayoutManager::TextLayoutManager(const ContextContainer::Shared &contextContainer)
 {
-  self_ = wrapManagedObject([RCTTextLayoutManager new]);
+  nativeTextLayoutManager_ = wrapManagedObject([RCTTextLayoutManager new]);
 }
 
 std::shared_ptr<void> TextLayoutManager::getNativeTextLayoutManager() const
 {
-  assert(self_ && "Stored NativeTextLayoutManager must not be null.");
-  return self_;
+  assert(nativeTextLayoutManager_ && "Stored NativeTextLayoutManager must not be null.");
+  return nativeTextLayoutManager_;
 }
 
 TextMeasurement TextLayoutManager::measure(
@@ -30,7 +30,7 @@ TextMeasurement TextLayoutManager::measure(
     const TextLayoutContext &layoutContext,
     const LayoutConstraints &layoutConstraints) const
 {
-  RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(self_);
+  RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(nativeTextLayoutManager_);
 
   auto measurement = TextMeasurement{};
 
@@ -92,7 +92,7 @@ LinesMeasurements TextLayoutManager::measureLines(
   react_native_assert(attributedStringBox.getMode() == AttributedStringBox::Mode::Value);
   const auto &attributedString = attributedStringBox.getValue();
 
-  RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(self_);
+  RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(nativeTextLayoutManager_);
 
   auto measurement =
       lineMeasureCache_.get({attributedString, paragraphAttributes, size}, [&](const LineMeasureCacheKey &key) {
@@ -105,18 +105,4 @@ LinesMeasurements TextLayoutManager::measureLines(
   return measurement;
 }
 
-Float TextLayoutManager::baseline(
-    const AttributedStringBox &attributedStringBox,
-    const ParagraphAttributes &paragraphAttributes,
-    const Size &size) const
-{
-  auto lines = this->measureLines(attributedStringBox, paragraphAttributes, size);
-
-  if (!lines.empty()) {
-    return lines[0].ascender;
-  } else {
-    return 0;
-  }
-}
-
 } // namespace facebook::react