diff --git a/examples/server/public/index.html.gz b/examples/server/public/index.html.gz
index c7a3c426..d0e6da8e 100644
Binary files a/examples/server/public/index.html.gz and b/examples/server/public/index.html.gz differ
diff --git a/examples/server/webui/src/components/ChatScreen.tsx b/examples/server/webui/src/components/ChatScreen.tsx
index 79de3053..d12b06e1 100644
--- a/examples/server/webui/src/components/ChatScreen.tsx
+++ b/examples/server/webui/src/components/ChatScreen.tsx
@@ -99,13 +99,9 @@ export default function ChatScreen() {
canvasData,
replaceMessageAndGenerate,
} = useAppContext();
- const [inputMsg, setInputMsg] = useState(prefilledMsg.content());
- const inputRef = useRef(null);
+ const textarea = useOptimizedTextarea(prefilledMsg.content());
- const { extraContext, clearExtraContext } = useVSCodeContext(
- inputRef,
- setInputMsg
- );
+ const { extraContext, clearExtraContext } = useVSCodeContext(textarea);
// TODO: improve this when we have "upload file" feature
const currExtra: Message['extra'] = extraContext ? [extraContext] : undefined;
@@ -135,9 +131,10 @@ export default function ChatScreen() {
};
const sendNewMessage = async () => {
- if (inputMsg.trim().length === 0 || isGenerating(currConvId ?? '')) return;
- const lastInpMsg = inputMsg;
- setInputMsg('');
+ const lastInpMsg = textarea.value();
+ if (lastInpMsg.trim().length === 0 || isGenerating(currConvId ?? ''))
+ return;
+ textarea.setValue('');
scrollToBottom(false);
setCurrNodeId(-1);
// get the last message node
@@ -146,13 +143,13 @@ export default function ChatScreen() {
!(await sendMessage(
currConvId,
lastMsgNodeId,
- inputMsg,
+ lastInpMsg,
currExtra,
onChunk
))
) {
// restore the input message if failed
- setInputMsg(lastInpMsg);
+ textarea.setValue(lastInpMsg);
}
// OK
clearExtraContext();
@@ -195,16 +192,13 @@ export default function ChatScreen() {
// send the prefilled message if needed
sendNewMessage();
} else {
- // otherwise, focus on the input and move the cursor to the end
- if (inputRef.current) {
- inputRef.current.focus();
- inputRef.current.selectionStart = inputRef.current.value.length;
- }
+ // otherwise, focus on the input
+ textarea.focus();
}
prefilledMsg.clear();
// no need to keep track of sendNewMessage
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [inputRef]);
+ }, [textarea.ref]);
// due to some timing issues of StorageUtils.appendMsg(), we need to make sure the pendingMsg is not duplicated upon rendering (i.e. appears once in the saved conversation and once in the pendingMsg)
const pendingMsgDisplay: MessageDisplay[] =
@@ -258,9 +252,7 @@ export default function ChatScreen() {