From 83be492b3a84319277dc2da8dcf7bcc1d1322f65 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Wed, 12 Mar 2025 17:00:31 +0100
Subject: [PATCH] Refactor injectIcon (#678)

---
 browser-extension/src/entrypoints/content.ts           |  4 ++--
 .../src/entrypoints/contentScript/Form.ts              | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser-extension/src/entrypoints/content.ts b/browser-extension/src/entrypoints/content.ts
index 1d046e561..9a042a75e 100644
--- a/browser-extension/src/entrypoints/content.ts
+++ b/browser-extension/src/entrypoints/content.ts
@@ -46,7 +46,7 @@ export default defineContentScript({
               return;
             }
 
-            injectIcon(target);
+            injectIcon(target, container);
 
             const isDisabled = await isAutoShowPopupDisabled();
             const canShow = canShowPopup();
@@ -91,7 +91,7 @@ export default defineContentScript({
             return { success: false, error: 'No form found' };
           }
 
-          injectIcon(target);
+          injectIcon(target, container);
           openAutofillPopup(target, container);
           return { success: true };
         });
diff --git a/browser-extension/src/entrypoints/contentScript/Form.ts b/browser-extension/src/entrypoints/contentScript/Form.ts
index e85170a8a..4db2ed44b 100644
--- a/browser-extension/src/entrypoints/contentScript/Form.ts
+++ b/browser-extension/src/entrypoints/contentScript/Form.ts
@@ -53,7 +53,7 @@ export function fillCredential(credential: Credential, input: HTMLInputElement)
 /**
  * Inject icon for a focused input element
  */
-export function injectIcon(input: HTMLInputElement): void {
+export function injectIcon(input: HTMLInputElement, container: HTMLElement): void {
   const aliasvaultIconSvg = `<?xml version="1.0" encoding="UTF-8"?>
 <svg enable-background="new 0 0 500 500" version="1.1" viewBox="0 0 500 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
 <path d="m459.87 294.95c0.016205 5.4005 0.03241 10.801-0.35022 16.873-1.111 6.3392-1.1941 12.173-2.6351 17.649-10.922 41.508-36.731 69.481-77.351 83.408-7.2157 2.4739-14.972 3.3702-22.479 4.995-23.629 0.042205-47.257 0.11453-70.886 0.12027-46.762 0.011322-93.523-0.01416-140.95-0.43411-8.59-2.0024-16.766-2.8352-24.398-5.3326-21.595-7.0666-39.523-19.656-53.708-37.552-10.227-12.903-17.579-27.17-21.28-43.221-1.475-6.3967-2.4711-12.904-3.6852-19.361-0.051849-5.747-0.1037-11.494 0.26915-17.886 4.159-42.973 27.68-71.638 63.562-92.153 0-0.70761-0.001961-1.6988 3.12e-4 -2.69 0.022484-9.8293-1.3071-19.894 0.35664-29.438 3.2391-18.579 11.08-35.272 23.763-49.773 12.098-13.832 26.457-23.989 43.609-30.029 7.813-2.7512 16.14-4.0417 24.234-5.9948 7.392-0.025734 14.784-0.05146 22.835 0.32253 4.1959 0.95392 7.7946 1.2538 11.258 2.1053 17.16 4.2192 32.287 12.176 45.469 24.104 2.2558 2.0411 4.372 6.6241 9.621 3.868 16.839-8.8419 34.718-11.597 53.603-8.594 16.791 2.6699 31.602 9.4308 44.236 20.636 11.531 10.227 19.84 22.841 25.393 37.236 6.3436 16.445 10.389 33.163 6.0798 49.389 7.9587 8.9321 15.807 16.704 22.421 25.414 9.162 12.065 15.33 25.746 18.144 40.776 0.97046 5.1848 1.9111 10.375 2.8654 15.563m-71.597 71.012c5.5615-5.2284 12.002-9.7986 16.508-15.817 10.474-13.992 14.333-29.916 11.288-47.446-2.2496-12.95-8.1973-24.076-17.243-33.063-12.746-12.663-28.865-18.614-46.786-18.569-69.912 0.17712-139.82 0.56831-209.74 0.96176-15.922 0.089599-29.168 7.4209-39.685 18.296-14.45 14.944-20.408 33.343-16.655 54.368 2.2763 12.754 8.2167 23.748 17.158 32.66 13.299 13.255 30.097 18.653 48.728 18.651 59.321-0.005188 118.64 0.042358 177.96-0.046601 9.5912-0.014374 19.181-0.86588 28.773-0.88855 10.649-0.025146 19.978-3.825 29.687-9.1074z" fill="#EEC170"/>
@@ -86,9 +86,9 @@ export function injectIcon(input: HTMLInputElement): void {
   }
 
   // Create an overlay container at document level if it doesn't exist
-  let overlayContainer = document.getElementById('aliasvault-overlay-container');
+  let overlayContainer = container.querySelector('#aliasvault-overlay-container');
   if (!overlayContainer) {
-    overlayContainer = document.createElement('div');
+    overlayContainer = document.createElement('div') as HTMLElement;
     overlayContainer.id = 'aliasvault-overlay-container';
     overlayContainer.style.cssText = `
       position: fixed;
@@ -99,7 +99,7 @@ export function injectIcon(input: HTMLInputElement): void {
       pointer-events: none;
       z-index: 2147483640;
     `;
-    document.body.appendChild(overlayContainer);
+    container.appendChild(overlayContainer);
   }
 
   // Create the icon element from the HTML template
@@ -131,7 +131,7 @@ export function injectIcon(input: HTMLInputElement): void {
     e.preventDefault();
     e.stopPropagation();
     setTimeout(() => input.focus(), 0);
-    openAutofillPopup(input);
+    openAutofillPopup(input, container);
   });
 
   // Append the icon to the overlay container