From 308d70b1ae70d20167eba5364d7726932b9166f2 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Fri, 3 Feb 2023 18:18:06 -0800
Subject: [PATCH 1/2] fix(icon): fix icon normalization to handle x-times-named
 icons

---
 src/components/icon/utils.spec.ts | 33 ++++++++++++++++++++++++++-----
 src/components/icon/utils.ts      | 32 +++++++++++++++++++-----------
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/components/icon/utils.spec.ts b/src/components/icon/utils.spec.ts
index e8090481baa..f3e766a412f 100644
--- a/src/components/icon/utils.spec.ts
+++ b/src/components/icon/utils.spec.ts
@@ -58,13 +58,36 @@ describe("utils", () => {
       expect(Object.keys(iconCache)).toHaveLength(4);
     });
 
-    it("normalizes icon name", () => {
-      // used internally by fetchIcon
-      expect(normalizeIconName("aZ")).toBe("aZ");
-      expect(normalizeIconName("a-z")).toBe("aZ");
-      expect(normalizeIconName("2d-explore")).toBe("i2DExplore");
+    it("normalizes icon name (used internally by fetchIcon)", () => {
+      expect(normalizeIconName("1-8x")).toBe("i18X");
+      expect(normalizeIconName("1-8X")).toBe("i18X");
+      expect(normalizeIconName("18X")).toBe("i18X");
+
+      expect(normalizeIconName("1x")).toBe("i1X");
+      expect(normalizeIconName("1X")).toBe("i1X");
+
       expect(normalizeIconName("2d-explore")).toBe("i2DExplore");
       expect(normalizeIconName("2DExplore")).toBe("i2DExplore");
+
+      expect(normalizeIconName("360-view")).toBe("i360View");
+      expect(normalizeIconName("360View")).toBe("i360View");
+
+      expect(normalizeIconName("a-z")).toBe("aZ");
+      expect(normalizeIconName("aZ")).toBe("aZ");
+
+      expect(normalizeIconName("attachment")).toBe("attachment");
+
+      expect(normalizeIconName("classify-pixels")).toBe("classifyPixels");
+      expect(normalizeIconName("classifyPixels")).toBe("classifyPixels");
+
+      expect(normalizeIconName("display-selection-lock")).toBe("displaySelectionLock");
+      expect(normalizeIconName("displaySelectionLock")).toBe("displaySelectionLock");
+
+      expect(normalizeIconName("number-circle-6")).toBe("numberCircle6");
+      expect(normalizeIconName("numberCircle6")).toBe("numberCircle6");
+
+      expect(normalizeIconName("x-axis-guide")).toBe("xAxisGuide");
+      expect(normalizeIconName("xAxisGuide")).toBe("xAxisGuide");
     });
   });
 });
diff --git a/src/components/icon/utils.ts b/src/components/icon/utils.ts
index ab665c936d7..4597567a5cd 100644
--- a/src/components/icon/utils.ts
+++ b/src/components/icon/utils.ts
@@ -58,24 +58,32 @@ export async function fetchIcon({ icon, scale }: FetchIconProps): Promise<Calcit
  * Normalize the icon name to match the path data module exports.
  * Exported for testing purposes.
  *
- * @param name
+ * @param name – an icon name that can be either kebab or camel-cased
  * @private
  */
 export function normalizeIconName(name: string): string {
   const numberLeadingName = !isNaN(Number(name.charAt(0)));
   const parts = name.split("-");
+  const kebabCased = parts.length > 0;
 
-  if (parts.length === 1) {
-    return numberLeadingName ? `i${name}` : name;
-  }
+  if (kebabCased) {
+    const firstNonDigitInPartPattern = /[a-z]/i;
+
+    name = name
+      .split("-")
+      .map((part, partIndex) => {
+        return part.replace(firstNonDigitInPartPattern, function replacer(match, offset) {
+          const isFirstCharInName = partIndex === 0 && offset === 0;
 
-  return parts
-    .map((part, index) => {
-      if (index === 0) {
-        return numberLeadingName ? `i${part.toUpperCase()}` : part;
-      }
+          if (isFirstCharInName) {
+            return match;
+          }
+
+          return match.toUpperCase();
+        });
+      })
+      .join("");
+  }
 
-      return part.charAt(0).toUpperCase() + part.slice(1);
-    })
-    .join("");
+  return numberLeadingName ? `i${name}` : name;
 }

From 7636b6630cde49d7dab2652c4a483b7944c923f0 Mon Sep 17 00:00:00 2001
From: JC Franco <jfranco@esri.com>
Date: Mon, 6 Feb 2023 09:56:35 -0800
Subject: [PATCH 2/2] tidy up

---
 src/components/icon/utils.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/icon/utils.ts b/src/components/icon/utils.ts
index 4597567a5cd..0a2d071f325 100644
--- a/src/components/icon/utils.ts
+++ b/src/components/icon/utils.ts
@@ -69,8 +69,7 @@ export function normalizeIconName(name: string): string {
   if (kebabCased) {
     const firstNonDigitInPartPattern = /[a-z]/i;
 
-    name = name
-      .split("-")
+    name = parts
       .map((part, partIndex) => {
         return part.replace(firstNonDigitInPartPattern, function replacer(match, offset) {
           const isFirstCharInName = partIndex === 0 && offset === 0;