refactor(overlay): add closeOnEsc property in overlay settings

jackofdiamond5 · jackofdiamond5 · commit 72505afc96a2 · 2020-07-03T13:51:15.000+03:00
diff --git a/projects/igniteui-angular/src/lib/combo/combo.component.ts b/projects/igniteui-angular/src/lib/combo/combo.component.ts
@@ -156,6 +156,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
     private _overlaySettings: OverlaySettings = {
         scrollStrategy: new AbsoluteScrollStrategy(),
         positionStrategy: new AutoPositionStrategy(),
+        closeOnEsc: true,
         modal: false,
         closeOnOutsideClick: true,
         excludePositionTarget: true
diff --git a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts
@@ -775,6 +775,7 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
 
         this._defaultDropDownOverlaySettings = {
             closeOnOutsideClick: true,
+            closeOnEsc: true,
             modal: false,
             scrollStrategy: new AbsoluteScrollStrategy(),
             positionStrategy: new AutoPositionStrategy(this._positionSettings),
@@ -783,6 +784,7 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
 
         this._modalOverlaySettings = {
             closeOnOutsideClick: true,
+            closeOnEsc: true,
             modal: true,
             outlet: this.outlet
         };
diff --git a/projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.ts b/projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.ts
@@ -402,10 +402,12 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
     private _focusedInput: IgxDateRangeInputsBaseComponent;
     private _dialogOverlaySettings: OverlaySettings = {
         closeOnOutsideClick: true,
+        closeOnEsc: true,
         modal: true
     };
     private _dropDownOverlaySettings: OverlaySettings = {
         closeOnOutsideClick: true,
+        closeOnEsc: true,
         modal: false
     };
     private onChangeCallback = (dateRange: DateRange) => { };
diff --git a/projects/igniteui-angular/src/lib/dialog/dialog.component.ts b/projects/igniteui-angular/src/lib/dialog/dialog.component.ts
@@ -83,6 +83,15 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
         this._isModal = val;
     }
 
+    get closeOnEscapeKey() {
+        return this._closeOnEscapeKey;
+    }
+
+    set closeOnEscapeKey(val: boolean) {
+        this._overlayDefaultSettings.closeOnEsc = val;
+        this._closeOnEscapeKey = val;
+    }
+
     /**
      * An @Input property controlling the `title` of the dialog.
      * ```html
@@ -301,6 +310,7 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
 
     private _overlayDefaultSettings: OverlaySettings;
     private _closeOnOutsideSelect = false;
+    private _closeOnEscapeKey = true;
     private _isModal = true;
     protected destroy$ = new Subject<boolean>();
 
@@ -404,6 +414,7 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
             positionStrategy: new GlobalPositionStrategy(this._positionSettings),
             scrollStrategy: new NoOpScrollStrategy(),
             modal: this.isModal,
+            closeOnEsc: true,
             closeOnOutsideClick: this.closeOnOutsideSelect
         };
     }
@@ -503,7 +514,6 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
         }
 
     }
-
 }
 
 export interface IDialogEventArgs extends IBaseEventArgs {
diff --git a/projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.ts b/projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.ts
@@ -86,6 +86,7 @@ export class IgxAutocompleteDirective extends IgxDropDownItemNavigationDirective
 
     private defaultSettings: OverlaySettings = {
         modal: false,
+        closeOnEsc: true,
         scrollStrategy: new AbsoluteScrollStrategy(),
         positionStrategy: new AutoPositionStrategy({ target: this.parentElement }),
         excludePositionTarget: true
diff --git a/projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.spec.ts b/projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.spec.ts
@@ -475,6 +475,7 @@ describe('IgxToggle', () => {
                 positionStrategy: jasmine.any(ConnectedPositioningStrategy) as any,
                 closeOnOutsideClick: true,
                 modal: false,
+                closeOnEsc: true,
                 scrollStrategy: jasmine.any(AbsoluteScrollStrategy) as any,
                 excludePositionTarget: true
             };
@@ -498,6 +499,7 @@ describe('IgxToggle', () => {
                 positionStrategy: jasmine.any(ConnectedPositioningStrategy) as any,
                 closeOnOutsideClick: true,
                 modal: false,
+                closeOnEsc: true,
                 scrollStrategy: jasmine.any(AbsoluteScrollStrategy) as any,
                 excludePositionTarget: true
             };
@@ -533,6 +535,7 @@ describe('IgxToggle', () => {
                 positionStrategy: jasmine.any(ConnectedPositioningStrategy) as any,
                 closeOnOutsideClick: true,
                 modal: false,
+                closeOnEsc: true,
                 scrollStrategy: jasmine.any(AbsoluteScrollStrategy) as any,
                 excludePositionTarget: true
             };
@@ -591,6 +594,7 @@ describe('IgxToggle', () => {
                 positionStrategy: jasmine.any(ConnectedPositioningStrategy) as any,
                 closeOnOutsideClick: true,
                 modal: false,
+                closeOnEsc: true,
                 scrollStrategy: jasmine.any(AbsoluteScrollStrategy) as any,
                 outlet: jasmine.any(IgxOverlayOutletDirective) as any,
                 excludePositionTarget: true
diff --git a/projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts b/projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts
@@ -429,6 +429,7 @@ export class IgxToggleActionDirective implements OnInit {
             scrollStrategy: new AbsoluteScrollStrategy(),
             closeOnOutsideClick: true,
             modal: false,
+            closeOnEsc: true,
             excludePositionTarget: true
         };
     }
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts
@@ -136,6 +136,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     private _overlaySettings: OverlaySettings = {
         closeOnOutsideClick: false,
         modal: false,
+        closeOnEsc: true,
         positionStrategy: new ConnectedPositioningStrategy(this._positionSettings),
         scrollStrategy: new CloseScrollStrategy()
     };
@@ -146,6 +147,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     public columnSelectOverlaySettings: OverlaySettings = {
         scrollStrategy: new AbsoluteScrollStrategy(),
         modal: false,
+        closeOnEsc: true,
         closeOnOutsideClick: false,
         excludePositionTarget: true
     };
@@ -156,6 +158,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     public conditionSelectOverlaySettings: OverlaySettings = {
         scrollStrategy: new AbsoluteScrollStrategy(),
         modal: false,
+        closeOnEsc: true,
         closeOnOutsideClick: false,
         excludePositionTarget: true
     };
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts
@@ -47,6 +47,7 @@ export class IgxGridFilteringRowComponent implements AfterViewInit {
         excludePositionTarget: true,
         closeOnOutsideClick: true,
         modal: false,
+        closeOnEsc: true,
         scrollStrategy: new AbsoluteScrollStrategy(),
         positionStrategy: new ConnectedPositioningStrategy(this._positionSettings)
     };
@@ -55,6 +56,7 @@ export class IgxGridFilteringRowComponent implements AfterViewInit {
         excludePositionTarget: true,
         closeOnOutsideClick: true,
         modal: false,
+        closeOnEsc: true,
         scrollStrategy: new AbsoluteScrollStrategy(),
         positionStrategy: new ConnectedPositioningStrategy(this._positionSettings)
     };
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.ts
@@ -60,6 +60,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
     private _customDialogOverlaySettings: OverlaySettings = {
         closeOnOutsideClick: true,
         modal: false,
+        closeOnEsc: true,
         positionStrategy: new AutoPositionStrategy(this._customDialogPositionSettings),
         scrollStrategy: new AbsoluteScrollStrategy()
     };
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.ts
@@ -43,6 +43,7 @@ export class IgxExcelStyleDefaultExpressionComponent implements AfterViewInit {
     public dropDownOverlaySettings: OverlaySettings = {
         scrollStrategy: new AbsoluteScrollStrategy(),
         modal: false,
+        closeOnEsc: true,
         closeOnOutsideClick: true,
         excludePositionTarget: true
     };
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts
@@ -209,6 +209,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
     private _subMenuOverlaySettings: OverlaySettings = {
         closeOnOutsideClick: true,
         modal: false,
+        closeOnEsc: true,
         positionStrategy: new AutoPositionStrategy(this._subMenuPositionSettings),
         scrollStrategy: new AbsoluteScrollStrategy()
     };
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts
@@ -90,6 +90,7 @@ export class IgxFilteringService implements OnDestroy {
         this._filterMenuOverlaySettings = {
             closeOnOutsideClick: true,
             modal: false,
+            closeOnEsc: true,
             positionStrategy: new ExcelStylePositionStrategy(this._filterMenuPositionSettings),
             scrollStrategy: new AbsoluteScrollStrategy()
         };
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -207,6 +207,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
     private _advancedFilteringOverlaySettings: OverlaySettings = {
         closeOnOutsideClick: false,
         modal: false,
+        closeOnEsc: true,
         positionStrategy: new ConnectedPositioningStrategy(this._advancedFilteringPositionSettings),
     };
 
@@ -6195,6 +6196,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             const overlaySettings: OverlaySettings = {
                 outlet: this.loadingOutlet,
                 closeOnOutsideClick: false,
+                closeOnEsc: true,
                 positionStrategy: new ContainerPositionStrategy()
             };
             if (!this._loadingId) {
diff --git a/projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar.component.ts b/projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar.component.ts
@@ -250,6 +250,7 @@ export class IgxGridToolbarComponent extends DisplayDensityBase implements After
         positionStrategy: new ConnectedPositioningStrategy(this._positionSettings),
         scrollStrategy: new AbsoluteScrollStrategy(),
         modal: false,
+        closeOnEsc: true,
         closeOnOutsideClick: true,
         excludePositionTarget: true
     };
diff --git a/projects/igniteui-angular/src/lib/select/select.component.ts b/projects/igniteui-angular/src/lib/select/select.component.ts
@@ -369,6 +369,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
     ngAfterContentInit() {
         this._overlayDefaults = {
             modal: false,
+            closeOnEsc: true,
             closeOnOutsideClick: false,
             positionStrategy: new SelectPositioningStrategy(this, { target: this.getEditElement() }),
             scrollStrategy: new AbsoluteScrollStrategy(),
diff --git a/projects/igniteui-angular/src/lib/services/overlay/overlay.spec.ts b/projects/igniteui-angular/src/lib/services/overlay/overlay.spec.ts
diff --git a/projects/igniteui-angular/src/lib/services/overlay/overlay.ts b/projects/igniteui-angular/src/lib/services/overlay/overlay.ts
diff --git a/projects/igniteui-angular/src/lib/services/overlay/utilities.ts b/projects/igniteui-angular/src/lib/services/overlay/utilities.ts

Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,7 @@ export class IgxToggleActionDirective implements OnInit {`
`429`	`429`	`scrollStrategy: new AbsoluteScrollStrategy(),`
`430`	`430`	`closeOnOutsideClick: true,`
`431`	`431`	`modal: false,`
	`432`	`+ closeOnEsc: true,`
`432`	`433`	`excludePositionTarget: true`
`433`	`434`	`};`
`434`	`435`	`}`