π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[PE-92] fix: removing readonly collaborative document editor (#6209)
M. Palanikannane33bae21254b
diff --git a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx b/packages/editor/src/core/components/editors/document/collaborative-editor.tsxindex cd7d6f3548..44c18c2f68 100644--- a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx+++ b/packages/editor/src/core/components/editors/document/collaborative-editor.tsx@@ -19,6 +19,7 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {containerClassName,disabledExtensions,displayConfig = DEFAULT_DISPLAY_CONFIG,+ editable,editorClassName = "",embedHandler,fileHandler,@@ -44,8 +45,8 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {// use document editorconst { editor, hasServerConnectionFailed, hasServerSynced } = useCollaborativeEditor({- onTransaction,disabledExtensions,+ editable,editorClassName,embedHandler,extensions,@@ -54,6 +55,7 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {handleEditorReady,id,mentionHandler,+ onTransaction,placeholder,realtimeConfig,serverHandler,diff --git a/packages/editor/src/core/components/editors/document/collaborative-read-only-editor.tsx b/packages/editor/src/core/components/editors/document/collaborative-read-only-editor.tsxdeleted file mode 100644index 89acace7b7..0000000000--- a/packages/editor/src/core/components/editors/document/collaborative-read-only-editor.tsx+++ /dev/null@@ -1,81 +0,0 @@-import { forwardRef, MutableRefObject } from "react";-// components-import { DocumentContentLoader, PageRenderer } from "@/components/editors";-// constants-import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";-// extensions-import { IssueWidget } from "@/extensions";-// helpers-import { getEditorClassNames } from "@/helpers/common";-// hooks-import { useReadOnlyCollaborativeEditor } from "@/hooks/use-read-only-collaborative-editor";-// types-import { EditorReadOnlyRefApi, ICollaborativeDocumentReadOnlyEditor } from "@/types";--const CollaborativeDocumentReadOnlyEditor = (props: ICollaborativeDocumentReadOnlyEditor) => {- const {- containerClassName,- disabledExtensions,- displayConfig = DEFAULT_DISPLAY_CONFIG,- editorClassName = "",- embedHandler,- fileHandler,- forwardedRef,- handleEditorReady,- id,- mentionHandler,- realtimeConfig,- serverHandler,- user,- } = props;- const extensions = [];- if (embedHandler?.issue) {- extensions.push(- IssueWidget({- widgetCallback: embedHandler.issue.widgetCallback,- })- );- }-- const { editor, hasServerConnectionFailed, hasServerSynced } = useReadOnlyCollaborativeEditor({- disabledExtensions,- editorClassName,- extensions,- fileHandler,- forwardedRef,- handleEditorReady,- id,- mentionHandler,- realtimeConfig,- serverHandler,- user,- });-- const editorContainerClassName = getEditorClassNames({- containerClassName,- });-- if (!editor) return null;-- if (!hasServerSynced && !hasServerConnectionFailed) return <DocumentContentLoader />;-- return (- <PageRenderer- displayConfig={displayConfig}- id={id}- editor={editor}- editorContainerClassName={editorContainerClassName}- />- );-};--const CollaborativeDocumentReadOnlyEditorWithRef = forwardRef<- EditorReadOnlyRefApi,- ICollaborativeDocumentReadOnlyEditor->((props, ref) => (- <CollaborativeDocumentReadOnlyEditor {...props} forwardedRef={ref as MutableRefObject<EditorReadOnlyRefApi | null>} />-));--CollaborativeDocumentReadOnlyEditorWithRef.displayName = "CollaborativeDocumentReadOnlyEditorWithRef";--export { CollaborativeDocumentReadOnlyEditorWithRef };diff --git a/packages/editor/src/core/components/editors/document/index.ts b/packages/editor/src/core/components/editors/document/index.tsindex 514b620e3a..571cb7e9a1 100644--- a/packages/editor/src/core/components/editors/document/index.ts+++ b/packages/editor/src/core/components/editors/document/index.ts@@ -1,5 +1,4 @@export * from "./collaborative-editor";-export * from "./collaborative-read-only-editor";export * from "./loader";export * from "./page-renderer";export * from "./read-only-editor";diff --git a/packages/editor/src/core/components/editors/document/page-renderer.tsx b/packages/editor/src/core/components/editors/document/page-renderer.tsxindex d1ff3b3d01..f291c8b3a3 100644--- a/packages/editor/src/core/components/editors/document/page-renderer.tsx+++ b/packages/editor/src/core/components/editors/document/page-renderer.tsx@@ -140,10 +140,10 @@ export const PageRenderer = (props: IPageRenderer) => {><EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />{editor.isEditable && (- <>+ <div><BlockMenu editor={editor} /><AIFeaturesMenu menu={aiHandler?.menu} />- </>+ </div>)}</EditorContainer></div>diff --git a/packages/editor/src/core/components/editors/editor-wrapper.tsx b/packages/editor/src/core/components/editors/editor-wrapper.tsxindex 075420ed74..50898b097a 100644--- a/packages/editor/src/core/components/editors/editor-wrapper.tsx+++ b/packages/editor/src/core/components/editors/editor-wrapper.tsx@@ -38,6 +38,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {} = props;const editor = useEditor({+ editable: true,disabledExtensions,editorClassName,enableHistory: true,diff --git a/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx b/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsxindex bcf78fe74b..7d0076fb7c 100644--- a/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx+++ b/packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx@@ -127,7 +127,7 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {return "Uploading...";}- if (draggedInside) {+ if (draggedInside && editor.isEditable) {return "Drop image here";}@@ -137,14 +137,16 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {return (<divclassName={cn(- "image-upload-component flex items-center justify-start gap-2 py-3 px-2 rounded-lg text-custom-text-300 hover:text-custom-text-200 bg-custom-background-90 hover:bg-custom-background-80 border border-dashed border-custom-border-300 transition-all duration-200 ease-in-out cursor-default",+ "image-upload-component flex items-center justify-start gap-2 py-3 px-2 rounded-lg text-custom-text-300 bg-custom-background-90 border border-dashed border-custom-border-300 transition-all duration-200 ease-in-out cursor-default",{- "hover:text-custom-text-200 cursor-pointer": editor.isEditable,- "bg-custom-background-80 text-custom-text-200": draggedInside,- "text-custom-primary-200 bg-custom-primary-100/10 hover:bg-custom-primary-100/10 hover:text-custom-primary-200 border-custom-primary-200/10":- selected,- "text-red-500 cursor-default hover:text-red-500": failedToLoadImage,- "bg-red-500/10 hover:bg-red-500/10": failedToLoadImage && selected,+ "hover:text-custom-text-200 hover:bg-custom-background-80 cursor-pointer": editor.isEditable,+ "bg-custom-background-80 text-custom-text-200": draggedInside && editor.isEditable,+ "text-custom-primary-200 bg-custom-primary-100/10 border-custom-primary-200/10 hover:bg-custom-primary-100/10 hover:text-custom-primary-200":+ selected && editor.isEditable,+ "text-red-500 cursor-default": failedToLoadImage,+ "hover:text-red-500": failedToLoadImage && editor.isEditable,+ "bg-red-500/10": failedToLoadImage && selected,+ "hover:bg-red-500/10": failedToLoadImage && selected && editor.isEditable,})}onDrop={onDrop}diff --git a/packages/editor/src/core/extensions/drop.tsx b/packages/editor/src/core/extensions/drop.tsxindex 2044f03bf5..0d578770ae 100644--- a/packages/editor/src/core/extensions/drop.tsx+++ b/packages/editor/src/core/extensions/drop.tsx@@ -2,58 +2,67 @@ import { Extension, Editor } from "@tiptap/core";import { Plugin, PluginKey } from "@tiptap/pm/state";import { EditorView } from "@tiptap/pm/view";-export const DropHandlerExtension = () =>- Extension.create({- name: "dropHandler",- priority: 1000,+export const DropHandlerExtension = Extension.create({+ name: "dropHandler",+ priority: 1000,- addProseMirrorPlugins() {- const editor = this.editor;- return [- new Plugin({- key: new PluginKey("drop-handler-plugin"),- props: {- handlePaste: (view: EditorView, event: ClipboardEvent) => {- if (event.clipboardData && event.clipboardData.files && event.clipboardData.files.length > 0) {- event.preventDefault();- const files = Array.from(event.clipboardData.files);- const imageFiles = files.filter((file) => file.type.startsWith("image"));+ addProseMirrorPlugins() {+ const editor = this.editor;+ return [+ new Plugin({+ key: new PluginKey("drop-handler-plugin"),+ props: {+ handlePaste: (view: EditorView, event: ClipboardEvent) => {+ if (+ editor.isEditable &&+ event.clipboardData &&+ event.clipboardData.files &&+ event.clipboardData.files.length > 0+ ) {+ event.preventDefault();+ const files = Array.from(event.clipboardData.files);+ const imageFiles = files.filter((file) => file.type.startsWith("image"));- if (imageFiles.length > 0) {- const pos = view.state.selection.from;- insertImagesSafely({ editor, files: imageFiles, initialPos: pos, event: "drop" });- }- return true;+ if (imageFiles.length > 0) {+ const pos = view.state.selection.from;+ insertImagesSafely({ editor, files: imageFiles, initialPos: pos, event: "drop" });}- return false;- },- handleDrop: (view: EditorView, event: DragEvent, _slice: any, moved: boolean) => {- if (!moved && event.dataTransfer && event.dataTransfer.files && event.dataTransfer.files.length > 0) {- event.preventDefault();- const files = Array.from(event.dataTransfer.files);- const imageFiles = files.filter((file) => file.type.startsWith("image"));+ return true;+ }+ return false;+ },+ handleDrop: (view: EditorView, event: DragEvent, _slice: any, moved: boolean) => {+ if (+ editor.isEditable &&+ !moved &&+ event.dataTransfer &&+ event.dataTransfer.files &&+ event.dataTransfer.files.length > 0+ ) {+ event.preventDefault();+ const files = Array.from(event.dataTransfer.files);+ const imageFiles = files.filter((file) => file.type.startsWith("image"));- if (imageFiles.length > 0) {- const coordinates = view.posAtCoords({- left: event.clientX,- top: event.clientY,- });+ if (imageFiles.length > 0) {+ const coordinates = view.posAtCoords({+ left: event.clientX,+ top: event.clientY,+ });- if (coordinates) {- const pos = coordinates.pos;- insertImagesSafely({ editor, files: imageFiles, initialPos: pos, event: "drop" });- }- return true;+ if (coordinates) {+ const pos = coordinates.pos;+ insertImagesSafely({ editor, files: imageFiles, initialPos: pos, event: "drop" });}+ return true;}- return false;- },+ }+ return false;},- }),- ];- },- });-+ },+ }),+ ];+ },+});export const insertImagesSafely = async ({editor,files,diff --git a/packages/editor/src/core/extensions/extensions.tsx b/packages/editor/src/core/extensions/extensions.tsxindex 0e06f774bb..71126c5766 100644--- a/packages/editor/src/core/extensions/extensions.tsx+++ b/packages/editor/src/core/extensions/extensions.tsx@@ -47,10 +47,11 @@ type TArguments = {};placeholder?: string | ((isFocused: boolean, value: string) => string);tabIndex?: number;+ editable: boolean;};export const CoreEditorExtensions = (args: TArguments): Extensions => {- const { disabledExtensions, enableHistory, fileHandler, mentionConfig, placeholder, tabIndex } = args;+ const { disabledExtensions, enableHistory, fileHandler, mentionConfig, placeholder, tabIndex, editable } = args;return [StarterKit.configure({@@ -89,7 +90,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {...(enableHistory ? {} : { history: false }),}),CustomQuoteExtension,- DropHandlerExtension(),+ DropHandlerExtension,CustomHorizontalRule.configure({HTMLAttributes: {class: "py-4 border-custom-border-400",@@ -137,6 +138,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {CustomCodeInlineExtension,Markdown.configure({html: true,+ transformCopiedText: true,transformPastedText: true,breaks: true,}),@@ -145,12 +147,14 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {TableCell,TableRow,CustomMention({- mentionSuggestions: mentionConfig.mentionSuggestions,+ mentionSuggestions: editable ? mentionConfig.mentionSuggestions : undefined,mentionHighlights: mentionConfig.mentionHighlights,- readonly: false,+ readonly: !editable,}),Placeholder.configure({placeholder: ({ editor, node }) => {+ if (!editor.isEditable) return;+if (node.type.name === "heading") return `Heading ${node.attrs.level}`;if (editor.storage.imageComponent.uploadInProgress) return "";diff --git a/packages/editor/src/core/extensions/read-only-extensions.tsx b/packages/editor/src/core/extensions/read-only-extensions.tsxindex 4debda019c..7e9b055210 100644--- a/packages/editor/src/core/extensions/read-only-extensions.tsx+++ b/packages/editor/src/core/extensions/read-only-extensions.tsx@@ -20,7 +20,6 @@ import {TableRow,Table,CustomMention,- HeadingListExtension,CustomReadOnlyImageExtension,CustomTextAlignExtension,CustomCalloutReadOnlyExtension,@@ -139,7 +138,6 @@ export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {}),CharacterCount,CustomColorExtension,- HeadingListExtension,CustomTextAlignExtension,CustomCalloutReadOnlyExtension,...CoreReadOnlyEditorAdditionalExtensions({diff --git a/packages/editor/src/core/hooks/use-collaborative-editor.ts b/packages/editor/src/core/hooks/use-collaborative-editor.tsindex b3c7d6cfc2..4abf7d6d1f 100644--- a/packages/editor/src/core/hooks/use-collaborative-editor.ts+++ b/packages/editor/src/core/hooks/use-collaborative-editor.ts@@ -15,6 +15,7 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {const {onTransaction,disabledExtensions,+ editable,editorClassName,editorProps = {},embedHandler,@@ -75,7 +76,7 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {const editor = useEditor({disabledExtensions,id,- onTransaction,+ editable,editorProps,editorClassName,enableHistory: false,@@ -97,9 +98,10 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {}),],fileHandler,- handleEditorReady,forwardedRef,+ handleEditorReady,mentionHandler,+ onTransaction,placeholder,provider,tabIndex,diff --git a/packages/editor/src/core/hooks/use-editor.ts b/packages/editor/src/core/hooks/use-editor.tsindex 15fbd19d5c..dd17373f76 100644--- a/packages/editor/src/core/hooks/use-editor.ts+++ b/packages/editor/src/core/hooks/use-editor.ts@@ -27,6 +27,7 @@ import type {} from "@/types";export interface CustomEditorProps {+ editable: boolean;editorClassName: string;editorProps?: EditorProps;enableHistory: boolean;@@ -55,6 +56,7 @@ export interface CustomEditorProps {export const useEditor = (props: CustomEditorProps) => {const {disabledExtensions,+ editable = true,editorClassName,editorProps = {},enableHistory,@@ -74,42 +76,46 @@ export const useEditor = (props: CustomEditorProps) => {autofocus = false,} = props;// states-const [savedSelection, setSavedSelection] = useState<Selection | null>(null);// refsconst editorRef: MutableRefObject<Editor | null> = useRef(null);const savedSelectionRef = useRef(savedSelection);- const editor = useTiptapEditor({- autofocus,- editorProps: {- ...CoreEditorProps({- editorClassName,- }),- ...editorProps,- },- extensions: [- ...CoreEditorExtensions({- disabledExtensions,- enableHistory,- fileHandler,- mentionConfig: {- mentionSuggestions: mentionHandler.suggestions ?? (() => Promise.resolve<IMentionSuggestion[]>([])),- mentionHighlights: mentionHandler.highlights,- },- placeholder,- tabIndex,- }),- ...extensions,- ],- content: typeof initialValue === "string" && initialValue.trim() !== "" ? initialValue : "<p></p>",- onCreate: () => handleEditorReady?.(true),- onTransaction: ({ editor }) => {- setSavedSelection(editor.state.selection);- onTransaction?.();+ const editor = useTiptapEditor(+ {+ editable,+ autofocus,+ editorProps: {+ ...CoreEditorProps({+ editorClassName,+ }),+ ...editorProps,+ },+ extensions: [+ ...CoreEditorExtensions({+ editable,+ disabledExtensions,+ enableHistory,+ fileHandler,+ mentionConfig: {+ mentionSuggestions: mentionHandler.suggestions ?? (() => Promise.resolve<IMentionSuggestion[]>([])),+ mentionHighlights: mentionHandler.highlights,+ },+ placeholder,+ tabIndex,+ }),+ ...extensions,+ ],+ content: typeof initialValue === "string" && initialValue.trim() !== "" ? initialValue : "<p></p>",+ onCreate: () => handleEditorReady?.(true),+ onTransaction: ({ editor }) => {+ setSavedSelection(editor.state.selection);+ onTransaction?.();+ },+ onUpdate: ({ editor }) => onChange?.(editor.getJSON(), editor.getHTML()),+ onDestroy: () => handleEditorReady?.(false),},- onUpdate: ({ editor }) => onChange?.(editor.getJSON(), editor.getHTML()),- onDestroy: () => handleEditorReady?.(false),- });+ [editable]+ );// Update the ref whenever savedSelection changesuseEffect(() => {diff --git a/packages/editor/src/core/hooks/use-file-upload.ts b/packages/editor/src/core/hooks/use-file-upload.tsindex f5f930f290..65daa2f8e4 100644--- a/packages/editor/src/core/hooks/use-file-upload.ts+++ b/packages/editor/src/core/hooks/use-file-upload.ts@@ -105,7 +105,7 @@ export const useDropZone = (args: TDropzoneArgs) => {async (e: DragEvent<HTMLDivElement>) => {e.preventDefault();setDraggedInside(false);- if (e.dataTransfer.files.length === 0) {+ if (e.dataTransfer.files.length === 0 || !editor.isEditable) {return;}const filesList = e.dataTransfer.files;diff --git a/packages/editor/src/core/hooks/use-read-only-collaborative-editor.ts b/packages/editor/src/core/hooks/use-read-only-collaborative-editor.tsdeleted file mode 100644index 01ca19b814..0000000000--- a/packages/editor/src/core/hooks/use-read-only-collaborative-editor.ts+++ /dev/null@@ -1,92 +0,0 @@-import { useEffect, useMemo, useState } from "react";-import { HocuspocusProvider } from "@hocuspocus/provider";-import Collaboration from "@tiptap/extension-collaboration";-import { IndexeddbPersistence } from "y-indexeddb";-// extensions-import { HeadingListExtension } from "@/extensions";-// hooks-import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";-// types-import { TReadOnlyCollaborativeEditorProps } from "@/types";--export const useReadOnlyCollaborativeEditor = (props: TReadOnlyCollaborativeEditorProps) => {- const {- disabledExtensions,- editorClassName,- editorProps = {},- extensions,- fileHandler,- forwardedRef,- handleEditorReady,- id,- mentionHandler,- realtimeConfig,- serverHandler,- user,- } = props;- // states- const [hasServerConnectionFailed, setHasServerConnectionFailed] = useState(false);- const [hasServerSynced, setHasServerSynced] = useState(false);- // initialize Hocuspocus provider- const provider = useMemo(- () =>- new HocuspocusProvider({- name: id,- url: realtimeConfig.url,- token: JSON.stringify(user),- parameters: realtimeConfig.queryParams,- onAuthenticationFailed: () => {- serverHandler?.onServerError?.();- setHasServerConnectionFailed(true);- },- onConnect: () => serverHandler?.onConnect?.(),- onClose: (data) => {- if (data.event.code === 1006) {- serverHandler?.onServerError?.();- setHasServerConnectionFailed(true);- }- },- onSynced: () => setHasServerSynced(true),- }),- [id, realtimeConfig, serverHandler, user]- );-- // indexed db integration for offline support- const localProvider = useMemo(- () => (id ? new IndexeddbPersistence(id, provider.document) : undefined),- [id, provider]- );-- // destroy and disconnect connection on unmount- useEffect(- () => () => {- provider.destroy();- localProvider?.destroy();- },- [provider, localProvider]- );-- const editor = useReadOnlyEditor({- disabledExtensions,- editorProps,- editorClassName,- extensions: [- ...(extensions ?? []),- HeadingListExtension,- Collaboration.configure({- document: provider.document,- }),- ],- fileHandler,- forwardedRef,- handleEditorReady,- mentionHandler,- provider,- });-- return {- editor,- hasServerConnectionFailed,- hasServerSynced,- };-};diff --git a/packages/editor/src/core/types/collaboration.ts b/packages/editor/src/core/types/collaboration.tsindex 35fbdb9968..b95f7283eb 100644--- a/packages/editor/src/core/types/collaboration.ts+++ b/packages/editor/src/core/types/collaboration.ts@@ -21,6 +21,7 @@ export type TServerHandler = {type TCollaborativeEditorHookProps = {disabledExtensions: TExtensions[];+ editable?: boolean;editorClassName: string;editorProps?: EditorProps;extensions?: Extensions;diff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.tsindex e91af8e492..404a3021d1 100644--- a/packages/editor/src/core/types/editor.ts+++ b/packages/editor/src/core/types/editor.ts@@ -138,6 +138,7 @@ export interface IRichTextEditor extends IEditorProps {export interface ICollaborativeDocumentEditorextends Omit<IEditorProps, "initialValue" | "onChange" | "onEnterKeyPress" | "value"> {+ editable: boolean;aiHandler?: TAIHandler;embedHandler: TEmbedConfig;handleEditorReady?: (value: boolean) => void;diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.tsindex ed7d913469..9dd0db267f 100644--- a/packages/editor/src/index.ts+++ b/packages/editor/src/index.ts@@ -9,7 +9,6 @@ import "./styles/drag-drop.css";// editorsexport {CollaborativeDocumentEditorWithRef,- CollaborativeDocumentReadOnlyEditorWithRef,DocumentReadOnlyEditorWithRef,LiteTextEditorWithRef,LiteTextReadOnlyEditorWithRef,diff --git a/packages/editor/src/styles/editor.css b/packages/editor/src/styles/editor.cssindex db60c7cf5f..e234f87cf8 100644--- a/packages/editor/src/styles/editor.css+++ b/packages/editor/src/styles/editor.css@@ -111,8 +111,12 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {transform: scale(1.05);}-ul[data-type="taskList"] li > label input[type="checkbox"]:hover {- background-color: rgba(var(--color-background-80)) !important;+.ProseMirror[contenteditable="true"] input[type="checkbox"]:hover {+ background-color: rgba(var(--color-background-80));+}++.ProseMirror[contenteditable="false"] input[type="checkbox"] {+ pointer-events: none;}ul[data-type="taskList"] li > label input[type="checkbox"][checked] {@@ -151,10 +155,6 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {margin-right: 0.2rem;margin-top: 0.15rem;- &:hover {- background-color: rgb(var(--color-background-80));- }-&:active {background-color: rgb(var(--color-background-90));}diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsxindex 6f88445ede..adbfd63680 100644--- a/web/core/components/pages/editor/editor-body.tsx+++ b/web/core/components/pages/editor/editor-body.tsx@@ -1,11 +1,9 @@-import { useCallback, useMemo } from "react";+import { Dispatch, SetStateAction, useCallback, useMemo } from "react";import { observer } from "mobx-react";import { useParams } from "next/navigation";// document-editorimport {CollaborativeDocumentEditorWithRef,- CollaborativeDocumentReadOnlyEditorWithRef,- EditorReadOnlyRefApi,EditorRefApi,TAIMenuProps,TDisplayConfig,@@ -20,7 +18,7 @@ import { Row } from "@plane/ui";import { PageContentBrowser, PageContentLoader, PageEditorTitle } from "@/components/pages";// helpersimport { cn, LIVE_BASE_PATH, LIVE_BASE_URL } from "@/helpers/common.helper";-import { getEditorFileHandlers, getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";+import { getEditorFileHandlers } from "@/helpers/editor.helper";import { generateRandomColor } from "@/helpers/string.helper";// hooksimport { useMember, useMention, useUser, useWorkspace } from "@/hooks/store";@@ -42,24 +40,14 @@ const fileService = new FileService();type Props = {editorRef: React.RefObject<EditorRefApi>;editorReady: boolean;- handleConnectionStatus: (status: boolean) => void;- handleEditorReady: (value: boolean) => void;- handleReadOnlyEditorReady: (value: boolean) => void;+ handleConnectionStatus: Dispatch<SetStateAction<boolean>>;+ handleEditorReady: Dispatch<SetStateAction<boolean>>;page: IPage;- readOnlyEditorRef: React.RefObject<EditorReadOnlyRefApi>;sidePeekVisible: boolean;};export const PageEditorBody: React.FC<Props> = observer((props) => {- const {- editorRef,- handleConnectionStatus,- handleEditorReady,- handleReadOnlyEditorReady,- page,- readOnlyEditorRef,- sidePeekVisible,- } = props;+ const { editorRef, handleConnectionStatus, handleEditorReady, page, sidePeekVisible } = props;// routerconst { workspaceSlug, projectId } = useParams();// store hooks@@ -112,11 +100,11 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {const handleServerConnect = useCallback(() => {handleConnectionStatus(false);- }, []);+ }, [handleConnectionStatus]);const handleServerError = useCallback(() => {handleConnectionStatus(true);- }, []);+ }, [handleConnectionStatus]);const serverHandler: TServerHandler = useMemo(() => ({@@ -169,18 +157,16 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {"w-[5%]": isFullWidth,})}>- {!isFullWidth && (- <PageContentBrowser editorRef={(isContentEditable ? editorRef : readOnlyEditorRef)?.current} />- )}+ {!isFullWidth && <PageContentBrowser editorRef={editorRef.current} />}</Row><div- className={cn("h-full w-full pt-5 duration-200", {+ className={cn("size-full pt-5 duration-200", {"md:w-[calc(100%-10rem)] xl:w-[calc(100%-28rem)]": !isFullWidth,"md:w-[90%]": isFullWidth,})}>- <div className="h-full w-full flex flex-col gap-y-7 overflow-y-auto overflow-x-hidden">- <div className="relative w-full flex-shrink-0 md:pl-5 px-4">+ <div className="size-full flex flex-col gap-y-7 overflow-y-auto overflow-x-hidden">+ <div className="relative w-full flex-shrink-0 md:pl-5 px-4 h-[38px]"><PageEditorTitleeditorRef={editorRef}title={pageTitle}@@ -188,72 +174,47 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {readOnly={!isContentEditable}/></div>- {isContentEditable ? (- <CollaborativeDocumentEditorWithRef- id={pageId}- fileHandler={getEditorFileHandlers({- maxFileSize,- projectId: projectId?.toString() ?? "",- uploadFile: async (file) => {- const { asset_id } = await fileService.uploadProjectAsset(- workspaceSlug?.toString() ?? "",- projectId?.toString() ?? "",- {- entity_identifier: pageId,- entity_type: EFileAssetType.PAGE_DESCRIPTION,- },- file- );- return asset_id;- },- workspaceId,- workspaceSlug: workspaceSlug?.toString() ?? "",- })}- handleEditorReady={handleEditorReady}- ref={editorRef}- containerClassName="h-full p-0 pb-64"- displayConfig={displayConfig}- editorClassName="pl-10"- mentionHandler={{- highlights: mentionHighlights,- suggestions: mentionSuggestions,- }}- embedHandler={{- issue: issueEmbedProps,- }}- realtimeConfig={realtimeConfig}- serverHandler={serverHandler}- user={userConfig}- disabledExtensions={disabledExtensions}- aiHandler={{- menu: getAIMenu,- }}- />- ) : (- <CollaborativeDocumentReadOnlyEditorWithRef- id={pageId}- ref={readOnlyEditorRef}- disabledExtensions={disabledExtensions}- fileHandler={getReadOnlyEditorFileHandlers({- projectId: projectId?.toString() ?? "",- workspaceSlug: workspaceSlug?.toString() ?? "",- })}- handleEditorReady={handleReadOnlyEditorReady}- containerClassName="p-0 pb-64 border-none"- displayConfig={displayConfig}- editorClassName="pl-10"- mentionHandler={{- highlights: mentionHighlights,- }}- embedHandler={{- issue: {- widgetCallback: issueEmbedProps.widgetCallback,- },- }}- realtimeConfig={realtimeConfig}- user={userConfig}- />- )}+ <CollaborativeDocumentEditorWithRef+ editable={isContentEditable}+ id={pageId}+ fileHandler={getEditorFileHandlers({+ maxFileSize,+ projectId: projectId?.toString() ?? "",+ uploadFile: async (file) => {+ const { asset_id } = await fileService.uploadProjectAsset(+ workspaceSlug?.toString() ?? "",+ projectId?.toString() ?? "",+ {+ entity_identifier: pageId,+ entity_type: EFileAssetType.PAGE_DESCRIPTION,+ },+ file+ );+ return asset_id;+ },+ workspaceId,+ workspaceSlug: workspaceSlug?.toString() ?? "",+ })}+ handleEditorReady={handleEditorReady}+ ref={editorRef}+ containerClassName="h-full p-0 pb-64"+ displayConfig={displayConfig}+ editorClassName="pl-10"+ mentionHandler={{+ highlights: mentionHighlights,+ suggestions: mentionSuggestions,+ }}+ embedHandler={{+ issue: issueEmbedProps,+ }}+ realtimeConfig={realtimeConfig}+ serverHandler={serverHandler}+ user={userConfig}+ disabledExtensions={disabledExtensions}+ aiHandler={{+ menu: getAIMenu,+ }}+ /></div></div><divdiff --git a/web/core/components/pages/editor/header/extra-options.tsx b/web/core/components/pages/editor/header/extra-options.tsxindex f21959cd93..924e28d05e 100644--- a/web/core/components/pages/editor/header/extra-options.tsx+++ b/web/core/components/pages/editor/header/extra-options.tsx@@ -2,7 +2,7 @@import { observer } from "mobx-react";// editor-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// uiimport { ArchiveIcon, FavoriteStar, setToast, TOAST_TYPE, Tooltip } from "@plane/ui";// components@@ -19,11 +19,10 @@ type Props = {editorRef: React.RefObject<EditorRefApi>;handleDuplicatePage: () => void;page: IPage;- readOnlyEditorRef: React.RefObject<EditorReadOnlyRefApi>;};export const PageExtraOptions: React.FC<Props> = observer((props) => {- const { editorRef, handleDuplicatePage, page, readOnlyEditorRef } = props;+ const { editorRef, handleDuplicatePage, page } = props;// derived valuesconst {archived_at,@@ -85,12 +84,8 @@ export const PageExtraOptions: React.FC<Props> = observer((props) => {iconClassName="text-custom-text-100"/>)}- <PageInfoPopover editorRef={isContentEditable ? editorRef.current : readOnlyEditorRef.current} />- <PageOptionsDropdown- editorRef={isContentEditable ? editorRef.current : readOnlyEditorRef.current}- handleDuplicatePage={handleDuplicatePage}- page={page}- />+ <PageInfoPopover editorRef={editorRef?.current} />+ <PageOptionsDropdown editorRef={editorRef?.current} handleDuplicatePage={handleDuplicatePage} page={page} /></div>);});diff --git a/web/core/components/pages/editor/header/info-popover.tsx b/web/core/components/pages/editor/header/info-popover.tsxindex e295d8ea27..13a1b17666 100644--- a/web/core/components/pages/editor/header/info-popover.tsx+++ b/web/core/components/pages/editor/header/info-popover.tsx@@ -2,12 +2,12 @@ import { useState } from "react";import { usePopper } from "react-popper";import { Info } from "lucide-react";// plane editor-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// helpersimport { getReadTimeFromWordsCount } from "@/helpers/date-time.helper";type Props = {- editorRef: EditorRefApi | EditorReadOnlyRefApi | null;+ editorRef: EditorRefApi | null;};export const PageInfoPopover: React.FC<Props> = (props) => {diff --git a/web/core/components/pages/editor/header/mobile-root.tsx b/web/core/components/pages/editor/header/mobile-root.tsxindex ac831796cb..df93a70e92 100644--- a/web/core/components/pages/editor/header/mobile-root.tsx+++ b/web/core/components/pages/editor/header/mobile-root.tsx@@ -13,52 +13,34 @@ type Props = {editorRef: React.RefObject<EditorRefApi>;handleDuplicatePage: () => void;page: IPage;- readOnlyEditorReady: boolean;- readOnlyEditorRef: React.RefObject<EditorReadOnlyRefApi>;setSidePeekVisible: (sidePeekState: boolean) => void;sidePeekVisible: boolean;};export const PageEditorMobileHeaderRoot: React.FC<Props> = observer((props) => {- const {- editorReady,- editorRef,- handleDuplicatePage,- page,- readOnlyEditorReady,- readOnlyEditorRef,- setSidePeekVisible,- sidePeekVisible,- } = props;+ const { editorReady, editorRef, handleDuplicatePage, page, setSidePeekVisible, sidePeekVisible } = props;// derived valuesconst { isContentEditable } = page;// page filtersconst { isFullWidth } = usePageFilters();- if (!editorRef.current && !readOnlyEditorRef.current) return null;+ if (!editorRef.current) return null;return (<><Header variant={EHeaderVariant.SECONDARY}><div className="flex-shrink-0 my-auto"><PageSummaryPopover- editorRef={isContentEditable ? editorRef.current : readOnlyEditorRef.current}+ editorRef={editorRef.current}isFullWidth={isFullWidth}sidePeekVisible={sidePeekVisible}setSidePeekVisible={setSidePeekVisible}/></div>- <PageExtraOptions- editorRef={editorRef}- handleDuplicatePage={handleDuplicatePage}- page={page}- readOnlyEditorRef={readOnlyEditorRef}- />+ <PageExtraOptions editorRef={editorRef} handleDuplicatePage={handleDuplicatePage} page={page} /></Header><Header variant={EHeaderVariant.TERNARY}>- {(editorReady || readOnlyEditorReady) && isContentEditable && editorRef.current && (- <PageToolbar editorRef={editorRef?.current} />- )}+ {editorReady && isContentEditable && editorRef.current && <PageToolbar editorRef={editorRef?.current} />}</Header></>);diff --git a/web/core/components/pages/editor/header/options-dropdown.tsx b/web/core/components/pages/editor/header/options-dropdown.tsxindex ff0987a9dc..a1db6f9724 100644--- a/web/core/components/pages/editor/header/options-dropdown.tsx+++ b/web/core/components/pages/editor/header/options-dropdown.tsx@@ -15,7 +15,7 @@ import {LucideIcon,} from "lucide-react";// document editor-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// uiimport { ArchiveIcon, CustomMenu, type ISvgIcons, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";// components@@ -30,7 +30,7 @@ import { useQueryParams } from "@/hooks/use-query-params";import { IPage } from "@/store/pages/page";type Props = {- editorRef: EditorRefApi | EditorReadOnlyRefApi | null;+ editorRef: EditorRefApi | null;handleDuplicatePage: () => void;page: IPage;};diff --git a/web/core/components/pages/editor/header/root.tsx b/web/core/components/pages/editor/header/root.tsxindex 9640f4e43b..41933feb72 100644--- a/web/core/components/pages/editor/header/root.tsx+++ b/web/core/components/pages/editor/header/root.tsx@@ -1,5 +1,5 @@import { observer } from "mobx-react";-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// componentsimport { Header, EHeaderVariant } from "@plane/ui";import { PageEditorMobileHeaderRoot, PageExtraOptions, PageSummaryPopover, PageToolbar } from "@/components/pages";@@ -15,35 +15,24 @@ type Props = {editorRef: React.RefObject<EditorRefApi>;handleDuplicatePage: () => void;page: IPage;- readOnlyEditorReady: boolean;- readOnlyEditorRef: React.RefObject<EditorReadOnlyRefApi>;setSidePeekVisible: (sidePeekState: boolean) => void;sidePeekVisible: boolean;};export const PageEditorHeaderRoot: React.FC<Props> = observer((props) => {- const {- editorReady,- editorRef,- handleDuplicatePage,- page,- readOnlyEditorReady,- readOnlyEditorRef,- setSidePeekVisible,- sidePeekVisible,- } = props;+ const { editorReady, editorRef, setSidePeekVisible, sidePeekVisible, handleDuplicatePage, page } = props;// derived valuesconst { isContentEditable } = page;// page filtersconst { isFullWidth } = usePageFilters();- if (!editorRef.current && !readOnlyEditorRef.current) return null;+ if (!editorRef.current) return null;return (<><Header variant={EHeaderVariant.SECONDARY} showOnMobile={false}><Header.LeftItem className="gap-0 w-full">- {(editorReady || readOnlyEditorReady) && (+ {editorReady && (<divclassName={cn("flex-shrink-0 my-auto", {"w-40 lg:w-56": !isFullWidth,@@ -51,30 +40,21 @@ export const PageEditorHeaderRoot: React.FC<Props> = observer((props) => {})}><PageSummaryPopover- editorRef={isContentEditable ? editorRef.current : readOnlyEditorRef.current}+ editorRef={editorRef.current}isFullWidth={isFullWidth}sidePeekVisible={sidePeekVisible}setSidePeekVisible={setSidePeekVisible}/></div>)}- {(editorReady || readOnlyEditorReady) && isContentEditable && editorRef.current && (- <PageToolbar editorRef={editorRef?.current} />- )}+ {editorReady && isContentEditable && editorRef.current && <PageToolbar editorRef={editorRef?.current} />}</Header.LeftItem>- <PageExtraOptions- editorRef={editorRef}- handleDuplicatePage={handleDuplicatePage}- page={page}- readOnlyEditorRef={readOnlyEditorRef}- />+ <PageExtraOptions editorRef={editorRef} handleDuplicatePage={handleDuplicatePage} page={page} /></Header><div className="md:hidden"><PageEditorMobileHeaderRooteditorRef={editorRef}- readOnlyEditorRef={readOnlyEditorRef}editorReady={editorReady}- readOnlyEditorReady={readOnlyEditorReady}handleDuplicatePage={handleDuplicatePage}page={page}sidePeekVisible={sidePeekVisible}diff --git a/web/core/components/pages/editor/page-root.tsx b/web/core/components/pages/editor/page-root.tsxindex ff1f3519e9..6f4418fe4d 100644--- a/web/core/components/pages/editor/page-root.tsx+++ b/web/core/components/pages/editor/page-root.tsx@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react";import { observer } from "mobx-react";import { useSearchParams } from "next/navigation";// editor-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// typesimport { TPage } from "@plane/types";// ui@@ -32,12 +32,10 @@ export const PageRoot = observer((props: TPageRootProps) => {// statesconst [editorReady, setEditorReady] = useState(false);const [hasConnectionFailed, setHasConnectionFailed] = useState(false);- const [readOnlyEditorReady, setReadOnlyEditorReady] = useState(false);const [sidePeekVisible, setSidePeekVisible] = useState(window.innerWidth >= 768);const [isVersionsOverlayOpen, setIsVersionsOverlayOpen] = useState(false);// refsconst editorRef = useRef<EditorRefApi>(null);- const readOnlyEditorRef = useRef<EditorReadOnlyRefApi>(null);// routerconst router = useAppRouter();// search params@@ -99,9 +97,7 @@ export const PageRoot = observer((props: TPageRootProps) => {editorRef.current?.clearEditor();editorRef.current?.setEditorValue(descriptionHTML);};- const currentVersionDescription = isContentEditable- ? editorRef.current?.getDocument().html- : readOnlyEditorRef.current?.getDocument().html;+ const currentVersionDescription = editorRef.current?.getDocument().html;return (<>@@ -137,19 +133,15 @@ export const PageRoot = observer((props: TPageRootProps) => {editorRef={editorRef}handleDuplicatePage={handleDuplicatePage}page={page}- readOnlyEditorReady={readOnlyEditorReady}- readOnlyEditorRef={readOnlyEditorRef}setSidePeekVisible={(state) => setSidePeekVisible(state)}sidePeekVisible={sidePeekVisible}/><PageEditorBodyeditorReady={editorReady}editorRef={editorRef}- handleConnectionStatus={(status) => setHasConnectionFailed(status)}- handleEditorReady={(val) => setEditorReady(val)}- handleReadOnlyEditorReady={() => setReadOnlyEditorReady(true)}+ handleConnectionStatus={setHasConnectionFailed}+ handleEditorReady={setEditorReady}page={page}- readOnlyEditorRef={readOnlyEditorRef}sidePeekVisible={sidePeekVisible}/></>diff --git a/web/core/components/pages/editor/summary/content-browser.tsx b/web/core/components/pages/editor/summary/content-browser.tsxindex 669d2e978c..16d818aaeb 100644--- a/web/core/components/pages/editor/summary/content-browser.tsx+++ b/web/core/components/pages/editor/summary/content-browser.tsx@@ -1,11 +1,11 @@import { useState, useEffect } from "react";// plane editor-import { EditorReadOnlyRefApi, EditorRefApi, IMarking } from "@plane/editor";+import { EditorRefApi, IMarking } from "@plane/editor";// componentsimport { OutlineHeading1, OutlineHeading2, OutlineHeading3 } from "./heading-components";type Props = {- editorRef: EditorRefApi | EditorReadOnlyRefApi | null;+ editorRef: EditorRefApi | null;setSidePeekVisible?: (sidePeekState: boolean) => void;};diff --git a/web/core/components/pages/editor/summary/popover.tsx b/web/core/components/pages/editor/summary/popover.tsxindex 5d14234f03..9acc4a7cc0 100644--- a/web/core/components/pages/editor/summary/popover.tsx+++ b/web/core/components/pages/editor/summary/popover.tsx@@ -2,14 +2,14 @@ import { useState } from "react";import { usePopper } from "react-popper";import { List } from "lucide-react";// document editor-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// helpersimport { cn } from "@/helpers/common.helper";// componentsimport { PageContentBrowser } from "./content-browser";type Props = {- editorRef: EditorRefApi | EditorReadOnlyRefApi | null;+ editorRef: EditorRefApi | null;isFullWidth: boolean;sidePeekVisible: boolean;setSidePeekVisible: (sidePeekState: boolean) => void;diff --git a/web/core/components/pages/modals/export-page-modal.tsx b/web/core/components/pages/modals/export-page-modal.tsxindex cf4f0a0f4b..acf4ff0831 100644--- a/web/core/components/pages/modals/export-page-modal.tsx+++ b/web/core/components/pages/modals/export-page-modal.tsx@@ -4,7 +4,7 @@ import { useState } from "react";import { PageProps, pdf } from "@react-pdf/renderer";import { Controller, useForm } from "react-hook-form";// plane editor-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// plane uiimport { Button, CustomSelect, EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";// components@@ -16,7 +16,7 @@ import {} from "@/helpers/editor.helper";type Props = {- editorRef: EditorRefApi | EditorReadOnlyRefApi | null;+ editorRef: EditorRefApi | null;isOpen: boolean;onClose: () => void;pageTitle: string;diff --git a/web/core/hooks/use-collaborative-page-actions.tsx b/web/core/hooks/use-collaborative-page-actions.tsxindex 6ec9f79905..6196929b6a 100644--- a/web/core/hooks/use-collaborative-page-actions.tsx+++ b/web/core/hooks/use-collaborative-page-actions.tsx@@ -50,6 +50,10 @@ export const useCollaborativePageActions = (editorRef: EditorRefApi | EditorReadtry {await actionDetails.execute(isPerformedByCurrentUser);if (isPerformedByCurrentUser) {+ const serverEventName = getServerEventName(clientAction);+ if (serverEventName) {+ editorRef?.emitRealTimeUpdate(serverEventName);+ }setCurrentActionBeingProcessed(clientAction);}} catch {@@ -60,18 +64,9 @@ export const useCollaborativePageActions = (editorRef: EditorRefApi | EditorRead});}},- [actionHandlerMap]+ [actionHandlerMap, editorRef]);- useEffect(() => {- if (currentActionBeingProcessed) {- const serverEventName = getServerEventName(currentActionBeingProcessed);- if (serverEventName) {- editorRef?.emitRealTimeUpdate(serverEventName);- }- }- }, [currentActionBeingProcessed, editorRef]);-useEffect(() => {const realTimeStatelessMessageListener = editorRef?.listenToRealTimeUpdate();@@ -95,6 +90,5 @@ export const useCollaborativePageActions = (editorRef: EditorRefApi | EditorReadreturn {executeCollaborativeAction,- EVENT_ACTION_DETAILS_MAP: actionHandlerMap,};};