diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.html b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.html index 7504a8c65c4..37a5bfdf996 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.html +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.html @@ -77,7 +77,7 @@
> channel === panel ); } diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts index 8db906569a6..ca812fb0a0b 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts @@ -938,7 +938,8 @@ describe('IgxPivotGrid #pivotGrid', () => { // move first chip over the second one headerRow.onDimDragOver({ dragChip: { - id: 'ProductCategory' + id: 'ProductCategory', + data: { pivotArea: 'row' } }, owner: rowChip2, originalEvent: { @@ -953,7 +954,8 @@ describe('IgxPivotGrid #pivotGrid', () => { // drop chip headerRow.onDimDrop({ dragChip: { - id: 'ProductCategory' + id: 'ProductCategory', + data: { pivotArea: 'row' } }, owner: rowChip2 }, rowChipArea, PivotDimensionType.Row); @@ -988,7 +990,8 @@ describe('IgxPivotGrid #pivotGrid', () => { // move first chip over the second one headerRow.onDimDragOver({ dragChip: { - id: 'Country' + id: 'Country', + data: { pivotArea: 'column' } }, owner: colChip2, originalEvent: { @@ -1003,7 +1006,8 @@ describe('IgxPivotGrid #pivotGrid', () => { // drop chip headerRow.onDimDrop({ dragChip: { - id: 'Country' + id: 'Country', + data: { pivotArea: 'column' } }, owner: colChip2 }, colChipArea, PivotDimensionType.Column); @@ -1029,7 +1033,8 @@ describe('IgxPivotGrid #pivotGrid', () => { // move first chip over the second one headerRow.onDimDragOver({ dragChip: { - id: 'UnitsSold' + id: 'UnitsSold', + data: { pivotArea: 'value' } }, owner: valChip2, originalEvent: { diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html index 9354aee7837..9d85981c0f2 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html @@ -14,7 +14,7 @@ - @@ -53,7 +53,7 @@ - - @@ -130,7 +130,7 @@ - x.member === event.dragChip.id || x.displayName === event.dragChip.id) : !this.grid.pivotConfiguration.values.find(x => x.member === event.dragChip.id || x.displayName === event.dragChip.id); @@ -534,6 +535,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem * @internal */ public onValueDrop(event, area) { + if (!(event.dragChip && event.dragChip.data?.pivotArea) && !(event.dragData?.chip && !!event.dragData.chip.data.pivotArea)) return; //values can only be reordered const values = this.grid.pivotConfiguration.values; const dragId = event.dragChip?.id || event.dragData?.chip.id; @@ -552,6 +554,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem * @internal */ public onDimDrop(event, area, dimensionType: PivotDimensionType) { + if (!(event.dragChip && event.dragChip.data?.pivotArea) && !(event.dragData?.chip && !!event.dragData.chip.data.pivotArea)) return; const dragId = event.dragChip?.id || event.dragData?.chip.id; const currentDim = this.grid.getDimensionsByType(dimensionType); const chipsArray = area.chipsList.toArray(); diff --git a/src/app/pivot-grid/pivot-grid.sample.html b/src/app/pivot-grid/pivot-grid.sample.html index 7da17f0ba48..7fd856f52bd 100644 --- a/src/app/pivot-grid/pivot-grid.sample.html +++ b/src/app/pivot-grid/pivot-grid.sample.html @@ -15,25 +15,32 @@ + @@ -48,17 +55,19 @@
- - +
+ +
diff --git a/src/app/pivot-grid/pivot-grid.sample.scss b/src/app/pivot-grid/pivot-grid.sample.scss index 020b4629315..872133520a6 100644 --- a/src/app/pivot-grid/pivot-grid.sample.scss +++ b/src/app/pivot-grid/pivot-grid.sample.scss @@ -52,4 +52,5 @@ igx-pivot-grid { align-items: flex-start; flex: 1 1 auto; order: 0; + align-items: stretch; } diff --git a/src/app/pivot-grid/pivot-grid.sample.ts b/src/app/pivot-grid/pivot-grid.sample.ts index 4db8faf747d..74fca84ea04 100644 --- a/src/app/pivot-grid/pivot-grid.sample.ts +++ b/src/app/pivot-grid/pivot-grid.sample.ts @@ -51,9 +51,7 @@ export class IgxTotalSaleAggregate { }) export class PivotGridSampleComponent { @ViewChild('grid1', { static: true }) public grid1: IgxPivotGridComponent; - public comfortable: DisplayDensity = DisplayDensity.comfortable; - public cosy: DisplayDensity = DisplayDensity.cosy; - public compact: DisplayDensity = DisplayDensity.compact; + public gridDensity = 'superCompact'; public filterExpTree = new FilteringExpressionsTree(FilteringLogic.And); @@ -274,7 +272,7 @@ export class PivotGridSampleComponent { } public setDensity(density: DisplayDensity) { - this.grid1.displayDensity = density; + this.gridDensity = density; } public autoSizeRow(ind) {