Fix icons conflict (overrides each other) (#9094)

surveyjs · Nov 22, 2024 · 59b4420 · 59b4420
1 parent 165a6d2
commit 59b4420
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/packages/survey-core/src/svgbundle.ts b/packages/survey-core/src/svgbundle.ts
@@ -11,8 +11,9 @@ export class SvgIconRegistry {
   private iconPrefix = "icon-";
 
   private processId(iconId: string, iconPrefix: string) {
-    if (iconId.indexOf(iconPrefix) == 0) iconId = iconId.substring(iconPrefix.length);
-    iconId = renamedIcons[iconId] || iconId;
+    if (iconId.indexOf(iconPrefix) == 0) {
+      iconId = iconId.substring(iconPrefix.length);
+    }
     return iconId;
   }
   public registerIconFromSymbol(iconId: string, iconSymbolSvg: string) {

diff --git a/packages/survey-core/tests/icons/svgRegistryTests.ts b/packages/survey-core/tests/icons/svgRegistryTests.ts
@@ -80,22 +80,22 @@ QUnit.test("svg import from svg via string - use prefix", function (assert) {
   assert.equal(svg.iconsRenderedHtml(), "<symbol id=\"icon-a\" viewBox=\"0 0 100 100\"><circle/></symbol>");
 });
 
-QUnit.test("check that user's svgs with old name will be supported after icons renaming", function (assert) {
-  const oldIconName = "icon-changecamera"; // see renamedIcons dictionary
-  const newIconName = "icon-flip-24x24";
-
-  let svg = new SvgIconRegistry();
-  let res = svg.registerIconFromSvg(oldIconName, "<svg viewBox=\"0 0 100 100\"><circle/></svg>");
-  assert.ok(res);
-  assert.equal(svg.iconsRenderedHtml(), `<symbol id="${newIconName}" viewBox="0 0 100 100"><circle/></symbol>`);
-});
-
-QUnit.test("check that user's svgs with old name will be supported after icons renaming: whithout 'icon-' prefix", function (assert) {
-  const oldIconName = "changecamera"; // see renamedIcons dictionary
-  const newIconName = "flip-24x24";
-
-  let svg = new SvgIconRegistry();
-  let res = svg.registerIconFromSvg(oldIconName, "<svg viewBox=\"0 0 100 100\"><circle/></svg>");
-  assert.ok(res);
-  assert.equal(svg.iconsRenderedHtml(), `<symbol id="icon-${newIconName}" viewBox="0 0 100 100"><circle/></symbol>`);
-});
+// QUnit.test("check that user's svgs with old name will be supported after icons renaming", function (assert) {
+//   const oldIconName = "icon-changecamera"; // see renamedIcons dictionary
+//   const newIconName = "icon-flip-24x24";
+
+//   let svg = new SvgIconRegistry();
+//   let res = svg.registerIconFromSvg(oldIconName, "<svg viewBox=\"0 0 100 100\"><circle/></svg>");
+//   assert.ok(res);
+//   assert.equal(svg.iconsRenderedHtml(), `<symbol id="${newIconName}" viewBox="0 0 100 100"><circle/></symbol>`);
+// });
+
+// QUnit.test("check that user's svgs with old name will be supported after icons renaming: whithout 'icon-' prefix", function (assert) {
+//   const oldIconName = "changecamera"; // see renamedIcons dictionary
+//   const newIconName = "flip-24x24";
+
+//   let svg = new SvgIconRegistry();
+//   let res = svg.registerIconFromSvg(oldIconName, "<svg viewBox=\"0 0 100 100\"><circle/></svg>");
+//   assert.ok(res);
+//   assert.equal(svg.iconsRenderedHtml(), `<symbol id="icon-${newIconName}" viewBox="0 0 100 100"><circle/></symbol>`);
+// });