From 4665b837a015a7b1491126f71065ceeaf5ca0e30 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Thu, 27 Jun 2024 18:32:41 +0000
Subject: [PATCH] Adjust for scrolling shenanigans.

---
 src/mami.js/emotes/picker.jsx |  2 +-
 src/mami.js/ui/input-menus.js |  4 ++++
 src/mami.js/ui/messages.jsx   | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/mami.js/emotes/picker.jsx b/src/mami.js/emotes/picker.jsx
index aaf1858..201a76d 100644
--- a/src/mami.js/emotes/picker.jsx
+++ b/src/mami.js/emotes/picker.jsx
@@ -38,7 +38,7 @@ const MamiEmotePicker = function(args) {
         $rc(listElem);
 
         for(const emote of emotes)
-            listElem.appendChild(<button class="emopick-emote" type="button" data-strings={emote.strings.join(' ')} onclick={() => {
+            listElem.appendChild(<button class="emopick-emote" type="button" title={`:${emote.strings[0]}:`} data-strings={emote.strings.join(' ')} onclick={() => {
                 args.onPick(emote);
                 if(!keepOpenToggleElem.checked)
                     close();
diff --git a/src/mami.js/ui/input-menus.js b/src/mami.js/ui/input-menus.js
index 1ea3f00..ef70732 100644
--- a/src/mami.js/ui/input-menus.js
+++ b/src/mami.js/ui/input-menus.js
@@ -16,6 +16,7 @@ Umi.UI.InputMenus = (function() {
 
         const buttonId = createButtonId(baseId);
         const menuId = 'umi-msg-menu-sub-' + baseId;
+        const isScrolledToBottom = Umi.UI.Messages.IsScrolledToBottom();
 
         const activeMenus = Array.from($qa(`.${inputMenuActive}`));
         if(activeMenus.length > 0)
@@ -34,6 +35,9 @@ Umi.UI.InputMenus = (function() {
         } else {
             current = '';
         }
+
+        if(isScrolledToBottom)
+            Umi.UI.Messages.ScrollIfNeeded();
     };
 
     const createButton = function(id, title, onClick) {
diff --git a/src/mami.js/ui/messages.jsx b/src/mami.js/ui/messages.jsx
index 05dea20..dc94c80 100644
--- a/src/mami.js/ui/messages.jsx
+++ b/src/mami.js/ui/messages.jsx
@@ -371,17 +371,29 @@ Umi.UI.Messages = (function() {
 
             mami.globalEvents.dispatch('umi:ui:message_add', { element: eBase });
         },
+        IsScrolledToBottom: () => {
+            const msgsList = $i('umi-messages');
+            return msgsList.scrollTop === (msgsList.scrollHeight - msgsList.offsetHeight);
+        },
+        ScrollIfNeeded: () => {
+            if(mami.settings.get('autoScroll'))
+                $i('umi-messages').lastElementChild?.scrollIntoView({ inline: 'end' });
+        },
         SwitchChannel: channel => {
             if(typeof channel === 'object' && channel !== null && 'name' in channel)
                 channel = channel.name;
             if(typeof channel !== 'string')
                 return;
 
+            const isScrolledToBottom = Umi.UI.Messages.IsScrolledToBottom();
             focusChannelName = channel;
 
             const root = $i('umi-messages');
             for(const elem of root.children)
                 elem.classList.toggle('hidden', elem.dataset.channel !== undefined && elem.dataset.channel !== focusChannelName);
+
+            if(isScrolledToBottom)
+                Umi.UI.Messages.ScrollIfNeeded();
         },
         Clear: retain => {
             if(typeof retain === 'string' && !isNaN(retain))