Skip to content

Commit ccbf59b

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into nrobakova/refactor-hiding-tests
2 parents c318603 + 1241860 commit ccbf59b

File tree

59 files changed

+736
-589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+736
-589
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ All notable changes for each version of this project will be documented in this
1010

1111
- `IgxInputGroup`
1212
- **Renamed** `supressInputAutofocus` input to `suppressInputAutofocus`
13+
- Clicking on prefix, suffix or label elements in the Input Group will no longer blur and re-focus the input.
1314

1415
### Themes
1516
- **Breaking Change** Change the default `$legacy-support` value to false in the `igx-theme` function.

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@
5353
"@angular/platform-browser-dynamic": "^9.1.0",
5454
"@angular/router": "^9.1.0",
5555
"@types/hammerjs": "^2.0.36",
56+
"@types/jszip": "^3.1.7",
5657
"@types/source-map": "0.5.2",
5758
"classlist.js": "^1.1.20150312",
5859
"core-js": "^2.6.2",
5960
"hammerjs": "^2.0.8",
60-
"jszip": "^3.1.5",
61+
"jszip": "^3.3.0",
6162
"resize-observer-polyfill": "^1.5.1",
6263
"rxjs": "^6.5.4",
6364
"tslib": "^1.10.0",

projects/igniteui-angular/ng-package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
},
88
"whitelistedNonPeerDependencies": [
99
"@types/hammerjs",
10+
"@types/jszip",
1011
"hammerjs",
1112
"jszip",
1213
"resize-observer-polyfill"

projects/igniteui-angular/ng-package.prod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"lib": {
55
"entryFile": "src/public_api.ts",
66
"umdModuleIds": {
7-
"jszip/dist/jszip": "JSZip",
87
"resize-observer-polyfill": "ResizeObserver"
98
}
109
},
1110
"whitelistedNonPeerDependencies": [
1211
"@types/hammerjs",
12+
"@types/jszip",
1313
"hammerjs",
1414
"jszip",
1515
"resize-observer-polyfill"

projects/igniteui-angular/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@
6767
],
6868
"dependencies": {
6969
"@types/hammerjs": "^2.0.36",
70+
"@types/jszip": "^3.1.7",
7071
"hammerjs": "^2.0.8",
71-
"jszip": "^3.1.5",
72+
"jszip": "^3.3.0",
7273
"resize-observer-polyfill": "^1.5.1"
7374
},
7475
"peerDependencies": {

projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export interface IGridResourceStrings {
9090
igx_grid_advanced_filter_initial_text?: string;
9191
igx_grid_advanced_filter_column_placeholder?: string;
9292
igx_grid_advanced_filter_value_placeholder?: string;
93+
igx_grid_pinned_row_indicator?: string;
9394
}
9495

9596
export const GridResourceStringsEN: IGridResourceStrings = {
@@ -183,5 +184,6 @@ export const GridResourceStringsEN: IGridResourceStrings = {
183184
igx_grid_advanced_filter_delete_filters: 'Delete filters',
184185
igx_grid_advanced_filter_initial_text: 'Start with creating a group of conditions linked with "And" or "Or"',
185186
igx_grid_advanced_filter_column_placeholder: 'Select column',
186-
igx_grid_advanced_filter_value_placeholder: 'Value'
187+
igx_grid_advanced_filter_value_placeholder: 'Value',
188+
igx_grid_pinned_row_indicator: 'Pinned'
187189
};

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,10 @@
396396
@extend %grid-cell--pinned--column-selected !optional;
397397
}
398398

399+
@include e(td, $m: row-pinned-first) {
400+
@extend %grid-cell--row-pinned-first !optional;
401+
}
402+
399403
@include e(td, $m: pinned-chip) {
400404
@extend %grid-cell--pinned-chip !optional;
401405
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,6 +1417,10 @@
14171417
}
14181418
}
14191419

1420+
%grid-cell--row-pinned-first {
1421+
overflow: hidden;
1422+
}
1423+
14201424
%grid-cell--pinned-chip {
14211425
margin-#{$right}: rem(12px);
14221426
}

projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
align-items: center;
9494
background: $splitter-color;
9595
border: 1px solid $splitter-color;
96-
cursor: row-resize;
9796
z-index: 99;
9897
opacity: .68;
9998
transition: opacity .15s $ease-out-quad !important;
@@ -123,7 +122,6 @@
123122
%igx-splitter-bar--vertical {
124123
flex-direction: column;
125124
height: 100%;
126-
cursor: col-resize;
127125

128126
&::before {
129127
@extend %handle-area--vertical;

0 commit comments

Comments
 (0)