Node.js based forum software built for the modern web
fix: scroll chats list to the active room (#14683)
palmoni550b616d98b5f
diff --git a/public/src/client/chats.js b/public/src/client/chats.jsindex a74435c81e..234336173f 100644--- a/public/src/client/chats.js+++ b/public/src/client/chats.js@@ -762,6 +762,9 @@ define('forum/chats', [socket.emit('modules.chats.enter', roomId);const chatEl = chatNavWrapper.find(`[data-roomid="${roomId}"]`);chatEl.addClass('active');+ if (chatEl.length) {+ chatEl[0].scrollIntoView({ block: 'nearest' });+ }if (chatEl.hasClass('unread')) {api.del(`/chats/${roomId}/state`, {});chatEl.removeClass('unread');diff --git a/public/src/client/chats/recent.js b/public/src/client/chats/recent.jsindex 24fa82f951..94aa9a3733 100644--- a/public/src/client/chats/recent.js+++ b/public/src/client/chats/recent.js@@ -19,47 +19,77 @@ define('forum/chats/recent', ['alerts', 'api', 'chat'], function (alerts, api, cchat.toggleReadState(chatEl);});+ let previousScrollTop = $('[component="chat/recent"]').scrollTop();$('[component="chat/recent"]').on('scroll', utils.debounce(function () {const $this = $(this);- const bottom = ($this[0].scrollHeight - $this.height()) * 0.9;- if ($this.scrollTop() > bottom) {- loadMoreRecentChats();+ const currentScrollTop = $this.scrollTop();+ const direction = currentScrollTop > previousScrollTop ? 1 : -1;+ previousScrollTop = currentScrollTop;+ const scrollPercent = 100 * (currentScrollTop / ($this[0].scrollHeight - $this.height()));+ if (direction === 1 && scrollPercent > 85) {+ loadMoreRecentChats(direction);+ } else if (direction === -1 && scrollPercent < 15) {+ loadMoreRecentChats(direction);}}, 100));});};- async function loadMoreRecentChats() {+ async function loadMoreRecentChats(direction) {const recentChats = $('[component="chat/recent"]');if (recentChats.attr('loading')) {return;}+ const prevStart = parseInt(recentChats.attr('data-prevstart'), 10) || 0;+ if (direction < 0 && prevStart <= 0) {+ return;+ }+ const params = { uid: ajaxify.data.uid };+ if (direction > 0) {+ params.start = recentChats.attr('data-nextstart');+ } else {+ params.start = Math.max(0, prevStart - 30);+ params.perPage = prevStart - params.start;+ }recentChats.attr('loading', 1);- api.get(`/chats`, {- uid: ajaxify.data.uid,- start: recentChats.attr('data-nextstart'),- }).then(({ rooms, nextStart }) => {+ try {+ const { rooms, nextStart } = await api.get(`/chats`, params);if (rooms.length) {- onRecentChatsLoaded({ rooms, nextStart }, function () {- recentChats.removeAttr('loading');+ await onRecentChatsLoaded({ rooms, nextStart }, direction);+ if (direction > 0) {recentChats.attr('data-nextstart', nextStart);- });- } else {- recentChats.removeAttr('loading');+ } else {+ recentChats.attr('data-prevstart', params.start);+ }}- }).catch(alerts.error);+ } catch (err) {+ alerts.error(err);+ } finally {+ recentChats.removeAttr('loading');+ }}- function onRecentChatsLoaded(data, callback) {+ async function onRecentChatsLoaded(data, direction) {if (!data.rooms.length) {- return callback();+ return;}- data.loadingMore = true;- app.parseAndTranslate('chats', 'rooms', data, function (html) {- $('[component="chat/recent"]').append(html);- html.find('.timeago').timeago();- callback();- });+ if (direction > 0) {+ data.loadingMore = true;+ } else {+ data.showBottomHr = true;+ }+ const html = await app.parseAndTranslate('chats', 'rooms', data);+ const recentChats = $('[component="chat/recent"]');+ if (direction > 0) {+ recentChats.append(html);+ } else {+ // preserve the scroll position when prepending rooms above the viewport+ const listEl = recentChats.get(0);+ const previousHeight = listEl.scrollHeight;+ recentChats.prepend(html);+ listEl.scrollTop += listEl.scrollHeight - previousHeight;+ }+ html.find('.timeago').timeago();}diff --git a/src/controllers/accounts/chats.js b/src/controllers/accounts/chats.jsindex ee6ed262d6..bd0dc62a4f 100644--- a/src/controllers/accounts/chats.js+++ b/src/controllers/accounts/chats.js@@ -30,8 +30,16 @@ chatsController.get = async function (req, res, next) {};const isSwitch = res.locals.isAPI && parseInt(req.query.switch, 10) === 1;if (!isSwitch) {+ let start = 0;+ if (req.params.roomid) {+ const roomIndex = await db.sortedSetRevRank(`uid:${uid}:chat:rooms`, req.params.roomid);+ if (roomIndex !== null) {+ // render the list around the selected room so it is visible without paging from the top+ start = Math.max(0, roomIndex - 2);+ }+ }const [recentChats, publicRooms, privateRoomCount] = await Promise.all([- messaging.getRecentChats(req.uid, uid, 0, 29),+ messaging.getRecentChats(req.uid, uid, start, start + 29),messaging.getPublicRooms(req.uid, uid),db.sortedSetCard(`uid:${uid}:chat:rooms`),]);@@ -40,6 +48,7 @@ chatsController.get = async function (req, res, next) {}payload.rooms = recentChats.rooms;payload.nextStart = recentChats.nextStart;+ payload.prevStart = start;payload.publicRooms = publicRooms;payload.privateRoomCount = privateRoomCount;}diff --git a/src/views/chats.tpl b/src/views/chats.tplindex 78bc942a0f..62a2e09470 100644--- a/src/views/chats.tpl+++ b/src/views/chats.tpl@@ -46,7 +46,7 @@</div>{{{ end }}}- <div id="private-rooms" component="chat/recent" class="chats-list overflow-auto mb-0 pe-1 pb-5 pb-lg-0 collapse show ghost-scrollbar" data-nextstart="{nextStart}">+ <div id="private-rooms" component="chat/recent" class="chats-list overflow-auto mb-0 pe-1 pb-5 pb-lg-0 collapse show ghost-scrollbar" data-nextstart="{nextStart}" data-prevstart="{prevStart}">{{{ each rooms }}}<!-- IMPORT partials/chats/recent_room.tpl -->{{{ end }}}