π₯π₯π₯ 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
Revert "fix: refactor editor extensions code spliting"
sriram veeraghantad2758fe5e6cc
diff --git a/packages/editor/src/ce/extensions/core/extensions.ts b/packages/editor/src/ce/extensions/core/extensions.tsdeleted file mode 100644index 8f4fd41855..0000000000--- a/packages/editor/src/ce/extensions/core/extensions.ts+++ /dev/null@@ -1,3 +0,0 @@-import { Extensions } from "@tiptap/core";--export const CoreEditorAdditionalExtensions = (): Extensions => [];diff --git a/packages/editor/src/ce/extensions/core/index.ts b/packages/editor/src/ce/extensions/core/index.tsdeleted file mode 100644index 9ffc978c3f..0000000000--- a/packages/editor/src/ce/extensions/core/index.ts+++ /dev/null@@ -1,2 +0,0 @@-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.tsdeleted file mode 100644index b7789af738..0000000000--- a/packages/editor/src/ce/extensions/core/read-only-extensions.ts+++ /dev/null@@ -1,3 +0,0 @@-import { Extensions } from "@tiptap/core";--export const CoreReadOnlyEditorAdditionalExtensions = (): Extensions => [];diff --git a/packages/editor/src/ce/extensions/core/without-props.ts b/packages/editor/src/ce/extensions/core/without-props.tsdeleted file mode 100644index 0debff0ea5..0000000000--- a/packages/editor/src/ce/extensions/core/without-props.ts+++ /dev/null@@ -1,3 +0,0 @@-import { Extensions } from "@tiptap/core";--export const CoreEditorAdditionalExtensionsWithoutProps: Extensions = [];diff --git a/packages/editor/src/ce/extensions/index.ts b/packages/editor/src/ce/extensions/index.tsindex b25cbcfc73..4a975b8c5a 100644--- a/packages/editor/src/ce/extensions/index.ts+++ b/packages/editor/src/ce/extensions/index.ts@@ -1,2 +1 @@-export * from "./core";export * from "./document-extensions";diff --git a/packages/editor/src/ce/types/editor.ts b/packages/editor/src/ce/types/editor.tsdeleted file mode 100644index 52ef2f743c..0000000000--- a/packages/editor/src/ce/types/editor.ts+++ /dev/null@@ -1 +0,0 @@-export type TEditorAdditionalCommands = never;diff --git a/packages/editor/src/ce/types/index.ts b/packages/editor/src/ce/types/index.tsindex 8b6f018470..f30596cb00 100644--- a/packages/editor/src/ce/types/index.ts+++ b/packages/editor/src/ce/types/index.ts@@ -1,2 +1 @@-export * from "./editor";export * from "./issue-embed";diff --git a/packages/editor/src/core/extensions/callout/block.tsx b/packages/editor/src/core/extensions/callout/block.tsxnew file mode 100644index 0000000000..b6c6d7991b--- /dev/null+++ b/packages/editor/src/core/extensions/callout/block.tsx@@ -0,0 +1,56 @@+import React, { useState } from "react";+import { NodeViewContent, NodeViewProps, NodeViewWrapper } from "@tiptap/react";+// constants+import { COLORS_LIST } from "@/constants/common";+// local components+import { CalloutBlockColorSelector } from "./color-selector";+import { CalloutBlockLogoSelector } from "./logo-selector";+// types+import { EAttributeNames, TCalloutBlockAttributes } from "./types";+// utils+import { updateStoredBackgroundColor } from "./utils";++type Props = NodeViewProps & {+ node: NodeViewProps["node"] & {+ attrs: TCalloutBlockAttributes;+ };+ updateAttributes: (attrs: Partial<TCalloutBlockAttributes>) => void;+};++export const CustomCalloutBlock: React.FC<Props> = (props) => {+ const { editor, node, updateAttributes } = props;+ // states+ const [isEmojiPickerOpen, setIsEmojiPickerOpen] = useState(false);+ const [isColorPickerOpen, setIsColorPickerOpen] = useState(false);+ // derived values+ const activeBackgroundColor = COLORS_LIST.find((c) => node.attrs["data-background"] === c.key)?.backgroundColor;++ return (+ <NodeViewWrapper+ className="editor-callout-component group/callout-node relative bg-custom-background-90 rounded-lg text-custom-text-100 p-4 my-2 flex items-start gap-4 transition-colors duration-500 break-words"+ style={{+ backgroundColor: activeBackgroundColor,+ }}+ >+ <CalloutBlockLogoSelector+ blockAttributes={node.attrs}+ disabled={!editor.isEditable}+ isOpen={isEmojiPickerOpen}+ handleOpen={(val) => setIsEmojiPickerOpen(val)}+ updateAttributes={updateAttributes}+ />+ <CalloutBlockColorSelector+ disabled={!editor.isEditable}+ isOpen={isColorPickerOpen}+ toggleDropdown={() => setIsColorPickerOpen((prev) => !prev)}+ onSelect={(val) => {+ updateAttributes({+ [EAttributeNames.BACKGROUND]: val,+ });+ updateStoredBackgroundColor(val);+ }}+ />+ <NodeViewContent as="div" className="w-full break-words" />+ </NodeViewWrapper>+ );+};diff --git a/packages/editor/src/core/extensions/callout/color-selector.tsx b/packages/editor/src/core/extensions/callout/color-selector.tsxnew file mode 100644index 0000000000..489b051666--- /dev/null+++ b/packages/editor/src/core/extensions/callout/color-selector.tsx@@ -0,0 +1,75 @@+import { Ban, ChevronDown } from "lucide-react";+// constants+import { COLORS_LIST } from "@/constants/common";+// helpers+import { cn } from "@/helpers/common";++type Props = {+ disabled: boolean;+ isOpen: boolean;+ onSelect: (color: string | null) => void;+ toggleDropdown: () => void;+};++export const CalloutBlockColorSelector: React.FC<Props> = (props) => {+ const { disabled, isOpen, onSelect, toggleDropdown } = props;++ const handleColorSelect = (val: string | null) => {+ onSelect(val);+ toggleDropdown();+ };++ return (+ <div+ className={cn("opacity-0 pointer-events-none absolute top-2 right-2 z-10 transition-opacity", {+ "group-hover/callout-node:opacity-100 group-hover/callout-node:pointer-events-auto": !disabled,+ "opacity-100 pointer-events-auto": isOpen,+ })}+ contentEditable={false}+ >+ <div className="relative">+ <button+ type="button"+ onClick={(e) => {+ toggleDropdown();+ e.stopPropagation();+ }}+ className={cn(+ "flex items-center gap-1 h-full whitespace-nowrap py-1 px-2.5 text-sm font-medium text-custom-text-300 hover:bg-white/10 active:bg-custom-background-80 rounded transition-colors",+ {+ "bg-white/10": isOpen,+ }+ )}+ disabled={disabled}+ >+ <span>Color</span>+ <ChevronDown className="flex-shrink-0 size-3" />+ </button>+ {isOpen && (+ <section className="absolute top-full right-0 z-10 mt-1 rounded-md border-[0.5px] border-custom-border-300 bg-custom-background-100 p-2 shadow-custom-shadow-rg animate-in fade-in slide-in-from-top-1">+ <div className="flex items-center gap-2">+ {COLORS_LIST.map((color) => (+ <button+ key={color.key}+ type="button"+ className="flex-shrink-0 size-6 rounded border-[0.5px] border-custom-border-400 hover:opacity-60 transition-opacity"+ style={{+ backgroundColor: color.backgroundColor,+ }}+ onClick={() => handleColorSelect(color.key)}+ />+ ))}+ <button+ type="button"+ className="flex-shrink-0 size-6 grid place-items-center rounded text-custom-text-300 border-[0.5px] border-custom-border-400 hover:bg-custom-background-80 transition-colors"+ onClick={() => handleColorSelect(null)}+ >+ <Ban className="size-4" />+ </button>+ </div>+ </section>+ )}+ </div>+ </div>+ );+};diff --git a/packages/editor/src/core/extensions/callout/extension-config.ts b/packages/editor/src/core/extensions/callout/extension-config.tsnew file mode 100644index 0000000000..546311509e--- /dev/null+++ b/packages/editor/src/core/extensions/callout/extension-config.ts@@ -0,0 +1,72 @@+import { Node, mergeAttributes } from "@tiptap/core";+import { Node as NodeType } from "@tiptap/pm/model";+import { MarkdownSerializerState } from "@tiptap/pm/markdown";+// types+import { EAttributeNames, TCalloutBlockAttributes } from "./types";+// utils+import { DEFAULT_CALLOUT_BLOCK_ATTRIBUTES } from "./utils";++// Extend Tiptap's Commands interface+declare module "@tiptap/core" {+ interface Commands<ReturnType> {+ calloutComponent: {+ insertCallout: () => ReturnType;+ };+ }+}++export const CustomCalloutExtensionConfig = Node.create({+ name: "calloutComponent",+ group: "block",+ content: "block+",++ addAttributes() {+ const attributes = {+ // Reduce instead of map to accumulate the attributes directly into an object+ ...Object.values(EAttributeNames).reduce((acc, value) => {+ acc[value] = {+ default: DEFAULT_CALLOUT_BLOCK_ATTRIBUTES[value],+ };+ return acc;+ }, {}),+ };+ return attributes;+ },++ addStorage() {+ return {+ markdown: {+ serialize(state: MarkdownSerializerState, node: NodeType) {+ const attrs = node.attrs as TCalloutBlockAttributes;+ const logoInUse = attrs["data-logo-in-use"];+ // add callout logo+ if (logoInUse === "emoji") {+ state.write(+ `> <img src="${attrs["data-emoji-url"]}" alt="${attrs["data-emoji-unicode"]}" width="30px" />\n`+ );+ } else {+ state.write(`> <icon>${attrs["data-icon-name"]} icon</icon>\n`);+ }+ // add an empty line after the logo+ state.write("> \n");+ // add '> ' before each line of the callout content+ state.wrapBlock("> ", null, node, () => state.renderContent(node));+ state.closeBlock(node);+ },+ },+ };+ },++ parseHTML() {+ return [+ {+ tag: `div[${EAttributeNames.BLOCK_TYPE}="${DEFAULT_CALLOUT_BLOCK_ATTRIBUTES[EAttributeNames.BLOCK_TYPE]}"]`,+ },+ ];+ },++ // Render HTML for the callout node+ renderHTML({ HTMLAttributes }) {+ return ["div", mergeAttributes(HTMLAttributes), 0];+ },+});diff --git a/packages/editor/src/core/extensions/callout/extension.tsx b/packages/editor/src/core/extensions/callout/extension.tsxnew file mode 100644index 0000000000..a83964b376--- /dev/null+++ b/packages/editor/src/core/extensions/callout/extension.tsx@@ -0,0 +1,68 @@+import { findParentNodeClosestToPos, Predicate, ReactNodeViewRenderer } from "@tiptap/react";+// extensions+import { CustomCalloutBlock } from "@/extensions";+// helpers+import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";+// config+import { CustomCalloutExtensionConfig } from "./extension-config";+// utils+import { getStoredBackgroundColor, getStoredLogo } from "./utils";++export const CustomCalloutExtension = CustomCalloutExtensionConfig.extend({+ selectable: true,+ draggable: true,++ addCommands() {+ return {+ insertCallout:+ () =>+ ({ commands }) => {+ // get stored logo values and background color from the local storage+ const storedLogoValues = getStoredLogo();+ const storedBackgroundValue = getStoredBackgroundColor();++ return commands.insertContent({+ type: this.name,+ content: [+ {+ type: "paragraph",+ },+ ],+ attrs: {+ ...storedLogoValues,+ "data-background": storedBackgroundValue,+ },+ });+ },+ };+ },++ addKeyboardShortcuts() {+ return {+ Backspace: ({ editor }) => {+ const { $from, empty } = editor.state.selection;+ try {+ const isParentNodeCallout: Predicate = (node) => node.type === this.type;+ const parentNodeDetails = findParentNodeClosestToPos($from, isParentNodeCallout);+ // Check if selection is empty and at the beginning of the callout+ if (empty && parentNodeDetails) {+ const isCursorAtCalloutBeginning = $from.pos === parentNodeDetails.start + 1;+ if (parentNodeDetails.node.content.size > 2 && isCursorAtCalloutBeginning) {+ editor.commands.setTextSelection(parentNodeDetails.pos - 1);+ return true;+ }+ }+ } catch (error) {+ console.error("Error in performing backspace action on callout", error);+ }+ return false; // Allow the default behavior if conditions are not met+ },+ ArrowDown: insertEmptyParagraphAtNodeBoundaries("down", this.name),+ ArrowUp: insertEmptyParagraphAtNodeBoundaries("up", this.name),+ };+ },++ addNodeView() {+ return ReactNodeViewRenderer(CustomCalloutBlock);+ },+});diff --git a/packages/editor/src/core/extensions/callout/index.ts b/packages/editor/src/core/extensions/callout/index.tsnew file mode 100644index 0000000000..57915d313f--- /dev/null+++ b/packages/editor/src/core/extensions/callout/index.ts@@ -0,0 +1,3 @@+export * from "./block";+export * from "./extension";+export * from "./read-only-extension";diff --git a/packages/editor/src/core/extensions/callout/logo-selector.tsx b/packages/editor/src/core/extensions/callout/logo-selector.tsxnew file mode 100644index 0000000000..4e9f966aff--- /dev/null+++ b/packages/editor/src/core/extensions/callout/logo-selector.tsx@@ -0,0 +1,97 @@+// plane helpers+import { convertHexEmojiToDecimal } from "@plane/helpers";+// plane ui+import { EmojiIconPicker, EmojiIconPickerTypes, Logo, TEmojiLogoProps } from "@plane/ui";+// helpers+import { cn } from "@/helpers/common";+// types+import { TCalloutBlockAttributes } from "./types";+// utils+import { DEFAULT_CALLOUT_BLOCK_ATTRIBUTES, updateStoredLogo } from "./utils";++type Props = {+ blockAttributes: TCalloutBlockAttributes;+ disabled: boolean;+ handleOpen: (val: boolean) => void;+ isOpen: boolean;+ updateAttributes: (attrs: Partial<TCalloutBlockAttributes>) => void;+};++export const CalloutBlockLogoSelector: React.FC<Props> = (props) => {+ const { blockAttributes, disabled, handleOpen, isOpen, updateAttributes } = props;++ const logoValue: TEmojiLogoProps = {+ in_use: blockAttributes["data-logo-in-use"],+ icon: {+ color: blockAttributes["data-icon-color"],+ name: blockAttributes["data-icon-name"],+ },+ emoji: {+ value: blockAttributes["data-emoji-unicode"]?.toString(),+ url: blockAttributes["data-emoji-url"],+ },+ };++ return (+ <div contentEditable={false}>+ <EmojiIconPicker+ closeOnSelect={false}+ isOpen={isOpen}+ handleToggle={handleOpen}+ className="flex-shrink-0 grid place-items-center"+ buttonClassName={cn("flex-shrink-0 size-8 grid place-items-center rounded-lg", {+ "hover:bg-white/10": !disabled,+ })}+ label={<Logo logo={logoValue} size={18} type="lucide" />}+ onChange={(val) => {+ // construct the new logo value based on the type of value+ let newLogoValue: Partial<TCalloutBlockAttributes> = {};+ let newLogoValueToStoreInLocalStorage: TEmojiLogoProps = {+ in_use: "emoji",+ emoji: {+ value: DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-emoji-unicode"],+ url: DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-emoji-url"],+ },+ };+ if (val.type === "emoji") {+ newLogoValue = {+ "data-emoji-unicode": convertHexEmojiToDecimal(val.value.unified),+ "data-emoji-url": val.value.imageUrl,+ };+ newLogoValueToStoreInLocalStorage = {+ in_use: "emoji",+ emoji: {+ value: convertHexEmojiToDecimal(val.value.unified),+ url: val.value.imageUrl,+ },+ };+ } else if (val.type === "icon") {+ newLogoValue = {+ "data-icon-name": val.value.name,+ "data-icon-color": val.value.color,+ };+ newLogoValueToStoreInLocalStorage = {+ in_use: "icon",+ icon: {+ name: val.value.name,+ color: val.value.color,+ },+ };+ }+ // update node attributes+ updateAttributes({+ "data-logo-in-use": val.type,+ ...newLogoValue,+ });+ // update stored logo in local storage+ updateStoredLogo(newLogoValueToStoreInLocalStorage);+ handleOpen(false);+ }}+ defaultIconColor={logoValue?.in_use && logoValue.in_use === "icon" ? logoValue?.icon?.color : undefined}+ defaultOpen={logoValue.in_use === "emoji" ? EmojiIconPickerTypes.EMOJI : EmojiIconPickerTypes.ICON}+ disabled={disabled}+ searchDisabled+ />+ </div>+ );+};diff --git a/packages/editor/src/core/extensions/callout/read-only-extension.tsx b/packages/editor/src/core/extensions/callout/read-only-extension.tsxnew file mode 100644index 0000000000..ad7dbd50d5--- /dev/null+++ b/packages/editor/src/core/extensions/callout/read-only-extension.tsx@@ -0,0 +1,14 @@+import { ReactNodeViewRenderer } from "@tiptap/react";+// extensions+import { CustomCalloutBlock } from "@/extensions";+// config+import { CustomCalloutExtensionConfig } from "./extension-config";++export const CustomCalloutReadOnlyExtension = CustomCalloutExtensionConfig.extend({+ selectable: false,+ draggable: false,++ addNodeView() {+ return ReactNodeViewRenderer(CustomCalloutBlock);+ },+});diff --git a/packages/editor/src/core/extensions/callout/types.ts b/packages/editor/src/core/extensions/callout/types.tsnew file mode 100644index 0000000000..17c55d9e5b--- /dev/null+++ b/packages/editor/src/core/extensions/callout/types.ts@@ -0,0 +1,26 @@+export enum EAttributeNames {+ ICON_COLOR = "data-icon-color",+ ICON_NAME = "data-icon-name",+ EMOJI_UNICODE = "data-emoji-unicode",+ EMOJI_URL = "data-emoji-url",+ LOGO_IN_USE = "data-logo-in-use",+ BACKGROUND = "data-background",+ BLOCK_TYPE = "data-block-type",+}++export type TCalloutBlockIconAttributes = {+ [EAttributeNames.ICON_COLOR]: string | undefined;+ [EAttributeNames.ICON_NAME]: string | undefined;+};++export type TCalloutBlockEmojiAttributes = {+ [EAttributeNames.EMOJI_UNICODE]: string | undefined;+ [EAttributeNames.EMOJI_URL]: string | undefined;+};++export type TCalloutBlockAttributes = {+ [EAttributeNames.LOGO_IN_USE]: "emoji" | "icon";+ [EAttributeNames.BACKGROUND]: string;+ [EAttributeNames.BLOCK_TYPE]: "callout-component";+} & TCalloutBlockIconAttributes &+ TCalloutBlockEmojiAttributes;diff --git a/packages/editor/src/core/extensions/callout/utils.ts b/packages/editor/src/core/extensions/callout/utils.tsnew file mode 100644index 0000000000..c450cbdd2d--- /dev/null+++ b/packages/editor/src/core/extensions/callout/utils.ts@@ -0,0 +1,85 @@+// plane helpers+import { sanitizeHTML } from "@plane/helpers";+// plane ui+import { TEmojiLogoProps } from "@plane/ui";+// types+import {+ EAttributeNames,+ TCalloutBlockAttributes,+ TCalloutBlockEmojiAttributes,+ TCalloutBlockIconAttributes,+} from "./types";++export const DEFAULT_CALLOUT_BLOCK_ATTRIBUTES: TCalloutBlockAttributes = {+ "data-logo-in-use": "emoji",+ "data-icon-color": null,+ "data-icon-name": null,+ "data-emoji-unicode": "128161",+ "data-emoji-url": "https://cdn.jsdelivr.net/npm/emoji-datasource-apple/img/apple/64/1f4a1.png",+ "data-background": null,+ "data-block-type": "callout-component",+};++type TStoredLogoValue = Pick<TCalloutBlockAttributes, EAttributeNames.LOGO_IN_USE> &+ (TCalloutBlockEmojiAttributes | TCalloutBlockIconAttributes);++// function to get the stored logo from local storage+export const getStoredLogo = (): TStoredLogoValue => {+ const fallBackValues: TStoredLogoValue = {+ "data-logo-in-use": "emoji",+ "data-emoji-unicode": DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-emoji-unicode"],+ "data-emoji-url": DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-emoji-url"],+ };++ if (typeof window !== "undefined") {+ const storedData = sanitizeHTML(localStorage.getItem("editor-calloutComponent-logo"));+ if (storedData) {+ let parsedData: TEmojiLogoProps;+ try {+ parsedData = JSON.parse(storedData);+ } catch (error) {+ console.error(`Error parsing stored callout logo, stored value- ${storedData}`, error);+ localStorage.removeItem("editor-calloutComponent-logo");+ return fallBackValues;+ }+ if (parsedData.in_use === "emoji" && parsedData.emoji?.value) {+ return {+ "data-logo-in-use": "emoji",+ "data-emoji-unicode": parsedData.emoji.value || DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-emoji-unicode"],+ "data-emoji-url": parsedData.emoji.url || DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-emoji-url"],+ };+ }+ if (parsedData.in_use === "icon" && parsedData.icon?.name) {+ return {+ "data-logo-in-use": "icon",+ "data-icon-name": parsedData.icon.name || DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-icon-name"],+ "data-icon-color": parsedData.icon.color || DEFAULT_CALLOUT_BLOCK_ATTRIBUTES["data-icon-color"],+ };+ }+ }+ }+ // fallback values+ return fallBackValues;+};+// function to update the stored logo on local storage+export const updateStoredLogo = (value: TEmojiLogoProps): void => {+ if (typeof window === "undefined") return;+ localStorage.setItem("editor-calloutComponent-logo", JSON.stringify(value));+};+// function to get the stored background color from local storage+export const getStoredBackgroundColor = (): string | null => {+ if (typeof window !== "undefined") {+ return sanitizeHTML(localStorage.getItem("editor-calloutComponent-background"));+ }+ return null;+};+// function to update the stored background color on local storage+export const updateStoredBackgroundColor = (value: string | null): void => {+ if (typeof window === "undefined") return;+ if (value === null) {+ localStorage.removeItem("editor-calloutComponent-background");+ return;+ } else {+ localStorage.setItem("editor-calloutComponent-background", value);+ }+};diff --git a/packages/editor/src/core/extensions/core-without-props.ts b/packages/editor/src/core/extensions/core-without-props.tsindex b1d53aa34a..075d90f2df 100644--- a/packages/editor/src/core/extensions/core-without-props.ts+++ b/packages/editor/src/core/extensions/core-without-props.ts@@ -1,4 +1,3 @@-import { Extensions } from "@tiptap/core";import TaskItem from "@tiptap/extension-task-item";import TaskList from "@tiptap/extension-task-list";import TextStyle from "@tiptap/extension-text-style";@@ -18,10 +17,10 @@ import { CustomMentionWithoutProps } from "./mentions/mentions-without-props";import { CustomQuoteExtension } from "./quote";import { TableHeader, TableCell, TableRow, Table } from "./table";import { CustomTextAlignExtension } from "./text-align";+import { CustomCalloutExtensionConfig } from "./callout/extension-config";import { CustomColorExtension } from "./custom-color";-import { CoreEditorAdditionalExtensionsWithoutProps } from "@/plane-editor/extensions/core/without-props";-export const CoreEditorExtensionsWithoutProps: Extensions = [+export const CoreEditorExtensionsWithoutProps = [StarterKit.configure({bulletList: {HTMLAttributes: {@@ -88,8 +87,8 @@ export const CoreEditorExtensionsWithoutProps: Extensions = [TableRow,CustomMentionWithoutProps(),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 96e90a5255..959d20e2ba 100644--- a/packages/editor/src/core/extensions/extensions.tsx+++ b/packages/editor/src/core/extensions/extensions.tsx@@ -1,4 +1,3 @@-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";@@ -9,6 +8,7 @@ import StarterKit from "@tiptap/starter-kit";import { Markdown } from "tiptap-markdown";// extensionsimport {+ CustomCalloutExtension,CustomCodeBlockExtension,CustomCodeInlineExtension,CustomCodeMarkPlugin,@@ -33,8 +33,6 @@ import {import { isValidHttpUrl } from "@/helpers/common";// typesimport { IMentionHighlight, IMentionSuggestion, TFileHandler } from "@/types";-// plane editor extensions-import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";type TArguments = {enableHistory: boolean;@@ -47,7 +45,7 @@ type TArguments = {tabIndex?: number;};-export const CoreEditorExtensions = (args: TArguments): Extensions => {+export const CoreEditorExtensions = (args: TArguments) => {const { enableHistory, fileHandler, mentionConfig, placeholder, tabIndex } = args;return [@@ -162,7 +160,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {}),CharacterCount,CustomTextAlignExtension,+ CustomCalloutExtension,CustomColorExtension,- ...CoreEditorAdditionalExtensions(),];};diff --git a/packages/editor/src/core/extensions/index.ts b/packages/editor/src/core/extensions/index.tsindex 5821b5ff53..d1fa0ce6db 100644--- a/packages/editor/src/core/extensions/index.ts+++ b/packages/editor/src/core/extensions/index.ts@@ -1,3 +1,4 @@+export * from "./callout";export * from "./code";export * from "./code-inline";export * from "./custom-image";diff --git a/packages/editor/src/core/extensions/read-only-extensions.tsx b/packages/editor/src/core/extensions/read-only-extensions.tsxindex 1eb0e85225..2d90592d68 100644--- a/packages/editor/src/core/extensions/read-only-extensions.tsx+++ b/packages/editor/src/core/extensions/read-only-extensions.tsx@@ -1,4 +1,3 @@-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";@@ -23,14 +22,13 @@ import {HeadingListExtension,CustomReadOnlyImageExtension,CustomTextAlignExtension,+ CustomCalloutReadOnlyExtension,CustomColorExtension,} from "@/extensions";// helpersimport { isValidHttpUrl } from "@/helpers/common";// typesimport { IMentionHighlight, TFileHandler } from "@/types";-// plane editor extensions-import { CoreReadOnlyEditorAdditionalExtensions } from "@/plane-editor/extensions";type Props = {fileHandler: Pick<TFileHandler, "getAssetSrc">;@@ -39,7 +37,7 @@ type Props = {};};-export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {+export const CoreReadOnlyEditorExtensions = (props: Props) => {const { fileHandler, mentionConfig } = props;return [@@ -129,6 +127,6 @@ export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {CustomColorExtension,HeadingListExtension,CustomTextAlignExtension,- ...CoreReadOnlyEditorAdditionalExtensions(),+ CustomCalloutReadOnlyExtension,];};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 d3fc807d02..c19bda3068 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@@ -12,6 +12,7 @@ import {List,ListOrdered,ListTodo,+ MessageSquareText,MinusSquare,Table,TextQuote,@@ -34,20 +35,20 @@ import {toggleTextColor,toggleBackgroundColor,insertImage,+ insertCallout,setText,} from "@/helpers/editor-commands";// types-import { CommandProps, ISlashCommandItem, TSlashCommandSectionKeys } from "@/types";-import { TSlashCommandAdditionalOption } from "./root";+import { CommandProps, ISlashCommandItem } from "@/types";export type TSlashCommandSection = {- key: TSlashCommandSectionKeys;+ key: string;title?: string;items: ISlashCommandItem[];};export const getSlashCommandFilteredSections =- (additionalOptions?: TSlashCommandAdditionalOption[]) =>+ (additionalOptions?: ISlashCommandItem[]) =>({ query }: { query: string }): TSlashCommandSection[] => {const SLASH_COMMAND_SECTIONS: TSlashCommandSection[] = [{@@ -179,6 +180,15 @@ export const getSlashCommandFilteredSections =searchTerms: ["img", "photo", "picture", "media", "upload"],command: ({ editor, range }: CommandProps) => insertImage({ editor, event: "insert", range }),},+ {+ commandKey: "callout",+ key: "callout",+ title: "Callout",+ icon: <MessageSquareText className="size-3.5" />,+ description: "Insert callout",+ searchTerms: ["callout", "comment", "message", "info", "alert"],+ command: ({ editor, range }: CommandProps) => insertCallout(editor, range),+ },{commandKey: "divider",key: "divider",@@ -191,7 +201,7 @@ export const getSlashCommandFilteredSections =],},{- key: "text-colors",+ key: "text-color",title: "Colors",items: [{@@ -232,7 +242,7 @@ export const getSlashCommandFilteredSections =],},{- key: "background-colors",+ key: "background-color",title: "Background colors",items: [{@@ -269,18 +279,8 @@ export const getSlashCommandFilteredSections =},];- additionalOptions?.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 !== undefined) {- const resolvedIndex =- itemIndexToPushAfter + 1 < sectionToPushTo.items.length- ? itemIndexToPushAfter + 1- : sectionToPushTo.items.length - 1;- sectionToPushTo.items.splice(resolvedIndex, 0, item);- } else {- sectionToPushTo.items.push(item);- }+ additionalOptions?.map((item) => {+ SLASH_COMMAND_SECTIONS?.[0]?.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 afe670d8fe..a99cbc5f90 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, TEditorCommands, TSlashCommandSectionKeys } from "@/types";+import { ISlashCommandItem } from "@/types";// componentsimport { getSlashCommandFilteredSections } from "./command-items-list";import { SlashCommandsMenu, SlashCommandsMenuProps } from "./command-menu";@@ -12,11 +12,6 @@ export type SlashCommandOptions = {suggestion: Omit<SuggestionOptions, "editor">;};-export type TSlashCommandAdditionalOption = ISlashCommandItem & {- section: TSlashCommandSectionKeys;- pushAfter: TEditorCommands;-};-const Command = Extension.create<SlashCommandOptions>({name: "slash-command",addOptions() {@@ -107,7 +102,7 @@ const renderItems = () => {};};-export const SlashCommands = (additionalOptions?: TSlashCommandAdditionalOption[]) =>+export const SlashCommands = (additionalOptions?: ISlashCommandItem[]) =>Command.configure({suggestion: {items: getSlashCommandFilteredSections(additionalOptions),diff --git a/packages/editor/src/core/helpers/editor-commands.ts b/packages/editor/src/core/helpers/editor-commands.tsindex 8b59360a9a..ec593d5367 100644--- a/packages/editor/src/core/helpers/editor-commands.ts+++ b/packages/editor/src/core/helpers/editor-commands.ts@@ -189,3 +189,7 @@ export const insertHorizontalRule = (editor: Editor, range?: Range) => {if (range) editor.chain().focus().deleteRange(range).setHorizontalRule().run();else editor.chain().focus().setHorizontalRule().run();};+export const insertCallout = (editor: Editor, range?: Range) => {+ if (range) editor.chain().focus().deleteRange(range).insertCallout().run();+ else editor.chain().focus().insertCallout().run();+};diff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.tsindex b3f9a5c6ec..53aae1f265 100644--- a/packages/editor/src/core/types/editor.ts+++ b/packages/editor/src/core/types/editor.ts@@ -14,8 +14,6 @@ import {TServerHandler,} from "@/types";import { TTextAlign } from "@/extensions";-// plane editor types-import { TEditorAdditionalCommands } from "@/plane-editor/types";export type TEditorCommands =| "text"@@ -41,7 +39,7 @@ export type TEditorCommands =| "text-color"| "background-color"| "text-align"- | TEditorAdditionalCommands;+ | "callout";export type TCommandExtraProps = {image: {@@ -123,7 +121,7 @@ export interface IEditorProps {onEnterKeyPress?: (e?: any) => void;placeholder?: string | ((isFocused: boolean, value: string) => string);tabIndex?: number;- value?: string | null;+ value?: string | null;}export interface ILiteTextEditor extends IEditorProps {extensions?: any[];diff --git a/packages/editor/src/core/types/slash-commands-suggestion.ts b/packages/editor/src/core/types/slash-commands-suggestion.tsindex d6dfae076f..91c93203af 100644--- a/packages/editor/src/core/types/slash-commands-suggestion.ts+++ b/packages/editor/src/core/types/slash-commands-suggestion.ts@@ -8,8 +8,6 @@ export type CommandProps = {range: Range;};-export type TSlashCommandSectionKeys = "general" | "text-colors" | "background-colors";-export type ISlashCommandItem = {commandKey: TEditorCommands;key: string;