Merge branch 'master' into editing-cell-tab-ime

Author: hanastasov

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -2920,6 +2920,24 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         return false;
     }
 
+    /**
+     * Returns the state of the grid virtualization, including the start index and how many records are rendered.
+     * ```typescript
+     * const gridVirtState = this.grid1.virtualizationState;
+     * ```
+	 * @memberof IgxGridBaseDirective
+     */
+    get virtualizationState() {
+        return this.verticalScrollContainer.state;
+    }
+
+    /**
+     * @hidden
+     */
+    set virtualizationState(state) {
+        this.verticalScrollContainer.state = state;
+    }
+
     /**
     * @hidden
     * @internal

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

@@ -173,24 +173,6 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
         this._filteredData = value;
     }
 
-    /**
-     * Returns the state of the grid virtualization, including the start index and how many records are rendered.
-     * ```typescript
-     * const gridVirtState = this.grid1.virtualizationState;
-     * ```
-	 * @memberof IgxGridComponent
-     */
-    get virtualizationState() {
-        return this.verticalScrollContainer.state;
-    }
-
-    /**
-     * @hidden
-     */
-    set virtualizationState(state) {
-        this.verticalScrollContainer.state = state;
-    }
-
     /**
      * Sets the total number of records in the data source.
      * This property is required for remote grid virtualization to function when it is bound to remote data.