Skip to content

Commit 72d86a6

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into vslavov/tree-POC
# Conflicts: # src/app/app.module.ts
2 parents ae49d35 + 156dbe1 commit 72d86a6

20 files changed

+188
-598
lines changed

CHANGELOG.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ All notable changes for each version of this project will be documented in this
2020
- Support for `currency` type columns is added in the grid.
2121
- Support for `percent` type columns is added in the grid.
2222
- Added support for filtering based on the formatted cell values using the `FormattedValuesFilteringStrategy` for `IgxGrid`/`IgxHierarchicalGrid` and `TreeGridFormattedValuesFilteringStrategy` for `IgxTreeGrid`.
23-
- `IgxPaginator`
24-
- `paging` and `pagingDone` events are now emitted.
23+
- The following new events are introduced: `sorting`, `filtering`, `columnPinned`, `columnVisibilityChanging`.
24+
- **Behavioral Change** -
25+
- `onColumnPinning` to emit `IPinColumnCancellableEventArgs` instead of `IPinColumnEventArgs`.
26+
- `Column pinning`, `Column moving`, `paging` interactions now discard the editing value, instead of committing it.
27+
- `Column Resizing` now does not exit edit mode.
2528
- `IgxInput` now supports `type="file"` and its styling upon all themes.
2629
_Note: validation of file type input is not yet supported._
2730
- `igxSplitter` now has the following additional outputs:
@@ -105,12 +108,6 @@ All notable changes for each version of this project will be documented in this
105108
- `IgxGrid`, `IgxHierarchicalGrid`, `IgxTreeGrid`
106109
- Added new property `selectRowOnClick` that determines whether clicking over a row will change its selection state or not. Set to `true` by default.
107110
- `GridPagingMode` enum members rename - `local` to `Local` and `remote` to `Remote`. Example: `GridPagingMode.Local`.
108-
- The following new events are introduced: `sorting`, `filtering`, `columnPinned`, `columnVisibilityChanging`.
109-
- **Behavioral Change** -
110-
- `onColumnPinning` to emit `IPinColumnCancellableEventArgs` instead of `IPinColumnEventArgs`.
111-
- **Breaking Change**:
112-
- `onPagingDone` output is removed. Use the `paging` and `pagingDone` outputs exposed by the `IgxPaginator`.
113-
- `page`, `perPage`, `paginate`, `nextPage`, `previousPage` and `totalPages` in the grids are deprecated and will be removed. Use the corresponding `IgxPaginator` outputs/inputs. When using an external paginator, take care to provide the corresponding slice of data. See [`Paging with Custom Template`](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/paging#remote-paging-with-custom-template)
114111
- IgxButton
115112
- IgxIcon(s) placed in a button now include margin if there are one or more sibling elements to give them some breathing room. The amount of margin applied depends on the display density of the button.
116113
- `IgxListComponent`

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"web-animations-js": "^2.3.2"
8585
},
8686
"igxDevDependencies": {
87-
"@igniteui/angular-schematics": "~11.1.710-beta.0"
87+
"@igniteui/angular-schematics": "~11.1.710"
8888
},
8989
"ng-update": {
9090
"migrations": "./migrations/migration-collection.json"

projects/igniteui-angular/src/lib/carousel/carousel.component.html

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
<ng-template #defaultIndicator let-slide>
22
<div class="igx-nav-dot"
3-
[class.igx-nav-dot--active]="slide.active"
4-
>
3+
[class.igx-nav-dot--active]="slide.active">
54
</div>
65
</ng-template>
76

87
<ng-template #defaultNextButton let-disabled>
9-
<a class="igx-nav-arrow"
10-
[class.igx-nav-arrow--disabled]="disabled"
11-
>
8+
<span class="igx-nav-arrow"
9+
[class.igx-nav-arrow--disabled]="disabled">
1210
<igx-icon>arrow_forward</igx-icon>
13-
</a>
11+
</span>
1412
</ng-template>
1513

1614
<ng-template #defaultPrevButton let-disabled>
17-
<a class="igx-nav-arrow"
18-
[class.igx-nav-arrow--disabled]="disabled"
19-
>
15+
<span class="igx-nav-arrow"
16+
[class.igx-nav-arrow--disabled]="disabled">
2017
<igx-icon>arrow_back</igx-icon>
21-
</a>
18+
</span>
2219
</ng-template>
2320

2421
<div *ngIf="showIndicators" [ngClass]="indicatorsOrientationClass" [attr.role]="'tablist'">

projects/igniteui-angular/src/lib/grids/common/events.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@ export interface IPinColumnEventArgs extends IBaseEventArgs {
7070
export interface IPinColumnCancellableEventArgs extends IPinColumnEventArgs, CancelableEventArgs {
7171
}
7272

73+
/**
74+
* The event arguments after a page is changed.
75+
*/
76+
export interface IPageEventArgs extends IBaseEventArgs {
77+
previous: number;
78+
current: number;
79+
}
80+
7381
export interface IRowDataEventArgs extends IBaseEventArgs {
7482
data: any;
7583
}

0 commit comments

Comments
 (0)