@blocknote/core 0.19.0 → 0.19.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/blocknote.js +2549 -2497
- package/dist/blocknote.js.map +1 -1
- package/dist/blocknote.umd.cjs +6 -6
- package/dist/blocknote.umd.cjs.map +1 -1
- package/dist/src/api/blockManipulation/commands/moveBlock/moveBlock.test.js +5 -1
- package/dist/src/api/blockManipulation/commands/moveBlock/moveBlock.test.js.map +1 -1
- package/dist/src/api/blockManipulation/commands/removeBlocks/removeBlocks.js +2 -40
- package/dist/src/api/blockManipulation/commands/removeBlocks/removeBlocks.js.map +1 -1
- package/dist/src/api/blockManipulation/commands/removeBlocks/removeBlocks.test.js +4 -0
- package/dist/src/api/blockManipulation/commands/removeBlocks/removeBlocks.test.js.map +1 -1
- package/dist/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.js +51 -9
- package/dist/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.js.map +1 -1
- package/dist/src/api/blockManipulation/commands/splitBlock/splitBlock.js +2 -2
- package/dist/src/api/blockManipulation/commands/splitBlock/splitBlock.js.map +1 -1
- package/dist/src/api/clipboard/fromClipboard/acceptedMIMETypes.js +1 -1
- package/dist/src/api/clipboard/fromClipboard/acceptedMIMETypes.js.map +1 -1
- package/dist/src/api/clipboard/fromClipboard/handleFileInsertion.js +4 -2
- package/dist/src/api/clipboard/fromClipboard/handleFileInsertion.js.map +1 -1
- package/dist/src/api/getBlockInfoFromPos.js +19 -25
- package/dist/src/api/getBlockInfoFromPos.js.map +1 -1
- package/dist/src/blocks/HeadingBlockContent/HeadingBlockContent.js +8 -4
- package/dist/src/blocks/HeadingBlockContent/HeadingBlockContent.js.map +1 -1
- package/dist/src/blocks/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.js +5 -3
- package/dist/src/blocks/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.js.map +1 -1
- package/dist/src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.js +12 -6
- package/dist/src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.js.map +1 -1
- package/dist/src/blocks/ListItemBlockContent/ListItemKeyboardShortcuts.js +5 -1
- package/dist/src/blocks/ListItemBlockContent/ListItemKeyboardShortcuts.js.map +1 -1
- package/dist/src/blocks/ListItemBlockContent/NumberedListItemBlockContent/NumberedListItemBlockContent.js +4 -2
- package/dist/src/blocks/ListItemBlockContent/NumberedListItemBlockContent/NumberedListItemBlockContent.js.map +1 -1
- package/dist/src/blocks/ParagraphBlockContent/ParagraphBlockContent.js +2 -1
- package/dist/src/blocks/ParagraphBlockContent/ParagraphBlockContent.js.map +1 -1
- package/dist/src/blocks/TableBlockContent/TableBlockContent.js +0 -1
- package/dist/src/blocks/TableBlockContent/TableBlockContent.js.map +1 -1
- package/dist/src/editor/BlockNoteEditor.js +39 -43
- package/dist/src/editor/BlockNoteEditor.js.map +1 -1
- package/dist/src/editor/BlockNoteEditor.test.js +2 -2
- package/dist/src/editor/BlockNoteEditor.test.js.map +1 -1
- package/dist/src/editor/BlockNoteExtensions.js +52 -6
- package/dist/src/editor/BlockNoteExtensions.js.map +1 -1
- package/dist/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.js +36 -6
- package/dist/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.js.map +1 -1
- package/dist/src/extensions/NodeSelectionKeyboard/NodeSelectionKeyboardPlugin.js +35 -32
- package/dist/src/extensions/NodeSelectionKeyboard/NodeSelectionKeyboardPlugin.js.map +1 -1
- package/dist/src/extensions/Placeholder/PlaceholderPlugin.js +74 -71
- package/dist/src/extensions/Placeholder/PlaceholderPlugin.js.map +1 -1
- package/dist/src/extensions/PreviousBlockType/PreviousBlockTypePlugin.js +153 -149
- package/dist/src/extensions/PreviousBlockType/PreviousBlockTypePlugin.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/webpack-stats.json +1 -1
- package/package.json +2 -2
- package/src/api/blockManipulation/commands/insertBlocks/__snapshots__/insertBlocks.test.ts.snap +0 -6
- package/src/api/blockManipulation/commands/mergeBlocks/__snapshots__/mergeBlocks.test.ts.snap +0 -5
- package/src/api/blockManipulation/commands/moveBlock/__snapshots__/moveBlock.test.ts.snap +0 -8
- package/src/api/blockManipulation/commands/moveBlock/moveBlock.test.ts +7 -3
- package/src/api/blockManipulation/commands/removeBlocks/__snapshots__/removeBlocks.test.ts.snap +439 -2
- package/src/api/blockManipulation/commands/removeBlocks/removeBlocks.test.ts +6 -0
- package/src/api/blockManipulation/commands/removeBlocks/removeBlocks.ts +2 -82
- package/src/api/blockManipulation/commands/replaceBlocks/__snapshots__/replaceBlocks.test.ts.snap +0 -8
- package/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.ts +96 -20
- package/src/api/blockManipulation/commands/splitBlock/__snapshots__/splitBlock.test.ts.snap +0 -6
- package/src/api/blockManipulation/commands/splitBlock/splitBlock.ts +2 -5
- package/src/api/blockManipulation/commands/updateBlock/__snapshots__/updateBlock.test.ts.snap +0 -490
- package/src/api/clipboard/fromClipboard/acceptedMIMETypes.ts +1 -1
- package/src/api/clipboard/fromClipboard/handleFileInsertion.ts +6 -5
- package/src/api/getBlockInfoFromPos.ts +20 -30
- package/src/api/parsers/html/__snapshots__/parse-notion-html.json +1 -2
- package/src/blocks/HeadingBlockContent/HeadingBlockContent.ts +16 -4
- package/src/blocks/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.ts +9 -3
- package/src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.ts +22 -6
- package/src/blocks/ListItemBlockContent/ListItemKeyboardShortcuts.ts +5 -3
- package/src/blocks/ListItemBlockContent/NumberedListItemBlockContent/NumberedListItemBlockContent.ts +8 -2
- package/src/blocks/ParagraphBlockContent/ParagraphBlockContent.ts +4 -1
- package/src/blocks/TableBlockContent/TableBlockContent.ts +0 -1
- package/src/editor/BlockNoteEditor.test.ts +2 -5
- package/src/editor/BlockNoteEditor.ts +71 -42
- package/src/editor/BlockNoteExtensions.ts +90 -14
- package/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts +36 -9
- package/src/extensions/NodeSelectionKeyboard/NodeSelectionKeyboardPlugin.ts +45 -42
- package/src/extensions/Placeholder/PlaceholderPlugin.ts +94 -90
- package/src/extensions/PreviousBlockType/PreviousBlockTypePlugin.ts +173 -169
- package/types/src/api/blockManipulation/commands/removeBlocks/removeBlocks.d.ts +0 -3
- package/types/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.d.ts +4 -0
- package/types/src/api/blockManipulation/setupTestEnv.d.ts +0 -6
- package/types/src/api/clipboard/fromClipboard/acceptedMIMETypes.d.ts +1 -1
- package/types/src/api/getBlockInfoFromPos.d.ts +9 -34
- package/types/src/api/testUtil/cases/customBlocks.d.ts +0 -6
- package/types/src/api/testUtil/cases/customInlineContent.d.ts +0 -6
- package/types/src/api/testUtil/cases/customStyles.d.ts +0 -6
- package/types/src/blocks/TableBlockContent/TableBlockContent.d.ts +0 -9
- package/types/src/blocks/defaultBlocks.d.ts +0 -12
- package/types/src/editor/BlockNoteEditor.d.ts +19 -2
- package/types/src/editor/BlockNoteExtensions.d.ts +14 -7
- package/types/src/extensions/NodeSelectionKeyboard/NodeSelectionKeyboardPlugin.d.ts +4 -1
- package/types/src/extensions/Placeholder/PlaceholderPlugin.d.ts +4 -1
- package/types/src/extensions/PreviousBlockType/PreviousBlockTypePlugin.d.ts +4 -5
|
@@ -6,7 +6,11 @@ import { setupTestEnv } from "../../setupTestEnv.js";
|
|
|
6
6
|
import { moveBlockDown, moveBlockUp, moveSelectedBlockAndSelection, } from "./moveBlock.js";
|
|
7
7
|
const getEditor = setupTestEnv();
|
|
8
8
|
function makeSelectionSpanContent(selectionType) {
|
|
9
|
-
const
|
|
9
|
+
const blockInfo = getBlockInfoFromSelection(getEditor()._tiptapEditor.state);
|
|
10
|
+
if (!blockInfo.isBlockContainer) {
|
|
11
|
+
throw new Error(`Selection points to a ${blockInfo.blockNoteType} node, not a blockContainer node`);
|
|
12
|
+
}
|
|
13
|
+
const { blockContent } = blockInfo;
|
|
10
14
|
if (selectionType === "cell") {
|
|
11
15
|
getEditor()._tiptapEditor.view.dispatch(getEditor()._tiptapEditor.state.tr.setSelection(CellSelection.create(getEditor()._tiptapEditor.state.doc, getEditor()
|
|
12
16
|
._tiptapEditor.state.doc.resolve(blockContent.beforePos + 3)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moveBlock.test.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/moveBlock/moveBlock.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,aAAa,EACb,WAAW,EACX,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AAExB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;AAEjC,SAAS,wBAAwB,CAAC,aAAuC;IACvE,MAAM,
|
|
1
|
+
{"version":3,"file":"moveBlock.test.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/moveBlock/moveBlock.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,43 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export function removeBlocksWithCallback(editor, blocksToRemove,
|
|
3
|
-
// Should return new removedSize.
|
|
4
|
-
callback) {
|
|
5
|
-
const ttEditor = editor._tiptapEditor;
|
|
6
|
-
const tr = ttEditor.state.tr;
|
|
7
|
-
const idsOfBlocksToRemove = new Set(blocksToRemove.map((block) => typeof block === "string" ? block : block.id));
|
|
8
|
-
const removedBlocks = [];
|
|
9
|
-
let removedSize = 0;
|
|
10
|
-
ttEditor.state.doc.descendants((node, pos) => {
|
|
11
|
-
// Skips traversing nodes after all target blocks have been removed.
|
|
12
|
-
if (idsOfBlocksToRemove.size === 0) {
|
|
13
|
-
return false;
|
|
14
|
-
}
|
|
15
|
-
// Keeps traversing nodes if block with target ID has not been found.
|
|
16
|
-
if (!node.type.isInGroup("bnBlock") ||
|
|
17
|
-
!idsOfBlocksToRemove.has(node.attrs.id)) {
|
|
18
|
-
return true;
|
|
19
|
-
}
|
|
20
|
-
// Saves the block that is being deleted.
|
|
21
|
-
removedBlocks.push(nodeToBlock(node, editor.schema.blockSchema, editor.schema.inlineContentSchema, editor.schema.styleSchema, editor.blockCache));
|
|
22
|
-
idsOfBlocksToRemove.delete(node.attrs.id);
|
|
23
|
-
// Removes the block and calculates the change in document size.
|
|
24
|
-
removedSize = callback?.(node, pos, tr, removedSize) || removedSize;
|
|
25
|
-
const oldDocSize = tr.doc.nodeSize;
|
|
26
|
-
tr.delete(pos - removedSize - 1, pos - removedSize + node.nodeSize + 1);
|
|
27
|
-
const newDocSize = tr.doc.nodeSize;
|
|
28
|
-
removedSize += oldDocSize - newDocSize;
|
|
29
|
-
return false;
|
|
30
|
-
});
|
|
31
|
-
// Throws an error if now all blocks could be found.
|
|
32
|
-
if (idsOfBlocksToRemove.size > 0) {
|
|
33
|
-
const notFoundIds = [...idsOfBlocksToRemove].join("\n");
|
|
34
|
-
throw Error("Blocks with the following IDs could not be found in the editor: " +
|
|
35
|
-
notFoundIds);
|
|
36
|
-
}
|
|
37
|
-
editor.dispatch(tr);
|
|
38
|
-
return removedBlocks;
|
|
39
|
-
}
|
|
1
|
+
import { removeAndInsertBlocks } from "../replaceBlocks/replaceBlocks.js";
|
|
40
2
|
export function removeBlocks(editor, blocksToRemove) {
|
|
41
|
-
return
|
|
3
|
+
return removeAndInsertBlocks(editor, blocksToRemove, []).removedBlocks;
|
|
42
4
|
}
|
|
43
5
|
//# sourceMappingURL=removeBlocks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeBlocks.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/removeBlocks/removeBlocks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"removeBlocks.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/removeBlocks/removeBlocks.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,UAAU,YAAY,CAK1B,MAAsC,EACtC,cAAiC;IAEjC,OAAO,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC;AACzE,CAAC"}
|
|
@@ -23,5 +23,9 @@ describe("Test removeBlocks", () => {
|
|
|
23
23
|
]);
|
|
24
24
|
expect(getEditor().document).toMatchSnapshot();
|
|
25
25
|
});
|
|
26
|
+
it("Remove all child blocks", () => {
|
|
27
|
+
removeBlocks(getEditor(), ["nested-paragraph-0"]);
|
|
28
|
+
expect(getEditor().document).toMatchSnapshot();
|
|
29
|
+
});
|
|
26
30
|
});
|
|
27
31
|
//# sourceMappingURL=removeBlocks.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeBlocks.test.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/removeBlocks/removeBlocks.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;AAEjC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QAE3C,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,YAAY,CAAC,SAAS,EAAE,EAAE;YACxB,aAAa;YACb,aAAa;YACb,yBAAyB;SAC1B,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,YAAY,CAAC,SAAS,EAAE,EAAE;YACxB,aAAa;YACb,SAAS;YACT,yBAAyB;SAC1B,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"removeBlocks.test.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/removeBlocks/removeBlocks.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;AAEjC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QAE3C,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,YAAY,CAAC,SAAS,EAAE,EAAE;YACxB,aAAa;YACb,aAAa;YACb,yBAAyB;SAC1B,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,YAAY,CAAC,SAAS,EAAE,EAAE;YACxB,aAAa;YACb,SAAS;YACT,yBAAyB;SAC1B,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAElD,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,29 +1,71 @@
|
|
|
1
1
|
import { blockToNode } from "../../../nodeConversions/blockToNode.js";
|
|
2
2
|
import { nodeToBlock } from "../../../nodeConversions/nodeToBlock.js";
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
export function removeAndInsertBlocks(editor, blocksToRemove, blocksToInsert) {
|
|
4
|
+
const ttEditor = editor._tiptapEditor;
|
|
5
|
+
let tr = ttEditor.state.tr;
|
|
6
|
+
// Converts the `PartialBlock`s to ProseMirror nodes to insert them into the
|
|
7
|
+
// document.
|
|
5
8
|
const nodesToInsert = [];
|
|
6
9
|
for (const block of blocksToInsert) {
|
|
7
10
|
nodesToInsert.push(blockToNode(block, editor.pmSchema, editor.schema.styleSchema));
|
|
8
11
|
}
|
|
12
|
+
const idsOfBlocksToRemove = new Set(blocksToRemove.map((block) => typeof block === "string" ? block : block.id));
|
|
13
|
+
const removedBlocks = [];
|
|
9
14
|
const idOfFirstBlock = typeof blocksToRemove[0] === "string"
|
|
10
15
|
? blocksToRemove[0]
|
|
11
16
|
: blocksToRemove[0].id;
|
|
12
|
-
|
|
13
|
-
|
|
17
|
+
let removedSize = 0;
|
|
18
|
+
ttEditor.state.doc.descendants((node, pos) => {
|
|
19
|
+
// Skips traversing nodes after all target blocks have been removed.
|
|
20
|
+
if (idsOfBlocksToRemove.size === 0) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
// Keeps traversing nodes if block with target ID has not been found.
|
|
24
|
+
if (!node.type.isInGroup("bnBlock") ||
|
|
25
|
+
!idsOfBlocksToRemove.has(node.attrs.id)) {
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
// Saves the block that is being deleted.
|
|
29
|
+
removedBlocks.push(nodeToBlock(node, editor.schema.blockSchema, editor.schema.inlineContentSchema, editor.schema.styleSchema, editor.blockCache));
|
|
30
|
+
idsOfBlocksToRemove.delete(node.attrs.id);
|
|
31
|
+
if (blocksToInsert.length > 0 && node.attrs.id === idOfFirstBlock) {
|
|
14
32
|
const oldDocSize = tr.doc.nodeSize;
|
|
15
|
-
tr.insert(pos, nodesToInsert);
|
|
33
|
+
tr = tr.insert(pos, nodesToInsert);
|
|
16
34
|
const newDocSize = tr.doc.nodeSize;
|
|
17
|
-
|
|
35
|
+
removedSize += oldDocSize - newDocSize;
|
|
36
|
+
}
|
|
37
|
+
const oldDocSize = tr.doc.nodeSize;
|
|
38
|
+
// Checks if the block is the only child of its parent. In this case, we
|
|
39
|
+
// need to delete the parent `blockGroup` node instead of just the
|
|
40
|
+
// `blockContainer`.
|
|
41
|
+
const $pos = tr.doc.resolve(pos - removedSize);
|
|
42
|
+
if ($pos.node().type.name === "blockGroup" &&
|
|
43
|
+
$pos.node($pos.depth - 1).type.name !== "doc" &&
|
|
44
|
+
$pos.node().childCount === 1) {
|
|
45
|
+
tr = tr.delete($pos.before(), $pos.after());
|
|
18
46
|
}
|
|
19
|
-
|
|
47
|
+
else {
|
|
48
|
+
tr = tr.delete(pos - removedSize, pos - removedSize + node.nodeSize);
|
|
49
|
+
}
|
|
50
|
+
const newDocSize = tr.doc.nodeSize;
|
|
51
|
+
removedSize += oldDocSize - newDocSize;
|
|
52
|
+
return false;
|
|
20
53
|
});
|
|
21
|
-
//
|
|
22
|
-
|
|
54
|
+
// Throws an error if now all blocks could be found.
|
|
55
|
+
if (idsOfBlocksToRemove.size > 0) {
|
|
56
|
+
const notFoundIds = [...idsOfBlocksToRemove].join("\n");
|
|
57
|
+
throw Error("Blocks with the following IDs could not be found in the editor: " +
|
|
58
|
+
notFoundIds);
|
|
59
|
+
}
|
|
60
|
+
editor.dispatch(tr);
|
|
61
|
+
// Converts the nodes created from `blocksToInsert` into full `Block`s.
|
|
23
62
|
const insertedBlocks = [];
|
|
24
63
|
for (const node of nodesToInsert) {
|
|
25
64
|
insertedBlocks.push(nodeToBlock(node, editor.schema.blockSchema, editor.schema.inlineContentSchema, editor.schema.styleSchema, editor.blockCache));
|
|
26
65
|
}
|
|
27
66
|
return { insertedBlocks, removedBlocks };
|
|
28
67
|
}
|
|
68
|
+
export function replaceBlocks(editor, blocksToRemove, blocksToInsert) {
|
|
69
|
+
return removeAndInsertBlocks(editor, blocksToRemove, blocksToInsert);
|
|
70
|
+
}
|
|
29
71
|
//# sourceMappingURL=replaceBlocks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replaceBlocks.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replaceBlocks.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { getBlockInfo,
|
|
1
|
+
import { getBlockInfo, getNearestBlockPos, } from "../../../getBlockInfoFromPos.js";
|
|
2
2
|
export const splitBlockCommand = (posInBlock, keepType, keepProps) => {
|
|
3
3
|
return ({ state, dispatch, }) => {
|
|
4
|
-
const nearestBlockContainerPos =
|
|
4
|
+
const nearestBlockContainerPos = getNearestBlockPos(state.doc, posInBlock);
|
|
5
5
|
const info = getBlockInfo(nearestBlockContainerPos);
|
|
6
6
|
if (!info.isBlockContainer) {
|
|
7
7
|
throw new Error(`BlockContainer expected when calling splitBlock, position ${posInBlock}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splitBlock.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/splitBlock/splitBlock.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"splitBlock.js","sourceRoot":"","sources":["../../../../../../src/api/blockManipulation/commands/splitBlock/splitBlock.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,UAAkB,EAClB,QAAkB,EAClB,SAAmB,EACnB,EAAE;IACF,OAAO,CAAC,EACN,KAAK,EACL,QAAQ,GAIT,EAAE,EAAE;QACH,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAE3E,MAAM,IAAI,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,6DAA6D,UAAU,EAAE,CAC1E,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG;YACZ;gBACE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,kCAAkC;gBAChE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE;aACtE;YACD;gBACE,IAAI,EAAE,QAAQ;oBACZ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;oBAC7B,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBACnC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;aAC5D;SACF,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptedMIMETypes.js","sourceRoot":"","sources":["../../../../../src/api/clipboard/fromClipboard/acceptedMIMETypes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,oBAAoB;IACpB,gBAAgB;IAChB,
|
|
1
|
+
{"version":3,"file":"acceptedMIMETypes.js","sourceRoot":"","sources":["../../../../../src/api/clipboard/fromClipboard/acceptedMIMETypes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,oBAAoB;IACpB,gBAAgB;IAChB,WAAW;IACX,YAAY;IACZ,OAAO;CACC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getBlockInfo,
|
|
1
|
+
import { getBlockInfo, getNearestBlockPos } from "../../getBlockInfoFromPos.js";
|
|
2
2
|
import { acceptedMIMETypes } from "./acceptedMIMETypes.js";
|
|
3
3
|
function checkFileExtensionsMatch(fileExtension1, fileExtension2) {
|
|
4
4
|
if (!fileExtension1.startsWith(".") || !fileExtension2.startsWith(".")) {
|
|
@@ -25,6 +25,8 @@ function checkMIMETypesMatch(mimeType1, mimeType2) {
|
|
|
25
25
|
}
|
|
26
26
|
export async function handleFileInsertion(event, editor) {
|
|
27
27
|
if (!editor.uploadFile) {
|
|
28
|
+
// eslint-disable-next-line no-console
|
|
29
|
+
console.warn("Attempted ot insert file, but uploadFile is not set in the BlockNote editor options");
|
|
28
30
|
return;
|
|
29
31
|
}
|
|
30
32
|
const dataTransfer = "dataTransfer" in event ? event.dataTransfer : event.clipboardData;
|
|
@@ -87,7 +89,7 @@ export async function handleFileInsertion(event, editor) {
|
|
|
87
89
|
if (!pos) {
|
|
88
90
|
return;
|
|
89
91
|
}
|
|
90
|
-
const posInfo =
|
|
92
|
+
const posInfo = getNearestBlockPos(editor._tiptapEditor.state.doc, pos.pos);
|
|
91
93
|
const blockInfo = getBlockInfo(posInfo);
|
|
92
94
|
insertedBlockId = editor.insertBlocks([fileBlock], blockInfo.bnBlock.node.attrs.id, "after")[0].id;
|
|
93
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleFileInsertion.js","sourceRoot":"","sources":["../../../../../src/api/clipboard/fromClipboard/handleFileInsertion.ts"],"names":[],"mappings":"AAQA,OAAO,
|
|
1
|
+
{"version":3,"file":"handleFileInsertion.js","sourceRoot":"","sources":["../../../../../src/api/clipboard/fromClipboard/handleFileInsertion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Retrieves the position just before the nearest
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* just before the last blockContainer is returned.
|
|
2
|
+
* Retrieves the position just before the nearest block node in a ProseMirror
|
|
3
|
+
* doc, relative to a position. If the position is within a block node or its
|
|
4
|
+
* descendants, the position just before it is returned. If the position is not
|
|
5
|
+
* within a block node or its descendants, the position just before the next
|
|
6
|
+
* closest block node is returned. If the position is beyond the last block, the
|
|
7
|
+
* position just before the last block is returned.
|
|
9
8
|
* @param doc The ProseMirror doc.
|
|
10
9
|
* @param pos An integer position in the document.
|
|
11
10
|
* @returns The position just before the nearest blockContainer node.
|
|
12
11
|
*/
|
|
13
|
-
export function
|
|
12
|
+
export function getNearestBlockPos(doc, pos) {
|
|
14
13
|
const $pos = doc.resolve(pos);
|
|
15
|
-
// Checks if the position provided is already just before a
|
|
16
|
-
//
|
|
14
|
+
// Checks if the position provided is already just before a block node, in
|
|
15
|
+
// which case we return the position.
|
|
17
16
|
if ($pos.nodeAfter && $pos.nodeAfter.type.isInGroup("bnBlock")) {
|
|
18
17
|
return {
|
|
19
18
|
posBeforeNode: $pos.pos,
|
|
@@ -21,7 +20,7 @@ export function getNearestBlockContainerPos(doc, pos) {
|
|
|
21
20
|
};
|
|
22
21
|
}
|
|
23
22
|
// Checks the node containing the position and its ancestors until a
|
|
24
|
-
//
|
|
23
|
+
// block node is found and returned.
|
|
25
24
|
let depth = $pos.depth;
|
|
26
25
|
let node = $pos.node(depth);
|
|
27
26
|
while (depth > 0) {
|
|
@@ -34,13 +33,12 @@ export function getNearestBlockContainerPos(doc, pos) {
|
|
|
34
33
|
depth--;
|
|
35
34
|
node = $pos.node(depth);
|
|
36
35
|
}
|
|
37
|
-
// If the position doesn't lie within a
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
//
|
|
42
|
-
//
|
|
43
|
-
// collaboration plugin.
|
|
36
|
+
// If the position doesn't lie within a block node, we instead find the
|
|
37
|
+
// position of the next closest one. If the position is beyond the last block,
|
|
38
|
+
// we return the position of the last block. While running `doc.descendants`
|
|
39
|
+
// is expensive, this case should be very rarely triggered. However, it's
|
|
40
|
+
// possible for the position to sometimes be beyond the last block node. This
|
|
41
|
+
// is a problem specifically when using the collaboration plugin.
|
|
44
42
|
const allBlockContainerPositions = [];
|
|
45
43
|
doc.descendants((node, pos) => {
|
|
46
44
|
if (node.type.isInGroup("bnBlock")) {
|
|
@@ -64,7 +62,7 @@ export function getNearestBlockContainerPos(doc, pos) {
|
|
|
64
62
|
* the ProseMirror positions just before & after each node.
|
|
65
63
|
* @param node The main `blockContainer` node that the block information should
|
|
66
64
|
* be retrieved from,
|
|
67
|
-
* @param
|
|
65
|
+
* @param bnBlockBeforePosOffset the position just before the
|
|
68
66
|
* `blockContainer` node in the document.
|
|
69
67
|
*/
|
|
70
68
|
export function getBlockInfoWithManualOffset(node, bnBlockBeforePosOffset) {
|
|
@@ -161,11 +159,7 @@ export function getBlockInfoFromResolvedPos(resolvedPos) {
|
|
|
161
159
|
* @param state The ProseMirror editor state.
|
|
162
160
|
*/
|
|
163
161
|
export function getBlockInfoFromSelection(state) {
|
|
164
|
-
const posInfo =
|
|
165
|
-
|
|
166
|
-
if (!ret.isBlockContainer) {
|
|
167
|
-
throw new Error(`selection always expected to return blockContainer ${state.selection.anchor}`);
|
|
168
|
-
}
|
|
169
|
-
return ret;
|
|
162
|
+
const posInfo = getNearestBlockPos(state.doc, state.selection.anchor);
|
|
163
|
+
return getBlockInfo(posInfo);
|
|
170
164
|
}
|
|
171
165
|
//# sourceMappingURL=getBlockInfoFromPos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBlockInfoFromPos.js","sourceRoot":"","sources":["../../../src/api/getBlockInfoFromPos.ts"],"names":[],"mappings":"AA8CA
|
|
1
|
+
{"version":3,"file":"getBlockInfoFromPos.js","sourceRoot":"","sources":["../../../src/api/getBlockInfoFromPos.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,8 @@ const HeadingBlockContent = createStronglyTypedTiptapNode({
|
|
|
41
41
|
find: new RegExp(`^(#{${level}})\\s$`),
|
|
42
42
|
handler: ({ state, chain, range }) => {
|
|
43
43
|
const blockInfo = getBlockInfoFromSelection(state);
|
|
44
|
-
if (blockInfo.
|
|
44
|
+
if (!blockInfo.isBlockContainer ||
|
|
45
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
45
46
|
return;
|
|
46
47
|
}
|
|
47
48
|
chain()
|
|
@@ -63,7 +64,8 @@ const HeadingBlockContent = createStronglyTypedTiptapNode({
|
|
|
63
64
|
return {
|
|
64
65
|
"Mod-Alt-1": () => {
|
|
65
66
|
const blockInfo = getBlockInfoFromSelection(this.editor.state);
|
|
66
|
-
if (blockInfo.
|
|
67
|
+
if (!blockInfo.isBlockContainer ||
|
|
68
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
67
69
|
return true;
|
|
68
70
|
}
|
|
69
71
|
// call updateBlockCommand
|
|
@@ -76,7 +78,8 @@ const HeadingBlockContent = createStronglyTypedTiptapNode({
|
|
|
76
78
|
},
|
|
77
79
|
"Mod-Alt-2": () => {
|
|
78
80
|
const blockInfo = getBlockInfoFromSelection(this.editor.state);
|
|
79
|
-
if (blockInfo.
|
|
81
|
+
if (!blockInfo.isBlockContainer ||
|
|
82
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
80
83
|
return true;
|
|
81
84
|
}
|
|
82
85
|
return this.editor.commands.command(updateBlockCommand(this.options.editor, blockInfo.bnBlock.beforePos, {
|
|
@@ -88,7 +91,8 @@ const HeadingBlockContent = createStronglyTypedTiptapNode({
|
|
|
88
91
|
},
|
|
89
92
|
"Mod-Alt-3": () => {
|
|
90
93
|
const blockInfo = getBlockInfoFromSelection(this.editor.state);
|
|
91
|
-
if (blockInfo.
|
|
94
|
+
if (!blockInfo.isBlockContainer ||
|
|
95
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
92
96
|
return true;
|
|
93
97
|
}
|
|
94
98
|
return this.editor.commands.command(updateBlockCommand(this.options.editor, blockInfo.bnBlock.beforePos, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeadingBlockContent.js","sourceRoot":"","sources":["../../../../src/blocks/HeadingBlockContent/HeadingBlockContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAEL,0CAA0C,EAC1C,6BAA6B,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,+BAA+B,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,GAAG,YAAY;IACf,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAU,EAAE;CAC7B,CAAC;AAEvB,MAAM,mBAAmB,GAAG,6BAA6B,CAAC;IACxD,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,cAAc;IACrB,aAAa;QACX,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;gBACV,kDAAkD;gBAClD,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;oBACrB,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,YAAY,CAAE,CAAC;oBACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC9B,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBACrB,OAAO,MAAM,CAAC;oBAChB,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE;oBACzB,OAAO;wBACL,YAAY,EAAG,UAAU,CAAC,KAAgB,CAAC,QAAQ,EAAE;qBACtD,CAAC;gBACJ,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAED,aAAa;QACX,OAAO;YACL,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACzB,iFAAiF;gBACjF,OAAO,IAAI,SAAS,CAAC;oBACnB,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;oBACtC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;wBACnC,MAAM,SAAS,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;wBACnD,
|
|
1
|
+
{"version":3,"file":"HeadingBlockContent.js","sourceRoot":"","sources":["../../../../src/blocks/HeadingBlockContent/HeadingBlockContent.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,8 @@ const BulletListItemBlockContent = createStronglyTypedTiptapNode({
|
|
|
22
22
|
find: new RegExp(`^[-+*]\\s$`),
|
|
23
23
|
handler: ({ state, chain, range }) => {
|
|
24
24
|
const blockInfo = getBlockInfoFromSelection(state);
|
|
25
|
-
if (blockInfo.
|
|
25
|
+
if (!blockInfo.isBlockContainer ||
|
|
26
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
26
27
|
return;
|
|
27
28
|
}
|
|
28
29
|
chain()
|
|
@@ -41,10 +42,11 @@ const BulletListItemBlockContent = createStronglyTypedTiptapNode({
|
|
|
41
42
|
Enter: () => handleEnter(this.options.editor),
|
|
42
43
|
"Mod-Shift-8": () => {
|
|
43
44
|
const blockInfo = getBlockInfoFromSelection(this.editor.state);
|
|
44
|
-
if (blockInfo.
|
|
45
|
+
if (!blockInfo.isBlockContainer ||
|
|
46
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
45
47
|
return true;
|
|
46
48
|
}
|
|
47
|
-
return this.
|
|
49
|
+
return this.editor.commands.command(updateBlockCommand(this.options.editor, blockInfo.bnBlock.beforePos, {
|
|
48
50
|
type: "bulletListItem",
|
|
49
51
|
props: {},
|
|
50
52
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BulletListItemBlockContent.js","sourceRoot":"","sources":["../../../../../src/blocks/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oEAAoE,CAAC;AACxG,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAEL,0CAA0C,EAC1C,6BAA6B,GAC9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,GAAG,YAAY;CACK,CAAC;AAEvB,MAAM,0BAA0B,GAAG,6BAA6B,CAAC;IAC/D,IAAI,EAAE,gBAAgB;IACtB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,cAAc;IACrB,0EAA0E;IAC1E,8DAA8D;IAC9D,QAAQ,EAAE,EAAE;IACZ,aAAa;QACX,OAAO;YACL,iEAAiE;YACjE,IAAI,SAAS,CAAC;gBACZ,IAAI,EAAE,IAAI,MAAM,CAAC,YAAY,CAAC;gBAC9B,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;oBACnC,MAAM,SAAS,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;oBACnD,
|
|
1
|
+
{"version":3,"file":"BulletListItemBlockContent.js","sourceRoot":"","sources":["../../../../../src/blocks/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.ts"],"names":[],"mappings":"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"}
|
package/dist/src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { InputRule } from "@tiptap/core";
|
|
2
2
|
import { updateBlockCommand } from "../../../api/blockManipulation/commands/updateBlock/updateBlock.js";
|
|
3
|
-
import { getBlockInfoFromSelection,
|
|
3
|
+
import { getBlockInfoFromSelection, getNearestBlockPos, } from "../../../api/getBlockInfoFromPos.js";
|
|
4
4
|
import { createBlockSpecFromStronglyTypedTiptapNode, createStronglyTypedTiptapNode, } from "../../../schema/index.js";
|
|
5
5
|
import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers.js";
|
|
6
6
|
import { defaultProps } from "../../defaultProps.js";
|
|
@@ -38,7 +38,8 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
|
|
|
38
38
|
find: new RegExp(`\\[\\s*\\]\\s$`),
|
|
39
39
|
handler: ({ state, chain, range }) => {
|
|
40
40
|
const blockInfo = getBlockInfoFromSelection(state);
|
|
41
|
-
if (blockInfo.
|
|
41
|
+
if (!blockInfo.isBlockContainer ||
|
|
42
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
42
43
|
return;
|
|
43
44
|
}
|
|
44
45
|
chain()
|
|
@@ -56,7 +57,8 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
|
|
|
56
57
|
find: new RegExp(`\\[[Xx]\\]\\s$`),
|
|
57
58
|
handler: ({ state, chain, range }) => {
|
|
58
59
|
const blockInfo = getBlockInfoFromSelection(state);
|
|
59
|
-
if (blockInfo.
|
|
60
|
+
if (!blockInfo.isBlockContainer ||
|
|
61
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
60
62
|
return;
|
|
61
63
|
}
|
|
62
64
|
chain()
|
|
@@ -76,8 +78,9 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
|
|
|
76
78
|
return {
|
|
77
79
|
Enter: () => handleEnter(this.options.editor),
|
|
78
80
|
"Mod-Shift-9": () => {
|
|
79
|
-
const blockInfo = getBlockInfoFromSelection(this.
|
|
80
|
-
if (blockInfo.
|
|
81
|
+
const blockInfo = getBlockInfoFromSelection(this.editor.state);
|
|
82
|
+
if (!blockInfo.isBlockContainer ||
|
|
83
|
+
blockInfo.blockContent.node.type.spec.content !== "inline*") {
|
|
81
84
|
return true;
|
|
82
85
|
}
|
|
83
86
|
return this.editor.commands.command(updateBlockCommand(this.options.editor, blockInfo.bnBlock.beforePos, {
|
|
@@ -175,7 +178,10 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
|
|
|
175
178
|
}
|
|
176
179
|
// TODO: test
|
|
177
180
|
if (typeof getPos !== "boolean") {
|
|
178
|
-
const beforeBlockContainerPos =
|
|
181
|
+
const beforeBlockContainerPos = getNearestBlockPos(editor.state.doc, getPos());
|
|
182
|
+
if (beforeBlockContainerPos.node.type.name !== "blockContainer") {
|
|
183
|
+
throw new Error(`Expected blockContainer node, got ${beforeBlockContainerPos.node.type.name}`);
|
|
184
|
+
}
|
|
179
185
|
this.editor.commands.command(updateBlockCommand(this.options.editor, beforeBlockContainerPos.posBeforeNode, {
|
|
180
186
|
type: "checkListItem",
|
|
181
187
|
props: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckListItemBlockContent.js","sourceRoot":"","sources":["../../../../../src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oEAAoE,CAAC;AACxG,OAAO,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"CheckListItemBlockContent.js","sourceRoot":"","sources":["../../../../../src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.ts"],"names":[],"mappings":"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"}
|