fix: webview init to check theme

oeyoews · Nov 1, 2024 · 48f3529 · 48f3529
1 parent f58dd1a
commit 48f3529
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "publisher": "oeyoews",
   "name": "usewiki2",
   "displayName": "usewiki2",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "private": true,
   "packageManager": "[email protected]",
   "description": "",

diff --git a/packages/react/src/App.tsx b/packages/react/src/App.tsx
@@ -89,8 +89,17 @@ function App() {
   // theme
   useEffect(() => {
     // 监听theme变化
+    // @NOTE： changetheme 只会在第一次插件初始化时（区别于webview初始化时）触发
+    // messenger.on('changeTheme', (data) => {
+    //   if (data.text === 'dark') {
+    //     setDark(true);
+    //   } else {
+    //     setDark(false);
+    //   }
+    // });
+    // 主动进行通信解决非初始化不处罚changetheme事件问题
+    messenger.send('changeTheme');
     messenger.on('changeTheme', (data) => {
-      console.log(data, 'changeTheme');
       if (data.text === 'dark') {
         setDark(true);
       } else {

diff --git a/src/generated/meta.ts b/src/generated/meta.ts
@@ -4,7 +4,7 @@
 // Meta info
 export const publisher = "oeyoews"
 export const name = "usewiki2"
-export const version = "2.8.0"
+export const version = "2.8.1"
 export const displayName = "usewiki2"
 export const description = undefined
 export const extensionId = `${publisher}.${name}`

diff --git a/src/webviews/index.ts b/src/webviews/index.ts
@@ -50,7 +50,9 @@ export class usewikiViewProvider implements WebviewViewProvider {
 
     const messenger = new WebviewMessenger({ context: this._view });
     this._messenger = messenger;
-    this.checkTheme();
+    messenger.on('changeTheme', () => {
+      this.checkTheme();
+    });
     window.onDidChangeActiveColorTheme((theme) => {
       const themeKind = theme.kind;
       if (themeKind === ColorThemeKind.Dark) {