Refactor BMIcon again

2 files changed, 14 insertions, 8 deletions

diff --git a/extension/src/components/BMIcon.tsx b/extension/src/components/BMIcon.tsx
index d8622fb..5e2f9c9 100644
--- a/extension/src/components/BMIcon.tsx
+++ b/extension/src/components/BMIcon.tsx
@@ -20,6 +20,12 @@ function BMIcon(props: {imgSrc?: string, bmUrl?:string}) {
         setIconMode("letter");
     }
 
+    if (!props.imgSrc) {
+        let url = new URL(props.bmUrl!);
+        bgColor = hashStringToColor(url.hostname)
+        iconMode = "letter"
+    }
+
     return (
         <div className={"icon-box " + (iconMode)}
              style={bgColor ? {"--icon-bg": `rgba(${bgColor[0]}, ${bgColor[1]}, ${bgColor[2]}, 0.2)`} as React.CSSProperties : undefined}>
diff --git a/extension/src/components/Bookmark.tsx b/extension/src/components/Bookmark.tsx
index a57f7f7..760fa44 100644
--- a/extension/src/components/Bookmark.tsx
+++ b/extension/src/components/Bookmark.tsx
@@ -105,7 +105,7 @@ function IconPre(props: {bmUrl: string, id:string}) {
         })
     }, []);
 
-    if (!data) return;
+    // if (!data) return;
     return <BMIcon bmUrl={props.bmUrl} imgSrc={data}/>
 }
 
@@ -125,13 +125,13 @@ async function findIcon(bmUrl: string, id:string) {
     //     return selectedUrl[0];
     // }
 
-    const url = new URL('https://www.google.com/s2/favicons');
-    url.searchParams.set("sz", "256");
-    url.searchParams.set("domain_url", bmUrl);
-    let resp = await fetch(url)
-    let imgData = resp.ok ? await toDataURL(url.toString()) : null;
-    getBrowser().storage.local.set({["icon-cache-"+bmUrl]: imgData});
-    return imgData;
+    // const url = new URL('https://www.google.com/s2/favicons');
+    // url.searchParams.set("sz", "256");
+    // url.searchParams.set("domain_url", bmUrl);
+    // let resp = await fetch(url)
+    // let imgData = resp.ok ? await toDataURL(url.toString()) : null;
+    // getBrowser().storage.local.set({["icon-cache-"+bmUrl]: imgData});
+    // return imgData;
 }
 
 function toDataURL(url: string): string {