minor cleanup

adobecom · Dec 3, 2024 · 9a392e9 · 9a392e9
1 parent c2ea4b5
commit 9a392e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libs/features/icons/icons.js b/libs/features/icons/icons.js
@@ -68,9 +68,11 @@ export default async function loadIcons(icons) {
   const iconsToFetch = new Map();
 
   icons.forEach((icon) => {
+    setNodeIndexClass(icon);
     if (icon.classList.contains('icon-tooltip')) decorateToolTip(icon);
     const iconName = [...icon.classList].find((c) => c.startsWith('icon-'))?.substring(5);
     if (icon.dataset.svgInjected || !iconName) return;
+    icon.setAttribute('data-name', iconName);
     if (!federalIcons[iconName] && !iconsToFetch.has(iconName)) {
       const url = `${fedRoot}/federal/assets/icons/svgs/${iconName}.svg`;
       iconsToFetch.set(iconName, fetch(url)
@@ -101,7 +103,7 @@ export default async function loadIcons(icons) {
   await Promise.all(iconRequests);
 
   icons.forEach((icon) => {
-    const iconName = [...icon.classList].find((c) => c.startsWith('icon-'))?.substring(5);
+    const iconName = icon.getAttribute('data-name');
     if (iconName && federalIcons[iconName] && !icon.dataset.svgInjected) {
       const svgClone = federalIcons[iconName].cloneNode(true);
       icon.appendChild(svgClone);

diff --git a/test/features/icons/icons.test.js b/test/features/icons/icons.test.js
@@ -1,6 +1,6 @@
 import { readFile } from '@web/test-runner-commands';
 import { expect } from '@esm-bundle/chai';
-import { stub } from 'sinon';
+import sinon, { stub } from 'sinon';
 import { waitForElement } from '../../helpers/waitfor.js';
 
 const { default: loadIcons, setNodeIndexClass } = await import('../../../libs/features/icons/icons.js');
@@ -27,7 +27,7 @@ describe('Icon Suppprt', () => {
   });
 
   afterEach(() => {
-    window.fetch.restore();
+    sinon.restore();
   });
 
   it('Replaces span.icon', async () => {