diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-07-06 16:45:58 +0300 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-07-06 16:45:58 +0300 |
| commit | db78c15f3445899bc0760bfea5194ae1d7896f47 (patch) | |
| tree | 45441a551da003d78d5ebbca36b26aa6de8bc379 /app/components | |
| parent | faf8c502904770997cb8450829f821c739f07138 (diff) | |
| parent | a622c0312931a79d634c231dede881c1cd33f3ee (diff) | |
| download | mullvadvpn-db78c15f3445899bc0760bfea5194ae1d7896f47.tar.xz mullvadvpn-db78c15f3445899bc0760bfea5194ae1d7896f47.zip | |
Merge branch 'feature/update-react-mapbox-gl-v2'
Diffstat (limited to 'app/components')
| -rw-r--r-- | app/components/Connect.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js index 8d5893c0a5..edca72c102 100644 --- a/app/components/Connect.js +++ b/app/components/Connect.js @@ -35,6 +35,12 @@ export type ConnectProps = { getServerInfo: (identifier: string) => ?ServerInfo }; +const ReactMap = ReactMapboxGl({ + accessToken: mapboxConfig.accessToken, + attributionControl: false, + interactive: false +}); + export default class Connect extends Component { props: ConnectProps; state = { @@ -126,11 +132,9 @@ export default class Connect extends Component { const serverLocation = this.convertToMapCoordinate(serverInfo.location); const map = process.platform === 'darwin' - ? <ReactMapboxGl + ? <ReactMap style={ mapboxConfig.styleURL } - accessToken={ mapboxConfig.accessToken } containerStyle={{ height: '100%' }} - interactive={ false } fitBounds={ mapBounds } fitBoundsOptions={ mapBoundsOptions }> <If condition={ isConnected }> @@ -147,7 +151,7 @@ export default class Connect extends Component { </Marker> </Then> </If> - </ReactMapboxGl> + </ReactMap> : undefined; return ( |