fix(igx-grdi): Remove ngModel from datepicker, #4331

IgniteUI · Mar 15, 2019 · 0594b1e · 0594b1e
1 parent d4fd7bc
commit 0594b1e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/projects/igniteui-angular/src/lib/grids/api.service.ts b/projects/igniteui-angular/src/lib/grids/api.service.ts
@@ -500,7 +500,7 @@ export class GridBaseAPIService <T extends IgxGridBaseComponent & IGridDataBinda
 
         if (index > -1) {
             filteringState.filteringOperands.splice(index, 1);
-        } else {
+        } else if (!fieldName) {
             filteringState.filteringOperands = [];
         }
 

diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering-row.component.html b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering-row.component.html
@@ -40,7 +40,13 @@
 </ng-template>
 
 <ng-template #defaultDateUI>
-    <igx-date-picker tabindex="0" [(ngModel)]="value" [outlet]="filteringService.grid.outletDirective" [locale]="filteringService.grid.locale" (onClose)="datePickerClose()">
+    <igx-date-picker 
+        tabindex="0"
+        [value]="value"
+        [outlet]="filteringService.grid.outletDirective"
+        [locale]="filteringService.grid.locale"
+        (onSelection)="onDateSelected($event)"
+        (onClose)="datePickerClose()">
         <ng-template igxDatePickerTemplate let-openDialog="openDialog" let-displayData="displayData">
             <igx-input-group type="box" [displayDensity]="'compact'" [supressInputAutofocus]="true">
                 <igx-prefix #inputGroupPrefix

diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering-row.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering-row.component.ts
@@ -426,6 +426,13 @@ export class IgxGridFilteringRowComponent implements AfterViewInit {
         }
     }
 
+    /**
+     *  Event handler for date picker's selection.
+     */
+    public onDateSelected(value: Date) {
+        this.value = value;
+    }
+
     /**
      * Opens the conditions dropdown.
      */