Merge branch '9.0.x' into dmdimitrov/issue7343-9.0.x

Author: rkaraivanov

projects/igniteui-angular/src/lib/chips/chip.component.html

@@ -2,9 +2,11 @@
     [attr.tabindex]="chipTabindex"
     (keydown)="onChipKeyDown($event)"
     [igxDrag]="{chip: this}"
-    [hideBaseOnDrag]="hideBaseOnDrag"
+    [style.visibility]='hideBaseElement ? "hidden" : "visible"'
     [ghostClass]="ghostClass"
     (dragStart)="onChipDragStart($event)"
+    (ghostCreate)="onChipGhostCreate()"
+    (ghostDestroy)="onChipGhostDestroy()"
     (dragEnd)="onChipDragEnd()"
     (transitioned)="onChipMoveEnd($event)"
     (dragClick)="onChipDragClicked($event)"

projects/igniteui-angular/src/lib/chips/chip.component.ts

@@ -437,6 +437,12 @@ export class IgxChipComponent extends DisplayDensityBase {
         return !this.disabled ? 0 : '';
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    public hideBaseElement = false;
+
     protected _selected = false;
     protected _selectedItemClass = 'igx-chip__item--selected';
     protected _movedWhileRemoving = false;
@@ -608,6 +614,22 @@ export class IgxChipComponent extends DisplayDensityBase {
         }
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    public onChipGhostCreate() {
+        this.hideBaseElement = this.hideBaseOnDrag;
+    }
+
+    /**
+     * @hidden
+     * @internal
+     */
+    public onChipGhostDestroy() {
+        this.hideBaseElement = false;
+    }
+
     /**
      * @hidden
      * @internal

projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.directive.ts

@@ -152,6 +152,8 @@ export class IgxDragLocation {
 export class IgxDragDirective implements AfterContentInit, OnDestroy {
 
     protected ghostContext: any = null;
+    protected _hideBaseOnDrag = false;
+    protected _animateOnRelease = false;
 
     /**
      * - Save data inside the `igxDrag` directive. This can be set when instancing `igxDrag` on an element.
@@ -232,7 +234,12 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
     @DeprecateProperty(`'hideBaseOnDrag' @Input property is deprecated and will be removed in future major versions.
         Alternatives to it are using the new no ghost dragging and custom base styling.`)
     @Input()
-    public hideBaseOnDrag = false;
+    get hideBaseOnDrag() {
+        return this._hideBaseOnDrag;
+    }
+    set hideBaseOnDrag(val) {
+        this._hideBaseOnDrag = val;
+    }
 
     /**
      * @deprecated Please use provided transition functions in future.
@@ -249,7 +256,12 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
     @DeprecateProperty(`'animateOnRelease' @Input property is deprecated and will be removed in future major versions.
         Please use 'transitionToOrigin' or 'transitionTo' methods instead.`)
     @Input()
-    public animateOnRelease = false;
+    get animateOnRelease() {
+        return this._animateOnRelease;
+    }
+    set animateOnRelease(val) {
+        this._animateOnRelease = val;
+    }
 
     /**
      * An @Input property that specifies a template for the ghost element created when dragging starts and `ghost` is true.
@@ -1011,7 +1023,7 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
         if (this._dragStarted) {
             if (this._lastDropArea && this._lastDropArea !== this.element.nativeElement ) {
                 this.dispatchDropEvent(event.pageX, event.pageY, event);
-            } else if (this.animateOnRelease) {
+            } else if (this._animateOnRelease) {
                 this.transitionToOrigin();
             }
 
@@ -1056,7 +1068,7 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
             this.zone.run(() => {
                 this.dragEnd.emit(eventArgs);
             });
-            if (this.animateOnRelease) {
+            if (this._animateOnRelease) {
                 this.transitionToOrigin();
             } else if (!this.animInProgress) {
                 this.onTransitionEnd(null);
@@ -1146,7 +1158,7 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
         });
 
         // Hide the base after the ghostElement is created, because otherwise the ghostElement will be not visible.
-        if (this.hideBaseOnDrag) {
+        if (this._hideBaseOnDrag) {
             this.visible = false;
         }
 
@@ -1239,7 +1251,7 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
                 return;
             }
 
-            if (this.hideBaseOnDrag) {
+            if (this._hideBaseOnDrag) {
                 this.visible = true;
             }
             this.ghostElement.parentNode.removeChild(this.ghostElement);

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

@@ -4193,7 +4193,10 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             fix.detectChanges();
 
             listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
-            expect(listItems.length).toBe(4, 'incorrect rendered list items count');
+            expect(listItems.length).toBeGreaterThan(1);
+            for (let i = 1; i < listItems.length; i++) {
+                expect(listItems[i].textContent.toString().indexOf(todayDate) > -1).toBeTruthy();
+            }
 
             UIInteractions.clickAndSendInputElementValue(inputNativeElement, dayOfWeek, fix);
             tick(100);