Skip to content

Commit 1513c27

Browse files
committed
adjust: wording and placeholder text size
1 parent 0ff3bbb commit 1513c27

File tree

1 file changed

+57
-33
lines changed

1 file changed

+57
-33
lines changed

client/src/components/Main/TextChat.jsx

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export default function TextChat({ messages }) {
4343
}, [convo?.conversationId]);
4444

4545
const messageHandler = (data, currentState, currentMsg) => {
46-
4746
const { messages, _currentMsg, message, sender, isRegenerate } = currentState;
4847

4948
if (isRegenerate)
@@ -79,9 +78,32 @@ export default function TextChat({ messages }) {
7978
const { messages, _currentMsg, message, sender, isRegenerate } = currentState;
8079

8180
if (isRegenerate)
82-
dispatch(setMessages([...messages, { sender, text: data, parentMessageId: message?.overrideParentMessageId, messageId: message?.overrideParentMessageId + '_', cancelled: true }]));
81+
dispatch(
82+
setMessages([
83+
...messages,
84+
{
85+
sender,
86+
text: data,
87+
parentMessageId: message?.overrideParentMessageId,
88+
messageId: message?.overrideParentMessageId + '_',
89+
cancelled: true
90+
}
91+
])
92+
);
8393
else
84-
dispatch(setMessages([...messages, currentMsg, { sender, text: data, parentMessageId: currentMsg?.messageId, messageId: currentMsg?.messageId + '_', cancelled: true }]));
94+
dispatch(
95+
setMessages([
96+
...messages,
97+
currentMsg,
98+
{
99+
sender,
100+
text: data,
101+
parentMessageId: currentMsg?.messageId,
102+
messageId: currentMsg?.messageId + '_',
103+
cancelled: true
104+
}
105+
])
106+
);
85107
};
86108

87109
const createdHandler = (data, currentState, currentMsg) => {
@@ -100,14 +122,8 @@ export default function TextChat({ messages }) {
100122
const { messages, _currentMsg, message, isCustomModel, sender, isRegenerate } =
101123
currentState;
102124
const { model, chatGptLabel, promptPrefix } = message;
103-
if (isRegenerate)
104-
dispatch(
105-
setMessages([...messages, responseMessage,])
106-
);
107-
else
108-
dispatch(
109-
setMessages([...messages, requestMessage, responseMessage,])
110-
);
125+
if (isRegenerate) dispatch(setMessages([...messages, responseMessage]));
126+
else dispatch(setMessages([...messages, requestMessage, responseMessage]));
111127
dispatch(setSubmitState(false));
112128

113129
const isBing = model === 'bingai' || model === 'sydney';
@@ -211,7 +227,7 @@ export default function TextChat({ messages }) {
211227

212228
let currentMsg = { ...currentState.message };
213229
let latestResponseText = '';
214-
230+
215231
const { server, payload } = createPayload(submission);
216232
const onMessage = (e) => {
217233
if (stopStream) {
@@ -271,8 +287,8 @@ export default function TextChat({ messages }) {
271287
const isCancelled = events.readyState <= 1;
272288
events.close();
273289
if (isCancelled) {
274-
const e = new Event("cancel");
275-
events.dispatchEvent(e)
290+
const e = new Event('cancel');
291+
events.dispatchEvent(e);
276292
}
277293
};
278294
}, [submission]);
@@ -328,11 +344,11 @@ export default function TextChat({ messages }) {
328344
};
329345

330346
return (
331-
<div className="input-panel fixed md:absolute bottom-0 left-0 w-full border-t md:border-t-0 dark:border-white/20 md:border-transparent md:dark:border-transparent md:bg-vert-light-gradient bg-white dark:bg-gray-800 md:dark:bg-transparent md:bg-transparent dark:md:bg-vert-dark-gradient py-2">
332-
<form className="stretch mx-2 flex flex-row gap-3 md:pt-2 last:mb-2 md:last:mb-6 lg:mx-auto lg:max-w-3xl lg:pt-6">
347+
<div className="input-panel md:bg-vert-light-gradient dark:md:bg-vert-dark-gradient fixed bottom-0 left-0 w-full border-t bg-white py-2 dark:border-white/20 dark:bg-gray-800 md:absolute md:border-t-0 md:border-transparent md:bg-transparent md:dark:border-transparent md:dark:bg-transparent">
348+
<form className="stretch mx-2 flex flex-row gap-3 last:mb-2 md:pt-2 md:last:mb-6 lg:mx-auto lg:max-w-3xl lg:pt-6">
333349
<div className="relative flex h-full flex-1 md:flex-col">
334-
<span className="flex ml-1 md:w-full md:m-auto md:mb-2 gap-0 md:gap-2 justify-center order-last md:order-none">
335-
{isSubmitting?
350+
<span className="order-last ml-1 flex justify-center gap-0 md:order-none md:m-auto md:mb-2 md:w-full md:gap-2">
351+
{isSubmitting ? (
336352
<button
337353
onClick={handleStopGenerating}
338354
className="input-panel-button btn btn-neutral flex justify-center gap-2 border-0 md:border"
@@ -341,17 +357,16 @@ export default function TextChat({ messages }) {
341357
<StopGeneratingIcon />
342358
<span className="hidden md:block">Stop generating</span>
343359
</button>
344-
:(latestMessage&&!latestMessage?.isCreatedByUser)?
345-
<button
346-
onClick={handleRegenerate}
347-
className="input-panel-button btn btn-neutral flex justify-center gap-2 border-0 md:border"
348-
type="button"
349-
>
350-
<RegenerateIcon />
351-
<span className="hidden md:block">Regenerate response</span>
352-
</button>
353-
:null
354-
}
360+
) : latestMessage && !latestMessage?.isCreatedByUser ? (
361+
<button
362+
onClick={handleRegenerate}
363+
className="input-panel-button btn btn-neutral flex justify-center gap-2 border-0 md:border"
364+
type="button"
365+
>
366+
<RegenerateIcon />
367+
<span className="hidden md:block">Regenerate response</span>
368+
</button>
369+
) : null}
355370
</span>
356371
<div
357372
className={`relative flex flex-grow flex-col rounded-md border border-black/10 ${
@@ -367,17 +382,26 @@ export default function TextChat({ messages }) {
367382
ref={inputRef}
368383
// style={{maxHeight: '200px', height: '24px', overflowY: 'hidden'}}
369384
rows="1"
370-
value={(disabled || isNotAppendable) ? '' : text}
385+
value={disabled || isNotAppendable ? '' : text}
371386
onKeyUp={handleKeyUp}
372387
onKeyDown={handleKeyDown}
373388
onChange={changeHandler}
374389
onCompositionStart={handleCompositionStart}
375390
onCompositionEnd={handleCompositionEnd}
376-
placeholder={disabled ? 'Choose another model or customize GPT again' : isNotAppendable ? 'Try to regenerate the incomplete response.' : ''}
391+
placeholder={
392+
disabled
393+
? 'Choose another model or customize GPT again'
394+
: isNotAppendable
395+
? 'Edit your message or Regenerate.'
396+
: ''
397+
}
398+
disabled={disabled || isNotAppendable}
399+
className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-12 pr-8 leading-6 placeholder:text-sm focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent md:pl-8"
400+
/>
401+
<SubmitButton
402+
submitMessage={submitMessage}
377403
disabled={disabled || isNotAppendable}
378-
className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-12 pr-8 leading-6 focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent md:pl-8"
379404
/>
380-
<SubmitButton submitMessage={submitMessage} disabled={disabled || isNotAppendable} />
381405
</div>
382406
</div>
383407
</form>

0 commit comments

Comments
 (0)