mirror of
https://github.com/maputnik/editor.git
synced 2025-12-25 23:50:02 +00:00
Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8
Conflicts: src/styles/index.scss
This commit is contained in:
@@ -54,7 +54,7 @@ class AutocompleteInput extends React.Component {
|
||||
>
|
||||
<Autocomplete
|
||||
menuStyle={{
|
||||
position: "absolute",
|
||||
position: "fixed",
|
||||
overflow: "auto",
|
||||
maxHeight: this.state.maxHeight
|
||||
}}
|
||||
|
||||
@@ -23,7 +23,9 @@ export default class LayerEditorGroup extends React.Component {
|
||||
<Collapser isCollapsed={this.props.isActive} />
|
||||
</div>
|
||||
<Collapse isOpened={this.props.isActive}>
|
||||
{this.props.children}
|
||||
<div className="react-collapse-container">
|
||||
{this.props.children}
|
||||
</div>
|
||||
</Collapse>
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -121,6 +121,7 @@ export default class MapboxGlMap extends React.Component {
|
||||
showMapPopupOnHover: false,
|
||||
showInspectMapPopupOnHover: true,
|
||||
showInspectButton: false,
|
||||
blockHoverPopupOnClick: true,
|
||||
assignLayerColor: (layerId, alpha) => {
|
||||
return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string()
|
||||
},
|
||||
|
||||
5
src/styles/_react-collapse.scss
Normal file
5
src/styles/_react-collapse.scss
Normal file
@@ -0,0 +1,5 @@
|
||||
// See <https://github.com/nkbt/react-collapse/commit/4f4fbce7c6c07b082dc62062338c9294c656f9df>
|
||||
.react-collapse-container {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
@@ -36,6 +36,7 @@ $toolbar-offset: 0;
|
||||
@import 'zoomproperty';
|
||||
@import 'popup';
|
||||
@import 'map';
|
||||
@import 'react-collapse';
|
||||
|
||||
/**
|
||||
* Hacks for webdriverio isVisibleWithinViewport
|
||||
|
||||
Reference in New Issue
Block a user