@@ -17,14 +17,14 @@ import {
17
17
Text ,
18
18
ListView ,
19
19
TouchableWithoutFeedback ,
20
- TouchableWithNativeFeedback ,
20
+ TouchableNativeFeedback ,
21
21
TouchableOpacity ,
22
22
TouchableHighlight ,
23
23
Modal ,
24
24
ActivityIndicator ,
25
25
} from 'react-native' ;
26
26
27
- const TOUCHABLE_ELEMENTS = [ 'TouchableHighlight' , 'TouchableOpacity' , 'TouchableWithoutFeedback' , 'TouchableWithNativeFeedback ' ] ;
27
+ const TOUCHABLE_ELEMENTS = [ 'TouchableHighlight' , 'TouchableOpacity' , 'TouchableWithoutFeedback' , 'TouchableNativeFeedback ' ] ;
28
28
29
29
export default class ModalDropdown extends Component {
30
30
static propTypes = {
@@ -188,6 +188,7 @@ export default class ModalDropdown extends Component {
188
188
onRequestClose = { this . _onRequestClose . bind ( this ) }
189
189
supportedOrientations = { [ 'portrait' , 'portrait-upside-down' , 'landscape' , 'landscape-left' , 'landscape-right' ] } >
190
190
< TouchableWithoutFeedback accessible = { this . props . accessible }
191
+ disabled = { ! this . state . showDropdown }
191
192
onPress = { this . _onModalPress . bind ( this ) } >
192
193
< View style = { styles . modal } >
193
194
< View style = { [ styles . dropdown , this . props . dropdownStyle , frameStyle ] } >
@@ -280,12 +281,12 @@ export default class ModalDropdown extends Component {
280
281
let highlighted = rowID == this . state . selectedIndex ;
281
282
let row = ! this . props . renderRow ?
282
283
( < 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
+ >
289
290
{ rowData }
290
291
</ Text > ) :
291
292
this . props . renderRow ( rowData , rowID , highlighted ) ;
@@ -326,12 +327,12 @@ export default class ModalDropdown extends Component {
326
327
) ;
327
328
}
328
329
break ;
329
- case 'TouchableWithNativeFeedback ' :
330
+ case 'TouchableNativeFeedback ' :
330
331
{
331
332
return (
332
- < TouchableWithNativeFeedback { ...props } >
333
+ < TouchableNativeFeedback { ...props } >
333
334
{ row . props . children }
334
- </ TouchableWithNativeFeedback >
335
+ </ TouchableNativeFeedback >
335
336
) ;
336
337
}
337
338
break ;
0 commit comments