From 59d497b481a225163d0f98fc878ed763c7c188cd Mon Sep 17 00:00:00 2001
From: samanpwbb <samanpwbb@gmail.com>
Date: Mon, 6 Jan 2020 17:30:14 -0800
Subject: [PATCH] Add option to close popup on map move

---
 src/ui/popup.js            | 18 +++++++++++++-----
 test/unit/ui/popup.test.js | 26 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/ui/popup.js b/src/ui/popup.js
index e9728f4946a..6f415c69cd4 100644
--- a/src/ui/popup.js
+++ b/src/ui/popup.js
@@ -25,6 +25,7 @@ export type Offset = number | PointLike | {[Anchor]: PointLike};
 export type PopupOptions = {
     closeButton?: boolean,
     closeOnClick?: boolean,
+    closeOnMove?: boolean,
     anchor?: Anchor,
     offset?: Offset,
     className?: string,
@@ -39,6 +40,8 @@ export type PopupOptions = {
  *   top right corner of the popup.
  * @param {boolean} [options.closeOnClick=true] If `true`, the popup will closed when the
  *   map is clicked.
+ * @param {boolean} [options.closeOnMove=false] If `true`, the popup will closed when the
+ *   map moves.
  * @param {string} [options.anchor] - A string indicating the part of the Popup that should
  *   be positioned closest to the coordinate set via {@link Popup#setLngLat}.
  *   Options are `'center'`, `'top'`, `'bottom'`, `'left'`, `'right'`, `'top-left'`,
@@ -92,7 +95,7 @@ export default class Popup extends Evented {
     constructor(options: PopupOptions) {
         super();
         this.options = extend(Object.create(defaultOptions), options);
-        bindAll(['_update', '_onClickClose', 'remove'], this);
+        bindAll(['_update', '_onClose', 'remove'], this);
     }
 
     /**
@@ -104,7 +107,11 @@ export default class Popup extends Evented {
     addTo(map: Map) {
         this._map = map;
         if (this.options.closeOnClick) {
-            this._map.on('click', this._onClickClose);
+            this._map.on('click', this._onClose);
+        }
+
+        if (this.options.closeOnMove) {
+            this._map.on('move', this._onClose);
         }
 
         this._map.on('remove', this.remove);
@@ -162,7 +169,8 @@ export default class Popup extends Evented {
 
         if (this._map) {
             this._map.off('move', this._update);
-            this._map.off('click', this._onClickClose);
+            this._map.off('move', this._onClose);
+            this._map.off('click', this._onClose);
             this._map.off('remove', this.remove);
             this._map.off('mousemove');
             delete this._map;
@@ -390,7 +398,7 @@ export default class Popup extends Evented {
             this._closeButton.type = 'button';
             this._closeButton.setAttribute('aria-label', 'Close popup');
             this._closeButton.innerHTML = '&#215;';
-            this._closeButton.addEventListener('click', this._onClickClose);
+            this._closeButton.addEventListener('click', this._onClose);
         }
 
     }
@@ -460,7 +468,7 @@ export default class Popup extends Evented {
         applyAnchorClass(this._container, anchor, 'popup');
     }
 
-    _onClickClose() {
+    _onClose() {
         this.remove();
     }
 }
diff --git a/test/unit/ui/popup.test.js b/test/unit/ui/popup.test.js
index c64b548b5ac..5de4adc716b 100644
--- a/test/unit/ui/popup.test.js
+++ b/test/unit/ui/popup.test.js
@@ -92,6 +92,32 @@ test('Popup has no close button if closeButton option is false', (t) => {
     t.end();
 });
 
+test('Popup does not close on map move events when the closeOnMove option is false', (t) => {
+    const map = createMap(t);
+    const popup = new Popup({closeOnMove: false})
+        .setText('Test')
+        .setLngLat([0, 0])
+        .addTo(map);
+
+    map.setCenter([-10, 0]); // longitude bounds: [-370, 350]
+
+    t.ok(popup.isOpen());
+    t.end();
+});
+
+test('Popup closes on map move events when the closeOnMove option is true', (t) => {
+    const map = createMap(t);
+    const popup = new Popup({closeOnMove: true})
+        .setText('Test')
+        .setLngLat([0, 0])
+        .addTo(map);
+
+    map.setCenter([-10, 0]); // longitude bounds: [-370, 350]
+
+    t.ok(!popup.isOpen());
+    t.end();
+});
+
 test('Popup fires close event when removed', (t) => {
     const map = createMap(t);
     const onClose = t.spy();