From b3fc23201e2f0bc8a83fe2a953a352bc97a699d2 Mon Sep 17 00:00:00 2001
From: Neil <55785687+carkom@users.noreply.github.com>
Date: Fri, 5 Apr 2024 00:38:49 +0100
Subject: [PATCH] Fix toggle bug (#2553)
* fix toggle bug
* notes
---
packages/desktop-client/src/components/common/Menu.tsx | 10 ++++++++--
upcoming-release-notes/2553.md | 6 ++++++
2 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 upcoming-release-notes/2553.md
diff --git a/packages/desktop-client/src/components/common/Menu.tsx b/packages/desktop-client/src/components/common/Menu.tsx
index a948ca5ec..38d0b9a9c 100644
--- a/packages/desktop-client/src/components/common/Menu.tsx
+++ b/packages/desktop-client/src/components/common/Menu.tsx
@@ -173,7 +173,11 @@ export function Menu<T extends MenuItem>({
}}
onPointerEnter={() => setHoveredIndex(idx)}
onPointerLeave={() => setHoveredIndex(null)}
- onClick={() => !item.disabled && onMenuSelect?.(item.name)}
+ onClick={() =>
+ !item.disabled &&
+ item.toggle === undefined &&
+ onMenuSelect?.(item.name)
+ }
>
{/* Force it to line up evenly */}
{item.toggle === undefined ? (
@@ -200,7 +204,9 @@ export function Menu<T extends MenuItem>({
onColor={theme.pageTextPositive}
style={{ marginLeft: 5 }}
onToggle={() =>
- !item.disabled && item.toggle && onMenuSelect?.(item.name)
+ !item.disabled &&
+ item.toggle !== undefined &&
+ onMenuSelect?.(item.name)
}
/>
</>
diff --git a/upcoming-release-notes/2553.md b/upcoming-release-notes/2553.md
new file mode 100644
index 000000000..2ce0e562c
--- /dev/null
+++ b/upcoming-release-notes/2553.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [carkom]
+---
+
+This fixes a regression that broke toggle menu items.
--
GitLab