Skip to content

fix: preserve marks across a shift+enter #1672 #1743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

fix: preserve marks across a shift+enter #1672 #1743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions packages/core/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ export const KeyboardShortcutsExtension = Extension.create<{
]);

const handleEnter = (withShift = false) => {
return this.editor.commands.first(({ commands }) => [
return this.editor.commands.first(({ commands, tr }) => [
// Removes a level of nesting if the block is empty & indented, while the selection is also empty & at the start
// of the block.
() =>
Expand Down Expand Up @@ -486,9 +486,21 @@ export const KeyboardShortcutsExtension = Extension.create<{
// both enter and shift+enter.
blockHardBreakShortcut === "enter"
) {
return commands.insertContent({
type: "hardBreak",
});
const marks =
tr.storedMarks ||
tr.selection.$head
.marks()
.filter((m) =>
this.editor.extensionManager.splittableMarks.includes(
m.type.name,
),
);

tr.insert(
tr.selection.head,
tr.doc.type.schema.nodes.hardBreak.create(),
).ensureMarks(marks);
return true;
}

return false;
Expand Down
Loading