Skip to content

Commit b53d76e

Browse files
sherginfacebook-github-bot
authored andcommitted
Better TextInput: RCTUITextView was decoupled in separate file and now handles placeholder feature
Reviewed By: mmmulani Differential Revision: D4663151 fbshipit-source-id: ce57ca4bebf4676df2ae5e586a1b175ec2aac760
1 parent 26e2c08 commit b53d76e

File tree

7 files changed

+319
-193
lines changed

7 files changed

+319
-193
lines changed

Examples/UIExplorer/js/TextInputExample.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ exports.examples = [
779779
<View>
780780
<TextInput
781781
placeholder="height increases with content"
782-
defaultValue="React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and React. The focus of React Native is on developer efficiency across all the platforms you care about learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native."
782+
defaultValue="React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and React. The focus of React Native is on developer efficiency across all the platforms you care about - learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native."
783783
multiline={true}
784784
enablesReturnKeyAutomatically={true}
785785
returnKeyType="go"

Libraries/Text/RCTText.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CB1A9E6C5C00147676 /* RCTShadowText.m */; };
2828
58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; };
2929
58B512161A9E6EFF00147676 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; };
30+
59B125C91E6E4E15004E2A67 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */; };
31+
59B125CA1E6E4E15004E2A67 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */; };
3032
59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; };
3133
59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; };
3234
59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E901E661BDD0081153B /* RCTShadowTextView.m */; };
@@ -58,6 +60,8 @@
5860
58B511CD1A9E6C5C00147676 /* RCTTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextManager.m; sourceTree = "<group>"; };
5961
58B512141A9E6EFF00147676 /* RCTText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTText.m; sourceTree = "<group>"; };
6062
58B512151A9E6EFF00147676 /* RCTText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTText.h; sourceTree = "<group>"; };
63+
59B125C71E6E4E15004E2A67 /* RCTUITextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUITextView.h; sourceTree = "<group>"; };
64+
59B125C81E6E4E15004E2A67 /* RCTUITextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUITextView.m; sourceTree = "<group>"; };
6165
59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextField.h; sourceTree = "<group>"; };
6266
59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowTextField.m; sourceTree = "<group>"; };
6367
59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextView.h; sourceTree = "<group>"; };
@@ -97,6 +101,8 @@
97101
131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */,
98102
131B6ABE1AF0CD0600FFC3E0 /* RCTTextViewManager.h */,
99103
131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */,
104+
59B125C71E6E4E15004E2A67 /* RCTUITextView.h */,
105+
59B125C81E6E4E15004E2A67 /* RCTUITextView.m */,
100106
);
101107
indentWidth = 2;
102108
sourceTree = "<group>";
@@ -194,6 +200,7 @@
194200
2D3B5F341D9B103100451313 /* RCTRawTextManager.m in Sources */,
195201
59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */,
196202
AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */,
203+
59B125CA1E6E4E15004E2A67 /* RCTUITextView.m in Sources */,
197204
2D3B5F3C1D9B106F00451313 /* RCTTextViewManager.m in Sources */,
198205
59F60E941E661BDD0081153B /* RCTShadowTextView.m in Sources */,
199206
2D3B5F331D9B102D00451313 /* RCTTextSelection.m in Sources */,
@@ -214,6 +221,7 @@
214221
1362F1011B4D51F400E06D8C /* RCTTextFieldManager.m in Sources */,
215222
59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */,
216223
AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */,
224+
59B125C91E6E4E15004E2A67 /* RCTUITextView.m in Sources */,
217225
131B6AC11AF0CD0600FFC3E0 /* RCTTextViewManager.m in Sources */,
218226
59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */,
219227
58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */,

Libraries/Text/RCTTextView.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
2626
@property (nonatomic, copy) NSString *text;
2727
@property (nonatomic, strong) UIColor *placeholderTextColor;
28+
@property (nonatomic, copy) NSString *placeholder;
2829
@property (nonatomic, strong) UIFont *font;
2930
@property (nonatomic, assign) NSInteger mostRecentEventCount;
3031
@property (nonatomic, strong) NSNumber *maxLength;

0 commit comments

Comments
 (0)