summaryrefslogtreecommitdiffhomepage
path: root/app/components
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-02-23 21:56:22 +0000
committerAndrej Mihajlov <and@codeispoetry.ru>2017-02-23 21:56:22 +0000
commitbd31d966cac0bb64f60d9f7856ba2c6e2c7bfd15 (patch)
tree09091b97bd4abc19212385c50125e6c2e95219c3 /app/components
parent84019e470a4615e24d8fe0335368495c8f4ee46e (diff)
downloadmullvadvpn-bd31d966cac0bb64f60d9f7856ba2c6e2c7bfd15.tar.xz
mullvadvpn-bd31d966cac0bb64f60d9f7856ba2c6e2c7bfd15.zip
Workaround unwanted animation on first pass
See: https://github.com/alex3165/react-mapbox-gl/issues/134
Diffstat (limited to 'app/components')
-rw-r--r--app/components/Connect.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 1767f7ef1c..17d99ac577 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -107,10 +107,22 @@ export default class Connect extends Component {
return [ bbox[1], bbox[0], bbox[3], bbox[2] ]; // <lng>, <lat>, <lng>, <lat>
}
+ componentWillMount() {
+ const loc = this.displayLocation();
+
+ // we need this to override default center
+ // see: https://github.com/alex3165/react-mapbox-gl/issues/134
+ this._initialLocation = [ loc[1], loc[0] ]; // <lng>, <lat>
+ }
+
+ componentWillUnmount() {
+ this._initialLocation = null;
+ }
+
render() {
const preferredServer = this.props.settings.preferredServer;
const serverInfo = this.serverInfo(preferredServer);
- const displayLocation = this.displayLocation();
+ const displayLocation = this.displayLocation(); // <lat>, <lng>
const markerLocation = [ displayLocation[1], displayLocation[0] ]; // <lng>, <lat>
const isConnecting = this.props.connect.status === ConnectionState.connecting;
@@ -126,6 +138,7 @@ export default class Connect extends Component {
<div className="connect">
<div className="connect__map">
<ReactMapboxGl style="mapbox://styles/mapbox/dark-v9"
+ center={ this._initialLocation }
accessToken={ accessToken }
containerStyle={{ height: '100%' }}
interactive={ false }