Fix code regression on mouse behavior (text selection) #229

maximelafarie · Jan 29, 2020 · a5b330f · a5b330f
1 parent 033952b
commit a5b330f
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/ngx-smart-modal/src/components/ngx-smart-modal.component.ts b/src/ngx-smart-modal/src/components/ngx-smart-modal.component.ts
@@ -145,23 +145,25 @@ export class NgxSmartModalComponent implements OnInit, OnDestroy, AfterViewInit
    * @param posX position X
    * @param posY position Y
    */
-  public setPosition(posX: number, posY: number) {
+  public setPosition(posX: number, posY: number): NgxSmartModalComponent {
     this.positionX = posX;
     this.positionY = posY;
+
+    return this;
   }
 
   /**
    * Moves dialog by changing top and left style of modal dialog by offset
    * @param offsetX modal's left offset
    * @param offsetY modal's top offset
    */
-  public moveDialog(offsetX: number, offsetY: number) {
-    if (!this.nsmDialog.length) {
-      return false;
+  public moveDialog(offsetX: number, offsetY: number): NgxSmartModalComponent {
+    if (this.nsmDialog.length) {
+      this.nsmDialog.last.nativeElement.style.top = (this.nsmDialog.last.nativeElement.offsetTop - offsetY) + 'px';
+      this.nsmDialog.last.nativeElement.style.left = (this.nsmDialog.last.nativeElement.offsetLeft - offsetX) + 'px';
     }
-    this.nsmDialog.last.nativeElement.style.top = (this.nsmDialog.last.nativeElement.offsetTop - offsetY) + 'px';
-    this.nsmDialog.last.nativeElement.style.left = (this.nsmDialog.last.nativeElement.offsetLeft - offsetX) + 'px';
-    return true;
+
+    return this;
   }
 
   /**
@@ -171,7 +173,7 @@ export class NgxSmartModalComponent implements OnInit, OnDestroy, AfterViewInit
   @HostListener('document:mousedown', ['$event'])
   private startDrag(e: MouseEvent) {
     if (!this.nsmContent.length || !this.draggable) {
-      return false;
+      return;
     }
 
     const src = e.srcElement as HTMLElement;
@@ -182,11 +184,9 @@ export class NgxSmartModalComponent implements OnInit, OnDestroy, AfterViewInit
         this.dragging = true;
         this.setPosition(e.clientX, e.clientY);
 
-        return true;
+        return;
       }
     }
-
-    return false;
   }
 
   /**
@@ -196,8 +196,9 @@ export class NgxSmartModalComponent implements OnInit, OnDestroy, AfterViewInit
   @HostListener('document:mousemove', ['$event'])
   private elementDrag(e: MouseEvent) {
     if (!this.dragging || !this.nsmDialog.length) {
-      return false;
+      return;
     }
+
     e.preventDefault();
 
     const offsetX = this.positionX - e.clientX;
@@ -206,8 +207,6 @@ export class NgxSmartModalComponent implements OnInit, OnDestroy, AfterViewInit
     this.moveDialog(offsetX, offsetY);
 
     this.setPosition(e.clientX, e.clientY);
-
-    return true;
   }
 
   /**