feat(mglDraggable): remove marker support

BREAKING CHANGE: Remove marker support for mglDraggable (use draggable input instead)
Wykks · Dec 13, 2020 · 7e14744 · 7e14744
1 parent 0049a1d
commit 7e14744
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/projects/ngx-mapbox-gl/src/lib/draggable/draggable.directive.ts b/projects/ngx-mapbox-gl/src/lib/draggable/draggable.directive.ts
@@ -14,7 +14,6 @@ import { fromEvent, Observable, ReplaySubject } from 'rxjs';
 import { filter, switchMap, take, takeUntil, tap } from 'rxjs/operators';
 import { LayerComponent } from '../layer/layer.component';
 import { MapService } from '../map/map.service';
-import { MarkerComponent } from '../marker/marker.component';
 import { FeatureComponent } from '../source/geojson/feature.component';
 import { deprecationWarning } from '../utils';
 
@@ -46,31 +45,17 @@ export class DraggableDirective implements OnInit, OnDestroy {
   constructor(
     private MapService: MapService,
     private NgZone: NgZone,
-    @Optional() @Host() private FeatureComponent?: FeatureComponent,
-    @Optional() @Host() private MarkerComponent?: MarkerComponent
+    @Optional() @Host() private FeatureComponent?: FeatureComponent
   ) {}
 
   ngOnInit() {
     this.warnDeprecatedOutputs();
     let enter$;
     let leave$;
     let updateCoords;
-    if (this.MarkerComponent) {
-      console.warn(
-        '[ngx-mapbox-gl] mglDraggable on Marker is deprecated, use draggable input instead'
-      );
-      let markerElement = <Element>this.MarkerComponent.content.nativeElement;
-      if (markerElement.children.length === 1) {
-        markerElement = markerElement.children[0];
-      }
-      enter$ = fromEvent(markerElement, 'mouseenter');
-      leave$ = fromEvent(markerElement, 'mouseleave');
-      updateCoords = this.MarkerComponent.updateCoordinates.bind(
-        this.MarkerComponent
-      );
-    } else if (this.FeatureComponent && this.layer) {
-      enter$ = this.layer.mouseEnter;
-      leave$ = this.layer.mouseLeave;
+    if (this.FeatureComponent && this.layer) {
+      enter$ = this.layer.layerMouseEnter;
+      leave$ = this.layer.layerMouseLeave;
       updateCoords = this.FeatureComponent.updateCoordinates.bind(
         this.FeatureComponent
       );
@@ -92,8 +77,8 @@ export class DraggableDirective implements OnInit, OnDestroy {
   }
 
   private handleDraggable(
-    enter$: Observable<any>,
-    leave$: Observable<any>,
+    enter$: Observable<MapMouseEvent>,
+    leave$: Observable<MapMouseEvent>,
     updateCoords: (coord: number[]) => void
   ) {
     let moving = false;