use offsetX & offsetY instead of x & y to get relative positions (#445)

* use offsetX & offsetY instead of x & y to get relative positions * drop event if sanity check fails
visgl · Mar 22, 2017 · 5fefcf3 · 5fefcf3
1 parent 2248cd2
commit 5fefcf3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/react/deckgl.js b/src/react/deckgl.js
@@ -119,7 +119,11 @@ export default class DeckGL extends React.Component {
 
   // Route events to layers
   _onClick(event) {
-    const {x, y} = event;
+    // use offsetX|Y for relative position to the container, drop event if falsy
+    if (!event || !event.event || !Number.isFinite(event.event.offsetX)) {
+      return;
+    }
+    const {event: {offsetX: x, offsetY: y}} = event;
     const selectedInfos = this.layerManager.pickLayer({x, y, mode: 'click'});
     if (selectedInfos.length) {
       const firstInfo = selectedInfos.find(info => info.index >= 0);
@@ -130,7 +134,10 @@ export default class DeckGL extends React.Component {
 
   // Route events to layers
   _onMouseMove(event) {
-    const {x, y} = event;
+    if (!event || !event.event || !Number.isFinite(event.event.offsetX)) {
+      return;
+    }
+    const {event: {offsetX: x, offsetY: y}} = event;
     const selectedInfos = this.layerManager.pickLayer({x, y, mode: 'hover'});
     if (selectedInfos.length) {
       const firstInfo = selectedInfos.find(info => info.index >= 0);