2015-03-23 20:28:42 +00:00
|
|
|
/**
|
|
|
|
* 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.
|
|
|
|
*/
|
2015-02-20 04:10:52 +00:00
|
|
|
|
|
|
|
#import "RCTTextField.h"
|
|
|
|
|
2017-05-29 22:56:38 +00:00
|
|
|
#import <React/RCTBridge.h>
|
2016-11-23 15:47:52 +00:00
|
|
|
#import <React/RCTConvert.h>
|
|
|
|
#import <React/RCTEventDispatcher.h>
|
iOS: Support allowFontScaling on TextInput
Summary:
Currently, only `Text` supports the `allowFontScaling` prop. This commit adds support for it on `TextInput`.
As part of this change, the TextInput setters for font attributes (e.g. size, weight) had to be refactored. The problem with them is that they use RCTFont's helpers which create a new font based on an existing font. These helpers lose information. In particular, they lose the scaleMultiplier.
For example, suppose the font size is 12 and the device's font multiplier is set to 1.5. So we'd create a font with size 12 and scaleMultiplier 1.5 which is an effective size of 18 (which is the only thing stored in the font). Next, suppose the device's font multiplier changes to 1. So we'd use an RCTFont helper to create a new font based on the existing font but with a scaleMultiplier of 1. However, the font didn't store the font size (12) and scaleMultiplier (1.5) separately. It just knows the (effective) font size of 18. So RCTFont thinks the new font has a font size of 18 and a scaleMultiplier of 1 so its effective font size is 18. This is incorrect and it should have been 12.
To fix this, the font attributes are now all stored individually. Anytime one of them changes, updateFont is called which recreates the font from scratch. This happens to fix some bugs around fontStyle and fontWeight which were reported several times before: #13730, #12738, #2140, #8533.
Created a test app where I verified that `allowFontScaling` works properly for `TextInputs` for all values (`undefined`, `true`, `false`) for a variety of `TextInputs`:
- Singleline TextInput
- Singleline TextInput's placeholder
- Multiline TextInput
- Multiline TextInput's placeholder
- Multiline TextInput using children instead of `value`
Also, verified switching `fontSize`, `fontWeight`, `fontStyle` and `fontFamily` through a bunch of combinations works properly.
Lastly, my team has been using this change in our app.
Adam Comella
Microsoft Corp.
Closes https://github.com/facebook/react-native/pull/14030
Reviewed By: TheSavior
Differential Revision: D5899959
Pulled By: shergin
fbshipit-source-id: c8c8c4d4d670cd2a142286e79bfffef3b58cecd3
2017-10-02 04:40:57 +00:00
|
|
|
#import <React/RCTFont.h>
|
2017-05-29 22:56:38 +00:00
|
|
|
#import <React/RCTUIManager.h>
|
2016-11-23 15:47:52 +00:00
|
|
|
#import <React/RCTUtils.h>
|
|
|
|
#import <React/UIView+React.h>
|
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
#import "RCTBackedTextInputDelegate.h"
|
2016-08-26 00:18:05 +00:00
|
|
|
#import "RCTTextSelection.h"
|
2017-05-29 22:56:47 +00:00
|
|
|
#import "RCTUITextField.h"
|
2015-02-20 04:10:52 +00:00
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
@interface RCTTextField () <RCTBackedTextInputDelegate>
|
2017-01-30 23:36:57 +00:00
|
|
|
|
|
|
|
@end
|
|
|
|
|
2015-02-20 04:10:52 +00:00
|
|
|
@implementation RCTTextField
|
|
|
|
{
|
2017-07-18 21:33:31 +00:00
|
|
|
RCTUITextField *_backedTextInput;
|
2015-11-05 05:01:49 +00:00
|
|
|
BOOL _submitted;
|
2017-05-29 22:56:47 +00:00
|
|
|
CGSize _previousContentSize;
|
2015-02-20 04:10:52 +00:00
|
|
|
}
|
|
|
|
|
2017-05-29 22:56:38 +00:00
|
|
|
- (instancetype)initWithBridge:(RCTBridge *)bridge
|
2015-02-20 04:10:52 +00:00
|
|
|
{
|
2017-06-27 23:05:05 +00:00
|
|
|
if (self = [super initWithBridge:bridge]) {
|
2017-06-10 15:19:34 +00:00
|
|
|
// `blurOnSubmit` defaults to `true` for <TextInput multiline={false}> by design.
|
|
|
|
_blurOnSubmit = YES;
|
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
_backedTextInput = [[RCTUITextField alloc] initWithFrame:self.bounds];
|
|
|
|
_backedTextInput.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
|
|
|
_backedTextInput.textInputDelegate = self;
|
iOS: Support allowFontScaling on TextInput
Summary:
Currently, only `Text` supports the `allowFontScaling` prop. This commit adds support for it on `TextInput`.
As part of this change, the TextInput setters for font attributes (e.g. size, weight) had to be refactored. The problem with them is that they use RCTFont's helpers which create a new font based on an existing font. These helpers lose information. In particular, they lose the scaleMultiplier.
For example, suppose the font size is 12 and the device's font multiplier is set to 1.5. So we'd create a font with size 12 and scaleMultiplier 1.5 which is an effective size of 18 (which is the only thing stored in the font). Next, suppose the device's font multiplier changes to 1. So we'd use an RCTFont helper to create a new font based on the existing font but with a scaleMultiplier of 1. However, the font didn't store the font size (12) and scaleMultiplier (1.5) separately. It just knows the (effective) font size of 18. So RCTFont thinks the new font has a font size of 18 and a scaleMultiplier of 1 so its effective font size is 18. This is incorrect and it should have been 12.
To fix this, the font attributes are now all stored individually. Anytime one of them changes, updateFont is called which recreates the font from scratch. This happens to fix some bugs around fontStyle and fontWeight which were reported several times before: #13730, #12738, #2140, #8533.
Created a test app where I verified that `allowFontScaling` works properly for `TextInputs` for all values (`undefined`, `true`, `false`) for a variety of `TextInputs`:
- Singleline TextInput
- Singleline TextInput's placeholder
- Multiline TextInput
- Multiline TextInput's placeholder
- Multiline TextInput using children instead of `value`
Also, verified switching `fontSize`, `fontWeight`, `fontStyle` and `fontFamily` through a bunch of combinations works properly.
Lastly, my team has been using this change in our app.
Adam Comella
Microsoft Corp.
Closes https://github.com/facebook/react-native/pull/14030
Reviewed By: TheSavior
Differential Revision: D5899959
Pulled By: shergin
fbshipit-source-id: c8c8c4d4d670cd2a142286e79bfffef3b58cecd3
2017-10-02 04:40:57 +00:00
|
|
|
_backedTextInput.font = self.fontAttributes.font;
|
2017-05-29 22:56:47 +00:00
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
[self addSubview:_backedTextInput];
|
2015-02-20 04:10:52 +00:00
|
|
|
}
|
2017-05-29 22:56:47 +00:00
|
|
|
|
2015-02-20 04:10:52 +00:00
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2017-05-29 22:56:47 +00:00
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
|
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
|
|
|
|
|
2017-06-27 23:05:04 +00:00
|
|
|
- (id<RCTBackedTextInputViewProtocol>)backedTextInputView
|
|
|
|
{
|
2017-07-18 21:33:31 +00:00
|
|
|
return _backedTextInput;
|
2017-06-27 23:05:04 +00:00
|
|
|
}
|
|
|
|
|
2015-11-02 17:13:41 +00:00
|
|
|
- (void)sendKeyValueForString:(NSString *)string
|
|
|
|
{
|
|
|
|
[_eventDispatcher sendTextEventWithType:RCTTextEventTypeKeyPress
|
|
|
|
reactTag:self.reactTag
|
|
|
|
text:nil
|
|
|
|
key:string
|
|
|
|
eventCount:_nativeEventCount];
|
|
|
|
}
|
|
|
|
|
2017-05-29 22:56:47 +00:00
|
|
|
#pragma mark - Properties
|
|
|
|
|
|
|
|
- (NSString *)text
|
|
|
|
{
|
2017-07-18 21:33:31 +00:00
|
|
|
return _backedTextInput.text;
|
2017-05-29 22:56:47 +00:00
|
|
|
}
|
|
|
|
|
2015-04-10 00:40:30 +00:00
|
|
|
- (void)setText:(NSString *)text
|
|
|
|
{
|
2015-07-21 19:37:24 +00:00
|
|
|
NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
|
|
|
|
if (eventLag == 0 && ![text isEqualToString:self.text]) {
|
2017-07-18 21:33:31 +00:00
|
|
|
UITextRange *selection = _backedTextInput.selectedTextRange;
|
|
|
|
NSInteger oldTextLength = _backedTextInput.text.length;
|
2015-12-17 18:22:56 +00:00
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
_backedTextInput.text = text;
|
2015-12-17 18:22:56 +00:00
|
|
|
|
|
|
|
if (selection.empty) {
|
|
|
|
// maintain cursor position relative to the end of the old text
|
2017-07-18 21:33:31 +00:00
|
|
|
NSInteger offsetStart = [_backedTextInput offsetFromPosition:_backedTextInput.beginningOfDocument toPosition:selection.start];
|
2015-12-17 18:22:56 +00:00
|
|
|
NSInteger offsetFromEnd = oldTextLength - offsetStart;
|
|
|
|
NSInteger newOffset = text.length - offsetFromEnd;
|
2017-07-18 21:33:31 +00:00
|
|
|
UITextPosition *position = [_backedTextInput positionFromPosition:_backedTextInput.beginningOfDocument offset:newOffset];
|
2017-07-18 21:33:45 +00:00
|
|
|
[_backedTextInput setSelectedTextRange:[_backedTextInput textRangeFromPosition:position toPosition:position]
|
|
|
|
notifyDelegate:YES];
|
2015-12-17 18:22:56 +00:00
|
|
|
}
|
2015-07-21 19:37:24 +00:00
|
|
|
} else if (eventLag > RCTTextUpdateLagWarningThreshold) {
|
2017-09-25 17:23:02 +00:00
|
|
|
RCTLogWarn(@"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.", _backedTextInput.text, (long long)eventLag);
|
2015-04-10 00:40:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
#pragma mark - RCTBackedTextInputDelegate
|
2017-01-30 23:36:57 +00:00
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
- (BOOL)textInputShouldChangeTextInRange:(NSRange)range replacementText:(NSString *)string
|
2017-01-30 23:36:57 +00:00
|
|
|
{
|
|
|
|
// Only allow single keypresses for `onKeyPress`, pasted text will not be sent.
|
2017-07-18 21:33:31 +00:00
|
|
|
if (!_backedTextInput.textWasPasted) {
|
2017-01-30 23:36:57 +00:00
|
|
|
[self sendKeyValueForString:string];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_maxLength != nil && ![string isEqualToString:@"\n"]) { // Make sure forms can be submitted via return.
|
2017-07-18 21:33:31 +00:00
|
|
|
NSUInteger allowedLength = _maxLength.integerValue - MIN(_maxLength.integerValue, _backedTextInput.text.length) + range.length;
|
2017-01-30 23:36:57 +00:00
|
|
|
if (string.length > allowedLength) {
|
|
|
|
if (string.length > 1) {
|
|
|
|
// Truncate the input string so the result is exactly `maxLength`.
|
|
|
|
NSString *limitedString = [string substringToIndex:allowedLength];
|
2017-07-18 21:33:31 +00:00
|
|
|
NSMutableString *newString = _backedTextInput.text.mutableCopy;
|
2017-01-30 23:36:57 +00:00
|
|
|
[newString replaceCharactersInRange:range withString:limitedString];
|
2017-07-18 21:33:31 +00:00
|
|
|
_backedTextInput.text = newString;
|
2017-01-30 23:36:57 +00:00
|
|
|
|
|
|
|
// Collapse selection at end of insert to match normal paste behavior.
|
2017-07-18 21:33:31 +00:00
|
|
|
UITextPosition *insertEnd = [_backedTextInput positionFromPosition:_backedTextInput.beginningOfDocument
|
2017-05-29 22:56:47 +00:00
|
|
|
offset:(range.location + allowedLength)];
|
2017-07-18 21:33:45 +00:00
|
|
|
[_backedTextInput setSelectedTextRange:[_backedTextInput textRangeFromPosition:insertEnd toPosition:insertEnd]
|
|
|
|
notifyDelegate:YES];
|
2017-07-18 21:33:31 +00:00
|
|
|
[self textInputDidChange];
|
2017-01-30 23:36:57 +00:00
|
|
|
}
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
2017-07-18 21:33:31 +00:00
|
|
|
- (void)textInputDidChange
|
|
|
|
{
|
|
|
|
_nativeEventCount++;
|
|
|
|
[_eventDispatcher sendTextEventWithType:RCTTextEventTypeChange
|
|
|
|
reactTag:self.reactTag
|
|
|
|
text:_backedTextInput.text
|
|
|
|
key:nil
|
|
|
|
eventCount:_nativeEventCount];
|
|
|
|
}
|
|
|
|
|
2015-02-20 04:10:52 +00:00
|
|
|
@end
|