Merge branch 'SillyTavern:staging' into staging

5c61c47f313df2a7559df6f9ef11ab26c1910921

Yokayo <52032299+Yokayo@users.noreply.github.com>

Signed

public/script.js+18 -4 Viewed

+        }
     });
     const chatElementScroll = document.getElementById('chat');
     chatElementScroll.addEventListener('wheel',const chatScrollHandler = function () {
 +        if (power_user.waifuMode) {
             scrollLock = true;
 -    }, { passive: true });
 +            return;
 -    chatElementScroll.addEventListener('touchstart', function () {
 +        }
++
 +        const scrollIsAtBottom = Math.abs(chatElementScroll.scrollHeight - chatElementScroll.clientHeight - chatElementScroll.scrollTop) < 1;
++
 +        // Resume autoscroll if the user scrolls to the bottom
 +        if (scrollLock && scrollIsAtBottom) {
 +            scrollLock = false;
 +        }
++
 +        // Cancel autoscroll if the user scrolls up
 +        if (!scrollLock && !scrollIsAtBottom) {
             scrollLock = true;
 -    }, { passive: true });
 +        }
 +    };
 +    chatElementScroll.addEventListener('wheel', chatScrollHandler, { passive: true });
 +    chatElementScroll.addEventListener('touchmove', chatScrollHandler, { passive: true });
     chatElementScroll.addEventListener('scroll', function () {
         if (is_use_scroll_holder) {
             this.scrollTop = scroll_holder;