Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

message_edit: Restore edit form setup when its row is re-rendered.

Pritesh Shetty88b03281d8fb
diff --git a/web/src/message_edit.ts b/web/src/message_edit.ts
index a5b200432a4..ba16361eea9 100644
--- a/web/src/message_edit.ts
+++ b/web/src/message_edit.ts
@@ -782,6 +782,16 @@ function start_edit_maintaining_scroll($row: JQuery, content: string): void {
}
}
+function setup_edit_form_widgets($row: JQuery): void {
+ const row_id = rows.id($row);
+ upload.setup_upload(upload.edit_config(row_id));
+ // Setup dropdown for saved snippets button in the current
+ // message edit control buttons tray.
+ saved_snippets_ui.setup_saved_snippets_dropdown_widget(
+ `.saved-snippets-message-edit-widget[data-message-id="${CSS.escape(row_id.toString())}"]`,
+ );
+}
+
function start_edit_with_content(
$row: JQuery,
content: string,
@@ -791,13 +801,7 @@ function start_edit_with_content(
if (edit_box_open_callback) {
edit_box_open_callback();
}
- const row_id = rows.id($row);
- upload.setup_upload(upload.edit_config(row_id));
- // Setup dropdown for saved snippets button in the current
- // message edit control buttons tray.
- saved_snippets_ui.setup_saved_snippets_dropdown_widget(
- `.saved-snippets-message-edit-widget[data-message-id="${CSS.escape(row_id.toString())}"]`,
- );
+ setup_edit_form_widgets($row);
}
export function start($row: JQuery, edit_box_open_callback?: () => void): void {
@@ -1498,6 +1502,11 @@ export function maybe_show_edit($row: JQuery, id: number): void {
if (currently_editing_messages.has(id)) {
const $message_edit_content = currently_editing_messages.get(id);
edit_message($row, $message_edit_content?.val() ?? "");
+ setup_edit_form_widgets($row);
+ if ($row.hasClass("show_preview")) {
+ show_preview_area($row);
+ $row.removeClass("show_preview");
+ }
}
}
diff --git a/web/src/message_list_view.ts b/web/src/message_list_view.ts
index df25a68aa2c..deb7c25e8a1 100644
--- a/web/src/message_list_view.ts
+++ b/web/src/message_list_view.ts
@@ -1864,8 +1864,13 @@ export class MessageListView {
if (message_content_edited) {
$rendered_msg.addClass("fade-in-message");
}
- this._post_process($rendered_msg);
+ if ($row.hasClass("preview_mode")) {
+ // We'll render the preview area after we've
+ // rendered the message edit content in this new row.
+ $rendered_msg.addClass("show_preview");
+ }
$row.replaceWith($rendered_msg);
+ this._post_process($rendered_msg);
message_list_hover.reapply_hover_on_row_replace($row, $rendered_msg, message_container.msg);
@@ -1989,6 +1994,7 @@ export class MessageListView {
this.update_sticky_recipient_headers();
maybe_restore_focus_to_message_edit_form();
}
+ autosize.update(this.$list.find(".message_edit_content"));
}
append(
diff --git a/web/tests/message_list_view.test.cjs b/web/tests/message_list_view.test.cjs
index 95b501fed3c..84e104807cf 100644
--- a/web/tests/message_list_view.test.cjs
+++ b/web/tests/message_list_view.test.cjs
@@ -345,6 +345,11 @@ test("rerender_messages rebuilds every distinct recipient bar", () => {
rerendered_group_ids.push(group.message_group_id);
};
+ // rerender_messages re-applies autosize to any open edit textareas; with
+ // no message being edited, the lookup returns an empty set.
+ const empty_list_stub = $.set_results("empty-stub", []);
+ view.$list.set_find_results(".message_edit_content", empty_list_stub);
+
view.rerender_messages([dm1.msg, dm2.msg, dm3.msg]);
// One header rerender per distinct bar; the rowless message is skipped.