From 3af29e78b93ce2b784f4ccafad595f5daf1c45bb Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 4 Dec 2024 14:03:27 +0200
Subject: [PATCH] when switching to new style, use "native" palette, also show
 it in appearance tab

---
 .../settings_modal/tabs/appearance_tab.js     | 21 ++++++-
 src/modules/interface.js                      | 61 ++++++++++++++-----
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 1e4e64d62..d910c79b7 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -361,8 +361,27 @@ const AppearanceTab = {
             onlyNormalState: true
           })
         } else if (version === 'v3') {
+          const palette = input.find(x => x.component === '@palette')
+          let paletteRule
+          if (palette) {
+            const { directives } = palette
+            directives.link = directives.link || directives.accent
+            directives.accent = directives.accent || directives.link
+            paletteRule = {
+              component: 'Root',
+              directives: Object.fromEntries(
+                Object
+                  .entries(directives)
+                  .filter(([k, v]) => k && k !== 'name')
+                  .map(([k, v]) => ['--' + k, 'color | ' + v])
+              )
+            }
+          } else {
+            paletteRule = null
+          }
+
           theme3 = init({
-            inputRuleset: input,
+            inputRuleset: [...input, paletteRule].filter(x => x),
             ultimateBackgroundColor: '#000000',
             liteMode: true,
             debug: true,
diff --git a/src/modules/interface.js b/src/modules/interface.js
index c08ca4e49..130ab0969 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -3,6 +3,10 @@ import { CURRENT_VERSION, generatePreset } from 'src/services/theme_data/theme_d
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
 import { deserialize } from '../services/theme_data/iss_deserializer.js'
 
+// helper for debugging
+// eslint-disable-next-line no-unused-vars
+const toValue = (x) => JSON.parse(JSON.stringify(x === undefined ? 'null' : x))
+
 const defaultState = {
   localFonts: null,
   themeApplied: false,
@@ -264,6 +268,7 @@ const interfaceMod = {
     setStyle ({ dispatch, commit }, value) {
       dispatch('resetThemeV3')
       dispatch('resetThemeV2')
+      dispatch('resetThemeV3Palette')
 
       commit('setOption', { name: 'style', value })
 
@@ -272,6 +277,7 @@ const interfaceMod = {
     setStyleCustom ({ dispatch, commit }, value) {
       dispatch('resetThemeV3')
       dispatch('resetThemeV2')
+      dispatch('resetThemeV3Palette')
 
       commit('setOption', { name: 'styleCustomData', value })
 
@@ -443,14 +449,47 @@ const interfaceMod = {
       console.debug('Version used', majorVersionUsed)
 
       if (majorVersionUsed === 'v3') {
+        state.themeDataUsed = null
+        state.themeNameUsed = null
+
+        const style = await getData(
+          'style',
+          stylesIndex,
+          userStyleCustomData,
+          userStyleName || instanceStyleName
+        )
+        state.styleNameUsed = style.nameUsed
+        state.styleDataUsed = style.dataUsed
+
+        let firstStylePaletteName = null
+        style
+          .dataUsed
+          ?.filter(x => x.component === '@palette')
+          .map(x => {
+            const cleanDirectives = Object.fromEntries(
+              Object
+                .entries(x.directives)
+                .filter(([k, v]) => k)
+            )
+
+            return { name: x.variant, ...cleanDirectives }
+          })
+          .forEach(palette => {
+            const key = 'style.' + palette.name.toLowerCase().replace(/ /, '_')
+            if (!firstStylePaletteName) firstStylePaletteName = key
+            palettesIndex[key] = () => Promise.resolve(palette)
+          })
+
         const palette = await getData(
           'palette',
           palettesIndex,
           userPaletteCustomData,
-          userPaletteName || instancePaletteName
+          userPaletteName || firstStylePaletteName || instancePaletteName
         )
+
         state.paletteNameUsed = palette.nameUsed
         state.paletteDataUsed = palette.dataUsed
+
         if (state.paletteDataUsed) {
           state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent
           state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link
@@ -481,18 +520,12 @@ const interfaceMod = {
           }
         }
         console.debug('Palette data used', palette.dataUsed)
-
-        const style = await getData(
-          'style',
-          stylesIndex,
-          userStyleCustomData,
-          userStyleName || instanceStyleName
-        )
-        state.styleNameUsed = style.nameUsed
-        state.styleDataUsed = style.dataUsed
-        state.themeDataUsed = null
-        state.themeNameUsed = null
       } else {
+        state.styleNameUsed = null
+        state.styleDataUsed = null
+        state.paletteNameUsed = null
+        state.paletteDataUsed = null
+
         const theme = await getData(
           'theme',
           themesIndex,
@@ -501,10 +534,6 @@ const interfaceMod = {
         )
         state.themeNameUsed = theme.nameUsed
         state.themeDataUsed = theme.dataUsed
-        state.styleNameUsed = null
-        state.styleDataUsed = null
-        state.paletteNameUsed = null
-        state.paletteDataUsed = null
       }
     },
     async applyTheme (