π₯π₯π₯ 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
[WEB-755] fix: Clearing nodes to default node i.e. paragraph before converting it to other type (#3974)
M. Palanikannan0759666b7594
diff --git a/packages/editor/core/src/lib/editor-commands.ts b/packages/editor/core/src/lib/editor-commands.tsindex 6524d1ff58..7c3e7f11e6 100644--- a/packages/editor/core/src/lib/editor-commands.ts+++ b/packages/editor/core/src/lib/editor-commands.ts@@ -4,18 +4,18 @@ import { findTableAncestor } from "src/lib/utils";import { UploadImage } from "src/types/upload-image";export const toggleHeadingOne = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 1 }).run();- else editor.chain().focus().toggleHeading({ level: 1 }).run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 1 }).run();+ else editor.chain().focus().clearNodes().toggleHeading({ level: 1 }).run();};export const toggleHeadingTwo = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 2 }).run();- else editor.chain().focus().toggleHeading({ level: 2 }).run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 2 }).run();+ else editor.chain().focus().clearNodes().toggleHeading({ level: 2 }).run();};export const toggleHeadingThree = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 3 }).run();- else editor.chain().focus().toggleHeading({ level: 3 }).run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 3 }).run();+ else editor.chain().focus().clearNodes().toggleHeading({ level: 3 }).run();};export const toggleBold = (editor: Editor, range?: Range) => {@@ -37,10 +37,10 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {// Check if code block is active then toggle code blockif (editor.isActive("codeBlock")) {if (range) {- editor.chain().focus().deleteRange(range).toggleCodeBlock().run();+ editor.chain().focus().deleteRange(range).clearNodes().toggleCodeBlock().run();return;}- editor.chain().focus().toggleCodeBlock().run();+ editor.chain().focus().clearNodes().toggleCodeBlock().run();return;}@@ -49,32 +49,32 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {if (isSelectionEmpty) {if (range) {- editor.chain().focus().deleteRange(range).toggleCodeBlock().run();+ editor.chain().focus().deleteRange(range).clearNodes().toggleCodeBlock().run();return;}- editor.chain().focus().toggleCodeBlock().run();+ editor.chain().focus().clearNodes().toggleCodeBlock().run();} else {if (range) {- editor.chain().focus().deleteRange(range).toggleCode().run();+ editor.chain().focus().deleteRange(range).clearNodes().toggleCode().run();return;}- editor.chain().focus().toggleCode().run();+ editor.chain().focus().clearNodes().toggleCode().run();}};export const toggleOrderedList = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).toggleOrderedList().run();- else editor.chain().focus().toggleOrderedList().run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleOrderedList().run();+ else editor.chain().focus().clearNodes().toggleOrderedList().run();};export const toggleBulletList = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).toggleBulletList().run();- else editor.chain().focus().toggleBulletList().run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleBulletList().run();+ else editor.chain().focus().clearNodes().toggleBulletList().run();};export const toggleTaskList = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).toggleTaskList().run();- else editor.chain().focus().toggleTaskList().run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleTaskList().run();+ else editor.chain().focus().clearNodes().toggleTaskList().run();};export const toggleStrike = (editor: Editor, range?: Range) => {@@ -83,8 +83,8 @@ export const toggleStrike = (editor: Editor, range?: Range) => {};export const toggleBlockquote = (editor: Editor, range?: Range) => {- if (range) editor.chain().focus().deleteRange(range).toggleBlockquote().run();- else editor.chain().focus().toggleBlockquote().run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleBlockquote().run();+ else editor.chain().focus().clearNodes().toggleBlockquote().run();};export const insertTableCommand = (editor: Editor, range?: Range) => {@@ -97,8 +97,8 @@ export const insertTableCommand = (editor: Editor, range?: Range) => {}}}- if (range) editor.chain().focus().deleteRange(range).insertTable({ rows: 3, cols: 3 }).run();- else editor.chain().focus().insertTable({ rows: 3, cols: 3 }).run();+ if (range) editor.chain().focus().deleteRange(range).clearNodes().insertTable({ rows: 3, cols: 3 }).run();+ else editor.chain().focus().clearNodes().insertTable({ rows: 3, cols: 3 }).run();};export const unsetLinkEditor = (editor: Editor) => {diff --git a/packages/editor/extensions/src/extensions/slash-commands.tsx b/packages/editor/extensions/src/extensions/slash-commands.tsxindex 88e257cef6..f37d18c683 100644--- a/packages/editor/extensions/src/extensions/slash-commands.tsx+++ b/packages/editor/extensions/src/extensions/slash-commands.tsx@@ -85,7 +85,10 @@ const getSuggestionItems =searchTerms: ["p", "paragraph"],icon: <CaseSensitive className="h-3.5 w-3.5" />,command: ({ editor, range }: CommandProps) => {- editor.chain().focus().deleteRange(range).toggleNode("paragraph", "paragraph").run();+ if (range) {+ editor.chain().focus().deleteRange(range).clearNodes().run();+ }+ editor.chain().focus().clearNodes().run();},},{diff --git a/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/index.tsx b/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/index.tsxindex f96e7293eb..2dbc86cec6 100644--- a/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/index.tsx+++ b/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/index.tsx@@ -25,16 +25,20 @@ type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children">;export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {const items: BubbleMenuItem[] = [- BoldItem(props.editor),- ItalicItem(props.editor),- UnderLineItem(props.editor),- StrikeThroughItem(props.editor),+ ...(props.editor.isActive("code")+ ? []+ : [+ BoldItem(props.editor),+ ItalicItem(props.editor),+ UnderLineItem(props.editor),+ StrikeThroughItem(props.editor),+ ]),CodeItem(props.editor),];const bubbleMenuProps: EditorBubbleMenuProps = {...props,- shouldShow: ({ view, state, editor }) => {+ shouldShow: ({ state, editor }) => {const { selection } = state;const { empty } = selection;@@ -64,6 +68,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);const [isSelecting, setIsSelecting] = useState(false);+useEffect(() => {function handleMouseDown() {function handleMouseMove() {@@ -108,14 +113,16 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {}}/>)}- <LinkSelector- editor={props.editor!!}- isOpen={isLinkSelectorOpen}- setIsOpen={() => {- setIsLinkSelectorOpen(!isLinkSelectorOpen);- setIsNodeSelectorOpen(false);- }}- />+ {!props.editor.isActive("code") && (+ <LinkSelector+ editor={props.editor}+ isOpen={isLinkSelectorOpen}+ setIsOpen={() => {+ setIsLinkSelectorOpen(!isLinkSelectorOpen);+ setIsNodeSelectorOpen(false);+ }}+ />+ )}<div className="flex">{items.map((item) => (<buttondiff --git a/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/link-selector.tsx b/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/link-selector.tsxindex 14448114dc..e45cfb3179 100644--- a/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/link-selector.tsx+++ b/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/link-selector.tsx@@ -84,8 +84,8 @@ export const LinkSelector: FC<LinkSelectorProps> = ({ editor, isOpen, setIsOpenclassName="flex items-center rounded-sm p-1 text-custom-text-300 transition-all hover:bg-custom-background-90"type="button"onClick={(e) => {- e.stopPropagation();onLinkSubmit();+ e.stopPropagation();}}><Check className="h-4 w-4" />diff --git a/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/node-selector.tsx b/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/node-selector.tsxindex 6bc9960857..1bb8c38bd2 100644--- a/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/node-selector.tsx+++ b/packages/editor/rich-text-editor/src/ui/menus/bubble-menu/node-selector.tsx@@ -26,7 +26,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({ editor, isOpen, setIsOpen{name: "Text",icon: TextIcon,- command: () => editor.chain().focus().toggleNode("paragraph", "paragraph").run(),+ command: () => editor.chain().focus().clearNodes().run(),isActive: () => editor.isActive("paragraph") && !editor.isActive("bulletList") && !editor.isActive("orderedList"),},HeadingOneItem(editor),