Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-14 06:25:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: current version sync (#1093)

Browse Source
This commit is contained in:
Aaryan Khandelwal
2024-09-10 17:53:35 +05:30
committed by GitHub
parent ccf7545ddb
commit a25deadac5
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/ee/components/pages/editor/page-root.tsx
View File

@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react";
import { observer } from "mobx-react";
import { useSearchParams } from "next/navigation";
// plane editor
import { EditorRefApi, useEditorMarkings } from "@plane/editor";
import { EditorReadOnlyRefApi, EditorRefApi, useEditorMarkings } from "@plane/editor";
// plane types
import { TPage } from "@plane/types";
// plane ui
@@ -37,7 +37,7 @@ export const WorkspacePageRoot = observer((props: TPageRootProps) => {
const [isVersionsOverlayOpen, setIsVersionsOverlayOpen] = useState(false);
// refs
const editorRef = useRef<EditorRefApi>(null);
const readOnlyEditorRef = useRef<EditorRefApi>(null);
const readOnlyEditorRef = useRef<EditorReadOnlyRefApi>(null);
// router
const router = useAppRouter();
// search params
@@ -91,11 +91,15 @@ export const WorkspacePageRoot = observer((props: TPageRootProps) => {
editorRef.current?.clearEditor();
editorRef.current?.setEditorValue(descriptionHTML);
};
const currentVersionDescription = isContentEditable
? editorRef.current?.getHTML()
: readOnlyEditorRef.current?.getHTML();
return (
<>
<PageVersionsOverlay
activeVersion={version}
currentVersionDescription={currentVersionDescription ?? null}
editorComponent={WorkspacePagesVersionEditor}
fetchAllVersions={async (pageId) => {
if (!workspaceSlug) return;

19
web/ee/components/pages/version/editor.tsx
View File

@@ -3,27 +3,21 @@ import { useParams } from "next/navigation";
// plane editor
import { DocumentReadOnlyEditorWithRef, TDisplayConfig } from "@plane/editor";
// plane types
import { IUserLite, TPageVersion } from "@plane/types";
import { IUserLite } from "@plane/types";
// plane ui
import { Loader } from "@plane/ui";
// components
import { TVersionEditorProps } from "@/components/pages";
// hooks
import { useMember, useUser } from "@/hooks/store";
import { usePageFilters } from "@/hooks/use-page-filters";
// plane web components
import { IssueEmbedCard } from "@/plane-web/components/pages";
// plane web hooks
import { useWorkspacePageDetails } from "@/plane-web/hooks/store";
import { useWorkspaceMention } from "@/plane-web/hooks/use-workspace-mention";
type Props = {
activeVersion: string | null;
isCurrentVersionActive: boolean;
pageId: string;
versionDetails: TPageVersion | undefined;
};
export const WorkspacePagesVersionEditor: React.FC<Props> = observer((props) => {
const { activeVersion, isCurrentVersionActive, pageId, versionDetails } = props;
export const WorkspacePagesVersionEditor: React.FC<TVersionEditorProps> = observer((props) => {
const { activeVersion, currentVersionDescription, isCurrentVersionActive, versionDetails } = props;
// params
const { workspaceSlug } = useParams();
// store hooks
@@ -32,7 +26,6 @@ export const WorkspacePagesVersionEditor: React.FC<Props> = observer((props) =>
getUserDetails,
workspace: { workspaceMemberIds },
} = useMember();
const currentPageDetails = useWorkspacePageDetails(pageId);
// derived values
const workspaceMemberDetails = workspaceMemberIds?.map((id) => getUserDetails(id) as IUserLite);
// use-mention
@@ -91,7 +84,7 @@ export const WorkspacePagesVersionEditor: React.FC<Props> = observer((props) =>
</div>
);
const description = isCurrentVersionActive ? currentPageDetails.description_html : versionDetails?.description_html;
const description = isCurrentVersionActive ? currentVersionDescription : versionDetails?.description_html;
if (description === undefined || description?.trim() === "") return null;
return (