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.

list_widget: Add get_rendered_count.

Aman Agrawal13ddd78b57af
diff --git a/web/src/list_widget.ts b/web/src/list_widget.ts
index 156256fbe0e..71a7660624b 100644
--- a/web/src/list_widget.ts
+++ b/web/src/list_widget.ts
@@ -72,6 +72,7 @@ type BaseListWidget = {
export type ListWidget<Key, Item = Key> = BaseListWidget & {
get_current_list: () => Item[];
get_rendered_list: () => Item[];
+ get_rendered_count: () => number;
filter_and_sort: () => Item[];
retain_selected_items: () => void;
all_rendered: () => boolean;
@@ -386,6 +387,10 @@ export function create<Key, Item = Key>(
return meta.filtered_list.slice(0, meta.offset);
},
+ get_rendered_count() {
+ return Math.min(meta.offset, meta.filtered_list.length);
+ },
+
// Recomputes the filtered list and removes the rendered rows of
// items it no longer includes, returning those items. A row left
// behind would not be counted by meta.offset, so a later render()
diff --git a/web/src/recent_view_ui.ts b/web/src/recent_view_ui.ts
index 580278cf4bc..8ecd76dc09a 100644
--- a/web/src/recent_view_ui.ts
+++ b/web/src/recent_view_ui.ts
@@ -432,7 +432,7 @@ function set_table_focus(row: number, col: number, using_keyboard = false): bool
// on `row_focus`.
if (
row >= 0 &&
- row >= topics_widget.get_rendered_list().length &&
+ row >= topics_widget.get_rendered_count() &&
row < topics_widget.get_current_list().length &&
!topics_widget.all_rendered()
) {
diff --git a/web/tests/list_widget.test.cjs b/web/tests/list_widget.test.cjs
index e8cd8cbb6d7..4fed8a9bd23 100644
--- a/web/tests/list_widget.test.cjs
+++ b/web/tests/list_widget.test.cjs
@@ -1048,6 +1048,25 @@ run_test("render advances the offset by the rows appended", () => {
assert.ok(widget.all_rendered());
});
+run_test("get_rendered_count", () => {
+ const $container = make_container();
+ const $scroll_container = make_scroll_container();
+ const widget = ListWidget.create($container, [1, 2, 3], {
+ name: "rendered-count",
+ modifier_html: div,
+ get_item: (item) => item,
+ $simplebar_container: $scroll_container,
+ });
+ assert.equal(widget.get_rendered_count(), 3);
+
+ // Without html_selector, the widget cannot remove the rows of items
+ // dropped from the list, so the offset stays past the list's end.
+ widget.replace_list_data([1, 2], false);
+ widget.filter_and_sort();
+ assert.equal(widget.get_rendered_count(), 2);
+ assert.deepEqual(widget.get_rendered_list(), [1, 2]);
+});
+
run_test("filter_and_sort removes rows of items no longer listed", () => {
const list = make_items(100);
let hidden_items = new Set();