remove old arch impl

Author: ArekChr

packages/react-native/Libraries/Text/React-RCTText.podspec

@@ -34,5 +34,4 @@ Pod::Spec.new do |s|
 
   s.dependency "Yoga"
   s.dependency "React-Core/RCTTextHeaders", version
-  add_dependency(s, "React-featureflags")
 end

packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm

@@ -15,8 +15,6 @@
 #import <React/RCTTextView.h>
 #import "NSTextStorage+FontScaling.h"
 
-#import <react/featureflags/ReactNativeFeatureFlags.h>
-
 @implementation RCTTextShadowView {
   __weak RCTBridge *_bridge;
   BOOL _needsUpdateView;
@@ -379,38 +377,17 @@ - (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
                                                        attribute:NSFontAttributeName
                                                          atIndex:0
                                                   effectiveRange:nil];
-                                                    
-                                              if (facebook::react::ReactNativeFeatureFlags::enableLineHeightCenteringOnIOS()) {
-                                                  CGFloat ascender = font.ascender;
-                                                  CGFloat descender = fabs(font.descender);
-                                                  CGFloat textHeight = ascender + descender;
-                                                  CGFloat leading = usedRect.size.height - textHeight;
-                                                  CGFloat adjustedAscender = ascender + ceil(leading / 2.0);
-                                                  CGFloat adjustedDescender = descender + floor(leading / 2.0);
-                                                  [lineData addObject:@{
-                                                    @"text" : renderedString,
-                                                    @"x" : @(usedRect.origin.x),
-                                                    @"y" : @(usedRect.origin.y),
-                                                    @"width" : @(usedRect.size.width),
-                                                    @"height" : @(usedRect.size.height),
-                                                    @"descender" : @(adjustedDescender),
-                                                    @"capHeight" : @(font.capHeight),
-                                                    @"ascender" : @(adjustedAscender),
-                                                    @"xHeight" : @(font.xHeight),
-                                                  }];
-                                              } else {
-                                                  [lineData addObject:@{
-                                                    @"text" : renderedString,
-                                                    @"x" : @(usedRect.origin.x),
-                                                    @"y" : @(usedRect.origin.y),
-                                                    @"width" : @(usedRect.size.width),
-                                                    @"height" : @(usedRect.size.height),
-                                                    @"descender" : @(-font.descender),
-                                                    @"capHeight" : @(font.capHeight),
-                                                    @"ascender" : @(font.ascender),
-                                                    @"xHeight" : @(font.xHeight),
-                                                  }];
-                                              }
+                                              [lineData addObject:@{
+                                                @"text" : renderedString,
+                                                @"x" : @(usedRect.origin.x),
+                                                @"y" : @(usedRect.origin.y),
+                                                @"width" : @(usedRect.size.width),
+                                                @"height" : @(usedRect.size.height),
+                                                @"descender" : @(-font.descender),
+                                                @"capHeight" : @(font.capHeight),
+                                                @"ascender" : @(font.ascender),
+                                                @"xHeight" : @(font.xHeight),
+                                              }];
                                             }];
     NSDictionary *payload = @{
       @"lines" : lineData,

packages/react-native/Libraries/Text/Text/RCTTextView.mm

@@ -11,7 +11,6 @@
 
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
-#import <react/featureflags/ReactNativeFeatureFlags.h>
 
 #import <React/RCTTextShadowView.h>
 
@@ -99,35 +98,6 @@ - (void)setTextStorage:(NSTextStorage *)textStorage
   [self setNeedsDisplay];
 }
 
-- (CGPoint)calculateDrawingPointWithTextStorage:(NSTextStorage *)textStorage
-                                   contentFrame:(CGRect)contentFrame {
-  if ([textStorage length] == 0) {
-    return contentFrame.origin;
-  }
-
-  UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:0 effectiveRange:NULL];
-  if (!font) {
-      font = [UIFontMetrics.defaultMetrics scaledFontForFont:[UIFont systemFontOfSize:14]];
-  }
-
-  NSParagraphStyle *paragraphStyle = [textStorage attribute:NSParagraphStyleAttributeName atIndex:0 effectiveRange:NULL];
-
-  if (!paragraphStyle || paragraphStyle.minimumLineHeight == 0) {
-    return CGPointMake(contentFrame.origin.x, contentFrame.origin.y);
-  }
-
-  CGFloat lineHeight = paragraphStyle.minimumLineHeight;
-  CGFloat ascent = font.ascender;
-  CGFloat descent = fabs(font.descender);
-  CGFloat textHeight = ascent + descent;
-
-  // Adjust vertical offset to ensure text is vertically centered relative to the line height.
-  CGFloat difference = MAX(0, textHeight - lineHeight);
-  CGFloat verticalOffset = difference / 2.0;
-
-  return CGPointMake(contentFrame.origin.x, contentFrame.origin.y + verticalOffset);
-}
-
 - (void)drawRect:(CGRect)rect
 {
   [super drawRect:rect];
@@ -148,15 +118,8 @@ - (void)drawRect:(CGRect)rect
 #endif
 
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
-
-  if (facebook::react::ReactNativeFeatureFlags::enableLineHeightCenteringOnIOS()) {
-    CGPoint drawingPoint = [self calculateDrawingPointWithTextStorage:_textStorage contentFrame:_contentFrame];
-    [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:drawingPoint];
-    [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:drawingPoint];
-  } else {
-    [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:_contentFrame.origin];
-    [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:_contentFrame.origin];
-  }
+  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:_contentFrame.origin];
+  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:_contentFrame.origin];
 
   __block UIBezierPath *highlightPath = nil;
   NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];