Skip to content

Commit 52c984e

Browse files
authored
Merge branch 'master' into simeonoff/contrast-css-vars
2 parents dcbf7b2 + 839f8f2 commit 52c984e

22 files changed

+1701
-2621
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ All notable changes for each version of this project will be documented in this
6969
- `tickLabelsOrientation` input was added. Allows you to change the rotation of all tick labels from horizontal to vertical(toptobottom, bottomtotop).
7070
- `igxSliderTickLabel` directive has been introduced. Allows you to set a custom template for all tick labels.
7171
- `isContinuous` - input has been deleted. The option is not supported anymore.
72-
- `onValueChanged` - new output has been exposed. This event is emitted at the end of every slide interaction.
73-
72+
- `onValueChanged` - new output has been exposed. This event is emitted at the end of every slide interaction.
73+
7474
- `IgxCarousel`:
7575
- `keyboardSupport` input is added, which can be used to enable and disable keyboard navigation
7676
- `gesturesSupport` input is added, which can be used to enable and disable gestures
@@ -81,7 +81,7 @@ All notable changes for each version of this project will be documented in this
8181
- `nextButtonTemplate` directive is added, which is used to provide a custom next button template. If not provided, a default next button is used.
8282
- `prevButtonTemplate` directive is added, which is used to provide a custom previous button template. If not provided, a default previous button is used.
8383

84-
- `IgxSelect`:
84+
- `IgxSelect`:
8585
- adding `IgxSelectHeaderDirective` and `IgxSelectFooterDirective`. These can be used to provide a custom header, respectively footer templates for the `igxSelect` drop-down list. If there are no templates marked with these directives - no default templates will be used so the drop-down list will not have header nor footer.
8686

8787
- `IgxCombo`:
@@ -124,6 +124,7 @@ All notable changes for each version of this project will be documented in this
124124

125125
@include igx-progress-circular($theme);
126126
```
127+
- RTL support
127128

128129
## 8.2.6
129130

package-lock.json

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

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
},
4646
"private": true,
4747
"dependencies": {
48-
"@angular/animations": "^9.0.0-rc.10",
49-
"@angular/common": "^9.0.0-rc.10",
50-
"@angular/compiler": "^9.0.0-rc.10",
51-
"@angular/core": "^9.0.0-rc.10",
52-
"@angular/forms": "^9.0.0-rc.10",
53-
"@angular/platform-browser": "^9.0.0-rc.10",
54-
"@angular/platform-browser-dynamic": "^9.0.0-rc.10",
55-
"@angular/router": "^9.0.0-rc.10",
48+
"@angular/animations": "^9.0.0-rc.11",
49+
"@angular/common": "^9.0.0-rc.11",
50+
"@angular/compiler": "^9.0.0-rc.11",
51+
"@angular/core": "^9.0.0-rc.11",
52+
"@angular/forms": "^9.0.0-rc.11",
53+
"@angular/platform-browser": "^9.0.0-rc.11",
54+
"@angular/platform-browser-dynamic": "^9.0.0-rc.11",
55+
"@angular/router": "^9.0.0-rc.11",
5656
"@types/hammerjs": "^2.0.36",
5757
"@types/source-map": "0.5.2",
5858
"classlist.js": "^1.1.20150312",
@@ -70,8 +70,8 @@
7070
"@angular-devkit/build-ng-packagr": "~0.900.0-rc.10",
7171
"@angular-devkit/schematics": "^9.0.0-rc.10",
7272
"@angular/cli": "~9.0.0-rc.10",
73-
"@angular/compiler-cli": "^9.0.0-rc.10",
74-
"@angular/language-service": "^9.0.0-rc.10",
73+
"@angular/compiler-cli": "^9.0.0-rc.11",
74+
"@angular/language-service": "^9.0.0-rc.11",
7575
"@angularclass/hmr": "^2.1.3",
7676
"@types/jasmine": "~3.3.5",
7777
"@types/jasminewd2": "~2.0.6",

projects/igniteui-angular/src/lib/chips/chip.spec.ts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { IgxSuffixDirective } from './../directives/suffix/suffix.directive';
1515
import { DisplayDensity } from '../core/displayDensity';
1616
import { UIInteractions, wait } from '../test-utils/ui-interactions.spec';
1717
import { configureTestSuite } from '../test-utils/configure-suite';
18+
import { ControlsFunction } from '../test-utils/controls-functions.spec';
1819

1920
@Component({
2021
template: `
@@ -129,7 +130,7 @@ describe('IgxChip', () => {
129130

130131
it('should render remove button when enabled after the content inside the chip', () => {
131132
const chipElems = fix.debugElement.queryAll(By.directive(IgxChipComponent));
132-
const chipRemoveButton = HelperTestFunctions.getDeleteButton(fix);
133+
const chipRemoveButton = ControlsFunction.getChipRemoveButton(chipElems[1].nativeElement);
133134

134135
// For this second chip there are 3 elements. The prefix, content span and the remove button icon .
135136
expect(chipElems[1].nativeElement.children[0].children.length).toEqual(4);
@@ -241,10 +242,10 @@ describe('IgxChip', () => {
241242

242243
it('should delete chip when space button is pressed on delete button', () => {
243244
HelperTestFunctions.verifyChipsCount(fix, 4);
244-
245-
const deleteButtonElement = HelperTestFunctions.getDeleteButton(fix);
245+
const chipElems = fix.debugElement.queryAll(By.directive(IgxChipComponent));
246+
const deleteButtonElement = ControlsFunction.getChipRemoveButton(chipElems[1].nativeElement);
246247
// Removes chip with id City, because country chip is unremovable
247-
UIInteractions.triggerKeyDownEvtUponElem(' ', deleteButtonElement.nativeElement, true);
248+
UIInteractions.triggerKeyDownEvtUponElem(' ', deleteButtonElement, true);
248249
fix.detectChanges();
249250

250251
HelperTestFunctions.verifyChipsCount(fix, 3);
@@ -257,9 +258,10 @@ describe('IgxChip', () => {
257258
it('should delete chip when enter button is pressed on delete button', () => {
258259
HelperTestFunctions.verifyChipsCount(fix, 4);
259260

260-
const deleteButtonElement = HelperTestFunctions.getDeleteButton(fix);
261+
const chipElems = fix.debugElement.queryAll(By.directive(IgxChipComponent));
262+
const deleteButtonElement = ControlsFunction.getChipRemoveButton(chipElems[1].nativeElement);
261263
// Removes chip with id City, because country chip is unremovable
262-
UIInteractions.triggerKeyDownEvtUponElem('Enter', deleteButtonElement.nativeElement, true);
264+
UIInteractions.triggerKeyDownEvtUponElem('Enter', deleteButtonElement, true);
263265
fix.detectChanges();
264266

265267
HelperTestFunctions.verifyChipsCount(fix, 3);
@@ -360,7 +362,8 @@ describe('IgxChip', () => {
360362
spyOn(secondChipComp.onSelection, 'emit');
361363
spyOn(secondChipComp.onSelectionDone, 'emit');
362364

363-
const chipRemoveButton = HelperTestFunctions.getDeleteButton(fix).nativeElement;
365+
const chipRemoveButton = ControlsFunction.getChipRemoveButton(secondChipComp.chipArea.nativeElement);
366+
364367
const removeBtnTop = chipRemoveButton.getBoundingClientRect().top;
365368
const removeBtnLeft = chipRemoveButton.getBoundingClientRect().left;
366369

@@ -400,12 +403,6 @@ describe('IgxChip', () => {
400403
});
401404

402405
class HelperTestFunctions {
403-
public static CHIP_REMOVE_BUTTON = '.igx-chip__remove';
404-
405-
public static getDeleteButton(fix, index = 0) {
406-
return fix.debugElement.queryAll(By.css(HelperTestFunctions.CHIP_REMOVE_BUTTON))[index];
407-
}
408-
409406
public static verifyChipsCount(fix, count) {
410407
const chipComponents = fix.debugElement.queryAll(By.directive(IgxChipComponent));
411408
expect(chipComponents.length).toEqual(count);

projects/igniteui-angular/src/lib/directives/template-outlet/template_outlet.directive.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ export class IgxTemplateOutletDirective implements OnChanges {
107107
this._viewContainerRef.insert(view, 0);
108108
this._updateExistingContext(this.igxTemplateOutletContext);
109109
this.onViewMoved.emit({ owner: this, view: this._viewRef, context: this.igxTemplateOutletContext });
110+
} else {
111+
this._updateExistingContext(this.igxTemplateOutletContext);
110112
}
111113
}
112114
private _useCachedView() {

projects/igniteui-angular/src/lib/grids/cell.component.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,16 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
620620
if (this.editable && editMode && !this.row.deleted) {
621621
if (editableCell) {
622622
this.gridAPI.update_cell(editableCell, editableCell.editValue);
623+
/* This check is related with the following issue #6517:
624+
* when edit cell that belongs to a column which is sorted and press tab,
625+
* the next cell in edit mode is with wrong value /its context is not updated/;
626+
* So we reapply sorting before the next cell enters edit mode.
627+
* Also we need to keep the notifyChanges below, because of the current
628+
* change detection cycle when we have editing with enabled transactions
629+
*/
630+
if (this.grid.sortingExpressions.length && this.grid.sortingExpressions.indexOf(editableCell.column.field)) {
631+
this.grid.cdr.detectChanges();
632+
}
623633
}
624634
crud.end();
625635
this.grid.notifyChanges();

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
IgxGridExternalAdvancedFilteringComponent,
1919
IgxGridAdvancedFilteringBindingComponent
2020
} from '../../test-utils/grid-samples.spec';
21+
import { ControlsFunction } from '../../test-utils/controls-functions.spec';
2122

2223
const ADVANCED_FILTERING_OPERATOR_LINE_AND_CSS_CLASS = 'igx-filter-tree__line--and';
2324
const ADVANCED_FILTERING_OPERATOR_LINE_OR_CSS_CLASS = 'igx-filter-tree__line--or';
@@ -2441,7 +2442,7 @@ describe('IgxGrid - Advanced Filtering #grid', () => {
24412442

24422443
// Press 'Enter' on the remove icon of the second chip.
24432444
const chip = GridFunctions.getAdvancedFilteringTreeExpressionChip(fix, [1]);
2444-
const removeIcon = chip.querySelector('.igx-chip__remove');
2445+
const removeIcon = ControlsFunction.getChipRemoveButton(chip);
24452446
UIInteractions.simulateKeyDownEvent(removeIcon, 'Enter');
24462447
tick(200);
24472448
fix.detectChanges();

0 commit comments

Comments
 (0)