π₯π₯π₯ 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
[WIKI-345] chore: pass disabled and flagged extensions to block menu (#7152)
Vipin Chaudhary0fe7da62655d
diff --git a/apps/live/src/core/services/api.service.ts b/apps/live/src/core/services/api.service.tsindex abc53c1113..dbef2ae179 100644--- a/apps/live/src/core/services/api.service.ts+++ b/apps/live/src/core/services/api.service.ts@@ -14,6 +14,7 @@ export abstract class APIService {this.axiosInstance = axios.create({baseURL,withCredentials: true,+ timeout: 20000,});}diff --git a/apps/space/helpers/string.helper.ts b/apps/space/helpers/string.helper.tsindex 2f4e48ab0d..cd086300c0 100644--- a/apps/space/helpers/string.helper.ts+++ b/apps/space/helpers/string.helper.ts@@ -71,7 +71,7 @@ export const isCommentEmpty = (comment: string | undefined): boolean => {return (comment?.trim() === "" ||comment === "<p></p>" ||- isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component"])+ isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component", "embed-component"]));};diff --git a/apps/web/core/components/editor/lite-text/editor.tsx b/apps/web/core/components/editor/lite-text/editor.tsxindex 5f4d28203c..feb99ea6e0 100644--- a/apps/web/core/components/editor/lite-text/editor.tsx+++ b/apps/web/core/components/editor/lite-text/editor.tsx@@ -1,6 +1,7 @@import React, { useState } from "react";-// plane imports+// plane constantsimport { EIssueCommentAccessSpecifier } from "@plane/constants";+// plane importsimport { type EditorRefApi, type ILiteTextEditorProps, LiteTextEditorWithRef, type TFileHandler } from "@plane/editor";import { useTranslation } from "@plane/i18n";import type { MakeOptional } from "@plane/types";@@ -87,7 +88,6 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp// derived valuesconst isEmpty = isCommentEmpty(props.initialValue);const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;-return (<divclassName={cn(diff --git a/apps/web/core/components/editor/sticky-editor/editor.tsx b/apps/web/core/components/editor/sticky-editor/editor.tsxindex 776d96cacc..aa86d1ed58 100644--- a/apps/web/core/components/editor/sticky-editor/editor.tsx+++ b/apps/web/core/components/editor/sticky-editor/editor.tsx@@ -59,7 +59,6 @@ export const StickyEditor = React.forwardRef<EditorRefApi, StickyEditorWrapperPr}// derived valuesconst editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;-return (<divclassName={cn("relative border border-custom-border-200 rounded", parentClassName)}diff --git a/apps/web/next.config.js b/apps/web/next.config.jsindex a429bf91cf..2067cf1f8b 100644--- a/apps/web/next.config.js+++ b/apps/web/next.config.js@@ -12,7 +12,7 @@ const nextConfig = {return [{source: "/(.*)?",- headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }],+ headers: [{ key: "X-Frame-Options", value: "DENY" }],},];},diff --git a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx b/packages/editor/src/core/components/editors/document/collaborative-editor.tsxindex 120ade7127..535f1b6ba1 100644--- a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx+++ b/packages/editor/src/core/components/editors/document/collaborative-editor.tsx@@ -108,6 +108,8 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =isTouchDevice={!!isTouchDevice}isLoading={!hasServerSynced && !hasServerConnectionFailed}tabIndex={tabIndex}+ flaggedExtensions={flaggedExtensions}+ disabledExtensions={disabledExtensions}/>);};diff --git a/packages/editor/src/core/components/editors/document/editor.tsx b/packages/editor/src/core/components/editors/document/editor.tsxindex bf27c48e3f..85285adea2 100644--- a/packages/editor/src/core/components/editors/document/editor.tsx+++ b/packages/editor/src/core/components/editors/document/editor.tsx@@ -82,6 +82,7 @@ const DocumentEditor = (props: IDocumentEditorProps) => {initialValue: value,mentionHandler,onChange,+ embedHandler,});const editorContainerClassName = getEditorClassNames({@@ -98,6 +99,8 @@ const DocumentEditor = (props: IDocumentEditorProps) => {editorContainerClassName={cn(editorContainerClassName, "document-editor")}id={id}isTouchDevice={!!isTouchDevice}+ flaggedExtensions={flaggedExtensions}+ disabledExtensions={disabledExtensions}/>);};diff --git a/packages/editor/src/core/components/editors/document/page-renderer.tsx b/packages/editor/src/core/components/editors/document/page-renderer.tsxindex 266476788c..7a628b3b22 100644--- a/packages/editor/src/core/components/editors/document/page-renderer.tsx+++ b/packages/editor/src/core/components/editors/document/page-renderer.tsx@@ -5,7 +5,7 @@ import { cn } from "@plane/utils";import { DocumentContentLoader, EditorContainer, EditorContentWrapper } from "@/components/editors";import { AIFeaturesMenu, BlockMenu, EditorBubbleMenu } from "@/components/menus";// types-import { TAIHandler, TDisplayConfig } from "@/types";+import { IEditorProps, TAIHandler, TDisplayConfig } from "@/types";type Props = {aiHandler?: TAIHandler;@@ -18,6 +18,8 @@ type Props = {isLoading?: boolean;isTouchDevice: boolean;tabIndex?: number;+ flaggedExtensions?: IEditorProps["flaggedExtensions"];+ disabledExtensions?: IEditorProps["disabledExtensions"];};export const PageRenderer = (props: Props) => {@@ -32,6 +34,8 @@ export const PageRenderer = (props: Props) => {isLoading,isTouchDevice,tabIndex,+ flaggedExtensions,+ disabledExtensions,} = props;return (@@ -54,7 +58,11 @@ export const PageRenderer = (props: Props) => {{editor.isEditable && !isTouchDevice && (<div>{bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}- <BlockMenu editor={editor} />+ <BlockMenu+ editor={editor}+ flaggedExtensions={flaggedExtensions}+ disabledExtensions={disabledExtensions}+ /><AIFeaturesMenu menu={aiHandler?.menu} /></div>)}diff --git a/packages/editor/src/core/components/editors/editor-wrapper.tsx b/packages/editor/src/core/components/editors/editor-wrapper.tsxindex 51c3ea156d..7de71bf6f4 100644--- a/packages/editor/src/core/components/editors/editor-wrapper.tsx+++ b/packages/editor/src/core/components/editors/editor-wrapper.tsx@@ -41,6 +41,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {placeholder,tabIndex,value,+ embedHandler,} = props;const editor = useEditor({@@ -65,6 +66,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {placeholder,tabIndex,value,+ embedHandler,});const editorContainerClassName = getEditorClassNames({diff --git a/packages/editor/src/core/components/editors/link-view-container.tsx b/packages/editor/src/core/components/editors/link-view-container.tsxindex c686c33ab6..5e839830e0 100644--- a/packages/editor/src/core/components/editors/link-view-container.tsx+++ b/packages/editor/src/core/components/editors/link-view-container.tsx@@ -1,8 +1,12 @@import { autoUpdate, flip, hide, shift, useDismiss, useFloating, useInteractions } from "@floating-ui/react";import { Editor, useEditorState } from "@tiptap/react";import { FC, useCallback, useEffect, useRef, useState } from "react";+// componentsimport { LinkView, LinkViewProps } from "@/components/links";+import { CORE_EXTENSIONS } from "@/constants/extension";+// components+import { getExtensionStorage } from "@/helpers/get-extension-storage";type Props = {editor: Editor;@@ -18,7 +22,7 @@ export const LinkViewContainer: FC<Props> = ({ editor, containerRef }) => {const editorState = useEditorState({editor,selector: ({ editor }: { editor: Editor }) => ({- linkExtensionStorage: editor.storage.link,+ linkExtensionStorage: getExtensionStorage(editor, CORE_EXTENSIONS.CUSTOM_LINK),}),});diff --git a/packages/editor/src/core/components/menus/block-menu.tsx b/packages/editor/src/core/components/menus/block-menu.tsxindex 4f4fb64ac6..43c0193c71 100644--- a/packages/editor/src/core/components/menus/block-menu.tsx+++ b/packages/editor/src/core/components/menus/block-menu.tsx@@ -4,9 +4,12 @@ import { useCallback, useEffect, useRef } from "react";import tippy, { Instance } from "tippy.js";// constantsimport { CORE_EXTENSIONS } from "@/constants/extension";+import { IEditorProps } from "@/types";type Props = {editor: Editor;+ flaggedExtensions?: IEditorProps["flaggedExtensions"];+ disabledExtensions?: IEditorProps["disabledExtensions"];};export const BlockMenu = (props: Props) => {diff --git a/packages/editor/src/core/extensions/custom-link/extension.tsx b/packages/editor/src/core/extensions/custom-link/extension.tsxindex 39c227b60f..f9ae0d561d 100644--- a/packages/editor/src/core/extensions/custom-link/extension.tsx+++ b/packages/editor/src/core/extensions/custom-link/extension.tsx@@ -81,6 +81,7 @@ declare module "@tiptap/core" {export type CustomLinkStorage = {isPreviewOpen: boolean;posToInsert: { from: number; to: number };+ isBubbleMenuOpen: boolean;};export const CustomLinkExtension = Mark.create<LinkOptions, CustomLinkStorage>({diff --git a/packages/editor/src/core/extensions/extensions.ts b/packages/editor/src/core/extensions/extensions.tsindex 9ca8f06ed5..eda64824ff 100644--- a/packages/editor/src/core/extensions/extensions.ts+++ b/packages/editor/src/core/extensions/extensions.ts@@ -29,7 +29,7 @@ import {// plane editor extensionsimport { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";// types-import type { IEditorProps } from "@/types";+import type { IEditorProps, TEmbedConfig } from "@/types";// local importsimport { CustomImageExtension } from "./custom-image/extension";import { EmojiExtension } from "./emoji/extension";@@ -45,9 +45,11 @@ type TArguments = Pick<| "mentionHandler"| "placeholder"| "tabIndex"+ | "embedHandler"> & {enableHistory: boolean;editable: boolean;+ embedHandler?: TEmbedConfig;};export const CoreEditorExtensions = (args: TArguments): Extensions => {@@ -60,6 +62,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {mentionHandler,placeholder,tabIndex,+ embedHandler,editable,} = args;@@ -115,6 +118,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {disabledExtensions,flaggedExtensions,fileHandler,+ embedHandler,}),];diff --git a/packages/editor/src/core/hooks/use-collaborative-editor.ts b/packages/editor/src/core/hooks/use-collaborative-editor.tsindex cd08f5cbda..46f7c4d82c 100644--- a/packages/editor/src/core/hooks/use-collaborative-editor.ts+++ b/packages/editor/src/core/hooks/use-collaborative-editor.ts@@ -80,6 +80,7 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorHookProps) =>);const editor = useEditor({+ embedHandler,disabledExtensions,id,editable,diff --git a/packages/editor/src/core/hooks/use-editor.ts b/packages/editor/src/core/hooks/use-editor.tsindex b5c6383cd7..22ca31143c 100644--- a/packages/editor/src/core/hooks/use-editor.ts+++ b/packages/editor/src/core/hooks/use-editor.ts@@ -32,6 +32,7 @@ export const useEditor = (props: TEditorHookProps) => {onAssetChange,onChange,onEditorFocus,+ embedHandler,onTransaction,placeholder,provider,@@ -63,6 +64,7 @@ export const useEditor = (props: TEditorHookProps) => {mentionHandler,placeholder,tabIndex,+ embedHandler,}),...extensions,],diff --git a/packages/editor/src/core/plugins/drag-handle.ts b/packages/editor/src/core/plugins/drag-handle.tsindex b525759d95..bf04ba45ad 100644--- a/packages/editor/src/core/plugins/drag-handle.ts+++ b/packages/editor/src/core/plugins/drag-handle.ts@@ -21,6 +21,7 @@ const generalSelectors = [".image-component",".image-upload-component",".editor-callout-component",+ ".editor-embed-component",].join(", ");const maxScrollSpeed = 20;@@ -103,6 +104,11 @@ export const nodeDOMAtCoords = (coords: { x: number; y: number }) => {continue;}+ // Skip elements inside .editor-embed-component+ if (elem.closest(".editor-embed-component") && !elem.matches(".editor-embed-component")) {+ continue;+ }+// apply general selectorif (elem.matches(generalSelectors)) {return elem;diff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.tsindex 2d04b96770..ed26bbbdac 100644--- a/packages/editor/src/core/types/editor.ts+++ b/packages/editor/src/core/types/editor.ts@@ -2,6 +2,7 @@ import type { Content, Extensions, JSONContent, RawCommands } from "@tiptap/coreimport type { MarkType, NodeType } from "@tiptap/pm/model";import type { Selection } from "@tiptap/pm/state";import type { EditorProps, EditorView } from "@tiptap/pm/view";+import type { NodeViewProps as TNodeViewProps } from "@tiptap/react";// extension typesimport type { TTextAlign } from "@/extensions";// types@@ -48,7 +49,8 @@ export type TEditorCommands =| "text-align"| "callout"| "attachment"- | "emoji";+ | "emoji"+ | "external-embed";export type TCommandExtraProps = {image: {@@ -138,6 +140,7 @@ export type IEditorProps = {editorClassName?: string;editorProps?: EditorProps;extensions?: Extensions;+ embedHandler?: TEmbedConfig;flaggedExtensions: TExtensions[];fileHandler: TFileHandler;forwardedRef?: React.MutableRefObject<EditorRefApi | null>;@@ -191,3 +194,5 @@ export type EditorEvents = {destroy: never;ready: { height: number };};++export type NodeViewProps = TNodeViewProps;diff --git a/packages/editor/src/core/types/hook.ts b/packages/editor/src/core/types/hook.tsindex 6e8dd1ee2b..0376fc14db 100644--- a/packages/editor/src/core/types/hook.ts+++ b/packages/editor/src/core/types/hook.ts@@ -13,6 +13,7 @@ type TCoreHookProps = Pick<| "handleEditorReady"| "isTouchDevice"| "onEditorFocus"+ | "embedHandler">;export type TEditorHookProps = TCoreHookProps &diff --git a/packages/utils/src/string.ts b/packages/utils/src/string.tsindex 6ffb4ea041..062a162abe 100644--- a/packages/utils/src/string.ts+++ b/packages/utils/src/string.ts@@ -174,7 +174,7 @@ export const isCommentEmpty = (comment: string | undefined): boolean => {return (comment?.trim() === "" ||comment === "<p></p>" ||- isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component"])+ isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component", "embed-component"]));};