Skip to content

Add support for "fa-rotate-by" #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/usage/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ The following features are available as part of Font Awesome. Note that the synt
<fa-icon [icon]="['fas', 'coffee']" [rotate]="90"></fa-icon>
<fa-icon [icon]="['fas', 'coffee']" [rotate]="180"></fa-icon>
<fa-icon [icon]="['fas', 'coffee']" [rotate]="270"></fa-icon>
<!-- Or any value supported by the rotate() transform can be specified. -->
<fa-icon [icon]="['fas', 'coffee']" rotate="45deg"></fa-icon>
```

### Flip
Expand Down
2 changes: 1 addition & 1 deletion projects/demo/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('Angular FontAwesome demo', () => {
});

it('should render all icons', async () => {
expect(await appPage.icons.count()).toBe(46);
expect(await appPage.icons.count()).toBe(47);
});

it('should only add styles once', async () => {
Expand Down
4 changes: 3 additions & 1 deletion projects/demo/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ <h3>Change color</h3>

<h3>Rotate</h3>

<fa-icon icon="user" [rotate]="90"></fa-icon>
<p><fa-icon icon="user" [rotate]="90"></fa-icon></p>

<p><fa-icon icon="user" rotate="45deg"></fa-icon></p>

<h3>Animations</h3>

Expand Down
53 changes: 53 additions & 0 deletions src/lib/icon/icon.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,4 +378,57 @@ describe('FaIconComponent', () => {
'fa-stack. Example: <fa-icon stackItemSize="2x"></fa-icon>.',
);
});

it('should be able to set predefined rotate as a number', () => {
@Component({
selector: 'fa-host',
standalone: false,
template: '<fa-icon icon="user" [rotate]="90"></fa-icon>',
})
class HostComponent {
constructor(iconLibrary: FaIconLibrary) {
iconLibrary.addIcons(faUser, faUserRegular);
}
}

const fixture = initTest(HostComponent);
fixture.detectChanges();
expect(queryByCss(fixture, '.fa-rotate-90')).toBeTruthy();
});

it('should be able to set predefined rotate as a string', () => {
@Component({
selector: 'fa-host',
standalone: false,
template: '<fa-icon icon="user" rotate="90"></fa-icon>',
})
class HostComponent {
constructor(iconLibrary: FaIconLibrary) {
iconLibrary.addIcons(faUser, faUserRegular);
}
}

const fixture = initTest(HostComponent);
fixture.detectChanges();
expect(queryByCss(fixture, '.fa-rotate-90')).toBeTruthy();
});

it('should be able to set customer rotate', () => {
@Component({
selector: 'fa-host',
standalone: false,
template: '<fa-icon icon="user" rotate="45deg"></fa-icon>',
})
class HostComponent {
constructor(iconLibrary: FaIconLibrary) {
iconLibrary.addIcons(faUser, faUserRegular);
}
}

const fixture = initTest(HostComponent);
fixture.detectChanges();
const svg = queryByCss(fixture, '.fa-rotate-by');
expect(svg).toBeTruthy();
expect(getComputedStyle(svg).getPropertyValue('--fa-rotate-angle')).toBe('45deg');
});
});
11 changes: 9 additions & 2 deletions src/lib/icon/icon.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ import {
PullProp,
RotateProp,
SizeProp,
Styles,
Transform,
} from '@fortawesome/fontawesome-svg-core';
import { FaConfig } from '../config';
import { FaIconLibrary } from '../icon-library';
import { faWarnIfIconDefinitionMissing } from '../shared/errors/warn-if-icon-html-missing';
import { faWarnIfIconSpecMissing } from '../shared/errors/warn-if-icon-spec-missing';
import { AnimationProp, FaProps } from '../shared/models/props.model';
import { faClassList } from '../shared/utils/classlist.util';
import { faClassList, isKnownRotateValue } from '../shared/utils/classlist.util';
import { ensureCss } from '../shared/utils/css';
import { faNormalizeIconSpec } from '../shared/utils/normalize-icon-spec.util';
import { FaStackItemSizeDirective } from '../stack/stack-item-size.directive';
Expand Down Expand Up @@ -59,7 +60,7 @@ export class FaIconComponent implements OnChanges {
@Input() border?: boolean;
@Input() inverse?: boolean;
@Input() symbol?: FaSymbol;
@Input() rotate?: RotateProp;
@Input() rotate?: RotateProp | string;
@Input() fixedWidth?: boolean;
@Input() transform?: string | Transform;

Expand Down Expand Up @@ -147,6 +148,11 @@ export class FaIconComponent implements OnChanges {

const parsedTransform = typeof this.transform === 'string' ? parse.transform(this.transform) : this.transform;

const styles: Styles = {};
if (classOpts.rotate != null && !isKnownRotateValue(classOpts.rotate)) {
styles['--fa-rotate-angle'] = `${classOpts.rotate}`;
}

return {
title: this.title,
transform: parsedTransform,
Expand All @@ -156,6 +162,7 @@ export class FaIconComponent implements OnChanges {
attributes: {
role: this.a11yRole,
},
styles,
};
}
}
11 changes: 9 additions & 2 deletions src/lib/layers/layers-text.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ import {
PullProp,
RotateProp,
SizeProp,
Styles,
text,
TextParams,
Transform,
} from '@fortawesome/fontawesome-svg-core';
import { FaConfig } from '../config';
import { faWarnIfParentNotExist } from '../shared/errors/warn-if-parent-not-exist';
import { FaProps } from '../shared/models/props.model';
import { faClassList } from '../shared/utils/classlist.util';
import { faClassList, isKnownRotateValue } from '../shared/utils/classlist.util';
import { ensureCss } from '../shared/utils/css';
import { FaLayersComponent } from './layers.component';

Expand All @@ -33,7 +34,7 @@ export class FaLayersTextComponent implements OnChanges {
@Input() pull?: PullProp;
@Input() border?: boolean;
@Input() inverse?: boolean;
@Input() rotate?: RotateProp;
@Input() rotate?: RotateProp | string;
@Input() fixedWidth?: boolean;
@Input() transform?: string | Transform;

Expand Down Expand Up @@ -72,10 +73,16 @@ export class FaLayersTextComponent implements OnChanges {

const parsedTransform = typeof this.transform === 'string' ? parse.transform(this.transform) : this.transform;

const styles: Styles = {};
if (classOpts.rotate != null && !isKnownRotateValue(classOpts.rotate)) {
styles['--fa-rotate-angle'] = `${classOpts.rotate}`;
}

return {
transform: parsedTransform,
classes: faClassList(classOpts),
title: this.title,
styles,
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/shared/models/props.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface FaProps {
flip?: FlipProp;
size?: SizeProp;
pull?: PullProp;
rotate?: RotateProp;
rotate?: RotateProp | string;
stackItemSize?: '1x' | '2x';
}

Expand Down
10 changes: 9 additions & 1 deletion src/lib/shared/utils/classlist.util.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import { RotateProp } from '@fortawesome/fontawesome-svg-core';
import { FaProps } from '../models/props.model';

export const isKnownRotateValue = (rotate: RotateProp | string | undefined) =>
rotate != null &&
(rotate === 90 || rotate === 180 || rotate === 270 || rotate === '90' || rotate === '180' || rotate === '270');

/**
* Fontawesome class list.
* Returns classes array by props.
*/
export const faClassList = (props: FaProps): string[] => {
const knownRotateValue = isKnownRotateValue(props.rotate);

const classes = {
[`fa-${props.animation}`]: props.animation != null && !props.animation.startsWith('spin'),
'fa-spin': props.animation === 'spin' || props.animation === 'spin-reverse',
Expand All @@ -21,7 +28,8 @@ export const faClassList = (props: FaProps): string[] => {
'fa-flip-horizontal': props.flip === 'horizontal' || props.flip === 'both',
'fa-flip-vertical': props.flip === 'vertical' || props.flip === 'both',
[`fa-${props.size}`]: props.size !== null,
[`fa-rotate-${props.rotate}`]: props.rotate !== null,
[`fa-rotate-${props.rotate}`]: knownRotateValue,
'fa-rotate-by': props.rotate != null && !knownRotateValue,
[`fa-pull-${props.pull}`]: props.pull !== null,
[`fa-stack-${props.stackItemSize}`]: props.stackItemSize != null,
};
Expand Down
Loading