Skip to content

Do not insert a new paragraph when inserting a smiley #133

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
Cyperghost merged 1 commit into from
Oct 8, 2024
Merged

Do not insert a new paragraph when inserting a smiley #133

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
25 changes: 21 additions & 4 deletions plugins/ckeditor5-woltlab-smiley/src/woltlabsmileycommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import { Command, Editor } from "@ckeditor/ckeditor5-core";
import { Range } from "@ckeditor/ckeditor5-engine";
import { Range, Node } from "@ckeditor/ckeditor5-engine";

export default class WoltlabSmileyCommand extends Command {
/**
Expand Down Expand Up @@ -53,9 +53,26 @@ export default class WoltlabSmileyCommand extends Command {
const modelFragment = this.editor.data.toModel(viewFragment);

const smileyRange = model.insertContent(modelFragment, range);
writer.setSelection(
model.insertContent(writer.createText(" "), smileyRange.end).end,
);

// If a smiley is inserted at the beginning of a paragraph, `smileyRange`
// is not the range of the smiley, but the entire paragraph in which the smiley was inserted.
let element: Node = smileyRange.getContainedElement()!;
if (element.is("element", "paragraph")) {
element = element.getChild(0)!;
}

writer.setSelection(element, "after");

// Don't add a white space if the smiley is followed by a white space.
const nodeAfter = element.nextSibling;
const isFollowedByWhiteSpace =
nodeAfter && nodeAfter.is("$text") && nodeAfter.data.startsWith(" ");

if (!isFollowedByWhiteSpace) {
writer.setSelection(
model.insertContent(writer.createText(" "), element, "after").end,
);
}
});
}
}