Skip to content

Commit c868b38

Browse files
author
mmart1n
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into bpachilova/feat-7981-master
2 parents 701adf9 + 13d82c1 commit c868b38

File tree

13 files changed

+1616
-1615
lines changed

13 files changed

+1616
-1615
lines changed

‎CHANGELOG.md

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

842842
Changed the how the grid toolbar is instantiated in the grids. The
843843
toolbar is now templated rather than being activated through a property on the parent grid. The toolbar features are also exposed as templatable
844-
components and the old properties are deprecated.
844+
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.
845845

846846
Refer to the official documentation for more information.
847847
- `FilteringStrategy`

‎package-lock.json

Lines changed: 1383 additions & 1427 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
@@ -49,14 +49,14 @@
4949
},
5050
"private": true,
5151
"dependencies": {
52-
"@angular/animations": "^13.0.0",
53-
"@angular/common": "^13.0.0",
54-
"@angular/compiler": "^13.0.0",
55-
"@angular/core": "^13.0.0",
56-
"@angular/forms": "^13.0.0",
57-
"@angular/platform-browser": "^13.0.0",
58-
"@angular/platform-browser-dynamic": "^13.0.0",
59-
"@angular/router": "^13.0.0",
52+
"@angular/animations": "^13.0.2",
53+
"@angular/common": "^13.0.2",
54+
"@angular/compiler": "^13.0.2",
55+
"@angular/core": "^13.0.2",
56+
"@angular/forms": "^13.0.2",
57+
"@angular/platform-browser": "^13.0.2",
58+
"@angular/platform-browser-dynamic": "^13.0.2",
59+
"@angular/router": "^13.0.2",
6060
"@igniteui/material-icons-extended": "^2.10.0",
6161
"@types/hammerjs": "^2.0.40",
6262
"@types/source-map": "0.5.2",
@@ -73,28 +73,28 @@
7373
"zone.js": "~0.11.4"
7474
},
7575
"devDependencies": {
76-
"@angular-devkit/build-angular": "~13.0.1",
77-
"@angular-devkit/schematics": "^13.0.1",
78-
"@angular-eslint/builder": "^13.0.0-alpha.0",
79-
"@angular-eslint/eslint-plugin": "^12.6.1",
80-
"@angular-eslint/eslint-plugin-template": "^12.6.1",
81-
"@angular-eslint/schematics": "^12.6.1",
82-
"@angular-eslint/template-parser": "^12.6.1",
83-
"@angular/cli": "~13.0.1",
84-
"@angular/compiler-cli": "^13.0.0",
85-
"@angular/language-service": "^13.0.0",
76+
"@angular-devkit/build-angular": "~13.0.3",
77+
"@angular-devkit/schematics": "^13.0.3",
78+
"@angular-eslint/builder": "^13.0.1",
79+
"@angular-eslint/eslint-plugin": "^13.0.1",
80+
"@angular-eslint/eslint-plugin-template": "^13.0.1",
81+
"@angular-eslint/schematics": "^13.0.1",
82+
"@angular-eslint/template-parser": "^13.0.1",
83+
"@angular/cli": "~13.0.3",
84+
"@angular/compiler-cli": "^13.0.2",
85+
"@angular/language-service": "^13.0.2",
8686
"@angularclass/hmr": "^2.1.3",
8787
"@types/jasmine": "^3.10.2",
8888
"@types/jasminewd2": "^2.0.10",
8989
"@types/node": "^12.20.36",
9090
"@types/webpack-env": "^1.16.3",
91-
"@typescript-eslint/eslint-plugin": "4.16.1",
92-
"@typescript-eslint/parser": "4.16.1",
91+
"@typescript-eslint/eslint-plugin": "5.3.0",
92+
"@typescript-eslint/parser": "5.3.0",
9393
"browser-sync": "^2.27.7",
9494
"codelyzer": "^6.0.2",
9595
"coveralls": "^3.1.1",
96-
"eslint": "^7.32.0",
97-
"eslint-plugin-import": "2.22.1",
96+
"eslint": "^8.2.0",
97+
"eslint-plugin-import": "2.25.2",
9898
"eslint-plugin-jsdoc": "30.7.6",
9999
"eslint-plugin-prefer-arrow": "1.2.2",
100100
"gulp": "^4.0.2",

‎projects/igniteui-angular/migrations/update-13_0_0/changes/inputs.json

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-theme.scss

Lines changed: 60 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,7 @@
10231023
border-bottom: 1px solid var-get($theme, 'row-border-color');
10241024
outline-style: none;
10251025
position: relative;
1026+
background-clip: content-box !important;
10261027

10271028
&:hover {
10281029
background: var-get($theme, 'row-hover-background');
@@ -1106,35 +1107,6 @@
11061107
color: var-get($theme, 'row-even-text-color');
11071108
}
11081109

1109-
%grid-row--selected {
1110-
color: var-get($theme, 'row-selected-text-color');
1111-
background: var-get($theme, 'row-selected-background');
1112-
1113-
%grid-cell--selected,
1114-
%grid-cell--pinned-selected {
1115-
color: var-get($theme, 'cell-selected-within-text-color');
1116-
background: var-get($theme, 'cell-selected-within-background');
1117-
}
1118-
1119-
&:hover {
1120-
background: var-get($theme, 'row-selected-hover-background');
1121-
color: var-get($theme, 'row-selected-hover-text-color');
1122-
1123-
%grid-cell--column-selected {
1124-
color: var-get($theme, 'row-selected-hover-text-color');
1125-
background: var-get($theme, 'row-selected-hover-background');
1126-
}
1127-
}
1128-
1129-
%igx-grid__tree-grouping-indicator {
1130-
color: var-get($theme, 'row-selected-text-color');
1131-
1132-
&:hover {
1133-
color: var-get($theme, 'row-selected-text-color');
1134-
}
1135-
}
1136-
}
1137-
11381110
%igx-grid__tr--expanded {
11391111
border-bottom: none;
11401112
}
@@ -1352,6 +1324,7 @@
13521324
line-height: $grid-cell-lh;
13531325
color: inherit;
13541326
text-align: #{$left};
1327+
background-clip: border-box !important;
13551328
}
13561329

13571330
%igx-grid__td--tree-cell {
@@ -1385,6 +1358,7 @@
13851358
}
13861359
}
13871360

1361+
%grid-cell--pinned-selected,
13881362
%grid-cell--selected {
13891363
color: var-get($theme, 'cell-selected-text-color');
13901364
background: var-get($theme, 'cell-selected-background');
@@ -1398,6 +1372,35 @@
13981372
}
13991373
}
14001374

1375+
%grid-row--selected {
1376+
color: var-get($theme, 'row-selected-text-color');
1377+
background: var-get($theme, 'row-selected-background');
1378+
1379+
%grid-cell--selected,
1380+
%grid-cell--pinned-selected {
1381+
color: var-get($theme, 'cell-selected-within-text-color');
1382+
background: var-get($theme, 'cell-selected-within-background');
1383+
}
1384+
1385+
&:hover {
1386+
background: var-get($theme, 'row-selected-hover-background');
1387+
color: var-get($theme, 'row-selected-hover-text-color');
1388+
1389+
%grid-cell--column-selected {
1390+
color: var-get($theme, 'row-selected-hover-text-color');
1391+
background: var-get($theme, 'row-selected-hover-background');
1392+
}
1393+
}
1394+
1395+
%igx-grid__tree-grouping-indicator {
1396+
color: var-get($theme, 'row-selected-text-color');
1397+
1398+
&:hover {
1399+
color: var-get($theme, 'row-selected-text-color');
1400+
}
1401+
}
1402+
}
1403+
14011404
%grid-cell--column-selected {
14021405
color: var-get($theme, 'row-selected-text-color');
14031406
background: var-get($theme, 'row-selected-background');
@@ -1493,13 +1496,6 @@
14931496
z-index: 9999;
14941497
}
14951498

1496-
%grid-cell--pinned-selected {
1497-
color: var-get($theme, 'cell-selected-text-color');
1498-
background: var-get($theme, 'cell-selected-background');
1499-
// this is causing an issue https://github.com/IgniteUI/igniteui-angular/issues/4981
1500-
// border-bottom: 0;
1501-
}
1502-
15031499
%grid-cell--pinned--column-selected {
15041500
color: var-get($theme, 'row-selected-text-color');
15051501
background: var-get($theme, 'row-selected-background');
@@ -1665,8 +1661,23 @@
16651661
background: var-get($theme, 'header-selected-background');
16661662
opacity: if($variant != 'indigo-design', .7, 1);
16671663

1668-
.sort-icon::after {
1669-
background: var-get($theme, 'header-selected-background');
1664+
.sort-icon {
1665+
color: var-get($theme, 'header-selected-text-color');
1666+
1667+
::after {
1668+
background: var-get($theme, 'header-selected-background');
1669+
}
1670+
}
1671+
1672+
&%igx-grid-th--sorted {
1673+
.sort-icon {
1674+
color: var-get($theme, 'header-selected-text-color');
1675+
1676+
&:focus,
1677+
&:hover {
1678+
color: var-get($theme, 'header-selected-text-color');
1679+
}
1680+
}
16701681
}
16711682
}
16721683

@@ -1677,6 +1688,17 @@
16771688
.sort-icon::after {
16781689
background: var-get($theme, 'header-selected-background');
16791690
}
1691+
1692+
&%igx-grid-th--sorted {
1693+
.sort-icon {
1694+
color: var-get($theme, 'header-selected-text-color');
1695+
1696+
&:focus,
1697+
&:hover {
1698+
color: var-get($theme, 'header-selected-text-color');
1699+
}
1700+
}
1701+
}
16801702
}
16811703

16821704
%igx-grid-th--active {
@@ -1831,7 +1853,6 @@
18311853
border-bottom: none;
18321854
}
18331855

1834-
// %igx-grid-summary__label,
18351856
%igx-grid-summary__result {
18361857
color: var-get($theme, 'body-summaries-text-color');
18371858
}

0 commit comments

Comments
 (0)