Skip to content

Commit df01749

Browse files
authored
Merge branch 'master' into dmdimitrov/issue6453-master
2 parents fbb499a + c3defd0 commit df01749

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,12 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
900900
event.stopPropagation();
901901

902902
const keydownArgs = { targetType: 'dataCell', target: this, event: event, cancel: false };
903+
904+
// This fixes IME editing issue(#6335) that happens only on IE
905+
if (isIE() && keydownArgs.event.keyCode === 229 && event.key === 'Tab') {
906+
return;
907+
}
908+
903909
this.grid.onGridKeydown.emit(keydownArgs);
904910
if (keydownArgs.cancel) {
905911
this.selectionService.clear();

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2920,6 +2920,24 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
29202920
return false;
29212921
}
29222922

2923+
/**
2924+
* Returns the state of the grid virtualization, including the start index and how many records are rendered.
2925+
* ```typescript
2926+
* const gridVirtState = this.grid1.virtualizationState;
2927+
* ```
2928+
* @memberof IgxGridBaseDirective
2929+
*/
2930+
get virtualizationState() {
2931+
return this.verticalScrollContainer.state;
2932+
}
2933+
2934+
/**
2935+
* @hidden
2936+
*/
2937+
set virtualizationState(state) {
2938+
this.verticalScrollContainer.state = state;
2939+
}
2940+
29232941
/**
29242942
* @hidden
29252943
* @internal

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,6 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
173173
this._filteredData = value;
174174
}
175175

176-
/**
177-
* Returns the state of the grid virtualization, including the start index and how many records are rendered.
178-
* ```typescript
179-
* const gridVirtState = this.grid1.virtualizationState;
180-
* ```
181-
* @memberof IgxGridComponent
182-
*/
183-
get virtualizationState() {
184-
return this.verticalScrollContainer.state;
185-
}
186-
187-
/**
188-
* @hidden
189-
*/
190-
set virtualizationState(state) {
191-
this.verticalScrollContainer.state = state;
192-
}
193-
194176
/**
195177
* Sets the total number of records in the data source.
196178
* This property is required for remote grid virtualization to function when it is bound to remote data.

0 commit comments

Comments
 (0)