#4486: FindSuitableIcon grabs last suitable icon, not first. (#4629)

fixes #4486 Co-authored-by: Justin Willis <[email protected]>
pwa-builder · Jan 25, 2024 · d745d41 · d745d41
1 parent f5ca667
commit d745d41
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/apps/pwabuilder/src/script/utils/icons.ts b/apps/pwabuilder/src/script/utils/icons.ts
@@ -32,12 +32,12 @@ export function findSuitableIcon(
   }
 
   const iconInfos = isIconInfos(icons) ? icons : icons.map(i => new IconInfo(i));
-  const exactMatch = iconInfos.find(i => i.isExactMatch(purpose, desiredWidth, desiredHeight, mimeType));
+  const exactMatch = iconInfos.findLast(i => i.isExactMatch(purpose, desiredWidth, desiredHeight, mimeType));
   if (exactMatch) {
     return exactMatch.getIcon();
   }
 
-  var largerMatch = iconInfos.find(i => i.isSuitableIcon(purpose, desiredWidth, desiredHeight, mimeType));
+  var largerMatch = iconInfos.findLast(i => i.isSuitableIcon(purpose, desiredWidth, desiredHeight, mimeType));
   return largerMatch?.getIcon() || null;
 }
 
@@ -69,12 +69,7 @@ export function findBestAppIcon(icons: Icon[] | null | undefined): Icon | null {
 }
 
 function isIconInfos(icons: Icon[] | IconInfo[]): icons is IconInfo[] {
-  const firstIcon = icons[0];
-  if (firstIcon instanceof IconInfo) {
-    return true;
-  }
-
-  return false;
+  return ( icons[0] instanceof IconInfo );
 }
 
 /**