From c692813019044de73d356fcc81ba6db852b69a9d Mon Sep 17 00:00:00 2001 From: PhilFlash Date: Thu, 11 Jan 2024 12:35:11 +0100 Subject: [PATCH 1/2] fix bug if svg name is 'us' (or 'pe' or 'se'). Previous code use include: for first time, cache.name is '#suspense' and for previous values, the condition is true (and the svg is not loaded) --- package-lock.json | 2 +- packages/ngx-fast-lib/src/lib/fast-svg.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13901bd..14f42f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26357,7 +26357,7 @@ }, "packages/ngx-fast-lib": { "name": "@push-based/ngx-fast-svg", - "version": "0.5.1", + "version": "18.0.0", "license": "MIT", "dependencies": { "tslib": "^2.0.0" diff --git a/packages/ngx-fast-lib/src/lib/fast-svg.component.ts b/packages/ngx-fast-lib/src/lib/fast-svg.component.ts index 21ee1bc..96e8a8a 100644 --- a/packages/ngx-fast-lib/src/lib/fast-svg.component.ts +++ b/packages/ngx-fast-lib/src/lib/fast-svg.component.ts @@ -182,7 +182,7 @@ export class FastSvgComponent implements AfterViewInit, OnDestroy { // If the img is present // and the name in included in the href (svg is fully loaded, not only the suspense svg) // Remove the element from the DOM as it is no longer needed - if (cache.name.includes(this.name)) { + if (cache.name === `#${this.name}`) { img.removeEventListener('load', this.loadedListener); // removeEventListener.bind(img, 'load', this.loadedListener); img.remove(); From 96cf555bcb3519f9f86b3be7b10e13374266567a Mon Sep 17 00:00:00 2001 From: PhilFlash Date: Thu, 11 Jan 2024 12:36:41 +0100 Subject: [PATCH 2/2] change demo with a new svg (copy of 'amount') with name 'us' --- .../ngx-fast-icon-demo/src/app/comparison/ant/icons.ts | 9 +++++++++ .../comparison/font-awesome/font-awesome.component.ts | 1 + packages/ngx-fast-icon-demo/src/app/icon-data.ts | 1 + packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts b/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts index 8bb7327..9db2a3d 100644 --- a/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts +++ b/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts @@ -8,6 +8,14 @@ export const account: IconDefinition = { theme: 'fill', }; +export const us: IconDefinition = { + icon: ` +`, + name: 'us', + theme: 'fill', +}; + export const back: IconDefinition = { icon: ` @@ -2505,6 +2513,7 @@ export const workshops = { export const AllIcons = [ account, + us, back, consulting, custom_workshops_1, diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts index 0c7f249..acfbb1d 100644 --- a/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts +++ b/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts @@ -22,6 +22,7 @@ export class FontAwesomeComponent { faCircleUser, faCircleUser, faCircleUser, + faCircleUser, ]); } } diff --git a/packages/ngx-fast-icon-demo/src/app/icon-data.ts b/packages/ngx-fast-icon-demo/src/app/icon-data.ts index f24abcc..ba19410 100644 --- a/packages/ngx-fast-icon-demo/src/app/icon-data.ts +++ b/packages/ngx-fast-icon-demo/src/app/icon-data.ts @@ -1,5 +1,6 @@ export const SUPPORTED_ICONS = [ 'account', + 'us', 'back', 'genre', 'imdb', diff --git a/packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg b/packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg new file mode 100644 index 0000000..1422885 --- /dev/null +++ b/packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg @@ -0,0 +1,2 @@ +