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: maintain relative cursor location when list is sorted
Scott-willb9e24888e72f
diff --git a/packages/editor/src/extensions/task-list/tests/__snapshots__/task-list.test.ts.snap b/packages/editor/src/extensions/task-list/__tests__/__snapshots__/task-list.test.ts.snapsimilarity index 100%rename from packages/editor/src/extensions/task-list/tests/__snapshots__/task-list.test.ts.snaprename to packages/editor/src/extensions/task-list/__tests__/__snapshots__/task-list.test.ts.snapdiff --git a/packages/editor/src/extensions/task-list/tests/task-list.test.ts b/packages/editor/src/extensions/task-list/__tests__/task-list.test.tssimilarity index 91%rename from packages/editor/src/extensions/task-list/tests/task-list.test.tsrename to packages/editor/src/extensions/task-list/__tests__/task-list.test.tsindex f0babe121..e1ea43854 100644--- a/packages/editor/src/extensions/task-list/tests/task-list.test.ts+++ b/packages/editor/src/extensions/task-list/__tests__/task-list.test.ts@@ -185,3 +185,20 @@ test(`sorting a task list with no checked items should do nothing`, async () =>expect(eq(editor.state.doc, beforeDoc)).toBe(true);});++test("sorting a task list should preserve cursor location", async () => {+ const { editor } = createEditor({+ initialContent: NESTED_TASK_LIST,+ extensions: {+ taskItem: TaskItemNode.configure({ nested: true }),+ taskList: TaskListNode+ }+ });+ const beforeFrom = editor.state.selection.from;+ const beforeTo = editor.state.selection.to;++ editor.commands.command(({ tr }) => !!sortList(tr, 0));++ expect(editor.state.selection.from).toBe(beforeFrom);+ expect(editor.state.selection.to).toBe(beforeTo);+});diff --git a/packages/editor/src/extensions/task-list/utils.ts b/packages/editor/src/extensions/task-list/utils.tsindex 174fcb4f1..50d7332d2 100644--- a/packages/editor/src/extensions/task-list/utils.ts+++ b/packages/editor/src/extensions/task-list/utils.ts@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import TaskList from "@tiptap/extension-task-list";-import { Transaction } from "@tiptap/pm/state";+import { TextSelection, Transaction } from "@tiptap/pm/state";import { Fragment, Node as ProsemirrorNode } from "prosemirror-model";import { NodeWithPos } from "@tiptap/core";import { findParentNodeClosestToPos } from "../../utils/prosemirror.js";@@ -74,11 +74,13 @@ export function deleteCheckedItems(tr: Transaction, pos: number) {}export function sortList(tr: Transaction, pos: number) {+ const originalFrom = tr.selection.from;+ const originalTo = tr.selection.to;+const node = tr.doc.nodeAt(pos);const parent = node ? { node, pos } : null;if (!parent || parent.node.type.name !== TaskList.name) return;-const sublists: NodeWithPos[] = [];parent.node.descendants((node, nodePos) => {if (node.type.name === TaskList.name)@@ -86,16 +88,13 @@ export function sortList(tr: Transaction, pos: number) {});if (sublists.length > 1) sublists.reverse();sublists.push(parent);-for (const list of sublists) {const listNode = tr.doc.nodeAt(tr.mapping.map(list.pos));if (!listNode) continue;-const children: {checked: number;index: number;}[] = [];-listNode.forEach((node, _, index) => {children.push({index,@@ -108,7 +107,6 @@ export function sortList(tr: Transaction, pos: number) {children.every((a) => a.checked === 0))continue;-tr.replaceWith(tr.mapping.map(list.pos + 1),tr.mapping.map(list.pos + listNode.nodeSize - 1),@@ -121,6 +119,8 @@ export function sortList(tr: Transaction, pos: number) {}if (!tr.steps.length) return null;+ //preserve cursor location+ tr.setSelection(TextSelection.create(tr.doc, originalFrom, originalTo));return tr;}