diff --git a/packages/editor/src/ce/extensions/document-extensions.tsx b/packages/editor/src/ce/extensions/document-extensions.tsx index bf2937fcd6..6bb5802132 100644 --- a/packages/editor/src/ce/extensions/document-extensions.tsx +++ b/packages/editor/src/ce/extensions/document-extensions.tsx @@ -4,20 +4,19 @@ import { SlashCommand } from "@/extensions"; // plane editor types import { TIssueEmbedConfig } from "@/plane-editor/types"; // types -import { TExtensions, TFileHandler, TUserDetails } from "@/types"; +import { TExtensions, TUserDetails } from "@/types"; type Props = { disabledExtensions?: TExtensions[]; - fileHandler: TFileHandler; issueEmbedConfig: TIssueEmbedConfig | undefined; provider: HocuspocusProvider; userDetails: TUserDetails; }; export const DocumentEditorAdditionalExtensions = (props: Props) => { - const { fileHandler } = props; + const {} = props; - const extensions: Extensions = [SlashCommand(fileHandler.upload)]; + const extensions: Extensions = [SlashCommand()]; return extensions; }; diff --git a/packages/editor/src/core/components/editors/rich-text/editor.tsx b/packages/editor/src/core/components/editors/rich-text/editor.tsx index 2820423727..b1f9eed7d0 100644 --- a/packages/editor/src/core/components/editors/rich-text/editor.tsx +++ b/packages/editor/src/core/components/editors/rich-text/editor.tsx @@ -11,7 +11,7 @@ const RichTextEditor = (props: IRichTextEditor) => { const { dragDropEnabled, fileHandler } = props; const getExtensions = useCallback(() => { - const extensions = [SlashCommand(fileHandler.upload)]; + const extensions = [SlashCommand()]; extensions.push( SideMenuExtension({ diff --git a/packages/editor/src/core/extensions/image-upload/view/image-uploader.tsx b/packages/editor/src/core/extensions/image-upload/view/image-uploader.tsx index c362bfc3a0..7ec16918b4 100644 --- a/packages/editor/src/core/extensions/image-upload/view/image-uploader.tsx +++ b/packages/editor/src/core/extensions/image-upload/view/image-uploader.tsx @@ -1,7 +1,9 @@ import { ChangeEvent, useCallback, useEffect, useRef } from "react"; import { Editor } from "@tiptap/core"; import { ImageIcon } from "lucide-react"; +// helpers import { cn } from "@/helpers/common"; +// hooks import { useUploader, useFileUpload, useDropZone } from "@/hooks/use-file-upload"; type RefType = React.RefObject | ((instance: HTMLInputElement | null) => void); @@ -42,28 +44,26 @@ export const ImageUploader = ({ } }, [existingFile, uploadFile]); - const wrapperClass = cn( - "flex items-center justify-start px-2 py-2 rounded-lg bg-opacity-80 border-2 border-dotted border-custom-border-400 cursor-pointer gap-2", - "transition-all duration-200 ease-in-out", - "hover:bg-custom-background-80 hover:border-custom-border-200", - draggedInside && "bg-custom-background-80" - ); - return (
- -
+ +
{loading ? "Uploading..." : draggedInside ? "Drop image here" : existingFile ? "Uploading..." : "Add an image"}
{ localRef.current = element; assignRef(fileInputRef, element); diff --git a/packages/editor/src/core/extensions/slash-commands.tsx b/packages/editor/src/core/extensions/slash-commands.tsx index 5d4e706f78..15ffe0d5d0 100644 --- a/packages/editor/src/core/extensions/slash-commands.tsx +++ b/packages/editor/src/core/extensions/slash-commands.tsx @@ -89,7 +89,7 @@ const Command = Extension.create({ }); const getSuggestionItems = - (uploadFile: UploadImage, additionalOptions?: Array) => + (additionalOptions?: Array) => ({ query }: { query: string }) => { let slashCommands: ISlashCommandItem[] = [ { @@ -415,10 +415,10 @@ const renderItems = () => { }; }; -export const SlashCommand = (uploadFile: UploadImage, additionalOptions?: Array) => +export const SlashCommand = (additionalOptions?: Array) => Command.configure({ suggestion: { - items: getSuggestionItems(uploadFile, additionalOptions), + items: getSuggestionItems(additionalOptions), render: renderItems, }, }); diff --git a/packages/editor/src/core/hooks/use-collaborative-editor.ts b/packages/editor/src/core/hooks/use-collaborative-editor.ts index cc504feb6f..a16480d5fa 100644 --- a/packages/editor/src/core/hooks/use-collaborative-editor.ts +++ b/packages/editor/src/core/hooks/use-collaborative-editor.ts @@ -84,7 +84,6 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => { ...(extensions ?? []), ...DocumentEditorAdditionalExtensions({ disabledExtensions, - fileHandler, issueEmbedConfig: embedHandler?.issue, provider, userDetails: user,