Skip to content

Commit

Permalink
[react_native] JS files from D1994196: [react_native] TextInput fix a…
Browse files Browse the repository at this point in the history
…ndroid viewconfig mixins: [NativeMethodsMixin, TimerMixin],
  • Loading branch information
andreicoman11 committed Apr 17, 2015
1 parent 915151c commit af895ba
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions Libraries/Components/TextInput/TextInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var notMultiline = {
onSubmitEditing: true,
};

var TextInputAndroidAttributes = {
var AndroidTextInputAttributes = {
autoCapitalize: true,
autoCorrect: true,
autoFocus: true,
Expand All @@ -84,10 +84,15 @@ var TextInputAndroidAttributes = {
testID: true,
};

var AndroidTextInput = createReactIOSNativeComponentClass({
validAttributes: TextInputAndroidAttributes,
var viewConfigIOS = {
uiViewClassName: 'RCTTextField',
validAttributes: RCTTextFieldAttributes,
};

var viewConfigAndroid = {
uiViewClassName: 'AndroidTextInput',
});
validAttributes: AndroidTextInputAttributes,
};

var crossPlatformKeyboardTypeMap = {
'numeric': 'decimal-pad',
Expand Down Expand Up @@ -293,10 +298,8 @@ var TextInput = React.createClass({
*/
mixins: [NativeMethodsMixin, TimerMixin],

viewConfig: {
uiViewClassName: 'RCTTextField',
validAttributes: RCTTextFieldAttributes,
},
viewConfig: ((Platform.OS === 'ios' ? viewConfigIOS :
(Platform.OS === 'android' ? viewConfigAndroid : {})) : Object),

isFocused: function(): boolean {
return TextInputState.currentlyFocusedField() ===
Expand Down Expand Up @@ -591,4 +594,9 @@ var RCTTextField = createReactIOSNativeComponentClass({
uiViewClassName: 'RCTTextField',
});

var AndroidTextInput = createReactIOSNativeComponentClass({
validAttributes: AndroidTextInputAttributes,
uiViewClassName: 'AndroidTextInput',
});

module.exports = TextInput;

0 comments on commit af895ba

Please sign in to comment.