fix closing and reopening modals

ekaterinburgdev · Dec 10, 2023 · 4b5a4c2 · 4b5a4c2 · ekbdev · Dec 10, 2023
1 parent da6a22e
commit 4b5a4c2
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/client/components/MainPage/MainPage.tsx b/client/components/MainPage/MainPage.tsx
@@ -31,8 +31,22 @@ export function MainPage({ cards, cardsDynamicData, marqueeItems, articles }: Ma
 
     useEffect(() => {
         const handlePopState = (e: PopStateEvent) => {
-            if (e.state.url === '/') {
+            const slug = e.state.articleSlug;
+
+            if (e.state.url === '/' || slug === null) {
                 setOpenedArticle(null);
+
+                return;
+            }
+
+            if (e.state.articleSlug) {
+                const article = articles.find((a) => a.slug === slug);
+
+                if (!article) {
+                    return;
+                }
+
+                setOpenedArticle(article);
             }
         };