Dynamic Text Sizes for Text component

Summary:
Dynamic Text Sizes for Text component.
Text gains new prop - allowFontScaling (false by default).
There is also AccessibilityManager module that allows you to tune multipliers per each content size category.

React/Base/RCTConvert.h

@@ -91,7 +91,8 @@ typedef NSURL RCTFileURL;
 + (UIFont *)UIFont:(UIFont *)font withStyle:(id)json;
 + (UIFont *)UIFont:(UIFont *)font withFamily:(id)json;
 + (UIFont *)UIFont:(UIFont *)font withFamily:(id)family
-              size:(id)size weight:(id)weight style:(id)style;
+              size:(id)size weight:(id)weight style:(id)style
+   scaleMultiplier:(CGFloat)scaleMultiplier;
 
 typedef NSArray NSStringArray;
 + (NSStringArray *)NSStringArray:(id)json;

React/Base/RCTConvert.m

@@ -779,31 +779,33 @@ static BOOL RCTFontIsCondensed(UIFont *font)
            withFamily:json[@"fontFamily"]
                  size:json[@"fontSize"]
                weight:json[@"fontWeight"]
-                style:json[@"fontStyle"]];
+                style:json[@"fontStyle"]
+          scaleMultiplier:1.0f];
 }
 
 + (UIFont *)UIFont:(UIFont *)font withSize:(id)json
 {
-  return [self UIFont:font withFamily:nil size:json weight:nil style:nil];
+  return [self UIFont:font withFamily:nil size:json weight:nil style:nil scaleMultiplier:1.0];
 }
 
 + (UIFont *)UIFont:(UIFont *)font withWeight:(id)json
 {
-  return [self UIFont:font withFamily:nil size:nil weight:json style:nil];
+  return [self UIFont:font withFamily:nil size:nil weight:json style:nil scaleMultiplier:1.0];
 }
 
 + (UIFont *)UIFont:(UIFont *)font withStyle:(id)json
 {
-  return [self UIFont:font withFamily:nil size:nil weight:nil style:json];
+  return [self UIFont:font withFamily:nil size:nil weight:nil style:json scaleMultiplier:1.0];
 }
 
 + (UIFont *)UIFont:(UIFont *)font withFamily:(id)json
 {
-  return [self UIFont:font withFamily:json size:nil weight:nil style:nil];
+  return [self UIFont:font withFamily:json size:nil weight:nil style:nil scaleMultiplier:1.0];
 }
 
 + (UIFont *)UIFont:(UIFont *)font withFamily:(id)family
               size:(id)size weight:(id)weight style:(id)style
+   scaleMultiplier:(CGFloat)scaleMultiplier
 {
   // Defaults
   NSString *const RCTDefaultFontFamily = @"System";
@@ -828,6 +830,9 @@ static BOOL RCTFontIsCondensed(UIFont *font)
 
   // Get font attributes
   fontSize = [self CGFloat:size] ?: fontSize;
+  if (scaleMultiplier > 0.0 && scaleMultiplier != 1.0) {
+    fontSize = round(fontSize * scaleMultiplier);
+  }
   familyName = [self NSString:family] ?: familyName;
   isItalic = style ? [self RCTFontStyle:style] : isItalic;
   fontWeight = weight ? [self RCTFontWeight:weight] : fontWeight;

React/Modules/RCTAccessibilityManager.h

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "RCTBridgeModule.h"
+#import "RCTBridge.h"
+
+extern NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification; // posted when multiplier is changed
+
+@interface RCTAccessibilityManager : NSObject <RCTBridgeModule>
+
+@property (nonatomic, readonly) CGFloat multiplier;
+
+@end
+
+@interface RCTBridge (RCTAccessibilityManager)
+
+@property (nonatomic, readonly) RCTAccessibilityManager *accessibilityManager;
+
+@end

React/Modules/RCTAccessibilityManager.m

@@ -0,0 +1,144 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "RCTAccessibilityManager.h"
+
+#import "RCTLog.h"
+
+NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification = @"RCTAccessibilityManagerDidUpdateMultiplierNotification";
+
+@interface RCTAccessibilityManager ()
+
+@property (nonatomic, copy) NSDictionary *multipliers;
+@property (nonatomic, copy) NSString *contentSizeCategory;
+@property (nonatomic, assign) CGFloat multiplier;
+
+@end
+
+@implementation RCTAccessibilityManager
+
+@synthesize bridge = _bridge;
+
+RCT_EXPORT_MODULE()
+
++ (NSDictionary *)JSToUIKitMap
+{
+  static NSDictionary *map = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    map = @{@"extraSmall": UIContentSizeCategoryExtraSmall,
+            @"small": UIContentSizeCategorySmall,
+            @"medium": UIContentSizeCategoryMedium,
+            @"large": UIContentSizeCategoryLarge,
+            @"extraLarge": UIContentSizeCategoryExtraLarge,
+            @"extraExtraLarge": UIContentSizeCategoryExtraExtraLarge,
+            @"extraExtraExtraLarge": UIContentSizeCategoryExtraExtraExtraLarge,
+            @"accessibilityMedium": UIContentSizeCategoryAccessibilityMedium,
+            @"accessibilityLarge": UIContentSizeCategoryAccessibilityLarge,
+            @"accessibilityExtraLarge": UIContentSizeCategoryAccessibilityExtraLarge,
+            @"accessibilityExtraExtraLarge": UIContentSizeCategoryAccessibilityExtraExtraLarge,
+            @"accessibilityExtraExtraExtraLarge": UIContentSizeCategoryAccessibilityExtraExtraExtraLarge};
+  });
+  return map;
+}
+
++ (NSString *)UIKitCategoryFromJSCategory:(NSString *)JSCategory
+{
+  return self.JSToUIKitMap[JSCategory];
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(didReceiveNewContentSizeCategory:)
+                                                 name:UIContentSizeCategoryDidChangeNotification
+                                               object:[UIApplication sharedApplication]];
+    self.contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)didReceiveNewContentSizeCategory:(NSNotification *)note
+{
+  self.contentSizeCategory = note.userInfo[UIContentSizeCategoryNewValueKey];
+}
+
+- (void)setContentSizeCategory:(NSString *)contentSizeCategory
+{
+  if (_contentSizeCategory != contentSizeCategory) {
+    _contentSizeCategory = [contentSizeCategory copy];
+    self.multiplier = [self multiplierForContentSizeCategory:_contentSizeCategory];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTAccessibilityManagerDidUpdateMultiplierNotification object:self];
+  }
+}
+
+- (CGFloat)multiplierForContentSizeCategory:(NSString *)category
+{
+  NSNumber *m = self.multipliers[category];
+  if (m.doubleValue <= 0.0) {
+    RCTLogError(@"Can't determinte multiplier for category %@. Using 1.0.", category);
+    m = @1.0;
+  }
+  return m.doubleValue;
+}
+
+- (NSDictionary *)multipliers
+{
+  if (_multipliers == nil) {
+    _multipliers = @{UIContentSizeCategoryExtraSmall: @0.823,
+                     UIContentSizeCategorySmall: @0.882,
+                     UIContentSizeCategoryMedium: @0.941,
+                     UIContentSizeCategoryLarge: @1.0,
+                     UIContentSizeCategoryExtraLarge: @1.118,
+                     UIContentSizeCategoryExtraExtraLarge: @1.235,
+                     UIContentSizeCategoryExtraExtraExtraLarge: @1.353,
+                     UIContentSizeCategoryAccessibilityMedium: @1.786,
+                     UIContentSizeCategoryAccessibilityLarge: @2.143,
+                     UIContentSizeCategoryAccessibilityExtraLarge: @2.643,
+                     UIContentSizeCategoryAccessibilityExtraExtraLarge: @3.143,
+                     UIContentSizeCategoryAccessibilityExtraExtraExtraLarge: @3.571};
+  }
+  return _multipliers;
+}
+
+RCT_EXPORT_METHOD(setAccessibilityContentSizeMultipliers:(NSDictionary *)JSMultipliers)
+{
+  NSMutableDictionary *multipliers = [[NSMutableDictionary alloc] init];
+  for (NSString *__nonnull JSCategory in JSMultipliers) {
+    NSNumber *m = JSMultipliers[JSCategory];
+    NSString *UIKitCategory = [self.class UIKitCategoryFromJSCategory:JSCategory];
+    multipliers[UIKitCategory] = m;
+  }
+  self.multipliers = multipliers;
+}
+
+RCT_EXPORT_METHOD(getMultiplier:(RCTResponseSenderBlock)callback)
+{
+  if (callback) {
+    callback(@[ @(self.multiplier) ]);
+  }
+}
+
+@end
+
+@implementation RCTBridge (RCTAccessibilityManager)
+
+- (RCTAccessibilityManager *)accessibilityManager
+{
+  return self.modules[RCTBridgeModuleNameForClass([RCTAccessibilityManager class])];
+}
+
+@end

React/Modules/RCTUIManager.h

@@ -14,6 +14,12 @@
 #import "RCTInvalidating.h"
 #import "RCTViewManager.h"
 
+/**
+ * Posted right before re-render happens. This is a chance for views to invalidate their state so
+ * next render cycle will pick up updated views and layout appropriately.
+ */
+extern NSString *const RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification;
+
 @protocol RCTScrollableProtocol;
 
 /**

React/Modules/RCTUIManager.m

@@ -14,6 +14,7 @@
 #import <AVFoundation/AVFoundation.h>
 
 #import "Layout.h"
+#import "RCTAccessibilityManager.h"
 #import "RCTAnimationType.h"
 #import "RCTAssert.h"
 #import "RCTBridge.h"
@@ -42,6 +43,8 @@ static void RCTTraverseViewNodes(id<RCTViewNodeProtocol> view, react_view_node_b
   }
 }
 
+NSString *const RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification = @"RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification";
+
 @interface RCTAnimation : NSObject
 
 @property (nonatomic, readonly) NSTimeInterval duration;
@@ -269,10 +272,33 @@ static NSDictionary *RCTViewConfigForModule(Class managerClass)
     _rootViewTags = [[NSMutableSet alloc] init];
 
     _bridgeTransactionListeners = [[NSMutableSet alloc] init];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(didReceiveNewContentSizeMultiplier)
+                                                 name:RCTAccessibilityManagerDidUpdateMultiplierNotification
+                                               object:nil];
   }
   return self;
 }
 
+- (void)dealloc
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)didReceiveNewContentSizeMultiplier
+{
+  __weak RCTUIManager *weakSelf = self;
+  dispatch_async(self.methodQueue, ^{
+    __weak RCTUIManager *strongSelf = weakSelf;
+    if (strongSelf) {
+      [[NSNotificationCenter defaultCenter] postNotificationName:RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification
+                                                          object:strongSelf];
+      [strongSelf batchDidComplete];
+    }
+  });
+}
+
 - (BOOL)isValid
 {
   return _viewRegistry != nil;

React/React.xcodeproj/project.pbxproj

@@ -79,6 +79,7 @@
 		83CBBA691A601EF300E9B192 /* RCTEventDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA661A601EF300E9B192 /* RCTEventDispatcher.m */; };
 		83CBBA981A6020BB00E9B192 /* RCTTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA971A6020BB00E9B192 /* RCTTouchHandler.m */; };
 		83CBBACC1A6023D300E9B192 /* RCTConvert.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBACB1A6023D300E9B192 /* RCTConvert.m */; };
+		E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -253,6 +254,8 @@
 		83CBBACA1A6023D300E9B192 /* RCTConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTConvert.h; sourceTree = "<group>"; };
 		83CBBACB1A6023D300E9B192 /* RCTConvert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert.m; sourceTree = "<group>"; };
 		E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextDecorationLineType.h; sourceTree = "<group>"; };
+		E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAccessibilityManager.h; sourceTree = "<group>"; };
+		E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAccessibilityManager.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -289,6 +292,8 @@
 		13B07FE01A69315300A75B9A /* Modules */ = {
 			isa = PBXGroup;
 			children = (
+				E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */,
+				E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */,
 				13B07FE71A69327A00A75B9A /* RCTAlertManager.h */,
 				13B07FE81A69327A00A75B9A /* RCTAlertManager.m */,
 				1372B7081AB030C200659ED6 /* RCTAppState.h */,
@@ -607,6 +612,7 @@
 				137327EA1AA5CF210034F82E /* RCTTabBarManager.m in Sources */,
 				13B080261A694A8400A75B9A /* RCTWrapperViewController.m in Sources */,
 				13B080051A6947C200A75B9A /* RCTScrollView.m in Sources */,
+				E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */,
 				13B07FF21A69327A00A75B9A /* RCTTiming.m in Sources */,
 				1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */,
 				134FCB3D1A6E7F0800051CC8 /* RCTContextExecutor.m in Sources */,