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 changing level of collapsed heading * preserve collasped state * reset visibility of hidden nodes under changed heading
01zulfi042656856aae
diff --git a/packages/editor/src/extensions/heading/heading.ts b/packages/editor/src/extensions/heading/heading.tsindex 222fa216f..b7f73d74f 100644--- a/packages/editor/src/extensions/heading/heading.ts+++ b/packages/editor/src/extensions/heading/heading.ts@@ -24,7 +24,7 @@ import {} from "@tiptap/core";import { Heading as TiptapHeading } from "@tiptap/extension-heading";import { isClickWithinBounds } from "../../utils/prosemirror.js";-import { Selection, Transaction } from "@tiptap/pm/state";+import { Plugin, PluginKey, Selection, Transaction } from "@tiptap/pm/state";import { Node } from "@tiptap/pm/model";import { useToolbarStore } from "../../toolbar/stores/toolbar-store.js";@@ -72,13 +72,14 @@ export const Heading = TiptapHeading.extend({return false;}- const { textAlign, textDirection } =+ const { textAlign, textDirection, collapsed } =state.selection.$from.parent.attrs;return commands.setNode(this.name, {...attributes,textAlign,- textDirection+ textDirection,+ collapsed});}};@@ -151,15 +152,19 @@ export const Heading = TiptapHeading.extend({find: HEADING_REGEX,type: this.type,getAttributes: (match) => {- const { textAlign, textDirection } =+ const { textAlign, textDirection, collapsed } =this.editor.state.selection.$from.parent?.attrs || {};const level = match[1].length;- return { level, textAlign, textDirection };+ return { level, textAlign, textDirection, collapsed };}})];},+ addProseMirrorPlugins() {+ return [headingUpdatePlugin];+ },+addNodeView() {return ({ node, getPos, editor, HTMLAttributes }) => {const heading = document.createElement(`h${node.attrs.level}`);@@ -344,3 +349,43 @@ function findEndOfCollapsedSection(return nextPos;}++const headingUpdatePlugin = new Plugin({+ key: new PluginKey("headingUpdate"),+ appendTransaction(transactions, oldState, newState) {+ const hasDocChanges = transactions.some(+ (transaction) => transaction.docChanged+ );+ if (!hasDocChanges) return null;++ const tr = newState.tr;+ const oldDoc = oldState.doc;+ const newDoc = newState.doc;+ let modified = false;++ newDoc.descendants((newNode, pos) => {+ if (newNode.type.name === "heading") {+ const oldNode = oldDoc.nodeAt(pos);+ if (+ oldNode &&+ oldNode.type.name === "heading" &&+ oldNode.attrs.level !== newNode.attrs.level+ ) {+ /**+ * if the level of a collapsed heading is changed,+ * we need to reset visibility of all the nodes under it as there+ * might be a heading of same or higher level previously+ * hidden under this heading+ */+ if (newNode.attrs.collapsed) {+ toggleNodesUnderHeading(tr, pos, oldNode.attrs.level, false);+ toggleNodesUnderHeading(tr, pos, newNode.attrs.level, true);+ modified = true;+ }+ }+ }+ });++ return modified ? tr : null;+ }+});