Skip to content

Commit ee5d736

Browse files
committed
Merge branch '8.2.x' of https://github.com/IgniteUI/igniteui-angular into pbozhinov/fix-bug-5643
2 parents f4d558f + dcd4bd4 commit ee5d736

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ export class IgxButtonGroupComponent extends DisplayDensityBase implements After
280280

281281
/**
282282
* Selects a button by its index.
283-
* @memberOf {@link IgxButtonGroupComponent}
284283
*```typescript
285284
*@ViewChild("MyChild")
286285
*private buttonG: IgxButtonGroupComponent;
@@ -289,6 +288,7 @@ export class IgxButtonGroupComponent extends DisplayDensityBase implements After
289288
* this.cdr.detectChanges();
290289
*}
291290
*```
291+
* @memberOf {@link IgxButtonGroupComponent}
292292
*/
293293
public selectButton(index: number) {
294294
if (index >= this.buttons.length || index < 0) {
@@ -327,7 +327,6 @@ export class IgxButtonGroupComponent extends DisplayDensityBase implements After
327327

328328
/**
329329
* Deselects a button by its index.
330-
* @memberOf {@link IgxButtonGroupComponent}
331330
* ```typescript
332331
*@ViewChild("MyChild")
333332
*private buttonG: IgxButtonGroupComponent;
@@ -336,6 +335,7 @@ export class IgxButtonGroupComponent extends DisplayDensityBase implements After
336335
* this.cdr.detectChanges();
337336
*}
338337
* ```
338+
* @memberOf {@link IgxButtonGroupComponent}
339339
*/
340340
public deselectButton(index: number) {
341341
if (index >= this.buttons.length || index < 0) {

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
@@ -670,7 +670,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
670670
* ```
671671
*/
672672
@Input()
673-
public placeholder = '';
673+
public placeholder;
674674

675675
/**
676676
* @hidden @internal

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
615615
/**
616616
* Gets the column `sortStrategy`.
617617
* ```typescript
618-
* let sortStrategy = this.column.sortStrategy'
618+
* let sortStrategy = this.column.sortStrategy
619619
* ```
620620
* @memberof IgxColumnComponent
621621
*/
@@ -627,10 +627,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
627627
* Sets the column `sortStrategy`.
628628
* ```typescript
629629
* this.column.sortStrategy = new CustomSortingStrategy().
630-
*
631-
* class CustomSortingStrategy extends SortingStrategy {
632-
* ...
633-
* }
630+
* class CustomSortingStrategy extends SortingStrategy {...}
634631
* ```
635632
* @memberof IgxColumnComponent
636633
*/
@@ -1544,7 +1541,6 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
15441541
* Autosize the column to the longest currently visible cell value, including the header cell.
15451542
* ```typescript
15461543
* @ViewChild('grid') grid: IgxGridComponent;
1547-
*
15481544
* let column = this.grid.columnList.filter(c => c.field === 'ID')[0];
15491545
* column.autosize();
15501546
* ```

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,10 +525,14 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
525525

526526
/**
527527
* Sets the current page index.
528+
* ```html
528529
* <igx-grid #grid [data]="Data" [paging]="true" [page]="5" [autoGenerate]="true"></igx-grid>
529-
*
530+
*```
530531
* Two-way data binding.
532+
* ```html
531533
* <igx-grid #grid [data]="Data" [paging]="true" [(page)]="model.page" [autoGenerate]="true"></igx-grid>
534+
* ```
535+
* @memberof IgxGridBaseComponent
532536
*/
533537
set page(val: number) {
534538
if (val === this._page || val < 0 || val > this.totalPages - 1) {
@@ -2252,7 +2256,8 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
22522256
* for the built-in column hiding UI of the`IgxColumnComponent`.
22532257
* ```typescript
22542258
* const hiddenColText = this.grid.hiddenColumnsText;
2255-
* ``
2259+
* ```
2260+
* @memberof IgxGridBaseComponent
22562261
*/
22572262
@WatchChanges()
22582263
@Input()
@@ -4138,7 +4143,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
41384143
* Returns how many times the grid contains the string.
41394144
* ```typescript
41404145
* this.grid.findPrev("financial");
4141-
* ````
4146+
* ```
41424147
* @param text the string to search.
41434148
* @param caseSensitive optionally, if the search should be case sensitive (defaults to false).
41444149
* @param exactMatch optionally, if the text should match the entire value (defaults to false).

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
422422
* <igx-grid [dropAreaTemplate]="dropAreaRef">
423423
* <igx-column [groupable]="true" field="ID"></igx-column>
424424
* </igx-grid>
425-
*
426425
* <ng-template #myDropArea>
427426
* <span> Custom drop area! </span>
428427
* </ng-template>

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)