Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 10:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: moving tables/blockQuote

Browse Source
This commit is contained in:
SiriusXT 2025-06-10 18:50:32 +08:00
parent e6c2f729f4
commit 3a56a16a58
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/ckeditor5/src/plugins/move_block_updown.ts
View File

@ -2,8 +2,7 @@
* https://github.com/TriliumNext/Notes/issues/1002
*/
import { Command, DocumentSelection, Element, Node, Plugin } from 'ckeditor5';
import { Command, DocumentSelection, Element, Node, Plugin, Range } from 'ckeditor5';
export default class MoveBlockUpDownPlugin extends Plugin {
init() {
@ -81,18 +80,26 @@ abstract class MoveBlockUpDownCommand extends Command {
}
}
// Restore selection to all items if many have been moved
if (
startOffset <= (firstBlock.maxOffset ?? Infinity) &&
endOffset <= (lastBlock.maxOffset ?? Infinity)
) {
writer.setSelection(
writer.createRange(
writer.createPositionAt(firstBlock, startOffset),
writer.createPositionAt(lastBlock, endOffset)
)
// Restore selection
let range: Range;
const maxStart = firstBlock.maxOffset ?? startOffset;
const maxEnd = lastBlock.maxOffset ?? endOffset;
// If original offsets valid within bounds, restore partial selection
if (startOffset <= maxStart && endOffset <= maxEnd) {
const clampedStart = Math.min(startOffset, maxStart);
const clampedEnd = Math.min(endOffset, maxEnd);
range = writer.createRange(
writer.createPositionAt(firstBlock, clampedStart),
writer.createPositionAt(lastBlock, clampedEnd)
);
} else { // Fallback: select entire moved blocks (handles tables)
range = writer.createRange(
writer.createPositionBefore(firstBlock),
writer.createPositionAfter(lastBlock)
);
}
writer.setSelection(range);
this.editor.editing.view.focus();
this.scrollToSelection();
});
@ -100,17 +107,27 @@ abstract class MoveBlockUpDownCommand extends Command {
getSelectedBlocks(selection: DocumentSelection) {
const blocks = [...selection.getSelectedBlocks()];
const resolved: Element[] = [];
// If the selected block is an object, such as a block quote or admonition, return the entire block.
if (blocks.length === 1) {
const block = blocks[0];
const parent = block.parent;
if (!parent?.name?.startsWith('$')) {
return [parent as Element];
// Selects elements (such as Mermaid) when there are no blocks
if (!blocks.length) {
const selectedObj = selection.getSelectedElement();
if (selectedObj) {
return [selectedObj];
}
}
return blocks;
for (const block of blocks) {
let el: Element = block;
// Traverse up until the parent is the root ($root) or there is no parent
while (el.parent && el.parent.name !== '$root') {
el = el.parent as Element;
}
resolved.push(el);
}
// Deduplicate adjacent duplicates (e.g., nested selections resolving to same block)
return resolved.filter((blk, idx) => idx === 0 || blk !== resolved[idx - 1]);
}
scrollToSelection() {