From c7cc5e6510b9f2eeaac4d8aca9d97b2ec524eb7f Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 1 Sep 2023 21:35:44 +0800 Subject: [PATCH] :art: --- app/src/menus/Menu.ts | 10 +++++----- app/src/search/util.ts | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts index 981927386..26514402c 100644 --- a/app/src/menus/Menu.ts +++ b/app/src/menus/Menu.ts @@ -56,14 +56,14 @@ export class Menu { } public showSubMenu(subMenuElement: HTMLElement) { - const parentRect = subMenuElement.parentElement.getBoundingClientRect(); - subMenuElement.style.top = (parentRect.top - 8) + "px"; - subMenuElement.style.left = (parentRect.right + 8) + "px"; + const itemRect = subMenuElement.parentElement.getBoundingClientRect(); + subMenuElement.style.top = (itemRect.top - 8) + "px"; + subMenuElement.style.left = (itemRect.right + 8) + "px"; subMenuElement.style.bottom = "auto"; const rect = subMenuElement.getBoundingClientRect(); if (rect.right > window.innerWidth) { - if (parentRect.left - 8 > rect.width) { - subMenuElement.style.left = (parentRect.left - 8 - rect.width) + "px"; + if (itemRect.left - 8 > rect.width) { + subMenuElement.style.left = (itemRect.left - 8 - rect.width) + "px"; } else { subMenuElement.style.left = (window.innerWidth - rect.width) + "px"; } diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 267f2b1c6..ca15db2e9 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -630,6 +630,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo event.preventDefault(); break; } else if (target.id === "searchFilter") { + window.siyuan.menus.menu.remove(); filterMenu(config, () => { config.page = 1; inputEvent(element, config, undefined, edit, true);