react-native-tvos 0.74.3-0 → 0.75.2-0

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

@@ -47,12 +47,6 @@ class TextLayoutManager {
       const AttributedStringBox& attributedStringBox,
       const ParagraphAttributes& paragraphAttributes,
       const TextLayoutContext& layoutContext,
-      LayoutConstraints layoutConstraints,
-      std::shared_ptr<void> /* hostTextStorage */) const;
-
-  std::shared_ptr<void> getHostTextStorage(
-      const AttributedString& attributedString,
-      const ParagraphAttributes& paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
   /**
@@ -85,16 +79,6 @@ class TextLayoutManager {
       const ParagraphAttributes& paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
-  TextMeasurement doMeasureMapBuffer(
-      AttributedString attributedString,
-      const ParagraphAttributes& paragraphAttributes,
-      LayoutConstraints layoutConstraints) const;
-
-  LinesMeasurements measureLinesMapBuffer(
-      const AttributedString& attributedString,
-      const ParagraphAttributes& paragraphAttributes,
-      Size size) const;
-
   void* self_{};
   ContextContainer::Shared contextContainer_;
   TextMeasureCache measureCache_;

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

@@ -17,8 +17,7 @@ TextMeasurement TextLayoutManager::measure(
     AttributedStringBox attributedStringBox,
     ParagraphAttributes paragraphAttributes,
     const TextLayoutContext& /*layoutContext*/,
-    LayoutConstraints layoutConstraints,
-    std::shared_ptr<void>) const {
+    LayoutConstraints layoutConstraints) const {
   TextMeasurement::Attachments attachments;
   for (const auto& fragment : attributedStringBox.getValue().getFragments()) {
     if (fragment.isAttachment()) {
@@ -29,6 +28,13 @@ TextMeasurement TextLayoutManager::measure(
   return TextMeasurement{{0, 0}, attachments};
 }
 
+TextMeasurement TextLayoutManager::measureCachedSpannableById(
+    int64_t /*cacheId*/,
+    const ParagraphAttributes& /*paragraphAttributes*/,
+    LayoutConstraints /*layoutConstraints*/) const {
+  return {};
+}
+
 LinesMeasurements TextLayoutManager::measureLines(
     AttributedString attributedString,
     ParagraphAttributes paragraphAttributes,
@@ -36,11 +42,4 @@ LinesMeasurements TextLayoutManager::measureLines(
   return {};
 };
 
-std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
-  return nullptr;
-}
-
 } // namespace facebook::react

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

@@ -39,8 +39,16 @@ class TextLayoutManager {
       AttributedStringBox attributedStringBox,
       ParagraphAttributes paragraphAttributes,
       const TextLayoutContext& layoutContext,
-      LayoutConstraints layoutConstraints,
-      std::shared_ptr<void>) const;
+      LayoutConstraints layoutConstraints) const;
+
+  /**
+   * Measures an AttributedString on the platform, as identified by some
+   * opaque cache ID.
+   */
+  virtual TextMeasurement measureCachedSpannableById(
+      int64_t cacheId,
+      const ParagraphAttributes& paragraphAttributes,
+      LayoutConstraints layoutConstraints) const;
 
   /*
    * Measures lines of `attributedString` using native text rendering
@@ -56,11 +64,6 @@ class TextLayoutManager {
    * Is used on a native views layer to delegate text rendering to the manager.
    */
   void* getNativeTextLayoutManager() const;
-
-  virtual std::shared_ptr<void> getHostTextStorage(
-      AttributedString attributedStringBox,
-      ParagraphAttributes paragraphAttributes,
-      LayoutConstraints layoutConstraints) const;
 };
 
 } // namespace facebook::react

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

@@ -289,7 +289,7 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(c
   }
 
   // Special
-  if (textAttributes.isHighlighted) {
+  if (textAttributes.isHighlighted.value_or(false)) {
     attributes[RCTAttributedStringIsHighlightedAttributeName] = @YES;
   }
 

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

@@ -14,6 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Returns UIFont instance corresponded to given font properties.
  */
-UIFont* RCTFontWithFontProperties(RCTFontProperties fontProperties);
+UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties);
 
 NS_ASSUME_NONNULL_END

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

@@ -6,10 +6,12 @@
  */
 
 #import "RCTFontUtils.h"
+#import <CoreText/CoreText.h>
 
 #import <algorithm>
 #import <cmath>
 #import <limits>
+#import <map>
 #import <mutex>
 
 static RCTFontProperties RCTDefaultFontProperties()
@@ -62,8 +64,51 @@ static RCTFontStyle RCTGetFontStyle(UIFont *font)
 
 static NSArray *RCTFontFeatures(RCTFontVariant fontVariant)
 {
-  // FIXME:
-  return @[];
+  NSMutableArray *fontFeatures = [NSMutableArray array];
+  static std::map<RCTFontVariant, NSDictionary *> mapping;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    mapping = {
+        {RCTFontVariantSmallCaps, @{
+           UIFontFeatureTypeIdentifierKey : @(kLowerCaseType),
+           UIFontFeatureSelectorIdentifierKey : @(kLowerCaseSmallCapsSelector),
+         }},
+        {RCTFontVariantOldstyleNums, @{
+           UIFontFeatureTypeIdentifierKey : @(kNumberCaseType),
+           UIFontFeatureSelectorIdentifierKey : @(kLowerCaseNumbersSelector),
+         }},
+        {RCTFontVariantLiningNums, @{
+           UIFontFeatureTypeIdentifierKey : @(kNumberCaseType),
+           UIFontFeatureSelectorIdentifierKey : @(kUpperCaseNumbersSelector),
+         }},
+        {RCTFontVariantTabularNums, @{
+           UIFontFeatureTypeIdentifierKey : @(kNumberSpacingType),
+           UIFontFeatureSelectorIdentifierKey : @(kMonospacedNumbersSelector),
+         }},
+        {RCTFontVariantProportionalNums, @{
+           UIFontFeatureTypeIdentifierKey : @(kNumberSpacingType),
+           UIFontFeatureSelectorIdentifierKey : @(kProportionalNumbersSelector),
+         }},
+    };
+  });
+
+  if (fontVariant & RCTFontVariantSmallCaps) {
+    [fontFeatures addObject:mapping[RCTFontVariantSmallCaps]];
+  }
+  if (fontVariant & RCTFontVariantOldstyleNums) {
+    [fontFeatures addObject:mapping[RCTFontVariantOldstyleNums]];
+  }
+  if (fontVariant & RCTFontVariantLiningNums) {
+    [fontFeatures addObject:mapping[RCTFontVariantLiningNums]];
+  }
+  if (fontVariant & RCTFontVariantTabularNums) {
+    [fontFeatures addObject:mapping[RCTFontVariantTabularNums]];
+  }
+  if (fontVariant & RCTFontVariantProportionalNums) {
+    [fontFeatures addObject:mapping[RCTFontVariantProportionalNums]];
+  }
+
+  return fontFeatures;
 }
 
 static UIFont *RCTDefaultFontWithFontProperties(RCTFontProperties fontProperties)

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

@@ -28,22 +28,16 @@ using RCTTextLayoutFragmentEnumerationBlock =
 
 - (facebook::react::TextMeasurement)measureAttributedString:(facebook::react::AttributedString)attributedString
                                         paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
-                                          layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                                                textStorage:(NSTextStorage *_Nullable)textStorage;
+                                          layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints;
 
 - (facebook::react::TextMeasurement)measureNSAttributedString:(NSAttributedString *)attributedString
                                           paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
-                                            layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                                                  textStorage:(NSTextStorage *_Nullable)textStorage;
-
-- (NSTextStorage *)textStorageForAttributesString:(facebook::react::AttributedString)attributedString
-                              paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
-                                             size:(CGSize)size;
+                                            layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints;
 
 - (void)drawAttributedString:(facebook::react::AttributedString)attributedString
          paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
                        frame:(CGRect)frame
-                 textStorage:(NSTextStorage *_Nullable)textStorage;
+           drawHighlightPath:(void (^_Nullable)(UIBezierPath *highlightPath))block;
 
 - (facebook::react::LinesMeasurements)getLinesForAttributedString:(facebook::react::AttributedString)attributedString
                                               paragraphAttributes:

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

@@ -37,7 +37,6 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 - (TextMeasurement)measureNSAttributedString:(NSAttributedString *)attributedString
                          paragraphAttributes:(ParagraphAttributes)paragraphAttributes
                            layoutConstraints:(LayoutConstraints)layoutConstraints
-                                 textStorage:(NSTextStorage *_Nullable)textStorage
 {
   if (attributedString.length == 0) {
     // This is not really an optimization because that should be checked much earlier on the call stack.
@@ -48,11 +47,9 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 
   CGSize maximumSize = CGSize{layoutConstraints.maximumSize.width, CGFLOAT_MAX};
 
-  if (!textStorage) {
-    textStorage = [self _textStorageForNSAttributesString:attributedString
-                                      paragraphAttributes:paragraphAttributes
-                                                     size:maximumSize];
-  }
+  NSTextStorage *textStorage = [self _textStorageAndLayoutManagerWithAttributesString:attributedString
+                                                                  paragraphAttributes:paragraphAttributes
+                                                                                 size:maximumSize];
 
   return [self _measureTextStorage:textStorage];
 }
@@ -60,50 +57,23 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 - (TextMeasurement)measureAttributedString:(AttributedString)attributedString
                        paragraphAttributes:(ParagraphAttributes)paragraphAttributes
                          layoutConstraints:(LayoutConstraints)layoutConstraints
-                               textStorage:(NSTextStorage *_Nullable)textStorage
 {
-  if (textStorage) {
-    return [self _measureTextStorage:textStorage];
-  } else {
-    return [self measureNSAttributedString:[self _nsAttributedStringFromAttributedString:attributedString]
-                       paragraphAttributes:paragraphAttributes
-                         layoutConstraints:layoutConstraints
-                               textStorage:nil];
-  }
+  return [self measureNSAttributedString:[self _nsAttributedStringFromAttributedString:attributedString]
+                     paragraphAttributes:paragraphAttributes
+                       layoutConstraints:layoutConstraints];
 }
 
 - (void)drawAttributedString:(AttributedString)attributedString
          paragraphAttributes:(ParagraphAttributes)paragraphAttributes
                        frame:(CGRect)frame
-                 textStorage:(NSTextStorage *_Nullable)textStorage
+           drawHighlightPath:(void (^_Nullable)(UIBezierPath *highlightPath))block
 {
-  BOOL createdStorageForFrame = NO;
-
-  if (!textStorage) {
-    textStorage = [self textStorageForAttributesString:attributedString
+  NSTextStorage *textStorage = [self
+      _textStorageAndLayoutManagerWithAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]
                                    paragraphAttributes:paragraphAttributes
                                                   size:frame.size];
-    createdStorageForFrame = YES;
-  }
-
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
-  CGPoint origin = frame.origin;
-
-  if (!createdStorageForFrame) {
-    CGRect rect = [layoutManager usedRectForTextContainer:textContainer];
-    static auto threshold = 1.0 / RCTScreenScale() + 0.01; // Size of a pixel plus some small threshold.
-
-    // `rect`'s width is stored in double precesion.
-    // `frame`'s width is also in double precesion but was stored as float in Yoga previously, precesion was lost.
-    if (std::abs(RCTCeilPixelValue(rect.size.width) - frame.size.width) < threshold) {
-      // `textStorage` passed to this method was used to calculate size of frame. If that's the case, it's
-      // width is the same as frame's width. Origin must be adjusted, otherwise glyhps will be painted in wrong
-      // place.
-      // We could create new `NSTextStorage` for the specific frame, but that is expensive.
-      origin.x -= RCTCeilPixelValue(rect.origin.x);
-    }
-  }
 
 #if TARGET_OS_MACCATALYST
   CGContextRef context = UIGraphicsGetCurrentContext();
@@ -112,21 +82,54 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 #endif
 
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
-  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:origin];
-  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:origin];
+  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:frame.origin];
+  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:frame.origin];
 
 #if TARGET_OS_MACCATALYST
   CGContextRestoreGState(context);
 #endif
+
+  if (block != nil) {
+    __block UIBezierPath *highlightPath = nil;
+    NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];
+
+    [textStorage
+        enumerateAttribute:RCTAttributedStringIsHighlightedAttributeName
+                   inRange:characterRange
+                   options:0
+                usingBlock:^(NSNumber *value, NSRange range, __unused BOOL *stop) {
+                  if (!value.boolValue) {
+                    return;
+                  }
+
+                  [layoutManager
+                      enumerateEnclosingRectsForGlyphRange:range
+                                  withinSelectedGlyphRange:range
+                                           inTextContainer:textContainer
+                                                usingBlock:^(CGRect enclosingRect, __unused BOOL *anotherStop) {
+                                                  UIBezierPath *path = [UIBezierPath
+                                                      bezierPathWithRoundedRect:CGRectInset(enclosingRect, -2, -2)
+                                                                   cornerRadius:2];
+                                                  if (highlightPath) {
+                                                    [highlightPath appendPath:path];
+                                                  } else {
+                                                    highlightPath = path;
+                                                  }
+                                                }];
+                }];
+
+    block(highlightPath);
+  }
 }
 
-- (LinesMeasurements)getLinesForAttributedString:(AttributedString)attributedString
-                             paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+- (LinesMeasurements)getLinesForAttributedString:(facebook::react::AttributedString)attributedString
+                             paragraphAttributes:(facebook::react::ParagraphAttributes)paragraphAttributes
                                             size:(CGSize)size
 {
-  NSTextStorage *textStorage = [self textStorageForAttributesString:attributedString
-                                                paragraphAttributes:paragraphAttributes
-                                                               size:size];
+  NSTextStorage *textStorage = [self
+      _textStorageAndLayoutManagerWithAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]
+                                   paragraphAttributes:paragraphAttributes
+                                                  size:size];
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
 
@@ -164,13 +167,33 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
   return paragraphLines;
 }
 
-- (NSTextStorage *)textStorageForAttributesString:(AttributedString)attributedString
-                              paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                                             size:(CGSize)size
+- (NSTextStorage *)_textStorageAndLayoutManagerWithAttributesString:(NSAttributedString *)attributedString
+                                                paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+                                                               size:(CGSize)size
 {
-  return [self _textStorageForNSAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]
-                             paragraphAttributes:paragraphAttributes
-                                            size:size];
+  NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
+
+  textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
+  textContainer.lineBreakMode = paragraphAttributes.maximumNumberOfLines > 0
+      ? RCTNSLineBreakModeFromEllipsizeMode(paragraphAttributes.ellipsizeMode)
+      : NSLineBreakByClipping;
+  textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
+
+  NSLayoutManager *layoutManager = [NSLayoutManager new];
+  layoutManager.usesFontLeading = NO;
+  [layoutManager addTextContainer:textContainer];
+
+  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
+
+  [textStorage addLayoutManager:layoutManager];
+
+  if (paragraphAttributes.adjustsFontSizeToFit) {
+    CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize) ? paragraphAttributes.minimumFontSize : 4.0;
+    CGFloat maximumFontSize = !isnan(paragraphAttributes.maximumFontSize) ? paragraphAttributes.maximumFontSize : 96.0;
+    [textStorage scaleFontSizeToFitSize:size minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
+  }
+
+  return textStorage;
 }
 
 - (SharedEventEmitter)getEventEmitterWithAttributeString:(AttributedString)attributedString
@@ -178,9 +201,10 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                                                    frame:(CGRect)frame
                                                  atPoint:(CGPoint)point
 {
-  NSTextStorage *textStorage = [self textStorageForAttributesString:attributedString
-                                                paragraphAttributes:paragraphAttributes
-                                                               size:frame.size];
+  NSTextStorage *textStorage = [self
+      _textStorageAndLayoutManagerWithAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]
+                                   paragraphAttributes:paragraphAttributes
+                                                  size:frame.size];
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
 
@@ -209,9 +233,10 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                               frame:(CGRect)frame
                          usingBlock:(RCTTextLayoutFragmentEnumerationBlock)block
 {
-  NSTextStorage *textStorage = [self textStorageForAttributesString:attributedString
-                                                paragraphAttributes:paragraphAttributes
-                                                               size:frame.size];
+  NSTextStorage *textStorage = [self
+      _textStorageAndLayoutManagerWithAttributesString:[self _nsAttributedStringFromAttributedString:attributedString]
+                                   paragraphAttributes:paragraphAttributes
+                                                  size:frame.size];
 
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
@@ -244,35 +269,6 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 
 #pragma mark - Private
 
-- (NSTextStorage *)_textStorageForNSAttributesString:(NSAttributedString *)attributedString
-                                 paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                                                size:(CGSize)size
-{
-  NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
-
-  textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
-  textContainer.lineBreakMode = paragraphAttributes.maximumNumberOfLines > 0
-      ? RCTNSLineBreakModeFromEllipsizeMode(paragraphAttributes.ellipsizeMode)
-      : NSLineBreakByClipping;
-  textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
-
-  NSLayoutManager *layoutManager = [NSLayoutManager new];
-  layoutManager.usesFontLeading = NO;
-  [layoutManager addTextContainer:textContainer];
-
-  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
-
-  [textStorage addLayoutManager:layoutManager];
-
-  if (paragraphAttributes.adjustsFontSizeToFit) {
-    CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize) ? paragraphAttributes.minimumFontSize : 4.0;
-    CGFloat maximumFontSize = !isnan(paragraphAttributes.maximumFontSize) ? paragraphAttributes.maximumFontSize : 96.0;
-    [textStorage scaleFontSizeToFitSize:size minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
-  }
-
-  return textStorage;
-}
-
 - (NSAttributedString *)_nsAttributedStringFromAttributedString:(AttributedString)attributedString
 {
   auto sharedNSAttributedString = _cache.get(attributedString, [](AttributedString attributedString) {

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

@@ -34,8 +34,7 @@ class TextLayoutManager {
       AttributedStringBox attributedStringBox,
       ParagraphAttributes paragraphAttributes,
       const TextLayoutContext& layoutContext,
-      LayoutConstraints layoutConstraints,
-      std::shared_ptr<void> hostTextStorage) const;
+      LayoutConstraints layoutConstraints) const;
 
   /*
    * Measures lines of `attributedString` using native text rendering
@@ -46,11 +45,6 @@ class TextLayoutManager {
       ParagraphAttributes paragraphAttributes,
       Size size) const;
 
-  std::shared_ptr<void> getHostTextStorage(
-      AttributedString attributedString,
-      ParagraphAttributes paragraphAttributes,
-      LayoutConstraints layoutConstraints) const;
-
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
    * Is used on a native views layer to delegate text rendering to the manager.

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

@@ -24,32 +24,13 @@ std::shared_ptr<void> TextLayoutManager::getNativeTextLayoutManager() const
   return self_;
 }
 
-std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints) const
-{
-  RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(self_);
-  CGSize maximumSize = CGSize{layoutConstraints.maximumSize.width, CGFLOAT_MAX};
-
-  NSTextStorage *textStorage = [textLayoutManager textStorageForAttributesString:attributedString
-                                                             paragraphAttributes:paragraphAttributes
-                                                                            size:maximumSize];
-  return wrapManagedObject(textStorage);
-}
-
 TextMeasurement TextLayoutManager::measure(
     AttributedStringBox attributedStringBox,
     ParagraphAttributes paragraphAttributes,
     const TextLayoutContext &layoutContext,
-    LayoutConstraints layoutConstraints,
-    std::shared_ptr<void> hostTextStorage) const
+    LayoutConstraints layoutConstraints) const
 {
   RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(self_);
-  NSTextStorage *textStorage;
-  if (hostTextStorage) {
-    textStorage = unwrapManagedObject(hostTextStorage);
-  }
 
   auto measurement = TextMeasurement{};
 
@@ -66,8 +47,7 @@ TextMeasurement TextLayoutManager::measure(
 
             auto measurement = [textLayoutManager measureAttributedString:attributedString
                                                       paragraphAttributes:paragraphAttributes
-                                                        layoutConstraints:layoutConstraints
-                                                              textStorage:textStorage];
+                                                        layoutConstraints:layoutConstraints];
 
             if (telemetry) {
               telemetry->didMeasureText();
@@ -89,8 +69,7 @@ TextMeasurement TextLayoutManager::measure(
 
       measurement = [textLayoutManager measureNSAttributedString:nsAttributedString
                                              paragraphAttributes:paragraphAttributes
-                                               layoutConstraints:layoutConstraints
-                                                     textStorage:textStorage];
+                                               layoutConstraints:layoutConstraints];
 
       if (telemetry) {
         telemetry->didMeasureText();

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

@@ -12,6 +12,7 @@ add_compile_options(
         -std=c++20
         -Wall
         -Wpedantic
+        -Wno-unused-local-typedef
         -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_uimanager_SRC CONFIGURE_DEPENDS *.cpp)
@@ -23,16 +24,20 @@ target_link_libraries(react_render_uimanager
         glog
         folly_runtime
         jsi
+        react_config
+        react_cxxreact
         react_debug
+        react_featureflags
         react_render_componentregistry
+        react_render_consistency
+        react_render_uimanager_consistency
         react_render_core
         react_render_debug
+        react_render_dom
         react_render_graphics
         react_render_leakchecker
         react_render_runtimescheduler
         react_render_mounting
-        react_config
-        reactnative
         rrc_root
         rrc_view
         runtimeexecutor

package/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SurfaceRegistryBinding.h"
-#include <react/renderer/debug/SystraceSection.h>
+#include <cxxreact/SystraceSection.h>
 #include <react/renderer/uimanager/bindingUtils.h>
 #include <react/renderer/uimanager/primitives.h>
 #include "bindingUtils.h"

package/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <folly/dynamic.h>
 #include <jsi/jsi.h>
 #include <react/renderer/core/ReactPrimitives.h>