mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 21:43:21 +00:00
compose: Extend empty compose navigation logic to recipient boxes.
Navigation key presses like `Up` and `PageUp` with an empty recipient boxes will now close the compose and propagate the keypress to the message list or recent topics, depending upon the active view. This extends behavior we've had for a long time with focus in the compose box itself.
This commit is contained in:
@@ -434,14 +434,9 @@ test("get_focus_area", () => {
|
||||
});
|
||||
|
||||
test("focus_in_empty_compose", ({override_rewire}) => {
|
||||
$("#compose-textarea").is = (attr) => {
|
||||
assert.equal(attr, ":focus");
|
||||
return $("#compose-textarea").is_focused;
|
||||
};
|
||||
|
||||
document.activeElement = {id: "compose-textarea"};
|
||||
override_rewire(compose_state, "composing", () => true);
|
||||
$("#compose-textarea").val("");
|
||||
$("#compose-textarea").trigger("focus");
|
||||
assert.ok(compose_state.focus_in_empty_compose());
|
||||
|
||||
override_rewire(compose_state, "composing", () => false);
|
||||
|
||||
@@ -42,7 +42,35 @@ export const topic = get_or_set("stream_message_recipient_topic");
|
||||
export const message_content = get_or_set("compose-textarea", true);
|
||||
|
||||
export function focus_in_empty_compose() {
|
||||
return composing() && message_content() === "" && $("#compose-textarea").is(":focus");
|
||||
// A user trying to press arrow keys in an empty compose is mostly
|
||||
// likely trying to navigate messages. This helper function
|
||||
// decides whether the compose box is "empty" for this purpose.
|
||||
if (!composing() || message_content() !== "") {
|
||||
return false;
|
||||
}
|
||||
|
||||
const focused_element_id = document.activeElement.id;
|
||||
if (focused_element_id === "compose-textarea") {
|
||||
// Focus will be in the compose textarea after sending a
|
||||
// message; this is the most common situation.
|
||||
return true;
|
||||
}
|
||||
|
||||
// If the current focus is in one of the recipient inputs, we need
|
||||
// to check whether the input is empty, to avoid accidentally
|
||||
// overriding the browser feature where the Up/Down arrow keys jump
|
||||
// you to the start/end of a non-empty text input.
|
||||
//
|
||||
// Check whether the current input element is empty for each input type.
|
||||
switch (focused_element_id) {
|
||||
case "private_message_recipient":
|
||||
return private_message_recipient().length === 0;
|
||||
case "stream_message_recipient_topic":
|
||||
case "stream_message_recipient_stream":
|
||||
return document.activeElement.value === "";
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
export function private_message_recipient(value) {
|
||||
|
||||
@@ -60,6 +60,7 @@ EXEMPT_FILES = make_set(
|
||||
"static/js/compose_actions.js",
|
||||
"static/js/compose_closed_ui.js",
|
||||
"static/js/compose_fade.js",
|
||||
"static/js/compose_state.js",
|
||||
"static/js/compose_ui.js",
|
||||
"static/js/compose_validate.js",
|
||||
"static/js/composebox_typeahead.js",
|
||||
|
||||
Reference in New Issue
Block a user