iOS: Support allowFontScaling on TextInput #14030
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /** | ||
| * 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 <UIKit/UIKit.h> | ||
|
|
||
| #import "RCTFontAttributesDelegate.h" | ||
|
|
||
| @class RCTAccessibilityManager; | ||
|
|
||
| @interface RCTFontAttributes : NSObject | ||
|
|
||
| @property (nonatomic, weak) id<RCTFontAttributesDelegate> delegate; | ||
|
|
||
| @property (readonly, nonatomic, strong) UIFont *font; | ||
|
|
||
| @property (nonatomic, assign) BOOL allowFontScaling; | ||
| @property (nonatomic, copy) NSString *fontFamily; | ||
| @property (nonatomic, strong) NSNumber *fontSize; | ||
| @property (nonatomic, assign) CGFloat fontSizeMultiplier; | ||
| @property (nonatomic, copy) NSString *fontStyle; | ||
| @property (nonatomic, copy) NSString *fontWeight; | ||
|
|
||
| - (instancetype)initWithAccessibilityManager:(RCTAccessibilityManager *)accessibilityManager; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /** | ||
| * 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 "RCTFontAttributes.h" | ||
|
|
||
| #import <React/RCTAccessibilityManager.h> | ||
| #import <React/RCTAssert.h> | ||
| #import <React/RCTFont.h> | ||
| #import <React/RCTLog.h> | ||
|
|
||
| @interface RCTFontAttributes () | ||
| { | ||
| RCTAccessibilityManager *_accessibilityManager; | ||
| } | ||
|
|
||
| @property (nonatomic, strong) UIFont *font; | ||
|
|
||
| @end | ||
|
|
||
| @implementation RCTFontAttributes | ||
|
|
||
| - (instancetype)initWithAccessibilityManager:(RCTAccessibilityManager *)accessibilityManager | ||
| { | ||
| RCTAssertParam(accessibilityManager); | ||
|
|
||
| if (self = [super init]) { | ||
| _accessibilityManager = accessibilityManager; | ||
| _fontSizeMultiplier = _accessibilityManager.multiplier; | ||
|
|
||
| [[NSNotificationCenter defaultCenter] addObserver:self | ||
| selector:@selector(contentSizeMultiplierDidChange) | ||
| name:RCTAccessibilityManagerDidUpdateMultiplierNotification | ||
| object:_accessibilityManager]; | ||
|
|
||
| [self updateFont]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)dealloc | ||
| { | ||
| [[NSNotificationCenter defaultCenter] removeObserver:self]; | ||
| } | ||
|
|
||
| - (void)contentSizeMultiplierDidChange | ||
| { | ||
| self.fontSizeMultiplier = _accessibilityManager.multiplier; | ||
| } | ||
|
|
||
| - (void)setAllowFontScaling:(BOOL)allowFontScaling | ||
| { | ||
| _allowFontScaling = allowFontScaling; | ||
| [self updateFont]; | ||
| } | ||
|
|
||
| - (void)setFontFamily:(NSString *)fontFamily | ||
| { | ||
| _fontFamily = fontFamily; | ||
| [self updateFont]; | ||
| } | ||
|
|
||
| - (void)setFontSize:(NSNumber *)fontSize | ||
| { | ||
| _fontSize = fontSize; | ||
| [self updateFont]; | ||
| } | ||
|
|
||
| - (void)setFontSizeMultiplier:(CGFloat)fontSizeMultiplier | ||
| { | ||
| _fontSizeMultiplier = fontSizeMultiplier; | ||
|
|
||
| if (_fontSizeMultiplier == 0) { | ||
| RCTLogError(@"fontSizeMultiplier value must be > zero."); | ||
| _fontSizeMultiplier = 1.0; | ||
| } | ||
|
|
||
| [self updateFont]; | ||
| } | ||
|
|
||
| - (void)setFontStyle:(NSString *)fontStyle | ||
| { | ||
| _fontStyle = fontStyle; | ||
| [self updateFont]; | ||
| } | ||
|
|
||
| - (void)setFontWeight:(NSString *)fontWeight | ||
| { | ||
| _fontWeight = fontWeight; | ||
| [self updateFont]; | ||
| } | ||
|
|
||
| - (void)updateFont | ||
| { | ||
| CGFloat scaleMultiplier = self.allowFontScaling ? self.fontSizeMultiplier : 1.0; | ||
| self.font = [RCTFont updateFont:nil | ||
| withFamily:self.fontFamily | ||
| size:self.fontSize | ||
| weight:self.fontWeight | ||
| style:self.fontStyle | ||
| variant:nil | ||
| scaleMultiplier:scaleMultiplier]; | ||
|
|
||
| [self.delegate fontAttributesDidChangeWithFont:self.font]; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /** | ||
| * 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. | ||
| */ | ||
|
|
||
| @protocol RCTFontAttributesDelegate <NSObject> | ||
|
|
||
| - (void)fontAttributesDidChangeWithFont:(UIFont *)font; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It ensures that
_backedTextInput'sfont gets initialized toRCTFontAttributes'sdefault font. This is not necessarily the same as_backedTextInput'sdefault font.