From 598053d254c605e7ac8e9edb447202d24d26fb73 Mon Sep 17 00:00:00 2001
From: Alex <alex.kingman@blackbaud.com>
Date: Thu, 25 Oct 2018 14:06:13 -0400
Subject: [PATCH] Fixed tile dashboard drag handle to work with handle icon.
 (#9)

---
 .../tile-dashboard.service.spec.ts             | 18 ++++++++++--------
 .../tile-dashboard/tile-dashboard.service.ts   |  3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.spec.ts b/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.spec.ts
index 794827c..8c2f06c 100644
--- a/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.spec.ts
+++ b/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.spec.ts
@@ -256,17 +256,19 @@ describe('Tile dashboard service', () => {
       })
   );
 
-  it('should set the tile\'s grab handle as the drag handle', () => {
+  it('should set the tile\'s grab handle as the drag handle', fakeAsync(() => {
+    let fixture = createDashboardTestComponent();
+    fixture.detectChanges();
+    tick();
+    fixture.detectChanges();
+    let tile: Element = fixture.nativeElement.querySelector('div.sky-test-tile-1');
+    let handle: Element = tile.querySelector('.sky-tile-grab-handle i');
     let setOptionsSpy = spyOn(mockDragulaService, 'setOptions').and.callFake(
       (bagId: any, options: any) => {
         let result = options.moves(
+          tile,
           undefined,
-          undefined,
-          {
-            matches: (cls: string) => {
-              return cls === '.sky-tile-grab-handle';
-            }
-          }
+          handle
         );
 
         expect(result).toBe(true);
@@ -281,7 +283,7 @@ describe('Tile dashboard service', () => {
     }());
 
     expect(setOptionsSpy).toHaveBeenCalled();
-  });
+  }));
 
   function testIntercolumnNavigation(fixture: ComponentFixture<TileDashboardTestComponent>, keyName: string) {
     let handle: HTMLElement = fixture.nativeElement.querySelector('div.sky-test-tile-1 .sky-tile-grab-handle');
diff --git a/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.ts b/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.ts
index cca7954..f0ee377 100644
--- a/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.ts
+++ b/src/app/public/modules/tiles/tile-dashboard/tile-dashboard.service.ts
@@ -416,7 +416,8 @@ export class SkyTileDashboardService {
   private initDragula() {
     this.dragulaService.setOptions(this.bagId, {
       moves: (el: HTMLElement, container: HTMLElement, handle: HTMLElement) => {
-        return handle.matches('.sky-tile-grab-handle');
+        const target = el.querySelector('.sky-tile-grab-handle');
+        return target.contains(handle);
       }
     });