Merge pull request #14 from eea/develop

Release
eea · Oct 7, 2024 · 0fe4040 · 0fe4040
2 parents 4af7671 + 5e48c8b
commit 0fe4040
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.6](https://github.com/eea/volto-chatbot/compare/0.1.5...0.1.6) - 7 October 2024
+
+#### :bug: Bug Fixes
+
+- fix: prevent scroll on edit mode - refs #277196 [kreafox - [`69f7200`](https://github.com/eea/volto-chatbot/commit/69f7200f415b6906111ff250276ed4a870a62579)]
+- fix: use proper name for edit block component [kreafox - [`07dcb44`](https://github.com/eea/volto-chatbot/commit/07dcb44e544c58563826a9487c524149ece80732)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`a00832a`](https://github.com/eea/volto-chatbot/commit/a00832a5b2170fe03b0be218e12eeef3e11926c1)]
+
 ### [0.1.5](https://github.com/eea/volto-chatbot/compare/0.1.4...0.1.5) - 4 October 2024
 
 #### :rocket: New Features

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-chatbot",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "@eeacms/volto-chatbot: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/ChatBlock/ChatBlockEdit.jsx b/src/ChatBlock/ChatBlockEdit.jsx
@@ -6,7 +6,7 @@ import ChatBlockView from './ChatBlockView';
 import { ChatBlockSchema } from './schema';
 import withDanswerData from './withDanswerData';
 
-const SearchBlockEdit = (props) => {
+const ChatBlockEdit = (props) => {
   const { onChangeBlock, block, assistants } = props;
 
   const schema = React.useMemo(
@@ -16,7 +16,7 @@ const SearchBlockEdit = (props) => {
 
   return (
     <div>
-      <ChatBlockView {...props} mode="edit" />
+      <ChatBlockView {...props} isEditMode />
       <SidebarPortal selected={props.selected}>
         <BlockDataForm
           schema={schema}
@@ -39,4 +39,4 @@ const SearchBlockEdit = (props) => {
 export default withDanswerData(() => [
   'assistants',
   superagent.get('/_da/persona?include_deleted=false').type('json'),
-])(SearchBlockEdit);
+])(ChatBlockEdit);
diff --git a/src/ChatBlock/ChatBlockView.jsx b/src/ChatBlock/ChatBlockView.jsx
@@ -4,10 +4,10 @@ import ChatWindow from './ChatWindow';
 import superagent from 'superagent';
 
 function ChatBlockView(props) {
-  const { assistantData, data } = props;
+  const { assistantData, data, isEditMode } = props;
 
   return assistantData ? (
-    <ChatWindow persona={assistantData} {...data} />
+    <ChatWindow persona={assistantData} isEditMode={isEditMode} {...data} />
   ) : (
     <div>Chatbot</div>
   );

diff --git a/src/ChatBlock/ChatWindow.jsx b/src/ChatBlock/ChatWindow.jsx
@@ -18,6 +18,7 @@ function ChatWindow({
   rehypePrism,
   remarkGfm,
   placeholderPrompt = 'Ask a question',
+  isEditMode,
   ...data
 }) {
   const { height, qgenAsistantId, enableQgen, scrollToInput } = data;
@@ -36,12 +37,12 @@ function ChatWindow({
   const scrollDist = React.useRef(0); // Keep track of scroll distance
 
   React.useEffect(() => {
-    if (!textareaRef.current) return;
+    if (!textareaRef.current || isEditMode) return;
 
     if (isStreaming || scrollToInput) {
       textareaRef.current.focus();
     }
-  }, [isStreaming, scrollToInput]);
+  }, [isStreaming, scrollToInput, isEditMode]);
 
   const handleClearChat = () => {
     clearChat();