Skip to content

Commit 7c45b4b

Browse files
authored
Merge branch '9.1.x' into simeonoff/fix-7455-9.1.x
2 parents 40be986 + 427f201 commit 7c45b4b

File tree

9 files changed

+25
-13
lines changed

9 files changed

+25
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
import { State } from '../services/public_api';
2323
import { IgxGridBaseDirective } from './grid-base.directive';
2424
import { IgxGridSelectionService, ISelectionNode, IgxGridCRUDService } from './selection/selection.service';
25-
import { DeprecateProperty, DeprecateMethod } from '../core/deprecateDecorators';
25+
import { DeprecateMethod } from '../core/deprecateDecorators';
2626
import { HammerGesturesManager } from '../core/touch';
2727
import { ColumnType } from './common/column.interface';
2828
import { RowType } from './common/row.interface';

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ import {
99
QueryList,
1010
TemplateRef,
1111
Output,
12-
EventEmitter,
13-
ElementRef,
12+
EventEmitter
1413
} from '@angular/core';
1514
import { notifyChanges } from '../watch-changes';
1615
import { WatchColumnChanges } from '../watch-changes';
1716
import { IgxRowIslandAPIService } from '../hierarchical-grid/row-island-api.service';
1817
import { DataType } from '../../data-operations/data-util';
19-
import { DeprecateProperty } from '../../core/deprecateDecorators';
2018
import {
2119
IgxFilteringOperand,
2220
IgxBooleanFilteringOperand,
@@ -88,6 +86,21 @@ export class IgxColumnComponent implements AfterContentInit {
8886
@WatchColumnChanges()
8987
@Input()
9088
public header = '';
89+
/**
90+
* Sets/gets the `title` value.
91+
* ```typescript
92+
* let title = this.column.title;
93+
* ```
94+
* ```html
95+
* <igx-column [title] = "'Some column tooltip'"></igx-column>
96+
* ```
97+
*
98+
* @memberof IgxColumnComponent
99+
*/
100+
@notifyChanges()
101+
@WatchColumnChanges()
102+
@Input()
103+
public title = '';
91104
/**
92105
* Sets/gets whether the column is sortable.
93106
* Default value is `false`.
@@ -1307,7 +1320,7 @@ export class IgxColumnComponent implements AfterContentInit {
13071320
protected collapseIndicatorTemplate: IgxCollapsibleIndicatorTemplateDirective;
13081321

13091322
constructor(public gridAPI: GridBaseAPIService<IgxGridBaseDirective & GridType>, public cdr: ChangeDetectorRef,
1310-
public rowIslandAPI: IgxRowIslandAPIService, public elementRef: ElementRef) { }
1323+
public rowIslandAPI: IgxRowIslandAPIService) { }
13111324

13121325
/**
13131326
* @hidden

projects/igniteui-angular/src/lib/grids/grid/column-group.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
15871587

15881588
const grid = fixture.componentInstance.grid;
15891589
const generalGroup = grid.columnList.find(c => c.header === 'General Information');
1590-
generalGroup.elementRef.nativeElement.title = 'General Information Title';
1590+
generalGroup.title = 'General Information Title';
15911591
fixture.detectChanges();
15921592

15931593
const headers = fixture.debugElement.queryAll(By.css('.' + GRID_COL_GROUP_THEAD_TITLE_CLASS));

projects/igniteui-angular/src/lib/grids/grid/column.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ describe('IgxGrid - Column properties #grid', () => {
384384
const nameColumn = grid.getColumnByName('Name');
385385

386386
idColumn.header = 'ID Header';
387-
idColumn.elementRef.nativeElement.title = 'ID Title';
387+
idColumn.title = 'ID Title';
388388
nameColumn.header = 'Name Header';
389389
fix.detectChanges();
390390

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*ngIf="groupingExpressions.length > 0 || hasGroupableColumns" #groupArea>
77
<igx-chips-area (onReorder)="chipsOrderChanged($event)" (onMoveEnd)="chipsMovingEnded()">
88
<ng-container *ngFor="let expr of chipsGoupingExpressions; let last = last;">
9-
<igx-chip [id]="expr.fieldName" [attr.title]="getGroupByChipTitle(expr)"
9+
<igx-chip [id]="expr.fieldName" [title]="getGroupByChipTitle(expr)"
1010
[removable]="getColumnGroupable(expr.fieldName)"
1111
[draggable]="getColumnGroupable(expr.fieldName)" [displayDensity]="displayDensity"
1212
(onKeyDown)="onChipKeyDown($event)" (onRemove)="onChipRemoved($event)"

projects/igniteui-angular/src/lib/grids/headers/grid-header-group.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626

2727
<ng-template #defaultColumn>
28-
<span class="igx-grid__th-group-title" [attr.title]="columnTitle">{{column.header}}</span>
28+
<span class="igx-grid__th-group-title" [title]="columnTitle">{{column.header}}</span>
2929
</ng-template>
3030

3131
<ng-template #defaultCollapseIndicator>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export class IgxGridHeaderGroupComponent implements DoCheck {
254254
* @hidden
255255
*/
256256
get columnTitle() {
257-
return this.column.elementRef.nativeElement.getAttribute('title') || this.column.header;
257+
return this.column.title || this.column.header;
258258
}
259259

260260
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<ng-template #defaultColumn>
2-
<span [attr.title]="columnTitle">{{ column.header || column.field }}</span>
2+
<span [title]="columnTitle">{{ column.header || column.field }}</span>
33
</ng-template>
44

55
<span class="igx-grid__th-title">

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ export class IgxGridHeaderComponent implements DoCheck, OnInit, OnDestroy {
122122
}
123123

124124
get columnTitle() {
125-
return this.column.elementRef.nativeElement.getAttribute('title') ||
126-
this.column.header || this.column.field;
125+
return this.column.title || this.column.header || this.column.field;
127126
}
128127

129128
@HostBinding('attr.role')

0 commit comments

Comments
 (0)