@progress/kendo-angular-grid 13.0.2 → 13.0.3-develop.2

package/esm2020/selection/cell-selection.service.mjs

@@ -8,20 +8,22 @@ import { isPresent } from '../utils';
 import { DomEventsService } from '../common/dom-events.service';
 import { LocalDataChangesService } from '../editing/local-data-changes.service';
 import { NavigationService } from '../navigation/navigation.service';
+import { CellSelectionAggregateService } from '../aggregates/selection-aggregate.service';
 import * as i0 from "@angular/core";
 import * as i1 from "../common/dom-events.service";
-import * as i2 from "../editing/local-data-changes.service";
-import * as i3 from "../navigation/navigation.service";
+import * as i2 from "../aggregates/selection-aggregate.service";
+import * as i3 from "../editing/local-data-changes.service";
+import * as i4 from "../navigation/navigation.service";
 /**
  * @hidden
  */
 export class CellSelectionService {
-    constructor(domEvents, localDataChangesService, navigationService) {
+    constructor(domEvents, aggregateService, localDataChangesService, navigationService) {
         this.domEvents = domEvents;
+        this.aggregateService = aggregateService;
         this.localDataChangesService = localDataChangesService;
         this.navigationService = navigationService;
         this.changes = new EventEmitter();
-        this.aggregateChanges = new EventEmitter();
         this.mouseUpEvent = new EventEmitter();
         this.currentSelection = [];
         this.active = false;
@@ -107,9 +109,8 @@ export class CellSelectionService {
         }
         ev.ctrlKey = ctrlKey;
         ev.shiftKey = event.shiftKey;
-        if (this.options.cellAggregates) {
-            this.aggregateChanges.emit(ev);
-            ev.cellAggregates = this.aggregates;
+        if (this.options.cellAggregates && !event.shiftKey) {
+            ev.cellAggregates = this.aggregateService.onSelectionChange(ev);
         }
         if (ev.shiftKey) {
             ev.rangeStartCell = this.lastSelectionItem;
@@ -222,8 +223,7 @@ export class CellSelectionService {
         }
         let cellAggregates;
         if (this.options.cellAggregates) {
-            this.aggregateChanges.emit({ selectedCells, deselectedCells });
-            cellAggregates = this.aggregates;
+            cellAggregates = this.aggregateService.onSelectionChange({ selectedCells, deselectedCells });
         }
         return {
             deselectedCells,
@@ -310,8 +310,8 @@ export class CellSelectionService {
         }
     }
 }
-CellSelectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CellSelectionService, deps: [{ token: i1.DomEventsService }, { token: i2.LocalDataChangesService }, { token: i3.NavigationService }], target: i0.ɵɵFactoryTarget.Injectable });
+CellSelectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CellSelectionService, deps: [{ token: i1.DomEventsService }, { token: i2.CellSelectionAggregateService }, { token: i3.LocalDataChangesService }, { token: i4.NavigationService }], target: i0.ɵɵFactoryTarget.Injectable });
 CellSelectionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CellSelectionService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CellSelectionService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.DomEventsService }, { type: i2.LocalDataChangesService }, { type: i3.NavigationService }]; } });
+        }], ctorParameters: function () { return [{ type: i1.DomEventsService }, { type: i2.CellSelectionAggregateService }, { type: i3.LocalDataChangesService }, { type: i4.NavigationService }]; } });

package/esm2020/selection/selection-checkbox.directive.mjs

@@ -5,8 +5,10 @@
 import { Directive, HostBinding, ElementRef, Input, Renderer2, NgZone } from '@angular/core';
 import { SelectionService } from './selection.service';
 import { Keys } from '@progress/kendo-angular-common';
+import { CellSelectionAggregateService } from '../aggregates/selection-aggregate.service';
 import * as i0 from "@angular/core";
 import * as i1 from "./selection.service";
+import * as i2 from "../aggregates/selection-aggregate.service";
 /**
  * Represents the row-selection checkbox of the Grid. The directive expects the
  * index of the current row as an input parameter. Inside the [`CellTemplateDirective`](slug:api_grid_celltemplatedirective), apply the
@@ -26,8 +28,9 @@ import * as i1 from "./selection.service";
  * ```
  */
 export class SelectionCheckboxDirective {
-    constructor(selectionService, el, renderer, ngZone) {
+    constructor(selectionService, aggregateService, el, renderer, ngZone) {
         this.selectionService = selectionService;
+        this.aggregateService = aggregateService;
         this.el = el;
         this.renderer = renderer;
         this.ngZone = ngZone;
@@ -54,8 +57,9 @@ export class SelectionCheckboxDirective {
                 const ev = this.selectionService.toggleByIndex(this.itemIndex);
                 ev.ctrlKey = true;
                 ev.shiftKey = false;
-                this.selectionService.aggregateChanges.emit(ev);
-                ev.cellAggregates = this.selectionService.aggregates;
+                if (this.selectionService.options.cellAggregates) {
+                    ev.cellAggregates = this.aggregateService.onSelectionChange(ev);
+                }
                 this.selectionService.changes.emit(ev);
             });
         }
@@ -72,14 +76,14 @@ export class SelectionCheckboxDirective {
         this.renderer.setProperty(this.el.nativeElement, 'checked', this.selectionService.isSelected(this.itemIndex));
     }
 }
-SelectionCheckboxDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionCheckboxDirective, deps: [{ token: i1.SelectionService }, { token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
+SelectionCheckboxDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionCheckboxDirective, deps: [{ token: i1.SelectionService }, { token: i2.CellSelectionAggregateService }, { token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
 SelectionCheckboxDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: SelectionCheckboxDirective, selector: "[kendoGridSelectionCheckbox]", inputs: { itemIndex: ["kendoGridSelectionCheckbox", "itemIndex"] }, host: { properties: { "attr.type": "this.type" } }, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionCheckboxDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[kendoGridSelectionCheckbox]'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.SelectionService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.NgZone }]; }, propDecorators: { itemIndex: [{
+        }], ctorParameters: function () { return [{ type: i1.SelectionService }, { type: i2.CellSelectionAggregateService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.NgZone }]; }, propDecorators: { itemIndex: [{
                 type: Input,
                 args: ['kendoGridSelectionCheckbox']
             }], type: [{

package/esm2020/selection/selection.service.mjs

@@ -9,22 +9,24 @@ import { DomEventsService } from '../common/dom-events.service';
 import { LocalDataChangesService } from '../editing/local-data-changes.service';
 import { NavigationService } from '../navigation/navigation.service';
 import { ContextService } from '../common/provider.service';
+import { CellSelectionAggregateService } from '../aggregates/selection-aggregate.service';
 import * as i0 from "@angular/core";
 import * as i1 from "../common/dom-events.service";
-import * as i2 from "../editing/local-data-changes.service";
-import * as i3 from "../navigation/navigation.service";
-import * as i4 from "../common/provider.service";
+import * as i2 from "../aggregates/selection-aggregate.service";
+import * as i3 from "../editing/local-data-changes.service";
+import * as i4 from "../navigation/navigation.service";
+import * as i5 from "../common/provider.service";
 /**
  * @hidden
  */
 export class SelectionService {
-    constructor(domEvents, localDataChangesService, navigationService, ctxService) {
+    constructor(domEvents, aggregateService, localDataChangesService, navigationService, ctxService) {
         this.domEvents = domEvents;
+        this.aggregateService = aggregateService;
         this.localDataChangesService = localDataChangesService;
         this.navigationService = navigationService;
         this.ctxService = ctxService;
         this.changes = new EventEmitter();
-        this.aggregateChanges = new EventEmitter();
         this.currentSelection = [];
         this.selectAllChecked = false;
         this.active = false;
@@ -113,8 +115,7 @@ export class SelectionService {
         ev.ctrlKey = ctrlKey;
         ev.shiftKey = event.shiftKey;
         if (this.options.cellAggregates) {
-            this.aggregateChanges.emit(ev);
-            ev.cellAggregates = this.aggregates;
+            ev.cellAggregates = this.aggregateService.onSelectionChange(ev);
         }
         if (ev.shiftKey) {
             ev.rangeStartRow = { dataItem: this.lastSelectionData, index: this.lastSelectionStartIndex };
@@ -254,6 +255,9 @@ export class SelectionService {
             selectedRows: selectedRows,
             shiftKey: true
         };
+        if (this.options.cellAggregates) {
+            ev.cellAggregates = this.aggregateService.onSelectionChange(ev);
+        }
         this.changes.emit(ev);
     }
     selectRange(startIndex, endIndex) {
@@ -278,8 +282,7 @@ export class SelectionService {
         }
         let cellAggregates;
         if (this.options.cellAggregates) {
-            this.aggregateChanges.emit({ selectedRows, deselectedRows });
-            cellAggregates = this.aggregates;
+            cellAggregates = this.aggregateService.onSelectionChange({ selectedRows, deselectedRows });
         }
         return {
             deselectedRows: deselectedRows,
@@ -380,8 +383,8 @@ export class SelectionService {
         }
     }
 }
-SelectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionService, deps: [{ token: i1.DomEventsService }, { token: i2.LocalDataChangesService }, { token: i3.NavigationService }, { token: i4.ContextService }], target: i0.ɵɵFactoryTarget.Injectable });
+SelectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionService, deps: [{ token: i1.DomEventsService }, { token: i2.CellSelectionAggregateService }, { token: i3.LocalDataChangesService }, { token: i4.NavigationService }, { token: i5.ContextService }], target: i0.ɵɵFactoryTarget.Injectable });
 SelectionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: SelectionService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.DomEventsService }, { type: i2.LocalDataChangesService }, { type: i3.NavigationService }, { type: i4.ContextService }]; } });
+        }], ctorParameters: function () { return [{ type: i1.DomEventsService }, { type: i2.CellSelectionAggregateService }, { type: i3.LocalDataChangesService }, { type: i4.NavigationService }, { type: i5.ContextService }]; } });