{
})
}
- const [prevForm, setPrevForm] = createStore
(clone(form))
+ const [prevForm, setPrevForm] = createSignal(clone(form))
const [saving, setSaving] = createSignal(false)
const mediaItems: Accessor = createMemo(() => {
@@ -90,20 +94,6 @@ export const EditView = (props: Props) => {
})
})
- onMount(() => {
- // eslint-disable-next-line unicorn/consistent-function-scoping
- const handleBeforeUnload = (event) => {
- if (!deepEqual(prevForm, form)) {
- event.returnValue = t(
- `There are unsaved changes in your publishing settings. Are you sure you want to leave the page without saving?`
- )
- }
- }
-
- window.addEventListener('beforeunload', handleBeforeUnload)
- onCleanup(() => window.removeEventListener('beforeunload', handleBeforeUnload))
- })
-
const handleTitleInputChange = (value) => {
setForm('title', value)
setForm('slug', slugify(value))
@@ -184,7 +174,7 @@ export const EditView = (props: Props) => {
const autoSaveRecursive = () => {
autoSaveTimeOutId = setTimeout(async () => {
- const hasChanges = !deepEqual(form, prevForm)
+ const hasChanges = !deepEqual(form, prevForm())
if (hasChanges) {
setSaving(true)
if (props.shout.visibility === 'owner') {
diff --git a/src/components/Views/PublishSettings/PublishSettings.tsx b/src/components/Views/PublishSettings/PublishSettings.tsx
index 4dce0a32..a14e4875 100644
--- a/src/components/Views/PublishSettings/PublishSettings.tsx
+++ b/src/components/Views/PublishSettings/PublishSettings.tsx
@@ -1,6 +1,6 @@
import { clsx } from 'clsx'
import styles from './PublishSettings.module.scss'
-import { createSignal, onMount, Show } from 'solid-js'
+import { createEffect, createSignal, onMount, Show } from 'solid-js'
import { TopicSelect, UploadModalContent } from '../../Editor'
import { Button } from '../../_shared/Button'
import { hideModal, showModal } from '../../../stores/ui'
diff --git a/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx b/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx
index 452cb032..d5e70faf 100644
--- a/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx
+++ b/src/components/_shared/GrowingTextarea/GrowingTextarea.tsx
@@ -1,6 +1,7 @@
import { clsx } from 'clsx'
import styles from './GrowingTextarea.module.scss'
-import { createSignal, Show } from 'solid-js'
+import { createSignal, Show, Switch } from 'solid-js'
+import { style } from 'solid-js/web'
type Props = {
class?: string
diff --git a/src/context/editor.tsx b/src/context/editor.tsx
index 28316a7d..3cd0efca 100644
--- a/src/context/editor.tsx
+++ b/src/context/editor.tsx
@@ -65,17 +65,6 @@ const topic2topicInput = (topic: Topic): TopicInput => {
}
}
-const saveDraftToLocalStorage = (formToSave: ShoutForm) => {
- localStorage.setItem(`shout-${formToSave.shoutId}`, JSON.stringify(formToSave))
-}
-const getDraftFromLocalStorage = (shoutId: number) => {
- return JSON.parse(localStorage.getItem(`shout-${shoutId}`))
-}
-
-const removeDraftFromLocalStorage = (shoutId: number) => {
- localStorage.removeItem(`shout-${shoutId}`)
-}
-
export const EditorProvider = (props: { children: JSX.Element }) => {
const { t } = useLocalize()
@@ -175,6 +164,17 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
await updateShout(draftForm, { publish: false })
}
+ const saveDraftToLocalStorage = (formToSave: ShoutForm) => {
+ localStorage.setItem(`shout-${formToSave.shoutId}`, JSON.stringify(formToSave))
+ }
+ const getDraftFromLocalStorage = (shoutId: number) => {
+ return JSON.parse(localStorage.getItem(`shout-${shoutId}`))
+ }
+
+ const removeDraftFromLocalStorage = (shoutId: number) => {
+ localStorage.removeItem(`shout-${shoutId}`)
+ }
+
const publishShout = async (formToPublish: ShoutForm) => {
if (isEditorPanelVisible()) {
toggleEditorPanel()
diff --git a/src/context/profile.tsx b/src/context/profile.tsx
index 6588c354..0e4a8cbf 100644
--- a/src/context/profile.tsx
+++ b/src/context/profile.tsx
@@ -34,16 +34,14 @@ const useProfileForm = () => {
if (!currentSlug()) return
try {
await loadAuthor({ slug: currentSlug() })
- const updatedFormValues = {
+ setForm({
name: currentAuthor()?.name,
slug: currentAuthor()?.slug,
bio: currentAuthor()?.bio,
about: currentAuthor()?.about,
userpic: currentAuthor()?.userpic,
links: currentAuthor()?.links
- }
-
- setForm(updatedFormValues)
+ })
} catch (error) {
console.error(error)
}
diff --git a/src/pages/profile/profileSettings.page.tsx b/src/pages/profile/profileSettings.page.tsx
index 6b086435..2a8ebf68 100644
--- a/src/pages/profile/profileSettings.page.tsx
+++ b/src/pages/profile/profileSettings.page.tsx
@@ -1,8 +1,7 @@
import { PageLayout } from '../../components/_shared/PageLayout'
import { Icon } from '../../components/_shared/Icon'
import ProfileSettingsNavigation from '../../components/Discours/ProfileSettingsNavigation'
-import { For, createSignal, Show, onMount, onCleanup } from 'solid-js'
-import deepEqual from 'fast-deep-equal'
+import { For, createSignal, Show, onMount } from 'solid-js'
import { clsx } from 'clsx'
import styles from './Settings.module.scss'
import { useProfileForm } from '../../context/profile'
@@ -14,8 +13,6 @@ import { useSnackbar } from '../../context/snackbar'
import { useLocalize } from '../../context/localize'
import { handleFileUpload } from '../../utils/handleFileUpload'
import { Userpic } from '../../components/Author/Userpic'
-import { createStore } from 'solid-js/store'
-import { clone } from '../../utils/clone'
export const ProfileSettingsPage = () => {
const { t } = useLocalize()
@@ -32,7 +29,6 @@ export const ProfileSettingsPage = () => {
actions: { loadSession }
} = useSession()
const { form, updateFormField, submit, slugError } = useProfileForm()
- const [prevForm, setPrevForm] = createStore(clone(form))
const handleChangeSocial = (value: string) => {
if (validateUrl(value)) {
@@ -49,7 +45,6 @@ export const ProfileSettingsPage = () => {
try {
await submit(form)
- setPrevForm(clone(form))
showSnackbar({ body: t('Profile successfully saved') })
} catch {
showSnackbar({ type: 'error', body: t('Error') })
@@ -75,23 +70,9 @@ export const ProfileSettingsPage = () => {
}
const [hostname, setHostname] = createSignal(null)
+ onMount(() => setHostname(window?.location.host))
- onMount(() => {
- setHostname(window?.location.host)
-
- // eslint-disable-next-line unicorn/consistent-function-scoping
- const handleBeforeUnload = (event) => {
- if (!deepEqual(form, prevForm)) {
- event.returnValue = t(
- 'There are unsaved changes in your profile settings. Are you sure you want to leave the page without saving?'
- )
- }
- }
-
- window.addEventListener('beforeunload', handleBeforeUnload)
- onCleanup(() => window.removeEventListener('beforeunload', handleBeforeUnload))
- })
-
+ console.log('!!! form:', form)
return (