diff --git a/packages/editor/lite-text-editor/src/index.ts b/packages/editor/lite-text-editor/src/index.ts index 18c4252dd..4cd5af2ee 100644 --- a/packages/editor/lite-text-editor/src/index.ts +++ b/packages/editor/lite-text-editor/src/index.ts @@ -1,4 +1,4 @@ export { LiteTextEditor, LiteTextEditorWithRef } from "src/ui"; -export { LiteReadOnlyEditor, LiteReadOnlyEditorWithRef } from "src/ui/read-only"; +export { LiteTextReadOnlyEditor, LiteTextReadOnlyEditorWithRef } from "src/ui/read-only"; export type { LiteTextEditorProps, ILiteTextEditor } from "src/ui"; -export type { LiteTextEditorReadOnlyProps, ILiteReadOnlyEditor } from "src/ui/read-only"; +export type { LiteTextReadOnlyEditorProps, ILiteTextReadOnlyEditor } from "src/ui/read-only"; diff --git a/packages/editor/lite-text-editor/src/ui/read-only/index.tsx b/packages/editor/lite-text-editor/src/ui/read-only/index.tsx index 8c227e98c..1d54ba588 100644 --- a/packages/editor/lite-text-editor/src/ui/read-only/index.tsx +++ b/packages/editor/lite-text-editor/src/ui/read-only/index.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { EditorContainer, EditorContentWrapper, getEditorClassNames, useReadOnlyEditor } from "@plane/editor-core"; -export type ILiteReadOnlyEditor = { +export type ILiteTextReadOnlyEditor = { value: string; editorContentCustomClassNames?: string; noBorder?: boolean; @@ -10,7 +10,7 @@ export type ILiteReadOnlyEditor = { mentionHighlights: string[]; }; -export interface LiteTextEditorReadOnlyProps extends ILiteReadOnlyEditor { +export interface LiteTextReadOnlyEditorProps extends ILiteTextReadOnlyEditor { forwardedRef?: React.Ref; } @@ -19,7 +19,7 @@ interface EditorHandle { setEditorValue: (content: string) => void; } -const LiteReadOnlyEditor = ({ +const LiteTextReadOnlyEditor = ({ editorContentCustomClassNames, noBorder, borderOnFocus, @@ -27,7 +27,7 @@ const LiteReadOnlyEditor = ({ value, forwardedRef, mentionHighlights, -}: LiteTextEditorReadOnlyProps) => { +}: LiteTextReadOnlyEditorProps) => { const editor = useReadOnlyEditor({ value, forwardedRef, @@ -51,10 +51,10 @@ const LiteReadOnlyEditor = ({ ); }; -const LiteReadOnlyEditorWithRef = React.forwardRef((props, ref) => ( - +const LiteTextReadOnlyEditorWithRef = React.forwardRef((props, ref) => ( + )); -LiteReadOnlyEditorWithRef.displayName = "LiteReadOnlyEditorWithRef"; +LiteTextReadOnlyEditorWithRef.displayName = "LiteTextReadOnlyEditorWithRef"; -export { LiteReadOnlyEditor, LiteReadOnlyEditorWithRef }; +export { LiteTextReadOnlyEditor, LiteTextReadOnlyEditorWithRef }; diff --git a/packages/editor/rich-text-editor/src/index.ts b/packages/editor/rich-text-editor/src/index.ts index 110dc48dc..7cdfb3cd4 100644 --- a/packages/editor/rich-text-editor/src/index.ts +++ b/packages/editor/rich-text-editor/src/index.ts @@ -1,3 +1,4 @@ export { RichTextEditor, RichTextEditorWithRef } from "src/ui"; -export { RichReadOnlyEditor, RichReadOnlyEditorWithRef } from "src/ui/read-only"; +export { RichTextReadOnlyEditor, RichTextReadOnlyEditorWithRef } from "src/ui/read-only"; export type { RichTextEditorProps, IRichTextEditor } from "src/ui"; +export type { IRichTextReadOnlyEditor } from "src/ui/read-only"; diff --git a/packages/editor/rich-text-editor/src/ui/read-only/index.tsx b/packages/editor/rich-text-editor/src/ui/read-only/index.tsx index 9b0f43f57..6c77d2ca4 100644 --- a/packages/editor/rich-text-editor/src/ui/read-only/index.tsx +++ b/packages/editor/rich-text-editor/src/ui/read-only/index.tsx @@ -2,7 +2,7 @@ import { EditorContainer, EditorContentWrapper, getEditorClassNames, useReadOnlyEditor } from "@plane/editor-core"; import * as React from "react"; -interface IRichTextReadOnlyEditor { +export interface IRichTextReadOnlyEditor { value: string; editorContentCustomClassNames?: string; noBorder?: boolean; @@ -20,7 +20,7 @@ interface EditorHandle { setEditorValue: (content: string) => void; } -const RichReadOnlyEditor = ({ +const RichTextReadOnlyEditor = ({ editorContentCustomClassNames, noBorder, borderOnFocus, @@ -52,10 +52,10 @@ const RichReadOnlyEditor = ({ ); }; -const RichReadOnlyEditorWithRef = React.forwardRef((props, ref) => ( - +const RichTextReadOnlyEditorWithRef = React.forwardRef((props, ref) => ( + )); -RichReadOnlyEditorWithRef.displayName = "RichReadOnlyEditorWithRef"; +RichTextReadOnlyEditorWithRef.displayName = "RichTextReadOnlyEditorWithRef"; -export { RichReadOnlyEditor, RichReadOnlyEditorWithRef }; +export { RichTextReadOnlyEditor, RichTextReadOnlyEditorWithRef }; diff --git a/space/components/issues/peek-overview/issue-details.tsx b/space/components/issues/peek-overview/issue-details.tsx index d84103388..316b8474d 100644 --- a/space/components/issues/peek-overview/issue-details.tsx +++ b/space/components/issues/peek-overview/issue-details.tsx @@ -1,16 +1,13 @@ import { IssueReactions } from "components/issues/peek-overview"; -import { RichReadOnlyEditor } from "@plane/rich-text-editor"; +import { RichTextReadOnlyEditor } from "@plane/rich-text-editor"; // types import { IIssue } from "types/issue"; -import useEditorSuggestions from "hooks/use-editor-suggestions"; type Props = { issueDetails: IIssue; }; export const PeekOverviewIssueDetails: React.FC = ({ issueDetails }) => { - const mentionConfig = useEditorSuggestions(); - return (
@@ -18,7 +15,7 @@ export const PeekOverviewIssueDetails: React.FC = ({ issueDetails }) => {

{issueDetails.name}

{issueDetails.description_html !== "" && issueDetails.description_html !== "

" && ( - = ({ issueDetails }) => { : issueDetails.description_html } customClassName="p-3 min-h-[50px] shadow-sm" - mentionHighlights={mentionConfig.mentionHighlights} /> )} diff --git a/web/components/core/modals/gpt-assistant-popover.tsx b/web/components/core/modals/gpt-assistant-popover.tsx index 3afd6d1b9..dedf7cbd8 100644 --- a/web/components/core/modals/gpt-assistant-popover.tsx +++ b/web/components/core/modals/gpt-assistant-popover.tsx @@ -8,10 +8,10 @@ import { usePopper } from "react-popper"; // ui import { Button, Input } from "@plane/ui"; // components -import { RichReadOnlyEditorWithRef } from "@plane/rich-text-editor"; import { Popover, Transition } from "@headlessui/react"; // types import { Placement } from "@popperjs/core"; +import { RichTextReadOnlyEditor } from "components/editor/rich-text-read-only-editor"; type Props = { isOpen: boolean; @@ -203,7 +203,7 @@ export const GptAssistantPopover: React.FC = (props) => { {prompt && (
Content: - = (props) => { {response !== "" && (
Response: - ${response}

`} customClassName={response ? "-mx-3 -my-3" : ""} noBorder diff --git a/web/components/editor/lite-text-read-only-editor.tsx b/web/components/editor/lite-text-read-only-editor.tsx index b36e62d69..3d85c51ab 100644 --- a/web/components/editor/lite-text-read-only-editor.tsx +++ b/web/components/editor/lite-text-read-only-editor.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { ILiteReadOnlyEditor, LiteReadOnlyEditorWithRef } from "@plane/lite-text-editor"; +import { ILiteReadOnlyEditor, LiteTextReadOnlyEditorWithRef } from "@plane/lite-text-editor"; import { useMention } from "hooks/store"; @@ -14,7 +14,9 @@ export const LiteTextReadOnlyEditor = React.forwardRef { const editorSuggestions = useMention(); - return ; + return ( + + ); } ); diff --git a/web/components/editor/rich-text-read-only-editor.tsx b/web/components/editor/rich-text-read-only-editor.tsx index 32056a927..7e35ad1b2 100644 --- a/web/components/editor/rich-text-read-only-editor.tsx +++ b/web/components/editor/rich-text-read-only-editor.tsx @@ -1,41 +1,23 @@ import React from "react"; -import { RichTextEditorWithRef, IRichTextEditor } from "@plane/rich-text-editor"; +import { IRichTextReadOnlyEditor, RichTextReadOnlyEditorWithRef } from "@plane/rich-text-editor"; import { useMention } from "hooks/store"; -import { FileService } from "services/file.service"; - interface EditorHandle { clearEditor: () => void; setEditorValue: (content: string) => void; } -interface RichTextEditorWrapperProps - extends Omit< - IRichTextEditor, - "uploadFile" | "deleteFile" | "restoreFile" | "mentionSuggestions" | "mentionHighlights" - > { - workspaceSlug: string; -} +interface RichTextReadOnlyEditorWrapperProps extends Omit {} -const fileService = new FileService(); - -export const RichTextEditor = React.forwardRef( - ({ workspaceSlug, ...props }, ref) => { +export const RichTextReadOnlyEditor = React.forwardRef( + ({ ...props }, ref) => { const editorSuggestions = useMention(); return ( - + ); } ); -RichTextEditor.displayName = "RichTextEditor"; +RichTextReadOnlyEditor.displayName = "RichTextReadOnlyEditor"; diff --git a/web/pages/profile/activity.tsx b/web/pages/profile/activity.tsx index 0cd010905..ca45dd673 100644 --- a/web/pages/profile/activity.tsx +++ b/web/pages/profile/activity.tsx @@ -7,7 +7,7 @@ import { UserService } from "services/user.service"; import { ProfileSettingsLayout } from "layouts/settings-layout"; // components import { ActivityIcon, ActivityMessage } from "components/core"; -import { RichReadOnlyEditor } from "@plane/rich-text-editor"; +import { RichTextReadOnlyEditor } from "components/editor/rich-text-read-only-editor"; // icons import { History, MessageSquare } from "lucide-react"; // ui @@ -74,11 +74,11 @@ const ProfileActivityPage: NextPageWithLayout = () => {

-