Merge branch '2573-preventDefaultAction' of https://github.com/ProjectMirador/mirador

__tests__/src/components/OpenSeadragonViewer.test.js

@@ -167,11 +167,11 @@ describe('OpenSeadragonViewer', () => {
     let panTo;
     let zoomTo;
     let addHandler;
+
     beforeEach(() => {
       panTo = jest.fn();
       zoomTo = jest.fn();
       addHandler = jest.fn();
-
       wrapper = shallow(
         <OpenSeadragonViewer
           tileSources={[{ '@id': 'http://foo' }]}
@@ -223,6 +223,20 @@ describe('OpenSeadragonViewer', () => {
       wrapper.instance().componentDidMount();
       expect(addHandler).toHaveBeenCalledWith('update-viewport', expect.anything());
     });
+
+    it('sets up a listener on canvas-click', () => {
+      wrapper.instance().componentDidMount();
+      expect(addHandler).toHaveBeenNthCalledWith(5, 'canvas-click', OpenSeadragonViewer.onCanvasClick);
+    });
+  });
+
+  describe('onCanvasClick', () => {
+    it('sets preventDefaultAction', () => {
+      const event = { preventDefaultAction: () => {} };
+      jest.spyOn(event, 'preventDefaultAction');
+      OpenSeadragonViewer.onCanvasClick(event);
+      expect(event.preventDefaultAction).toBe(true);
+    });
   });
 
   describe('componentDidUpdate', () => {

src/components/OpenSeadragonViewer.js

@@ -34,6 +34,14 @@ export class OpenSeadragonViewer extends Component {
     });
   }
 
+  /**
+   *
+   * @param e
+   */
+  static onCanvasClick(e) {
+    e.preventDefaultAction = true;
+  }
+
   /**
    * @param {Object} props
    */
@@ -80,7 +88,7 @@ export class OpenSeadragonViewer extends Component {
     this.viewer.addHandler('animation-finish', () => {
       this.osdUpdating = false;
     });
-
+    this.viewer.addHandler('canvas-click', OpenSeadragonViewer.onCanvasClick);
     if (viewer) {
       this.viewer.viewport.panTo(viewer, true);
       this.viewer.viewport.zoomTo(viewer.zoom, viewer, true);