Merge a88c365 into 9c0e965

uber · Aug 20, 2019 · ed87e7a · ed87e7a
2 parents 9c0e965 + a88c365
commit ed87e7a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/modules/react-map-gl-draw/package.json b/modules/react-map-gl-draw/package.json
@@ -47,5 +47,8 @@
     "react": "^16.x",
     "react-dom": "^16.x",
     "react-map-gl": "^5.x"
+  },
+  "resolutions": {
+    "@turf/difference": "6.0.1"
   }
 }
diff --git a/modules/react-map-gl-draw/src/mode-handler.js b/modules/react-map-gl-draw/src/mode-handler.js
@@ -71,6 +71,7 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
   constructor() {
     super();
     this.state = defaultState;
+    this._eventsRegistered = false;
 
     this._events = {
       anyclick: evt => this._onEvent(this._onClick, evt, true),
@@ -88,11 +89,11 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
     if (this.props.mode !== nextProps.mode) {
       this._clearEditingState();
 
-      if (nextProps.mode === MODES.READ_ONLY) {
+      if (this._eventsRegistered && (!nextProps.mode || nextProps.mode === MODES.READ_ONLY)) {
         this._degregisterEvents();
       }
 
-      if (this.props.mode === MODES.READ_ONLY && nextProps.mode) {
+      if (!this._eventsRegistered && nextProps.mode && nextProps.mode !== MODES.READ_ONLY) {
         this._registerEvents();
       }
 
@@ -122,6 +123,7 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
       const selectedFeatureIndex =
         features && features.findIndex(f => f.properties.id === nextProps.selectedFeatureId);
       this.setState({
+        selectedFeatureId: nextProps.selectedFeatureId,
         selectedFeatureIndex: isNumeric(selectedFeatureIndex) ? selectedFeatureIndex : null
       });
     }
@@ -132,6 +134,7 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
   }
 
   _events: any;
+  _eventsRegistered: boolean;
   _modeHandler: any;
   _context: ?MapContext;
   _containerRef: ?HTMLElement;
@@ -227,6 +230,7 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
       return;
     }
     eventManager.off(this._events);
+    this._eventsRegistered = false;
   };
 
   _registerEvents = () => {
@@ -236,6 +240,7 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
       return;
     }
     eventManager.on(this._events, ref);
+    this._eventsRegistered = true;
   };
 
   _onEvent = (handler: Function, evt: MjolnirEvent, stopPropagation: boolean) => {
@@ -261,8 +266,8 @@ export default class ModeHandler extends Component<EditorProps, EditorState> {
         });
       } else if (this.state.selectedFeatureId) {
         onSelect({
-          selectedFeatureId: null,
-          selectedFeatureIndex: null
+          selectedFeatureIndex: null,
+          selectedFeatureId: null
         });
       }
     }