From 18bd07291d146f367e62817e6cbaa04129585109 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Sat, 18 May 2024 20:36:06 +0300
Subject: [PATCH] edit-effect

---
 src/pages/edit.page.tsx | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/pages/edit.page.tsx b/src/pages/edit.page.tsx
index 21353681..f729e50b 100644
--- a/src/pages/edit.page.tsx
+++ b/src/pages/edit.page.tsx
@@ -1,4 +1,4 @@
-import { Show, Suspense, createEffect, createMemo, createSignal, lazy, on, onMount } from 'solid-js'
+import { Show, Suspense, createEffect, createMemo, createSignal, lazy, on } from 'solid-js'
 
 import { AuthGuard } from '../components/AuthGuard'
 import { Loading } from '../components/_shared/Loading'
@@ -7,7 +7,7 @@ import { useLocalize } from '../context/localize'
 import { useSession } from '../context/session'
 import { apiClient } from '../graphql/client/core'
 import { Shout } from '../graphql/schema/core.gen'
-import { router } from '../stores/router'
+import { router, useRouter } from '../stores/router'
 
 import { redirectPage } from '@nanostores/router'
 import { useSnackbar } from '../context/snackbar'
@@ -33,6 +33,7 @@ const getContentTypeTitle = (layout: LayoutType) => {
 export const EditPage = () => {
   const { t } = useLocalize()
   const { session } = useSession()
+  const { page } = useRouter()
   const snackbar = useSnackbar()
 
   const fail = async (error: string) => {
@@ -45,12 +46,18 @@ export const EditPage = () => {
   const [shoutId, setShoutId] = createSignal<number>(0)
   const [shout, setShout] = createSignal<Shout>()
 
-  onMount(() => {
-    const shoutId = window.location.pathname.split('/').pop()
-    const shoutIdFromUrl = Number.parseInt(shoutId ?? '0', 10)
-    console.debug(`editing shout ${shoutIdFromUrl}`)
-    if (shoutIdFromUrl) setShoutId(shoutIdFromUrl)
-  })
+  createEffect(
+    on(
+      page,
+      (p) => {
+        const shoutId = p?.path.split('/').pop()
+        const shoutIdFromUrl = Number.parseInt(shoutId ?? '0', 10)
+        console.debug(`editing shout ${shoutIdFromUrl}`)
+        if (shoutIdFromUrl) setShoutId(shoutIdFromUrl)
+      },
+      { defer: true },
+    ),
+  )
 
   createEffect(
     on([session, shout, shoutId], async ([ses, sh, shid]) => {