π₯π₯π₯ 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
refactor: editor code splitting (#6102)
Aaryan Khandelwal9f14167ef517
diff --git a/packages/editor/src/ce/extensions/core/extensions.ts b/packages/editor/src/ce/extensions/core/extensions.tsnew file mode 100644index 0000000000..d03229133b--- /dev/null+++ b/packages/editor/src/ce/extensions/core/extensions.ts@@ -0,0 +1,12 @@+import { Extensions } from "@tiptap/core";+// types+import { TExtensions } from "@/types";++type Props = {+ disabledExtensions: TExtensions[];+};++export const CoreEditorAdditionalExtensions = (props: Props): Extensions => {+ const {} = props;+ return [];+};diff --git a/packages/editor/src/ce/extensions/core/index.ts b/packages/editor/src/ce/extensions/core/index.tsnew file mode 100644index 0000000000..9ffc978c3f--- /dev/null+++ b/packages/editor/src/ce/extensions/core/index.ts@@ -0,0 +1,2 @@+export * from "./extensions";+export * from "./read-only-extensions";diff --git a/packages/editor/src/ce/extensions/core/read-only-extensions.ts b/packages/editor/src/ce/extensions/core/read-only-extensions.tsnew file mode 100644index 0000000000..398848e31d--- /dev/null+++ b/packages/editor/src/ce/extensions/core/read-only-extensions.ts@@ -0,0 +1,12 @@+import { Extensions } from "@tiptap/core";+// types+import { TExtensions } from "@/types";++type Props = {+ disabledExtensions: TExtensions[];+};++export const CoreReadOnlyEditorAdditionalExtensions = (props: Props): Extensions => {+ const {} = props;+ return [];+};diff --git a/packages/editor/src/ce/extensions/core/without-props.ts b/packages/editor/src/ce/extensions/core/without-props.tsnew file mode 100644index 0000000000..0debff0ea5--- /dev/null+++ b/packages/editor/src/ce/extensions/core/without-props.ts@@ -0,0 +1,3 @@+import { Extensions } from "@tiptap/core";++export const CoreEditorAdditionalExtensionsWithoutProps: Extensions = [];diff --git a/packages/editor/src/ce/extensions/document-extensions.tsx b/packages/editor/src/ce/extensions/document-extensions.tsxindex e3c94fa0e1..35d7c0f3de 100644--- a/packages/editor/src/ce/extensions/document-extensions.tsx+++ b/packages/editor/src/ce/extensions/document-extensions.tsx@@ -15,7 +15,13 @@ type Props = {export const DocumentEditorAdditionalExtensions = (_props: Props) => {const { disabledExtensions } = _props;- const extensions: Extensions = disabledExtensions?.includes("slash-commands") ? [] : [SlashCommands()];+ const extensions: Extensions = disabledExtensions?.includes("slash-commands")+ ? []+ : [+ SlashCommands({+ disabledExtensions,+ }),+ ];return extensions;};diff --git a/packages/editor/src/ce/extensions/index.ts b/packages/editor/src/ce/extensions/index.tsindex 4a975b8c5a..c9f58a936a 100644--- a/packages/editor/src/ce/extensions/index.ts+++ b/packages/editor/src/ce/extensions/index.ts@@ -1 +1,3 @@+export * from "./core";export * from "./document-extensions";+export * from "./slash-commands";diff --git a/packages/editor/src/ce/extensions/slash-commands.tsx b/packages/editor/src/ce/extensions/slash-commands.tsxnew file mode 100644index 0000000000..6eabee0823--- /dev/null+++ b/packages/editor/src/ce/extensions/slash-commands.tsx@@ -0,0 +1,14 @@+// extensions+import { TSlashCommandAdditionalOption } from "@/extensions";+// types+import { TExtensions } from "@/types";++type Props = {+ disabledExtensions: TExtensions[];+};++export const coreEditorAdditionalSlashCommandOptions = (props: Props): TSlashCommandAdditionalOption[] => {+ const {} = props;+ const options: TSlashCommandAdditionalOption[] = [];+ return options;+};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.tsxindex aa925abece..89acace7b7 100644--- 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.tsx@@ -15,6 +15,7 @@ import { EditorReadOnlyRefApi, ICollaborativeDocumentReadOnlyEditor } from "@/tyconst CollaborativeDocumentReadOnlyEditor = (props: ICollaborativeDocumentReadOnlyEditor) => {const {containerClassName,+ disabledExtensions,displayConfig = DEFAULT_DISPLAY_CONFIG,editorClassName = "",embedHandler,@@ -37,6 +38,7 @@ const CollaborativeDocumentReadOnlyEditor = (props: ICollaborativeDocumentReadOn}const { editor, hasServerConnectionFailed, hasServerSynced } = useReadOnlyCollaborativeEditor({+ disabledExtensions,editorClassName,extensions,fileHandler,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 8544157aa0..b36fb44a7a 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@@ -10,9 +10,10 @@ import { getEditorClassNames } from "@/helpers/common";// hooksimport { useReadOnlyEditor } from "@/hooks/use-read-only-editor";// types-import { EditorReadOnlyRefApi, IMentionHighlight, TDisplayConfig, TFileHandler } from "@/types";+import { EditorReadOnlyRefApi, IMentionHighlight, TDisplayConfig, TExtensions, TFileHandler } from "@/types";interface IDocumentReadOnlyEditor {+ disabledExtensions: TExtensions[];id: string;initialValue: string;containerClassName: string;@@ -31,6 +32,7 @@ interface IDocumentReadOnlyEditor {const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {const {containerClassName,+ disabledExtensions,displayConfig = DEFAULT_DISPLAY_CONFIG,editorClassName = "",embedHandler,@@ -51,6 +53,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {}const editor = useReadOnlyEditor({+ disabledExtensions,editorClassName,extensions,fileHandler,diff --git a/packages/editor/src/core/components/editors/editor-wrapper.tsx b/packages/editor/src/core/components/editors/editor-wrapper.tsxindex 33f011535c..075420ed74 100644--- a/packages/editor/src/core/components/editors/editor-wrapper.tsx+++ b/packages/editor/src/core/components/editors/editor-wrapper.tsx@@ -19,6 +19,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {const {children,containerClassName,+ disabledExtensions,displayConfig = DEFAULT_DISPLAY_CONFIG,editorClassName = "",extensions,@@ -37,6 +38,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {} = props;const editor = useEditor({+ disabledExtensions,editorClassName,enableHistory: true,extensions,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 e06826a289..6cd360ac0d 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@@ -12,6 +12,7 @@ import { IReadOnlyEditorProps } from "@/types";export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {const {containerClassName,+ disabledExtensions,displayConfig = DEFAULT_DISPLAY_CONFIG,editorClassName = "",fileHandler,@@ -22,6 +23,7 @@ export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {} = props;const editor = useReadOnlyEditor({+ disabledExtensions,editorClassName,fileHandler,forwardedRef,diff --git a/packages/editor/src/core/components/editors/rich-text/editor.tsx b/packages/editor/src/core/components/editors/rich-text/editor.tsxindex 87dba8b4d1..ffcc21da6c 100644--- a/packages/editor/src/core/components/editors/rich-text/editor.tsx+++ b/packages/editor/src/core/components/editors/rich-text/editor.tsx@@ -8,12 +8,7 @@ import { SideMenuExtension, SlashCommands } from "@/extensions";import { EditorRefApi, IRichTextEditor } from "@/types";const RichTextEditor = (props: IRichTextEditor) => {- const {- disabledExtensions,- dragDropEnabled,- bubbleMenuEnabled = true,- extensions: externalExtensions = [],- } = props;+ const { disabledExtensions, dragDropEnabled, bubbleMenuEnabled = true, extensions: externalExtensions = [] } = props;const getExtensions = useCallback(() => {const extensions = [@@ -24,7 +19,11 @@ const RichTextEditor = (props: IRichTextEditor) => {}),];if (!disabledExtensions?.includes("slash-commands")) {- extensions.push(SlashCommands());+ extensions.push(+ SlashCommands({+ disabledExtensions,+ })+ );}return extensions;diff --git a/packages/editor/src/core/extensions/core-without-props.ts b/packages/editor/src/core/extensions/core-without-props.tsindex 075d90f2df..cb1b0a0024 100644--- a/packages/editor/src/core/extensions/core-without-props.ts+++ b/packages/editor/src/core/extensions/core-without-props.ts@@ -19,6 +19,8 @@ import { TableHeader, TableCell, TableRow, Table } from "./table";import { CustomTextAlignExtension } from "./text-align";import { CustomCalloutExtensionConfig } from "./callout/extension-config";import { CustomColorExtension } from "./custom-color";+// plane editor extensions+import { CoreEditorAdditionalExtensionsWithoutProps } from "@/plane-editor/extensions/core/without-props";export const CoreEditorExtensionsWithoutProps = [StarterKit.configure({@@ -89,6 +91,7 @@ export const CoreEditorExtensionsWithoutProps = [CustomTextAlignExtension,CustomCalloutExtensionConfig,CustomColorExtension,+ ...CoreEditorAdditionalExtensionsWithoutProps,];export const DocumentEditorExtensionsWithoutProps = [IssueWidgetWithoutProps()];diff --git a/packages/editor/src/core/extensions/extensions.tsx b/packages/editor/src/core/extensions/extensions.tsxindex 959d20e2ba..b8910a56c3 100644--- a/packages/editor/src/core/extensions/extensions.tsx+++ b/packages/editor/src/core/extensions/extensions.tsx@@ -1,3 +1,4 @@+import { Extensions } from "@tiptap/core";import CharacterCount from "@tiptap/extension-character-count";import Placeholder from "@tiptap/extension-placeholder";import TaskItem from "@tiptap/extension-task-item";@@ -32,9 +33,12 @@ import {// helpersimport { isValidHttpUrl } from "@/helpers/common";// types-import { IMentionHighlight, IMentionSuggestion, TFileHandler } from "@/types";+import { IMentionHighlight, IMentionSuggestion, TExtensions, TFileHandler } from "@/types";+// plane editor extensions+import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";type TArguments = {+ disabledExtensions: TExtensions[];enableHistory: boolean;fileHandler: TFileHandler;mentionConfig: {@@ -45,8 +49,8 @@ type TArguments = {tabIndex?: number;};-export const CoreEditorExtensions = (args: TArguments) => {- const { enableHistory, fileHandler, mentionConfig, placeholder, tabIndex } = args;+export const CoreEditorExtensions = (args: TArguments): Extensions => {+ const { disabledExtensions, enableHistory, fileHandler, mentionConfig, placeholder, tabIndex } = args;return [StarterKit.configure({@@ -162,5 +166,8 @@ export const CoreEditorExtensions = (args: TArguments) => {CustomTextAlignExtension,CustomCalloutExtension,CustomColorExtension,+ ...CoreEditorAdditionalExtensions({+ disabledExtensions,+ }),];};diff --git a/packages/editor/src/core/extensions/read-only-extensions.tsx b/packages/editor/src/core/extensions/read-only-extensions.tsxindex 2d90592d68..9ca99495e5 100644--- a/packages/editor/src/core/extensions/read-only-extensions.tsx+++ b/packages/editor/src/core/extensions/read-only-extensions.tsx@@ -1,3 +1,4 @@+import { Extensions } from "@tiptap/core";import CharacterCount from "@tiptap/extension-character-count";import TaskItem from "@tiptap/extension-task-item";import TaskList from "@tiptap/extension-task-list";@@ -28,17 +29,20 @@ import {// helpersimport { isValidHttpUrl } from "@/helpers/common";// types-import { IMentionHighlight, TFileHandler } from "@/types";+import { IMentionHighlight, TExtensions, TFileHandler } from "@/types";+// plane editor extensions+import { CoreReadOnlyEditorAdditionalExtensions } from "@/plane-editor/extensions";type Props = {+ disabledExtensions: TExtensions[];fileHandler: Pick<TFileHandler, "getAssetSrc">;mentionConfig: {mentionHighlights?: () => Promise<IMentionHighlight[]>;};};-export const CoreReadOnlyEditorExtensions = (props: Props) => {- const { fileHandler, mentionConfig } = props;+export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {+ const { disabledExtensions, fileHandler, mentionConfig } = props;return [StarterKit.configure({@@ -128,5 +132,8 @@ export const CoreReadOnlyEditorExtensions = (props: Props) => {HeadingListExtension,CustomTextAlignExtension,CustomCalloutReadOnlyExtension,+ ...CoreReadOnlyEditorAdditionalExtensions({+ disabledExtensions,+ }),];};diff --git a/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx b/packages/editor/src/core/extensions/slash-commands/command-items-list.tsxindex c19bda3068..1efb729019 100644--- a/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx+++ b/packages/editor/src/core/extensions/slash-commands/command-items-list.tsx@@ -39,17 +39,27 @@ import {setText,} from "@/helpers/editor-commands";// types-import { CommandProps, ISlashCommandItem } from "@/types";+import { CommandProps, ISlashCommandItem, TExtensions, TSlashCommandSectionKeys } from "@/types";+// plane editor extensions+import { coreEditorAdditionalSlashCommandOptions } from "@/plane-editor/extensions";+// local types+import { TSlashCommandAdditionalOption } from "./root";export type TSlashCommandSection = {- key: string;+ key: TSlashCommandSectionKeys;title?: string;items: ISlashCommandItem[];};+type TArgs = {+ additionalOptions?: TSlashCommandAdditionalOption[];+ disabledExtensions: TExtensions[];+};+export const getSlashCommandFilteredSections =- (additionalOptions?: ISlashCommandItem[]) =>+ (args: TArgs) =>({ query }: { query: string }): TSlashCommandSection[] => {+ const { additionalOptions, disabledExtensions } = args;const SLASH_COMMAND_SECTIONS: TSlashCommandSection[] = [{key: "general",@@ -201,7 +211,7 @@ export const getSlashCommandFilteredSections =],},{- key: "text-color",+ key: "text-colors",title: "Colors",items: [{@@ -242,7 +252,7 @@ export const getSlashCommandFilteredSections =],},{- key: "background-color",+ key: "background-colors",title: "Background colors",items: [{@@ -279,8 +289,19 @@ export const getSlashCommandFilteredSections =},];- additionalOptions?.map((item) => {- SLASH_COMMAND_SECTIONS?.[0]?.items.push(item);+ [+ ...(additionalOptions ?? []),+ ...coreEditorAdditionalSlashCommandOptions({+ disabledExtensions,+ }),+ ]?.forEach((item) => {+ const sectionToPushTo = SLASH_COMMAND_SECTIONS.find((s) => s.key === item.section) ?? SLASH_COMMAND_SECTIONS[0];+ const itemIndexToPushAfter = sectionToPushTo.items.findIndex((i) => i.commandKey === item.pushAfter);+ if (itemIndexToPushAfter !== -1) {+ sectionToPushTo.items.splice(itemIndexToPushAfter + 1, 0, item);+ } else {+ sectionToPushTo.items.push(item);+ }});const filteredSlashSections = SLASH_COMMAND_SECTIONS.map((section) => ({diff --git a/packages/editor/src/core/extensions/slash-commands/root.tsx b/packages/editor/src/core/extensions/slash-commands/root.tsxindex a99cbc5f90..62c353f927 100644--- a/packages/editor/src/core/extensions/slash-commands/root.tsx+++ b/packages/editor/src/core/extensions/slash-commands/root.tsx@@ -3,7 +3,7 @@ import { ReactRenderer } from "@tiptap/react";import Suggestion, { SuggestionOptions } from "@tiptap/suggestion";import tippy from "tippy.js";// types-import { ISlashCommandItem } from "@/types";+import { ISlashCommandItem, TEditorCommands, TExtensions, TSlashCommandSectionKeys } from "@/types";// componentsimport { getSlashCommandFilteredSections } from "./command-items-list";import { SlashCommandsMenu, SlashCommandsMenuProps } from "./command-menu";@@ -12,6 +12,11 @@ export type SlashCommandOptions = {suggestion: Omit<SuggestionOptions, "editor">;};+export type TSlashCommandAdditionalOption = ISlashCommandItem & {+ section: TSlashCommandSectionKeys;+ pushAfter: TEditorCommands;+};+const Command = Extension.create<SlashCommandOptions>({name: "slash-command",addOptions() {@@ -102,10 +107,15 @@ const renderItems = () => {};};-export const SlashCommands = (additionalOptions?: ISlashCommandItem[]) =>+type TExtensionProps = {+ additionalOptions?: TSlashCommandAdditionalOption[];+ disabledExtensions: TExtensions[];+};++export const SlashCommands = (props: TExtensionProps) =>Command.configure({suggestion: {- items: getSlashCommandFilteredSections(additionalOptions),+ items: getSlashCommandFilteredSections(props),render: renderItems,},});diff --git a/packages/editor/src/core/hooks/use-collaborative-editor.ts b/packages/editor/src/core/hooks/use-collaborative-editor.tsindex 5bee8c0c3f..f32d7f4cca 100644--- a/packages/editor/src/core/hooks/use-collaborative-editor.ts+++ b/packages/editor/src/core/hooks/use-collaborative-editor.ts@@ -75,6 +75,7 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {}, [provider, id]);const editor = useEditor({+ disabledExtensions,id,onTransaction,editorProps,diff --git a/packages/editor/src/core/hooks/use-editor.ts b/packages/editor/src/core/hooks/use-editor.tsindex eef72797ce..5cddc79e56 100644--- a/packages/editor/src/core/hooks/use-editor.ts+++ b/packages/editor/src/core/hooks/use-editor.ts@@ -16,12 +16,20 @@ import { IMarking, scrollSummary, scrollToNodeViaDOMCoordinates } from "@/helper// propsimport { CoreEditorProps } from "@/props";// types-import { EditorRefApi, IMentionHighlight, IMentionSuggestion, TEditorCommands, TFileHandler } from "@/types";+import {+ EditorRefApi,+ IMentionHighlight,+ IMentionSuggestion,+ TEditorCommands,+ TExtensions,+ TFileHandler,+} from "@/types";export interface CustomEditorProps {editorClassName: string;editorProps?: EditorProps;enableHistory: boolean;+ disabledExtensions: TExtensions[];extensions?: any;fileHandler: TFileHandler;forwardedRef?: MutableRefObject<EditorRefApi | null>;@@ -45,6 +53,7 @@ export interface CustomEditorProps {export const useEditor = (props: CustomEditorProps) => {const {+ disabledExtensions,editorClassName,editorProps = {},enableHistory,@@ -79,6 +88,7 @@ export const useEditor = (props: CustomEditorProps) => {},extensions: [...CoreEditorExtensions({+ disabledExtensions,enableHistory,fileHandler,mentionConfig: {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.tsindex d408192297..62e08e5d32 100644--- a/packages/editor/src/core/hooks/use-read-only-collaborative-editor.ts+++ b/packages/editor/src/core/hooks/use-read-only-collaborative-editor.ts@@ -11,6 +11,7 @@ import { TReadOnlyCollaborativeEditorProps } from "@/types";export const useReadOnlyCollaborativeEditor = (props: TReadOnlyCollaborativeEditorProps) => {const {+ disabledExtensions,editorClassName,editorProps = {},extensions,@@ -66,6 +67,7 @@ export const useReadOnlyCollaborativeEditor = (props: TReadOnlyCollaborativeEdit}, [provider, id]);const editor = useReadOnlyEditor({+ disabledExtensions,editorProps,editorClassName,extensions: [diff --git a/packages/editor/src/core/hooks/use-read-only-editor.ts b/packages/editor/src/core/hooks/use-read-only-editor.tsindex 23ce023adc..f75fa72685 100644--- a/packages/editor/src/core/hooks/use-read-only-editor.ts+++ b/packages/editor/src/core/hooks/use-read-only-editor.ts@@ -11,14 +11,15 @@ import { IMarking, scrollSummary } from "@/helpers/scroll-to-node";// propsimport { CoreReadOnlyEditorProps } from "@/props";// types-import { EditorReadOnlyRefApi, IMentionHighlight, TFileHandler } from "@/types";+import { EditorReadOnlyRefApi, IMentionHighlight, TExtensions, TFileHandler } from "@/types";interface CustomReadOnlyEditorProps {- initialValue?: string;+ disabledExtensions: TExtensions[];editorClassName: string;- forwardedRef?: MutableRefObject<EditorReadOnlyRefApi | null>;- extensions?: any;editorProps?: EditorProps;+ extensions?: any;+ forwardedRef?: MutableRefObject<EditorReadOnlyRefApi | null>;+ initialValue?: string;fileHandler: Pick<TFileHandler, "getAssetSrc">;handleEditorReady?: (value: boolean) => void;mentionHandler: {@@ -29,6 +30,7 @@ interface CustomReadOnlyEditorProps {export const useReadOnlyEditor = (props: CustomReadOnlyEditorProps) => {const {+ disabledExtensions,initialValue,editorClassName,forwardedRef,@@ -54,6 +56,7 @@ export const useReadOnlyEditor = (props: CustomReadOnlyEditorProps) => {},extensions: [...CoreReadOnlyEditorExtensions({+ disabledExtensions,mentionConfig: {mentionHighlights: mentionHandler.highlights,},diff --git a/packages/editor/src/core/types/collaboration.ts b/packages/editor/src/core/types/collaboration.tsindex 8609995ed8..35fbdb9968 100644--- a/packages/editor/src/core/types/collaboration.ts+++ b/packages/editor/src/core/types/collaboration.ts@@ -20,7 +20,7 @@ export type TServerHandler = {};type TCollaborativeEditorHookProps = {- disabledExtensions?: TExtensions[];+ disabledExtensions: TExtensions[];editorClassName: string;editorProps?: EditorProps;extensions?: Extensions;diff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.tsindex 53aae1f265..4b134a854c 100644--- a/packages/editor/src/core/types/editor.ts+++ b/packages/editor/src/core/types/editor.ts@@ -104,7 +104,7 @@ export interface EditorRefApi extends EditorReadOnlyRefApi {export interface IEditorProps {containerClassName?: string;displayConfig?: TDisplayConfig;- disabledExtensions?: TExtensions[];+ disabledExtensions: TExtensions[];editorClassName?: string;fileHandler: TFileHandler;forwardedRef?: React.MutableRefObject<EditorRefApi | null>;@@ -146,6 +146,7 @@ export interface ICollaborativeDocumentEditor// read only editor propsexport interface IReadOnlyEditorProps {containerClassName?: string;+ disabledExtensions: TExtensions[];displayConfig?: TDisplayConfig;editorClassName?: string;fileHandler: Pick<TFileHandler, "getAssetSrc">;diff --git a/packages/editor/src/core/types/extensions.ts b/packages/editor/src/core/types/extensions.tsindex 2be17a4eff..b3aacccc0a 100644--- a/packages/editor/src/core/types/extensions.ts+++ b/packages/editor/src/core/types/extensions.ts@@ -1 +1 @@-export type TExtensions = "ai" | "collaboration-cursor" | "issue-embed" | "slash-commands"| "enter-key";+export type TExtensions = "ai" | "collaboration-cursor" | "issue-embed" | "slash-commands" | "enter-key";diff --git a/packages/editor/src/core/types/slash-commands-suggestion.ts b/packages/editor/src/core/types/slash-commands-suggestion.tsindex 91c93203af..d6dfae076f 100644--- a/packages/editor/src/core/types/slash-commands-suggestion.ts+++ b/packages/editor/src/core/types/slash-commands-suggestion.ts@@ -8,6 +8,8 @@ export type CommandProps = {range: Range;};+export type TSlashCommandSectionKeys = "general" | "text-colors" | "background-colors";+export type ISlashCommandItem = {commandKey: TEditorCommands;key: string;diff --git a/space/core/components/editor/lite-text-editor.tsx b/space/core/components/editor/lite-text-editor.tsxindex 0e3f34293b..5d50271355 100644--- a/space/core/components/editor/lite-text-editor.tsx+++ b/space/core/components/editor/lite-text-editor.tsx@@ -10,7 +10,8 @@ import { isCommentEmpty } from "@/helpers/string.helper";// hooksimport { useMention } from "@/hooks/use-mention";-interface LiteTextEditorWrapperProps extends Omit<ILiteTextEditor, "fileHandler" | "mentionHandler"> {+interface LiteTextEditorWrapperProps+ extends Omit<ILiteTextEditor, "disabledExtensions" | "fileHandler" | "mentionHandler"> {anchor: string;workspaceId: string;isSubmitting?: boolean;@@ -41,6 +42,7 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp<div className="border border-custom-border-200 rounded p-3 space-y-3"><LiteTextEditorWithRefref={ref}+ disabledExtensions={[]}fileHandler={getEditorFileHandlers({anchor,uploadFile,diff --git a/space/core/components/editor/lite-text-read-only-editor.tsx b/space/core/components/editor/lite-text-read-only-editor.tsxindex e12a46682e..014f4010c0 100644--- a/space/core/components/editor/lite-text-read-only-editor.tsx+++ b/space/core/components/editor/lite-text-read-only-editor.tsx@@ -7,7 +7,10 @@ import { getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";// hooksimport { useMention } from "@/hooks/use-mention";-type LiteTextReadOnlyEditorWrapperProps = Omit<ILiteTextReadOnlyEditor, "fileHandler" | "mentionHandler"> & {+type LiteTextReadOnlyEditorWrapperProps = Omit<+ ILiteTextReadOnlyEditor,+ "disabledExtensions" | "fileHandler" | "mentionHandler"+> & {anchor: string;};@@ -18,6 +21,7 @@ export const LiteTextReadOnlyEditor = React.forwardRef<EditorReadOnlyRefApi, Litreturn (<LiteTextReadOnlyEditorWithRefref={ref}+ disabledExtensions={[]}fileHandler={getReadOnlyEditorFileHandlers({anchor,})}diff --git a/space/core/components/editor/rich-text-editor.tsx b/space/core/components/editor/rich-text-editor.tsxindex 39a18f4f4c..cfe2e1b7f0 100644--- a/space/core/components/editor/rich-text-editor.tsx+++ b/space/core/components/editor/rich-text-editor.tsx@@ -1,12 +1,11 @@import React, { forwardRef } from "react";// editorimport { EditorRefApi, IMentionHighlight, IRichTextEditor, RichTextEditorWithRef } from "@plane/editor";-// types// helpers-import { cn } from "@/helpers/common.helper";import { getEditorFileHandlers } from "@/helpers/editor.helper";-interface RichTextEditorWrapperProps extends Omit<IRichTextEditor, "fileHandler" | "mentionHandler"> {+interface RichTextEditorWrapperProps+ extends Omit<IRichTextEditor, "disabledExtensions" | "fileHandler" | "mentionHandler"> {uploadFile: (file: File) => Promise<string>;}@@ -27,6 +26,7 @@ export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperPropsuggestions: undefined,}}ref={ref}+ disabledExtensions={[]}fileHandler={getEditorFileHandlers({uploadFile,workspaceId: "",diff --git a/space/core/components/editor/rich-text-read-only-editor.tsx b/space/core/components/editor/rich-text-read-only-editor.tsxindex b5b097baac..fca1776e25 100644--- a/space/core/components/editor/rich-text-read-only-editor.tsx+++ b/space/core/components/editor/rich-text-read-only-editor.tsx@@ -7,7 +7,10 @@ import { getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";// hooksimport { useMention } from "@/hooks/use-mention";-type RichTextReadOnlyEditorWrapperProps = Omit<IRichTextReadOnlyEditor, "fileHandler" | "mentionHandler"> & {+type RichTextReadOnlyEditorWrapperProps = Omit<+ IRichTextReadOnlyEditor,+ "disabledExtensions" | "fileHandler" | "mentionHandler"+> & {anchor: string;};@@ -18,6 +21,7 @@ export const RichTextReadOnlyEditor = React.forwardRef<EditorReadOnlyRefApi, Ricreturn (<RichTextReadOnlyEditorWithRefref={ref}+ disabledExtensions={[]}fileHandler={getReadOnlyEditorFileHandlers({anchor,})}diff --git a/web/ce/hooks/use-editor-flagging.ts b/web/ce/hooks/use-editor-flagging.tsindex ddaee71650..05fdff91fa 100644--- a/web/ce/hooks/use-editor-flagging.ts+++ b/web/ce/hooks/use-editor-flagging.ts@@ -4,10 +4,14 @@ import { TExtensions } from "@plane/editor";/*** @description extensions disabled in various editors*/-export const useEditorFlagging = (): {+export const useEditorFlagging = (+ workspaceSlug: string+): {documentEditor: TExtensions[];+ liteTextEditor: TExtensions[];richTextEditor: TExtensions[];} => ({documentEditor: ["ai", "collaboration-cursor"],+ liteTextEditor: ["ai", "collaboration-cursor"],richTextEditor: ["ai", "collaboration-cursor"],});diff --git a/web/core/components/editor/lite-text-editor/lite-text-editor.tsx b/web/core/components/editor/lite-text-editor/lite-text-editor.tsxindex 0822f1a97d..0fe75904d8 100644--- a/web/core/components/editor/lite-text-editor/lite-text-editor.tsx+++ b/web/core/components/editor/lite-text-editor/lite-text-editor.tsx@@ -14,9 +14,11 @@ import { isCommentEmpty } from "@/helpers/string.helper";// hooksimport { useMember, useMention, useUser } from "@/hooks/store";// plane web hooks+import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";import { useFileSize } from "@/plane-web/hooks/use-file-size";-interface LiteTextEditorWrapperProps extends Omit<ILiteTextEditor, "fileHandler" | "mentionHandler"> {+interface LiteTextEditorWrapperProps+ extends Omit<ILiteTextEditor, "disabledExtensions" | "fileHandler" | "mentionHandler"> {workspaceSlug: string;workspaceId: string;projectId: string;@@ -49,6 +51,8 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrappgetUserDetails,project: { getProjectMemberIds },} = useMember();+ // editor flaggings+ const { liteTextEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString());// derived valuesconst projectMemberIds = getProjectMemberIds(projectId);const projectMemberDetails = projectMemberIds?.map((id) => getUserDetails(id) as IUserLite);@@ -72,6 +76,7 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp<div className="border border-custom-border-200 rounded p-3 space-y-3"><LiteTextEditorWithRefref={ref}+ disabledExtensions={disabledExtensions}fileHandler={getEditorFileHandlers({maxFileSize,projectId,diff --git a/web/core/components/editor/lite-text-editor/lite-text-read-only-editor.tsx b/web/core/components/editor/lite-text-editor/lite-text-read-only-editor.tsxindex e2585a4724..1f1edad7d1 100644--- a/web/core/components/editor/lite-text-editor/lite-text-read-only-editor.tsx+++ b/web/core/components/editor/lite-text-editor/lite-text-read-only-editor.tsx@@ -6,8 +6,13 @@ import { cn } from "@/helpers/common.helper";import { getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";// hooksimport { useMention, useUser } from "@/hooks/store";+// plane web hooks+import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";-type LiteTextReadOnlyEditorWrapperProps = Omit<ILiteTextReadOnlyEditor, "fileHandler" | "mentionHandler"> & {+type LiteTextReadOnlyEditorWrapperProps = Omit<+ ILiteTextReadOnlyEditor,+ "disabledExtensions" | "fileHandler" | "mentionHandler"+> & {workspaceSlug: string;projectId: string;};@@ -19,10 +24,13 @@ export const LiteTextReadOnlyEditor = React.forwardRef<EditorReadOnlyRefApi, Litconst { mentionHighlights } = useMention({user: currentUser,});+ // editor flaggings+ const { liteTextEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString());return (<LiteTextReadOnlyEditorWithRefref={ref}+ disabledExtensions={disabledExtensions}fileHandler={getReadOnlyEditorFileHandlers({projectId,workspaceSlug,diff --git a/web/core/components/editor/rich-text-editor/rich-text-editor.tsx b/web/core/components/editor/rich-text-editor/rich-text-editor.tsxindex fb734bc8d1..908ac50225 100644--- a/web/core/components/editor/rich-text-editor/rich-text-editor.tsx+++ b/web/core/components/editor/rich-text-editor/rich-text-editor.tsx@@ -9,9 +9,11 @@ import { getEditorFileHandlers } from "@/helpers/editor.helper";// hooksimport { useMember, useMention, useUser } from "@/hooks/store";// plane web hooks+import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";import { useFileSize } from "@/plane-web/hooks/use-file-size";-interface RichTextEditorWrapperProps extends Omit<IRichTextEditor, "fileHandler" | "mentionHandler"> {+interface RichTextEditorWrapperProps+ extends Omit<IRichTextEditor, "disabledExtensions" | "fileHandler" | "mentionHandler"> {workspaceSlug: string;workspaceId: string;projectId: string;@@ -26,6 +28,8 @@ export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperPropgetUserDetails,project: { getProjectMemberIds },} = useMember();+ // editor flaggings+ const { richTextEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString());// derived valuesconst projectMemberIds = getProjectMemberIds(projectId);const projectMemberDetails = projectMemberIds?.map((id) => getUserDetails(id) as IUserLite);@@ -42,6 +46,7 @@ export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperPropreturn (<RichTextEditorWithRefref={ref}+ disabledExtensions={disabledExtensions}fileHandler={getEditorFileHandlers({maxFileSize,projectId,diff --git a/web/core/components/editor/rich-text-editor/rich-text-read-only-editor.tsx b/web/core/components/editor/rich-text-editor/rich-text-read-only-editor.tsxindex 21e656ae60..a9067641f9 100644--- a/web/core/components/editor/rich-text-editor/rich-text-read-only-editor.tsx+++ b/web/core/components/editor/rich-text-editor/rich-text-read-only-editor.tsx@@ -6,8 +6,13 @@ import { cn } from "@/helpers/common.helper";import { getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";// hooksimport { useMention } from "@/hooks/store";+// plane web hooks+import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";-type RichTextReadOnlyEditorWrapperProps = Omit<IRichTextReadOnlyEditor, "fileHandler" | "mentionHandler"> & {+type RichTextReadOnlyEditorWrapperProps = Omit<+ IRichTextReadOnlyEditor,+ "disabledExtensions" | "fileHandler" | "mentionHandler"+> & {workspaceSlug: string;projectId?: string;};@@ -15,10 +20,13 @@ type RichTextReadOnlyEditorWrapperProps = Omit<IRichTextReadOnlyEditor, "fileHanexport const RichTextReadOnlyEditor = React.forwardRef<EditorReadOnlyRefApi, RichTextReadOnlyEditorWrapperProps>(({ workspaceSlug, projectId, ...props }, ref) => {const { mentionHighlights } = useMention({});+ // editor flaggings+ const { richTextEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString());return (<RichTextReadOnlyEditorWithRefref={ref}+ disabledExtensions={disabledExtensions}fileHandler={getReadOnlyEditorFileHandlers({projectId,workspaceSlug,diff --git a/web/core/components/global/product-updates/modal.tsx b/web/core/components/global/product-updates/modal.tsxindex 57beaa6810..6bdacc9470 100644--- a/web/core/components/global/product-updates/modal.tsx+++ b/web/core/components/global/product-updates/modal.tsx@@ -59,6 +59,7 @@ export const ProductUpdatesModal: FC<ProductUpdatesModalProps> = observer((props{data?.id && (<DocumentReadOnlyEditorWithRefref={editorRef}+ disabledExtensions={[]}id={data.id}initialValue={data.description_html ?? "<p></p>"}containerClassName="p-0 border-none"diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsxindex 0d299104fc..ad27f9d7de 100644--- a/web/core/components/pages/editor/editor-body.tsx+++ b/web/core/components/pages/editor/editor-body.tsx@@ -84,7 +84,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {user: currentUser ?? undefined,});// editor flaggings- const { documentEditor } = useEditorFlagging();+ const { documentEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString());// page filtersconst { fontSize, fontStyle, isFullWidth } = usePageFilters();// issue-embed@@ -224,7 +224,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {realtimeConfig={realtimeConfig}serverHandler={serverHandler}user={userConfig}- disabledExtensions={documentEditor}+ disabledExtensions={disabledExtensions}aiHandler={{menu: getAIMenu,}}@@ -233,6 +233,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {<CollaborativeDocumentReadOnlyEditorWithRefid={pageId}ref={readOnlyEditorRef}+ disabledExtensions={disabledExtensions}fileHandler={getReadOnlyEditorFileHandlers({projectId: projectId?.toString() ?? "",workspaceSlug: workspaceSlug?.toString() ?? "",diff --git a/web/core/components/pages/version/editor.tsx b/web/core/components/pages/version/editor.tsxindex 697af9b152..637736e39f 100644--- a/web/core/components/pages/version/editor.tsx+++ b/web/core/components/pages/version/editor.tsx@@ -12,6 +12,7 @@ import { getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";import { useMember, useMention, useUser } from "@/hooks/store";import { usePageFilters } from "@/hooks/use-page-filters";// plane web hooks+import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";import { useIssueEmbed } from "@/plane-web/hooks/use-issue-embed";export type TVersionEditorProps = {@@ -31,6 +32,8 @@ export const PagesVersionEditor: React.FC<TVersionEditorProps> = observer((propsgetUserDetails,project: { getProjectMemberIds },} = useMember();+ // editor flaggings+ const { documentEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString() ?? "");// derived valuesconst projectMemberIds = projectId ? getProjectMemberIds(projectId.toString()) : [];const projectMemberDetails = projectMemberIds?.map((id) => getUserDetails(id) as IUserLite);@@ -101,6 +104,7 @@ export const PagesVersionEditor: React.FC<TVersionEditorProps> = observer((propsid={activeVersion ?? ""}initialValue={description ?? "<p></p>"}containerClassName="p-0 pb-64 border-none"+ disabledExtensions={disabledExtensions}displayConfig={displayConfig}editorClassName="pl-10"fileHandler={getReadOnlyEditorFileHandlers({