Skip to content

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

FIX: Don't lose focus when pressing key up and -down in composer emoji picker (#40052)

Ted Johansson2d2f3bec153f
diff --git a/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs b/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs
index 98e0fc14bf7..96de864fcf0 100644
--- a/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs
+++ b/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs
@@ -40,7 +40,7 @@ import placeholder from "../extensions/placeholder";
import * as utils from "../lib/plugin-utils";
import TextManipulation from "../lib/text-manipulation";
-const AUTOCOMPLETE_KEY_DOWN_SUPPRESS = ["Enter", "Tab"];
+const AUTOCOMPLETE_KEY_DOWN_SUPPRESS = ["Enter", "Tab", "ArrowDown", "ArrowUp"];
/**
* @typedef ProsemirrorEditorArgs
@@ -251,7 +251,7 @@ export default class ProsemirrorEditor extends Component {
},
},
handleKeyDown: (view, event) => {
- // suppress if Enter/Tab and the autocomplete is open
+ // suppress if the autocomplete is open
return (
AUTOCOMPLETE_KEY_DOWN_SUPPRESS.includes(event.key) &&
!!document.querySelector(".autocomplete")
diff --git a/spec/system/composer/prosemirror_autocomplete_spec.rb b/spec/system/composer/prosemirror_autocomplete_spec.rb
index b98953cc4e5..ca236a23bac 100644
--- a/spec/system/composer/prosemirror_autocomplete_spec.rb
+++ b/spec/system/composer/prosemirror_autocomplete_spec.rb
@@ -24,6 +24,27 @@ describe "Composer - ProseMirror - Autocomplete" do
expect(composer).to have_emoji_autocomplete
end
+ it "keeps emoji autocomplete open when pressing arrow down near a horizontal rule" do
+ open_composer
+
+ composer.send_keys(:enter, "---", :enter)
+
+ expect(rich).to have_css("hr")
+
+ composer.send_keys(:up, :up)
+ composer.type_content(" :smi")
+
+ expect(composer).to have_emoji_autocomplete_selected(1)
+
+ composer.send_keys(:down)
+
+ expect(composer).to have_emoji_autocomplete_selected(2)
+
+ composer.send_keys(:up)
+
+ expect(composer).to have_emoji_autocomplete_selected(1)
+ end
+
it "strips partially written emoji when using 'more' emoji modal" do
open_composer
diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index e68972fe064..a31f5ac2952 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -215,6 +215,10 @@ module PageObjects
has_no_css?(AUTOCOMPLETE_MENU)
end
+ def has_emoji_autocomplete_selected?(index)
+ has_css?("#{AUTOCOMPLETE_MENU} ul li:nth-child(#{index}) a.selected")
+ end
+
EMOJI_SUGGESTION_SELECTOR = "#{AUTOCOMPLETE_MENU} .emoji-shortname"
def has_emoji_suggestion?(emoji)