Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Ensure emoji is inserted in the correct location (#17107) 

In the specific case where you start typing an emoji, then open the full emoji picker, the chosen emoji would be inserted in the wrong place. This was an unintentional side effect of the changes in 75d9c16156

This commit updates the `emojiSelected` logic to avoid mutating the 'selected' object, and also adds a test for this specific behaviour.
This commit is contained in:
David Taylor 2022-06-16 12:16:53 +01:00 committed by GitHub
parent c39cebc161
commit a4fc88ce68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js
View File

@ -570,14 +570,12 @@ export default Mixin.create({
this.addText(selected, `:${code}:`);
}
} else {
let numOfRemovedChars = selected.pre.length - captures[1].length;
selected.pre = selected.pre.slice(
0,
selected.pre.length - captures[1].length
let numOfRemovedChars = captures[1].length;
this._insertAt(
selected.start - numOfRemovedChars,
selected.end,
`${code}:`
);
selected.start -= numOfRemovedChars;
selected.end -= numOfRemovedChars;
this.addText(selected, `${code}:`);
}
},
});

23
app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
View File

@ -19,6 +19,7 @@ import formatTextWithSelection from "discourse/tests/helpers/d-editor-helper";
import hbs from "htmlbars-inline-precompile";
import { next } from "@ember/runloop";
import { withPluginApi } from "discourse/lib/plugin-api";
import { isLegacyEmber } from "discourse-common/config/environment";
discourseModule("Integration | Component | d-editor", function (hooks) {
setupRenderingTest(hooks);
@ -727,7 +728,27 @@ third line`
await click(
'.emoji-picker .section[data-section="smileys_&_emotion"] img.emoji[title="grinning"]'
);
assert.strictEqual(this.value, "hello world. :grinning:");
assert.strictEqual(
this.value,
"hello world. :grinning:",
"it works when there is no partial emoji"
);
if (!isLegacyEmber()) {
await click("textarea.d-editor-input");
await fillIn(".d-editor-input", "starting to type an emoji like :gri");
jumpEnd(query("textarea.d-editor-input"));
await click("button.emoji");
await click(
'.emoji-picker .section[data-section="smileys_&_emotion"] img.emoji[title="grinning"]'
);
assert.strictEqual(
this.value,
"starting to type an emoji like :grinning:",
"it works when there is a partial emoji"
);
}
},
});