Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: speed up note loading significantly

Abdullah Atta4bbd43e54b8b
diff --git a/packages/editor/patches/@tiptap+core+2.2.4.patch b/packages/editor/patches/@tiptap+core+2.2.4.patch
index 9bc4daad5..b13604194 100644
--- a/packages/editor/patches/@tiptap+core+2.2.4.patch
+++ b/packages/editor/patches/@tiptap+core+2.2.4.patch
@@ -1,8 +1,34 @@
diff --git a/node_modules/@tiptap/core/dist/index.cjs b/node_modules/@tiptap/core/dist/index.cjs
-index 1ea30e0..b5d15e3 100644
+index 1ea30e0..03c80e2 100644
--- a/node_modules/@tiptap/core/dist/index.cjs
+++ b/node_modules/@tiptap/core/dist/index.cjs
-@@ -1327,7 +1327,7 @@ const cut = (originRange, targetPos) => ({ editor, tr }) => {
+@@ -383,7 +383,7 @@ function fromString(value) {
+ * @param extensionAttributes List of attributes to inject
+ */
+ function injectExtensionAttributesToParseRule(parseRule, extensionAttributes) {
+- if (parseRule.style) {
++ if (parseRule.style || (!parseRule.attrs && !parseRule.getAttrs && extensionAttributes.length === 0)) {
+ return parseRule;
+ }
+ return {
+@@ -400,12 +400,10 @@ function injectExtensionAttributesToParseRule(parseRule, extensionAttributes) {
+ if (value === null || value === undefined) {
+ return items;
+ }
+- return {
+- ...items,
+- [item.name]: value,
+- };
+- }, {});
+- return { ...oldAttributes, ...newAttributes };
++ items[item.name] = value;
++ return items;
++ }, oldAttributes || {});
++ return newAttributes;
+ },
+ };
+ }
+@@ -1327,7 +1325,7 @@ const cut = (originRange, targetPos) => ({ editor, tr }) => {
tr.deleteRange(originRange.from, originRange.to);
const newPos = tr.mapping.map(targetPos);
tr.insert(newPos, contentSlice.content);
@@ -11,7 +37,33 @@ index 1ea30e0..b5d15e3 100644
return true;
};
-@@ -1901,9 +1901,24 @@ const lift = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
+@@ -1587,24 +1585,11 @@ const insertContent = (value, options) => ({ tr, commands }) => {
+ return commands.insertContentAt({ from: tr.selection.from, to: tr.selection.to }, value, options);
+ };
+
+-const removeWhitespaces = (node) => {
+- const children = node.childNodes;
+- for (let i = children.length - 1; i >= 0; i -= 1) {
+- const child = children[i];
+- if (child.nodeType === 3 && child.nodeValue && /^(\n\s\s|\n)$/.test(child.nodeValue)) {
+- node.removeChild(child);
+- }
+- else if (child.nodeType === 1) {
+- removeWhitespaces(child);
+- }
+- }
+- return node;
+-};
+ function elementFromString(value) {
+ // add a wrapper to preserve leading and trailing whitespace
+ const wrappedValue = `<body>${value}</body>`;
+ const html = new window.DOMParser().parseFromString(wrappedValue, 'text/html').body;
+- return removeWhitespaces(html);
++ return html;
+ }
+
+ function createNodeFromContent(content, schema, options) {
+@@ -1901,9 +1886,24 @@ const lift = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
return commands$1.lift(state, dispatch);
};
@@ -39,11 +91,107 @@ index 1ea30e0..b5d15e3 100644
const liftListItem = typeOrName => ({ state, dispatch }) => {
const type = getNodeType(typeOrName, state.schema);
+@@ -3279,16 +3279,20 @@ const Keymap = Extension.create({
+ new state.Plugin({
+ key: new state.PluginKey('clearDocument'),
+ appendTransaction: (transactions, oldState, newState) => {
++ const { empty, from, to } = oldState.selection;
++ if (empty) {
++ return;
++ }
++
+ const docChanges = transactions.some(transaction => transaction.docChanged)
+- && !oldState.doc.eq(newState.doc);
++ && oldState.doc.nodeSize !== newState.doc.nodeSize;
+ if (!docChanges) {
+ return;
+ }
+- const { empty, from, to } = oldState.selection;
+ const allFrom = state.Selection.atStart(oldState.doc).from;
+ const allEnd = state.Selection.atEnd(oldState.doc).to;
+ const allWasSelected = from === allFrom && to === allEnd;
+- if (empty || !allWasSelected) {
++ if (!allWasSelected) {
+ return;
+ }
+ const isEmpty = newState.doc.textBetween(0, newState.doc.content.size, ' ', ' ').length === 0;
+@@ -3788,23 +3792,29 @@ class Editor extends EventEmitter {
+ * Creates a ProseMirror view.
+ */
+ createView() {
+- const doc = createDocument(this.options.content, this.schema, this.options.parseOptions);
+- const selection = resolveFocusPosition(doc, this.options.autofocus);
+- this.view = new view.EditorView(this.options.element, {
++ this.view = new EditorView(this.options.element, {
+ ...this.options.editorProps,
+ dispatchTransaction: this.dispatchTransaction.bind(this),
+- state: state.EditorState.create({
+- doc,
+- selection: selection || undefined,
+- }),
++ state: EditorState.create({
++ doc: this.schema.topNodeType.create(),
++ })
+ });
+- // `editor.view` is not yet available at this time.
+- // Therefore we will add all plugins and node views directly afterwards.
+- const newState = this.state.reconfigure({
+- plugins: this.extensionManager.plugins,
++ setTimeout(() => {
++ const doc = createDocument(this.options.content, this.schema, this.options.parseOptions);
++ const selection = resolveFocusPosition(doc, this.options.autofocus);
++ // `editor.view` is not yet available at this time.
++ // Therefore we will add all plugins and node views directly afterwards.
++ const newState = EditorState.create({
++ plugins: this.extensionManager.plugins,
++ doc,
++ selection
++ });
++
++ this.view.setProps({
++ state: newState,
++ nodeViews: this.extensionManager.nodeViews
++ })
+ });
+- this.view.updateState(newState);
+- this.createNodeViews();
+ this.prependClass();
+ // Let’s store the editor instance in the DOM element.
+ // So we’ll have access to it for tests.
diff --git a/node_modules/@tiptap/core/dist/index.js b/node_modules/@tiptap/core/dist/index.js
-index 554e919..cdd21be 100644
+index 554e919..f1e9726 100644
--- a/node_modules/@tiptap/core/dist/index.js
+++ b/node_modules/@tiptap/core/dist/index.js
-@@ -1323,7 +1323,7 @@ const cut = (originRange, targetPos) => ({ editor, tr }) => {
+@@ -379,9 +379,10 @@ function fromString(value) {
+ * @param extensionAttributes List of attributes to inject
+ */
+ function injectExtensionAttributesToParseRule(parseRule, extensionAttributes) {
+- if (parseRule.style) {
++ if (parseRule.style || (!parseRule.attrs && !parseRule.getAttrs && extensionAttributes.length === 0)) {
+ return parseRule;
+ }
++
+ return {
+ ...parseRule,
+ getAttrs: node => {
+@@ -396,12 +397,10 @@ function injectExtensionAttributesToParseRule(parseRule, extensionAttributes) {
+ if (value === null || value === undefined) {
+ return items;
+ }
+- return {
+- ...items,
+- [item.name]: value,
+- };
+- }, {});
+- return { ...oldAttributes, ...newAttributes };
++ items[item.name] = value;
++ return items;
++ }, oldAttributes || {});
++ return newAttributes;
+ },
+ };
+ }
+@@ -1323,7 +1322,7 @@ const cut = (originRange, targetPos) => ({ editor, tr }) => {
tr.deleteRange(originRange.from, originRange.to);
const newPos = tr.mapping.map(targetPos);
tr.insert(newPos, contentSlice.content);
@@ -52,7 +200,33 @@ index 554e919..cdd21be 100644
return true;
};
-@@ -1897,9 +1897,24 @@ const lift = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
+@@ -1583,24 +1582,11 @@ const insertContent = (value, options) => ({ tr, commands }) => {
+ return commands.insertContentAt({ from: tr.selection.from, to: tr.selection.to }, value, options);
+ };
+
+-const removeWhitespaces = (node) => {
+- const children = node.childNodes;
+- for (let i = children.length - 1; i >= 0; i -= 1) {
+- const child = children[i];
+- if (child.nodeType === 3 && child.nodeValue && /^(\n\s\s|\n)$/.test(child.nodeValue)) {
+- node.removeChild(child);
+- }
+- else if (child.nodeType === 1) {
+- removeWhitespaces(child);
+- }
+- }
+- return node;
+-};
+ function elementFromString(value) {
+ // add a wrapper to preserve leading and trailing whitespace
+ const wrappedValue = `<body>${value}</body>`;
+ const html = new window.DOMParser().parseFromString(wrappedValue, 'text/html').body;
+- return removeWhitespaces(html);
++ return html;
+ }
+
+ function createNodeFromContent(content, schema, options) {
+@@ -1897,9 +1883,24 @@ const lift = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
return lift$1(state, dispatch);
};
@@ -80,6 +254,72 @@ index 554e919..cdd21be 100644
const liftListItem = typeOrName => ({ state, dispatch }) => {
const type = getNodeType(typeOrName, state.schema);
+@@ -3275,16 +3276,20 @@ const Keymap = Extension.create({
+ new Plugin({
+ key: new PluginKey('clearDocument'),
+ appendTransaction: (transactions, oldState, newState) => {
++ const { empty, from, to } = oldState.selection;
++ if (empty) {
++ return;
++ }
++
+ const docChanges = transactions.some(transaction => transaction.docChanged)
+- && !oldState.doc.eq(newState.doc);
++ && oldState.doc.nodeSize !== newState.doc.nodeSize;
+ if (!docChanges) {
+ return;
+ }
+- const { empty, from, to } = oldState.selection;
+ const allFrom = Selection.atStart(oldState.doc).from;
+ const allEnd = Selection.atEnd(oldState.doc).to;
+ const allWasSelected = from === allFrom && to === allEnd;
+- if (empty || !allWasSelected) {
++ if (!allWasSelected) {
+ return;
+ }
+ const isEmpty = newState.doc.textBetween(0, newState.doc.content.size, ' ', ' ').length === 0;
+@@ -3784,23 +3789,30 @@ class Editor extends EventEmitter {
+ * Creates a ProseMirror view.
+ */
+ createView() {
+- const doc = createDocument(this.options.content, this.schema, this.options.parseOptions);
+- const selection = resolveFocusPosition(doc, this.options.autofocus);
+ this.view = new EditorView(this.options.element, {
+ ...this.options.editorProps,
+ dispatchTransaction: this.dispatchTransaction.bind(this),
+ state: EditorState.create({
+- doc,
+- selection: selection || undefined,
+- }),
++ doc: this.schema.topNodeType.create(),
++ })
+ });
+- // `editor.view` is not yet available at this time.
+- // Therefore we will add all plugins and node views directly afterwards.
+- const newState = this.state.reconfigure({
+- plugins: this.extensionManager.plugins,
++
++ setTimeout(() => {
++ const doc = createDocument(this.options.content, this.schema, this.options.parseOptions);
++ const selection = resolveFocusPosition(doc, this.options.autofocus);
++ // `editor.view` is not yet available at this time.
++ // Therefore we will add all plugins and node views directly afterwards.
++ const newState = EditorState.create({
++ plugins: this.extensionManager.plugins,
++ doc,
++ selection
++ });
++
++ this.view.setProps({
++ state: newState,
++ nodeViews: this.extensionManager.nodeViews
++ })
+ });
+- this.view.updateState(newState);
+- this.createNodeViews();
+ this.prependClass();
+ // Let’s store the editor instance in the DOM element.
+ // So we’ll have access to it for tests.
diff --git a/node_modules/@tiptap/core/dist/packages/core/src/Editor.d.ts b/node_modules/@tiptap/core/dist/packages/core/src/Editor.d.ts
index 55d710f..e9698f5 100644
--- a/node_modules/@tiptap/core/dist/packages/core/src/Editor.d.ts