Merge pull request swiety85#69 from swiety85/bug-with-drag-enter-of-item-prototype-#64

swiety85 · web-flow · commit 707458e37bef · 2017-07-13T22:40:49.000+02:00
Bug with drag enter of item prototype swiety85#64
diff --git a/demo/src/app/gridster/gridster-prototype/gridster-prototype.service.ts b/demo/src/app/gridster/gridster-prototype/gridster-prototype.service.ts
@@ -71,12 +71,15 @@ export class GridsterPrototypeService {
                 };
             });
 
-        const dragExt = Observable.concat(Observable.of({
-                item: null,
-                isOver: false,
-                isDrop: false
-        }), Observable.merge(over, drop))
+        const dragExt = Observable.merge(
+                // dragStartSubject is connected in case when item prototype is placed above gridster
+                // and drag enter is not fired
+                this.dragStartSubject.map(() => ({ item: null, isOver: false, isDrop: false })),
+                over,
+                drop
+            )
             .scan((prev: any, next: any) => {
+
                 return {
                     item: next.item,
                     isOver: next.isOver,
diff --git a/src/gridster-prototype/gridster-prototype.service.ts b/src/gridster-prototype/gridster-prototype.service.ts
@@ -71,12 +71,15 @@ export class GridsterPrototypeService {
                 };
             });
 
-        const dragExt = Observable.concat(Observable.of({
-                item: null,
-                isOver: false,
-                isDrop: false
-        }), Observable.merge(over, drop))
+        const dragExt = Observable.merge(
+                // dragStartSubject is connected in case when item prototype is placed above gridster
+                // and drag enter is not fired
+                this.dragStartSubject.map(() => ({ item: null, isOver: false, isDrop: false })),
+                over,
+                drop
+            )
             .scan((prev: any, next: any) => {
+
                 return {
                     item: next.item,
                     isOver: next.isOver,
