fix(esf): modified new strategy to be only for the excel style filter #6670

Author: igdmdimitrov

…sition/auto-elastic-position-strategy.ts …l-style/excel-style-position-strategy.tsprojects/igniteui-angular/src/lib/services/overlay/position/auto-elastic-position-strategy.ts renamed to projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-position-strategy.ts projects/igniteui-angular/src/lib/services/overlay/position/auto-elastic-position-strategy.ts renamed to projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-position-strategy.ts

@@ -1,17 +1,12 @@
-import { ConnectedFit, Size } from './../utilities';
-import { AutoPositionStrategy } from './auto-position-strategy';
+import { AutoPositionStrategy } from '../../../services/overlay/position/auto-position-strategy';
+import { ConnectedFit } from '../../../services/overlay/utilities';
 
-/**
- * TODO
- */
-export class AutoElasticPositionStrategy extends AutoPositionStrategy {
-    /** @inheritdoc */
-    position(contentElement: HTMLElement, size: Size, document?: Document, initialCall?: boolean): void {
-        this._forceFit = true;
-        super.position(contentElement, size, document, initialCall);
+/** @hidden */
+export class ExcelStylePositionStrategy extends AutoPositionStrategy {
+    protected shouldFitInViewPort(connectedFit: ConnectedFit) {
+        return true;
     }
 
-    /** @inheritdoc */
     protected fitInViewport(element: HTMLElement, connectedFit: ConnectedFit) {
         const heightOverflow = connectedFit.contentElementRect.height - connectedFit.viewPortRect.height;
         if (heightOverflow > 0) {

projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts

@@ -24,13 +24,13 @@ import { IgxColumnResizingService } from '../resizing/resizing.service';
 import { IgxOverlayService } from '../../services/overlay/overlay';
 import { IgxGridExcelStyleFilteringComponent } from '../filtering/excel-style/grid.excel-style-filtering.component';
 import { OverlaySettings, PositionSettings, VerticalAlignment } from '../../services/overlay/utilities';
-import { AutoElasticPositionStrategy } from '../../services/overlay/position/auto-elastic-position-strategy';
 import { useAnimation } from '@angular/animations';
 import { filter, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { fadeIn, fadeOut } from '../../animations/main';
 import { AbsoluteScrollStrategy } from '../../services/overlay/scroll/absolute-scroll-strategy';
 import { GridType } from '../common/grid.interface';
+import { ExcelStylePositionStrategy } from '../filtering/excel-style/excel-style-position-strategy';
 
 /**
  * @hidden
@@ -234,7 +234,7 @@ export class IgxGridHeaderComponent implements DoCheck, OnInit, OnDestroy {
         this._filterMenuOverlaySettings = {
             closeOnOutsideClick: true,
             modal: false,
-            positionStrategy: new AutoElasticPositionStrategy(this._filterMenuPositionSettings),
+            positionStrategy: new ExcelStylePositionStrategy(this._filterMenuPositionSettings),
             scrollStrategy: new AbsoluteScrollStrategy()
         };
 

projects/igniteui-angular/src/lib/services/overlay/position/base-fit-position-strategy.ts

@@ -4,7 +4,6 @@ import { HorizontalAlignment, VerticalAlignment, PositionSettings, Size, Util, C
 export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrategy {
     protected _initialSize: Size;
     protected _initialSettings: PositionSettings;
-    protected _forceFit = false;
 
     /** @inheritdoc */
     position(contentElement: HTMLElement, size: Size, document?: Document, initialCall?: boolean): void {
@@ -17,8 +16,7 @@ export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrate
             this.settings = Object.assign({}, this._initialSettings);
             connectedFit.viewPortRect = Util.getViewportRect(document);
             this.updateViewPortFit(connectedFit);
-            if (connectedFit.fitHorizontal.back < 0 || connectedFit.fitHorizontal.forward < 0 ||
-                connectedFit.fitVertical.back < 0 || connectedFit.fitVertical.forward < 0 || this._forceFit) {
+            if (this.shouldFitInViewPort(connectedFit)) {
                 this.fitInViewport(contentElement, connectedFit);
             }
         }
@@ -84,6 +82,15 @@ export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrate
         return targetRect.bottom + targetRect.height * startPoint + elementRect.height * direction + offset;
     }
 
+    /**
+     * Returns whether the element should fit in viewport
+     * @param connectedFit connectedFit object containing all necessary parameters
+     */
+    protected shouldFitInViewPort(connectedFit: ConnectedFit) {
+        return connectedFit.fitHorizontal.back < 0 || connectedFit.fitHorizontal.forward < 0 ||
+            connectedFit.fitVertical.back < 0 || connectedFit.fitVertical.forward < 0;
+    }
+
     /**
      * Fits the element into viewport according to the position settings
      * @param element element to fit in viewport
@@ -93,5 +100,3 @@ export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrate
         element: HTMLElement,
         connectedFit: ConnectedFit);
 }
-
-