fix: theme not updated if system theme changed

liriliri · Nov 10, 2024 · 05b1ced · 05b1ced
1 parent c719049
commit 05b1ced
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "karma-jquery": "^0.2.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^5.0.0",
-    "licia": "^1.43.0",
+    "licia": "^1.44.0",
     "luna-box-model": "^1.0.0",
     "luna-console": "^1.3.5",
     "luna-data-grid": "^1.0.0",

diff --git a/src/DevTools/DevTools.js b/src/DevTools/DevTools.js
@@ -10,9 +10,10 @@ import isNum from 'licia/isNum'
 import nextTick from 'licia/nextTick'
 import $ from 'licia/$'
 import toNum from 'licia/toNum'
-import isDarkMode from 'licia/isDarkMode'
 import extend from 'licia/extend'
 import isStr from 'licia/isStr'
+import theme from 'licia/theme'
+import upperFirst from 'licia/upperFirst'
 import startWith from 'licia/startWith'
 import ready from 'licia/ready'
 import pointerEvent from 'licia/pointerEvent'
@@ -265,19 +266,19 @@ export default class DevTools extends Emitter {
       $container.rmClass(c('safe-area'))
     }
   }
-  _setTheme(theme) {
+  _setTheme(t) {
     const { $container } = this
 
-    if (theme === 'System preference') {
-      theme = isDarkMode() ? 'Dark' : 'Light'
+    if (t === 'System preference') {
+      t = upperFirst(theme.get())
     }
 
-    if (isDarkTheme(theme)) {
+    if (isDarkTheme(t)) {
       $container.addClass(c('dark'))
     } else {
       $container.rmClass(c('dark'))
     }
-    evalCss.setTheme(theme)
+    evalCss.setTheme(t)
   }
   _setTransparency(opacity) {
     if (!isNum(opacity)) return
@@ -396,5 +397,12 @@ export default class DevTools extends Emitter {
     window.addEventListener('resize', this._checkSafeArea)
 
     emitter.on(emitter.SCALE, this._updateTabHeight)
+
+    theme.on('change', () => {
+      const t = this.config.get('theme')
+      if (t === 'System preference') {
+        this._setTheme(t)
+      }
+    })
   }
 }