move the betafeatures check to global.ts so that its more performant

WorldBrain · Jun 10, 2024 · 06ef3d8 · 06ef3d8
1 parent c6a6ada
commit 06ef3d8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/src/content-scripts/content_script/global.ts b/src/content-scripts/content_script/global.ts
@@ -1546,25 +1546,41 @@ export async function main(
             },
         })
     }
-    const imageElements = document.getElementsByTagName('img')
 
-    const disabledServices = [
-        'https://www.facebook.com/',
-        'https://www.instagram.com/',
-        'https://www.pinterest.com/',
-    ]
+    const betaFeatureSetting = await syncSettings.betaFeatures.get(
+        'imageOverlay',
+    )
 
-    if (
-        imageElements.length > 0 &&
-        !disabledServices.some((url) => fullPageUrl.includes(url))
-    ) {
-        inPageUI.loadOnDemandInPageUI({
-            component: 'img-action-buttons',
-            options: {
-                imageElements,
-                contentScriptsBG,
-            },
-        })
+    let imageInjectionEnabled = null
+    if (betaFeatureSetting != null) {
+        imageInjectionEnabled = betaFeatureSetting
+    }
+
+    if (imageInjectionEnabled == null) {
+        await syncSettings.betaFeatures.set('imageOverlay', false)
+    }
+
+    if (imageInjectionEnabled) {
+        const imageElements = document.getElementsByTagName('img')
+
+        const disabledServices = [
+            'https://www.facebook.com/',
+            'https://www.instagram.com/',
+            'https://www.pinterest.com/',
+        ]
+
+        if (
+            imageElements.length > 0 &&
+            !disabledServices.some((url) => fullPageUrl.includes(url))
+        ) {
+            inPageUI.loadOnDemandInPageUI({
+                component: 'img-action-buttons',
+                options: {
+                    imageElements,
+                    contentScriptsBG,
+                },
+            })
+        }
     }
 
     // Function to track when the subscription has been updated by going to our website (which the user arrives through a redirect)

diff --git a/src/search-injection/img-action-buttons.tsx b/src/search-injection/img-action-buttons.tsx
@@ -150,22 +150,6 @@ export const handleRenderImgActionButtons = async (
     imageElements: HTMLCollectionOf<HTMLImageElement>,
     contentScriptsBG: ContentScriptsInterface<'caller'>,
 ) => {
-    const betaFeatureSetting = await syncSettings.betaFeatures.get(
-        'imageOverlay',
-    )
-    let imageInjectionEnabled = null
-    if (betaFeatureSetting != null) {
-        imageInjectionEnabled = betaFeatureSetting
-    }
-
-    if (imageInjectionEnabled == null) {
-        await syncSettings.betaFeatures.set('imageOverlay', false)
-    }
-
-    if (!imageInjectionEnabled) {
-        return
-    }
-
     let shouldShow = true
     if (imageElements.length === 0) {
         return