From d1a1995162861985e2b28f046df3036cd13a3b93 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Fri, 15 Sep 2023 17:03:32 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E3=83=A2=E3=83=BC=E3=83=80?=
 =?UTF-8?q?=E3=83=AB=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=8C?=
 =?UTF-8?q?safe=20area=E3=82=92=E4=BE=B5=E7=8A=AF=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                      | 1 +
 packages/frontend/src/components/MkModal.vue | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 8c226ca125..58597bb69e 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -74,6 +74,7 @@
 - Fix: Misskey 플러그인 설치 시 AiScript 버전 확인이 0.14.0 이후 버전에서 지원되지 않는 문제 수정 (misskey-dev/misskey#11729)
 - Fix: '대화'에서 Autocomplete를 사용할 수 없음
 - Fix: 누락된 안테나 소스 추가
+- Fix: 모달 팝업이 safe area를 침범하지 않도록
 
 ### Server
 - Nodeinfo의 Software 이름을 CherryPick이 아닌 다른 이름으로 변경할 때 관련 주석 추가
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index 464177964c..c1eda0ca91 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -433,8 +433,8 @@ defineExpose({
 			bottom: 0;
 			left: 0;
 			right: 0;
-			margin: auto;
-			padding: 32px;
+      margin: auto auto calc(env(safe-area-inset-bottom));
+      padding: 32px;
 			display: flex;
 			overflow: auto;
 
@@ -467,7 +467,7 @@ defineExpose({
 			bottom: 0;
 			left: 0;
 			right: 0;
-			margin: auto;
+      margin: auto auto calc(env(safe-area-inset-bottom));
 		}
 	}
 }