Skip to content

Commit ef195b5

Browse files
authored
Merge branch 'master' into simeonoff/fix-fluent-pagination
2 parents af9a63c + f19c175 commit ef195b5

35 files changed

+352
-245
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ All notable changes for each version of this project will be documented in this
1515
- Added `closeOnEscape` - with it, the dialog can be allowed or prevented from closing when `Esc` is pressed.
1616
- `IgxNavbar`:
1717
- **Breaking Changes** - The `igx-action-icon` has been renamed to `igx-navbar-action`. It should get renamed in your components via `ng update`;
18+
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
19+
- **Breaking Change** - The `selectedRows` method is now an `@Input` property. Setting it to an array of Row IDs will update the grid's selection state, any previous selection will be cleared. Setting it to an empty array will clear the selection entirely.
1820
- `igxGrid`
1921
- Added `onScroll` event, which is emitted when the grid is scrolled vertically or horizontally.
2022
- Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default.
@@ -46,6 +48,7 @@ The following example shows how you can use the Indigo theme:
4648
}
4749
```
4850

51+
4952
### New Features
5053
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
5154
- Introduced `showSummaryOnCollapse` grid property which allows you to control whether the summary row stays visible when the groupBy / parent row is collapsed.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
aria-autocomplete="both" [attr.aria-owns]="dropdown.id" [attr.aria-labelledby]="ariaLabelledBy" />
4242
<igx-suffix *ngIf="showSearchCaseIcon">
4343
<igx-icon fontSet="case-sensitive" name="case-sensitive" [isActive]="filteringOptions.caseSensitive"
44-
(click)="filteringOptions.caseSensitive=!filteringOptions.caseSensitive">
44+
(click)="toggleCaseSensitive()">
4545
</igx-icon>
4646
</igx-suffix>
4747
</igx-input-group>

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,22 +2005,22 @@ describe('igxCombo', () => {
20052005
combo.searchValue = 'New ';
20062006
combo.handleInputChange();
20072007
fixture.detectChanges();
2008-
expect(filterSpy).toHaveBeenCalledTimes(2);
2008+
expect(filterSpy).toHaveBeenCalledTimes(1);
20092009
expect(combo.filteredData.length).toBeLessThan(initialData.length);
20102010

20112011
firstFilter = [...combo.filteredData];
20122012
combo.searchValue += ' ';
20132013
combo.handleInputChange();
20142014
fixture.detectChanges();
20152015
expect(combo.filteredData.length).toBeLessThan(initialData.length);
2016-
expect(filterSpy).toHaveBeenCalledTimes(4);
2016+
expect(filterSpy).toHaveBeenCalledTimes(2);
20172017

20182018
combo.searchValue = '';
20192019
combo.handleInputChange();
20202020
fixture.detectChanges();
20212021
expect(combo.filteredData.length).toEqual(initialData.length);
20222022
expect(combo.filteredData.length).toBeGreaterThan(firstFilter.length);
2023-
expect(filterSpy).toHaveBeenCalledTimes(6);
2023+
expect(filterSpy).toHaveBeenCalledTimes(3);
20242024
expect(combo.filteredData.length).toEqual(initialData.length);
20252025
});
20262026
it('should properly select/deselect filteredData', () => {
@@ -2033,7 +2033,7 @@ describe('igxCombo', () => {
20332033
combo.searchValue = 'New ';
20342034
combo.handleInputChange();
20352035
fixture.detectChanges();
2036-
expect(filterSpy).toHaveBeenCalledTimes(2);
2036+
expect(filterSpy).toHaveBeenCalledTimes(1);
20372037
expect(combo.filteredData.length).toBeLessThan(initialData.length);
20382038
expect(combo.filteredData.length).toEqual(4);
20392039

projects/igniteui-angular/src/lib/combo/combo.component.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,6 +1578,13 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
15781578
public handleClosed() {
15791579
this.onClosed.emit();
15801580
}
1581+
1582+
/**
1583+
* @hidden @internal
1584+
*/
1585+
public toggleCaseSensitive() {
1586+
this.filteringOptions = { caseSensitive: !this.filteringOptions.caseSensitive };
1587+
}
15811588
}
15821589

15831590
/**

projects/igniteui-angular/src/lib/combo/combo.pipes.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import { IComboFilteringOptions } from './combo.component';
1111
* @hidden
1212
*/
1313
@Pipe({
14-
name: 'comboFiltering',
15-
pure: false
14+
name: 'comboFiltering'
1615
})
1716
export class IgxComboFilteringPipe implements PipeTransform {
1817
public transform(collection: any[], searchValue: any, displayKey: any,

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,13 @@
187187
box-shadow: --var($theme, 'shadow');
188188
transition: $transition;
189189
border-radius: --var($theme, 'border-radius');
190+
191+
button {
192+
// The margin here is required to fix a bug in Safari #7858
193+
margin-top: 0;
194+
margin-#{$right}: 0;
195+
margin-bottom: 0;
196+
}
190197
}
191198

192199
%igx-group-item {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,15 +1587,16 @@
15871587
}
15881588

15891589
%igx-grid__th--active {
1590-
%grid-cell-header,
1590+
@extend %grid-cell--active;
1591+
15911592
%igx-grid__th--selected,
15921593
%igx-grid__th--selectable {
1593-
@extend %grid-cell--active
1594+
@extend %grid-cell--active;
15941595
}
15951596
}
15961597

15971598
%igx-grid-summary--active {
1598-
@extend %grid-cell--active
1599+
@extend %grid-cell--active;
15991600
}
16001601

16011602
%igx-grid__th--sortable {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_grid.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,9 @@ $_dark-indigo-grid: extend(
443443

444444
cell-selected-background: (
445445
igx-color: ('grays', 200),
446+
to-opaque: (
447+
igx-color: 'surface',
448+
)
446449
),
447450

448451
cell-selected-text-color: (

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,8 @@ $_indigo-grid: extend(
688688

689689
cell-selected-background: (
690690
igx-color: ('primary', 50),
691-
rgba: .5
691+
rgba: .5,
692+
to-opaque: #fff
692693
),
693694

694695
cell-active-border-color: (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export class IgxStringReplacePipe implements PipeTransform {
265265
@Pipe({ name: 'transactionState' })
266266
export class IgxGridTransactionStatePipe implements PipeTransform {
267267

268-
transform(row_id: any, field: string, rowEditable: boolean, transactions: any, _: any) {
268+
transform(row_id: any, field: string, rowEditable: boolean, transactions: any, _: any, __: any) {
269269
if (rowEditable) {
270270
const rowCurrentState = transactions.getAggregatedValue(row_id, false);
271271
if (rowCurrentState) {

0 commit comments

Comments
 (0)