fix(popup): do not send open/close event when moving an opened popup

fix #48
Wykks · Aug 4, 2018 · 2b6f712 · 2b6f712 · antonsimola · Aug 4, 2018
1 parent 4c49629
commit 2b6f712
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/projects/ngx-mapbox-gl/src/lib/map/map.service.ts b/projects/ngx-mapbox-gl/src/lib/map/map.service.ts
@@ -328,8 +328,11 @@ export class MapService {
     });
   }
 
-  addPopupToMap(popup: MapboxGl.Popup, lngLat: MapboxGl.LngLatLike) {
+  addPopupToMap(popup: MapboxGl.Popup, lngLat: MapboxGl.LngLatLike, skipOpenEvent = false) {
     return this.zone.runOutsideAngular(() => {
+      if (skipOpenEvent && (<any>popup)._listeners) {
+        delete (<any>popup)._listeners['open'];
+      }
       popup.setLngLat(lngLat);
       popup.addTo(this.mapInstance);
     });
@@ -341,7 +344,10 @@ export class MapService {
     });
   }
 
-  removePopupFromMap(popup: MapboxGl.Popup) {
+  removePopupFromMap(popup: MapboxGl.Popup, skipCloseEvent = false) {
+    if (skipCloseEvent && (<any>popup)._listeners) {
+      delete (<any>popup)._listeners['close'];
+    }
     this.popupsToRemove.push(popup);
   }
 

diff --git a/projects/ngx-mapbox-gl/src/lib/popup/popup.component.ts b/projects/ngx-mapbox-gl/src/lib/popup/popup.component.ts
@@ -51,9 +51,9 @@ export class PopupComponent implements OnChanges, OnDestroy, AfterViewInit, OnIn
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.lngLat && !changes.lngLat.isFirstChange()) {
-      this.MapService.removePopupFromMap(this.popupInstance!);
+      this.MapService.removePopupFromMap(this.popupInstance!, true);
       const popupInstanceTmp = this.createPopup();
-      this.MapService.addPopupToMap(popupInstanceTmp, changes.lngLat.currentValue);
+      this.MapService.addPopupToMap(popupInstanceTmp, changes.lngLat.currentValue, this.popupInstance!.isOpen());
       this.popupInstance = popupInstanceTmp;
     }
     if (changes.marker && !changes.marker.isFirstChange()) {