Add apple_fontSmoothing style and global default setting (facebook#329)

* Update scripts to publish react-native-macos-init * Clean up merge markers * Restored ios:macos RNTester parity except for InputAccessoryView. * Revert "Restored ios:macos RNTester parity except for InputAccessoryView." This reverts commit 5a67ae0. * Added experimental webkitFontSmoothing style. * Rename to fontSmoothing * Missed some upstream delta comments * Add .command to .gitattributes for lf * Renamed fontSmoothing to apple_fontSmoothing
cipolleschi · May 1, 2020 · a4287a0 · a4287a0
1 parent ada2ea2
commit a4287a0
Show file tree

Hide file tree

Showing 16 changed files with 328 additions and 191 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,4 @@
 # that.
 gradlew text eol=lf
 *.sh text eol=lf
+*.command text eol=lf
diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js
@@ -270,6 +270,7 @@ const ReactNativeViewConfig = {
       fontStyle: true,
       fontVariant: true,
       fontWeight: true,
+      apple_fontSmoothing: true, // TODO(OSS Candidate ISS#2710739)
       height: true,
       includeFontPadding: true,
       justifyContent: true,

diff --git a/Libraries/DeprecatedPropTypes/DeprecatedTextStylePropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedTextStylePropTypes.js
@@ -74,6 +74,17 @@ const DeprecatedTextStylePropTypes = {
       | 'proportional-nums',
     >,
   >),
+  /** [TODO(OSS Candidate ISS#2710739)
+   * @platform ios, macos
+   */
+  apple_fontSmoothing: (ReactPropTypes.oneOf([
+    'auto' /*default*/,
+    'none',
+    'antialiased',
+    'subpixel-antialiased',
+  ]): React$PropType$Primitive<
+    'auto' | 'none' | 'antialiased' | 'subpixel-antialiased',
+  >), // ]TODO(OSS Candidate ISS#2710739)
   textShadowOffset: (ReactPropTypes.shape({
     width: ReactPropTypes.number,
     height: ReactPropTypes.number,

diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -602,6 +602,11 @@ export type ____TextStyle_Internal = $ReadOnly<{|
     | 'tabular-nums'
     | 'proportional-nums',
   >,
+  apple_fontSmoothing?:
+    | 'auto'
+    | 'none'
+    | 'antialiased'
+    | 'subpixel-antialiased', // TODO(OSS Candidate ISS#2710739)
   textShadowOffset?: $ReadOnly<{|
     width: number,
     height: number,

diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
@@ -38,6 +38,7 @@ - (RCTShadowView *)shadowView
 RCT_REMAP_SHADOW_PROPERTY(allowFontScaling, textAttributes.allowFontScaling, BOOL)
 RCT_REMAP_SHADOW_PROPERTY(maxFontSizeMultiplier, textAttributes.maxFontSizeMultiplier, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(letterSpacing, textAttributes.letterSpacing, CGFloat)
+RCT_REMAP_SHADOW_PROPERTY(apple_fontSmoothing, textAttributes.fontSmoothing, RCTFontSmoothing) // TODO(OSS Candidate ISS#2710739)
 // Paragraph Styles
 RCT_REMAP_SHADOW_PROPERTY(lineHeight, textAttributes.lineHeight, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(textAlign, textAttributes.alignment, NSTextAlignment)

diff --git a/Libraries/Text/RCTTextAttributes.h b/Libraries/Text/RCTTextAttributes.h
@@ -8,12 +8,14 @@
 #import <React/RCTUIKit.h> // TODO(macOS ISS#2323203)
 
 #import <React/RCTTextDecorationLineType.h>
+#import <React/RCTFontSmoothing.h> // TODO(OSS Candidate ISS#2710739)
 
 #import "RCTTextTransform.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const RCTTextAttributesIsHighlightedAttributeName;
+extern NSString *const RCTTextAttributesFontSmoothingAttributeName;  // TODO(OSS Candidate ISS#2710739)
 extern NSString *const RCTTextAttributesTagAttributeName;
 
 /**
@@ -37,6 +39,8 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 @property (nonatomic, copy, nullable) NSArray<NSString *> *fontVariant;
 @property (nonatomic, assign) BOOL allowFontScaling;
 @property (nonatomic, assign) CGFloat letterSpacing;
+@property (nonatomic, assign) RCTFontSmoothing fontSmoothing; // TODO(OSS Candidate ISS#2710739)
+@property (class, nonatomic, assign) RCTFontSmoothing fontSmoothingDefault; // TODO(OSS Candidate ISS#2710739)
 // Paragraph Styles
 @property (nonatomic, assign) CGFloat lineHeight;
 @property (nonatomic, assign) NSTextAlignment alignment;

diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m
@@ -12,6 +12,7 @@
 #import <React/RCTLog.h>
 
 NSString *const RCTTextAttributesIsHighlightedAttributeName = @"RCTTextAttributesIsHighlightedAttributeName";
+NSString *const RCTTextAttributesFontSmoothingAttributeName = @"RCTTextAttributesFontSmoothingAttributeName"; // TODO(OSS Candidate ISS#2710739)
 NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttributeName";
 
 @implementation RCTTextAttributes
@@ -56,6 +57,7 @@ - (void)applyTextAttributes:(RCTTextAttributes *)textAttributes
   _fontVariant = textAttributes->_fontVariant ?: _fontVariant;
   _allowFontScaling = textAttributes->_allowFontScaling || _allowFontScaling;  // *
   _letterSpacing = !isnan(textAttributes->_letterSpacing) ? textAttributes->_letterSpacing : _letterSpacing;
+  _fontSmoothing = textAttributes->_fontSmoothing != RCTFontSmoothingAuto ? textAttributes->_fontSmoothing : _fontSmoothing; // TODO(OSS Candidate ISS#2710739)
 
   // Paragraph Styles
   _lineHeight = !isnan(textAttributes->_lineHeight) ? textAttributes->_lineHeight : _lineHeight;
@@ -183,6 +185,12 @@ - (NSParagraphStyle *)effectiveParagraphStyle
     attributes[RCTTextAttributesIsHighlightedAttributeName] = @YES;
   }
 
+  // [TODO(macOS ISS#2323203)
+  if (_fontSmoothing != RCTFontSmoothingAuto) {
+    attributes[RCTTextAttributesFontSmoothingAttributeName] = @(_fontSmoothing);
+  }
+  // ]TODO(macOS ISS#2323203)
+
   if (_tag) {
     attributes[RCTTextAttributesTagAttributeName] = _tag;
   }
@@ -290,6 +298,7 @@ - (BOOL)isEqual:(RCTTextAttributes *)textAttributes
     RCTTextAttributesCompareObjects(_fontVariant) &&
     RCTTextAttributesCompareOthers(_allowFontScaling) &&
     RCTTextAttributesCompareFloats(_letterSpacing) &&
+    RCTTextAttributesCompareOthers(_fontSmoothing) && // TODO(OSS Candidate ISS#2710739)
     // Paragraph Styles
     RCTTextAttributesCompareFloats(_lineHeight) &&
     RCTTextAttributesCompareFloats(_alignment) &&
@@ -309,4 +318,16 @@ - (BOOL)isEqual:(RCTTextAttributes *)textAttributes
     RCTTextAttributesCompareOthers(_textTransform);
 }
 
+// [TODO(OSS Candidate ISS#2710739)
+static RCTFontSmoothing _fontSmoothingDefault = RCTFontSmoothingAuto;
+
++ (RCTFontSmoothing)fontSmoothingDefault {
+  return _fontSmoothingDefault;
+}
+
++ (void)setFontSmoothingDefault:(RCTFontSmoothing)fontSmoothingDefault {
+  _fontSmoothingDefault = fontSmoothingDefault;
+}
+// ]TODO(OSS Candidate ISS#2710739)
+
 @end
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
@@ -159,12 +159,40 @@ - (void)drawRect:(CGRect)rect
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
 
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
-  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:_contentFrame.origin];
-  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:_contentFrame.origin];
-
-  __block UIBezierPath *highlightPath = nil;
   NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange
                                                      actualGlyphRange:NULL];
+  // [TODO(OSS Candidate ISS#2710739)
+  [_textStorage enumerateAttribute:RCTTextAttributesFontSmoothingAttributeName
+                           inRange:characterRange
+                           options:0
+                        usingBlock:
+    ^(NSNumber *value, NSRange range, __unused BOOL *stop) {
+    RCTFontSmoothing smoothing = value.integerValue;
+    if (smoothing == RCTFontSmoothingAuto) {
+      smoothing = [RCTTextAttributes fontSmoothingDefault];
+    }
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSaveGState(context);
+    switch (smoothing) {
+      case RCTFontSmoothingNone:
+        CGContextSetShouldAntialias(context, false);
+        break;
+      case RCTFontSmoothingAntialiased:
+        CGContextSetAllowsFontSmoothing(context, false);
+        CGContextSetShouldSmoothFonts(context, false);
+        break;
+      case RCTFontSmoothingAuto:
+      case RCTFontSmoothingSubpixelAntialiased:
+        break;
+    }
+    NSRange subGlyphRange = [layoutManager glyphRangeForCharacterRange:range actualCharacterRange:nil];
+    [layoutManager drawBackgroundForGlyphRange:subGlyphRange atPoint:_contentFrame.origin];
+    [layoutManager drawGlyphsForGlyphRange:subGlyphRange atPoint:_contentFrame.origin];
+    CGContextRestoreGState(context);
+  }];
+  // ]TODO(OSS Candidate ISS#2710739)
+
+  __block UIBezierPath *highlightPath = nil;
   [_textStorage enumerateAttribute:RCTTextAttributesIsHighlightedAttributeName
                            inRange:characterRange
                            options:0