Skip to content

A platform for community discussion. Free, open, simple.

FIX: Emoji autocomplete after a Unicode ellipsis

Jake Goldsborough221d3ce9c906
diff --git a/frontend/discourse/app/ui-kit/modifiers/d-autocomplete.js b/frontend/discourse/app/ui-kit/modifiers/d-autocomplete.js
index 93a0ebf1809..cb5136aa582 100644
--- a/frontend/discourse/app/ui-kit/modifiers/d-autocomplete.js
+++ b/frontend/discourse/app/ui-kit/modifiers/d-autocomplete.js
@@ -22,7 +22,7 @@ export const CANCELLED_STATUS = "__CANCELLED";
* Used to ensure consistency between trigger detection and completion position calculation.
*/
export const EMOJI_ALLOWED_PRECEDING_CHARS_REGEXP =
- /[\s.?,@/#!%&*;:\[\]{}=\-_()+]/;
+ /[\s.…?,@/#!%&*;:\[\]{}=\-_()+]/;
/**
* Class-based modifier for adding autocomplete functionality to input elements
@@ -577,11 +577,12 @@ export default class DAutocompleteModifier extends Modifier {
let completeEnd;
let completeStart;
- if (pos.completeStart !== undefined && pos.completeEnd !== undefined) {
+ if (pos.completeStart != null && pos.completeEnd != null) {
completeStart = pos.completeStart;
completeEnd = pos.completeEnd;
} else {
- completeStart = completeEnd = this.getCaretPosition();
+ completeStart = this.getCaretPosition();
+ completeEnd = completeStart - 1;
}
// Use textHandler's replaceTerm method for consistent behavior
diff --git a/frontend/discourse/tests/acceptance/emoji-test.js b/frontend/discourse/tests/acceptance/emoji-test.js
index de1858109e5..583ca064019 100644
--- a/frontend/discourse/tests/acceptance/emoji-test.js
+++ b/frontend/discourse/tests/acceptance/emoji-test.js
@@ -1,4 +1,4 @@
-import { click, fillIn, visit } from "@ember/test-helpers";
+import { click, fillIn, find, visit } from "@ember/test-helpers";
import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
import { test } from "qunit";
import emojiPicker from "discourse/tests/helpers/emoji-picker-helper";
@@ -92,6 +92,47 @@ acceptance("Emoji", function (needs) {
);
});
+ for (const ellipsis of ["...", "…"]) {
+ test(`emoji autocomplete after ${ellipsis}`, async function (assert) {
+ await visit("/t/internationalization-localization/280");
+ await click("#topic-footer-buttons .btn.create");
+
+ await simulateKeys(".d-editor-input", `Hello world${ellipsis}:smi`);
+ assert.dom(".autocomplete.ac-emoji").exists();
+
+ await simulateKey(".d-editor-input", "\t");
+
+ assert.dom(".d-editor-input").hasValue(`Hello world${ellipsis}:smiley: `);
+ });
+ }
+
+ test("emoji autocomplete after an ellipsis changes while the menu is open", async function (assert) {
+ await visit("/t/internationalization-localization/280");
+ await click("#topic-footer-buttons .btn.create");
+
+ await simulateKeys(".d-editor-input", "Hello world...:smi");
+ assert.dom(".autocomplete.ac-emoji").exists();
+
+ await fillIn(".d-editor-input", "Hello world…:smi");
+ await simulateKey(".d-editor-input", "\t");
+
+ assert.dom(".d-editor-input").hasValue("Hello world…:smiley: ");
+ });
+
+ test("emoji autocomplete inserts at the cursor if the trigger disappears", async function (assert) {
+ await visit("/t/internationalization-localization/280");
+ await click("#topic-footer-buttons .btn.create");
+
+ await simulateKeys(".d-editor-input", "Hello world...:smi");
+ assert.dom(".autocomplete.ac-emoji").exists();
+
+ await fillIn(".d-editor-input", "Hello world");
+ find(".d-editor-input").setSelectionRange(6, 6);
+ await simulateKey(".d-editor-input", "\t");
+
+ assert.dom(".d-editor-input").hasValue("Hello :smiley: world");
+ });
+
needs.settings({ emoji_autocomplete_min_chars: 2 });
test("siteSetting:emoji_autocomplete_min_chars", async function (assert) {