From e8b0bd4d0ad5f043d526dd91febd1bba77642095 Mon Sep 17 00:00:00 2001
From: oterral <olivier.terral@swisstopo.ch>
Date: Fri, 13 Apr 2018 14:24:39 +0200
Subject: [PATCH 1/4] Update mapbox-gl-inspect dependency

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f04a1a6..66e939af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7597,9 +7597,9 @@
       }
     },
     "mapbox-gl-inspect": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.0.tgz",
-      "integrity": "sha512-84qABwzuCenZz3oNF8vzqymE5dBoDhEkG5FUdPE2XFXaYabLo4lODRLReMYzeoNPn/4IJFUb9Qy3MN7lGG8CfA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.1.tgz",
+      "integrity": "sha512-qkcT8lcYQy2x8wn+BUb6a6YXCEIHeGKHlt01/FSf58yYEmeufuihtbCjN9of2JDQm2XeRGdDEksAH7if7tPyyg==",
       "requires": {
         "lodash.isequal": "4.5.0",
         "randomcolor": "0.4.4"
diff --git a/package.json b/package.json
index 00775c84..df6ccc44 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.throttle": "^4.1.1",
     "mapbox-gl": "^0.44.1",
-    "mapbox-gl-inspect": "^1.3.0",
+    "mapbox-gl-inspect": "^1.3.1",
     "maputnik-design": "github:maputnik/design",
     "mousetrap": "^1.6.1",
     "ol-mapbox-style": "^2.10.1",

From 044349e65f146a6b6ecc7c44d111306b22406af6 Mon Sep 17 00:00:00 2001
From: oterral <olivier.terral@swisstopo.ch>
Date: Fri, 13 Apr 2018 14:25:08 +0200
Subject: [PATCH 2/4] Block popup on click in inspect mode

---
 src/components/map/MapboxGlMap.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/map/MapboxGlMap.jsx b/src/components/map/MapboxGlMap.jsx
index 5dc4e0d0..c65410e3 100644
--- a/src/components/map/MapboxGlMap.jsx
+++ b/src/components/map/MapboxGlMap.jsx
@@ -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()
       },

From b62533fa3e053f653b611dabe6eafc8718e65d6d Mon Sep 17 00:00:00 2001
From: oterral <olivier.terral@swisstopo.ch>
Date: Fri, 13 Apr 2018 15:55:16 +0200
Subject: [PATCH 3/4] Use a fixed position for autocomplete menu

---
 src/components/inputs/AutocompleteInput.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/inputs/AutocompleteInput.jsx b/src/components/inputs/AutocompleteInput.jsx
index a81ab513..a633e60d 100644
--- a/src/components/inputs/AutocompleteInput.jsx
+++ b/src/components/inputs/AutocompleteInput.jsx
@@ -54,7 +54,7 @@ class AutocompleteInput extends React.Component {
     >
       <Autocomplete
         menuStyle={{
-          position: "absolute",
+          position: "fixed",
           overflow: "auto",
           maxHeight: this.state.maxHeight
         }}

From 9808d44c7107c47f418d04462e6c21ee06b7b159 Mon Sep 17 00:00:00 2001
From: orangemug <info@orangemug.co.uk>
Date: Fri, 13 Apr 2018 17:00:51 +0100
Subject: [PATCH 4/4] Fix to allow layers sections to expand smoothly. Fixes
 #244

---
 src/components/layers/LayerEditorGroup.jsx | 4 +++-
 src/styles/_react-collapse.scss            | 5 +++++
 src/styles/index.scss                      | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 src/styles/_react-collapse.scss

diff --git a/src/components/layers/LayerEditorGroup.jsx b/src/components/layers/LayerEditorGroup.jsx
index 7c82fc1c..0a803e05 100644
--- a/src/components/layers/LayerEditorGroup.jsx
+++ b/src/components/layers/LayerEditorGroup.jsx
@@ -21,7 +21,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>
   }
diff --git a/src/styles/_react-collapse.scss b/src/styles/_react-collapse.scss
new file mode 100644
index 00000000..a58dddeb
--- /dev/null
+++ b/src/styles/_react-collapse.scss
@@ -0,0 +1,5 @@
+// See <https://github.com/nkbt/react-collapse/commit/4f4fbce7c6c07b082dc62062338c9294c656f9df>
+.react-collapse-container {
+  position: relative;
+  overflow: hidden;
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 1472bf67..64f4be9b 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -36,3 +36,4 @@ $toolbar-offset: 0;
 @import 'zoomproperty';
 @import 'popup';
 @import 'map';
+@import 'react-collapse';