paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: Ensure compose box is focused after inserting any content.

Browse Source 
In `insert_syntax_and_focus`, we now explicitly focus the textarea
before inserting the content, rather than relying on insert() to do
this for us. A comment is added documenting the quirks of insert that
require this.

This fixes a bug where the compose box might not be focused after
inserting video call links, emojis from the picker, GIPHY gifs, and
some other buttons.
This commit is contained in:
Tim Abbott
2023-04-10 12:03:31 -07:00
parent ff48f3c489
commit c76adf1e89
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/src/compose_ui.js
View File

@@ -61,10 +61,7 @@ export function smart_insert_inline($textarea, syntax) {
syntax += " "; syntax += " ";
} }
// text-field-edit ensures `$textarea` is focused before inserting
// the new syntax.
insert($textarea[0], syntax); insert($textarea[0], syntax);
autosize_textarea($textarea); autosize_textarea($textarea);
} }
@@ -111,10 +108,7 @@ export function smart_insert_block($textarea, syntax) {
const new_lines_needed_after_count = 2 - new_lines_after_count; const new_lines_needed_after_count = 2 - new_lines_after_count;
syntax = syntax + "\n".repeat(new_lines_needed_after_count); syntax = syntax + "\n".repeat(new_lines_needed_after_count);
// text-field-edit ensures `$textarea` is focused before inserting
// the new syntax.
insert($textarea[0], syntax); insert($textarea[0], syntax);
autosize_textarea($textarea); autosize_textarea($textarea);
} }
@@ -126,6 +120,17 @@ export function insert_syntax_and_focus(
// Generic helper for inserting syntax into the main compose box // Generic helper for inserting syntax into the main compose box
// where the cursor was and focusing the area. Mostly a thin // where the cursor was and focusing the area. Mostly a thin
// wrapper around smart_insert_inline and smart_inline_block. // wrapper around smart_insert_inline and smart_inline_block.
//
// We focus the textarea first. In theory, we could let the
// `insert` function of text-area-edit take care of this, since it
// will focus the target element before manipulating it.
//
// But it unfortunately will blur it afterwards if the original
// focus was something else, which is not behavior we want, so we
// just focus the textarea in question ourselves before calling
// it.
$textarea.trigger("focus");
if (mode === "inline") { if (mode === "inline") {
smart_insert_inline($textarea, syntax); smart_insert_inline($textarea, syntax);
} else if (mode === "block") { } else if (mode === "block") {