fix(asyncpipe): support async pipe

nivekcode · Apr 25, 2019 · 0db7f1e · 0db7f1e
1 parent daa80b3
commit 0db7f1e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/projects/ng-sortgrid/src/lib/ngsg-item.directive.ts b/projects/ng-sortgrid/src/lib/ngsg-item.directive.ts
@@ -5,9 +5,9 @@ import {
   EventEmitter,
   HostListener,
   Input,
-  NgZone, OnDestroy,
+  NgZone, OnChanges, OnDestroy,
   OnInit,
-  Output
+  Output, SimpleChanges
 } from '@angular/core';
 
 import {NgsgReflectService} from './ngsg-reflect.service';
@@ -19,11 +19,12 @@ import {NgsgElementsHelper} from './ngsg-elements.helper';
 import {NgsgEventsService} from './ngsg-events.service';
 import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
+import {group} from '@angular/animations';
 
 const selector = '[ngSortgridItem]';
 
 @Directive({selector})
-export class NgsgItemDirective implements OnInit, AfterViewInit, OnDestroy {
+export class NgsgItemDirective implements OnInit, OnChanges, AfterViewInit, OnDestroy {
   @Input() ngSortGridGroup = 'defaultGroup';
   @Input() ngSortGridItems;
 
@@ -43,16 +44,22 @@ export class NgsgItemDirective implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    if (!this.ngSortGridItems) {
-      console.warn(`Ng-sortgrid: No items provided - please use [sortGridItems] to pass in an array of items -
-      otherwhise the ordered items will not be emitted in the (sorted) event`);
-    }
-    this.ngsgStore.initState(this.ngSortGridGroup, this.ngSortGridItems, {});
     this.ngsgEventService.dropped$.pipe(
       takeUntil(this.destroy$)
     ).subscribe(() => this.selected = false);
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    const sortGridItemChanges = changes.ngSortGridItems;
+    const sortGridItems = sortGridItemChanges.currentValue ? sortGridItemChanges.currentValue : [];
+
+    if (!this.ngsgStore.hasGroup(this.ngSortGridGroup)) {
+      this.ngsgStore.initState(this.ngSortGridGroup, sortGridItems);
+      return;
+    }
+    this.ngsgStore.setItems(this.ngSortGridGroup, sortGridItems);
+  }
+
   ngAfterViewInit(): void {
     this.el.nativeElement.draggable = true;
   }
@@ -94,6 +101,13 @@ export class NgsgItemDirective implements OnInit, AfterViewInit, OnDestroy {
     if (!this.ngsgStore.hasSelectedItems(this.ngSortGridGroup)) {
       return;
     }
+
+    if (!this.ngsgStore.hasItems(this.ngSortGridGroup)) {
+      console.warn(`Ng-sortgrid: No items provided - please use [sortGridItems] to pass in an array of items -
+      otherwhise the ordered items can not be emitted in the (sorted) event`);
+      return;
+    }
+
     this.sortService.endSort();
     const element = !this.occuredOnHost(event) ? NgsgElementsHelper.findHost(event.target, selector) : event.target;
     const reflectedChanges = this.reflectService.reflectChanges(this.ngSortGridGroup, element);

diff --git a/projects/ng-sortgrid/src/lib/ngsg-store.service.ts b/projects/ng-sortgrid/src/lib/ngsg-store.service.ts
@@ -29,13 +29,22 @@ export class NgsgStoreService {
   }
 
   public setItems(group: string, items: any): void {
+    console.log('Items', items);
     this.state.get(group).items = [...items];
   }
 
   public getItems(group: string): any[] {
     return this.state.get(group).items;
   }
 
+  public hasItems(group: string): boolean {
+    return this.getItems(group).length > 0;
+  }
+
+  public hasGroup(group: string): boolean {
+    return this.state.has(group);
+  }
+
   public getSelectedItems(group: string): NgsgDragelement[] {
     return this.state.get(group).selectedItems;
   }