Merge branch 'master' into ddincheva/rowdataAPI

Author: zdrawku

CHANGELOG.md

@@ -13,8 +13,8 @@ All notable changes for each version of this project will be documented in this
     - **Breaking Change** - `target` property in `PositionSettings` has been deprecated. You can set the attaching target for the component to show in `OverlaySettings` instead.
 - `IgxSelect`
     - Added `aria-labelledby` property for the items list container(marked as `role="listbox"`). This will ensure the users of assistive technologies will also know what the list items container is used for, upon opening.
-- `IgxDatePicker`
-    - **Breaking Change** - Deprecated the `label` and `labelVisibility` properties.
+- `IgxDatePicker`	
+    - **Breaking Change** - Deprecated the `label` property.
 
 
 ### New Features
@@ -26,7 +26,7 @@ All notable changes for each version of this project will be documented in this
 - ` IgxExcelExporterService`
     - Added `worksheetName` property to the `IgxExcelExporterOptions`, that allows setting the name of the worksheet.
 - `IgxDatePicker`
-    - The `labelVisibility` and the `label` property have been deprecated and now a custom label is set by nesting a <label igxLabel></label> inside the <igx-date-picker><igx-date-picker> tags.
+    - The the `label` property have been deprecated and a custom label can also be set by nesting a <label igxLabel></label> inside the <igx-date-picker><igx-date-picker> tags.
 - `IgxTimePicker`
     - Added a custom label functionality.
 - `IgxCalendar` and `IgxDatePicker` - new `showWeekNumbers` input, that allows showing of the week number at left side of content area.

projects/igniteui-angular/src/lib/date-picker/README.md

@@ -41,7 +41,7 @@ DatePicker with cancel and today buttons
 </igx-date-picker>
 ```
 
-The DatePicker's custom label can be set in the way shown below. If `labelVisibility` is set to `false` and a custom label is not used, a default one will be set.
+The DatePicker's custom label can be set in two ways, either by changing the `label` property or in the way shown below.
 ````html
 <igx-date-picker>
     <label igxLabel>Custom label</label>

projects/igniteui-angular/src/lib/date-picker/date-picker.component.html

@@ -4,7 +4,6 @@
 
 <ng-template #readOnlyDatePickerTemplate>
     <igx-input-group (click)="openDialog()">
-        <label igxLabel *ngIf="!_labelDirectiveUserTemplate&&!labelVisibility">Date</label>
         <ng-container ngProjectAs="[igxLabel]" *ngTemplateOutlet="labelTemplate"></ng-container>
         <igx-prefix>
             <igx-icon>today</igx-icon>
@@ -24,7 +23,6 @@
 
 <ng-template #editableDatePickerTemplate>
     <igx-input-group #editableInputGroup>
-        <label igxLabel *ngIf="!_labelDirectiveUserTemplate&&!labelVisibility">Date</label>
         <ng-container ngProjectAs="[igxLabel]" *ngTemplateOutlet="labelTemplate"></ng-container>
         <igx-prefix (click)="onOpenClick($event)">
             <igx-icon>today</igx-icon>

projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts

@@ -159,7 +159,7 @@ describe('IgxDatePicker', () => {
             fixture.detectChanges();
 
             label = fixture.debugElement.query(By.directive(IgxLabelDirective));
-            expect(label.nativeElement.innerText).toBe('Date');
+            expect(label).toBeNull();
         });
 
         it('When update label property it should reflect on the label text of the datepicker', () => {
@@ -179,7 +179,7 @@ describe('IgxDatePicker', () => {
             fixture.detectChanges();
 
             let label = fixture.debugElement.query(By.directive(IgxLabelDirective));
-            expect(label.nativeElement.innerText).toBe('Date');
+            expect(label).toBeNull();
 
             fixture.componentInstance.labelVisibility = true;
             fixture.detectChanges();
@@ -207,9 +207,9 @@ describe('IgxDatePicker', () => {
             fixtureProjectedLabel.detectChanges();
             testComponent.customLabelVisibility = false;
             fixtureProjectedLabel.detectChanges();
-            label = dom.query(By.directive(IgxLabelDirective)).nativeElement.innerText;
+            label = dom.query(By.directive(IgxLabelDirective));
             fixtureProjectedLabel.detectChanges();
-            expect(label).toEqual('Date');
+            expect(label).toBeNull();
 
             testComponent.customLabelVisibility = true;
             fixtureProjectedLabel.detectChanges();

projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

@@ -190,18 +190,7 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
      * By default the visibility is set to true.
      * @example
      * <igx-date-picker [labelVisibility]="false"></igx-date-picker>
-     * @deprecated Use
-     * ````html
-     * <igx-date-picker>
-     *      <label igxLabel>Custom label</label>
-     * </igx-date-picker>
-     * ````
-     * to set a custom label.
      */
-    @DeprecateProperty(`Deprecated. Use
-    <igx-date-picker>
-        <label igxLabel>Custom label</label>
-    </igx-date-picker> to set a label.` )
     @Input()
     public labelVisibility = true;