2 files changed, 14 insertions, 15 deletions

diff --git a/src/webview/darkmode.ts b/src/webview/darkmode.ts
index 7b9407049..a0699bdb7 100644
--- a/src/webview/darkmode.ts
+++ b/src/webview/darkmode.ts
@@ -9,10 +9,17 @@ const ID = [...Array.from({ length: 20 })]
   .map(() => chars[Math.trunc(Math.random() * chars.length)])
   .join('');
 
+function darkModeFilePath(recipePath: string) {
+  return join(recipePath, 'darkmode.css');
+}
+
+export function darkModeStyleExists(recipePath: string) {
+  return pathExistsSync(darkModeFilePath(recipePath));
+}
+
 export function injectDarkModeStyle(recipePath: string) {
-  const darkModeStyle = join(recipePath, 'darkmode.css');
-  if (pathExistsSync(darkModeStyle)) {
-    const data = readFileSync(darkModeStyle);
+  if (darkModeStyleExists(recipePath)) {
+    const data = readFileSync(darkModeFilePath(recipePath));
     const styles = document.createElement('style');
     styles.id = ID;
     styles.innerHTML = data.toString();
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 70241419a..0b44d1d01 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -27,6 +27,7 @@ import { DialogTitleHandler } from './dialogTitle';
 import { SessionHandler } from './sessionHandler';
 import contextMenu from './contextMenu';
 import {
+  darkModeStyleExists,
   injectDarkModeStyle,
   isDarkModeStyleInjected,
   removeDarkModeStyle,
@@ -320,15 +321,6 @@ class RecipeController {
     ) {
       debug('Enable dark mode');
 
-      // Check if recipe has a darkmode.css
-      const darkModeStyle = join(
-        this.settings.service.recipe.path,
-        'darkmode.css',
-      );
-      const darkModeExists = pathExistsSync(darkModeStyle);
-
-      debug('darkmode.css exists? ', darkModeExists);
-
       // Check if recipe has a custom dark mode handler
       if (this.recipe && this.recipe.darkModeHandler) {
         debug('Using custom dark mode handler');
@@ -341,8 +333,8 @@ class RecipeController {
         }
 
         this.recipe.darkModeHandler(true, handlerConfig);
-      } else if (darkModeExists) {
-        debug('Injecting darkmode.css');
+      } else if (darkModeStyleExists(this.settings.service.recipe.path)) {
+        debug('Injecting darkmode from recipe');
         injectDarkModeStyle(this.settings.service.recipe.path);
 
         // Make sure universal dark mode is disabled
@@ -379,7 +371,7 @@ class RecipeController {
 
         this.recipe.darkModeHandler(false, handlerConfig);
       } else if (isDarkModeStyleInjected()) {
-        debug('Removing injected darkmode.css');
+        debug('Removing injected darkmode from recipe');
         removeDarkModeStyle();
       } else {
         debug('Removing Dark Reader');