paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 02:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_list: Hide channels on zoom-in using .hide instead of hide().

Browse Source 
This gives us more control, for example `show()` was adding
`display: inline-block;` to channels after unhiding them
which was overriding other code (added for channel folders
in future commits) that was trying to hide the channels.
This commit is contained in:
Evy Kassirer
2025-07-21 22:15:45 -07:00
committed by Tim Abbott
parent 25a75b9ed7
commit c942900b69
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/stream_list.ts
View File

@@ -429,13 +429,13 @@ export function zoom_in_topics(options: {stream_id: number | undefined}): void {
const stream_id = options.stream_id; const stream_id = options.stream_id;
if (stream_id_for_elt($elt) === stream_id) { if (stream_id_for_elt($elt) === stream_id) {
$elt.show(); $elt.toggleClass("hide", false);
// Add search box for topics list. // Add search box for topics list.
$elt.children("div.bottom_left_row").append($(render_filter_topics())); $elt.children("div.bottom_left_row").append($(render_filter_topics()));
$("#topic_filter_query").trigger("focus"); $("#topic_filter_query").trigger("focus");
topic_list.setup_topic_search_typeahead(); topic_list.setup_topic_search_typeahead();
} else { } else {
$elt.hide(); $elt.toggleClass("hide", true);
} }
}); });
} }
@@ -450,7 +450,7 @@ export function zoom_out_topics(): void {
}); });
$("#streams_list").expectOne().removeClass("zoom-in").addClass("zoom-out"); $("#streams_list").expectOne().removeClass("zoom-in").addClass("zoom-out");
$("#stream_filters li.narrow-filter").show(); $("#stream_filters li.narrow-filter").toggleClass("hide", false);
// Remove search box for topics list from DOM. // Remove search box for topics list from DOM.
$(".filter-topics").remove(); $(".filter-topics").remove();
} }

4
web/styles/left_sidebar.css
View File

@@ -1904,6 +1904,10 @@ li.topic-list-item {
} }
.zoom-in { .zoom-in {
.narrow-filter.hide {
display: none;
}
.narrow-filter > .bottom_left_row { .narrow-filter > .bottom_left_row {
position: sticky; position: sticky;
/* We subtract a quarter pixel of space to correct /* We subtract a quarter pixel of space to correct

14
web/tests/stream_list.test.cjs
View File

@@ -455,14 +455,14 @@ test_ui("zoom_in_and_zoom_out", ({mock_template}) => {
assert.ok(!$label1.visible()); assert.ok(!$label1.visible());
assert.ok(!$label2.visible()); assert.ok(!$label2.visible());
assert.ok(!$splitter.visible()); assert.ok(!$splitter.visible());
assert.ok($stream_li1.visible()); assert.ok(!$stream_li1.hasClass("hide"));
assert.ok(!$stream_li2.visible()); assert.ok($stream_li2.hasClass("hide"));
assert.ok($("#streams_list").hasClass("zoom-in")); assert.ok($("#streams_list").hasClass("zoom-in"));
assert.ok(filter_topics_appended); assert.ok(filter_topics_appended);
$("#stream_filters li.narrow-filter").show = () => { $("#stream_filters li.narrow-filter").toggleClass = (classname, value) => {
$stream_li1.show(); $stream_li1.toggleClass(classname, value);
$stream_li2.show(); $stream_li2.toggleClass(classname, value);
}; };
$stream_li1.length = 1; $stream_li1.length = 1;
@@ -474,8 +474,8 @@ test_ui("zoom_in_and_zoom_out", ({mock_template}) => {
assert.ok($label1.visible()); assert.ok($label1.visible());
assert.ok($label2.visible()); assert.ok($label2.visible());
assert.ok($splitter.visible()); assert.ok($splitter.visible());
assert.ok($stream_li1.visible()); assert.ok(!$stream_li1.hasClass("hide"));
assert.ok($stream_li2.visible()); assert.ok(!$stream_li2.hasClass("hide"));
assert.ok($("#streams_list").hasClass("zoom-out")); assert.ok($("#streams_list").hasClass("zoom-out"));
assert.ok(!filter_topics_appended); assert.ok(!filter_topics_appended);
}); });