From 5a3d7f9ef882eb08110aebce81241e90d8051cd2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 4 Aug 2023 14:14:09 +0000
Subject: [PATCH] :v:

---
 packages/frontend/src/components/MkPopupMenu.vue | 6 ++++++
 packages/frontend/src/scripts/get-note-menu.ts   | 4 +++-
 packages/frontend/src/scripts/get-user-menu.ts   | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkPopupMenu.vue b/packages/frontend/src/components/MkPopupMenu.vue
index 73afcc1fab..ee7dbecf05 100644
--- a/packages/frontend/src/components/MkPopupMenu.vue
+++ b/packages/frontend/src/components/MkPopupMenu.vue
@@ -58,10 +58,16 @@ function onModalClosed() {
 function hide() {
 	manualShowing.value = false;
 	hiding.value = true;
+
+	// closeは呼ぶ必要がある
+	modal?.close();
 }
 
 function close() {
 	manualShowing.value = false;
+
+	// closeは呼ぶ必要がある
+	modal?.close();
 }
 </script>
 
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 20cea45ee3..8e29fc0c9b 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -418,7 +418,9 @@ export function getNoteMenu(props: {
 
 	const cleanup = () => {
 		if (_DEV_) console.log('note menu cleanup', cleanups);
-		cleanups.forEach(cleanup => cleanup());
+		for (const cl of cleanups) {
+			cl();
+		}
 	};
 
 	return {
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 445560b0c3..69a6f75c12 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -330,7 +330,9 @@ export function getUserMenu(user: misskey.entities.UserDetailed, router: Router
 
 	const cleanup = () => {
 		if (_DEV_) console.log('user menu cleanup', cleanups);
-		cleanups.forEach(cleanup => cleanup());
+		for (const cl of cleanups) {
+			cl();
+		}
 	};
 
 	return {