Skip to content

Commit 85d2456

Browse files
kdinevkdinev
authored
Merge branch '16.1.x' into simeonoff/sass-build
2 parents 7a78ec1 + 1b390f1 commit 85d2456

File tree

9 files changed

+63
-61
lines changed

9 files changed

+63
-61
lines changed

‎projects/igniteui-angular/src/lib/avatar/avatar.component.spec.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,20 @@ describe('Avatar', () => {
8080
const fixture = TestBed.createComponent(AvatarWithAttribsComponent);
8181
fixture.detectChanges();
8282
const instance = fixture.componentInstance.avatar;
83-
const hostEl = fixture.debugElement.query(By.css(baseClass)).nativeElement;
8483

8584
expect(instance.size).toEqual(IgxAvatarSize.SMALL);
86-
expect(hostEl.classList).toContain(classes.small);
8785

8886
instance.size = IgxAvatarSize.MEDIUM;
8987
fixture.detectChanges();
9088
expect(instance.size).toEqual(IgxAvatarSize.MEDIUM);
91-
expect(hostEl.classList).toContain(classes.medium);
9289

9390
instance.size = IgxAvatarSize.LARGE;
9491
fixture.detectChanges();
9592
expect(instance.size).toEqual(IgxAvatarSize.LARGE);
96-
expect(hostEl.classList).toContain(classes.large);
9793

9894
instance.size = 'nonsense' as any;
9995
fixture.detectChanges();
10096
expect(instance.size).toEqual(IgxAvatarSize.SMALL);
101-
expect(hostEl.classList).toContain(classes.small);
10297
});
10398

10499
it('Initializes default avatar', () => {

‎projects/igniteui-angular/src/lib/avatar/avatar.component.ts‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ export class IgxAvatarComponent implements OnInit {
237237
* @hidden
238238
* @internal
239239
*/
240-
private _size: string | IgxAvatarSize = IgxAvatarSize.SMALL;
240+
private _size: string | IgxAvatarSize;
241+
241242
/**
242243
* Returns the size of the avatar.
243244
*
@@ -248,7 +249,7 @@ export class IgxAvatarComponent implements OnInit {
248249
*/
249250
@Input()
250251
public get size(): string | IgxAvatarSize {
251-
return this._size;
252+
return this._size || IgxAvatarSize.SMALL;
252253
}
253254

254255
/**
@@ -272,22 +273,6 @@ export class IgxAvatarComponent implements OnInit {
272273
}
273274
}
274275

275-
/** @hidden @internal */
276-
@HostBinding('class.igx-avatar--small')
277-
public get _isSmallSize(): boolean {
278-
return this.size === 'small';
279-
}
280-
/** @hidden @internal */
281-
@HostBinding('class.igx-avatar--medium')
282-
public get _isMediumSize(): boolean {
283-
return this.size === 'medium';
284-
}
285-
/** @hidden @internal */
286-
@HostBinding('class.igx-avatar--large')
287-
public get _isLargeSize(): boolean {
288-
return this.size === 'large';
289-
}
290-
291276
/**
292277
* Returns the type of the avatar.
293278
*
@@ -328,6 +313,13 @@ export class IgxAvatarComponent implements OnInit {
328313
return this.type === IgxAvatarType.INITIALS;
329314
}
330315

316+
@HostBinding('style.--component-size')
317+
protected get componentSize() {
318+
if (this._size) {
319+
return `var(--ig-size-${this._size})`;
320+
}
321+
}
322+
331323
/**
332324
* Returns the template of the avatar.
333325
*

‎projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-component.scss‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
66
@mixin component {
77
@include b(igx-avatar) {
8-
@include sizable();
98
// Register the component in the component registry
109
$this: bem--selector-to-string(&);
1110

@@ -30,18 +29,6 @@
3029
@extend %igx-avatar--rounded !optional;
3130
}
3231

33-
@include m(small) {
34-
@extend %igx-avatar--small !optional;
35-
}
36-
37-
@include m(medium) {
38-
@extend %igx-avatar--medium !optional;
39-
}
40-
41-
@include m(large) {
42-
@extend %igx-avatar--large !optional;
43-
}
44-
4532
@include m(initials) {
4633
@extend %igx-avatar--initials !optional;
4734
}

‎projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
}
8282

8383
%igx-avatar-display {
84+
@include sizable();
85+
--component-size: var(--ig-size, var(--ig-size-small));
86+
8487
position: relative;
8588
display: inline-flex;
8689
justify-content: center;
@@ -94,6 +97,10 @@
9497
width: var-get($theme, 'size');
9598
height: var-get($theme, 'size');
9699

100+
igx-icon {
101+
--component-size: 3;
102+
}
103+
97104
&::after {
98105
box-shadow: none;
99106
@if $bootstrap-theme {
@@ -129,19 +136,4 @@
129136
font-size: calc(#{var-get($theme, 'size')} / 2);
130137
line-height: calc(#{var-get($theme, 'size')} / 2);
131138
}
132-
133-
%igx-avatar--small,
134-
%igx-avatar-initials--small {
135-
--component-size: var(--ig-size, var(--ig-size-small));
136-
}
137-
138-
%igx-avatar--medium,
139-
%igx-avatar-initials--medium {
140-
--component-size: var(--ig-size, var(--ig-size-medium));
141-
}
142-
143-
%igx-avatar--large,
144-
%igx-avatar-initials--large {
145-
--component-size: var(--ig-size, var(--ig-size-large));
146-
}
147139
}

‎projects/igniteui-angular/src/lib/services/excel/excel-exporter-grid.spec.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,21 @@ describe('Excel Exporter', () => {
771771

772772
await exportAndVerify(grid, options, actualData.exportGriWithDateData);
773773
});
774+
775+
it('Should respect column formatter', async () => {
776+
const fix = TestBed.createComponent(GridIDNameJobTitleComponent);
777+
fix.detectChanges();
778+
await wait();
779+
780+
const grid = fix.componentInstance.grid;
781+
const nameCol = grid.getColumnByName('Name');
782+
nameCol.formatter = fix.componentInstance.formatter;
783+
grid.getColumnByName('JobTitle').hidden = true;
784+
785+
fix.detectChanges();
786+
787+
await exportAndVerify(grid, options, actualData.exportGriWithFormattedColumn);
788+
});
774789
});
775790

776791
describe('', () => {

‎projects/igniteui-angular/src/lib/services/excel/test-data.service.spec.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,6 +1500,24 @@ export class FileContentData {
15001500
return this.createData();
15011501
}
15021502

1503+
public get exportGriWithFormattedColumn() {
1504+
this._sharedStringsData =
1505+
`count="12" uniqueCount="12"><si><t>ID</t></si><si><t>Name</t></si><si><t>Casey Houston - Vice President</t></si><si><t>Gilberto Todd - Director</t></si><si><t>Tanya Bennett - Director</t></si><si><t>Jack Simon - Software Developer</t></si><si><t>Celia Martinez - Senior Software Developer</t></si><si><t>Erma Walsh - CEO</t></si><si><t>Debra Morton - Associate Software Developer</t></si><si><t>Erika Wells - Software Development Team Lead</t></si><si><t>Leslie Hansen - Associate Software Developer</t></si><si><t>Eduardo Ramirez - Manager</t></si>`;
1506+
1507+
this._tableData =
1508+
`ref="A1:B11" totalsRowShown="0">
1509+
<autoFilter ref="A1:B11"/><tableColumns count="2"><tableColumn id="1" name="ID"/><tableColumn id="2" name="Name"/></tableColumns>`;
1510+
1511+
this._worksheetData =
1512+
`<dimension ref="A1:B11"/>
1513+
<sheetViews><sheetView tabSelected="1" workbookViewId="0"></sheetView></sheetViews>
1514+
<sheetFormatPr defaultRowHeight="15" x14ac:dyDescent="0.25"/>
1515+
<cols><col min="1" max="1" width="50" customWidth="1"/><col min="2" max="2" width="50" customWidth="1"/></cols>
1516+
<sheetData><row r="1"><c r="A1" t="s"><v>0</v></c><c r="B1" t="s"><v>1</v></c></row><row r="2"><c r="A2" s="1"><v>1</v></c><c r="B2" t="s"><v>2</v></c></row><row r="3"><c r="A3" s="1"><v>2</v></c><c r="B3" t="s"><v>3</v></c></row><row r="4"><c r="A4" s="1"><v>3</v></c><c r="B4" t="s"><v>4</v></c></row><row r="5"><c r="A5" s="1"><v>4</v></c><c r="B5" t="s"><v>5</v></c></row><row r="6"><c r="A6" s="1"><v>5</v></c><c r="B6" t="s"><v>6</v></c></row><row r="7"><c r="A7" s="1"><v>6</v></c><c r="B7" t="s"><v>7</v></c></row><row r="8"><c r="A8" s="1"><v>7</v></c><c r="B8" t="s"><v>8</v></c></row><row r="9"><c r="A9" s="1"><v>8</v></c><c r="B9" t="s"><v>9</v></c></row><row r="10"><c r="A10" s="1"><v>9</v></c><c r="B10" t="s"><v>10</v></c></row><row r="11"><c r="A11" s="1"><v>10</v></c><c r="B11" t="s"><v>11</v></c></row></sheetData>`;
1517+
1518+
return this.createData();
1519+
}
1520+
15031521
public get exportHierarchicalDataWithSkippedColumns() {
15041522
this._sharedStringsData =
15051523
`count="89" uniqueCount="47"><si><t>Artist</t></si><si><t>Grammy Nominations</t></si><si><t>Grammy Awards</t></si><si><t>Naomí Yepes</t></si><si><t>Launch Date</t></si><si><t>US Billboard 200</t></si><si><t>No.</t></si><si><t>Title</t></si><si><t>Genre</t></si><si><t>Wood Shavifdsafdsafsangs Forever</t></si><si><t>*fdasfsa</t></si><si><t>Wood Shavifdsafdsafsavngs Forever</t></si><si><t>*vxzvczx</t></si><si><t>Wfdsafsaings Forever</t></si><si><t>*fdsacewwwqwq</t></si><si><t>Wood Shavings Forever</t></si><si><t>*rewqrqcxz</t></si><si><t>Wood Shavings Forever - Remix</t></si><si><t>Punk</t></si><si><t>SANTORINI</t></si><si><t>Hip-Hop</t></si><si><t>HEARTBEAT</t></si><si><t>OVERSEAS</t></si><si><t>Zoom</t></si><si><t>Do You?</t></si><si><t>No Photos</t></si><si><t>Tour</t></si><si><t>Started on</t></si><si><t>Location</t></si><si><t>Headliner</t></si><si><t>Faithful Tour</t></si><si><t>Sep 12</t></si><si><t>Worldwide</t></si><si><t>NO</t></si><si><t>Country</t></si><si><t>Attendants</t></si><si><t>Belgium</t></si><si><t>USA</t></si><si><t>Babila Ebwélé</t></si><si><t>Show Out</t></si><si><t>Mood Swings</t></si><si><t>Scenario</t></si><si><t>Astroworld</t></si><si><t>Jul 21</t></si><si><t>Bulgaria</t></si><si><t>Romania</t></si><si><t>Chloe</t></si>`;

‎projects/igniteui-angular/src/lib/services/exporter-common/base-export-service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ export abstract class IgxBaseExporter {
468468
rawValue = rawValue.toString();
469469
}
470470

471-
let formattedValue = shouldApplyFormatter ? e.formatter(rawValue) : rawValue;
471+
let formattedValue = shouldApplyFormatter ? e.formatter(rawValue, record.data) : rawValue;
472472

473473
if (this.isPivotGridExport && !isNaN(parseFloat(formattedValue))) {
474474
formattedValue = parseFloat(formattedValue);

‎projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ export class GridIDNameJobTitleComponent extends PagingComponent {
402402
public override data = SampleTestData.personJobDataFull();
403403
public override width = '100%';
404404
public override height = '100%';
405+
public formatter = (value: any, rowData: any) => {
406+
return `${value} - ${rowData.JobTitle}`;
407+
};
405408
}
406409

407410
@Component({

‎src/app/avatar/avatar.sample.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<section class="sample-column">
44
<h4 class="sample-title">Circular Avatars</h4>
55
<article class="avatars">
6-
<igx-avatar class="avatar-theme" icon="tag_faces" [roundShape]="true"></igx-avatar>
6+
<igx-avatar class="avatar-theme" icon="tag_faces" size="small" [roundShape]="true"></igx-avatar>
77

88
<igx-avatar igxDrag icon="tag_faces" size="medium" shape="circle"></igx-avatar>
99

1010
<igx-avatar icon="tag_faces" size="large" shape="circle"></igx-avatar>
1111

12-
<igx-avatar initials="AZ" shape="circle"></igx-avatar>
12+
<igx-avatar initials="AZ" size="small" shape="circle"></igx-avatar>
1313

1414
<igx-avatar initials="AZ" size="medium" shape="circle"></igx-avatar>
1515

1616
<igx-avatar initials="AZ" size="large" shape="circle"></igx-avatar>
1717

18-
<igx-avatar color="red" bgColor="black" src="https://images.unsplash.com/photo-1514041790697-53f1f86214d2?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b7ac79503fbe78855a346c8d814f95ba&auto=format&fit=crop&w=1650&q=80" shape="circle"></igx-avatar>
18+
<igx-avatar color="red" bgColor="black" src="https://images.unsplash.com/photo-1514041790697-53f1f86214d2?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b7ac79503fbe78855a346c8d814f95ba&auto=format&fit=crop&w=1650&q=80" size="small" shape="circle"></igx-avatar>
1919

2020
<igx-avatar src="assets/images/avatar/17.jpg" size="medium" shape="circle"></igx-avatar>
2121

@@ -27,19 +27,19 @@ <h4 class="sample-title">Circular Avatars</h4>
2727
<section class="sample-column">
2828
<h4 class="sample-title">Rounded Avatars</h4>
2929
<article class="avatars">
30-
<igx-avatar class="avatar-theme" icon="tag_faces" shape="rounded"></igx-avatar>
30+
<igx-avatar class="avatar-theme" icon="tag_faces" size="small" shape="rounded"></igx-avatar>
3131

3232
<igx-avatar igxDrag icon="tag_faces" size="medium" shape="rounded"></igx-avatar>
3333

3434
<igx-avatar icon="tag_faces" size="large" shape="rounded"></igx-avatar>
3535

36-
<igx-avatar initials="AZ" shape="rounded"></igx-avatar>
36+
<igx-avatar initials="AZ" size="small" shape="rounded"></igx-avatar>
3737

3838
<igx-avatar initials="AZ" size="medium" shape="rounded"></igx-avatar>
3939

4040
<igx-avatar initials="AZ" size="large" shape="rounded"></igx-avatar>
4141

42-
<igx-avatar color="red" bgColor="black" src="https://images.unsplash.com/photo-1514041790697-53f1f86214d2?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b7ac79503fbe78855a346c8d814f95ba&auto=format&fit=crop&w=1650&q=80" shape="rounded"></igx-avatar>
42+
<igx-avatar color="red" bgColor="black" src="https://images.unsplash.com/photo-1514041790697-53f1f86214d2?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b7ac79503fbe78855a346c8d814f95ba&auto=format&fit=crop&w=1650&q=80" size="small" shape="rounded"></igx-avatar>
4343

4444
<igx-avatar src="assets/images/avatar/17.jpg" size="medium" shape="rounded"></igx-avatar>
4545

@@ -51,19 +51,19 @@ <h4 class="sample-title">Rounded Avatars</h4>
5151
<section class="sample-column">
5252
<h4 class="sample-title">Square Avatars</h4>
5353
<article class="avatars">
54-
<igx-avatar icon="tag_faces" [roundShape]="false"></igx-avatar>
54+
<igx-avatar icon="tag_faces" size="small" [roundShape]="false"></igx-avatar>
5555

5656
<igx-avatar icon="tag_faces" size="medium" shape="square"></igx-avatar>
5757

5858
<igx-avatar icon="tag_faces" size="large"></igx-avatar>
5959

60-
<igx-avatar initials="AZ"></igx-avatar>
60+
<igx-avatar initials="AZ" size="small"></igx-avatar>
6161

6262
<igx-avatar initials="AZ" size="medium"></igx-avatar>
6363

6464
<igx-avatar initials="AZ" size="large"></igx-avatar>
6565

66-
<igx-avatar src="assets/images/avatar/18.jpg"></igx-avatar>
66+
<igx-avatar src="assets/images/avatar/18.jpg" size="small"></igx-avatar>
6767

6868
<igx-avatar src="assets/images/avatar/16.jpg" size="medium"></igx-avatar>
6969

0 commit comments

Comments
 (0)