From 647a0932af45ce10a7ecd400bf4210646fcdefb8 Mon Sep 17 00:00:00 2001
From: Martin Pettersson <martin_pettersson@outlook.com>
Date: Wed, 14 Feb 2024 02:03:06 +0100
Subject: [PATCH] Use provided browsing context

---
 src/MapInteraction.jsx      | 22 ++++++++++++----------
 src/MapInteraction.test.jsx | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/MapInteraction.jsx b/src/MapInteraction.jsx
index ca726eb..4aadd90 100644
--- a/src/MapInteraction.jsx
+++ b/src/MapInteraction.jsx
@@ -45,7 +45,8 @@ export class MapInteractionControlled extends Component {
       btnClass: PropTypes.string,
       plusBtnClass: PropTypes.string,
       minusBtnClass: PropTypes.string,
-      controlsClass: PropTypes.string
+      controlsClass: PropTypes.string,
+      browsingContext: PropTypes.object
     };
   }
 
@@ -56,7 +57,8 @@ export class MapInteractionControlled extends Component {
       showControls: false,
       translationBounds: {},
       disableZoom: false,
-      disablePan: false
+      disablePan: false,
+      browsingContext: window
     };
   }
 
@@ -95,13 +97,13 @@ export class MapInteractionControlled extends Component {
     this.getContainerNode().addEventListener('mousedown', this.onMouseDown, passiveOption);
 
     // move gesture
-    window.addEventListener('touchmove', this.onTouchMove, passiveOption);
-    window.addEventListener('mousemove', this.onMouseMove, passiveOption);
+    this.props.browsingContext.addEventListener('touchmove', this.onTouchMove, passiveOption);
+    this.props.browsingContext.addEventListener('mousemove', this.onMouseMove, passiveOption);
 
     // end gesture
     const touchAndMouseEndOptions = { capture: true, ...passiveOption };
-    window.addEventListener('touchend', this.onTouchEnd, touchAndMouseEndOptions);
-    window.addEventListener('mouseup', this.onMouseUp, touchAndMouseEndOptions);
+    this.props.browsingContext.addEventListener('touchend', this.onTouchEnd, touchAndMouseEndOptions);
+    this.props.browsingContext.addEventListener('mouseup', this.onMouseUp, touchAndMouseEndOptions);
 
   }
 
@@ -110,13 +112,13 @@ export class MapInteractionControlled extends Component {
 
     // Remove touch events
     this.getContainerNode().removeEventListener('touchstart', this.onTouchStart);
-    window.removeEventListener('touchmove', this.onTouchMove);
-    window.removeEventListener('touchend', this.onTouchEnd);
+    this.props.browsingContext.removeEventListener('touchmove', this.onTouchMove);
+    this.props.browsingContext.removeEventListener('touchend', this.onTouchEnd);
 
     // Remove mouse events
     this.getContainerNode().removeEventListener('mousedown', this.onMouseDown);
-    window.removeEventListener('mousemove', this.onMouseMove);
-    window.removeEventListener('mouseup', this.onMouseUp);
+    this.props.browsingContext.removeEventListener('mousemove', this.onMouseMove);
+    this.props.browsingContext.removeEventListener('mouseup', this.onMouseUp);
   }
 
   /*
diff --git a/src/MapInteraction.test.jsx b/src/MapInteraction.test.jsx
index 65a83cc..971867f 100644
--- a/src/MapInteraction.test.jsx
+++ b/src/MapInteraction.test.jsx
@@ -225,4 +225,27 @@ describe("MapInteraction", () => {
       expect(rmiInner.props().value).to.deep.equal({ scale: 1, translation: { x: 0, y: 0 } });
     });
   });
+
+  it("uses provided browsing context", () => {
+    const browsingContext = sinon.spy({addEventListener() {}, removeEventListener() {}});
+
+    wrapper = mount(<MapInteraction browsingContext={browsingContext}/>);
+
+    expect(browsingContext.addEventListener.callCount).to.equal(4);
+    expect(browsingContext.addEventListener.calledWith("touchmove")).to.be.true;
+    expect(browsingContext.addEventListener.calledWith("mousemove")).to.be.true;
+    expect(browsingContext.addEventListener.calledWith("touchend")).to.be.true;
+    expect(browsingContext.addEventListener.calledWith("mouseup")).to.be.true;
+
+    wrapper.unmount();
+
+    expect(browsingContext.removeEventListener.callCount).to.equal(4);
+    expect(browsingContext.removeEventListener.calledWith("touchmove")).to.be.true;
+    expect(browsingContext.removeEventListener.calledWith("mousemove")).to.be.true;
+    expect(browsingContext.removeEventListener.calledWith("touchend")).to.be.true;
+    expect(browsingContext.removeEventListener.calledWith("mouseup")).to.be.true;
+
+    // re-mount the component to avoid error in afterEach hook when attempting to umount
+    wrapper = mount(<MapInteraction/>);
+  });
 });