diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-02-20 17:27:46 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 10:53:13 +0100 |
| commit | 0fe680110e676bd71764d5fa3c9a69a87ee9a258 (patch) | |
| tree | 778f3856750d958e4321fe0f072bd389ed9be5f7 | |
| parent | 58b1b85a1719fa1573edd572e8647a9dd9aa525c (diff) | |
| download | mullvadvpn-0fe680110e676bd71764d5fa3c9a69a87ee9a258.tar.xz mullvadvpn-0fe680110e676bd71764d5fa3c9a69a87ee9a258.zip | |
Drop no longer available cursor prop
| -rw-r--r-- | app/components/Preferences.js | 2 | ||||
| -rw-r--r-- | app/components/styled/Button.js | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/app/components/Preferences.js b/app/components/Preferences.js index f0b65d4a06..d24d99c042 100644 --- a/app/components/Preferences.js +++ b/app/components/Preferences.js @@ -21,7 +21,7 @@ export default class Preferences extends Component { <Header hidden={ true } style={ 'defaultDark' } /> <Container> <View style={ styles.preferences }> - <Button style={ styles.preferences__close } cursor='default' onPress={ this.props.onClose } testName='closeButton'> + <Button style={ styles.preferences__close } onPress={ this.props.onClose } testName='closeButton'> <View style={ styles.preferences__close_content }> <Img style={ styles.preferences__close_icon } source="icon-back" /> <Text style={ styles.preferences__close_title }>Settings</Text> diff --git a/app/components/styled/Button.js b/app/components/styled/Button.js index 2fef7361e2..c2b258c161 100644 --- a/app/components/styled/Button.js +++ b/app/components/styled/Button.js @@ -7,18 +7,10 @@ const defaultStyle = ReactXP.Styles.createViewStyle({ cursor: 'default', }); -type Props = { - style?: Object | Array<any>; - cursor?: string; -}; - -export function Button(props: Props) { - const { style, cursor, ...rest } = props; +export function Button(props: Object) { + const { style, ...rest } = props; const concreteStyle = ReactXP.Styles.combine([defaultStyle, style]); - // Can be removed when we upgrade to ReactXP 0.51 - const concreteCursor = cursor || concreteStyle.cursor || 'default'; - - return <ReactXP.Button style={concreteStyle} cursor={concreteCursor} {...rest} />; + return <ReactXP.Button style={concreteStyle} {...rest} />; } |
