Skip to content

Commit 49cc7e0

Browse files
kdinevkdinev
authored
Merge branch 'master' into mdragnev/fix-6356-master
2 parents eee4243 + ed84ad9 commit 49cc7e0

File tree

13 files changed

+472
-296
lines changed

13 files changed

+472
-296
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 13 additions & 13 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.5",
49-
"@angular/common": "^9.0.0-rc.5",
50-
"@angular/compiler": "^9.0.0-rc.5",
51-
"@angular/core": "^9.0.0-rc.5",
52-
"@angular/forms": "^9.0.0-rc.5",
53-
"@angular/platform-browser": "^9.0.0-rc.5",
54-
"@angular/platform-browser-dynamic": "^9.0.0-rc.5",
55-
"@angular/router": "^9.0.0-rc.5",
48+
"@angular/animations": "^9.0.0-rc.7",
49+
"@angular/common": "^9.0.0-rc.7",
50+
"@angular/compiler": "^9.0.0-rc.7",
51+
"@angular/core": "^9.0.0-rc.7",
52+
"@angular/forms": "^9.0.0-rc.7",
53+
"@angular/platform-browser": "^9.0.0-rc.7",
54+
"@angular/platform-browser-dynamic": "^9.0.0-rc.7",
55+
"@angular/router": "^9.0.0-rc.7",
5656
"@types/hammerjs": "^2.0.36",
5757
"@types/source-map": "0.5.2",
5858
"classlist.js": "^1.1.20150312",
@@ -66,12 +66,12 @@
6666
"zone.js": "~0.10.2"
6767
},
6868
"devDependencies": {
69-
"@angular-devkit/build-angular": "~0.900.0-rc.5",
70-
"@angular-devkit/build-ng-packagr": "~0.900.0-rc.5",
69+
"@angular-devkit/build-angular": "~0.900.0-rc.7",
70+
"@angular-devkit/build-ng-packagr": "~0.900.0-rc.7",
7171
"@angular-devkit/schematics": "^7.2.1",
72-
"@angular/cli": "~9.0.0-rc.5",
73-
"@angular/compiler-cli": "^9.0.0-rc.5",
74-
"@angular/language-service": "^9.0.0-rc.5",
72+
"@angular/cli": "~9.0.0-rc.7",
73+
"@angular/compiler-cli": "^9.0.0-rc.7",
74+
"@angular/language-service": "^9.0.0-rc.7",
7575
"@angularclass/hmr": "^2.1.3",
7676
"@types/jasmine": "~3.3.5",
7777
"@types/jasminewd2": "~2.0.6",

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ export class IgxTemplateOutletDirective implements OnChanges {
3232
@Output()
3333
public onCachedViewLoaded = new EventEmitter<ICachedViewLoadedEventArgs>();
3434

35+
@Output()
36+
public onBeforeViewDetach = new EventEmitter<IViewChangeEventArgs>();
37+
3538
constructor(public _viewContainerRef: ViewContainerRef, private _zone: NgZone, public cdr: ChangeDetectorRef) {
3639
}
3740

@@ -66,6 +69,7 @@ export class IgxTemplateOutletDirective implements OnChanges {
6669
const prevIndex = this._viewRef ? this._viewContainerRef.indexOf(this._viewRef) : -1;
6770
// detach old and create new
6871
if (prevIndex !== -1) {
72+
this.onBeforeViewDetach.emit({ owner: this, view: this._viewRef, context: this.igxTemplateOutletContext });
6973
this._viewContainerRef.detach(prevIndex);
7074
}
7175
if (this.igxTemplateOutlet) {
@@ -92,9 +96,11 @@ export class IgxTemplateOutletDirective implements OnChanges {
9296
if (view !== this._viewRef) {
9397
if (owner._viewContainerRef.indexOf(view) !== -1) {
9498
// detach in case view it is attached somewhere else at the moment.
99+
this.onBeforeViewDetach.emit({ owner: this, view: this._viewRef, context: this.igxTemplateOutletContext });
95100
owner._viewContainerRef.detach(owner._viewContainerRef.indexOf(view));
96101
}
97102
if (this._viewRef && this._viewContainerRef.indexOf(this._viewRef) !== -1) {
103+
this.onBeforeViewDetach.emit({ owner: this, view: this._viewRef, context: this.igxTemplateOutletContext });
98104
this._viewContainerRef.detach(this._viewContainerRef.indexOf(this._viewRef));
99105
}
100106
this._viewRef = view;
@@ -113,6 +119,7 @@ export class IgxTemplateOutletDirective implements OnChanges {
113119
// then detach old view and insert the stored one with the matching template
114120
// after that update its context.
115121
if (this._viewContainerRef.length > 0) {
122+
this.onBeforeViewDetach.emit({ owner: this, view: this._viewRef, context: this.igxTemplateOutletContext });
116123
this._viewContainerRef.detach(this._viewContainerRef.indexOf(this._viewRef));
117124
}
118125

‎projects/igniteui-angular/src/lib/grids/grid-base.directive.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6013,6 +6013,19 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
60136013
return this.cellSelection !== GridSelectionMode.none;
60146014
}
60156015

6016+
public viewDetachHandler(args: ICachedViewLoadedEventArgs) {
6017+
const context = args.view.context;
6018+
if (context['templateID'] === 'dataRow') {
6019+
// some browsers (like FireFox and Edge) do not trigger onBlur when the focused element is detached from DOM
6020+
// hence we need to trigger it manually when cell is detached.
6021+
const row = this.getRowByIndex(context.index);
6022+
const focusedCell = row.cells.find(x => x.focused);
6023+
if (focusedCell) {
6024+
focusedCell.onBlur();
6025+
}
6026+
}
6027+
}
6028+
60166029
/**
60176030
* @hidden
60186031
*/

‎projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,23 +167,34 @@ export class IgxGridNavigationService {
167167
}
168168

169169
public movePreviousEditable(rowIndex: number, currentColumnVisibleIndex: number) {
170-
const prevEditableColumnIndex = this.findNextEditable(MoveDirection.LEFT, currentColumnVisibleIndex - 1);
171-
if (prevEditableColumnIndex === -1 && this.grid.rowEditTabs.length) {
172-
// TODO: make gridAPI visible for internal use and remove cast to any
173-
(this.grid as any).gridAPI.submit_value();
174-
this.grid.rowEditTabs.last.element.nativeElement.focus();
175-
return;
170+
let prevEditableColumnIndex = this.findNextEditable(MoveDirection.LEFT, currentColumnVisibleIndex - 1);
171+
if (prevEditableColumnIndex === -1) {
172+
if (this.grid.rowEditTabs.length) {
173+
// TODO: make gridAPI visible for internal use and remove cast to any
174+
(this.grid as any).gridAPI.submit_value();
175+
this.grid.rowEditTabs.last.element.nativeElement.focus();
176+
return;
177+
} else {
178+
// In case when row edit template is empty select last editable cell
179+
prevEditableColumnIndex = this.grid.lastEditableColumnIndex;
180+
}
181+
176182
}
177183
this.focusEditableTarget(rowIndex, prevEditableColumnIndex);
178184
}
179185

180186
public moveNextEditable(rowIndex: number, currentColumnVisibleIndex: number) {
181-
const nextEditableColumnIndex = this.findNextEditable(MoveDirection.RIGHT, currentColumnVisibleIndex + 1);
182-
if (nextEditableColumnIndex === -1 && this.grid.rowEditTabs.length) {
183-
// TODO: make gridAPI visible for internal use and remove cast to any
184-
(this.grid as any).gridAPI.submit_value();
185-
this.grid.rowEditTabs.first.element.nativeElement.focus();
186-
return;
187+
let nextEditableColumnIndex = this.findNextEditable(MoveDirection.RIGHT, currentColumnVisibleIndex + 1);
188+
if (nextEditableColumnIndex === -1) {
189+
if ( this.grid.rowEditTabs.length) {
190+
// TODO: make gridAPI visible for internal use and remove cast to any
191+
(this.grid as any).gridAPI.submit_value();
192+
this.grid.rowEditTabs.first.element.nativeElement.focus();
193+
return;
194+
} else {
195+
// In case when row edit template is empty select first editable cell
196+
nextEditableColumnIndex = this.grid.firstEditableColumnIndex;
197+
}
187198
}
188199
this.focusEditableTarget(rowIndex, nextEditableColumnIndex);
189200
}

‎projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import {
2323
IgxGridWithEditingAndFeaturesComponent,
2424
IgxGridRowEditingWithoutEditableColumnsComponent,
2525
IgxGridCustomOverlayComponent,
26-
IgxGridRowEditingWithFeaturesComponent
26+
IgxGridRowEditingWithFeaturesComponent,
27+
IgxGridEmptyRowEditTemplateComponent
2728
} from '../../test-utils/grid-samples.spec';
2829
import { IgxGridTestComponent } from './grid.component.spec';
2930

@@ -45,7 +46,8 @@ describe('IgxGrid - Row Editing #grid', () => {
4546
IgxGridRowEditingWithoutEditableColumnsComponent,
4647
IgxGridTestComponent,
4748
IgxGridCustomOverlayComponent,
48-
IgxGridRowEditingWithFeaturesComponent
49+
IgxGridRowEditingWithFeaturesComponent,
50+
IgxGridEmptyRowEditTemplateComponent
4951
],
5052
imports: [
5153
NoopAnimationsModule, IgxGridModule]
@@ -1912,7 +1914,7 @@ describe('IgxGrid - Row Editing #grid', () => {
19121914

19131915
expect(parseInt(GridFunctions.getRowEditingBannerText(fix), 10)).toEqual(0);
19141916
fix.componentInstance.cellInEditMode.editValue = 'Spiro';
1915-
fix.componentInstance.moveNext(true);
1917+
UIInteractions.triggerKeyDownWithBlur('tab', cell.nativeElement, true);
19161918
tick(16);
19171919
fix.detectChanges();
19181920

@@ -1923,6 +1925,41 @@ describe('IgxGrid - Row Editing #grid', () => {
19231925
expect(grid.endEdit).toHaveBeenCalled();
19241926
expect(grid.endEdit).toHaveBeenCalledTimes(1);
19251927
}));
1928+
1929+
it('Empty template', fakeAsync(() => {
1930+
const fix = TestBed.createComponent(IgxGridEmptyRowEditTemplateComponent);
1931+
fix.detectChanges();
1932+
tick(16);
1933+
1934+
const grid = fix.componentInstance.grid;
1935+
let cell = grid.getCellByColumn(0, 'ProductName');
1936+
UIInteractions.triggerKeyDownEvtUponElem('f2', cell.nativeElement, true);
1937+
1938+
fix.detectChanges();
1939+
tick(16);
1940+
1941+
cell.editValue = 'Spiro';
1942+
UIInteractions.triggerKeyDownEvtUponElem('tab', cell.nativeElement, true);
1943+
1944+
fix.detectChanges();
1945+
tick(16);
1946+
fix.detectChanges();
1947+
tick(16);
1948+
1949+
expect(cell.editMode).toBe(false);
1950+
cell = grid.getCellByColumn(0, 'ReorderLevel');
1951+
expect(cell.editMode).toBe(true);
1952+
1953+
UIInteractions.triggerKeyDownEvtUponElem('tab', cell.nativeElement, true, false, true);
1954+
fix.detectChanges();
1955+
tick(16);
1956+
fix.detectChanges();
1957+
tick(16);
1958+
1959+
expect(cell.editMode).toBe(false);
1960+
cell = grid.getCellByColumn(0, 'ProductName');
1961+
expect(cell.editMode).toBe(true);
1962+
}));
19261963
});
19271964

19281965
describe('Transaction', () => {

‎projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-fun
1919
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
2020
import { GridSelectionMode } from '../common/enums';
2121
import { IgxGridSelectionModule } from '../selection/selection.module';
22+
import { FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
23+
import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
2224

2325
const DEBOUNCETIME = 30;
2426

@@ -1671,6 +1673,38 @@ describe('IgxGrid - Row Selection #grid', () => {
16711673
expect(grid.getRowByIndex(1).selected).toBeTruthy();
16721674
expect(grid.onRowSelectionChange.emit).toHaveBeenCalledTimes(6);
16731675
}));
1676+
1677+
it('Should select only filtered records', fakeAsync(() => {
1678+
grid.height = '1100px';
1679+
const tree = new FilteringExpressionsTree(FilteringLogic.And);
1680+
tree.filteringOperands.push({
1681+
fieldName: 'UnitsInStock',
1682+
searchVal: 0,
1683+
condition: IgxNumberFilteringOperand.instance().condition('greaterThan'),
1684+
});
1685+
tree.filteringOperands.push({
1686+
fieldName: 'ProductName',
1687+
searchVal: 'a',
1688+
condition: IgxStringFilteringOperand.instance().condition('contains'),
1689+
ignoreCase: true
1690+
});
1691+
grid.advancedFilteringExpressionsTree = tree;
1692+
GridSelectionFunctions.headerCheckboxClick(grid);
1693+
fix.detectChanges();
1694+
tick();
1695+
1696+
expect(grid.rowList.length).toBe(9);
1697+
expect(grid.selectedRows().length).toBe(9);
1698+
GridSelectionFunctions.verifyHeaderRowCheckboxState(grid, true, false);
1699+
1700+
grid.advancedFilteringExpressionsTree = null;
1701+
fix.detectChanges();
1702+
tick();
1703+
1704+
expect(grid.rowList.length).toBe(19);
1705+
expect(grid.selectedRows().length).toBe(9);
1706+
GridSelectionFunctions.verifyHeaderRowCheckboxState(grid, false, true);
1707+
}));
16741708
});
16751709

16761710
describe('Integration with CRUD and transactions', () => {

‎projects/igniteui-angular/src/lib/grids/grid/grid.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@
122122
[igxTemplateOutletContext]='getContext(rowData, rowIndex)'
123123
(onCachedViewLoaded)='cachedViewLoaded($event)'
124124
(onViewCreated)='viewCreatedHandler($event)'
125-
(onViewMoved)='viewMovedHandler($event)'>
125+
(onViewMoved)='viewMovedHandler($event)'
126+
(onBeforeViewDetach)='viewDetachHandler($event)'>
126127
</ng-template>
127128
</ng-template>
128129
<ng-template #record_template let-rowIndex="index" let-rowData>

‎projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@
108108
<ng-template
109109
[igxTemplateOutlet]='(isHierarchicalRecord(rowData) ? hierarchical_record_template : (isChildGridRecord(rowData) && isExpanded(rowData) ? child_record_template : hierarchical_record_template))'
110110
[igxTemplateOutletContext]='getContext(rowData)' (onViewCreated)='viewCreatedHandler($event)'
111-
(onViewMoved)='viewMovedHandler($event)' (onCachedViewLoaded)='cachedViewLoaded($event)'></ng-template>
111+
(onViewMoved)='viewMovedHandler($event)' (onCachedViewLoaded)='cachedViewLoaded($event)'
112+
(onBeforeViewDetach)='viewDetachHandler($event)'></ng-template>
112113
<!-- <ng-container *igxTemplateOutlet="(isHierarchicalRecord(rowData) ? hierarchical_record_template : (isChildGridRecord(rowData) && isExpanded(rowData) ? child_record_template : hierarchical_record_template)); context: getContext(rowData)"></ng-container> -->
113114
</ng-template>
114115
<ng-container *ngTemplateOutlet="template"></ng-container>

‎projects/igniteui-angular/src/lib/grids/row-drag.directive.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { fromEvent, Subscription } from 'rxjs';
55
import { IgxRowDirective, IgxGridBaseDirective } from './grid';
66
import { IRowDragStartEventArgs, IRowDragEndEventArgs } from './common/events';
77
import { GridType } from './common/grid.interface';
8+
import { IgxHierarchicalRowComponent } from './hierarchical-grid/hierarchical-row.component';
89

910

1011
const ghostBackgroundClass = 'igx-grid__tr--ghost';
@@ -107,6 +108,15 @@ export class IgxRowDragDirective extends IgxDragDirective implements OnDestroy {
107108
};
108109
super.createGhost(pageX, pageY, this.row.nativeElement);
109110

111+
// check if there is an expander icon and create the ghost at the corresponding position
112+
if (this.isHierarchicalGrid) {
113+
const row = this.row as IgxHierarchicalRowComponent;
114+
if (row.expander) {
115+
const expanderWidth = row.expander.nativeElement.getBoundingClientRect().width;
116+
this._ghostHostX += expanderWidth;
117+
}
118+
}
119+
110120
const ghost = this.ghostElement;
111121

112122
const gridRect = this.row.grid.nativeElement.getBoundingClientRect();
@@ -145,6 +155,10 @@ export class IgxRowDragDirective extends IgxDragDirective implements OnDestroy {
145155
}
146156
this.endDragging();
147157
}
158+
159+
private get isHierarchicalGrid() {
160+
return this.row.grid.nativeElement.tagName.toLowerCase() === 'igx-hierarchical-grid';
161+
}
148162
}
149163

150164
/**

0 commit comments

Comments
 (0)