π₯π₯π₯ 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
[PULSE-42] feat: text alignment for all editors (#5847)
Aaryan Khandelwalb4de055463e8
diff --git a/packages/editor/package.json b/packages/editor/package.jsonindex c52c630c8c..067be0145d 100644--- a/packages/editor/package.json+++ b/packages/editor/package.json@@ -48,6 +48,7 @@"@tiptap/extension-placeholder": "^2.3.0","@tiptap/extension-task-item": "^2.1.13","@tiptap/extension-task-list": "^2.1.13",+ "@tiptap/extension-text-align": "^2.8.0","@tiptap/extension-text-style": "^2.7.1","@tiptap/extension-underline": "^2.1.13","@tiptap/pm": "^2.1.13",diff --git a/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsxnew file mode 100644index 0000000000..e3ccc6cf62--- /dev/null+++ b/packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsx@@ -0,0 +1,91 @@+import { Editor } from "@tiptap/core";+import { AlignCenter, AlignLeft, AlignRight, LucideIcon } from "lucide-react";+// components+import { TextAlignItem } from "@/components/menus";+// helpers+import { cn } from "@/helpers/common";+// types+import { TEditorCommands } from "@/types";++type Props = {+ editor: Editor;+ onClose: () => void;+};++export const TextAlignmentSelector: React.FC<Props> = (props) => {+ const { editor, onClose } = props;++ const menuItem = TextAlignItem(editor);++ const textAlignmentOptions: {+ itemKey: TEditorCommands;+ renderKey: string;+ icon: LucideIcon;+ command: () => void;+ isActive: () => boolean;+ }[] = [+ {+ itemKey: "text-align",+ renderKey: "text-align-left",+ icon: AlignLeft,+ command: () =>+ menuItem.command({+ alignment: "left",+ }),+ isActive: () =>+ menuItem.isActive({+ alignment: "left",+ }),+ },+ {+ itemKey: "text-align",+ renderKey: "text-align-center",+ icon: AlignCenter,+ command: () =>+ menuItem.command({+ alignment: "center",+ }),+ isActive: () =>+ menuItem.isActive({+ alignment: "center",+ }),+ },+ {+ itemKey: "text-align",+ renderKey: "text-align-right",+ icon: AlignRight,+ command: () =>+ menuItem.command({+ alignment: "right",+ }),+ isActive: () =>+ menuItem.isActive({+ alignment: "right",+ }),+ },+ ];++ return (+ <div className="flex gap-0.5 px-2">+ {textAlignmentOptions.map((item) => (+ <button+ key={item.renderKey}+ type="button"+ onClick={(e) => {+ e.stopPropagation();+ item.command();+ onClose();+ }}+ className={cn(+ "size-7 grid place-items-center rounded text-custom-text-300 hover:bg-custom-background-80 active:bg-custom-background-80 transition-colors",+ {+ "bg-custom-background-80 text-custom-text-100": item.isActive(),+ }+ )}+ >+ <item.icon className="size-4" />+ </button>+ ))}+ </div>+ );+};diff --git a/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsxindex b48070775e..bc7f5a56f1 100644--- a/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx@@ -16,8 +16,8 @@ type Props = {export const BubbleMenuColorSelector: FC<Props> = (props) => {const { editor, isOpen, setIsOpen } = props;- const activeTextColor = COLORS_LIST.find((c) => TextColorItem(editor).isActive(c.key));- const activeBackgroundColor = COLORS_LIST.find((c) => BackgroundColorItem(editor).isActive(c.key));+ const activeTextColor = COLORS_LIST.find((c) => TextColorItem(editor).isActive({ color: c.key }));+ const activeBackgroundColor = COLORS_LIST.find((c) => BackgroundColorItem(editor).isActive({ color: c.key }));return (<div className="relative h-full">@@ -64,7 +64,7 @@ export const BubbleMenuColorSelector: FC<Props> = (props) => {style={{backgroundColor: color.textColor,}}- onClick={() => TextColorItem(editor).command(color.key)}+ onClick={() => TextColorItem(editor).command({ color: color.key })}/>))}<button@@ -87,7 +87,7 @@ export const BubbleMenuColorSelector: FC<Props> = (props) => {style={{backgroundColor: color.backgroundColor,}}- onClick={() => BackgroundColorItem(editor).command(color.key)}+ onClick={() => BackgroundColorItem(editor).command({ color: color.key })}/>))}<buttondiff --git a/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsx b/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsxindex 436239fca4..a121c48ef1 100644--- a/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/node-selector.tsx@@ -19,6 +19,8 @@ import {} from "@/components/menus";// helpersimport { cn } from "@/helpers/common";+// types+import { TEditorCommands } from "@/types";type Props = {editor: Editor;@@ -29,7 +31,7 @@ type Props = {export const BubbleMenuNodeSelector: FC<Props> = (props) => {const { editor, isOpen, setIsOpen } = props;- const items: EditorMenuItem[] = [+ const items: EditorMenuItem<TEditorCommands>[] = [TextItem(editor),HeadingOneItem(editor),HeadingTwoItem(editor),@@ -44,7 +46,7 @@ export const BubbleMenuNodeSelector: FC<Props> = (props) => {CodeItem(editor),];- const activeItem = items.filter((item) => item.isActive("")).pop() ?? {+ const activeItem = items.filter((item) => item.isActive()).pop() ?? {name: "Multiple",};diff --git a/packages/editor/src/core/components/menus/bubble-menu/root.tsx b/packages/editor/src/core/components/menus/bubble-menu/root.tsxindex 0f789dd8a1..18079f089e 100644--- a/packages/editor/src/core/components/menus/bubble-menu/root.tsx+++ b/packages/editor/src/core/components/menus/bubble-menu/root.tsx@@ -1,5 +1,5 @@import { FC, useEffect, useState } from "react";-import { BubbleMenu, BubbleMenuProps, isNodeSelection } from "@tiptap/react";+import { BubbleMenu, BubbleMenuProps, Editor, isNodeSelection } from "@tiptap/react";// componentsimport {BoldItem,@@ -7,7 +7,6 @@ import {BubbleMenuLinkSelector,BubbleMenuNodeSelector,CodeItem,- EditorMenuItem,ItalicItem,StrikeThroughItem,UnderLineItem,@@ -16,6 +15,8 @@ import {import { isCellSelection } from "@/extensions/table/table/utilities/is-cell-selection";// helpersimport { cn } from "@/helpers/common";+// local components+import { TextAlignmentSelector } from "./alignment-selector";type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children">;@@ -26,7 +27,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {const [isColorSelectorOpen, setIsColorSelectorOpen] = useState(false);const [isSelecting, setIsSelecting] = useState(false);- const items: EditorMenuItem[] = props.editor.isActive("code")+ const basicFormattingOptions = props.editor.isActive("code")? [CodeItem(props.editor)]: [BoldItem(props.editor), ItalicItem(props.editor), UnderLineItem(props.editor), StrikeThroughItem(props.editor)];@@ -132,7 +133,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {)}</div><div className="flex gap-0.5 px-2">- {items.map((item) => (+ {basicFormattingOptions.map((item) => (<buttonkey={item.key}type="button"@@ -151,6 +152,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {</button>))}</div>+ <TextAlignmentSelector+ editor={props.editor}+ onClose={() => {+ const editor = props.editor as Editor;+ if (!editor) return;+ const pos = editor.state.selection.to;+ editor.commands.setTextSelection(pos ?? 0);+ }}+ /></>)}</BubbleMenu>diff --git a/packages/editor/src/core/components/menus/menu-items.ts b/packages/editor/src/core/components/menus/menu-items.tsindex 0ece455ed2..5e987fca6d 100644--- a/packages/editor/src/core/components/menus/menu-items.ts+++ b/packages/editor/src/core/components/menus/menu-items.ts@@ -1,4 +1,3 @@-import { Selection } from "@tiptap/pm/state";import { Editor } from "@tiptap/react";import {BoldIcon,@@ -22,6 +21,7 @@ import {LucideIcon,MinusSquare,Palette,+ AlignCenter,} from "lucide-react";// helpersimport {@@ -29,6 +29,7 @@ import {insertImage,insertTableCommand,setText,+ setTextAlign,toggleBackgroundColor,toggleBlockquote,toggleBold,@@ -48,24 +49,20 @@ import {toggleUnderline,} from "@/helpers/editor-commands";// types-import { TColorEditorCommands, TNonColorEditorCommands } from "@/types";+import { TCommandWithProps, TEditorCommands } from "@/types";-export type EditorMenuItem = {+type isActiveFunction<T extends TEditorCommands> = (params?: TCommandWithProps<T>) => boolean;+type commandFunction<T extends TEditorCommands> = (params?: TCommandWithProps<T>) => void;++export type EditorMenuItem<T extends TEditorCommands> = {+ key: T;name: string;- command: (...args: any) => void;+ command: commandFunction<T>;icon: LucideIcon;-} & (- | {- key: TNonColorEditorCommands;- isActive: () => boolean;- }- | {- key: TColorEditorCommands;- isActive: (color: string | undefined) => boolean;- }-);+ isActive: isActiveFunction<T>;+};-export const TextItem = (editor: Editor): EditorMenuItem => ({+export const TextItem = (editor: Editor): EditorMenuItem<"text"> => ({key: "text",name: "Text",isActive: () => editor.isActive("paragraph"),@@ -73,7 +70,7 @@ export const TextItem = (editor: Editor): EditorMenuItem => ({icon: CaseSensitive,});-export const HeadingOneItem = (editor: Editor): EditorMenuItem => ({+export const HeadingOneItem = (editor: Editor): EditorMenuItem<"h1"> => ({key: "h1",name: "Heading 1",isActive: () => editor.isActive("heading", { level: 1 }),@@ -81,7 +78,7 @@ export const HeadingOneItem = (editor: Editor): EditorMenuItem => ({icon: Heading1,});-export const HeadingTwoItem = (editor: Editor): EditorMenuItem => ({+export const HeadingTwoItem = (editor: Editor): EditorMenuItem<"h2"> => ({key: "h2",name: "Heading 2",isActive: () => editor.isActive("heading", { level: 2 }),@@ -89,7 +86,7 @@ export const HeadingTwoItem = (editor: Editor): EditorMenuItem => ({icon: Heading2,});-export const HeadingThreeItem = (editor: Editor): EditorMenuItem => ({+export const HeadingThreeItem = (editor: Editor): EditorMenuItem<"h3"> => ({key: "h3",name: "Heading 3",isActive: () => editor.isActive("heading", { level: 3 }),@@ -97,7 +94,7 @@ export const HeadingThreeItem = (editor: Editor): EditorMenuItem => ({icon: Heading3,});-export const HeadingFourItem = (editor: Editor): EditorMenuItem => ({+export const HeadingFourItem = (editor: Editor): EditorMenuItem<"h4"> => ({key: "h4",name: "Heading 4",isActive: () => editor.isActive("heading", { level: 4 }),@@ -105,7 +102,7 @@ export const HeadingFourItem = (editor: Editor): EditorMenuItem => ({icon: Heading4,});-export const HeadingFiveItem = (editor: Editor): EditorMenuItem => ({+export const HeadingFiveItem = (editor: Editor): EditorMenuItem<"h5"> => ({key: "h5",name: "Heading 5",isActive: () => editor.isActive("heading", { level: 5 }),@@ -113,7 +110,7 @@ export const HeadingFiveItem = (editor: Editor): EditorMenuItem => ({icon: Heading5,});-export const HeadingSixItem = (editor: Editor): EditorMenuItem => ({+export const HeadingSixItem = (editor: Editor): EditorMenuItem<"h6"> => ({key: "h6",name: "Heading 6",isActive: () => editor.isActive("heading", { level: 6 }),@@ -121,7 +118,7 @@ export const HeadingSixItem = (editor: Editor): EditorMenuItem => ({icon: Heading6,});-export const BoldItem = (editor: Editor): EditorMenuItem => ({+export const BoldItem = (editor: Editor): EditorMenuItem<"bold"> => ({key: "bold",name: "Bold",isActive: () => editor?.isActive("bold"),@@ -129,7 +126,7 @@ export const BoldItem = (editor: Editor): EditorMenuItem => ({icon: BoldIcon,});-export const ItalicItem = (editor: Editor): EditorMenuItem => ({+export const ItalicItem = (editor: Editor): EditorMenuItem<"italic"> => ({key: "italic",name: "Italic",isActive: () => editor?.isActive("italic"),@@ -137,7 +134,7 @@ export const ItalicItem = (editor: Editor): EditorMenuItem => ({icon: ItalicIcon,});-export const UnderLineItem = (editor: Editor): EditorMenuItem => ({+export const UnderLineItem = (editor: Editor): EditorMenuItem<"underline"> => ({key: "underline",name: "Underline",isActive: () => editor?.isActive("underline"),@@ -145,7 +142,7 @@ export const UnderLineItem = (editor: Editor): EditorMenuItem => ({icon: UnderlineIcon,});-export const StrikeThroughItem = (editor: Editor): EditorMenuItem => ({+export const StrikeThroughItem = (editor: Editor): EditorMenuItem<"strikethrough"> => ({key: "strikethrough",name: "Strikethrough",isActive: () => editor?.isActive("strike"),@@ -153,7 +150,7 @@ export const StrikeThroughItem = (editor: Editor): EditorMenuItem => ({icon: StrikethroughIcon,});-export const BulletListItem = (editor: Editor): EditorMenuItem => ({+export const BulletListItem = (editor: Editor): EditorMenuItem<"bulleted-list"> => ({key: "bulleted-list",name: "Bulleted list",isActive: () => editor?.isActive("bulletList"),@@ -161,7 +158,7 @@ export const BulletListItem = (editor: Editor): EditorMenuItem => ({icon: ListIcon,});-export const NumberedListItem = (editor: Editor): EditorMenuItem => ({+export const NumberedListItem = (editor: Editor): EditorMenuItem<"numbered-list"> => ({key: "numbered-list",name: "Numbered list",isActive: () => editor?.isActive("orderedList"),@@ -169,7 +166,7 @@ export const NumberedListItem = (editor: Editor): EditorMenuItem => ({icon: ListOrderedIcon,});-export const TodoListItem = (editor: Editor): EditorMenuItem => ({+export const TodoListItem = (editor: Editor): EditorMenuItem<"to-do-list"> => ({key: "to-do-list",name: "To-do list",isActive: () => editor.isActive("taskItem"),@@ -177,7 +174,7 @@ export const TodoListItem = (editor: Editor): EditorMenuItem => ({icon: CheckSquare,});-export const QuoteItem = (editor: Editor): EditorMenuItem => ({+export const QuoteItem = (editor: Editor): EditorMenuItem<"quote"> => ({key: "quote",name: "Quote",isActive: () => editor?.isActive("blockquote"),@@ -185,7 +182,7 @@ export const QuoteItem = (editor: Editor): EditorMenuItem => ({icon: TextQuote,});-export const CodeItem = (editor: Editor): EditorMenuItem => ({+export const CodeItem = (editor: Editor): EditorMenuItem<"code"> => ({key: "code",name: "Code",isActive: () => editor?.isActive("code") || editor?.isActive("codeBlock"),@@ -193,7 +190,7 @@ export const CodeItem = (editor: Editor): EditorMenuItem => ({icon: CodeIcon,});-export const TableItem = (editor: Editor): EditorMenuItem => ({+export const TableItem = (editor: Editor): EditorMenuItem<"table"> => ({key: "table",name: "Table",isActive: () => editor?.isActive("table"),@@ -201,14 +198,14 @@ export const TableItem = (editor: Editor): EditorMenuItem => ({icon: TableIcon,});-export const ImageItem = (editor: Editor) =>- ({- key: "image",- name: "Image",- isActive: () => editor?.isActive("image") || editor?.isActive("imageComponent"),- command: (savedSelection: Selection | null) => insertImage({ editor, event: "insert", pos: savedSelection?.from }),- icon: ImageIcon,- }) as const;+export const ImageItem = (editor: Editor): EditorMenuItem<"image"> => ({+ key: "image",+ name: "Image",+ isActive: () => editor?.isActive("image") || editor?.isActive("imageComponent"),+ command: ({ savedSelection }) =>+ insertImage({ editor, event: "insert", pos: savedSelection?.from ?? editor.state.selection.from }),+ icon: ImageIcon,+});export const HorizontalRuleItem = (editor: Editor) =>({@@ -219,23 +216,31 @@ export const HorizontalRuleItem = (editor: Editor) =>icon: MinusSquare,}) as const;-export const TextColorItem = (editor: Editor): EditorMenuItem => ({+export const TextColorItem = (editor: Editor): EditorMenuItem<"text-color"> => ({key: "text-color",name: "Color",- isActive: (color) => editor.isActive("customColor", { color }),- command: (color: string) => toggleTextColor(color, editor),+ isActive: ({ color }) => editor.isActive("customColor", { color }),+ command: ({ color }) => toggleTextColor(color, editor),icon: Palette,});-export const BackgroundColorItem = (editor: Editor): EditorMenuItem => ({+export const BackgroundColorItem = (editor: Editor): EditorMenuItem<"background-color"> => ({key: "background-color",name: "Background color",- isActive: (color) => editor.isActive("customColor", { backgroundColor: color }),- command: (color: string) => toggleBackgroundColor(color, editor),+ isActive: ({ color }) => editor.isActive("customColor", { backgroundColor: color }),+ command: ({ color }) => toggleBackgroundColor(color, editor),icon: Palette,});-export const getEditorMenuItems = (editor: Editor | null): EditorMenuItem[] => {+export const TextAlignItem = (editor: Editor): EditorMenuItem<"text-align"> => ({+ key: "text-align",+ name: "Text align",+ isActive: ({ alignment }) => editor.isActive({ textAlign: alignment }),+ command: ({ alignment }) => setTextAlign(alignment, editor),+ icon: AlignCenter,+});++export const getEditorMenuItems = (editor: Editor | null): EditorMenuItem<TEditorCommands>[] => {if (!editor) return [];return [@@ -260,5 +265,6 @@ export const getEditorMenuItems = (editor: Editor | null): EditorMenuItem[] => {HorizontalRuleItem(editor),TextColorItem(editor),BackgroundColorItem(editor),+ TextAlignItem(editor),];};diff --git a/packages/editor/src/core/extensions/core-without-props.ts b/packages/editor/src/core/extensions/core-without-props.tsindex 39a243f88a..abceea4ff5 100644--- a/packages/editor/src/core/extensions/core-without-props.ts+++ b/packages/editor/src/core/extensions/core-without-props.ts@@ -16,6 +16,7 @@ import { IssueWidgetWithoutProps } from "./issue-embed/issue-embed-without-propsimport { 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";@@ -85,6 +86,7 @@ export const CoreEditorExtensionsWithoutProps = [TableCell,TableRow,CustomMentionWithoutProps(),+ CustomTextAlignExtension,CustomCalloutExtensionConfig,CustomColorExtension,];diff --git a/packages/editor/src/core/extensions/extensions.tsx b/packages/editor/src/core/extensions/extensions.tsxindex 24a372b4aa..3907e3b9d2 100644--- a/packages/editor/src/core/extensions/extensions.tsx+++ b/packages/editor/src/core/extensions/extensions.tsx@@ -19,6 +19,7 @@ import {CustomLinkExtension,CustomMention,CustomQuoteExtension,+ CustomTextAlignExtension,CustomTypographyExtension,DropHandlerExtension,ImageExtension,@@ -158,6 +159,7 @@ export const CoreEditorExtensions = (args: TArguments) => {includeChildren: true,}),CharacterCount,+ CustomTextAlignExtension,CustomCalloutExtension,CustomColorExtension,];diff --git a/packages/editor/src/core/extensions/index.ts b/packages/editor/src/core/extensions/index.tsindex dbd529d8c1..d1fa0ce6db 100644--- a/packages/editor/src/core/extensions/index.ts+++ b/packages/editor/src/core/extensions/index.ts@@ -16,10 +16,10 @@ export * from "./custom-color";export * from "./drop";export * from "./enter-key-extension";export * from "./extensions";+export * from "./headers";export * from "./horizontal-rule";export * from "./keymap";export * from "./quote";export * from "./read-only-extensions";export * from "./side-menu";-export * from "./slash-commands";-export * from "./headers";+export * from "./text-align";diff --git a/packages/editor/src/core/extensions/read-only-extensions.tsx b/packages/editor/src/core/extensions/read-only-extensions.tsxindex 096cefbae6..31ae1d90a1 100644--- a/packages/editor/src/core/extensions/read-only-extensions.tsx+++ b/packages/editor/src/core/extensions/read-only-extensions.tsx@@ -21,6 +21,7 @@ import {CustomMention,HeadingListExtension,CustomReadOnlyImageExtension,+ CustomTextAlignExtension,CustomCalloutReadOnlyExtension,CustomColorExtension,} from "@/extensions";@@ -125,6 +126,7 @@ export const CoreReadOnlyEditorExtensions = (props: Props) => {CharacterCount,CustomColorExtension,HeadingListExtension,+ CustomTextAlignExtension,CustomCalloutReadOnlyExtension,];};diff --git a/packages/editor/src/core/extensions/slash-commands/command-menu.tsx b/packages/editor/src/core/extensions/slash-commands/command-menu.tsxindex c6363bc51c..d6148b69ae 100644--- a/packages/editor/src/core/extensions/slash-commands/command-menu.tsx+++ b/packages/editor/src/core/extensions/slash-commands/command-menu.tsx@@ -3,12 +3,12 @@ import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "reactimport { TSlashCommandSection } from "./command-items-list";import { CommandMenuItem } from "./command-menu-item";-type Props = {+export type SlashCommandsMenuProps = {items: TSlashCommandSection[];command: any;};-export const SlashCommandsMenu = (props: Props) => {+export const SlashCommandsMenu = (props: SlashCommandsMenuProps) => {const { items: sections, command } = props;// statesconst [selectedIndex, setSelectedIndex] = useState({diff --git a/packages/editor/src/core/extensions/slash-commands/root.tsx b/packages/editor/src/core/extensions/slash-commands/root.tsxindex df70820dcf..a99cbc5f90 100644--- a/packages/editor/src/core/extensions/slash-commands/root.tsx+++ b/packages/editor/src/core/extensions/slash-commands/root.tsx@@ -6,7 +6,7 @@ import tippy from "tippy.js";import { ISlashCommandItem } from "@/types";// componentsimport { getSlashCommandFilteredSections } from "./command-items-list";-import { SlashCommandsMenu } from "./command-menu";+import { SlashCommandsMenu, SlashCommandsMenuProps } from "./command-menu";export type SlashCommandOptions = {suggestion: Omit<SuggestionOptions, "editor">;@@ -55,7 +55,7 @@ interface CommandListInstance {}const renderItems = () => {- let component: ReactRenderer<CommandListInstance, typeof SlashCommandsMenu> | null = null;+ let component: ReactRenderer<CommandListInstance, SlashCommandsMenuProps> | null = null;let popup: any | null = null;return {onStart: (props: { editor: Editor; clientRect?: (() => DOMRect | null) | null }) => {diff --git a/packages/editor/src/core/extensions/text-align.ts b/packages/editor/src/core/extensions/text-align.tsnew file mode 100644index 0000000000..bfe62f6c04--- /dev/null+++ b/packages/editor/src/core/extensions/text-align.ts@@ -0,0 +1,8 @@+import TextAlign from "@tiptap/extension-text-align";++export type TTextAlign = "left" | "center" | "right";++export const CustomTextAlignExtension = TextAlign.configure({+ alignments: ["left", "center", "right"],+ types: ["heading", "paragraph"],+});diff --git a/packages/editor/src/core/helpers/editor-commands.ts b/packages/editor/src/core/helpers/editor-commands.tsindex efa19e3876..ec593d5367 100644--- a/packages/editor/src/core/helpers/editor-commands.ts+++ b/packages/editor/src/core/helpers/editor-commands.ts@@ -181,10 +181,14 @@ export const toggleBackgroundColor = (color: string | undefined, editor: Editor,}};+export const setTextAlign = (alignment: string, editor: Editor) => {+ editor.chain().focus().setTextAlign(alignment).run();+};+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/hooks/use-editor.ts b/packages/editor/src/core/hooks/use-editor.tsindex 67d7799660..eef72797ce 100644--- a/packages/editor/src/core/hooks/use-editor.ts+++ b/packages/editor/src/core/hooks/use-editor.ts@@ -6,7 +6,7 @@ import { EditorProps } from "@tiptap/pm/view";import { useEditor as useTiptapEditor, Editor } from "@tiptap/react";import * as Y from "yjs";// components-import { getEditorMenuItems } from "@/components/menus";+import { EditorMenuItem, getEditorMenuItems } from "@/components/menus";// extensionsimport { CoreEditorExtensions } from "@/extensions";// helpers@@ -155,11 +155,11 @@ export const useEditor = (props: CustomEditorProps) => {const item = getEditorMenuItem(itemKey);if (item) {if (item.key === "image") {- item.command(savedSelectionRef.current);- } else if (itemKey === "text-color" || itemKey === "background-color") {- item.command(props.color);+ (item as EditorMenuItem<"image">).command({+ savedSelection: savedSelectionRef.current,+ });} else {- item.command();+ item.command(props);}} else {console.warn(`No command found for item: ${itemKey}`);@@ -173,11 +173,7 @@ export const useEditor = (props: CustomEditorProps) => {const item = getEditorMenuItem(itemKey);if (!item) return false;- if (itemKey === "text-color" || itemKey === "background-color") {- return item.isActive(props.color);- } else {- return item.isActive("");- }+ return item.isActive(props);},onHeadingChange: (callback: (headings: IMarking[]) => void) => {// Subscribe to update event emitted from headers extensiondiff --git a/packages/editor/src/core/types/editor.ts b/packages/editor/src/core/types/editor.tsindex 97f22e7723..53aae1f265 100644--- a/packages/editor/src/core/types/editor.ts+++ b/packages/editor/src/core/types/editor.ts@@ -1,4 +1,5 @@import { JSONContent } from "@tiptap/core";+import { Selection } from "@tiptap/pm/state";// helpersimport { IMarking } from "@/helpers/scroll-to-node";// types@@ -6,14 +7,64 @@ import {IMentionHighlight,IMentionSuggestion,TAIHandler,- TColorEditorCommands,TDisplayConfig,TEmbedConfig,TExtensions,TFileHandler,- TNonColorEditorCommands,TServerHandler,} from "@/types";+import { TTextAlign } from "@/extensions";++export type TEditorCommands =+ | "text"+ | "h1"+ | "h2"+ | "h3"+ | "h4"+ | "h5"+ | "h6"+ | "bold"+ | "italic"+ | "underline"+ | "strikethrough"+ | "bulleted-list"+ | "numbered-list"+ | "to-do-list"+ | "quote"+ | "code"+ | "table"+ | "image"+ | "divider"+ | "issue-embed"+ | "text-color"+ | "background-color"+ | "text-align"+ | "callout";++export type TCommandExtraProps = {+ image: {+ savedSelection: Selection | null;+ };+ "text-color": {+ color: string | undefined;+ };+ "background-color": {+ color: string | undefined;+ };+ "text-align": {+ alignment: TTextAlign;+ };+};++// Create a utility type that maps a command to its extra props or an empty object if none are defined+export type TCommandWithProps<T extends TEditorCommands> = T extends keyof TCommandExtraProps+ ? TCommandExtraProps[T] // If the command has extra props, include them+ : object; // Otherwise, just return the command type with no extra props++type TCommandWithPropsWithItemKey<T extends TEditorCommands> = T extends keyof TCommandExtraProps+ ? { itemKey: T } & TCommandExtraProps[T]+ : { itemKey: T };+// editor refsexport type EditorReadOnlyRefApi = {getMarkDown: () => string;@@ -39,26 +90,8 @@ export interface EditorRefApi extends EditorReadOnlyRefApi {scrollToNodeViaDOMCoordinates: (behavior?: ScrollBehavior, position?: number) => void;getCurrentCursorPosition: () => number | undefined;setEditorValueAtCursorPosition: (content: string) => void;- executeMenuItemCommand: (- props:- | {- itemKey: TNonColorEditorCommands;- }- | {- itemKey: TColorEditorCommands;- color: string | undefined;- }- ) => void;- isMenuItemActive: (- props:- | {- itemKey: TNonColorEditorCommands;- }- | {- itemKey: TColorEditorCommands;- color: string | undefined;- }- ) => boolean;+ executeMenuItemCommand: <T extends TEditorCommands>(props: TCommandWithPropsWithItemKey<T>) => void;+ isMenuItemActive: <T extends TEditorCommands>(props: TCommandWithPropsWithItemKey<T>) => boolean;onStateChange: (callback: () => void) => () => void;setFocusAtPosition: (position: number) => void;isEditorReadyToDiscard: () => boolean;diff --git a/packages/editor/src/core/types/slash-commands-suggestion.ts b/packages/editor/src/core/types/slash-commands-suggestion.tsindex 122231111e..91c93203af 100644--- a/packages/editor/src/core/types/slash-commands-suggestion.ts+++ b/packages/editor/src/core/types/slash-commands-suggestion.ts@@ -1,33 +1,7 @@import { CSSProperties } from "react";import { Editor, Range } from "@tiptap/core";--export type TEditorCommands =- | "text"- | "h1"- | "h2"- | "h3"- | "h4"- | "h5"- | "h6"- | "bold"- | "italic"- | "underline"- | "strikethrough"- | "bulleted-list"- | "numbered-list"- | "to-do-list"- | "quote"- | "code"- | "table"- | "image"- | "divider"- | "issue-embed"- | "text-color"- | "background-color"- | "callout";--export type TColorEditorCommands = Extract<TEditorCommands, "text-color" | "background-color">;-export type TNonColorEditorCommands = Exclude<TEditorCommands, "text-color" | "background-color">;+// types+import { TEditorCommands } from "@/types";export type CommandProps = {editor: Editor;diff --git a/space/core/components/editor/lite-text-editor.tsx b/space/core/components/editor/lite-text-editor.tsxindex 4cd6d82e87..0e3f34293b 100644--- a/space/core/components/editor/lite-text-editor.tsx+++ b/space/core/components/editor/lite-text-editor.tsx@@ -1,6 +1,6 @@import React from "react";// editor-import { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef, TNonColorEditorCommands } from "@plane/editor";+import { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef } from "@plane/editor";// componentsimport { IssueCommentToolbar } from "@/components/editor";// helpers@@ -30,11 +30,12 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp} = props;// use-mentionconst { mentionHighlights } = useMention();-function isMutableRefObject<T>(ref: React.ForwardedRef<T>): ref is React.MutableRefObject<T | null> {return !!ref && typeof ref === "object" && "current" in ref;}+ // derived valuesconst isEmpty = isCommentEmpty(props.initialValue);+ const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;return (<div className="border border-custom-border-200 rounded p-3 space-y-3">@@ -54,18 +55,19 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrappcontainerClassName={cn(containerClassName, "relative")}/><IssueCommentToolbar- executeCommand={(key) => {- if (isMutableRefObject<EditorRefApi>(ref)) {- ref.current?.executeMenuItemCommand({- itemKey: key as TNonColorEditorCommands,- });- }+ executeCommand={(item) => {+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch here+ editorRef?.executeMenuItemCommand({+ itemKey: item.itemKey,+ ...item.extraProps,+ });}}isSubmitting={isSubmitting}showSubmitButton={showSubmitButton}handleSubmit={(e) => rest.onEnterKeyPress?.(e)}isCommentEmpty={isEmpty}- editorRef={isMutableRefObject<EditorRefApi>(ref) ? ref : null}+ editorRef={editorRef}/></div>);diff --git a/space/core/components/editor/toolbar.tsx b/space/core/components/editor/toolbar.tsxindex beccc8cb76..4593aaf653 100644--- a/space/core/components/editor/toolbar.tsx+++ b/space/core/components/editor/toolbar.tsx@@ -2,21 +2,21 @@import React, { useEffect, useState, useCallback } from "react";// editor-import { EditorRefApi, TEditorCommands, TNonColorEditorCommands } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// uiimport { Button, Tooltip } from "@plane/ui";// constants-import { TOOLBAR_ITEMS } from "@/constants/editor";+import { TOOLBAR_ITEMS, ToolbarMenuItem } from "@/constants/editor";// helpersimport { cn } from "@/helpers/common.helper";type Props = {- executeCommand: (commandKey: TEditorCommands) => void;+ executeCommand: (item: ToolbarMenuItem) => void;handleSubmit: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;isCommentEmpty: boolean;isSubmitting: boolean;showSubmitButton: boolean;- editorRef: React.MutableRefObject<EditorRefApi | null> | null;+ editorRef: EditorRefApi | null;};const toolbarItems = TOOLBAR_ITEMS.lite;@@ -28,24 +28,25 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {// Function to update active statesconst updateActiveStates = useCallback(() => {- if (editorRef?.current) {- const newActiveStates: Record<string, boolean> = {};- Object.values(toolbarItems)- .flat()- .forEach((item) => {- // Assert that editorRef.current is not null- newActiveStates[item.key] = (editorRef.current as EditorRefApi).isMenuItemActive({- itemKey: item.key as TNonColorEditorCommands,- });+ if (!editorRef) return;+ const newActiveStates: Record<string, boolean> = {};+ Object.values(toolbarItems)+ .flat()+ .forEach((item) => {+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch here+ newActiveStates[item.renderKey] = editorRef.isMenuItemActive({+ itemKey: item.itemKey,+ ...item.extraProps,});- setActiveStates(newActiveStates);- }+ });+ setActiveStates(newActiveStates);}, [editorRef]);// useEffect to call updateActiveStates when isActive prop changesuseEffect(() => {- if (!editorRef?.current) return;- const unsubscribe = editorRef.current.onStateChange(updateActiveStates);+ if (!editorRef) return;+ const unsubscribe = editorRef.onStateChange(updateActiveStates);updateActiveStates();return () => unsubscribe();}, [editorRef, updateActiveStates]);@@ -61,35 +62,39 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {"pl-0": index === 0,})}>- {toolbarItems[key].map((item) => (- <Tooltip- key={item.key}- tooltipContent={- <p className="flex flex-col gap-1 text-center text-xs">- <span className="font-medium">{item.name}</span>- {item.shortcut && <kbd className="text-custom-text-400">{item.shortcut.join(" + ")}</kbd>}- </p>- }- >- <button- type="button"- onClick={() => executeCommand(item.key)}- className={cn(- "grid place-items-center aspect-square rounded-sm p-0.5 text-custom-text-400 hover:bg-custom-background-80",- {- "bg-custom-background-80 text-custom-text-100": activeStates[item.key],- }- )}+ {toolbarItems[key].map((item) => {+ const isItemActive = activeStates[item.renderKey];++ return (+ <Tooltip+ key={item.renderKey}+ tooltipContent={+ <p className="flex flex-col gap-1 text-center text-xs">+ <span className="font-medium">{item.name}</span>+ {item.shortcut && <kbd className="text-custom-text-400">{item.shortcut.join(" + ")}</kbd>}+ </p>+ }>- <item.icon- className={cn("h-3.5 w-3.5", {- "text-custom-text-100": activeStates[item.key],- })}- strokeWidth={2.5}- />- </button>- </Tooltip>- ))}+ <button+ type="button"+ onClick={() => executeCommand(item)}+ className={cn(+ "grid place-items-center aspect-square rounded-sm p-0.5 text-custom-text-400 hover:bg-custom-background-80",+ {+ "bg-custom-background-80 text-custom-text-100": isItemActive,+ }+ )}+ >+ <item.icon+ className={cn("h-3.5 w-3.5", {+ "text-custom-text-100": isItemActive,+ })}+ strokeWidth={2.5}+ />+ </button>+ </Tooltip>+ );+ })}</div>))}</div>diff --git a/space/core/components/issues/peek-overview/comment/add-comment.tsx b/space/core/components/issues/peek-overview/comment/add-comment.tsxindex f6c8a452b5..3623f39864 100644--- a/space/core/components/issues/peek-overview/comment/add-comment.tsx+++ b/space/core/components/issues/peek-overview/comment/add-comment.tsx@@ -91,7 +91,7 @@ export const AddComment: React.FC<Props> = observer((props) => {}onChange={(comment_json, comment_html) => onChange(comment_html)}isSubmitting={isSubmitting}- placeholder="Add Comment..."+ placeholder="Add comment..."uploadFile={async (file) => {const { asset_id } = await uploadCommentAsset(file, anchor);setUploadAssetIds((prev) => [...prev, asset_id]);diff --git a/space/core/constants/editor.ts b/space/core/constants/editor.tsindex 2c6ac2bbb7..6089c56046 100644--- a/space/core/constants/editor.ts+++ b/space/core/constants/editor.ts@@ -1,5 +1,9 @@import {+ AlignCenter,+ AlignLeft,+ AlignRight,Bold,+ CaseSensitive,Code2,Heading1,Heading2,@@ -19,30 +23,99 @@ import {Underline,} from "lucide-react";// editor-import { TEditorCommands } from "@plane/editor";+import { TCommandExtraProps, TEditorCommands } from "@plane/editor";type TEditorTypes = "lite" | "document";-export type ToolbarMenuItem = {- key: TEditorCommands;+// Utility type to enforce the necessary extra props or make extraProps optional+type ExtraPropsForCommand<T extends TEditorCommands> = T extends keyof TCommandExtraProps+ ? TCommandExtraProps[T]+ : object; // Default to empty object for commands without extra props++export type ToolbarMenuItem<T extends TEditorCommands = TEditorCommands> = {+ itemKey: T;+ renderKey: string;name: string;icon: LucideIcon;shortcut?: string[];editors: TEditorTypes[];+ extraProps?: ExtraPropsForCommand<T>;};-export const BASIC_MARK_ITEMS: ToolbarMenuItem[] = [- { key: "h1", name: "Heading 1", icon: Heading1, editors: ["document"] },- { key: "h2", name: "Heading 2", icon: Heading2, editors: ["document"] },- { key: "h3", name: "Heading 3", icon: Heading3, editors: ["document"] },- { key: "h4", name: "Heading 4", icon: Heading4, editors: ["document"] },- { key: "h5", name: "Heading 5", icon: Heading5, editors: ["document"] },- { key: "h6", name: "Heading 6", icon: Heading6, editors: ["document"] },- { key: "bold", name: "Bold", icon: Bold, shortcut: ["Cmd", "B"], editors: ["lite", "document"] },- { key: "italic", name: "Italic", icon: Italic, shortcut: ["Cmd", "I"], editors: ["lite", "document"] },- { key: "underline", name: "Underline", icon: Underline, shortcut: ["Cmd", "U"], editors: ["lite", "document"] },+export const TYPOGRAPHY_ITEMS: ToolbarMenuItem<"text" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6">[] = [+ { itemKey: "text", renderKey: "text", name: "Text", icon: CaseSensitive, editors: ["document"] },+ { itemKey: "h1", renderKey: "h1", name: "Heading 1", icon: Heading1, editors: ["document"] },+ { itemKey: "h2", renderKey: "h2", name: "Heading 2", icon: Heading2, editors: ["document"] },+ { itemKey: "h3", renderKey: "h3", name: "Heading 3", icon: Heading3, editors: ["document"] },+ { itemKey: "h4", renderKey: "h4", name: "Heading 4", icon: Heading4, editors: ["document"] },+ { itemKey: "h5", renderKey: "h5", name: "Heading 5", icon: Heading5, editors: ["document"] },+ { itemKey: "h6", renderKey: "h6", name: "Heading 6", icon: Heading6, editors: ["document"] },+];++export const TEXT_ALIGNMENT_ITEMS: ToolbarMenuItem<"text-align">[] = [+ {+ itemKey: "text-align",+ renderKey: "text-align-left",+ name: "Left align",+ icon: AlignLeft,+ shortcut: ["Cmd", "Shift", "L"],+ editors: ["lite", "document"],+ extraProps: {+ alignment: "left",+ },+ },+ {+ itemKey: "text-align",+ renderKey: "text-align-center",+ name: "Center align",+ icon: AlignCenter,+ shortcut: ["Cmd", "Shift", "E"],+ editors: ["lite", "document"],+ extraProps: {+ alignment: "center",+ },+ },+ {+ itemKey: "text-align",+ renderKey: "text-align-right",+ name: "Right align",+ icon: AlignRight,+ shortcut: ["Cmd", "Shift", "R"],+ editors: ["lite", "document"],+ extraProps: {+ alignment: "right",+ },+ },+];++const BASIC_MARK_ITEMS: ToolbarMenuItem<"bold" | "italic" | "underline" | "strikethrough">[] = [+ {+ itemKey: "bold",+ renderKey: "bold",+ name: "Bold",+ icon: Bold,+ shortcut: ["Cmd", "B"],+ editors: ["lite", "document"],+ },+ {+ itemKey: "italic",+ renderKey: "italic",+ name: "Italic",+ icon: Italic,+ shortcut: ["Cmd", "I"],+ editors: ["lite", "document"],+ },+ {+ itemKey: "underline",+ renderKey: "underline",+ name: "Underline",+ icon: Underline,+ shortcut: ["Cmd", "U"],+ editors: ["lite", "document"],+ },{- key: "strikethrough",+ itemKey: "strikethrough",+ renderKey: "strikethrough",name: "Strikethrough",icon: Strikethrough,shortcut: ["Cmd", "Shift", "S"],@@ -50,23 +123,26 @@ export const BASIC_MARK_ITEMS: ToolbarMenuItem[] = [},];-export const LIST_ITEMS: ToolbarMenuItem[] = [+const LIST_ITEMS: ToolbarMenuItem<"bulleted-list" | "numbered-list" | "to-do-list">[] = [{- key: "bulleted-list",+ itemKey: "bulleted-list",+ renderKey: "bulleted-list",name: "Bulleted list",icon: List,shortcut: ["Cmd", "Shift", "7"],editors: ["lite", "document"],},{- key: "numbered-list",+ itemKey: "numbered-list",+ renderKey: "numbered-list",name: "Numbered list",icon: ListOrdered,shortcut: ["Cmd", "Shift", "8"],editors: ["lite", "document"],},{- key: "to-do-list",+ itemKey: "to-do-list",+ renderKey: "to-do-list",name: "To-do list",icon: ListTodo,shortcut: ["Cmd", "Shift", "9"],@@ -74,14 +150,14 @@ export const LIST_ITEMS: ToolbarMenuItem[] = [},];-export const USER_ACTION_ITEMS: ToolbarMenuItem[] = [- { key: "quote", name: "Quote", icon: TextQuote, editors: ["lite", "document"] },- { key: "code", name: "Code", icon: Code2, editors: ["lite", "document"] },+export const USER_ACTION_ITEMS: ToolbarMenuItem<"quote" | "code">[] = [+ { itemKey: "quote", renderKey: "quote", name: "Quote", icon: TextQuote, editors: ["lite", "document"] },+ { itemKey: "code", renderKey: "code", name: "Code", icon: Code2, editors: ["lite", "document"] },];-export const COMPLEX_ITEMS: ToolbarMenuItem[] = [- { key: "table", name: "Table", icon: Table, editors: ["document"] },- { key: "image", name: "Image", icon: Image, editors: ["lite", "document"] },+export const COMPLEX_ITEMS: ToolbarMenuItem<"table" | "image">[] = [+ { itemKey: "table", renderKey: "table", name: "Table", icon: Table, editors: ["document"] },+ { itemKey: "image", renderKey: "image", name: "Image", icon: Image, editors: ["lite", "document"] },];export const TOOLBAR_ITEMS: {@@ -91,12 +167,14 @@ export const TOOLBAR_ITEMS: {} = {lite: {basic: BASIC_MARK_ITEMS.filter((item) => item.editors.includes("lite")),+ alignment: TEXT_ALIGNMENT_ITEMS.filter((item) => item.editors.includes("lite")),list: LIST_ITEMS.filter((item) => item.editors.includes("lite")),userAction: USER_ACTION_ITEMS.filter((item) => item.editors.includes("lite")),complex: COMPLEX_ITEMS.filter((item) => item.editors.includes("lite")),},document: {basic: BASIC_MARK_ITEMS.filter((item) => item.editors.includes("document")),+ alignment: TEXT_ALIGNMENT_ITEMS.filter((item) => item.editors.includes("document")),list: LIST_ITEMS.filter((item) => item.editors.includes("document")),userAction: USER_ACTION_ITEMS.filter((item) => item.editors.includes("document")),complex: COMPLEX_ITEMS.filter((item) => item.editors.includes("document")),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 3e64e83a33..0822f1a97d 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@@ -1,6 +1,6 @@import React from "react";// editor-import { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef, TNonColorEditorCommands } from "@plane/editor";+import { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef } from "@plane/editor";// typesimport { IUserLite } from "@plane/types";// components@@ -61,12 +61,12 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp});// file sizeconst { maxFileSize } = useFileSize();-- const isEmpty = isCommentEmpty(props.initialValue);-function isMutableRefObject<T>(ref: React.ForwardedRef<T>): ref is React.MutableRefObject<T | null> {return !!ref && typeof ref === "object" && "current" in ref;}+ // derived values+ const isEmpty = isCommentEmpty(props.initialValue);+ const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;return (<div className="border border-custom-border-200 rounded p-3 space-y-3">@@ -89,19 +89,20 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp/><IssueCommentToolbaraccessSpecifier={accessSpecifier}- executeCommand={(key) => {- if (isMutableRefObject<EditorRefApi>(ref)) {- ref.current?.executeMenuItemCommand({- itemKey: key as TNonColorEditorCommands,- });- }+ executeCommand={(item) => {+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch here+ editorRef?.executeMenuItemCommand({+ itemKey: item.itemKey,+ ...item.extraProps,+ });}}handleAccessChange={handleAccessChange}handleSubmit={(e) => rest.onEnterKeyPress?.(e)}isCommentEmpty={isEmpty}isSubmitting={isSubmitting}showAccessSpecifier={showAccessSpecifier}- editorRef={isMutableRefObject<EditorRefApi>(ref) ? ref : null}+ editorRef={editorRef}showSubmitButton={showSubmitButton}/></div>diff --git a/web/core/components/editor/lite-text-editor/toolbar.tsx b/web/core/components/editor/lite-text-editor/toolbar.tsxindex ecf8c3283c..1951a3170e 100644--- a/web/core/components/editor/lite-text-editor/toolbar.tsx+++ b/web/core/components/editor/lite-text-editor/toolbar.tsx@@ -3,25 +3,25 @@import React, { useEffect, useState, useCallback } from "react";import { Globe2, Lock, LucideIcon } from "lucide-react";// editor-import { EditorRefApi, TEditorCommands, TNonColorEditorCommands } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// uiimport { Button, Tooltip } from "@plane/ui";// constants-import { TOOLBAR_ITEMS } from "@/constants/editor";+import { TOOLBAR_ITEMS, ToolbarMenuItem } from "@/constants/editor";import { EIssueCommentAccessSpecifier } from "@/constants/issue";// helpersimport { cn } from "@/helpers/common.helper";type Props = {accessSpecifier?: EIssueCommentAccessSpecifier;- executeCommand: (commandKey: TEditorCommands) => void;+ executeCommand: (item: ToolbarMenuItem) => void;handleAccessChange?: (accessKey: EIssueCommentAccessSpecifier) => void;handleSubmit: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;isCommentEmpty: boolean;isSubmitting: boolean;showAccessSpecifier: boolean;showSubmitButton: boolean;- editorRef: React.MutableRefObject<EditorRefApi | null> | null;+ editorRef: EditorRefApi | null;};type TCommentAccessType = {@@ -63,24 +63,25 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {// Function to update active statesconst updateActiveStates = useCallback(() => {- if (editorRef?.current) {- const newActiveStates: Record<string, boolean> = {};- Object.values(toolbarItems)- .flat()- .forEach((item) => {- // Assert that editorRef.current is not null- newActiveStates[item.key] = (editorRef.current as EditorRefApi).isMenuItemActive({- itemKey: item.key as TNonColorEditorCommands,- });+ if (!editorRef) return;+ const newActiveStates: Record<string, boolean> = {};+ Object.values(toolbarItems)+ .flat()+ .forEach((item) => {+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch here+ newActiveStates[item.renderKey] = editorRef.isMenuItemActive({+ itemKey: item.itemKey,+ ...item.extraProps,});- setActiveStates(newActiveStates);- }+ });+ setActiveStates(newActiveStates);}, [editorRef]);// useEffect to call updateActiveStates when isActive prop changesuseEffect(() => {- if (!editorRef?.current) return;- const unsubscribe = editorRef.current.onStateChange(updateActiveStates);+ if (!editorRef) return;+ const unsubscribe = editorRef.onStateChange(updateActiveStates);updateActiveStates();return () => unsubscribe();}, [editorRef, updateActiveStates]);@@ -122,35 +123,39 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {"pl-0": index === 0,})}>- {toolbarItems[key].map((item) => (- <Tooltip- key={item.key}- tooltipContent={- <p className="flex flex-col gap-1 text-center text-xs">- <span className="font-medium">{item.name}</span>- {item.shortcut && <kbd className="text-custom-text-400">{item.shortcut.join(" + ")}</kbd>}- </p>- }- >- <button- type="button"- onClick={() => executeCommand(item.key)}- className={cn(- "grid place-items-center aspect-square rounded-sm p-0.5 text-custom-text-400 hover:bg-custom-background-80",- {- "bg-custom-background-80 text-custom-text-100": activeStates[item.key],- }- )}+ {toolbarItems[key].map((item) => {+ const isItemActive = activeStates[item.renderKey];++ return (+ <Tooltip+ key={item.renderKey}+ tooltipContent={+ <p className="flex flex-col gap-1 text-center text-xs">+ <span className="font-medium">{item.name}</span>+ {item.shortcut && <kbd className="text-custom-text-400">{item.shortcut.join(" + ")}</kbd>}+ </p>+ }>- <item.icon- className={cn("h-3.5 w-3.5", {- "text-custom-text-100": activeStates[item.key],- })}- strokeWidth={2.5}- />- </button>- </Tooltip>- ))}+ <button+ type="button"+ onClick={() => executeCommand(item)}+ className={cn(+ "grid place-items-center aspect-square rounded-sm p-0.5 text-custom-text-400 hover:bg-custom-background-80",+ {+ "bg-custom-background-80 text-custom-text-100": isItemActive,+ }+ )}+ >+ <item.icon+ className={cn("h-3.5 w-3.5", {+ "text-custom-text-100": isItemActive,+ })}+ strokeWidth={2.5}+ />+ </button>+ </Tooltip>+ );+ })}</div>))}</div>diff --git a/web/core/components/pages/editor/header/color-dropdown.tsx b/web/core/components/pages/editor/header/color-dropdown.tsxindex 68de2dc36b..2809336c17 100644--- a/web/core/components/pages/editor/header/color-dropdown.tsx+++ b/web/core/components/pages/editor/header/color-dropdown.tsx@@ -4,13 +4,19 @@ import { memo } from "react";import { ALargeSmall, Ban } from "lucide-react";import { Popover } from "@headlessui/react";// plane editor-import { COLORS_LIST, TColorEditorCommands } from "@plane/editor";+import { COLORS_LIST, TEditorCommands } from "@plane/editor";// helpersimport { cn } from "@/helpers/common.helper";type Props = {- handleColorSelect: (key: TColorEditorCommands, color: string | undefined) => void;- isColorActive: (key: TColorEditorCommands, color: string | undefined) => boolean;+ handleColorSelect: (+ key: Extract<TEditorCommands, "text-color" | "background-color">,+ color: string | undefined+ ) => void;+ isColorActive: (+ key: Extract<TEditorCommands, "text-color" | "background-color">,+ color: string | undefined+ ) => boolean;};export const ColorDropdown: React.FC<Props> = memo((props) => {diff --git a/web/core/components/pages/editor/header/toolbar.tsx b/web/core/components/pages/editor/header/toolbar.tsxindex 447616b532..6e4ffdd5f8 100644--- a/web/core/components/pages/editor/header/toolbar.tsx+++ b/web/core/components/pages/editor/header/toolbar.tsx@@ -3,7 +3,7 @@import React, { useEffect, useState, useCallback } from "react";import { Check, ChevronDown } from "lucide-react";// editor-import { EditorRefApi, TNonColorEditorCommands } from "@plane/editor";+import { EditorRefApi } from "@plane/editor";// uiimport { CustomMenu, Tooltip } from "@plane/ui";// components@@ -36,11 +36,13 @@ const ToolbarButton: React.FC<ToolbarButtonProps> = React.memo((props) => {}><button- key={item.key}type="button"onClick={() =>+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch hereexecuteCommand({- itemKey: item.key as TNonColorEditorCommands,+ itemKey: item.itemKey,+ ...item.extraProps,})}className={cn("grid size-7 place-items-center rounded text-custom-text-300 hover:bg-custom-background-80", {@@ -66,15 +68,20 @@ export const PageToolbar: React.FC<Props> = ({ editorRef }) => {const [activeStates, setActiveStates] = useState<Record<string, boolean>>({});const updateActiveStates = useCallback(() => {+ // console.log("Updating status");const newActiveStates: Record<string, boolean> = {};Object.values(toolbarItems).flat().forEach((item) => {- newActiveStates[item.key] = editorRef.isMenuItemActive({- itemKey: item.key as TNonColorEditorCommands,+ // TODO: update this while toolbar homogenization+ // @ts-expect-error type mismatch here+ newActiveStates[item.renderKey] = editorRef.isMenuItemActive({+ itemKey: item.itemKey,+ ...item.extraProps,});});setActiveStates(newActiveStates);+ // console.log("newActiveStates", newActiveStates);}, [editorRef]);useEffect(() => {@@ -85,7 +92,8 @@ export const PageToolbar: React.FC<Props> = ({ editorRef }) => {const activeTypography = TYPOGRAPHY_ITEMS.find((item) =>editorRef.isMenuItemActive({- itemKey: item.key as TNonColorEditorCommands,+ itemKey: item.itemKey,+ ...item.extraProps,}));@@ -105,11 +113,12 @@ export const PageToolbar: React.FC<Props> = ({ editorRef }) => {>{TYPOGRAPHY_ITEMS.map((item) => (<CustomMenu.MenuItem- key={item.key}+ key={item.renderKey}className="flex items-center justify-between gap-2"onClick={() =>editorRef.executeMenuItemCommand({- itemKey: item.key as TNonColorEditorCommands,+ itemKey: item.itemKey,+ ...item.extraProps,})}>@@ -117,7 +126,9 @@ export const PageToolbar: React.FC<Props> = ({ editorRef }) => {<item.icon className="size-3" />{item.name}</span>- {activeTypography?.key === item.key && <Check className="size-3 text-custom-text-300 flex-shrink-0" />}+ {activeTypography?.itemKey === item.itemKey && (+ <Check className="size-3 text-custom-text-300 flex-shrink-0" />+ )}</CustomMenu.MenuItem>))}</CustomMenu>@@ -139,9 +150,9 @@ export const PageToolbar: React.FC<Props> = ({ editorRef }) => {<div key={key} className="flex items-center gap-0.5 px-2 first:pl-0 last:pr-0">{toolbarItems[key].map((item) => (<ToolbarButton- key={item.key}+ key={item.renderKey}item={item}- isActive={activeStates[item.key]}+ isActive={activeStates[item.renderKey]}executeCommand={editorRef.executeMenuItemCommand}/>))}diff --git a/web/core/constants/editor.ts b/web/core/constants/editor.tsindex 8524a870e2..a1b389fd01 100644--- a/web/core/constants/editor.ts+++ b/web/core/constants/editor.ts@@ -1,5 +1,8 @@import { Styles, StyleSheet } from "@react-pdf/renderer";import {+ AlignCenter,+ AlignLeft,+ AlignRight,Bold,CaseSensitive,Code2,@@ -21,7 +24,7 @@ import {Underline,} from "lucide-react";// editor-import { TEditorCommands, TEditorFontStyle } from "@plane/editor";+import { TCommandExtraProps, TEditorCommands, TEditorFontStyle } from "@plane/editor";// uiimport { MonospaceIcon, SansSerifIcon, SerifIcon } from "@plane/ui";// helpers@@ -29,30 +32,95 @@ import { convertRemToPixel } from "@/helpers/common.helper";type TEditorTypes = "lite" | "document";-export type ToolbarMenuItem = {- key: TEditorCommands;+// Utility type to enforce the necessary extra props or make extraProps optional+type ExtraPropsForCommand<T extends TEditorCommands> = T extends keyof TCommandExtraProps+ ? TCommandExtraProps[T]+ : object; // Default to empty object for commands without extra props++export type ToolbarMenuItem<T extends TEditorCommands = TEditorCommands> = {+ itemKey: T;+ renderKey: string;name: string;icon: LucideIcon;shortcut?: string[];editors: TEditorTypes[];+ extraProps?: ExtraPropsForCommand<T>;};-export const TYPOGRAPHY_ITEMS: ToolbarMenuItem[] = [- { key: "text", name: "Text", icon: CaseSensitive, editors: ["document"] },- { key: "h1", name: "Heading 1", icon: Heading1, editors: ["document"] },- { key: "h2", name: "Heading 2", icon: Heading2, editors: ["document"] },- { key: "h3", name: "Heading 3", icon: Heading3, editors: ["document"] },- { key: "h4", name: "Heading 4", icon: Heading4, editors: ["document"] },- { key: "h5", name: "Heading 5", icon: Heading5, editors: ["document"] },- { key: "h6", name: "Heading 6", icon: Heading6, editors: ["document"] },+export const TYPOGRAPHY_ITEMS: ToolbarMenuItem<"text" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6">[] = [+ { itemKey: "text", renderKey: "text", name: "Text", icon: CaseSensitive, editors: ["document"] },+ { itemKey: "h1", renderKey: "h1", name: "Heading 1", icon: Heading1, editors: ["document"] },+ { itemKey: "h2", renderKey: "h2", name: "Heading 2", icon: Heading2, editors: ["document"] },+ { itemKey: "h3", renderKey: "h3", name: "Heading 3", icon: Heading3, editors: ["document"] },+ { itemKey: "h4", renderKey: "h4", name: "Heading 4", icon: Heading4, editors: ["document"] },+ { itemKey: "h5", renderKey: "h5", name: "Heading 5", icon: Heading5, editors: ["document"] },+ { itemKey: "h6", renderKey: "h6", name: "Heading 6", icon: Heading6, editors: ["document"] },];-const BASIC_MARK_ITEMS: ToolbarMenuItem[] = [- { key: "bold", name: "Bold", icon: Bold, shortcut: ["Cmd", "B"], editors: ["lite", "document"] },- { key: "italic", name: "Italic", icon: Italic, shortcut: ["Cmd", "I"], editors: ["lite", "document"] },- { key: "underline", name: "Underline", icon: Underline, shortcut: ["Cmd", "U"], editors: ["lite", "document"] },+export const TEXT_ALIGNMENT_ITEMS: ToolbarMenuItem<"text-align">[] = [+ {+ itemKey: "text-align",+ renderKey: "text-align-left",+ name: "Left align",+ icon: AlignLeft,+ shortcut: ["Cmd", "Shift", "L"],+ editors: ["lite", "document"],+ extraProps: {+ alignment: "left",+ },+ },+ {+ itemKey: "text-align",+ renderKey: "text-align-center",+ name: "Center align",+ icon: AlignCenter,+ shortcut: ["Cmd", "Shift", "E"],+ editors: ["lite", "document"],+ extraProps: {+ alignment: "center",+ },+ },+ {+ itemKey: "text-align",+ renderKey: "text-align-right",+ name: "Right align",+ icon: AlignRight,+ shortcut: ["Cmd", "Shift", "R"],+ editors: ["lite", "document"],+ extraProps: {+ alignment: "right",+ },+ },+];++const BASIC_MARK_ITEMS: ToolbarMenuItem<"bold" | "italic" | "underline" | "strikethrough">[] = [+ {+ itemKey: "bold",+ renderKey: "bold",+ name: "Bold",+ icon: Bold,+ shortcut: ["Cmd", "B"],+ editors: ["lite", "document"],+ },+ {+ itemKey: "italic",+ renderKey: "italic",+ name: "Italic",+ icon: Italic,+ shortcut: ["Cmd", "I"],+ editors: ["lite", "document"],+ },+ {+ itemKey: "underline",+ renderKey: "underline",+ name: "Underline",+ icon: Underline,+ shortcut: ["Cmd", "U"],+ editors: ["lite", "document"],+ },{- key: "strikethrough",+ itemKey: "strikethrough",+ renderKey: "strikethrough",name: "Strikethrough",icon: Strikethrough,shortcut: ["Cmd", "Shift", "S"],@@ -60,23 +128,26 @@ const BASIC_MARK_ITEMS: ToolbarMenuItem[] = [},];-const LIST_ITEMS: ToolbarMenuItem[] = [+const LIST_ITEMS: ToolbarMenuItem<"bulleted-list" | "numbered-list" | "to-do-list">[] = [{- key: "bulleted-list",+ itemKey: "bulleted-list",+ renderKey: "bulleted-list",name: "Bulleted list",icon: List,shortcut: ["Cmd", "Shift", "7"],editors: ["lite", "document"],},{- key: "numbered-list",+ itemKey: "numbered-list",+ renderKey: "numbered-list",name: "Numbered list",icon: ListOrdered,shortcut: ["Cmd", "Shift", "8"],editors: ["lite", "document"],},{- key: "to-do-list",+ itemKey: "to-do-list",+ renderKey: "to-do-list",name: "To-do list",icon: ListTodo,shortcut: ["Cmd", "Shift", "9"],@@ -84,29 +155,31 @@ const LIST_ITEMS: ToolbarMenuItem[] = [},];-const USER_ACTION_ITEMS: ToolbarMenuItem[] = [- { key: "quote", name: "Quote", icon: TextQuote, editors: ["lite", "document"] },- { key: "code", name: "Code", icon: Code2, editors: ["lite", "document"] },+const USER_ACTION_ITEMS: ToolbarMenuItem<"quote" | "code">[] = [+ { itemKey: "quote", renderKey: "quote", name: "Quote", icon: TextQuote, editors: ["lite", "document"] },+ { itemKey: "code", renderKey: "code", name: "Code", icon: Code2, editors: ["lite", "document"] },];-const COMPLEX_ITEMS: ToolbarMenuItem[] = [- { key: "table", name: "Table", icon: Table, editors: ["document"] },- { key: "image", name: "Image", icon: Image, editors: ["lite", "document"] },+const COMPLEX_ITEMS: ToolbarMenuItem<"table" | "image">[] = [+ { itemKey: "table", renderKey: "table", name: "Table", icon: Table, editors: ["document"] },+ { itemKey: "image", renderKey: "image", name: "Image", icon: Image, editors: ["lite", "document"], extraProps: {} },];export const TOOLBAR_ITEMS: {[editorType in TEditorTypes]: {- [key: string]: ToolbarMenuItem[];+ [key: string]: ToolbarMenuItem<TEditorCommands>[];};} = {lite: {basic: BASIC_MARK_ITEMS.filter((item) => item.editors.includes("lite")),+ alignment: TEXT_ALIGNMENT_ITEMS.filter((item) => item.editors.includes("lite")),list: LIST_ITEMS.filter((item) => item.editors.includes("lite")),userAction: USER_ACTION_ITEMS.filter((item) => item.editors.includes("lite")),complex: COMPLEX_ITEMS.filter((item) => item.editors.includes("lite")),},document: {basic: BASIC_MARK_ITEMS.filter((item) => item.editors.includes("document")),+ alignment: TEXT_ALIGNMENT_ITEMS.filter((item) => item.editors.includes("document")),list: LIST_ITEMS.filter((item) => item.editors.includes("document")),userAction: USER_ACTION_ITEMS.filter((item) => item.editors.includes("document")),complex: COMPLEX_ITEMS.filter((item) => item.editors.includes("document")),diff --git a/yarn.lock b/yarn.lockindex e0e8dbaa98..cb6f87170e 100644--- a/yarn.lock+++ b/yarn.lock@@ -3597,6 +3597,11 @@resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.9.1.tgz#e0ca3ec1379dbc39a98070c650d3759df85db794"integrity sha512-vmUkclPi02iVf+uu74iyUp5xGNib0Gxs73DJ1z+a7CzjuLRqqCa/KEde95CR0Y//DaK/Csz4DOSUyTfLCMvpWg==+"@tiptap/extension-text-align@^2.8.0":+ version "2.9.1"+ resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.9.1.tgz#5f7920a16c95b283c961cf1e22357bdc355c1626"+ integrity sha512-oUp0XnwJpAImcOVV68vsY2CpkHpRZ3gzWfIRTuy+aYitQim3xDKis/qfWQUWZsANp9/TZ0VyjtkZxNMwOfcu1g==+"@tiptap/extension-text-style@^2.7.1", "@tiptap/extension-text-style@^2.9.1":version "2.9.1"resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-2.9.1.tgz#b9fc9cd8e90747357fbd4cac541a33aaa8b76875"@@ -3878,9 +3883,9 @@integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="@types/express-serve-static-core@*", "@types/express-serve-static-core@^5.0.0":- version "5.0.0"- resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz#91f06cda1049e8f17eeab364798ed79c97488a1c"- integrity sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==+ version "5.0.1"+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz#3c9997ae9d00bc236e45c6374e84f2596458d9db"+ integrity sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==dependencies:"@types/node" "*""@types/qs" "*"@@ -4031,11 +4036,11 @@"@types/node" "*""@types/node@*", "@types/node@^22.0.0", "@types/node@^22.5.4":- version "22.7.9"- resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.9.tgz#2bf2797b5e84702d8262ea2cf843c3c3c880d0e9"- integrity sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg==+ version "22.8.0"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.0.tgz#193c6f82f9356ce0e6bba86b59f2ffe06e7e320b"+ integrity sha512-84rafSBHC/z1i1E3p0cJwKA+CfYDNSXX9WSZBRopjIzLET8oNt6ht2tei4C7izwDeEiLLfdeSVBv1egOH916hg==dependencies:- undici-types "~6.19.2"+ undici-types "~6.19.8""@types/[email protected]":version "18.14.1"@@ -4053,9 +4058,9 @@integrity sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA=="@types/node@^20.14.9", "@types/node@^20.5.2":- version "20.17.0"- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.0.tgz#d0620ba0fe4cf2a0f12351c7bdd805fc4e1f036b"- integrity sha512-a7zRo0f0eLo9K5X9Wp5cAqTUNGzuFLDG2R7C4HY2BhcMAsxgSPuRvAC1ZB6QkuUQXf0YZAgfOX2ZyrBa2n4nHQ==+ version "20.17.1"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.1.tgz#2b968e060dfb04b7f9550fe3db5f552721c14566"+ integrity sha512-j2VlPv1NnwPJbaCNv69FO/1z4lId0QmGvpT41YxitRtWlg96g/j8qcv2RKsLKe2F6OJgyXhupN1Xo17b2m139Q==dependencies:undici-types "~6.19.2"@@ -9876,9 +9881,9 @@ postgres-range@^1.1.1:integrity sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==posthog-js@^1.131.3:- version "1.174.4"- resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.174.4.tgz#67abe7ba9c3b99db8fb472be0017b7d45217184f"- integrity sha512-wfnSp1nDYHvV4+qy+UnDTED3afe8tVOiLa4Y83RLI2HZdMKovnLq11GJX6cYJ99+hs88HyGD1XmNTxShIQoOhQ==+ version "1.176.0"+ resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.176.0.tgz#39841ab213aa9c5500982659dc6d537a407f7205"+ integrity sha512-T5XKNtRzp7q6CGb7Vc7wAI76rWap9fiuDUPxPsyPBPDkreKya91x9RIsSapAVFafwD1AEin1QMczCmt9Le9BWw==dependencies:core-js "^3.38.1"fflate "^0.4.8"@@ -10109,9 +10114,9 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prprosemirror-view "^1.27.0"prosemirror-tables@^1.4.0:- version "1.5.1"- resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.5.1.tgz#75e6ace7427834f2150f9f08bf8fa400429f5238"- integrity sha512-zL0vI0rGdhLLKXaZU1Jw1I8RuXwa5bv4aEY6G9TdynNRIU2FodtfI/YdhqVlimilhOIBGMbhvTvnQy5fvbHt2A==+ version "1.6.0"+ resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.6.0.tgz#b05fbb1172d55dd22ad2662af8e243c969bbbfdd"+ integrity sha512-eirSS2fwVYzKhvM2qeXSn9ix/SBn7QOLDftPQ4ImEQIevFDiSKAB6Lbrmm/WEgrbTDbCm+xhSq4gOD9w7wT59Q==dependencies:prosemirror-keymap "^1.1.2"prosemirror-model "^1.8.1"@@ -11735,17 +11740,17 @@ tiptap-markdown@^0.8.9:markdown-it-task-lists "^2.1.1"prosemirror-markdown "^1.11.1"-tldts-core@^6.1.54:- version "6.1.54"- resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.54.tgz#a3c3b5f45a64a1f9ea4bb32a94642218c7b7baa5"- integrity sha512-5cc42+0G0EjYRDfIJHKraaT3I5kPm7j6or3Zh1T9sF+Ftj1T+isT4thicUyQQ1bwN7/xjHQIuY2fXCoXP8Haqg==+tldts-core@^6.1.55:+ version "6.1.55"+ resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.55.tgz#cab0d412672fca9c77d3c51312c69bb5b5ee95c2"+ integrity sha512-BL+BuKHHaOpntE5BGI6naXjULU6aRlgaYdfDHR3T/hdbNTWkWUZ9yuc11wGnwgpvRwlyUiIK+QohYK3olaVU6Q==tldts@^6.1.32:- version "6.1.54"- resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.54.tgz#782594001a7b95e577b4cc391c0f0ed7c8307d37"- integrity sha512-rDaL1t59gb/Lg0HPMUGdV1vAKLQcXwU74D26aMaYV4QW7mnMvShd1Vmkg3HYAPWx2JCTUmsrXt/Yl9eJ5UFBQw==+ version "6.1.55"+ resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.55.tgz#9a27d1708652bbae93d4b842dc2f8554fdabffc6"+ integrity sha512-HxQR/9roQ07Pwc8RyyrJMAxRz5/ssoF3qIPPUiIo3zUt6yMdmYZjM2OZIFMiZ3jHyz9jrGHEHuQZrUhoc1LkDw==dependencies:- tldts-core "^6.1.54"+ tldts-core "^6.1.55"to-regex-range@^5.0.1:version "5.0.1"@@ -12063,7 +12068,7 @@ undefsafe@^2.0.5:resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==-undici-types@~6.19.2:+undici-types@~6.19.2, undici-types@~6.19.8:version "6.19.8"resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==