fix: fix drag style

worktile · Aug 2, 2023 · 1d3312d · 1d3312d
1 parent 466b9c2
commit 1d3312d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/packages/gantt/src/components/bar/bar-drag.ts b/packages/gantt/src/components/bar/bar-drag.ts
@@ -128,9 +128,7 @@ export class GanttBarDrag implements OnDestroy {
                         });
                     }
                 } else {
-                    if (!this.dragContainer.draggingItem) {
-                        this.barElement.classList.add(activeClass);
-                    }
+                    this.barElement.classList.add(activeClass);
                 }
             });
 
@@ -161,7 +159,7 @@ export class GanttBarDrag implements OnDestroy {
                     this.barDragMove();
                 }
             });
-            this.dragContainer.emitDragStarted(this.item.origin);
+            this.dragContainer.dragStarted.emit({ item: this.item.origin });
         });
 
         dragRef.moved.subscribe((event) => {
@@ -185,7 +183,7 @@ export class GanttBarDrag implements OnDestroy {
                 x: this.ganttUpper.view.getXPointByDate(this.item.start),
                 y: (this.ganttUpper.styles.lineHeight - this.ganttUpper.styles.barHeight) / 2 - 1
             });
-            this.dragContainer.emitDragEnded(this.item.origin);
+            this.dragContainer.dragEnded.emit({ item: this.item.origin });
         });
         this.barDragRef = dragRef;
 
@@ -221,7 +219,7 @@ export class GanttBarDrag implements OnDestroy {
                         }
                     }
                 });
-                this.dragContainer.emitDragStarted(this.item.origin);
+                this.dragContainer.dragStarted.emit({ item: this.item.origin });
             });
 
             dragRef.moved.subscribe((event) => {
@@ -251,7 +249,7 @@ export class GanttBarDrag implements OnDestroy {
                     x: this.ganttUpper.view.getXPointByDate(this.item.start),
                     y: (this.ganttUpper.styles.lineHeight - this.ganttUpper.styles.barHeight) / 2 - 1
                 });
-                this.dragContainer.emitDragEnded(this.item.origin);
+                this.dragContainer.dragEnded.emit({ item: this.item.origin });
             });
             dragRefs.push(dragRef);
         });
@@ -350,12 +348,10 @@ export class GanttBarDrag implements OnDestroy {
     }
 
     private setDraggingStyles() {
-        this.barElement.style.pointerEvents = 'none';
         this.barElement.classList.add('gantt-bar-draggable-drag');
     }
 
     private clearDraggingStyles() {
-        this.barElement.style.pointerEvents = '';
         this.barElement.classList.remove('gantt-bar-draggable-drag');
     }
 

diff --git a/packages/gantt/src/components/bar/bar.component.ts b/packages/gantt/src/components/bar/bar.component.ts
@@ -55,7 +55,11 @@ export class NgxGanttBarComponent extends GanttItemUpper implements OnInit, Afte
 
     override ngOnInit() {
         super.ngOnInit();
+        this.dragContainer.dragStarted.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
+            this.elementRef.nativeElement.style.pointerEvents = 'none';
+        });
         this.dragContainer.dragEnded.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
+            this.elementRef.nativeElement.style.pointerEvents = '';
             this.setContentBackground();
         });
     }

diff --git a/packages/gantt/src/gantt-drag-container.ts b/packages/gantt/src/gantt-drag-container.ts
@@ -1,7 +1,7 @@
 import { Injectable, EventEmitter, Inject } from '@angular/core';
 import { GanttLinkType } from './class';
 import { GanttDragEvent, GanttLinkDragEvent } from './class/event';
-import { GanttItem, GanttItemInternal } from './class/item';
+import { GanttItemInternal } from './class/item';
 import { GanttUpper, GANTT_UPPER_TOKEN } from './gantt-upper';
 
 function getDependencyType(path: LinkDragPath, dependencyTypes: GanttLinkType[]): GanttLinkType {
@@ -47,24 +47,12 @@ export class GanttDragContainer {
 
     linkDragEnded = new EventEmitter<GanttLinkDragEvent>();
 
-    draggingItem: GanttItem;
-
     linkDraggingId: string;
 
     linkDragPath: LinkDragPath = { from: null, to: null };
 
     constructor(@Inject(GANTT_UPPER_TOKEN) public ganttUpper: GanttUpper) {}
 
-    emitDragStarted(item: GanttItem) {
-        this.draggingItem = item;
-        this.dragStarted.emit({ item });
-    }
-
-    emitDragEnded(item: GanttItem) {
-        this.draggingItem = null;
-        this.dragEnded.emit({ item });
-    }
-
     emitLinkDragStarted(from: LinkDragPosition) {
         this.linkDraggingId = from.item.id;
         this.linkDragPath.from = from;