From b52610d692d3e97124bbe6b0d11ee36137772153 Mon Sep 17 00:00:00 2001
From: Ilya Y <75578537+ilya-bkv@users.noreply.github.com>
Date: Thu, 17 Aug 2023 13:36:27 +0300
Subject: [PATCH] Fix Media Items description autosave (#184)

---
 .../Article/AudioPlayer/PlayerPlaylist.tsx    |  2 +-
 src/components/Editor/SimplifiedEditor.tsx    | 27 ++++++++++++++-----
 .../_shared/SolidSwiper/SolidSwiper.tsx       |  8 +++++-
 .../_shared/SolidSwiper/swiper.d.ts           |  1 +
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
index 9e4c3e5f..7ce74f36 100644
--- a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
+++ b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
@@ -162,7 +162,7 @@ export const PlayerPlaylist = (props: Props) => {
                     initialContent={mi.body}
                     placeholder={`${t('Description')}...`}
                     smallHeight={true}
-                    onAutoSave={(value) => handleMediaItemFieldChange('body', value)}
+                    onChange={(value) => handleMediaItemFieldChange('body', value)}
                   />
                   <GrowingTextarea
                     allowEnterKey={true}
diff --git a/src/components/Editor/SimplifiedEditor.tsx b/src/components/Editor/SimplifiedEditor.tsx
index 8114cdf3..afed92d2 100644
--- a/src/components/Editor/SimplifiedEditor.tsx
+++ b/src/components/Editor/SimplifiedEditor.tsx
@@ -28,11 +28,14 @@ import { InsertLinkForm } from './InsertLinkForm'
 import { Link } from '@tiptap/extension-link'
 import { UploadedFile } from '../../pages/types'
 import { Figure } from './extensions/Figure'
+import { Image } from '@tiptap/extension-image'
+import { Figcaption } from './extensions/Figcaption'
+import { useOutsideClickHandler } from '../../utils/useOutsideClickHandler'
 
 type Props = {
   initialContent?: string
   onSubmit?: (text: string) => void
-  onAutoSave?: (text: string) => void
+  onChange?: (text: string) => void
   placeholder: string
   submitButtonText?: string
   quoteEnabled?: boolean
@@ -46,11 +49,18 @@ type Props = {
 const SimplifiedEditor = (props: Props) => {
   const { t } = useLocalize()
 
-  const editorElRef: {
-    current: HTMLDivElement
+  const wrapperEditorElRef: {
+    current: HTMLElement
   } = {
     current: null
   }
+
+  const editorElRef: {
+    current: HTMLElement
+  } = {
+    current: null
+  }
+
   const {
     actions: { setEditor }
   } = useEditorContext()
@@ -82,6 +92,8 @@ const SimplifiedEditor = (props: Props) => {
         }
       }),
       ImageFigure,
+      Image,
+      Figcaption,
       Placeholder.configure({
         emptyNodeClass: styles.emptyNode,
         placeholder: props.placeholder
@@ -174,16 +186,17 @@ const SimplifiedEditor = (props: Props) => {
     window.removeEventListener('keydown', handleKeyDown)
   })
 
-  if (props.onAutoSave) {
+  if (props.onChange) {
     createEffect(() => {
-      if (isFocused()) return
-      props.onAutoSave(html())
+      props.onChange(html())
     })
   }
+
   const handleInsertLink = () => !editor().state.selection.empty && showModal('editorInsertLink')
 
   return (
     <div
+      ref={(el) => (wrapperEditorElRef.current = el)}
       class={clsx(styles.SimplifiedEditor, {
         [styles.smallHeight]: props.smallHeight,
         [styles.isFocused]: isFocused() || !isEmpty()
@@ -257,7 +270,7 @@ const SimplifiedEditor = (props: Props) => {
             </Popover>
           </Show>
         </div>
-        <Show when={!props.onAutoSave}>
+        <Show when={!props.onChange}>
           <div class={styles.buttons}>
             <Button value={t('Cancel')} variant="secondary" disabled={isEmpty()} onClick={handleClear} />
             <Button
diff --git a/src/components/_shared/SolidSwiper/SolidSwiper.tsx b/src/components/_shared/SolidSwiper/SolidSwiper.tsx
index 3ca6086a..3037127f 100644
--- a/src/components/_shared/SolidSwiper/SolidSwiper.tsx
+++ b/src/components/_shared/SolidSwiper/SolidSwiper.tsx
@@ -35,6 +35,7 @@ export const SolidSwiper = (props: Props) => {
   const { t } = useLocalize()
   const [loading, setLoading] = createSignal(false)
   const [slideIndex, setSlideIndex] = createSignal(0)
+  const [slideBody, setSlideBody] = createSignal<string>()
 
   const mainSwipeRef: { current: SwiperRef } = { current: null }
   const thumbSwipeRef: { current: SwiperRef } = { current: null }
@@ -131,6 +132,10 @@ export const SolidSwiper = (props: Props) => {
     }, 0)
   }
 
+  const handleSaveBeforeSlideChange = () => {
+    handleSlideDescriptionChange(slideIndex(), 'body', slideBody())
+  }
+
   return (
     <div class={clsx(styles.Swiper, props.editorMode ? styles.editorMode : styles.articleMode)}>
       <div class={styles.container}>
@@ -157,6 +162,7 @@ export const SolidSwiper = (props: Props) => {
               thumbs-swiper={'.thumbSwiper'}
               observer={true}
               onSlideChange={handleSlideChange}
+              onBeforeSlideChangeStart={handleSaveBeforeSlideChange}
               space-between={20}
             >
               <For each={props.images}>
@@ -324,7 +330,7 @@ export const SolidSwiper = (props: Props) => {
               initialContent={props.images[slideIndex()].body}
               smallHeight={true}
               placeholder={t('Enter image description')}
-              onAutoSave={(value) => handleSlideDescriptionChange(slideIndex(), 'body', value)}
+              onChange={(value) => setSlideBody(value)}
             />
           </div>
         </Show>
diff --git a/src/components/_shared/SolidSwiper/swiper.d.ts b/src/components/_shared/SolidSwiper/swiper.d.ts
index e7b06700..1da88ad9 100644
--- a/src/components/_shared/SolidSwiper/swiper.d.ts
+++ b/src/components/_shared/SolidSwiper/swiper.d.ts
@@ -35,6 +35,7 @@ declare module 'solid-js' {
       ref?: RefObject<SwiperRef>
       children?: JSX.Element
       onSlideChange?: () => void
+      onBeforeSlideChangeStart?: () => void
       class?: string
     }
     // eslint-disable-next-line @typescript-eslint/no-empty-interface