Merge 9607ee0 into d57b6fe

uber · Apr 6, 2019 · d4dd420 · d4dd420
2 parents d57b6fe + 9607ee0
commit d4dd420
Show file tree

Hide file tree

Showing 10 changed files with 3,117 additions and 95 deletions.
diff --git a/examples/deck/yarn.lock b/examples/deck/yarn.lock
diff --git a/modules/layers/src/mode-handlers/snappable-handler.js b/modules/layers/src/mode-handlers/snappable-handler.js
@@ -86,14 +86,14 @@ export class SnappableHandler extends ModeHandler {
         const updatedFeature = updatedData.features[selectedIndex];
 
         const { positionIndexes, featureIndex } = pickedHandle;
-        if (selectedIndex >= 0 && featureIndex !== selectedIndex) return;
-
-        const { coordinates } = updatedFeature.geometry;
-        // $FlowFixMe
-        (pickedHandle || {}).position = positionIndexes.reduce(
-          (a: any[], b: number) => a[b],
-          coordinates
-        );
+        if (selectedIndex >= 0 && featureIndex === selectedIndex) {
+          const { coordinates } = updatedFeature.geometry;
+          // $FlowFixMe
+          pickedHandle.position = positionIndexes.reduce(
+            (a: any[], b: number) => a[b],
+            coordinates
+          );
+        }
       }
     }
   }
@@ -115,7 +115,7 @@ export class SnappableHandler extends ModeHandler {
   // selected feature. If a snap handle has been picked, display said snap handle
   // along with all snappable points on all non-selected features.
   getEditHandles(picks?: Array<Object>, groundCoords?: Position): any[] {
-    const { enableSnapping } = this._modeConfig;
+    const { enableSnapping } = this._modeConfig || {};
     const handles = this._handler.getEditHandles(picks, groundCoords);
 
     if (!enableSnapping) return handles;
@@ -137,18 +137,12 @@ export class SnappableHandler extends ModeHandler {
     return handles.filter(Boolean);
   }
 
-  _shouldPerformSnap() {
-    if (!this._editHandlePicks) return false;
-    const { pickedHandle, potentialSnapHandle } = this._editHandlePicks || {};
-    return pickedHandle && potentialSnapHandle;
-  }
-
   _performSnapIfRequired() {
-    if (this._isSnapped || !this._editHandlePicks || !this._shouldPerformSnap()) return;
+    if (this._isSnapped) return;
     const { pickedHandle, potentialSnapHandle } = this._editHandlePicks || {};
-    if (!pickedHandle || !potentialSnapHandle) return;
-
-    this._isSnapped = true;
+    if (pickedHandle && potentialSnapHandle) {
+      this._isSnapped = true;
+    }
   }
 
   // Unsnapping only occurs after the user snaps two polygons but continues to drag the