From 7bd36cc3d9cbe940fd39406764d03a3878cf93bf Mon Sep 17 00:00:00 2001
From: Cam Manderson <cam@alpaca.travel>
Date: Mon, 12 Nov 2018 14:53:10 +1100
Subject: [PATCH] Updates the lifecycle to match the required 16.6

---
 package.json       |  6 +++---
 src/map-events.jsx |  4 ++--
 src/map.jsx        | 12 ++++++------
 yarn.lock          |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index b81052b..a744eea 100644
--- a/package.json
+++ b/package.json
@@ -31,9 +31,9 @@
     "element-resize-event": "^2.0.9",
     "lodash.has": "^4.5.2",
     "lodash.isequal": "^4.5.0",
-    "prop-types": "^15.6.2",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0"
+    "react": "^16.6.1",
+    "react-dom": "^16.6.1",
+    "prop-types": "^15.6.2"
   },
   "peerDependencies": {
     "mapbox-gl": "^0.51.0"
diff --git a/src/map-events.jsx b/src/map-events.jsx
index 0d8464f..eca5f82 100644
--- a/src/map-events.jsx
+++ b/src/map-events.jsx
@@ -7,8 +7,8 @@ class MapEvents extends React.Component {
     this._updateListeners({}, this.props);
   }
 
-  componentDidUpdate(nextProps) {
-    this._updateListeners(this.props, nextProps);
+  componentDidUpdate(prevProps) {
+    this._updateListeners(prevProps, this.props);
   }
 
   componentWillUnmount() {
diff --git a/src/map.jsx b/src/map.jsx
index 1f26e93..c4f9723 100644
--- a/src/map.jsx
+++ b/src/map.jsx
@@ -118,12 +118,12 @@ class Map extends React.Component {
     addResizeListener(this.container, this._resizedContainer);
   }
 
-  componentWillReceiveProps(nextProps) {
-    this._updateConvenienceHandlers(this.props, nextProps);
-    this._updateStyle(this.props.mapStyle, nextProps.mapStyle);
-    this._updateMapOptions(this.props, nextProps);
-    this._updateMapViewport(this.props, nextProps);
-    this._updateFeatureState(this.props, nextProps);
+  componentDidUpdate(prevProps) {
+    this._updateConvenienceHandlers(prevProps, this.props);
+    this._updateStyle(prevProps.mapStyle, this.props.mapStyle);
+    this._updateMapOptions(prevProps, this.props);
+    this._updateMapViewport(prevProps, this.props);
+    this._updateFeatureState(prevProps, this.props);
   }
 
   componentWillUnmount() {
diff --git a/yarn.lock b/yarn.lock
index e5f6e71..25e5c64 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3766,7 +3766,7 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^16.2.0:
+react-dom@^16.6.1:
   version "16.6.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.1.tgz#5476e08694ae504ae385a28b62ecc4fe3a29add9"
   dependencies:
@@ -3775,7 +3775,7 @@ react-dom@^16.2.0:
     prop-types "^15.6.2"
     scheduler "^0.11.0"
 
-react@^16.2.0:
+react@^16.6.1:
   version "16.6.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.6.1.tgz#ee2aef4f0a09e494594882029821049772f915fe"
   dependencies: