Skip to content

Commit 155485e

Browse files
authored
Merge branch '8.1.x' into mvenkov/update-nav-drawer-for-server-side-rendering-8.1.x
2 parents 43bf838 + 28db3ad commit 155485e

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<ng-container ngProjectAs="igx-hint, [igxHint]">
2525
<ng-content select="igx-hint, [igxHint]"></ng-content>
2626
</ng-container>
27-
<input igxInput #comboInput name="comboInput" type="text" [value]="value" readonly [placeholder]="placeholder"
27+
<input igxInput #comboInput name="comboInput" type="text" [value]="value" readonly [attr.placeholder]="placeholder"
2828
[disabled]="disabled" (blur)="onBlur()" />
2929
<ng-container ngProjectAs="igx-suffix">
3030
<ng-content select="igx-suffix"></ng-content>
@@ -47,7 +47,7 @@
4747
<igx-input-group *ngIf="displaySearchInput" [displayDensity]="displayDensity" class="igx-combo__search">
4848
<input class="igx-combo-input" igxInput #searchInput name="searchInput" autocomplete="off" type="text"
4949
[(ngModel)]="searchValue" (ngModelChange)="handleInputChange($event)" (keyup)="handleKeyUp($event)"
50-
(keydown)="handleKeyDown($event)" (focus)="dropdown.onBlur($event)" [placeholder]="searchPlaceholder"
50+
(keydown)="handleKeyDown($event)" (focus)="dropdown.onBlur($event)" [attr.placeholder]="searchPlaceholder"
5151
aria-autocomplete="both" [attr.aria-owns]="dropdown.id" [attr.aria-labelledby]="ariaLabelledBy" />
5252
</igx-input-group>
5353
<ng-container *ngTemplateOutlet="headerTemplate">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
683683
* ```
684684
*/
685685
@Input()
686-
public placeholder = '';
686+
public placeholder;
687687

688688
/**
689689
* @hidden @internal

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
6868
}
6969

7070
public navigateUp(rowElement, selectedNode: ISelectionNode) {
71+
if (selectedNode.isSummaryRow) { return; }
7172
const prevElem = rowElement.previousElementSibling;
7273
const visibleColumnIndex = selectedNode.column;
7374
const currentRowIndex = selectedNode.row;
@@ -103,6 +104,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
103104
}
104105
}
105106
public navigateDown(rowElement, selectedNode: ISelectionNode) {
107+
if (selectedNode.isSummaryRow) { return; }
106108
const nextElem = rowElement.nextElementSibling;
107109
const visibleColumnIndex = selectedNode.column;
108110
const currentRowIndex = selectedNode.row;

0 commit comments

Comments
 (0)