pleroma-fe

commit: a2a58dc082ecb1fe7e509b66b0073957c6a192f9
parent 4aaf6bcc59a7fb7f84f1c59f54ab1d528f820340
Author: Henry Jameson <me@hjkos.com>
Date:   Tue, 12 Nov 2024 21:10:02 +0200

improve robustness and responsiveness

Diffstat:
M
src/components/settings_modal/tabs/style_tab/style_tab.js
35
+++++++++++++++++++++++------------
M
src/components/shadow_control/shadow_control.js
11
++++++++---

2 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -1,6 +1,6 @@
-import { ref, reactive, computed, watch, provide } from 'vue'
+import { ref, reactive, computed, watch, watchEffect, provide } from 'vue'
 import { useStore } from 'vuex'
-import { get, set, unset } from 'lodash'
+import { get, set, unset, throttle } from 'lodash'
 
 import Select from 'src/components/select/select.vue'
 import SelectMotion from 'src/components/select/select_motion.vue'
@@ -639,13 +639,21 @@ export default {
     const overallPreviewRules = ref([])
     exports.overallPreviewRules = overallPreviewRules
 
-    const overallPreviewCssRules = computed(() => getScopedVersion(
-      getCssRules(overallPreviewRules.value),
-      '#edited-style-preview'
-    ).join('\n'))
+    const overallPreviewCssRules = ref([])
+    watchEffect(throttle(() => {
+      try {
+        overallPreviewCssRules.value = getScopedVersion(
+          getCssRules(overallPreviewRules.value),
+          '#edited-style-preview'
+        ).join('\n')
+      } catch (e) {
+        console.error(e)
+      }
+    }, 500))
+
     exports.overallPreviewCssRules = overallPreviewCssRules
 
-    const updateOverallPreview = () => {
+    const updateOverallPreview = throttle(() => {
       try {
         overallPreviewRules.value = init({
           inputRuleset: exportRules.value,
@@ -657,7 +665,7 @@ export default {
         console.error('Could not compile preview theme', e)
         return null
       }
-    }
+    }, 1000)
     //
     // Apart from "hover" we can't really show how component looks like in
     // certain states, so we have to fake them.
@@ -730,10 +738,13 @@ export default {
         return r.component === 'Root'
       })
       const rootDirectivesEntries = Object.entries(rootComponent.directives)
-      const directives = Object.fromEntries(
-        rootDirectivesEntries
-          .filter(([k, v]) => k.startsWith('--') && v.startsWith('color | '))
-          .map(([k, v]) => [k.substring(2), v.substring('color | '.length)]))
+      const directives = {}
+      rootDirectivesEntries
+        .filter(([k, v]) => k.startsWith('--') && v.startsWith('color | '))
+        .map(([k, v]) => [k.substring(2), v.substring('color | '.length)])
+        .forEach(([k, v]) => {
+          directives[k] = findColor(v, { dynamicVars: {}, staticVars: directives })
+        })
       return directives
     })
     provide('staticVars', staticVars)
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
@@ -112,9 +112,14 @@ export default {
     },
     getColorFallback () {
       if (this.staticVars && this.selected?.color) {
-        const computedColor = findColor(this.selected.color, { dynamicVars: {}, staticVars: this.staticVars }, true)
-        if (computedColor) return rgb2hex(computedColor)
-        return null
+        try {
+          const computedColor = findColor(this.selected.color, { dynamicVars: {}, staticVars: this.staticVars }, true)
+          if (computedColor) return rgb2hex(computedColor)
+          return null
+        } catch (e) {
+          console.warn(e)
+          return null
+        }
       } else {
         return this.currentFallback?.color
       }