π₯π₯π₯ 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
[WEB-1974] fix: images getting replaced on resize (#5233)
Aaryan Khandelwal518327e3803f
diff --git a/packages/editor/src/core/components/editors/document/editor.tsx b/packages/editor/src/core/components/editors/document/editor.tsxindex d39f1b99fc..6576dacba7 100644--- a/packages/editor/src/core/components/editors/document/editor.tsx+++ b/packages/editor/src/core/components/editors/document/editor.tsx@@ -78,10 +78,11 @@ const DocumentEditor = (props: IDocumentEditor) => {return (<PageRenderer- tabIndex={tabIndex}editor={editor}editorContainerClassName={editorContainerClassNames}hideDragHandle={hideDragHandleOnMouseLeave}+ id={id}+ tabIndex={tabIndex}/>);};diff --git a/packages/editor/src/core/components/editors/document/page-renderer.tsx b/packages/editor/src/core/components/editors/document/page-renderer.tsxindex 5e1d1ef8a2..9254d52c65 100644--- a/packages/editor/src/core/components/editors/document/page-renderer.tsx+++ b/packages/editor/src/core/components/editors/document/page-renderer.tsx@@ -21,11 +21,12 @@ type IPageRenderer = {editor: Editor;editorContainerClassName: string;hideDragHandle?: () => void;+ id: string;tabIndex?: number;};export const PageRenderer = (props: IPageRenderer) => {- const { tabIndex, editor, hideDragHandle, editorContainerClassName } = props;+ const { editor, editorContainerClassName, hideDragHandle, id, tabIndex } = props;// statesconst [linkViewProps, setLinkViewProps] = useState<LinkViewProps>();const [isOpen, setIsOpen] = useState(false);@@ -130,10 +131,11 @@ export const PageRenderer = (props: IPageRenderer) => {<div className="frame-renderer flex-grow w-full -mx-5" onMouseOver={handleLinkHover}><EditorContainereditor={editor}- hideDragHandle={hideDragHandle}editorContainerClassName={editorContainerClassName}+ hideDragHandle={hideDragHandle}+ id={id}>- <EditorContentWrapper tabIndex={tabIndex} editor={editor} />+ <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />{editor && editor.isEditable && <BlockMenu editor={editor} />}</EditorContainer></div>diff --git a/packages/editor/src/core/components/editors/document/read-only-editor.tsx b/packages/editor/src/core/components/editors/document/read-only-editor.tsxindex 9b91d9782e..b259574e43 100644--- a/packages/editor/src/core/components/editors/document/read-only-editor.tsx+++ b/packages/editor/src/core/components/editors/document/read-only-editor.tsx@@ -13,6 +13,7 @@ import { TEmbedConfig } from "@/plane-editor/types";import { EditorReadOnlyRefApi, IMentionHighlight } from "@/types";interface IDocumentReadOnlyEditor {+ id: string;initialValue: string;containerClassName: string;editorClassName?: string;@@ -30,6 +31,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {containerClassName,editorClassName = "",embedHandler,+ id,initialValue,forwardedRef,tabIndex,@@ -58,7 +60,9 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {containerClassName,});- return <PageRenderer tabIndex={tabIndex} editor={editor} editorContainerClassName={editorContainerClassName} />;+ return (+ <PageRenderer editor={editor} editorContainerClassName={editorContainerClassName} id={id} tabIndex={tabIndex} />+ );};const DocumentReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, IDocumentReadOnlyEditor>((props, ref) => (diff --git a/packages/editor/src/core/components/editors/editor-container.tsx b/packages/editor/src/core/components/editors/editor-container.tsxindex 7e515766b9..5c09f42e56 100644--- a/packages/editor/src/core/components/editors/editor-container.tsx+++ b/packages/editor/src/core/components/editors/editor-container.tsx@@ -4,14 +4,15 @@ import { Editor } from "@tiptap/react";import { cn } from "@/helpers/common";interface EditorContainerProps {+ children: ReactNode;editor: Editor | null;editorContainerClassName: string;- children: ReactNode;hideDragHandle?: () => void;+ id: string;}export const EditorContainer: FC<EditorContainerProps> = (props) => {- const { editor, editorContainerClassName, hideDragHandle, children } = props;+ const { children, editor, editorContainerClassName, hideDragHandle, id } = props;const handleContainerClick = () => {if (!editor) return;@@ -54,7 +55,7 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {return (<div- id="editor-container"+ id={`editor-container-${id}`}onClick={handleContainerClick}onMouseLeave={hideDragHandle}className={cn(diff --git a/packages/editor/src/core/components/editors/editor-content.tsx b/packages/editor/src/core/components/editors/editor-content.tsxindex 7eeebc5c01..691bc1002b 100644--- a/packages/editor/src/core/components/editors/editor-content.tsx+++ b/packages/editor/src/core/components/editors/editor-content.tsx@@ -4,18 +4,19 @@ import { Editor, EditorContent } from "@tiptap/react";import { ImageResizer } from "@/extensions/image";interface EditorContentProps {- editor: Editor | null;children?: ReactNode;+ editor: Editor | null;+ id: string;tabIndex?: number;}export const EditorContentWrapper: FC<EditorContentProps> = (props) => {- const { editor, tabIndex, children } = props;+ const { editor, children, id, tabIndex } = props;return (<div tabIndex={tabIndex} onFocus={() => editor?.chain().focus(undefined, { scrollIntoView: false }).run()}><EditorContent editor={editor} />- {editor?.isActive("image") && editor?.isEditable && <ImageResizer editor={editor} />}+ {editor?.isActive("image") && editor?.isEditable && <ImageResizer editor={editor} id={id} />}{children}</div>);diff --git a/packages/editor/src/core/components/editors/editor-wrapper.tsx b/packages/editor/src/core/components/editors/editor-wrapper.tsxindex e5142eeba4..e9d38432cc 100644--- a/packages/editor/src/core/components/editors/editor-wrapper.tsx+++ b/packages/editor/src/core/components/editors/editor-wrapper.tsx@@ -21,7 +21,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {editorClassName = "",extensions,hideDragHandleOnMouseLeave,- id = "",+ id,initialValue,fileHandler,forwardedRef,@@ -57,13 +57,14 @@ export const EditorWrapper: React.FC<Props> = (props) => {return (<EditorContainer- hideDragHandle={hideDragHandleOnMouseLeave}editor={editor}editorContainerClassName={editorContainerClassName}+ id={id}+ hideDragHandle={hideDragHandleOnMouseLeave}>{children?.(editor)}<div className="flex flex-col">- <EditorContentWrapper tabIndex={tabIndex} editor={editor} />+ <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} /></div></EditorContainer>);diff --git a/packages/editor/src/core/components/editors/read-only-editor-wrapper.tsx b/packages/editor/src/core/components/editors/read-only-editor-wrapper.tsxindex 25da4d9afb..d75a5d5304 100644--- a/packages/editor/src/core/components/editors/read-only-editor-wrapper.tsx+++ b/packages/editor/src/core/components/editors/read-only-editor-wrapper.tsx@@ -8,7 +8,7 @@ import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";import { IReadOnlyEditorProps } from "@/types";export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {- const { containerClassName, editorClassName = "", initialValue, forwardedRef, mentionHandler } = props;+ const { containerClassName, editorClassName = "", id, initialValue, forwardedRef, mentionHandler } = props;const editor = useReadOnlyEditor({initialValue,@@ -24,9 +24,9 @@ export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {if (!editor) return null;return (- <EditorContainer editor={editor} editorContainerClassName={editorContainerClassName}>+ <EditorContainer editor={editor} editorContainerClassName={editorContainerClassName} id={id}><div className="flex flex-col">- <EditorContentWrapper editor={editor} />+ <EditorContentWrapper editor={editor} id={id} /></div></EditorContainer>);diff --git a/packages/editor/src/core/extensions/image/image-resize.tsx b/packages/editor/src/core/extensions/image/image-resize.tsxindex d711374040..c50e318966 100644--- a/packages/editor/src/core/extensions/image/image-resize.tsx+++ b/packages/editor/src/core/extensions/image/image-resize.tsx@@ -2,75 +2,84 @@ import { useState } from "react";import { Editor } from "@tiptap/react";import Moveable from "react-moveable";-export const ImageResizer = ({ editor }: { editor: Editor }) => {+type Props = {+ editor: Editor;+ id: string;+};++const getImageElement = (editorId: string): HTMLImageElement | null =>+ document.querySelector(`#editor-container-${editorId}.active-editor .ProseMirror-selectednode`);++export const ImageResizer = (props: Props) => {+ const { editor, id } = props;+ // states+ const [aspectRatio, setAspectRatio] = useState(1);+const updateMediaSize = () => {- const imageInfo = document.querySelector(".ProseMirror-selectednode") as HTMLImageElement;- if (imageInfo) {- const selection = editor.state.selection;+ const imageElement = getImageElement(id);- // Use the style width/height if available, otherwise fall back to the element's natural width/height- const width = imageInfo.style.width- ? Number(imageInfo.style.width.replace("px", ""))- : imageInfo.getAttribute("width");- const height = imageInfo.style.height- ? Number(imageInfo.style.height.replace("px", ""))- : imageInfo.getAttribute("height");+ if (!imageElement) return;- editor.commands.setImage({- src: imageInfo.src,- width: width,- height: height,- } as any);- editor.commands.setNodeSelection(selection.from);- }- };+ const selection = editor.state.selection;- const [aspectRatio, setAspectRatio] = useState(1);+ // Use the style width/height if available, otherwise fall back to the element's natural width/height+ const width = imageElement.style.width+ ? Number(imageElement.style.width.replace("px", ""))+ : imageElement.getAttribute("width");+ const height = imageElement.style.height+ ? Number(imageElement.style.height.replace("px", ""))+ : imageElement.getAttribute("height");++ editor.commands.setImage({+ src: imageElement.src,+ width: width,+ height: height,+ } as any);+ editor.commands.setNodeSelection(selection.from);+ };return (- <>- <Moveable- target={document.querySelector(".active-editor .ProseMirror-selectednode") as HTMLElement}- container={null}- origin={false}- edge={false}- throttleDrag={0}- keepRatio- resizable- throttleResize={0}- onResizeStart={() => {- const imageInfo = document.querySelector(".active-editor .ProseMirror-selectednode") as HTMLImageElement;- if (imageInfo) {- const originalWidth = Number(imageInfo.width);- const originalHeight = Number(imageInfo.height);- setAspectRatio(originalWidth / originalHeight);- }- }}- onResize={({ target, width, height, delta }) => {- if (delta[0] || delta[1]) {- let newWidth, newHeight;- if (delta[0]) {- // Width change detected- newWidth = Math.max(width, 100);- newHeight = newWidth / aspectRatio;- } else if (delta[1]) {- // Height change detected- newHeight = Math.max(height, 100);- newWidth = newHeight * aspectRatio;- }- target.style.width = `${newWidth}px`;- target.style.height = `${newHeight}px`;+ <Moveable+ target={getImageElement(id)}+ container={null}+ origin={false}+ edge={false}+ throttleDrag={0}+ keepRatio+ resizable+ throttleResize={0}+ onResizeStart={() => {+ const imageElement = getImageElement(id);+ if (imageElement) {+ const originalWidth = Number(imageElement.width);+ const originalHeight = Number(imageElement.height);+ setAspectRatio(originalWidth / originalHeight);+ }+ }}+ onResize={({ target, width, height, delta }) => {+ if (delta[0] || delta[1]) {+ let newWidth, newHeight;+ if (delta[0]) {+ // Width change detected+ newWidth = Math.max(width, 100);+ newHeight = newWidth / aspectRatio;+ } else if (delta[1]) {+ // Height change detected+ newHeight = Math.max(height, 100);+ newWidth = newHeight * aspectRatio;}- }}- onResizeEnd={() => {- updateMediaSize();- }}- scalable- renderDirections={["se"]}- onScale={({ target, transform }) => {- target.style.transform = transform;- }}- />- </>+ target.style.width = `${newWidth}px`;+ target.style.height = `${newHeight}px`;+ }+ }}+ onResizeEnd={() => {+ updateMediaSize();+ }}+ scalable+ renderDirections={["se"]}+ onScale={({ target, transform }) => {+ target.style.transform = transform;+ }}+ />);};diff --git a/packages/editor/src/core/extensions/mentions/extension.tsx b/packages/editor/src/core/extensions/mentions/extension.tsxindex e5a447c7fe..93453f625e 100644--- a/packages/editor/src/core/extensions/mentions/extension.tsx+++ b/packages/editor/src/core/extensions/mentions/extension.tsx@@ -91,7 +91,8 @@ export const CustomMention = ({// @ts-expect-error - Tippy types are incorrectpopup = tippy("body", {getReferenceClientRect: props.clientRect,- appendTo: () => document.querySelector(".active-editor") ?? document.querySelector("#editor-container"),+ appendTo: () =>+ document.querySelector(".active-editor") ?? document.querySelector('[id^="editor-container"]'),content: component.element,showOnCreate: true,interactive: true,diff --git a/packages/editor/src/core/extensions/slash-commands.tsx b/packages/editor/src/core/extensions/slash-commands.tsxindex a84ff5d162..a61198db2b 100644--- a/packages/editor/src/core/extensions/slash-commands.tsx+++ b/packages/editor/src/core/extensions/slash-commands.tsx@@ -374,7 +374,8 @@ const renderItems = () => {editor: props.editor,});- const tippyContainer = document.querySelector(".active-editor") ?? document.querySelector("#editor-container");+ const tippyContainer =+ document.querySelector(".active-editor") ?? document.querySelector('[id^="editor-container"]');// @ts-expect-error Tippy overloads are messed uppopup = tippy("body", {diff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.tsindex 6fa243f8ab..695082c11f 100644--- a/packages/editor/src/core/types/editor.ts+++ b/packages/editor/src/core/types/editor.ts@@ -29,7 +29,7 @@ export interface IEditorProps {editorClassName?: string;fileHandler: TFileHandler;forwardedRef?: React.MutableRefObject<EditorRefApi | null>;- id?: string;+ id: string;initialValue: string;mentionHandler: {highlights: () => Promise<IMentionHighlight[]>;@@ -52,6 +52,7 @@ export interface IReadOnlyEditorProps {containerClassName?: string;editorClassName?: string;forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;+ id: string;initialValue: string;mentionHandler: {highlights: () => Promise<IMentionHighlight[]>;diff --git a/space/core/components/issues/peek-overview/comment/add-comment.tsx b/space/core/components/issues/peek-overview/comment/add-comment.tsxindex 60db563148..a602538e00 100644--- a/space/core/components/issues/peek-overview/comment/add-comment.tsx+++ b/space/core/components/issues/peek-overview/comment/add-comment.tsx@@ -72,6 +72,7 @@ export const AddComment: React.FC<Props> = observer((props) => {workspaceId={workspaceID?.toString() ?? ""}workspaceSlug={workspaceSlug?.toString() ?? ""}ref={editorRef}+ id="peek-overview-add-comment"initialValue={!value || value === "" || (typeof value === "object" && Object.keys(value).length === 0)? watch("comment_html")diff --git a/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx b/space/core/components/issues/peek-overview/comment/comment-detail-card.tsxindex 4f36cb55fb..67738b524d 100644--- a/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx+++ b/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx@@ -105,6 +105,7 @@ export const CommentCard: React.FC<Props> = observer((props) => {workspaceSlug={workspaceSlug?.toString() ?? ""}onEnterKeyPress={() => handleSubmit(handleCommentUpdate)()}ref={editorRef}+ id={comment.id}initialValue={value}value={null}onChange={(comment_json, comment_html) => onChange(comment_html)}@@ -132,7 +133,7 @@ export const CommentCard: React.FC<Props> = observer((props) => {</div></form><div className={`${isEditing ? "hidden" : ""}`}>- <LiteTextReadOnlyEditor ref={showEditorRef} initialValue={comment.comment_html} />+ <LiteTextReadOnlyEditor ref={showEditorRef} id={comment.id} initialValue={comment.comment_html} /><CommentReactions anchor={anchor} commentId={comment.id} /></div></div>diff --git a/space/core/components/issues/peek-overview/issue-details.tsx b/space/core/components/issues/peek-overview/issue-details.tsxindex 8c24ad6441..b47bfad68c 100644--- a/space/core/components/issues/peek-overview/issue-details.tsx+++ b/space/core/components/issues/peek-overview/issue-details.tsx@@ -26,6 +26,7 @@ export const PeekOverviewIssueDetails: React.FC<Props> = observer((props) => {<h4 className="break-words text-2xl font-medium">{issueDetails.name}</h4>{description !== "" && description !== "<p></p>" && (<RichTextReadOnlyEditor+ id={issueDetails.id}initialValue={!description ||description === "" ||diff --git a/web/core/components/core/modals/gpt-assistant-popover.tsx b/web/core/components/core/modals/gpt-assistant-popover.tsxindex dcb4645507..d093e0a1b0 100644--- a/web/core/components/core/modals/gpt-assistant-popover.tsx+++ b/web/core/components/core/modals/gpt-assistant-popover.tsx@@ -203,13 +203,22 @@ export const GptAssistantPopover: React.FC<Props> = (props) => {{prompt && (<div className="text-sm">Content:- <RichTextReadOnlyEditor initialValue={prompt} containerClassName="-m-3" ref={editorRef} />+ <RichTextReadOnlyEditor+ id="ai-assistant-content"+ initialValue={prompt}+ containerClassName="-m-3"+ ref={editorRef}+ /></div>)}{response !== "" && (<div className="page-block-section max-h-[8rem] text-sm">Response:- <RichTextReadOnlyEditor initialValue={`<p>${response}</p>`} ref={responseRef} />+ <RichTextReadOnlyEditor+ id="ai-assistant-response"+ initialValue={`<p>${response}</p>`}+ ref={responseRef}+ /></div>)}{invalidResponse && (diff --git a/web/core/components/inbox/modals/create-edit-modal/issue-description.tsx b/web/core/components/inbox/modals/create-edit-modal/issue-description.tsxindex 7b9ef67497..18cd40944b 100644--- a/web/core/components/inbox/modals/create-edit-modal/issue-description.tsx+++ b/web/core/components/inbox/modals/create-edit-modal/issue-description.tsx@@ -42,6 +42,7 @@ export const InboxIssueDescription: FC<TInboxIssueDescription> = observer((propsreturn (<RichTextEditor+ id="inbox-modal-editor"initialValue={!data?.description_html || data?.description_html === "" ? "<p></p>" : data?.description_html}ref={editorRef}workspaceSlug={workspaceSlug}diff --git a/web/core/components/issues/description-input.tsx b/web/core/components/issues/description-input.tsxindex f78bce8536..b78f0b91f6 100644--- a/web/core/components/issues/description-input.tsx+++ b/web/core/components/issues/description-input.tsx@@ -118,6 +118,7 @@ export const IssueDescriptionInput: FC<IssueDescriptionInputProps> = observer((p/>) : (<RichTextReadOnlyEditor+ id={issueId}initialValue={localIssueDescription.description_html ?? ""}containerClassName={containerClassName}/>diff --git a/web/core/components/issues/issue-detail/issue-activity/comments/comment-card.tsx b/web/core/components/issues/issue-detail/issue-activity/comments/comment-card.tsxindex 8779e2cc95..0ea9e8f15b 100644--- a/web/core/components/issues/issue-detail/issue-activity/comments/comment-card.tsx+++ b/web/core/components/issues/issue-detail/issue-activity/comments/comment-card.tsx@@ -143,6 +143,7 @@ export const IssueCommentCard: FC<TIssueCommentCard> = observer((props) => {projectId={projectId}workspaceSlug={workspaceSlug}ref={editorRef}+ id={comment.id}initialValue={watch("comment_html") ?? ""}value={null}onChange={(comment_json, comment_html) => setValue("comment_html", comment_html)}@@ -190,7 +191,7 @@ export const IssueCommentCard: FC<TIssueCommentCard> = observer((props) => {)}</div>)}- <LiteTextReadOnlyEditor ref={showEditorRef} initialValue={comment.comment_html ?? ""} />+ <LiteTextReadOnlyEditor ref={showEditorRef} id={comment.id} initialValue={comment.comment_html ?? ""} /><IssueCommentReactionworkspaceSlug={workspaceSlug}diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsxindex 8c6cd1b8c0..8814bb86c9 100644--- a/web/core/components/issues/issue-modal/form.tsx+++ b/web/core/components/issues/issue-modal/form.tsx@@ -460,6 +460,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {control={control}render={({ field: { value, onChange } }) => (<RichTextEditor+ id="issue-modal-editor"initialValue={value ?? ""}value={data.description_html}workspaceSlug={workspaceSlug?.toString() as string}diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsxindex 6bc1b2e7bc..d142800ff8 100644--- a/web/core/components/pages/editor/editor-body.tsx+++ b/web/core/components/pages/editor/editor-body.tsx@@ -153,6 +153,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {) : (<DocumentReadOnlyEditorWithRefref={readOnlyEditorRef}+ id={pageId}initialValue={pageDescription ?? "<p></p>"}handleEditorReady={handleReadOnlyEditorReady}containerClassName="p-0 pb-64 border-none"diff --git a/web/core/components/profile/activity/activity-list.tsx b/web/core/components/profile/activity/activity-list.tsxindex b692117201..505fc568fd 100644--- a/web/core/components/profile/activity/activity-list.tsx+++ b/web/core/components/profile/activity/activity-list.tsx@@ -68,6 +68,7 @@ export const ActivityList: React.FC<Props> = observer((props) => {</div><div className="issue-comments-section p-0"><RichTextReadOnlyEditor+ id={activityItem.id}initialValue={activityItem?.new_value !== ""? (activityItem.new_value?.toString() as string)diff --git a/web/core/components/profile/activity/profile-activity-list.tsx b/web/core/components/profile/activity/profile-activity-list.tsxindex c381690e7f..d2414b1e9b 100644--- a/web/core/components/profile/activity/profile-activity-list.tsx+++ b/web/core/components/profile/activity/profile-activity-list.tsx@@ -97,6 +97,7 @@ export const ProfileActivityListPage: React.FC<Props> = observer((props) => {</div><div className="issue-comments-section p-0"><RichTextReadOnlyEditor+ id={activityItem.id}initialValue={activityItem?.new_value !== "" ? activityItem.new_value : activityItem.old_value}