Skip to content

Commit

Permalink
Merge branch 'master' into ikitanov/fix-#14044-master
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanKitanov17 authored May 8, 2024
2 parents 66a1ad1 + 2f58ee4 commit 06f31a2
Show file tree
Hide file tree
Showing 80 changed files with 2,255 additions and 1,205 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master, 17.0.x, 16.1.x, 15.1.x ]
branches: [ master, 17.1.x, 17.0.x, 16.1.x, 15.1.x ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, 17.0.x, 16.1.x, 15.1.x ]
branches: [ master, 17.1.x, 17.0.x, 16.1.x, 15.1.x ]
schedule:
- cron: '33 4 * * 4'

Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes for each version of this project will be documented in this

## 17.2.0
### New Features
- `IgxAvatar`
- Removed deprecated property `roundShape`; Deprecated `color` and `bgColor` properties.
- `IgxButton`
- Removed deprecated properties `color` and `background`;
- `IgxCalendar`
- Completely revamped calendar themes.
- New years view.
Expand All @@ -14,6 +18,12 @@ All notable changes for each version of this project will be documented in this
- Replaced the `vertical` property with `orientation` that can be set to either `horizontal`(default) or `vertical`.
- Standalone views support full-blown keyboard navigation, accessibility improvements and the ability to change pages automatically on keyboard navigation.
- Standalone views now emit `pageChanged` event whenever the active view page changes.
- `IgxCard`
- Removed deprecated properties `type` and `reverse`;
- `IgxDialog`
- Removed `leftButtonColor`, `leftButtonBackgroundColor` `rightButtonColor`, and `rightButtonBackgroundColor` properties.
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
- Enhanced the advanced filtering to emit the `filtering` event when filters are applied.

## 17.1.0
### New Features
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@types/source-map": "0.5.2",
"express": "^4.19.2",
"fflate": "^0.8.1",
"igniteui-theming": "^6.0.2",
"igniteui-theming": "^6.2.0",
"igniteui-trial-watermark": "^3.0.2",
"lodash-es": "^4.17.21",
"rxjs": "^7.8.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,94 @@
"selector": "igx-calendar",
"type": "component"
}
},
{
"name": "roundShape",
"remove": true,
"owner": {
"selector": "igx-avatar",
"type": "component"
}
},
{
"name": "color",
"remove": true,
"owner": {
"selector": "igxButton",
"type": "directive"
}
},
{
"name": "background",
"remove": true,
"owner": {
"selector": "igxButton",
"type": "directive"
}
},
{
"name": "igxButtonColor",
"remove": true,
"owner": {
"selector": "igxButton",
"type": "directive"
}
},
{
"name": "igxButtonBackground",
"remove": true,
"owner": {
"selector": "igxButton",
"type": "directive"
}
},
{
"name": "type",
"remove": true,
"owner": {
"selector": "igx-card",
"type": "component"
}
},
{
"name": "reverse",
"remove": true,
"owner": {
"selector": "igx-card",
"type": "component"
}
},
{
"name": "leftButtonColor",
"remove": true,
"owner": {
"selector": "igx-dialog",
"type": "component"
}
},
{
"name": "leftButtonBackgroundColor",
"remove": true,
"owner": {
"selector": "igx-dialog",
"type": "component"
}
},
{
"name": "rightButtonColor",
"remove": true,
"owner": {
"selector": "igx-dialog",
"type": "component"
}
},
{
"name": "rightButtonBackgroundColor",
"remove": true,
"owner": {
"selector": "igx-dialog",
"type": "component"
}
}
]
}

4 changes: 2 additions & 2 deletions projects/igniteui-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"igniteui-trial-watermark": "^3.0.2",
"lodash-es": "^4.17.21",
"uuid": "^9.0.0",
"igniteui-theming": "^6.0.1",
"igniteui-theming": "^6.2.0",
"@igniteui/material-icons-extended": "^3.0.0"
},
"peerDependencies": {
Expand All @@ -94,7 +94,7 @@
}
},
"igxDevDependencies": {
"@igniteui/angular-schematics": "~17.1.1316"
"@igniteui/angular-schematics": "~17.2.1320"
},
"ng-update": {
"migrations": "./migrations/migration-collection.json",
Expand Down
40 changes: 6 additions & 34 deletions projects/igniteui-angular/src/lib/avatar/avatar.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,20 @@ describe('Avatar', () => {
const instance = fixture.componentInstance.avatar;
const hostEl = fixture.debugElement.query(By.css(baseClass)).nativeElement;

expect(instance.roundShape).toBeTruthy();
expect(instance.shape).toEqual('circle');
expect(hostEl.classList).toContain(classes.circle);
expect(instance.shape).toEqual('square');
expect(hostEl.classList).not.toContain(classes.circle);
expect(hostEl.classList).not.toContain(classes.round);

instance.shape = "square";
instance.shape = "circle";

fixture.detectChanges();
expect(instance.roundShape).toBeFalsy();
expect(instance.shape).toEqual('square');
expect(instance.shape).toEqual('circle');
expect(hostEl.classList).toContain(classes.circle);
expect(hostEl.classList).not.toContain(classes.round);
expect(hostEl.classList).not.toContain(classes.circle);

instance.shape = "rounded";

fixture.detectChanges();
expect(instance.roundShape).toBeFalsy();
expect(instance.shape).toEqual('rounded');
expect(hostEl.classList).toContain(classes.round);
expect(hostEl.classList).not.toContain(classes.circle);
Expand Down Expand Up @@ -151,23 +148,6 @@ describe('Avatar', () => {
expect(hostEl.classList).toContain(classes.image);
});

it('Sets background and foreground colors', () => {
const fixture = TestBed.createComponent(AvatarWithAttribsComponent);
fixture.detectChanges();
const instance = fixture.componentInstance.avatar;
const hostEl = fixture.debugElement.query(By.css(baseClass)).nativeElement;

expect(hostEl.style.background).toEqual(instance.bgColor);
expect(hostEl.style.color).toEqual(instance.color);

instance.bgColor = '#000';
instance.color = '#fff';

fixture.detectChanges();
expect(hostEl.style.background).toEqual('rgb(0, 0, 0)');
expect(hostEl.style.color).toEqual('rgb(255, 255, 255)');
});

it('Sets ARIA attributes', () => {
const fixture = TestBed.createComponent(InitImageAvatarComponent);
fixture.detectChanges();
Expand All @@ -192,22 +172,14 @@ class InitAvatarComponent {

@Component({
template: `
<igx-avatar
[initials]="initials"
[bgColor]="bgColor"
[color]="color"
size="small"
[roundShape]="true">
</igx-avatar>`,
<igx-avatar [initials]="initials" size="small"></igx-avatar>`,
standalone: true,
imports: [IgxAvatarComponent]
})
class AvatarWithAttribsComponent {
@ViewChild(IgxAvatarComponent, { static: true }) public avatar: IgxAvatarComponent;

public initials = 'ZK';
public color = 'orange';
public bgColor = 'royalblue';
}

@Component({
Expand Down
29 changes: 8 additions & 21 deletions projects/igniteui-angular/src/lib/avatar/avatar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,27 +117,6 @@ export class IgxAvatarComponent implements OnInit {
@Input()
public id = `igx-avatar-${NEXT_ID++}`;

/**
* Sets a circular shape to the avatar, if `[roundShape]` is set to `true`.
* By default the shape of the avatar is a square.
*
* @example
* ```html
* <igx-avatar [roundShape]="true" ></igx-avatar>
* ```
* @deprecated in version 15.1.0.
* @hidden
*/
@Input()
@HostBinding('class.igx-avatar--circle')
public get roundShape() {
return this.shape === 'circle';
}

public set roundShape(value: boolean) {
this.shape = value === true ? 'circle' : 'square';
}

/**
* Sets square, rounded or circular shape to the avatar.
* By default the shape of the avatar is square.
Expand All @@ -156,13 +135,20 @@ export class IgxAvatarComponent implements OnInit {
return this.shape === 'rounded';
}

/** @hidden @internal */
@HostBinding('class.igx-avatar--circle')
public get isCircle(): boolean {
return this.shape === 'circle';
}

/**
* Sets the color of the avatar's initials or icon.
*
* @example
* ```html
* <igx-avatar color="blue"></igx-avatar>
* ```
* @deprecated in version 17.2.0.
*/

@HostBinding('style.color')
Expand All @@ -177,6 +163,7 @@ export class IgxAvatarComponent implements OnInit {
* <igx-avatar bgColor="yellow"></igx-avatar>
* ```
* @igxFriendlyName Background color
* @deprecated in version 17.2.0.
*/

@HostBinding('style.background')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
[selected]="button.selected"
[attr.data-togglable]="button.togglable"
[disabled]="disabled || button.disabled"
[igxButtonColor]="button.color"
[igxButtonBackground]="button.bgcolor"
[igxLabel]="button.label"
[igxRipple]="button.ripple"
>
Expand Down
Loading

0 comments on commit 06f31a2

Please sign in to comment.