Merge pull request #802 from OpenGeoscience/layer-pointer-events

Only allow pointer events on children of active layers.
OpenGeoscience · Mar 30, 2018 · 39cd0f5 · 39cd0f5
2 parents 8d47f41 + 8922fdc
commit 39cd0f5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/src/main.styl b/src/main.styl
@@ -32,7 +32,8 @@
     height 100%
     pointer-events none
     &.active
-      pointer-events auto
+      > *
+        pointer-events auto
 
   .geo-tile-layer
     transform-origin 0px 0px

diff --git a/src/sceneObject.js b/src/sceneObject.js
@@ -179,7 +179,7 @@ var sceneObject = function (arg) {
    */
   this._exit = function () {
     m_children = [];
-    delete m_this.parent;
+    m_parent = null;
     s_exit();
   };
 

diff --git a/tests/cases/annotation.js b/tests/cases/annotation.js
@@ -151,6 +151,10 @@ describe('geo.annotation', function () {
       expect(ann.layer()).toBe(layer);
     });
     it('state', function () {
+      map = createMap();
+      layer = map.createLayer('annotation', {
+        annotations: geo.listAnnotations()
+      });
       var ann = geo.annotation.annotation('test', {layer: layer});
       map.geoOn(geo.event.annotation.state, function (evt) {
         stateEvent += 1;

diff --git a/tests/cases/widget.js b/tests/cases/widget.js
@@ -249,4 +249,26 @@ describe('widget api', function () {
     domWidget._exit();
     expect($(o.uiLayer.canvas()).children().length).toBe(widgetCount - 1);
   });
+  it('widgets on two layers should both be clickable', function () {
+    var o = makeMap(),
+        offset = o.map.node().offset(),
+        uiLayer2 = o.map.createLayer('ui'),
+        clickCount = 0, clickCount2 = 0,
+        widget = o.uiLayer.createWidget('dom', {
+          position: {top: 0, left: 0, width: '20px', height: '20px'}
+        }),
+        widget2 = uiLayer2.createWidget('dom', {
+          position: {top: 0, left: 30, width: '20px', height: '20px'}
+        });
+    $(widget.canvas()).on('click', function () {
+      clickCount += 1;
+    });
+    $(widget2.canvas()).on('click', function () {
+      clickCount2 += 1;
+    });
+    document.elementFromPoint(offset.left + 10, offset.top + 10).click();
+    document.elementFromPoint(offset.left + 40, offset.top + 10).click();
+    expect(clickCount).toBe(1);
+    expect(clickCount2).toBe(1);
+  });
 });