@progress/kendo-angular-grid 6.0.4-dev.202202221309 → 6.1.0-dev.202203010950

package/dist/es2015/columns/sort-settings.js

@@ -9,7 +9,8 @@ const DEFAULTS = {
     allowUnsort: true,
     mode: 'single',
     showIndexes: true,
-    initialDirection: 'asc'
+    initialDirection: 'asc',
+    multiSortKey: 'none'
 };
 /**
  * @hidden

package/dist/es2015/grid.component.d.ts

@@ -71,6 +71,7 @@ import { CellSelectionService } from './selection/cell-selection.service';
 import { ColumnStickyChangeEvent } from './column-menu/column-sticky-change-event';
 import { GroupRowArgs } from './grouping/group-rows-args.interface';
 import { CellLoadingTemplateDirective } from './rendering/cell-loading.template.directive';
+import { LoadingTemplateDirective } from './rendering/loading-template.directive';
 /**
  * Represents the Kendo UI Grid component for Angular.
  *
@@ -553,8 +554,10 @@ export declare class GridComponent implements AfterContentInit, AfterViewInit, O
     readonly noScrollbarClass: boolean;
     detailTemplateChildren: QueryList<DetailTemplateDirective>;
     detailTemplate: DetailTemplateDirective;
-    loadingTemplateChildren: QueryList<CellLoadingTemplateDirective>;
-    loadingTemplate: CellLoadingTemplateDirective;
+    cellLoadingTemplateChildren: QueryList<CellLoadingTemplateDirective>;
+    cellLoadingTemplate: CellLoadingTemplateDirective;
+    loadingTemplateChildren: QueryList<LoadingTemplateDirective>;
+    loadingTemplate: LoadingTemplateDirective;
     noRecordsTemplateChildren: QueryList<NoRecordsTemplateDirective>;
     noRecordsTemplate: NoRecordsTemplateDirective;
     pagerTemplateChildren: QueryList<PagerTemplateDirective>;
@@ -588,7 +591,8 @@ export declare class GridComponent implements AfterContentInit, AfterViewInit, O
     private _rowSelected;
     private _cellSelected;
     private _customDetailTemplate;
-    private _customLoadingTemplate;
+    private _cellLoadingTemplate;
+    private _loadingTemplate;
     private _customNoRecordsTemplate;
     private _customPagerTemplate;
     private _customToolbarTemplate;

package/dist/es2015/grid.component.js

@@ -70,6 +70,7 @@ import { defaultTrackBy } from './common/default-track-by';
 import { CellSelectionService } from './selection/cell-selection.service';
 import { ColumnStickyChangeEvent } from './column-menu/column-sticky-change-event';
 import { CellLoadingTemplateDirective } from './rendering/cell-loading.template.directive';
+import { LoadingTemplateDirective } from './rendering/loading-template.directive';
 const createControl = (source) => (acc, key) => {
     acc[key] = new FormControl(source[key]);
     return acc;
@@ -705,14 +706,23 @@ let GridComponent = class GridComponent {
     set detailTemplate(detailTemplate) {
         this._customDetailTemplate = detailTemplate;
     }
-    get loadingTemplate() {
-        if (this._customLoadingTemplate) {
+    get cellLoadingTemplate() {
+        if (this._cellLoadingTemplate) {
             return this._customDetailTemplate;
         }
+        return this.cellLoadingTemplateChildren ? this.cellLoadingTemplateChildren.first : undefined;
+    }
+    set cellLoadingTemplate(cellLoadingTemplate) {
+        this._cellLoadingTemplate = cellLoadingTemplate;
+    }
+    get loadingTemplate() {
+        if (this._loadingTemplate) {
+            return this._loadingTemplate;
+        }
         return this.loadingTemplateChildren ? this.loadingTemplateChildren.first : undefined;
     }
     set loadingTemplate(loadingTemplate) {
-        this._customLoadingTemplate = loadingTemplate;
+        this._loadingTemplate = loadingTemplate;
     }
     get noRecordsTemplate() {
         if (this._customNoRecordsTemplate) {
@@ -2317,6 +2327,10 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     ContentChildren(CellLoadingTemplateDirective),
     tslib_1.__metadata("design:type", QueryList)
+], GridComponent.prototype, "cellLoadingTemplateChildren", void 0);
+tslib_1.__decorate([
+    ContentChildren(LoadingTemplateDirective),
+    tslib_1.__metadata("design:type", QueryList)
 ], GridComponent.prototype, "loadingTemplateChildren", void 0);
 tslib_1.__decorate([
     ContentChildren(NoRecordsTemplateDirective),
@@ -2746,6 +2760,7 @@ GridComponent = tslib_1.__decorate([
                 [rowSticky]="rowSticky"
                 [loading]="loading"
                 [isVirtual]="isVirtual"
+                [cellLoadingTemplate]="cellLoadingTemplate?.templateRef"
                 [loadingTemplate]="loadingTemplate?.templateRef"
                 [virtualColumns]="virtualColumns"
                 (scrollBottom)="notifyScrollBottom()"
@@ -2850,7 +2865,7 @@ GridComponent = tslib_1.__decorate([
                     [detailTemplate]="detailTemplate">
                 </tfoot>
             </table>
-            <div *ngIf="loading" kendoGridLoading>
+            <div [loadingTemplate]="loadingTemplate" *ngIf="loading" kendoGridLoading>
             </div>
         </ng-template>
         </div>