From 3b297f8233f2e22b26a1e378c7b60d80fe7e1208 Mon Sep 17 00:00:00 2001 From: denStrigo Date: Mon, 28 Oct 2019 16:41:28 +0300 Subject: [PATCH] fix(icon): fix NULL content render in MS Edge --- src/framework/theme/components/icon/icon.component.ts | 2 +- src/framework/theme/components/icon/icon.spec.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/framework/theme/components/icon/icon.component.ts b/src/framework/theme/components/icon/icon.component.ts index 9bc0065220..b5432e617c 100644 --- a/src/framework/theme/components/icon/icon.component.ts +++ b/src/framework/theme/components/icon/icon.component.ts @@ -115,7 +115,7 @@ export class NbIconComponent implements NbIconConfig, OnChanges, OnInit { protected prevClasses = []; @HostBinding('innerHtml') - html: SafeHtml; + html: SafeHtml = ''; @HostBinding('class.status-primary') get primary() { diff --git a/src/framework/theme/components/icon/icon.spec.ts b/src/framework/theme/components/icon/icon.spec.ts index 9a28076a6a..7a42279331 100644 --- a/src/framework/theme/components/icon/icon.spec.ts +++ b/src/framework/theme/components/icon/icon.spec.ts @@ -138,4 +138,12 @@ describe('NbIconComponent', () => { iconComponent.config = null; expect(iconComponent.config).toEqual(config); }); + + it('icon inner html not to be null or undefined', () => { + const iconComponent: NbIconComponent = TestBed.createComponent(NbIconComponent).componentInstance; + iconComponent.config = { icon: 'test-not-existing-icon' }; + + expect(iconComponent.html).not.toBeNull(); + expect(iconComponent.html).not.toBeUndefined(); + }); });