Remove double click handlers from nebula layers and edit-modes (#410)

uber · Jun 5, 2020 · 95e8b94 · 95e8b94
1 parent 34d72a9
commit 95e8b94
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 40 deletions.
diff --git a/examples/advanced/src/example.tsx b/examples/advanced/src/example.tsx
@@ -1021,8 +1021,7 @@ export default class Example extends React.Component<
               id: 'basemap',
               controller: {
                 type: MapController,
-                // @ts-ignore
-                doubleClickZoom: this.state.mode === 'view' && !this.state.selectionTool,
+                doubleClickZoom: false,
               },
             }),
           ]}

diff --git a/modules/edit-modes/src/index.ts b/modules/edit-modes/src/index.ts
@@ -49,7 +49,6 @@ export type {
   StartDraggingEvent,
   StopDraggingEvent,
   DraggingEvent,
-  DoubleClickEvent,
   ModeProps,
   GuideFeatureCollection,
   Viewport,

diff --git a/modules/edit-modes/src/types.ts b/modules/edit-modes/src/types.ts
@@ -36,12 +36,6 @@ export type BasePointerEvent = {
 // Represents a click event
 export type ClickEvent = BasePointerEvent;
 
-// Represents a double-click event
-export type DoubleClickEvent = {
-  mapCoords: Position;
-  sourceEvent: any;
-};
-
 // Represents an event that occurs when the pointer goes down and the cursor starts moving
 export type StartDraggingEvent = BasePointerEvent & {
   pointerDownPicks?: Pick[] | null | undefined;

diff --git a/modules/layers/src/event-types.ts b/modules/layers/src/event-types.ts
@@ -15,11 +15,6 @@ export type ClickEvent = {
   sourceEvent: any;
 };
 
-export type DoubleClickEvent = {
-  groundCoords: Position;
-  sourceEvent: any;
-};
-
 export type StartDraggingEvent = {
   picks: DeckGLPick[];
   screenCoords: Position;

diff --git a/modules/layers/src/layers/editable-layer.ts b/modules/layers/src/layers/editable-layer.ts
@@ -7,10 +7,9 @@ import {
   StopDraggingEvent,
   DraggingEvent,
   PointerMoveEvent,
-  DoubleClickEvent,
 } from '@nebula.gl/edit-modes';
 
-const EVENT_TYPES = ['anyclick', 'pointermove', 'panstart', 'panmove', 'panend', 'dblclick'];
+const EVENT_TYPES = ['anyclick', 'pointermove', 'panstart', 'panmove', 'panend'];
 
 export default class EditableLayer extends CompositeLayer<any> {
   static layerName = 'EditableLayer';
@@ -19,10 +18,6 @@ export default class EditableLayer extends CompositeLayer<any> {
     // default implementation - do nothing
   }
 
-  onDoubleClick(event: DoubleClickEvent) {
-    // default implementation - do nothing
-  }
-
   onStartDragging(event: StartDraggingEvent) {
     // default implementation - do nothing
   }
@@ -35,7 +30,9 @@ export default class EditableLayer extends CompositeLayer<any> {
     // default implementation - do nothing
   }
 
-  onPointerMove(event: PointerMoveEvent) {} // default implementation - do nothing
+  onPointerMove(event: PointerMoveEvent) {
+    // default implementation - do nothing
+  }
   // TODO: implement onCancelDragging (e.g. drag off screen)
 
   initializeState() {
@@ -113,21 +110,6 @@ export default class EditableLayer extends CompositeLayer<any> {
     });
   }
 
-  _ondblclick({ srcEvent }: any) {
-    const screenCoords = this.getScreenCoords(srcEvent);
-    const mapCoords = this.getMapCoords(screenCoords);
-    // @ts-ignore
-    const picks = this.getPicks(screenCoords);
-
-    this.onDoubleClick({
-      mapCoords,
-      // @ts-ignore
-      screenCoords,
-      picks,
-      sourceEvent: srcEvent,
-    });
-  }
-
   _onpanstart(event: any) {
     const screenCoords = this.getScreenCoords(event.srcEvent);
     const mapCoords = this.getMapCoords(screenCoords);

diff --git a/modules/main/src/lib/nebula.ts b/modules/main/src/lib/nebula.ts
@@ -15,15 +15,15 @@ export default class Nebula {
     this.props = props;
     this.wmViewport = new WebMercatorViewport(this.props.viewport);
 
-    // TODO: Properly use pointer events: ['click', 'dblclick', 'pointermove', 'pointerup', 'pointerdown']
-    ['click', 'dblclick', 'mousemove', 'mouseup', 'mousedown'].forEach((name) =>
+    // TODO: Properly use pointer events: ['click', 'pointermove', 'pointerup', 'pointerdown']
+    ['click', 'mousemove', 'mouseup', 'mousedown'].forEach((name) =>
       document.addEventListener(name, this._onMouseEvent, true)
     );
   }
 
   detach() {
-    // TODO: Properly use pointer events: ['click', 'dblclick', 'pointermove', 'pointerup', 'pointerdown']
-    ['click', 'dblclick', 'mousemove', 'mouseup', 'mousedown'].forEach((name) =>
+    // TODO: Properly use pointer events: ['click', 'pointermove', 'pointerup', 'pointerdown']
+    ['click', 'mousemove', 'mouseup', 'mousedown'].forEach((name) =>
       document.removeEventListener(name, this._onMouseEvent, true)
     );
   }