Skip to content

Commit a7623f2

Browse files
MKirovaMKirova
MKirova
authored and
MKirova
committed
Merge from base.
2 parents a3e0a49 + ca10fbe commit a7623f2

28 files changed

+1945
-1646
lines changed

‎package-lock.json‎

Lines changed: 1385 additions & 1430 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@
5151
},
5252
"private": true,
5353
"dependencies": {
54-
"@angular/animations": "^13.0.0",
55-
"@angular/common": "^13.0.0",
56-
"@angular/compiler": "^13.0.0",
57-
"@angular/core": "^13.0.0",
58-
"@angular/forms": "^13.0.0",
59-
"@angular/platform-browser": "^13.0.0",
60-
"@angular/platform-browser-dynamic": "^13.0.0",
61-
"@angular/router": "^13.0.0",
54+
"@angular/animations": "^13.0.2",
55+
"@angular/common": "^13.0.2",
56+
"@angular/compiler": "^13.0.2",
57+
"@angular/core": "^13.0.2",
58+
"@angular/forms": "^13.0.2",
59+
"@angular/platform-browser": "^13.0.2",
60+
"@angular/platform-browser-dynamic": "^13.0.2",
61+
"@angular/router": "^13.0.2",
6262
"@igniteui/material-icons-extended": "^2.10.0",
6363
"@types/hammerjs": "^2.0.40",
6464
"@types/source-map": "0.5.2",
@@ -75,28 +75,28 @@
7575
"zone.js": "~0.11.4"
7676
},
7777
"devDependencies": {
78-
"@angular-devkit/build-angular": "~13.0.1",
79-
"@angular-devkit/schematics": "^13.0.1",
80-
"@angular-eslint/builder": "^13.0.0-alpha.0",
81-
"@angular-eslint/eslint-plugin": "^12.6.1",
82-
"@angular-eslint/eslint-plugin-template": "^12.6.1",
83-
"@angular-eslint/schematics": "^12.6.1",
84-
"@angular-eslint/template-parser": "^12.6.1",
85-
"@angular/cli": "~13.0.1",
86-
"@angular/compiler-cli": "^13.0.0",
87-
"@angular/language-service": "^13.0.0",
78+
"@angular-devkit/build-angular": "~13.0.3",
79+
"@angular-devkit/schematics": "^13.0.3",
80+
"@angular-eslint/builder": "^13.0.1",
81+
"@angular-eslint/eslint-plugin": "^13.0.1",
82+
"@angular-eslint/eslint-plugin-template": "^13.0.1",
83+
"@angular-eslint/schematics": "^13.0.1",
84+
"@angular-eslint/template-parser": "^13.0.1",
85+
"@angular/cli": "~13.0.3",
86+
"@angular/compiler-cli": "^13.0.2",
87+
"@angular/language-service": "^13.0.2",
8888
"@angularclass/hmr": "^2.1.3",
8989
"@types/jasmine": "^3.10.2",
9090
"@types/jasminewd2": "^2.0.10",
9191
"@types/node": "^12.20.36",
9292
"@types/webpack-env": "^1.16.3",
93-
"@typescript-eslint/eslint-plugin": "4.16.1",
94-
"@typescript-eslint/parser": "4.16.1",
93+
"@typescript-eslint/eslint-plugin": "5.3.0",
94+
"@typescript-eslint/parser": "5.3.0",
9595
"browser-sync": "^2.27.7",
9696
"codelyzer": "^6.0.2",
9797
"coveralls": "^3.1.1",
98-
"eslint": "^7.32.0",
99-
"eslint-plugin-import": "2.22.1",
98+
"eslint": "^8.2.0",
99+
"eslint-plugin-import": "2.25.2",
100100
"eslint-plugin-jsdoc": "30.7.6",
101101
"eslint-plugin-prefer-arrow": "1.2.2",
102102
"gulp": "^4.0.2",

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-component.scss‎

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -548,10 +548,43 @@
548548
}
549549
}
550550

551+
// Pivot start
552+
@include e(tr-pivot) {
553+
@extend %igx-grid__tr-pivot !optional
554+
}
555+
556+
@include e(tr-pivot, $m: 'row-area') {
557+
@extend %igx-grid__tr-pivot--row-area !optional
558+
}
559+
560+
@include e(tr-pivot, $m: 'filter') {
561+
@extend %igx-grid__tr-pivot--filter !optional
562+
}
563+
564+
@include e(tr-pivot-group) {
565+
@extend %igx-grid__tr-pivot-group !optional
566+
}
567+
568+
@include e(tr-pivot-toggle-icons) {
569+
@extend %igx-grid__tr-pivot-toggle-icons !optional;
570+
}
571+
// pivot end
551572

552573
@include m(cosy) {
553574
@extend %grid-display !optional;
554575

576+
@include e(tr-pivot) {
577+
@extend %igx-grid__tr-pivot--cosy !optional
578+
}
579+
580+
@include e(tr-pivot, $m: 'row-area') {
581+
@extend %igx-grid__tr-pivot--row-area--cosy !optional
582+
}
583+
584+
@include e(tr-pivot, $m: 'filter') {
585+
@extend %igx-grid__tr-pivot--filter--cosy !optional
586+
}
587+
555588
@include e(drag-indicator) {
556589
@extend %igx-grid__drag-indicator--cosy !optional;
557590
}
@@ -641,6 +674,18 @@
641674
@include m(compact) {
642675
@extend %grid-display !optional;
643676

677+
@include e(tr-pivot) {
678+
@extend %igx-grid__tr-pivot--compact !optional
679+
}
680+
681+
@include e(tr-pivot, $m: 'row-area') {
682+
@extend %igx-grid__tr-pivot--row-area--compact !optional
683+
}
684+
685+
@include e(tr-pivot, $m: 'filter') {
686+
@extend %igx-grid__tr-pivot--filter--compact !optional
687+
}
688+
644689
@include e(drag-indicator) {
645690
@extend %igx-grid__drag-indicator--compact !optional;
646691
}
@@ -727,22 +772,6 @@
727772
}
728773
}
729774

730-
@include e(tr-pivot) {
731-
@extend %igx-grid__tr-pivot !optional
732-
}
733-
734-
@include e(tr-pivot, $m: 'row-area') {
735-
@extend %igx-grid__tr-pivot--row-area !optional
736-
}
737-
738-
@include e(tr-pivot, $m: 'filter') {
739-
@extend %igx-grid__tr-pivot--filter !optional
740-
}
741-
742-
@include e(tr-pivot-group) {
743-
@extend %igx-grid__tr-pivot-group !optional
744-
}
745-
746775
@include excel-filtering-partial();
747776
@include advanced-filtering-partial();
748777
@include group-by-area();

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,12 @@
640640
compact: 0 $padding-compact
641641
);
642642

643+
$pivot-row-aria-padding: (
644+
comfortable: $padding-comfortable,
645+
cosy: $padding-cosy,
646+
compact: $padding-compact
647+
);
648+
643649
$grid-cbx-padding: (
644650
comfortable: $padding-comfortable,
645651
cosy: $padding-cosy,
@@ -2879,20 +2885,29 @@
28792885
display: flex;
28802886
align-items: center;
28812887
background: inherit;
2888+
overflow: hidden;
28822889
z-index: 3;
2890+
height: map.get($grid-header-height, 'comfortable');
28832891

2884-
&:not(&--row-area) {
2885-
height: map.get($grid-header-height, 'comfortable');
2892+
&--cosy {
2893+
height: map.get($grid-header-height, 'cosy');
2894+
padding: map.get($grid-header-padding, 'cosy');
2895+
}
2896+
2897+
&--compact {
2898+
height: map.get($grid-header-height, 'compact');
2899+
padding: map.get($grid-header-padding, 'compact');
28862900
}
28872901

28882902
padding: map.get($grid-header-padding, 'comfortable');
28892903
background-clip: border-box !important;
2890-
28912904
border-#{$left}: var-get($theme, 'header-border-width') var-get($theme, 'header-border-style') var-get($theme, 'header-border-color');
28922905
border-#{$right}: var-get($theme, 'header-border-width') var-get($theme, 'header-border-style') var-get($theme, 'header-border-color');
28932906
border-bottom: var-get($theme, 'header-border-width') var-get($theme, 'header-border-style') var-get($theme, 'header-border-color');
28942907

28952908
igx-chips-area {
2909+
flex-wrap: nowrap;
2910+
28962911
> * {
28972912
margin-#{$right}: rem(8px);
28982913
}
@@ -2904,14 +2919,33 @@
29042919
}
29052920

29062921
%igx-grid__tr-pivot--row-area {
2922+
height: auto !important;
29072923
align-items: flex-end;
2908-
padding-bottom: $padding-comfortable;
2924+
padding-bottom: map.get($pivot-row-aria-padding, 'comfortable');
2925+
2926+
&--cosy{
2927+
padding-bottom: map.get($pivot-row-aria-padding, 'cosy');
2928+
}
2929+
2930+
&--compact{
2931+
padding-bottom: map.get($pivot-row-aria-padding, 'compact');
2932+
}
2933+
29092934
border-#{$left}: 0;
29102935
border-bottom: 0;
29112936
}
29122937

29132938
%igx-grid__tr-pivot--filter {
29142939
height: map.get($grid-header-height, 'comfortable');
2940+
2941+
&--cosy {
2942+
height: map.get($grid-header-height, 'cosy');
2943+
}
2944+
2945+
&--compact {
2946+
height: map.get($grid-header-height, 'compact');
2947+
}
2948+
29152949
border-left: 0;
29162950
border-right: 0;
29172951
border-bottom: var-get($theme, 'header-border-width') var-get($theme, 'header-border-style') var-get($theme, 'header-border-color');
@@ -2924,7 +2958,12 @@
29242958
%igx-grid__tr-pivot-group {
29252959
flex: 1;
29262960
}
2961+
2962+
%igx-grid__tr-pivot-toggle-icons {
2963+
display: inline-flex !important;
2964+
}
29272965
// Pivot grid END
29282966
}
29292967

29302968

2969+

‎projects/igniteui-angular/src/lib/data-operations/pivot-strategy.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ export class PivotColumnDimensionsStrategy implements IPivotDimensionStrategy {
121121
delete hierarchy[k];
122122
}
123123
});
124-
delete hierarchy.processed;
125-
if (this.isLeaf(hierarchy, pivotKeys)) {
126-
delete hierarchy[pivotKeys.records]; /* remove the helper records of the actual records so that
127-
expand indicators can be rendered properly */
128-
}
129124
for (const property in flatCols) {
130125
if (flatCols.hasOwnProperty(property)) {
131126
hierarchy[property] = flatCols[property];
@@ -179,7 +174,7 @@ export class DimensionValuesFilteringStrategy extends FilteringStrategy {
179174
protected getFieldValue(rec: any, fieldName: string, isDate: boolean = false, isTime: boolean = false,
180175
grid?: PivotGridType): any {
181176
const config = grid.pivotConfiguration;
182-
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
177+
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined);
183178
const enabledDimensions = allDimensions.filter(x => x && x.enabled);
184179
const dim = PivotUtil.flatten(enabledDimensions).find(x => x.memberName === fieldName);
185180
return PivotUtil.extractValueFromDimension(dim, rec);
@@ -202,7 +197,7 @@ export class DefaultPivotSortingStrategy extends DefaultSortingStrategy {
202197
grid?: PivotGridType) {
203198
const key = fieldName;
204199
const config = grid.pivotConfiguration;
205-
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
200+
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined);
206201
const enabledDimensions = allDimensions.filter(x => x && x.enabled);
207202
this.dimension = PivotUtil.flatten(enabledDimensions).find(x => x.memberName === key);
208203
const reverse = (dir === SortingDirection.Desc ? -1 : 1);

‎projects/igniteui-angular/src/lib/grids/common/grid.interface.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { IGridGroupingStrategy, IGridSortingStrategy } from './strategy';
3434
import { IForOfState, IgxGridForOfDirective } from '../../directives/for-of/for_of.directive';
3535
import { OverlaySettings } from '../../services/overlay/utilities';
3636
import { IPinningConfig } from '../grid.common';
37-
import { IPivotConfiguration, IPivotDimension, IPivotKeys, IPivotValue } from '../pivot-grid/pivot-grid.interface';
37+
import { IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotKeys, IPivotValue, IValuesChange } from '../pivot-grid/pivot-grid.interface';
3838

3939

4040
export const IGX_GRID_BASE = new InjectionToken<GridType>('IgxGridBaseToken');
@@ -628,6 +628,9 @@ export interface PivotGridType extends GridType {
628628
setupColumns(): void;
629629
toggleRow(rowID: any): void;
630630
resolveDataTypes(field: any): GridColumnDataType;
631+
resolveRowDimensionWidth(dim: IPivotDimension): number;
632+
dimensionsChange: EventEmitter<IDimensionsChange>;
633+
valuesChange: EventEmitter<IValuesChange>;
631634
pivotKeys: IPivotKeys;
632635
}
633636
export interface GridSVGIcon {

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/base-filtering.component.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ export abstract class BaseFilteringComponent {
1818
public abstract expressionsList: ExpressionUI[];
1919
public abstract listData: FilterListItem[];
2020

21-
abstract loadingStart: EventEmitter<undefined>;
22-
abstract loadingEnd: EventEmitter<undefined>;
23-
abstract initialized: EventEmitter<undefined>;
24-
abstract columnChange: EventEmitter<any>;
25-
abstract sortingChanged: EventEmitter<undefined>;
26-
abstract listDataLoaded: EventEmitter<undefined>;
21+
public abstract loadingStart: EventEmitter<undefined>;
22+
public abstract loadingEnd: EventEmitter<undefined>;
23+
public abstract initialized: EventEmitter<undefined>;
24+
public abstract columnChange: EventEmitter<any>;
25+
public abstract sortingChanged: EventEmitter<undefined>;
26+
public abstract listDataLoaded: EventEmitter<undefined>;
2727

2828
constructor(
2929
protected cdr: ChangeDetectorRef,
@@ -32,13 +32,13 @@ export abstract class BaseFilteringComponent {
3232
) { }
3333

3434

35-
abstract initialize(column: any, overlayService: IgxOverlayService): void;
36-
abstract detectChanges(): void;
37-
abstract hide(): void;
38-
abstract closeDropdown(): void;
39-
abstract onSelect(): void;
40-
abstract onPin(): void;
41-
abstract onHideToggle(): void;
42-
abstract cancel(): void;
35+
public abstract initialize(column: any, overlayService: IgxOverlayService): void;
36+
public abstract detectChanges(): void;
37+
public abstract hide(): void;
38+
public abstract closeDropdown(): void;
39+
public abstract onSelect(): void;
40+
public abstract onPin(): void;
41+
public abstract onHideToggle(): void;
42+
public abstract cancel(): void;
4343

4444
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2786,8 +2786,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
27862786
* @hidden @internal
27872787
*/
27882788
public abstract id: string;
2789-
abstract data: any[] | null;
2790-
abstract filteredData: any[];
2789+
public abstract data: any[] | null;
2790+
public abstract filteredData: any[];
27912791
/**
27922792
* Returns an array containing the filtered sorted data.
27932793
*

‎projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-filtering.service.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ export class IgxPivotFilteringService extends IgxFilteringService {
1616
super.clear_filter(fieldName);
1717
const grid = this.grid;
1818
const config = (grid as IgxPivotGridComponent).pivotConfiguration;
19-
const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null));
20-
const enabledDimensions = allDimensions.filter(x => x && x.enabled);
21-
const dim = enabledDimensions.find(x => x.memberName === fieldName || x.member === fieldName) || {};
19+
const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined));
20+
const dim = allDimensions.find(x => x.memberName === fieldName || x.member === fieldName);
2221
dim.filters = undefined;
2322
grid.filteringPipeTrigger++;
2423
if (PivotUtil.flatten(config.columns).indexOf(dim) !== -1) {
@@ -31,7 +30,7 @@ export class IgxPivotFilteringService extends IgxFilteringService {
3130
super.filter_internal(fieldName, term, conditionOrExpressionsTree, ignoreCase);
3231
const grid = this.grid;
3332
const config = (grid as IgxPivotGridComponent).pivotConfiguration;
34-
const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null));
33+
const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined));
3534
const enabledDimensions = allDimensions.filter(x => x && x.enabled);
3635
const dim = enabledDimensions.find(x => x.memberName === fieldName || x.member === fieldName);
3736
const filteringTree = dim.filters || new FilteringExpressionsTree(FilteringLogic.And);

‎projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
</ng-template>
4848
</ng-template>
4949
<ng-template #record_template let-rowIndex="index" let-rowData>
50-
<igx-pivot-row [gridID]="id" [index]="rowIndex" [data]="rowData" [ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
50+
<igx-pivot-row [pivotRowWidths]='pivotRowWidths' [gridID]="id" [index]="rowIndex" [data]="rowData"
51+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
5152
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger" #row>
5253
</igx-pivot-row>
5354
</ng-template>

0 commit comments

Comments
 (0)