A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: fix enter/tab not working in block nodes inside outline list item
Abdullah Atta9eebda86c27e
diff --git a/packages/editor/src/extensions/outline-list-item/outline-list-item.ts b/packages/editor/src/extensions/outline-list-item/outline-list-item.tsindex 19c3b5e84..14165ee14 100644--- a/packages/editor/src/extensions/outline-list-item/outline-list-item.ts+++ b/packages/editor/src/extensions/outline-list-item/outline-list-item.ts@@ -25,6 +25,7 @@ import {import { findParentNodeOfTypeClosestToPos } from "../../utils/prosemirror.js";import { OutlineList } from "../outline-list/outline-list.js";import { keybindings, tiptapKeys } from "@notesnook/common";+import { Paragraph } from "../paragraph/paragraph.js";export interface ListItemOptions {HTMLAttributes: Record<string, unknown>;@@ -93,21 +94,37 @@ export const OutlineListItem = Node.create<ListItemOptions>({return true;});},- Enter: () => {- // const subList = findSublist(editor, this.type);- // if (!subList) return this.editor.commands.splitListItem(this.name);-- // const { isCollapsed, subListPos } = subList;-- // if (isCollapsed) {- // return this.editor.commands.toggleOutlineCollapse(subListPos, false);- // }+ Enter: ({ editor }) => {+ const { $anchor } = editor.state.selection;+ if (+ $anchor.parent.type.name !== Paragraph.name ||+ ($anchor.parent.type.name === Paragraph.name &&+ $anchor.node($anchor.depth - 1)?.type.name !== this.type.name)+ )+ return false;return this.editor.commands.splitListItem(this.name);},- Tab: () => this.editor.commands.sinkListItem(this.name),- [keybindings.liftListItem.keys]: () =>- this.editor.commands.liftListItem(this.name)+ Tab: ({ editor }) => {+ const { $anchor } = editor.state.selection;+ if (+ $anchor.parent.type.name !== Paragraph.name ||+ ($anchor.parent.type.name === Paragraph.name &&+ $anchor.node($anchor.depth - 1)?.type.name !== this.type.name)+ )+ return false;+ return this.editor.commands.sinkListItem(this.name);+ },+ [keybindings.liftListItem.keys]: ({ editor }) => {+ const { $anchor } = editor.state.selection;+ if (+ $anchor.parent.type.name !== Paragraph.name ||+ ($anchor.parent.type.name === Paragraph.name &&+ $anchor.node($anchor.depth - 1)?.type.name !== this.type.name)+ )+ return false;+ return this.editor.commands.liftListItem(this.name);+ }};},@@ -125,7 +142,7 @@ export const OutlineListItem = Node.create<ListItemOptions>({function onClick(e: MouseEvent | TouchEvent) {if (e instanceof MouseEvent && e.button !== 0) return;- if (!(e.target instanceof HTMLParagraphElement)) return;+ if (!(e.target instanceof HTMLElement)) return;if (!li.classList.contains("nested")) return;const pos = typeof getPos === "function" ? getPos() : 0;