gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-28 19:44:24 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix(ckeditor): Cmd+Up/Down not working properly

Browse Source
This commit is contained in:
Elian Doran 2025-11-27 20:00:15 +02:00
parent 786f0db4bb
commit 073c02ee0c
No known key found for this signature in database
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* https://github.com/TriliumNext/Trilium/issues/1002 * https://github.com/TriliumNext/Trilium/issues/1002
*/ */
import { Command, ModelDocumentSelection, ModelElement, ModelNode, Plugin, ModelRange, _isMac } from 'ckeditor5'; import { Command, ModelDocumentSelection, ModelElement, ModelNode, Plugin, ModelRange, _isMac, Editor } from 'ckeditor5';
const keyMap = { const keyMap = {
ArrowUp: 'moveBlockUp', ArrowUp: 'moveBlockUp',
@ -33,7 +33,21 @@ export default class MoveBlockUpDownPlugin extends Plugin {
const isOnlyMeta = (!e.ctrlKey && !e.altKey && e.metaKey); const isOnlyMeta = (!e.ctrlKey && !e.altKey && e.metaKey);
const isOnlyAlt = (!e.ctrlKey && e.altKey && !e.metaKey); const isOnlyAlt = (!e.ctrlKey && e.altKey && !e.metaKey);
if ((!isMac && isOnlyMeta) || isOnlyAlt) { // on Mac, Cmd+Up and Cmd+Down are supposed to jump to the beginning/end of the document.
// Cmd+Down works in CKEditor, but Cmd+Up doesn't for some reason.
if (isMac && isOnlyMeta) {
e.preventDefault();
e.stopImmediatePropagation();
editor.model.change(writer => {
const position = (command === "moveBlockUp" ? 0 : "end");
writer.setSelection(writer.createPositionAt( editor.model.document.getRoot(), position));
scrollToSelection(editor);
} );
return;
}
if (isOnlyMeta || isOnlyAlt) {
e.preventDefault(); e.preventDefault();
e.stopImmediatePropagation(); e.stopImmediatePropagation();
editor.execute(command); editor.execute(command);
@ -102,8 +116,7 @@ abstract class MoveBlockUpDownCommand extends Command {
} }
writer.setSelection(range); writer.setSelection(range);
this.editor.editing.view.focus(); this.editor.editing.view.focus();
scrollToSelection(this.editor);
this.scrollToSelection();
}); });
} }
@ -131,13 +144,6 @@ abstract class MoveBlockUpDownCommand extends Command {
// Deduplicate adjacent duplicates (e.g., nested selections resolving to same block) // Deduplicate adjacent duplicates (e.g., nested selections resolving to same block)
return resolved.filter((blk, idx) => idx === 0 || blk !== resolved[idx - 1]); return resolved.filter((blk, idx) => idx === 0 || blk !== resolved[idx - 1]);
} }
scrollToSelection() {
// Ensure scroll happens in sync with DOM updates
requestAnimationFrame(() => {
this.editor.editing.view.scrollToTheSelection();
});
};
} }
class MoveBlockUpCommand extends MoveBlockUpDownCommand { class MoveBlockUpCommand extends MoveBlockUpDownCommand {
@ -164,3 +170,10 @@ class MoveBlockDownCommand extends MoveBlockUpDownCommand {
return "after" as const; return "after" as const;
} }
} }
function scrollToSelection(editor: Editor) {
// Ensure scroll happens in sync with DOM updates
requestAnimationFrame(() => {
editor.editing.view.scrollToTheSelection();
});
};