Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

refactor: ai menu (#5400)

Aaryan Khandelwal881d0525cc02
diff --git a/packages/editor/src/core/components/menus/ai-menu.tsx b/packages/editor/src/core/components/menus/ai-menu.tsx
index 8a714a6552..94c1f8e0ad 100644
--- a/packages/editor/src/core/components/menus/ai-menu.tsx
+++ b/packages/editor/src/core/components/menus/ai-menu.tsx
@@ -87,6 +87,7 @@ export const AIFeaturesMenu: React.FC<Props> = (props) => {
>
<div ref={menuRef} className="z-10">
{menu?.({
+ isOpen: isPopupVisible,
onClose: hidePopup,
})}
</div>
diff --git a/packages/editor/src/core/components/menus/index.ts b/packages/editor/src/core/components/menus/index.ts
index da050b6831..ed4f4e7cc6 100644
--- a/packages/editor/src/core/components/menus/index.ts
+++ b/packages/editor/src/core/components/menus/index.ts
@@ -1,4 +1,4 @@
-export * from "./bubble-menu";
export * from "./ai-menu";
+export * from "./bubble-menu";
export * from "./block-menu";
export * from "./menu-items";
diff --git a/packages/editor/src/core/extensions/side-menu.tsx b/packages/editor/src/core/extensions/side-menu.tsx
index ccc13ed5eb..75577c74fc 100644
--- a/packages/editor/src/core/extensions/side-menu.tsx
+++ b/packages/editor/src/core/extensions/side-menu.tsx
@@ -182,7 +182,7 @@ const SideMenu = (options: SideMenuPluginProps) => {
aiHandleDOMEvents?.mousemove?.();
}
},
- keydown: () => hideSideMenu(),
+ // keydown: () => hideSideMenu(),
mousewheel: () => hideSideMenu(),
dragenter: (view) => {
if (handlesConfig.dragDrop) {
diff --git a/packages/editor/src/core/types/ai.ts b/packages/editor/src/core/types/ai.ts
index f5470f51c0..448482e654 100644
--- a/packages/editor/src/core/types/ai.ts
+++ b/packages/editor/src/core/types/ai.ts
@@ -1,7 +1,8 @@
-type TMenuProps = {
+export type TAIMenuProps = {
+ isOpen: boolean;
onClose: () => void;
};
export type TAIHandler = {
- menu?: (props: TMenuProps) => React.ReactNode;
+ menu?: (props: TAIMenuProps) => React.ReactNode;
};
diff --git a/web/ce/components/pages/editor/ai/menu.tsx b/web/ce/components/pages/editor/ai/menu.tsx
index 7610595f73..edbed725df 100644
--- a/web/ce/components/pages/editor/ai/menu.tsx
+++ b/web/ce/components/pages/editor/ai/menu.tsx
@@ -1,6 +1,6 @@
"use client";
-import React, { RefObject, useRef, useState } from "react";
+import React, { RefObject, useEffect, useRef, useState } from "react";
import { useParams } from "next/navigation";
import { ChevronRight, CornerDownRight, LucideIcon, RefreshCcw, Sparkles, TriangleAlert } from "lucide-react";
// plane editor
@@ -20,6 +20,7 @@ const aiService = new AIService();
type Props = {
editorRef: RefObject<EditorRefApi>;
+ isOpen: boolean;
onClose: () => void;
};
@@ -57,7 +58,7 @@ const TONES_LIST = [
];
export const EditorAIMenu: React.FC<Props> = (props) => {
- const { editorRef, onClose } = props;
+ const { editorRef, isOpen, onClose } = props;
// states
const [activeTask, setActiveTask] = useState<AI_EDITOR_TASKS | null>(null);
const [response, setResponse] = useState<string | undefined>(undefined);
@@ -126,6 +127,14 @@ export const EditorAIMenu: React.FC<Props> = (props) => {
onClose();
};
+ // reset on close
+ useEffect(() => {
+ if (!isOpen) {
+ setActiveTask(null);
+ setResponse(undefined);
+ }
+ }, [isOpen]);
+
return (
<div
className={cn(
diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsx
index b9b0f23207..5cd7e503c4 100644
--- a/web/core/components/pages/editor/editor-body.tsx
+++ b/web/core/components/pages/editor/editor-body.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// document-editor
@@ -8,6 +8,7 @@ import {
EditorReadOnlyRefApi,
EditorRefApi,
IMarking,
+ TAIMenuProps,
TDisplayConfig,
} from "@plane/editor";
// types
@@ -95,6 +96,11 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
fontStyle,
};
+ const getAIMenu = useCallback(
+ ({ isOpen, onClose }: TAIMenuProps) => <EditorAIMenu editorRef={editorRef} isOpen={isOpen} onClose={onClose} />,
+ [editorRef]
+ );
+
useEffect(() => {
updateMarkings(pageDescription ?? "<p></p>");
}, [pageDescription, updateMarkings]);
@@ -158,7 +164,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
}}
disabledExtensions={documentEditor}
aiHandler={{
- menu: ({ onClose }) => <EditorAIMenu editorRef={editorRef} onClose={onClose} />,
+ menu: getAIMenu,
}}
/>
) : (