[ReactNative] revert D2233419: 'Dynamic Text Sizes for Text component'

Libraries/Text/RCTShadowRawText.m

@@ -9,32 +9,8 @@
 
 #import "RCTShadowRawText.h"
 
-#import "RCTUIManager.h"
-
 @implementation RCTShadowRawText
 
-- (instancetype)init
-{
-  if ((self = [super init])) {
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(contentSizeMultiplierDidChange:)
-                                                 name:RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification
-                                               object:nil];
-  }
-  return self;
-}
-
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-- (void)contentSizeMultiplierDidChange:(NSNotification *)note
-{
-  [self dirtyLayout];
-  [self dirtyText];
-}
-
 - (void)setText:(NSString *)text
 {
   if (_text != text) {

Libraries/Text/RCTShadowText.h

@@ -30,8 +30,6 @@ extern NSString *const RCTReactTagAttributeName;
 @property (nonatomic, strong) UIColor *textDecorationColor;
 @property (nonatomic, assign) NSUnderlineStyle textDecorationStyle;
 @property (nonatomic, assign) RCTTextDecorationLineType textDecorationLine;
-@property (nonatomic, assign) CGFloat fontSizeMultiplier;
-@property (nonatomic, assign) BOOL allowFontScaling;
 
 - (void)recomputeText;
 

Libraries/Text/RCTShadowText.m

@@ -9,9 +9,6 @@
 
 #import "RCTShadowText.h"
 
-#import "RCTAccessibilityManager.h"
-#import "RCTUIManager.h"
-#import "RCTBridge.h"
 #import "RCTConvert.h"
 #import "RCTLog.h"
 #import "RCTShadowRawText.h"
@@ -54,31 +51,16 @@ static css_dim_t RCTMeasure(void *context, float width)
     _letterSpacing = NAN;
     _isHighlighted = NO;
     _textDecorationStyle = NSUnderlineStyleSingle;
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(contentSizeMultiplierDidChange:)
-                                                 name:RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification
-                                               object:nil];
   }
   return self;
 }
 
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 - (NSString *)description
 {
   NSString *superDescription = super.description;
   return [[superDescription substringToIndex:superDescription.length - 1] stringByAppendingFormat:@"; text: %@>", [self attributedString].string];
 }
 
-- (void)contentSizeMultiplierDidChange:(NSNotification *)note
-{
-  [self dirtyLayout];
-  [self dirtyText];
-}
-
 - (NSDictionary *)processUpdatedProperties:(NSMutableSet *)applierBlocks
                           parentProperties:(NSDictionary *)parentProperties
 {
@@ -208,9 +190,7 @@ static css_dim_t RCTMeasure(void *context, float width)
     [self _addAttribute:NSBackgroundColorAttributeName withValue:self.backgroundColor toAttributedString:attributedString];
   }
 
-  UIFont *font = [RCTConvert UIFont:nil withFamily:fontFamily
-                               size:fontSize weight:fontWeight style:fontStyle
-                    scaleMultiplier:(_allowFontScaling && _fontSizeMultiplier > 0.0 ? _fontSizeMultiplier : 1.0)];
+  UIFont *font = [RCTConvert UIFont:nil withFamily:fontFamily size:fontSize weight:fontWeight style:fontStyle];
   [self _addAttribute:NSFontAttributeName withValue:font toAttributedString:attributedString];
   [self _addAttribute:NSKernAttributeName withValue:letterSpacing toAttributedString:attributedString];
   [self _addAttribute:RCTReactTagAttributeName withValue:self.reactTag toAttributedString:attributedString];
@@ -267,9 +247,8 @@ static css_dim_t RCTMeasure(void *context, float width)
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     paragraphStyle.alignment = _textAlign;
     paragraphStyle.baseWritingDirection = _writingDirection;
-    CGFloat lineHeight = round(_lineHeight * self.fontSizeMultiplier);
-    paragraphStyle.minimumLineHeight = lineHeight;
-    paragraphStyle.maximumLineHeight = lineHeight;
+    paragraphStyle.minimumLineHeight = _lineHeight;
+    paragraphStyle.maximumLineHeight = _lineHeight;
     [attributedString addAttribute:NSParagraphStyleAttributeName
                              value:paragraphStyle
                              range:(NSRange){0, attributedString.length}];
@@ -342,26 +321,4 @@ RCT_TEXT_PROPERTY(TextDecorationLine, _textDecorationLine, RCTTextDecorationLine
 RCT_TEXT_PROPERTY(TextDecorationStyle, _textDecorationStyle, NSUnderlineStyle);
 RCT_TEXT_PROPERTY(WritingDirection, _writingDirection, NSWritingDirection)
 
-- (void)setAllowFontScaling:(BOOL)allowFontScaling
-{
-  _allowFontScaling = allowFontScaling;
-  for (RCTShadowView *child in [self reactSubviews]) {
-    if ([child isKindOfClass:[RCTShadowText class]]) {
-      [(RCTShadowText *)child setAllowFontScaling:allowFontScaling];
-    }
-  }
-  [self dirtyText];
-}
-
-- (void)setFontSizeMultiplier:(CGFloat)fontSizeMultiplier
-{
-  _fontSizeMultiplier = fontSizeMultiplier;
-  for (RCTShadowView *child in [self reactSubviews]) {
-    if ([child isKindOfClass:[RCTShadowText class]]) {
-      [(RCTShadowText *)child setFontSizeMultiplier:fontSizeMultiplier];
-    }
-  }
-  [self dirtyText];
-}
-
 @end

Libraries/Text/RCTTextManager.m

@@ -9,7 +9,6 @@
 
 #import "RCTTextManager.h"
 
-#import "RCTAccessibilityManager.h"
 #import "RCTAssert.h"
 #import "RCTConvert.h"
 #import "RCTLog.h"
@@ -50,7 +49,6 @@ RCT_EXPORT_SHADOW_PROPERTY(textDecorationStyle, NSUnderlineStyle)
 RCT_EXPORT_SHADOW_PROPERTY(textDecorationColor, UIColor)
 RCT_EXPORT_SHADOW_PROPERTY(textDecorationLine, RCTTextDecorationLineType)
 RCT_EXPORT_SHADOW_PROPERTY(writingDirection, NSWritingDirection)
-RCT_EXPORT_SHADOW_PROPERTY(allowFontScaling, BOOL)
 
 - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(RCTSparseArray *)shadowViewRegistry
 {
@@ -71,7 +69,6 @@ RCT_EXPORT_SHADOW_PROPERTY(allowFontScaling, BOOL)
       RCTAssert([shadowView isTextDirty], @"Don't process any nodes that don't have dirty text");
 
       if ([shadowView isKindOfClass:[RCTShadowText class]]) {
-        [(RCTShadowText *)shadowView setFontSizeMultiplier:self.bridge.accessibilityManager.multiplier];
         [(RCTShadowText *)shadowView recomputeText];
       } else if ([shadowView isKindOfClass:[RCTShadowRawText class]]) {
         RCTLogError(@"Raw text cannot be used outside of a <Text> tag. Not rendering string: '%@'",

Libraries/Text/Text.js

@@ -30,7 +30,6 @@ var viewConfig = {
   validAttributes: merge(ReactNativeViewAttributes.UIView, {
     isHighlighted: true,
     numberOfLines: true,
-    allowFontScaling: true,
   }),
   uiViewClassName: 'RCTText',
 };
@@ -100,27 +99,16 @@ var Text = React.createClass({
      *
      *   {nativeEvent: {layout: {x, y, width, height}}}.
      */
-    onLayout: React.PropTypes.func,
-    /**
-     * Specifies should fonts scale to respect Text Size accessibility setting.
-     */ 
-    allowFontScaling: React.PropTypes.bool,
+     onLayout: React.PropTypes.func,
   },
 
   viewConfig: viewConfig,
 
-  getInitialState: function(): Object {
+  getInitialState: function() {
     return merge(this.touchableGetInitialState(), {
       isHighlighted: false,
     });
   },
-  
-  getDefaultProps: function(): Object {
-    return {
-      numberOfLines: 0,
-      allowFontScaling: true,
-    };
-  },
 
   onStartShouldSetResponder: function(): bool {
     var shouldSetFromProps = this.props.onStartShouldSetResponder &&
@@ -243,7 +231,6 @@ if (Platform.OS === 'android') {
   RCTVirtualText = createReactNativeComponentClass({
     validAttributes: merge(ReactNativeViewAttributes.UIView, {
       isHighlighted: true,
-      allowFontScaling: false,
     }),
     uiViewClassName: 'RCTVirtualText',
   });