Skip to content

Commit f2506cd

Browse files
committed
Merge remote-tracking branch 'origin/pivot-grid-master' into dkamburov/pivot-keyboard-nav
2 parents 8bda7da + 7aecb7a commit f2506cd

38 files changed

+3004
-2904
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ All notable changes for each version of this project will be documented in this
846846

847847
Changed the how the grid toolbar is instantiated in the grids. The
848848
toolbar is now templated rather than being activated through a property on the parent grid. The toolbar features are also exposed as templatable
849-
components and the old properties are deprecated.
849+
components and the old properties are deprecated. The implementation of the Column Hiding UI has been changed in order to select which columns should be displayed, instead of hidden.
850850

851851
Refer to the official documentation for more information.
852852
- `FilteringStrategy`

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",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"@scheme": "../../common/schema/binding.schema.json",
3+
"changes": [
4+
{
5+
"name": "color",
6+
"remove": "true",
7+
"owner": {
8+
"selector": "igx-icon",
9+
"type": "component"
10+
}
11+
}
12+
]
13+
}
14+

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@angular/forms": "^13.0.0"
8888
},
8989
"igxDevDependencies": {
90-
"@igniteui/angular-schematics": "~13.0.900-rc.2"
90+
"@igniteui/angular-schematics": "~13.0.900"
9191
},
9292
"ng-update": {
9393
"migrations": "./migrations/migration-collection.json"

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

Lines changed: 45 additions & 0 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
}

0 commit comments

Comments
 (0)