From b6eb586121a4a138ee8f06da00eeceea5e37ae4c Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 24 Apr 2025 12:45:06 +0800 Subject: [PATCH] fix(context-menu): ensure submenu is only transformed if it has items - Updated the submenu transformation logic to check for item length before processing, preventing unnecessary transformations. - Adjusted the EntryTitle component's hover effect class for improved scaling behavior. Signed-off-by: Innei --- apps/desktop/src/renderer/src/atoms/context-menu.ts | 7 ++++--- .../src/modules/entry-content/components/EntryTitle.tsx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src/renderer/src/atoms/context-menu.ts b/apps/desktop/src/renderer/src/atoms/context-menu.ts index 426d77e40..14d67fdbe 100644 --- a/apps/desktop/src/renderer/src/atoms/context-menu.ts +++ b/apps/desktop/src/renderer/src/atoms/context-menu.ts @@ -103,9 +103,10 @@ function transformMenuItemsForNative(nextItems: FollowMenuItem[]): ElectronMenuI (!item.disabled && item.click !== undefined) || (!!item.submenu && item.submenu.length > 0), accelerator: item.shortcut?.replace("Meta", "CmdOrCtrl"), checked: typeof item.checked === "boolean" ? item.checked : undefined, - submenu: item.submenu - ? transformMenuItemsForNative(filterNullableMenuItems(item.submenu)) - : undefined, + submenu: + item.submenu.length > 0 + ? transformMenuItemsForNative(filterNullableMenuItems(item.submenu)) + : undefined, } }) } diff --git a/apps/desktop/src/renderer/src/modules/entry-content/components/EntryTitle.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryTitle.tsx index ecc792d8c..0da3cfe2c 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/components/EntryTitle.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryTitle.tsx @@ -71,7 +71,7 @@ export const EntryTitle = ({ entryId, compact }: EntryLinkProps) => { href={populatedFullHref ?? "#"} target="_blank" rel="noopener noreferrer" - className="cursor-link hover:multi-[scale-105;opacity-95] inline-block select-text break-words text-[1.7rem] font-bold leading-normal duration-200" + className="cursor-link hover:multi-[scale-[1.01];opacity-95] inline-block select-text break-words text-[1.7rem] font-bold leading-normal duration-200" >