schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-28 18:21:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8

Browse source 
Conflicts:
	src/styles/index.scss
This commit is contained in:
orangemug 2018-04-16 15:31:27 +01:00
commit 78a7f152e7
7 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -8025,9 +8025,9 @@
} }
}, },
"mapbox-gl-inspect": { "mapbox-gl-inspect": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.0.tgz", "resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.1.tgz",
"integrity": "sha512-84qABwzuCenZz3oNF8vzqymE5dBoDhEkG5FUdPE2XFXaYabLo4lODRLReMYzeoNPn/4IJFUb9Qy3MN7lGG8CfA==", "integrity": "sha512-qkcT8lcYQy2x8wn+BUb6a6YXCEIHeGKHlt01/FSf58yYEmeufuihtbCjN9of2JDQm2XeRGdDEksAH7if7tPyyg==",
"requires": { "requires": {
"lodash.isequal": "4.5.0", "lodash.isequal": "4.5.0",
"randomcolor": "0.4.4" "randomcolor": "0.4.4"

2
package.json
View file

@ -34,7 +34,7 @@
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.44.1", "mapbox-gl": "^0.44.1",
"mapbox-gl-inspect": "^1.3.0", "mapbox-gl-inspect": "^1.3.1",
"maputnik-design": "github:maputnik/design", "maputnik-design": "github:maputnik/design",
"mousetrap": "^1.6.1", "mousetrap": "^1.6.1",
"ol-mapbox-style": "^2.10.1", "ol-mapbox-style": "^2.10.1",

2
src/components/inputs/AutocompleteInput.jsx
View file

@ -54,7 +54,7 @@ class AutocompleteInput extends React.Component {
> >
<Autocomplete <Autocomplete
menuStyle={{ menuStyle={{
position: "absolute", position: "fixed",
overflow: "auto", overflow: "auto",
maxHeight: this.state.maxHeight maxHeight: this.state.maxHeight
}} }}

4
src/components/layers/LayerEditorGroup.jsx
View file

@ -23,7 +23,9 @@ export default class LayerEditorGroup extends React.Component {
<Collapser isCollapsed={this.props.isActive} /> <Collapser isCollapsed={this.props.isActive} />
</div> </div>
<Collapse isOpened={this.props.isActive}> <Collapse isOpened={this.props.isActive}>
{this.props.children} <div className="react-collapse-container">
{this.props.children}
</div>
</Collapse> </Collapse>
</div> </div>
} }

1
src/components/map/MapboxGlMap.jsx
View file

@ -121,6 +121,7 @@ export default class MapboxGlMap extends React.Component {
showMapPopupOnHover: false, showMapPopupOnHover: false,
showInspectMapPopupOnHover: true, showInspectMapPopupOnHover: true,
showInspectButton: false, showInspectButton: false,
blockHoverPopupOnClick: true,
assignLayerColor: (layerId, alpha) => { assignLayerColor: (layerId, alpha) => {
return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string() return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string()
}, },

5
src/styles/_react-collapse.scss Normal file
View file

@ -0,0 +1,5 @@
// See <https://github.com/nkbt/react-collapse/commit/4f4fbce7c6c07b082dc62062338c9294c656f9df>
.react-collapse-container {
position: relative;
overflow: hidden;
}

1
src/styles/index.scss
View file

@ -36,6 +36,7 @@ $toolbar-offset: 0;
@import 'zoomproperty'; @import 'zoomproperty';
@import 'popup'; @import 'popup';
@import 'map'; @import 'map';
@import 'react-collapse';
/** /**
* Hacks for webdriverio isVisibleWithinViewport * Hacks for webdriverio isVisibleWithinViewport