diff --git a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx index 7552d18f..bb90fc93 100644 --- a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx +++ b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx @@ -110,7 +110,7 @@ export const EditorFloatingMenu = (props: FloatingMenuProps) => { { + onClose={(value) => { renderImage(value) setSelectedMenuItem() }} diff --git a/src/components/Editor/UploadModalContent/UploadModalContent.tsx b/src/components/Editor/UploadModalContent/UploadModalContent.tsx index 839b6440..4f6bbc34 100644 --- a/src/components/Editor/UploadModalContent/UploadModalContent.tsx +++ b/src/components/Editor/UploadModalContent/UploadModalContent.tsx @@ -8,13 +8,11 @@ import { hideModal } from '../../../stores/ui' import { createDropzone, createFileUploader, UploadFile } from '@solid-primitives/upload' import { handleFileUpload } from '../../../utils/handleFileUpload' import { useLocalize } from '../../../context/localize' -import { Editor } from '@tiptap/core' import { Loading } from '../../_shared/Loading' import { verifyImg } from '../../../utils/verifyImg' -import { imageProxy } from '../../../utils/imageProxy' type Props = { - closeCallback: (imgUrl?: string) => void + onClose: (imgUrl?: string) => void } export const UploadModalContent = (props: Props) => { @@ -30,7 +28,7 @@ export const UploadModalContent = (props: Props) => { setIsUploading(true) const fileUrl = await handleFileUpload(file) setIsUploading(false) - props.closeCallback(fileUrl) + props.onClose(fileUrl) } catch (error) { setIsUploading(false) setUploadError(t('Error')) @@ -113,9 +111,9 @@ export const UploadModalContent = (props: Props) => { showInput={true} onClose={() => { hideModal() - props.closeCallback() + props.onClose() }} - // validate={(value) => verifyImg(value)} + validate={(value) => verifyImg(value)} onSubmit={handleImageFormSubmit} errorMessage={t('Invalid image link')} /> diff --git a/src/components/Views/Edit.tsx b/src/components/Views/Edit.tsx index f4c276c0..b40ee5c8 100644 --- a/src/components/Views/Edit.tsx +++ b/src/components/Views/Edit.tsx @@ -90,9 +90,8 @@ export const EditView = (props: EditViewProps) => { setForm('slug', slug) } - const handleSetCover = (imgUrl: string) => { + const handleUploadModalContentCloseSetCover = (imgUrl: string) => { hideModal() - console.log('!!! imgUrl:', imgUrl) setCoverImage(imgUrl) setForm('coverImageUrl', imgUrl) } @@ -253,7 +252,7 @@ export const EditView = (props: EditViewProps) => { - handleSetCover(value)} /> + handleUploadModalContentCloseSetCover(value)} />