Skip to content

Commit 93a5e20

Browse files
committed
Fix TouchableWithNativeFeedback should be TouchableNativeFeedback
1 parent 0858919 commit 93a5e20

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

components/ModalDropdown.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import {
1717
Text,
1818
ListView,
1919
TouchableWithoutFeedback,
20-
TouchableWithNativeFeedback,
20+
TouchableNativeFeedback,
2121
TouchableOpacity,
2222
TouchableHighlight,
2323
Modal,
2424
ActivityIndicator,
2525
} from 'react-native';
2626

27-
const TOUCHABLE_ELEMENTS = ['TouchableHighlight', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableWithNativeFeedback'];
27+
const TOUCHABLE_ELEMENTS = ['TouchableHighlight', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback'];
2828

2929
export default class ModalDropdown extends Component {
3030
static propTypes = {
@@ -188,6 +188,7 @@ export default class ModalDropdown extends Component {
188188
onRequestClose={this._onRequestClose.bind(this)}
189189
supportedOrientations={['portrait', 'portrait-upside-down', 'landscape', 'landscape-left', 'landscape-right']}>
190190
<TouchableWithoutFeedback accessible={this.props.accessible}
191+
disabled={!this.state.showDropdown}
191192
onPress={this._onModalPress.bind(this)}>
192193
<View style={styles.modal}>
193194
<View style={[styles.dropdown, this.props.dropdownStyle, frameStyle]}>
@@ -280,12 +281,12 @@ export default class ModalDropdown extends Component {
280281
let highlighted = rowID == this.state.selectedIndex;
281282
let row = !this.props.renderRow ?
282283
(<Text style={[
283-
styles.rowText,
284-
this.props.dropdownTextStyle,
285-
highlighted && styles.highlightedRowText,
286-
highlighted && this.props.dropdownTextHighlightStyle
287-
]}
288-
>
284+
styles.rowText,
285+
this.props.dropdownTextStyle,
286+
highlighted && styles.highlightedRowText,
287+
highlighted && this.props.dropdownTextHighlightStyle
288+
]}
289+
>
289290
{rowData}
290291
</Text>) :
291292
this.props.renderRow(rowData, rowID, highlighted);
@@ -326,12 +327,12 @@ export default class ModalDropdown extends Component {
326327
);
327328
}
328329
break;
329-
case 'TouchableWithNativeFeedback':
330+
case 'TouchableNativeFeedback':
330331
{
331332
return (
332-
<TouchableWithNativeFeedback {...props}>
333+
<TouchableNativeFeedback {...props}>
333334
{row.props.children}
334-
</TouchableWithNativeFeedback>
335+
</TouchableNativeFeedback>
335336
);
336337
}
337338
break;

0 commit comments

Comments
 (0)