Small Radix CSS fix + toolbar injection

alyssaxuu · Mar 25, 2024 · a0a0b35 · a0a0b35
1 parent ec054eb
commit a0a0b35
Show file tree

Hide file tree

Showing 17 changed files with 159 additions and 11 deletions.
diff --git a/build/background.bundle 3.js b/build/background.bundle 3.js
diff --git a/build/contentScript.bundle 2.js b/build/contentScript.bundle 2.js
diff --git a/build/contentScript.bundle.js b/build/contentScript.bundle.js
diff --git a/build/download.bundle 2.js b/build/download.bundle 2.js
diff --git a/build/editor.bundle 2.js b/build/editor.bundle 2.js
diff --git a/build/manifest.json b/build/manifest.json
@@ -1 +1 @@
-{"description":"__MSG_extDesc__","version":"3.1.9","manifest_version":3,"name":"__MSG_extName__","default_locale":"en","background":{"service_worker":"background.bundle.js"},"action":{"default_icon":"assets/img/icon-34.png"},"icons":{"128":"assets/img/icon-128.png"},"host_permissions":["<all_urls>"],"content_scripts":[{"matches":["<all_urls>"],"js":["contentScript.bundle.js"],"css":["assets/fonts/fonts.css"]}],"web_accessible_resources":[{"resources":["content.styles.css","blank.mp4","playground.html","editor.html","assets/*","setup.html","worker.js","vendor/*","recorder.html","recorderoffscreen.html","sandbox.html","wrapper.html","camera.html","permissions.html","region.html","waveform.html","playground.html","editorfallback.html","download.html","*"],"matches":["<all_urls>"]}],"oauth2":{"client_id":"560517327251-m7n1k3kddknu7s9s4ejvrs1bj91gutd7.apps.googleusercontent.com","scopes":["https://www.googleapis.com/auth/drive.file"]},"cross_origin_embedder_policy":{"value":"require-corp"},"cross_origin_opener_policy":{"value":"same-origin"},"content_security_policy":{"sandbox":"sandbox allow-scripts allow-modals allow-popups; script-src 'self' 'unsafe-inline' 'unsafe-eval' blob:; object-src 'self';worker-src 'self' blob: ;","extension_pages":"script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; media-src 'self' data: blob: *;"},"sandbox":{"pages":["editor.html"]},"commands":{"start-recording":{"suggested_key":{"default":"Alt+Shift+G"},"description":"Start recording"},"cancel-recording":{"suggested_key":{"default":"Alt+Shift+X"},"description":"Cancel recording"},"pause-recording":{"suggested_key":{"default":"Alt+Shift+M"},"description":"Pause/Resume recording"}},"permissions":["identity","activeTab","storage","unlimitedStorage","downloads","tabs","tabCapture","scripting"],"optional_permissions":["offscreen","desktopCapture","alarms"]}
+{"description":"__MSG_extDesc__","version":"3.1.10","manifest_version":3,"name":"__MSG_extName__","default_locale":"en","background":{"service_worker":"background.bundle.js"},"action":{"default_icon":"assets/img/icon-34.png"},"icons":{"128":"assets/img/icon-128.png"},"host_permissions":["<all_urls>"],"content_scripts":[{"matches":["<all_urls>"],"js":["contentScript.bundle.js"],"css":["assets/fonts/fonts.css"]}],"web_accessible_resources":[{"resources":["content.styles.css","blank.mp4","playground.html","editor.html","assets/*","setup.html","worker.js","vendor/*","recorder.html","recorderoffscreen.html","sandbox.html","wrapper.html","camera.html","permissions.html","region.html","waveform.html","playground.html","editorfallback.html","download.html","*"],"matches":["<all_urls>"]}],"oauth2":{"client_id":"560517327251-m7n1k3kddknu7s9s4ejvrs1bj91gutd7.apps.googleusercontent.com","scopes":["https://www.googleapis.com/auth/drive.file"]},"cross_origin_embedder_policy":{"value":"require-corp"},"cross_origin_opener_policy":{"value":"same-origin"},"content_security_policy":{"sandbox":"sandbox allow-scripts allow-modals allow-popups; script-src 'self' 'unsafe-inline' 'unsafe-eval' blob:; object-src 'self';worker-src 'self' blob: ;","extension_pages":"script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; media-src 'self' data: blob: *;"},"sandbox":{"pages":["editor.html"]},"commands":{"start-recording":{"suggested_key":{"default":"Alt+Shift+G"},"description":"Start recording"},"cancel-recording":{"suggested_key":{"default":"Alt+Shift+X"},"description":"Cancel recording"},"pause-recording":{"suggested_key":{"default":"Alt+Shift+M"},"description":"Pause/Resume recording"}},"permissions":["identity","activeTab","storage","unlimitedStorage","downloads","tabs","tabCapture","scripting"],"optional_permissions":["offscreen","desktopCapture","alarms"]}
diff --git a/build/permissions 3.html b/build/permissions 3.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><title></title><script defer="defer" src="/permissions.bundle.js"></script></head><body><div id="app-container"></div></body></html>
diff --git a/build/recorder 2.html b/build/recorder 2.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Screenity - Recorder</title><style>@font-face{font-family:Satoshi-Light;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/Satoshi-Light.ttf) format("truetype");font-weight:400;font-style:normal}@font-face{font-family:Satoshi-Medium;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/Satoshi-Medium.ttf) format("truetype");font-weight:400;font-style:normal}@font-face{font-family:Satoshi-Bold;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/Satoshi-Bold.ttf) format("truetype");font-weight:400;font-style:normal}body{font-family:Satoshi-Medium}</style><script defer="defer" src="/recorder.bundle.js"></script></head><body><div id="app-container"></div></body></html>
diff --git a/build/region 2.html b/build/region 2.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><title></title><script defer="defer" src="/region.bundle.js"></script></head><body><div id="app-container"></div></body></html>
diff --git a/build/setup 2.html b/build/setup 2.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Screenity - First Steps</title><style>@font-face{font-family:Satoshi-Light;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/Satoshi-Light.ttf) format("truetype");font-weight:400;font-style:normal}@font-face{font-family:Satoshi-Medium;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/Satoshi-Medium.ttf) format("truetype");font-weight:400;font-style:normal}@font-face{font-family:Satoshi-Bold;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/Satoshi-Bold.ttf) format("truetype");font-weight:400;font-style:normal}@font-face{font-family:Gloria-Hallelujah;src:url(chrome-extension://__MSG_@@extension_id__/assets/fonts/GloriaHallelujah-Regular.ttf) format("truetype")}</style><script defer="defer" src="/setup.bundle.js"></script></head><body><div id="app-container"></div></body></html>
diff --git a/src/manifest.json b/src/manifest.json
@@ -3,7 +3,7 @@
   "name": "__MSG_extName__",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
-  "version": "3.1.9",
+  "version": "3.1.10",
   "background": {
     "service_worker": "background.bundle.js"
   },

diff --git a/src/pages/Content/Content.jsx b/src/pages/Content/Content.jsx
@@ -125,7 +125,7 @@ const Content = () => {
   }
 }
 
-[data-radix-popper-content-wrapper] { z-index: 999999999999!important; } 
+#screenity-ui [data-radix-popper-content-wrapper] { z-index: 999999999999!important; } 
 
 .screenity-shadow-dom .CanvasContainer {
 	position: fixed;

diff --git a/src/pages/Content/context/ContentState.jsx b/src/pages/Content/context/ContentState.jsx
@@ -999,7 +999,7 @@ const ContentState = (props) => {
       } else if (request.type === "recording-check") {
         if (!request.force) {
           if (!contentStateRef.showExtension && !contentStateRef.recording) {
-            updateFromStorage(true, sender.tab.id);
+            updateFromStorage(true, sender.id);
           }
         } else if (request.force) {
           setContentState((prevContentState) => ({
@@ -1008,7 +1008,7 @@ const ContentState = (props) => {
             recording: true,
           }));
           //checkRecording(sender.tab.id);
-          updateFromStorage(false, sender.tab.id);
+          updateFromStorage(false, sender.id);
         }
       } else if (request.type === "stop-pending") {
         setContentState((prevContentState) => ({

diff --git a/src/pages/Content/popup/styles/components/_Tooltip.scss b/src/pages/Content/popup/styles/components/_Tooltip.scss
@@ -88,7 +88,7 @@
   }
 }
 
-[data-radix-popper-content-wrapper] {
+#screenity-ui [data-radix-popper-content-wrapper] {
   z-index: $z-index-max !important;
 }
 

diff --git a/src/pages/Content/styles/app.css b/src/pages/Content/styles/app.css
@@ -684,7 +684,7 @@ body {
     transform: translateX(0);
   }
 }
-[data-radix-popper-content-wrapper] {
+#screenity-ui [data-radix-popper-content-wrapper] {
   z-index: 99999999999 !important;
 }
 
@@ -3160,7 +3160,7 @@ button {
     transform: translateX(0);
   }
 }
-[data-radix-popper-content-wrapper] {
+#screenity-ui [data-radix-popper-content-wrapper] {
   z-index: 99999999999 !important;
 }
 

diff --git a/src/pages/Content/styles/dist/app.css b/src/pages/Content/styles/dist/app.css
@@ -598,7 +598,7 @@ body {
     transform: translateX(0);
   }
 }
-[data-radix-popper-content-wrapper] {
+#screenity-ui [data-radix-popper-content-wrapper] {
   z-index: 99999999999 !important;
 }
 

diff --git a/src/pages/Content/toolbar/styles/components/_Tooltip.scss b/src/pages/Content/toolbar/styles/components/_Tooltip.scss
@@ -90,7 +90,7 @@
   }
 }
 
-[data-radix-popper-content-wrapper] {
+#screenity-ui [data-radix-popper-content-wrapper] {
   z-index: $z-index-max !important;
 }