From 82741e490b3c5a60be2345cc0aa0f7e8b582e024 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 7 May 2020 04:07:50 -0700
Subject: [PATCH] Optimize icon fetching (#5791)

---
 src/components/ha-icon.ts | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/components/ha-icon.ts b/src/components/ha-icon.ts
index 80a2e9e782..3d665756c0 100644
--- a/src/components/ha-icon.ts
+++ b/src/components/ha-icon.ts
@@ -38,6 +38,33 @@ get("_version", iconStore).then((version) => {
 const chunks: Chunks = {};
 const MDI_PREFIXES = ["mdi", "hass", "hassio", "hademo"];
 
+let toRead: Array<[string, (string) => void]> = [];
+
+// Queue up as many icon fetches in 1 transaction
+const getIcon = (iconName: string) =>
+  new Promise<string>((resolve) => {
+    toRead.push([iconName, resolve]);
+
+    if (toRead.length > 1) {
+      return;
+    }
+
+    const results: Array<[(string) => void, IDBRequest]> = [];
+
+    iconStore
+      ._withIDBStore("readonly", (store) => {
+        for (const [iconName_, resolve_] of toRead) {
+          results.push([resolve_, store.get(iconName_)]);
+        }
+        toRead = [];
+      })
+      .then(() => {
+        for (const [resolve_, request] of results) {
+          resolve_(request.result);
+        }
+      });
+  });
+
 const findIconChunk = (icon): string => {
   let lastChunk: IconMeta;
   for (const chunk of iconMetadata.parts) {
@@ -101,7 +128,7 @@ export class HaIcon extends LitElement {
     this._noMdi = false;
 
     const iconName = icon[1];
-    const cachedPath: string = await get(iconName, iconStore);
+    const cachedPath: string = await getIcon(iconName);
     if (cachedPath) {
       this._path = cachedPath;
       return;