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.

recent_view: Insert rows only within the rendered range.

Aman Agrawal92827a2b69eb
diff --git a/web/src/recent_view_ui.ts b/web/src/recent_view_ui.ts
index 8ecd76dc09a..82cf698c285 100644
--- a/web/src/recent_view_ui.ts
+++ b/web/src/recent_view_ui.ts
@@ -1179,7 +1179,11 @@ function rerender_conversation_rows(row_keys: Set<string>): void {
rows_left -= 1;
if (get_conversation_row(conversation_key).length > 0) {
topics_widget.render_item(topic_data);
- } else {
+ } else if (list_index < topics_widget.get_rendered_count()) {
+ // The range grows with each insert, hence the live count.
+ // Inserting at its end would grow it too, for the next
+ // conversation and so on; the widget renders those rows
+ // in batches.
topics_widget.insert_rendered_row(topic_data, () => list_index);
}
}
diff --git a/web/tests/recent_view.test.cjs b/web/tests/recent_view.test.cjs
index 4163c63ba7b..33680e0af88 100644
--- a/web/tests/recent_view.test.cjs
+++ b/web/tests/recent_view.test.cjs
@@ -84,6 +84,7 @@ const ListWidget = mock_esm("../src/list_widget", {
hard_redraw: noop,
filter_and_sort: () => [],
get_current_list: () => [],
+ get_rendered_count: () => ListWidget.get_current_list().length,
all_rendered: () => true,
replace_list_data(data) {
assert.notEqual(
@@ -1017,6 +1018,32 @@ test("rerender renders more rows until they reach the bottom of the viewport", (
assert.equal(batches_rendered, batches_until_all_rendered);
});
+test("rerender inserts rows only within the rendered range", ({override}) => {
+ // Two new conversations sort before the only rendered row. Each insert
+ // extends the rendered range, which lets the second one in; a third,
+ // past the range, is left for the widget to render.
+ show_recent_view_with_messages();
+ const topics = [topic1, topic2, topic3, topic4];
+ const list = topics.map((topic) => conversation_for(topic));
+ const [new_first, new_second, with_row] = list;
+ for (const topic of [topic1, topic2, topic4]) {
+ stub_no_row_for(get_topic_key(stream1, topic));
+ }
+ override(ListWidget, "get_current_list", () => list);
+ const updates = record_row_updates(override);
+ override(ListWidget, "get_rendered_count", () => {
+ const rows_inserted = updates.filter(([kind]) => kind === "insert").length;
+ return 1 + rows_inserted;
+ });
+
+ bulk_rerender(topics.map((topic) => get_topic_key(stream1, topic)));
+ assert.deepEqual(updates, [
+ ["insert", new_first, 0],
+ ["insert", new_second, 1],
+ ["rerender", with_row],
+ ]);
+});
+
test("basic assertions", ({mock_template, override_rewire}) => {
override_rewire(rt, "inplace_rerender", noop);
rt.clear_for_tests();