Skip to content

Commit 9947e8e

Browse files
Updates to newer RN versions and fixes styles for arrays
1 parent bb8f456 commit 9947e8e

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

StatelessForm.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Platform, Component, PropTypes, ScrollView, View } from 'react-native'
1+
import React, { Component, PropTypes } from 'react'
2+
import { Platform, ScrollView, View } from 'react-native'
23

34
export default class StatelessForm extends Component {
45
componentDidMount() {
@@ -51,7 +52,7 @@ export default class StatelessForm extends Component {
5152
render() {
5253
return (
5354
<ScrollView
54-
keyboardShouldPersistTaps={false}
55+
keyboardShouldPersistTaps="never"
5556
{ ...this.props }
5657
ref='scrollView'
5758
style={[{
@@ -63,7 +64,7 @@ export default class StatelessForm extends Component {
6364
{ Platform.OS == 'android' && <View style={{ height: 500 }}/> }
6465
</ScrollView>
6566
)
66-
}
67+
}
6768
}
6869

6970
StatelessForm.propTypes = {

widgets/InlineTextInput.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes, View, Text, TextInput } from 'react-native'
1+
import React, { Component, PropTypes } from 'react'
2+
import { View, Text, TextInput, StyleSheet } from 'react-native'
23

34
export default class InlineTextInput extends Component {
45
componentDidMount() {
@@ -54,7 +55,8 @@ export default class InlineTextInput extends Component {
5455
}
5556

5657
renderMessage() {
57-
const { message, messageStyle, style } = this.props
58+
const { message, messageStyle } = this.props
59+
const style = StyleSheet.flatten(this.props.style)
5860
if (this.shouldDisplayMessage()) {
5961
return(
6062
<View style={{
@@ -74,7 +76,8 @@ export default class InlineTextInput extends Component {
7476
}
7577

7678
render() {
77-
const { title, value, style, titleStyle, inputStyle, nextInput, onBlur, multiline } = this.props
79+
const { title, value, titleStyle, inputStyle, nextInput, onBlur, multiline } = this.props
80+
const style = StyleSheet.flatten(this.props.style)
7881
return (
7982
<View
8083
onLayout={this.handleLayout.bind(this)}
@@ -105,6 +108,7 @@ export default class InlineTextInput extends Component {
105108
</Text>
106109
<TextInput
107110
clearButtonMode='while-editing'
111+
underlineColorAndroid='transparent'
108112
returnKeyType={ multiline ? 'default' : (nextInput ? 'next' : 'done') }
109113
onSubmitEditing={this.handleSubmitEditing.bind(this)}
110114
{ ...this.props }

0 commit comments

Comments
 (0)