From 5fb7badfb4fe39f925090e03f66760a6b03b577a Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Wed, 31 Dec 2025 19:54:31 +0800
Subject: [PATCH 1/5] fix(rightPane): toggling right pane visibility
 incorrectly affects all windows

---
 apps/client/src/widgets/buttons/right_pane_toggle.tsx | 11 +++++++++--
 .../src/widgets/sidebar/RightPanelContainer.tsx       | 11 ++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index 53bf67ae2..e9253dc37 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -3,9 +3,12 @@ import clsx from "clsx";
 import { t } from "../../services/i18n";
 import ActionButton from "../react/ActionButton";
 import { useTriliumOptionBool } from "../react/hooks";
+import { useState } from "preact/hooks";
+import appContext from "../../components/app_context";
 
 export default function RightPaneToggle() {
-    const [ rightPaneVisible, setRightPaneVisible ] = useTriliumOptionBool("rightPaneVisible");
+    const [rightPaneVisibleOption, setRightPaneVisibleOption] = useTriliumOptionBool("rightPaneVisible");
+    const [rightPaneVisible, setRightPaneVisible] = useState(rightPaneVisibleOption);
 
     return (
         <ActionButton
@@ -15,7 +18,11 @@ export default function RightPaneToggle() {
             )}
             text={t("right_pane.toggle")}
             icon="bx bx-sidebar"
-            onClick={() => setRightPaneVisible(!rightPaneVisible)}
+            onClick={() => {
+                setRightPaneVisible(!rightPaneVisible);
+                setRightPaneVisibleOption(!rightPaneVisible);
+                appContext.triggerEvent("toggleRightPane", {});
+            }}
         />
     );
 }
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index a512d1362..27c13fb12 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -3,7 +3,7 @@ import "./RightPanelContainer.css";
 
 import Split from "@triliumnext/split.js";
 import { VNode } from "preact";
-import { useEffect, useRef } from "preact/hooks";
+import { useState, useEffect, useRef } from "preact/hooks";
 
 import appContext from "../../components/app_context";
 import { WidgetsByParent } from "../../services/bundle";
@@ -27,10 +27,12 @@ interface RightPanelWidgetDefinition {
 }
 
 export default function RightPanelContainer({ widgetsByParent }: { widgetsByParent: WidgetsByParent }) {
-    const [ rightPaneVisible, setRightPaneVisible ] = useTriliumOptionBool("rightPaneVisible");
+    const [rightPaneVisibleOption, setRightPaneVisibleOption] = useTriliumOptionBool("rightPaneVisible");
+    const [rightPaneVisible, setRightPaneVisible] = useState(rightPaneVisibleOption);
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
     useTriliumEvent("toggleRightPane", () => {
+        setRightPaneVisibleOption(!rightPaneVisible);
         setRightPaneVisible(!rightPaneVisible);
     });
 
@@ -45,7 +47,10 @@ export default function RightPanelContainer({ widgetsByParent }: { widgetsByPare
                         {t("right_pane.empty_message")}
                         <Button
                             text={t("right_pane.empty_button")}
-                            onClick={() => setRightPaneVisible(!rightPaneVisible)}
+                                onClick={() => {
+                                    setRightPaneVisibleOption(!rightPaneVisible);
+                                    setRightPaneVisible(!rightPaneVisible);
+                                }}
                         />
                     </div>
                 )

From 5aa0a956dd7e789380e9108a7400401a90225a6d Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Fri, 2 Jan 2026 10:25:34 +0800
Subject: [PATCH 2/5] fix: toggling right pane visibility incorrectly affects
 all windows

---
 .../src/widgets/buttons/right_pane_toggle.tsx     | 15 ++++++++-------
 .../src/widgets/sidebar/RightPanelContainer.tsx   | 10 +++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index e9253dc37..0b5e59f34 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -5,10 +5,15 @@ import ActionButton from "../react/ActionButton";
 import { useTriliumOptionBool } from "../react/hooks";
 import { useState } from "preact/hooks";
 import appContext from "../../components/app_context";
+import { useTriliumEvent } from "../react/hooks";
+import options from "../../services/options";
 
 export default function RightPaneToggle() {
-    const [rightPaneVisibleOption, setRightPaneVisibleOption] = useTriliumOptionBool("rightPaneVisible");
-    const [rightPaneVisible, setRightPaneVisible] = useState(rightPaneVisibleOption);
+    const [rightPaneVisible, setRightPaneVisible] = useState(options.is("rightPaneVisible"));
+
+    useTriliumEvent("toggleRightPane", () => {
+        setRightPaneVisible(!rightPaneVisible);
+    });
 
     return (
         <ActionButton
@@ -18,11 +23,7 @@ export default function RightPaneToggle() {
             )}
             text={t("right_pane.toggle")}
             icon="bx bx-sidebar"
-            onClick={() => {
-                setRightPaneVisible(!rightPaneVisible);
-                setRightPaneVisibleOption(!rightPaneVisible);
-                appContext.triggerEvent("toggleRightPane", {});
-            }}
+            triggerCommand="toggleRightPane"
         />
     );
 }
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index 27c13fb12..2ecb43f27 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -27,12 +27,11 @@ interface RightPanelWidgetDefinition {
 }
 
 export default function RightPanelContainer({ widgetsByParent }: { widgetsByParent: WidgetsByParent }) {
-    const [rightPaneVisibleOption, setRightPaneVisibleOption] = useTriliumOptionBool("rightPaneVisible");
-    const [rightPaneVisible, setRightPaneVisible] = useState(rightPaneVisibleOption);
+    const [rightPaneVisible, setRightPaneVisible] = useState(options.is("rightPaneVisible"));
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
     useTriliumEvent("toggleRightPane", () => {
-        setRightPaneVisibleOption(!rightPaneVisible);
+        options.save("rightPaneVisible",(!rightPaneVisible).toString());
         setRightPaneVisible(!rightPaneVisible);
     });
 
@@ -47,10 +46,7 @@ export default function RightPanelContainer({ widgetsByParent }: { widgetsByPare
                         {t("right_pane.empty_message")}
                         <Button
                             text={t("right_pane.empty_button")}
-                                onClick={() => {
-                                    setRightPaneVisibleOption(!rightPaneVisible);
-                                    setRightPaneVisible(!rightPaneVisible);
-                                }}
+                            triggerCommand="toggleRightPane"
                         />
                     </div>
                 )

From 4be3011a8ad7fdbdb135e1080ffd0eedf8280d03 Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Fri, 2 Jan 2026 10:30:15 +0800
Subject: [PATCH 3/5] fix: toggling right pane visibility incorrectly affects
 all windows

---
 apps/client/src/widgets/buttons/right_pane_toggle.tsx  | 10 ++++------
 .../client/src/widgets/sidebar/RightPanelContainer.tsx |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index 0b5e59f34..7d91b6b2d 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -1,15 +1,13 @@
 import clsx from "clsx";
 
 import { t } from "../../services/i18n";
-import ActionButton from "../react/ActionButton";
-import { useTriliumOptionBool } from "../react/hooks";
-import { useState } from "preact/hooks";
-import appContext from "../../components/app_context";
-import { useTriliumEvent } from "../react/hooks";
 import options from "../../services/options";
+import ActionButton from "../react/ActionButton";
+import { useState } from "preact/hooks";
+import { useTriliumEvent } from "../react/hooks";
 
 export default function RightPaneToggle() {
-    const [rightPaneVisible, setRightPaneVisible] = useState(options.is("rightPaneVisible"));
+    const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
 
     useTriliumEvent("toggleRightPane", () => {
         setRightPaneVisible(!rightPaneVisible);
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index 2ecb43f27..4a16da5cc 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -27,7 +27,7 @@ interface RightPanelWidgetDefinition {
 }
 
 export default function RightPanelContainer({ widgetsByParent }: { widgetsByParent: WidgetsByParent }) {
-    const [rightPaneVisible, setRightPaneVisible] = useState(options.is("rightPaneVisible"));
+    const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
     useTriliumEvent("toggleRightPane", () => {

From 644d3a181fda7d95e5fd2f0bd6df78abca05ed0d Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Fri, 2 Jan 2026 11:08:49 +0800
Subject: [PATCH 4/5] fix: toggling right pane visibility incorrectly affects
 all windows

---
 apps/client/src/widgets/buttons/right_pane_toggle.tsx   | 2 +-
 apps/client/src/widgets/sidebar/RightPanelContainer.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index 7d91b6b2d..8f82e9de0 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -10,7 +10,7 @@ export default function RightPaneToggle() {
     const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
 
     useTriliumEvent("toggleRightPane", () => {
-        setRightPaneVisible(!rightPaneVisible);
+        setRightPaneVisible(current => !current);
     });
 
     return (
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index 4a16da5cc..a6df7ba9d 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -31,8 +31,11 @@ export default function RightPanelContainer({ widgetsByParent }: { widgetsByPare
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
     useTriliumEvent("toggleRightPane", () => {
-        options.save("rightPaneVisible",(!rightPaneVisible).toString());
-        setRightPaneVisible(!rightPaneVisible);
+        setRightPaneVisible(current => {
+            const newValue = !current;
+            options.save("rightPaneVisible", newValue.toString());
+            return newValue;
+        });
     });
 
     return (

From 3420374649abf267388eba2c07006fe651e43a4a Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Fri, 2 Jan 2026 11:31:59 +0800
Subject: [PATCH 5/5] fix: toggling right pane visibility incorrectly affects
 all windows

---
 apps/client/src/widgets/buttons/right_pane_toggle.tsx   | 6 +++---
 apps/client/src/widgets/sidebar/RightPanelContainer.tsx | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index 8f82e9de0..6a31d633c 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -3,15 +3,15 @@ import clsx from "clsx";
 import { t } from "../../services/i18n";
 import options from "../../services/options";
 import ActionButton from "../react/ActionButton";
-import { useState } from "preact/hooks";
+import { useState, useCallback } from "preact/hooks";
 import { useTriliumEvent } from "../react/hooks";
 
 export default function RightPaneToggle() {
     const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
 
-    useTriliumEvent("toggleRightPane", () => {
+    useTriliumEvent("toggleRightPane", useCallback(() => {
         setRightPaneVisible(current => !current);
-    });
+    }, []));
 
     return (
         <ActionButton
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index a6df7ba9d..56f6dd99c 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -3,7 +3,7 @@ import "./RightPanelContainer.css";
 
 import Split from "@triliumnext/split.js";
 import { VNode } from "preact";
-import { useState, useEffect, useRef } from "preact/hooks";
+import { useState, useEffect, useRef, useCallback } from "preact/hooks";
 
 import appContext from "../../components/app_context";
 import { WidgetsByParent } from "../../services/bundle";
@@ -11,7 +11,7 @@ import { t } from "../../services/i18n";
 import options from "../../services/options";
 import { DEFAULT_GUTTER_SIZE } from "../../services/resizer";
 import Button from "../react/Button";
-import { useActiveNoteContext, useLegacyWidget, useNoteProperty, useTriliumEvent, useTriliumOptionBool, useTriliumOptionJson } from "../react/hooks";
+import { useActiveNoteContext, useLegacyWidget, useNoteProperty, useTriliumEvent, useTriliumOptionJson } from "../react/hooks";
 import Icon from "../react/Icon";
 import LegacyRightPanelWidget from "../right_panel_widget";
 import HighlightsList from "./HighlightsList";
@@ -30,13 +30,13 @@ export default function RightPanelContainer({ widgetsByParent }: { widgetsByPare
     const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
-    useTriliumEvent("toggleRightPane", () => {
+    useTriliumEvent("toggleRightPane", useCallback(() => {
         setRightPaneVisible(current => {
             const newValue = !current;
             options.save("rightPaneVisible", newValue.toString());
             return newValue;
         });
-    });
+    }, []));
 
     return (
         <div id="right-pane">