Merge branch 'master' into simeonoff/fix-highlight

Author: simeonoff

projects/igniteui-angular/src/lib/core/i18n/date-picker-resources.ts

@@ -0,0 +1,9 @@
+export interface IDatePickerResourceStrings {
+    igx_date_picker_change_date?: string;
+    igx_date_picker_choose_date?: string;
+}
+
+export const DatePickerResourceStringsEN: IDatePickerResourceStrings = {
+    igx_date_picker_change_date: 'Change Date',
+    igx_date_picker_choose_date: 'Choose Date'
+};

projects/igniteui-angular/src/lib/core/i18n/date-range-picker-resources.ts

@@ -1,7 +1,9 @@
 export interface IDateRangePickerResourceStrings {
     igx_date_range_picker_date_separator?: string;
+    igx_date_range_picker_done_button?: string;
 }
 
 export const DateRangePickerResourceStringsEN: IDateRangePickerResourceStrings = {
-    igx_date_range_picker_date_separator: 'to'
+    igx_date_range_picker_date_separator: 'to',
+    igx_date_range_picker_done_button: 'Done'
 };

projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts

@@ -232,8 +232,8 @@ export const GridResourceStringsEN: IGridResourceStrings = {
     igx_grid_advanced_filter_column_placeholder: 'Select column',
     igx_grid_advanced_filter_value_placeholder: 'Value',
     igx_grid_pinned_row_indicator: 'Pinned',
-    igx_grid_hiding_check_all_label: 'Hide All',
-    igx_grid_hiding_uncheck_all_label: 'Show All',
+    igx_grid_hiding_check_all_label: 'Show All',
+    igx_grid_hiding_uncheck_all_label: 'Hide All',
     igx_grid_pinning_check_all_label: 'Pin All',
     igx_grid_pinning_uncheck_all_label: 'Unpin All',
     igx_grid_toolbar_actions_filter_prompt: 'Filter columns list ...',

projects/igniteui-angular/src/lib/core/i18n/resources.ts

@@ -1,3 +1,4 @@
+import { DatePickerResourceStringsEN, IDatePickerResourceStrings } from './date-picker-resources';
 import { DateRangePickerResourceStringsEN, IDateRangePickerResourceStrings } from './date-range-picker-resources';
 import { IGridResourceStrings, GridResourceStringsEN } from './grid-resources';
 import { ITimePickerResourceStrings, TimePickerResourceStringsEN } from './time-picker-resources';
@@ -11,8 +12,8 @@ import { IInputResourceStrings, InputResourceStringsEN } from './input-resources
 import { ITreeResourceStrings, TreeResourceStringsEN } from './tree-resources';
 
 export interface IResourceStrings extends IGridResourceStrings, ITimePickerResourceStrings, ICalendarResourceStrings,
-    ICarouselResourceStrings, IChipResourceStrings, IInputResourceStrings, IDateRangePickerResourceStrings, IListResourceStrings,
-    IPaginatorResourceStrings, ITreeResourceStrings { }
+    ICarouselResourceStrings, IChipResourceStrings, IInputResourceStrings, IDatePickerResourceStrings, IDateRangePickerResourceStrings,
+    IListResourceStrings, IPaginatorResourceStrings, ITreeResourceStrings { }
 
 /**
  * @hidden
@@ -23,6 +24,7 @@ export const CurrentResourceStrings = {
     TimePickerResStrings: cloneValue(TimePickerResourceStringsEN),
     CalendarResStrings: cloneValue(CalendarResourceStringsEN),
     ChipResStrings: cloneValue(ChipResourceStringsEN),
+    DatePickerResourceStrings: cloneValue(DatePickerResourceStringsEN),
     DateRangePickerResStrings: cloneValue(DateRangePickerResourceStringsEN),
     CarouselResStrings: cloneValue(CarouselResourceStringsEN),
     ListResStrings: cloneValue(ListResourceStringsEN),
@@ -56,6 +58,7 @@ export const getCurrentResourceStrings = (): IResourceStrings => ({
     ...CurrentResourceStrings.CalendarResStrings,
     ...CurrentResourceStrings.CarouselResStrings,
     ...CurrentResourceStrings.ChipResStrings,
+    ...CurrentResourceStrings.DatePickerResourceStrings,
     ...CurrentResourceStrings.DateRangePickerResStrings,
     ...CurrentResourceStrings.GridResStrings,
     ...CurrentResourceStrings.InputResStrings,

projects/igniteui-angular/src/lib/core/i18n/time-picker-resources.ts

@@ -1,9 +1,13 @@
 export interface ITimePickerResourceStrings {
     igx_time_picker_ok?: string;
     igx_time_picker_cancel?: string;
+    igx_time_picker_change_time?: string;
+    igx_time_picker_choose_time?: string;
 }
 
 export const TimePickerResourceStringsEN: ITimePickerResourceStrings = {
     igx_time_picker_ok: 'OK',
-    igx_time_picker_cancel: 'Cancel'
+    igx_time_picker_cancel: 'Cancel',
+    igx_time_picker_change_time: 'Change Time',
+    igx_time_picker_choose_time: 'Choose Time'
 };

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

@@ -1,6 +1,6 @@
 <igx-input-group [displayDensity]="this.displayDensity" [type]="this.type" [suppressInputAutofocus]="true">
     <igx-prefix *ngIf="!this.toggleComponents.length" (click)="this.toggle()">
-        <igx-icon [title]="this.value ? 'Change Date' : 'Choose Date'">today</igx-icon>
+        <igx-icon [title]="this.value ? resourceStrings.igx_date_picker_change_date : resourceStrings.igx_date_picker_choose_date">today</igx-icon>
     </igx-prefix>
 
     <input class="igx-date-picker__input-date" [displayValuePipe]="this.formatter ? displayValue : null" igxInput

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

@@ -220,11 +220,11 @@ describe('IgxDatePicker', () => {
                 onClosed: new EventEmitter<OverlayEventArgs>(),
                 onClosing: new EventEmitter<OverlayClosingEventArgs>(),
                 show(..._args) {
-                    this.onOpening.emit(mockOverlayEventArgs);
+                    this.onOpening.emit(Object.assign({}, mockOverlayEventArgs, { cancel: false }));
                     this.onOpened.emit(mockOverlayEventArgs);
                 },
                 hide(..._args) {
-                    this.onClosing.emit(mockOverlayEventArgs);
+                    this.onClosing.emit(Object.assign({}, mockOverlayEventArgs, { cancel: false }));
                     this.onClosed.emit(mockOverlayEventArgs);
                 },
                 detach: (..._args) => { },
@@ -297,7 +297,7 @@ describe('IgxDatePicker', () => {
             //#endregion
 
             //#region Events
-            xit('should properly emit open/close events', () => {
+            it('should properly emit open/close events', () => {
                 spyOn(datePicker.opened, 'emit');
                 spyOn(datePicker.closed, 'emit');
 
@@ -310,17 +310,17 @@ describe('IgxDatePicker', () => {
                 expect(datePicker.closed.emit).toHaveBeenCalledWith({ owner: datePicker });
             });
 
-            xit('should properly emit opening/closing events', () => {
+            it('should properly emit opening/closing events', () => {
                 spyOn(datePicker.opening, 'emit');
                 spyOn(datePicker.closing, 'emit');
 
                 datePicker.ngAfterViewInit();
 
                 datePicker.open();
-                expect(datePicker.opening.emit).toHaveBeenCalledWith({ owner: datePicker, cancel: false });
+                expect(datePicker.opening.emit).toHaveBeenCalledWith({ owner: datePicker, event: undefined, cancel: false });
 
                 datePicker.close();
-                expect(datePicker.closing.emit).toHaveBeenCalledWith({ owner: datePicker, cancel: false });
+                expect(datePicker.closing.emit).toHaveBeenCalledWith({ owner: datePicker, event: undefined, cancel: false });
             });
 
             it('should emit valueChange when the value changes', () => {

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

@@ -25,14 +25,15 @@ import {
     OverlayCancelableEventArgs,
     OverlayEventArgs
 } from '../services/public_api';
+import { CurrentResourceStrings } from '../core/i18n/resources';
+import { IDatePickerResourceStrings } from '../core/i18n/date-picker-resources';
 import { DateRangeDescriptor, DateRangeType } from '../core/dates/dateRange';
 import { isEqual, IBaseCancelableBrowserEventArgs, IBaseEventArgs, PlatformUtil } from '../core/utils';
 import { IgxCalendarContainerComponent } from '../date-common/calendar-container/calendar-container.component';
 import { fadeIn, fadeOut } from '../animations/fade';
 import { PickerBaseDirective } from '../date-common/picker-base.directive';
 import { DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
 import { DatePart, DatePartDeltas, IgxDateTimeEditorDirective } from '../directives/date-time-editor/public_api';
-import { DeprecateProperty } from '../core/deprecateDecorators';
 import { DateTimeUtil } from '../date-common/util/date-time.util';
 import { PickerHeaderOrientation as PickerHeaderOrientation } from '../date-common/types';
 import { IDatePickerValidationFailedEventArgs } from './date-picker.common';
@@ -354,6 +355,22 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
         return this._maxValue;
     }
 
+    /**
+     * An accessor that sets the resource strings.
+     * By default it uses EN resources.
+     */
+    @Input()
+    public set resourceStrings(value: IDatePickerResourceStrings) {
+        this._resourceStrings = Object.assign({}, this._resourceStrings, value);
+    }
+
+    /**
+     * An accessor that returns the resource strings.
+     */
+    public get resourceStrings(): IDatePickerResourceStrings {
+        return this._resourceStrings;
+    }
+
     /** @hidden @internal */
     @Input()
     public readOnly = false;
@@ -435,6 +452,7 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
     /** @hidden @internal */
     public displayValue: PipeTransform = { transform: (date: Date) => this.formatter(date) };
 
+    private _resourceStrings = CurrentResourceStrings.DatePickerResourceStrings;
     private _dateValue: Date;
     private _overlayId: string;
     private _value: Date | string;
@@ -843,9 +861,10 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
     }
 
     private subscribeToOverlayEvents() {
-        this._overlayService.onOpening.pipe(...this._overlaySubFilter).subscribe((eventArgs) => {
-            const args = eventArgs as IBaseCancelableBrowserEventArgs;
+        this._overlayService.onOpening.pipe(...this._overlaySubFilter).subscribe((eventArgs: OverlayCancelableEventArgs) => {
+            const args: IBaseCancelableBrowserEventArgs = { owner: this, event: eventArgs.event, cancel: eventArgs.cancel };
             this.opening.emit(args);
+            eventArgs.cancel = args.cancel;
             if (args.cancel) {
                 this._overlayService.detach(this._overlayId);
                 return;
@@ -855,8 +874,9 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
             this._collapsed = false;
         });
 
-        this._overlayService.onOpened.pipe(...this._overlaySubFilter).subscribe((eventArgs) => {
-            this.opened.emit(eventArgs as IBaseEventArgs);
+        this._overlayService.onOpened.pipe(...this._overlaySubFilter).subscribe((_eventArgs) => {
+            const args: IBaseEventArgs = { owner: this };
+            this.opened.emit(args);
             if (this._calendar?.daysView?.selectedDates) {
                 this._calendar?.daysView?.focusActiveDate();
                 return;
@@ -868,9 +888,10 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
             }
         });
 
-        this._overlayService.onClosing.pipe(...this._overlaySubFilter).subscribe((eventArgs) => {
-            const args = eventArgs as IBaseCancelableBrowserEventArgs;
+        this._overlayService.onClosing.pipe(...this._overlaySubFilter).subscribe((eventArgs: OverlayCancelableEventArgs) => {
+            const args: IBaseCancelableBrowserEventArgs = { owner: this, event: eventArgs.event, cancel: eventArgs.cancel };
             this.closing.emit(args);
+            eventArgs.cancel = args.cancel;
             if (args.cancel) {
                 return;
             }
@@ -880,8 +901,9 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
             }
         });
 
-        this._overlayService.onClosed.pipe(...this._overlaySubFilter).subscribe((event) => {
-            this.closed.emit(event as IBaseEventArgs);
+        this._overlayService.onClosed.pipe(...this._overlaySubFilter).subscribe((_event) => {
+            const args: IBaseEventArgs = { owner: this };
+            this.closed.emit(args);
             this._overlayService.detach(this._overlayId);
             this._collapsed = true;
             this._overlayId = null;

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

@@ -16,6 +16,7 @@ import { CalendarSelection, IgxCalendarComponent, WEEKDAYS } from '../calendar/p
 import { DateRangeType } from '../core/dates';
 import { DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
 import { CurrentResourceStrings } from '../core/i18n/resources';
+import { IDateRangePickerResourceStrings } from '../core/i18n/date-range-picker-resources';
 import { DateTimeUtil } from '../date-common/util/date-time.util';
 import { IBaseCancelableBrowserEventArgs, isDate, parseDate, PlatformUtil } from '../core/utils';
 import { IgxCalendarContainerComponent } from '../date-common/calendar-container/calendar-container.component';
@@ -152,6 +153,7 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
      *
      * @remarks
      * Default value is `Done`.
+     * An @Input property that renders Done button with custom text. By default `doneButtonText` is set to Done.
      * The button will only show up in `dialog` mode.
      *
      * @example
@@ -160,8 +162,16 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
      * ```
      */
     @Input()
-    public doneButtonText = 'Done';
+    public set doneButtonText(value: string) {
+        this._doneButtonText = value;
+    }
 
+    public get doneButtonText(): string {
+        if (this._doneButtonText === null) {
+            return this.resourceStrings.igx_date_range_picker_done_button;
+        }
+        return this._doneButtonText;
+    }
     /**
      * Custom overlay settings that should be used to display the calendar.
      *
@@ -234,6 +244,22 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
         return this._maxValue;
     }
 
+    /**
+     * An accessor that sets the resource strings.
+     * By default it uses EN resources.
+     */
+     @Input()
+     public set resourceStrings(value: IDateRangePickerResourceStrings) {
+         this._resourceStrings = Object.assign({}, this._resourceStrings, value);
+     }
+
+     /**
+      * An accessor that returns the resource strings.
+      */
+     public get resourceStrings(): IDateRangePickerResourceStrings {
+         return this._resourceStrings;
+     }
+
     /**
      * Sets the `placeholder` for single-input `IgxDateRangePickerComponent`.
      *
@@ -303,7 +329,12 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
     public dateSeparatorTemplate: TemplateRef<any>;
 
     /** @hidden @internal */
-    public dateSeparator = CurrentResourceStrings.DateRangePickerResStrings.igx_date_range_picker_date_separator;
+    public get dateSeparator(): string {
+        if (this._dateSeparator === null) {
+            return this.resourceStrings.igx_date_range_picker_date_separator;
+        }
+        return this._dateSeparator;
+    }
 
     /** @hidden @internal */
     public get appliedFormat(): string {
@@ -386,6 +417,9 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
         return false;
     }
 
+    private _resourceStrings = CurrentResourceStrings.DateRangePickerResStrings;
+    private _doneButtonText = null;
+    private _dateSeparator = null;
     private _value: DateRange | null;
     private _overlayId: string;
     private _ngControl: NgControl;

projects/igniteui-angular/src/lib/grids/column-actions/column-hiding.directive.ts

@@ -19,28 +19,28 @@ export class IgxColumnHidingDirective extends IgxColumnActionsBaseDirective {
      * @hidden @internal
      */
     public get checkAllLabel(): string {
-        return this.columnActions.grid?.resourceStrings.igx_grid_hiding_check_all_label ?? 'Hide All';
+        return this.columnActions.grid?.resourceStrings.igx_grid_hiding_check_all_label ?? 'Show All';
     }
 
     /**
      * @hidden @internal
      */
     public get uncheckAllLabel(): string {
-        return this.columnActions.grid?.resourceStrings.igx_grid_hiding_uncheck_all_label ?? 'Show All';
+        return this.columnActions.grid?.resourceStrings.igx_grid_hiding_uncheck_all_label ?? 'Hide All';
     }
     /**
      * @hidden @internal
      */
     public checkAll() {
-        this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(true));
+        this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(false));
 
     }
 
     /**
      * @hidden @internal
      */
     public uncheckAll() {
-        this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(false));
+        this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(true));
     }
 
     /**
@@ -63,10 +63,10 @@ export class IgxColumnHidingDirective extends IgxColumnActionsBaseDirective {
     }
 
     public get allChecked() {
-        return this.columnActions.filteredColumns.every(col => this.columnChecked(col));
+        return this.columnActions.filteredColumns.every(col => !this.columnChecked(col));
     }
 
     public get allUnchecked() {
-        return this.columnActions.filteredColumns.every(col => !this.columnChecked(col));
+        return this.columnActions.filteredColumns.every(col => this.columnChecked(col));
     }
 }