From a1072db227939066dfc74ed298f90e0a3348a974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?= <josuegalre@gmail.com>
Date: Mon, 16 Sep 2024 01:21:00 -0600
Subject: [PATCH 1/2] feature(zenThemesImporter): add string type theme
 property writing to dom on startup

---
 src/ZenThemesImporter.mjs | 46 +++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/ZenThemesImporter.mjs b/src/ZenThemesImporter.mjs
index 84d1338..90eddb6 100644
--- a/src/ZenThemesImporter.mjs
+++ b/src/ZenThemesImporter.mjs
@@ -145,7 +145,9 @@ var gZenThemeImporter = new (class {
     const browser = this._getBrowser();
 
     for (const theme of Object.values(await this.getThemes())) {
-      const { preferences, areOldPreferences } = await this._getThemePreferences(theme);
+      const { preferences, areOldPreferences } = (await this._getThemePreferences(theme)).filter(
+        ({ type }) => type !== 'checkbox'
+      );
       const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
 
       if (!theme.enabled) {
@@ -155,6 +157,10 @@ var gZenThemeImporter = new (class {
           element.remove();
         }
 
+        if (document.querySelector(':root').style.hasProperty(`--${sanitizedProperty}`)) {
+          document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
+        }
+
         continue;
       }
 
@@ -162,24 +168,40 @@ var gZenThemeImporter = new (class {
         continue;
       }
 
-      const themePreferences = preferences.filter(({ type }) => type === 'dropdown');
-
-      for (const { property } of themePreferences) {
+      for (const { property, type } of preferences) {
         const value = Services.prefs.getStringPref(property, '');
+        const sanitizedProperty = property?.replaceAll(/\./g, '-');
 
-        if (value !== '') {
-          let element = browser.document.getElementById(sanitizedName);
+        switch (type) {
+          case 'dropdown': {
+            if (value !== '') {
+              let element = browser.document.getElementById(sanitizedName);
 
-          if (!element) {
-            element = browser.document.createElement('div');
+              if (!element) {
+                element = browser.document.createElement('div');
 
-            element.style.display = 'none';
-            element.setAttribute('id', sanitizedName);
+                element.style.display = 'none';
+                element.setAttribute('id', sanitizedName);
 
-            browser.document.body.appendChild(element);
+                browser.document.body.appendChild(element);
+              }
+
+              element.setAttribute(sanitizedProperty, value);
+            }
+            break;
           }
 
-          element.setAttribute(property?.replaceAll(/\./g, '-'), value);
+          case 'string': {
+            if (value === '') {
+              document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
+            } else {
+              document.querySelector(':root').style.setProperty(`--${sanitizedProperty}`, value);
+            }
+            break;
+          }
+
+          default: {
+          }
         }
       }
     }

From df1c0886d6eac4babcd4b9e7dec64402942b440f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?= <josuegalre@gmail.com>
Date: Mon, 16 Sep 2024 12:17:18 -0600
Subject: [PATCH 2/2] fix(zenThemesImporter): fixed wrong preferences filtering

---
 src/ZenThemesImporter.mjs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/ZenThemesImporter.mjs b/src/ZenThemesImporter.mjs
index 90eddb6..337ae9c 100644
--- a/src/ZenThemesImporter.mjs
+++ b/src/ZenThemesImporter.mjs
@@ -145,9 +145,13 @@ var gZenThemeImporter = new (class {
     const browser = this._getBrowser();
 
     for (const theme of Object.values(await this.getThemes())) {
-      const { preferences, areOldPreferences } = (await this._getThemePreferences(theme)).filter(
-        ({ type }) => type !== 'checkbox'
-      );
+      const { preferences, areOldPreferences } = await this._getThemePreferences(theme);
+
+      if (areOldPreferences) {
+        continue;
+      }
+
+      const filteredPreferences = preferences.filter(({ type }) => type !== 'checkbox');
       const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
 
       if (!theme.enabled) {
@@ -157,17 +161,17 @@ var gZenThemeImporter = new (class {
           element.remove();
         }
 
-        if (document.querySelector(':root').style.hasProperty(`--${sanitizedProperty}`)) {
-          document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
+        for (const { property } of filteredPreferences) {
+          const sanitizedProperty = property?.replaceAll(/\./g, '-');
+
+          if (document.querySelector(':root').style.hasProperty(`--${sanitizedProperty}`)) {
+            document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
+          }
         }
 
         continue;
       }
 
-      if (areOldPreferences) {
-        continue;
-      }
-
       for (const { property, type } of preferences) {
         const value = Services.prefs.getStringPref(property, '');
         const sanitizedProperty = property?.replaceAll(/\./g, '-');