Skip to content

Commit 7e14973

Browse files
claravoxstsnel
authored andcommitted
YDA-6146: scroll normally when short group list
1 parent 60ff193 commit 7e14973

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

group_manager/static/group_manager/js/group_manager.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ function collapseUncollapseOnScroll () {
2020
const topOfScreenPoint = 60
2121
const collapsePoint = 300
2222
const st = Math.floor(window.scrollY)
23+
// Should be height of: header + search bar + whichever tree/list is visible
24+
const groupsListHeight = $('#groups-card-header').outerHeight() +
25+
($('#pills-tree.show').outerHeight() || 0) +
26+
($('#pills-list.show').outerHeight() || 0) +
27+
$('#search').outerHeight()
28+
// group properties + group members list (+ priv buttons)
29+
const groupOverviewHeight = $('#group-overview').outerHeight()
2330
let collapseEl = bootstrap.Collapse.getInstance('#group-properties')
2431
if (!collapseEl) {
2532
collapseEl = new bootstrap.Collapse('#group-properties', {
@@ -29,6 +36,10 @@ function collapseUncollapseOnScroll () {
2936

3037
if (Math.abs(lastScrollTop - st) <= delta) {
3138
return
39+
} else if (groupsListHeight < groupOverviewHeight) {
40+
// Skip if group list shorter than screen
41+
lastScrollTop = st
42+
return
3243
}
3344

3445
if (st <= lastScrollTop && st <= topOfScreenPoint) {
@@ -37,7 +48,7 @@ function collapseUncollapseOnScroll () {
3748
} else if (st > lastScrollTop &&
3849
st > collapsePoint &&
3950
Math.abs(lastScrollTop - st) <= collapseDelta &&
40-
$('#group-overview').outerHeight() + buffer > $(window).height()) {
51+
groupOverviewHeight + buffer > $(window).height()) {
4152
// Have scrolled down at least a little
4253
bootstrap.Collapse.getInstance('#group-properties').hide()
4354
}

group_manager/templates/group_manager/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<div class="col-md-6">
3030
<h1 id="group-manager-text">Group manager</h1>
3131
<div class="card groups">
32-
<div class="card-header">
32+
<div id="groups-card-header" class="card-header">
3333
Groups
3434
<ul class="nav nav-pills float-end" id="pills-tab" role="tablist">
3535
<li class="nav-item" role="presentation">

0 commit comments

Comments
 (0)