diff options
| -rw-r--r-- | app/components/Connect.js | 12 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | yarn.lock | 45 |
3 files changed, 29 insertions, 32 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 ( diff --git a/package.json b/package.json index 3cc302efb0..b9124b7bf0 100644 --- a/package.json +++ b/package.json @@ -15,14 +15,14 @@ "electron-log": "^2.2.0", "history": "^4.6.1", "jsonrpc-lite": "^1.2.3", - "mapbox-gl": "^0.36.0", + "mapbox-gl": "^0.37.0", "moment": "^2.17.1", "prop-types": "^15.5.10", "react": "^15.6.1", "react-custom-scrollbars": "^4.0.2", "react-dom": "^15.6.1", "react-if": "^2.2.1", - "react-mapbox-gl": "^1.3.0", + "react-mapbox-gl": "^2.1.0", "react-redux": "^5.0.2", "react-router": "^4.1.1", "react-router-redux": "5.0.0-alpha.6", @@ -42,19 +42,19 @@ version "3.0.0" resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.0.0.tgz#c1de4293081424da3ac30c23afa850af1019bb54" -"@turf/bbox@^4.3.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-4.4.0.tgz#3149458eb41404427cf786a90fb3680a0e8aab55" +"@turf/bbox@^4.4.0": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-4.5.2.tgz#1a6c6e7d0ea03b26cbc14d46e6df408ae3ddf87a" dependencies: - "@turf/meta" "^4.4.0" + "@turf/meta" "^4.5.2" -"@turf/helpers@^4.3.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.4.0.tgz#c83112f7fbe6ed183c7c0c2f776481b94d1cbd01" +"@turf/helpers@^4.4.0": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.5.2.tgz#6fc6772a7b301f277b49732925c354c7fb85d1df" -"@turf/meta@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-4.4.0.tgz#4fa25d4cc0525bd4cdbaf4ff68a6f8ae81f1975f" +"@turf/meta@^4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-4.5.2.tgz#8450fc442d2a59494251a5a52ae520017e2dcf0d" "@types/node@^7.0.18": version "7.0.29" @@ -2606,7 +2606,7 @@ for-in@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" -for-own@^0.1.1, for-own@^0.1.4: +for-own@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" dependencies: @@ -3742,9 +3742,9 @@ mapbox-gl-supported@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mapbox-gl-supported/-/mapbox-gl-supported-1.2.0.tgz#cbd34df894206cadda9a33c8d9a4609f26bb1989" -mapbox-gl@^0.36.0: - version "0.36.0" - resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.36.0.tgz#786ec912e47827117fde12012196a0b471845a74" +mapbox-gl@^0.37.0: + version "0.37.0" + resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.37.0.tgz#20103b0ae73a0e77fe9405439749318b87c04f10" dependencies: "@mapbox/gl-matrix" "^0.0.1" "@mapbox/shelf-pack" "^3.0.0" @@ -4558,14 +4558,13 @@ react-if@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-if/-/react-if-2.2.1.tgz#b6a2a3a15d6f80fa4db43ed6d18ece6e9d12a11c" -react-mapbox-gl@^1.3.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/react-mapbox-gl/-/react-mapbox-gl-1.12.0.tgz#5f2c74533eb399d320eae36c50b9f5ab31513a60" +react-mapbox-gl@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/react-mapbox-gl/-/react-mapbox-gl-2.1.0.tgz#415937900f90f36dfa58a6873c84c7e1e3783c07" dependencies: - "@turf/bbox" "^4.3.0" - "@turf/helpers" "^4.3.0" + "@turf/bbox" "^4.4.0" + "@turf/helpers" "^4.4.0" deep-equal "^1.0.1" - reduce-object "^0.1.3" supercluster "^2.3.0" react-redux@^5.0.2: @@ -4696,12 +4695,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -reduce-object@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/reduce-object/-/reduce-object-0.1.3.tgz#d549d40a6c2936fa4e3e9b78ca89c93314594218" - dependencies: - for-own "^0.1.1" - reduce-reducers@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b" |