Skip to content

Commit a7fed4c

Browse files
authored
Merge branch 'master' into roadmap-update-milestone-11
2 parents 9944582 + 48872f5 commit a7fed4c

File tree

71 files changed

+3482
-6473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3482
-6473
lines changed

projects/igniteui-angular/src/lib/core/utils.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ export interface CancelableBrowserEventArgs extends CancelableEventArgs {
314314
event?: Event;
315315
}
316316

317+
export const HORIZONTAL_NAV_KEYS = new Set(['arrowleft', 'left', 'arrowright', 'right', 'home', 'end']);
318+
317319
export const NAVIGATION_KEYS = new Set([
318320
'down',
319321
'up',
@@ -331,7 +333,7 @@ export const NAVIGATION_KEYS = new Set([
331333
]);
332334
export const ROW_EXPAND_KEYS = new Set('right down arrowright arrowdown'.split(' '));
333335
export const ROW_COLLAPSE_KEYS = new Set('left up arrowleft arrowup'.split(' '));
334-
export const SUPPORTED_KEYS = new Set([...Array.from(NAVIGATION_KEYS), 'tab', 'enter', 'f2', 'escape', 'esc']);
336+
export const SUPPORTED_KEYS = new Set([...Array.from(NAVIGATION_KEYS), 'enter', 'f2', 'escape', 'esc', 'pagedown', 'pageup']);
335337

336338
/**
337339
* @hidden

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -879,15 +879,24 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
879879
protected moveApplyScrollNext(prevIndex: number): void {
880880
const start = prevIndex + this.state.chunkSize;
881881
for (let i = start; i < start + this.state.startIndex - prevIndex && this.igxForOf[i] !== undefined; i++) {
882-
const input = this.igxForOf[i];
883-
const embView = this._embeddedViews.shift();
884-
const cntx = embView.context;
885-
cntx.$implicit = input;
886-
cntx.index = this.getContextIndex(input);
887-
cntx.count = this.igxForOf.length;
888-
const view: ViewRef = this.dc.instance._vcr.detach(0);
889-
this.dc.instance._vcr.insert(view);
890-
this._embeddedViews.push(embView);
882+
this._moveApply(i);
883+
}
884+
}
885+
886+
/**
887+
*
888+
*/
889+
protected _moveApply(contextIndex: number, topPosition = false) {
890+
const context = this.igxForOf[contextIndex];
891+
const forOfContext = new IgxForOfContext<T>(context, this.getContextIndex(context), this.igxForOf.length);
892+
const view = this.dc.instance._vcr.createEmbeddedView(this._template, forOfContext, topPosition ? 0 : undefined);
893+
this.dc.instance._vcr.detach(topPosition ? this.dc.instance._vcr.length - 1 : 0);
894+
if (topPosition) {
895+
this._embeddedViews.pop();
896+
this._embeddedViews.unshift(view);
897+
} else {
898+
this._embeddedViews.shift();
899+
this._embeddedViews.push(view);
891900
}
892901
}
893902

@@ -897,14 +906,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
897906
*/
898907
protected moveApplyScrollPrev(prevIndex: number): void {
899908
for (let i = prevIndex - 1; i >= this.state.startIndex && this.igxForOf[i] !== undefined; i--) {
900-
const input = this.igxForOf[i];
901-
const embView = this._embeddedViews.pop();
902-
const cntx = embView.context;
903-
cntx.$implicit = input;
904-
cntx.index = this.getContextIndex(input);
905-
const view: ViewRef = this.dc.instance._vcr.detach(this.dc.instance._vcr.length - 1);
906-
this.dc.instance._vcr.insert(view, 0);
907-
this._embeddedViews.unshift(embView);
909+
this._moveApply(i, true);
908910
}
909911
}
910912

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
<ng-template #inlineEditor let-cell="cell">
99
<ng-container *ngIf="column.dataType === 'string'">
1010
<igx-input-group displayDensity="compact">
11-
<input igxInput [value]="editValue" (input)="editValue = $event.target.value" [igxFocus]="focused" />
11+
<input igxInput [value]="editValue" (input)="editValue = $event.target.value" [igxFocus]="true" />
1212
</igx-input-group>
1313
</ng-container>
1414
<ng-container *ngIf="column.dataType === 'number'">
1515
<igx-input-group displayDensity="compact">
16-
<input igxInput [value]="editValue" (input)="editValue = $event.target.value" [igxFocus]="focused" type="number">
16+
<input igxInput [value]="editValue" (input)="editValue = $event.target.value" [igxFocus]="true" type="number">
1717
</igx-input-group>
1818
</ng-container>
1919
<ng-container *ngIf="column.dataType === 'boolean'">
2020
<igx-checkbox (change)="editValue = $event.checked" [value]="editValue" [checked]="editValue"
21-
[igxFocus]="focused" [disableRipple]="true"></igx-checkbox>
21+
[igxFocus]="true" [disableRipple]="true"></igx-checkbox>
2222
</ng-container>
2323
<ng-container *ngIf="column.dataType === 'date'">
2424
<igx-date-picker [style.width.%]="100" [outlet]="grid.outletDirective" mode="dropdown"
25-
[locale]="grid.locale" [(value)]="editValue" [igxFocus]="focused" [labelVisibility]="false">
25+
[locale]="grid.locale" [(value)]="editValue" [igxFocus]="true" [labelVisibility]="false">
2626
</igx-date-picker>
2727
</ng-container>
2828
</ng-template>

0 commit comments

Comments
 (0)