@gitlab/ui 92.1.0 → 92.1.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [92.1.1](https://gitlab.com/gitlab-org/gitlab-ui/compare/v92.1.0...v92.1.1) (2024-09-11)
+
+
+### Bug Fixes
+
+* ensure chat scrolls to bottom with new message ([3d048f8](https://gitlab.com/gitlab-org/gitlab-ui/commit/3d048f82c586cd3860a7cf5c86d0572ee44d0dc6))
+
 # [92.1.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v92.0.0...v92.1.0) (2024-09-10)
 
 

package/dist/components/experimental/duo/chat/duo_chat.js

@@ -14,7 +14,7 @@ import { SafeHtmlDirective } from '../../../../directives/safe_html/safe_html';
 import GlDuoChatLoader from './components/duo_chat_loader/duo_chat_loader';
 import GlDuoChatPredefinedPrompts from './components/duo_chat_predefined_prompts/duo_chat_predefined_prompts';
 import GlDuoChatConversation from './components/duo_chat_conversation/duo_chat_conversation';
-import { CHAT_RESET_MESSAGE, CHAT_INCLUDE_MESSAGE, CHAT_CLEAN_MESSAGE, CHAT_CLEAR_MESSAGE } from './constants';
+import { CHAT_RESET_MESSAGE, CHAT_INCLUDE_MESSAGE, MESSAGE_MODEL_ROLES, CHAT_CLEAN_MESSAGE, CHAT_CLEAR_MESSAGE } from './constants';
 import { INCLUDE_SLASH_COMMAND } from './mock_data';
 import __vue_normalize__ from 'vue-runtime-helpers/dist/normalize-component.js';
 
@@ -292,12 +292,18 @@ var script = {
         this.displaySubmitButton = true; // Re-enable submit button when loading stops
       }
       this.isHidden = false;
-      this.scrollToBottom();
     },
     isStreaming(newVal) {
       if (!newVal && !this.isLoading) {
         this.displaySubmitButton = true; // Re-enable submit button when streaming stops
       }
+    },
+    lastMessage(newMessage) {
+      if (this.scrolledToBottom || newMessage.role.toLowerCase() === MESSAGE_MODEL_ROLES.user) {
+        // only scroll to bottom on new message if the user hasn't explicitly scrolled up to view an earlier message
+        // or if the user has just submitted a new message
+        this.scrollToBottom();
+      }
     }
   },
   created() {
@@ -366,8 +372,6 @@ var script = {
     },
     async scrollToBottom() {
       var _this$$refs$anchor, _this$$refs$anchor$sc;
-      // This method is also called directly by consumers of this component
-      // https://gitlab.com/gitlab-org/gitlab-vscode-extension/-/blob/3269f6200dc3821c62a3992b40c971dd9ee55d87/webviews/vue2/gitlab_duo_chat/src/App.vue#L97
       await this.$nextTick();
       (_this$$refs$anchor = this.$refs.anchor) === null || _this$$refs$anchor === void 0 ? void 0 : (_this$$refs$anchor$sc = _this$$refs$anchor.scrollIntoView) === null || _this$$refs$anchor$sc === void 0 ? void 0 : _this$$refs$anchor$sc.call(_this$$refs$anchor);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "92.1.0",
+  "version": "92.1.1",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/experimental/duo/chat/duo_chat.vue

@@ -20,6 +20,7 @@ import {
   CHAT_RESET_MESSAGE,
   CHAT_CLEAR_MESSAGE,
   CHAT_INCLUDE_MESSAGE,
+  MESSAGE_MODEL_ROLES,
 } from './constants';
 import { INCLUDE_SLASH_COMMAND } from './mock_data';
 
@@ -317,13 +318,19 @@ export default {
         this.displaySubmitButton = true; // Re-enable submit button when loading stops
       }
       this.isHidden = false;
-      this.scrollToBottom();
     },
     isStreaming(newVal) {
       if (!newVal && !this.isLoading) {
         this.displaySubmitButton = true; // Re-enable submit button when streaming stops
       }
     },
+    lastMessage(newMessage) {
+      if (this.scrolledToBottom || newMessage.role.toLowerCase() === MESSAGE_MODEL_ROLES.user) {
+        // only scroll to bottom on new message if the user hasn't explicitly scrolled up to view an earlier message
+        // or if the user has just submitted a new message
+        this.scrollToBottom();
+      }
+    },
   },
   created() {
     this.handleScrollingTrottled = throttle(this.handleScrolling, 200); // Assume a 200ms throttle for example
@@ -396,8 +403,6 @@ export default {
       this.scrolledToBottom = scrollTop + offsetHeight >= scrollHeight;
     },
     async scrollToBottom() {
-      // This method is also called directly by consumers of this component
-      // https://gitlab.com/gitlab-org/gitlab-vscode-extension/-/blob/3269f6200dc3821c62a3992b40c971dd9ee55d87/webviews/vue2/gitlab_duo_chat/src/App.vue#L97
       await this.$nextTick();
 
       this.$refs.anchor?.scrollIntoView?.();