From 49c04a4259e7cb273e7b81718a0969efbebcd22e Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Fri, 26 May 2023 13:31:02 +0800
Subject: [PATCH] Try go back if close media modal
---
src/pages/status.jsx | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/pages/status.jsx b/src/pages/status.jsx
index 490b081e..0cf9043e 100644
--- a/src/pages/status.jsx
+++ b/src/pages/status.jsx
@@ -55,6 +55,7 @@ function resetScrollPosition(id) {
function StatusPage(params) {
const { id } = params;
const { masto, instance } = api({ instance: params.instance });
+ const snapStates = useSnapshot(states);
const [searchParams, setSearchParams] = useSearchParams();
const mediaParam = searchParams.get('media');
const mediaOnlyParam = searchParams.get('media-only');
@@ -117,12 +118,16 @@ function StatusPage(params) {
instance={instance}
index={mediaIndex - 1}
onClose={() => {
- if (showMediaOnly) {
- location.hash = closeLink;
+ if (snapStates.prevLocation) {
+ history.back();
} else {
- searchParams.delete('media');
- searchParams.delete('mediaStatusID');
- setSearchParams(searchParams);
+ if (showMediaOnly) {
+ location.hash = closeLink;
+ } else {
+ searchParams.delete('media');
+ searchParams.delete('mediaStatusID');
+ setSearchParams(searchParams);
+ }
}
}}
/>