Skip to content

Commit e7a9d07

Browse files
authored
Merge pull request #10274 from IgniteUI/simeonoff/fix-9975
fix(icon-service): can't register icon w/o family
2 parents f6f6612 + 2e6850d commit e7a9d07

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

projects/igniteui-angular/src/lib/icon/icon.service.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class IgxIconService {
105105
* this.iconService.addSvgIcon('aruba', '/assets/svg/country_flags/aruba.svg', 'svg-flags');
106106
* ```
107107
*/
108-
public addSvgIcon(name: string, url: string, family: string = '') {
108+
public addSvgIcon(name: string, url: string, family = this._family) {
109109
if (name && url) {
110110
const safeUrl = this._sanitizer.bypassSecurityTrustResourceUrl(url);
111111
if (!safeUrl) {
@@ -154,8 +154,9 @@ export class IgxIconService {
154154
* ```
155155
*/
156156
public isSvgIconCached(name: string, family: string = ''): boolean {
157-
if(this._cachedSvgIcons.has(family)) {
158-
const familyRegistry = this._cachedSvgIcons.get(family) as Map<string, SafeHtml>;
157+
const familyClassName = this.familyClassName(family);
158+
if(this._cachedSvgIcons.has(familyClassName)) {
159+
const familyRegistry = this._cachedSvgIcons.get(familyClassName) as Map<string, SafeHtml>;
159160
return familyRegistry.has(name);
160161
}
161162

@@ -169,7 +170,8 @@ export class IgxIconService {
169170
* ```
170171
*/
171172
public getSvgIcon(name: string, family: string = '') {
172-
return this._cachedSvgIcons.get(family)?.get(name);
173+
const familyClassName = this.familyClassName(family);
174+
return this._cachedSvgIcons.get(familyClassName)?.get(name);
173175
}
174176

175177
/**

src/app/icon/icon.sample.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h4 class="sample-title">Using SVG Icons</h4>
8686
<igx-icon family="svg-flags" name="equals"></igx-icon>
8787
<igx-icon family="svg-flags" name="is_empty"></igx-icon>
8888
<igx-icon family="svg-flags" name="starts_with"></igx-icon>
89-
<igx-icon family="svg-flags" name="copy"></igx-icon>
89+
<igx-icon name="copy"></igx-icon>
9090
</div>
9191
</article>
9292

src/app/icon/icon.sample.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export class IconSampleComponent implements OnInit {
1919
this._iconService.addSvgIcon('equals', '/assets/svg/filtering/equals.svg', 'svg-flags');
2020
this._iconService.addSvgIcon('is_empty', '/assets/svg/filtering/is_empty.svg', 'svg-flags');
2121
this._iconService.addSvgIcon('starts_with', '/assets/svg/filtering/starts_with.svg', 'svg-flags');
22-
this._iconService.addSvgIcon('copy', '/assets/svg/filtering/copy.svg', 'svg-flags');
22+
this._iconService.addSvgIcon('copy', '/assets/svg/filtering/copy.svg');
2323
}
2424
}

0 commit comments

Comments
 (0)