mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-19 09:50:15 +01:00
📋 fix: Ensure Textarea Resizes in Clipboard Edge Case (#2268)
* chore: ts-ignore fake conversation data used for testing * chore(useTextarea): import helper functions to declutter hook * fix(Textarea): reset textarea value explicitly by resetting `textAreaRef.current.value`
This commit is contained in:
parent
d07396d308
commit
aff219c655
6 changed files with 63 additions and 55 deletions
|
|
@ -3,9 +3,9 @@ import { useForm } from 'react-hook-form';
|
||||||
import { memo, useCallback, useRef, useMemo } from 'react';
|
import { memo, useCallback, useRef, useMemo } from 'react';
|
||||||
import {
|
import {
|
||||||
supportsFiles,
|
supportsFiles,
|
||||||
|
EModelEndpoint,
|
||||||
mergeFileConfig,
|
mergeFileConfig,
|
||||||
fileConfig as defaultFileConfig,
|
fileConfig as defaultFileConfig,
|
||||||
EModelEndpoint,
|
|
||||||
} from 'librechat-data-provider';
|
} from 'librechat-data-provider';
|
||||||
import { useChatContext, useAssistantsMapContext } from '~/Providers';
|
import { useChatContext, useAssistantsMapContext } from '~/Providers';
|
||||||
import { useRequiresKey, useTextarea } from '~/hooks';
|
import { useRequiresKey, useTextarea } from '~/hooks';
|
||||||
|
|
@ -43,9 +43,9 @@ const ChatForm = ({ index = 0 }) => {
|
||||||
setFiles,
|
setFiles,
|
||||||
conversation,
|
conversation,
|
||||||
isSubmitting,
|
isSubmitting,
|
||||||
handleStopGenerating,
|
|
||||||
filesLoading,
|
filesLoading,
|
||||||
setFilesLoading,
|
setFilesLoading,
|
||||||
|
handleStopGenerating,
|
||||||
} = useChatContext();
|
} = useChatContext();
|
||||||
|
|
||||||
const assistantMap = useAssistantsMapContext();
|
const assistantMap = useAssistantsMapContext();
|
||||||
|
|
@ -57,7 +57,9 @@ const ChatForm = ({ index = 0 }) => {
|
||||||
}
|
}
|
||||||
ask({ text: data.text });
|
ask({ text: data.text });
|
||||||
methods.reset();
|
methods.reset();
|
||||||
textAreaRef.current?.setRangeText('', 0, data.text.length, 'end');
|
if (textAreaRef.current) {
|
||||||
|
textAreaRef.current.value = '';
|
||||||
|
}
|
||||||
},
|
},
|
||||||
[ask, methods],
|
[ask, methods],
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import { EModelEndpoint } from 'librechat-data-provider';
|
||||||
import type { TEndpointOption } from 'librechat-data-provider';
|
import type { TEndpointOption } from 'librechat-data-provider';
|
||||||
import type { UseFormSetValue } from 'react-hook-form';
|
import type { UseFormSetValue } from 'react-hook-form';
|
||||||
import type { KeyboardEvent } from 'react';
|
import type { KeyboardEvent } from 'react';
|
||||||
|
import { forceResize, insertTextAtCursor, getAssistantName } from '~/utils';
|
||||||
import { useAssistantsMapContext } from '~/Providers/AssistantsMapContext';
|
import { useAssistantsMapContext } from '~/Providers/AssistantsMapContext';
|
||||||
import useGetSender from '~/hooks/Conversations/useGetSender';
|
import useGetSender from '~/hooks/Conversations/useGetSender';
|
||||||
import useFileHandling from '~/hooks/Files/useFileHandling';
|
import useFileHandling from '~/hooks/Files/useFileHandling';
|
||||||
|
|
@ -12,58 +13,6 @@ import useLocalize from '~/hooks/useLocalize';
|
||||||
|
|
||||||
type KeyEvent = KeyboardEvent<HTMLTextAreaElement>;
|
type KeyEvent = KeyboardEvent<HTMLTextAreaElement>;
|
||||||
|
|
||||||
function insertTextAtCursor(element: HTMLTextAreaElement, textToInsert: string) {
|
|
||||||
element.focus();
|
|
||||||
|
|
||||||
// Use the browser's built-in undoable actions if possible
|
|
||||||
if (window.getSelection() && document.queryCommandSupported('insertText')) {
|
|
||||||
document.execCommand('insertText', false, textToInsert);
|
|
||||||
} else {
|
|
||||||
console.warn('insertTextAtCursor: document.execCommand is not supported');
|
|
||||||
const startPos = element.selectionStart;
|
|
||||||
const endPos = element.selectionEnd;
|
|
||||||
const beforeText = element.value.substring(0, startPos);
|
|
||||||
const afterText = element.value.substring(endPos);
|
|
||||||
element.value = beforeText + textToInsert + afterText;
|
|
||||||
element.selectionStart = element.selectionEnd = startPos + textToInsert.length;
|
|
||||||
const event = new Event('input', { bubbles: true });
|
|
||||||
element.dispatchEvent(event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Necessary resize helper for edge cases where paste doesn't update the container height.
|
|
||||||
*
|
|
||||||
1) Resetting the height to 'auto' forces the component to recalculate height based on its current content
|
|
||||||
|
|
||||||
2) Forcing a reflow. Accessing offsetHeight will cause a reflow of the page,
|
|
||||||
ensuring that the reset height takes effect before resetting back to the scrollHeight.
|
|
||||||
This step is necessary because changes to the DOM do not instantly cause reflows.
|
|
||||||
|
|
||||||
3) Reseting back to scrollHeight reads and applies the ideal height for the current content dynamically
|
|
||||||
*/
|
|
||||||
const forceResize = (textAreaRef: React.RefObject<HTMLTextAreaElement>) => {
|
|
||||||
if (textAreaRef.current) {
|
|
||||||
textAreaRef.current.style.height = 'auto';
|
|
||||||
textAreaRef.current.offsetHeight;
|
|
||||||
textAreaRef.current.style.height = `${textAreaRef.current.scrollHeight}px`;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const getAssistantName = ({
|
|
||||||
name,
|
|
||||||
localize,
|
|
||||||
}: {
|
|
||||||
name?: string;
|
|
||||||
localize: (phraseKey: string, ...values: string[]) => string;
|
|
||||||
}) => {
|
|
||||||
if (name && name.length > 0) {
|
|
||||||
return name;
|
|
||||||
} else {
|
|
||||||
return localize('com_ui_assistant');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function useTextarea({
|
export default function useTextarea({
|
||||||
textAreaRef,
|
textAreaRef,
|
||||||
submitButtonRef,
|
submitButtonRef,
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-nocheck
|
||||||
import { EModelEndpoint, ImageDetail } from 'librechat-data-provider';
|
import { EModelEndpoint, ImageDetail } from 'librechat-data-provider';
|
||||||
import type { ConversationData } from 'librechat-data-provider';
|
import type { ConversationData } from 'librechat-data-provider';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,20 @@
|
||||||
import { defaultEndpoints } from 'librechat-data-provider';
|
import { defaultEndpoints } from 'librechat-data-provider';
|
||||||
import type { EModelEndpoint, TEndpointsConfig, TConfig } from 'librechat-data-provider';
|
import type { EModelEndpoint, TEndpointsConfig, TConfig } from 'librechat-data-provider';
|
||||||
|
|
||||||
|
export const getAssistantName = ({
|
||||||
|
name,
|
||||||
|
localize,
|
||||||
|
}: {
|
||||||
|
name?: string;
|
||||||
|
localize: (phraseKey: string, ...values: string[]) => string;
|
||||||
|
}) => {
|
||||||
|
if (name && name.length > 0) {
|
||||||
|
return name;
|
||||||
|
} else {
|
||||||
|
return localize('com_ui_assistant');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export const getEndpointsFilter = (endpointsConfig: TEndpointsConfig) => {
|
export const getEndpointsFilter = (endpointsConfig: TEndpointsConfig) => {
|
||||||
const filter: Record<string, boolean> = {};
|
const filter: Record<string, boolean> = {};
|
||||||
if (!endpointsConfig) {
|
if (!endpointsConfig) {
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ export * from './files';
|
||||||
export * from './latex';
|
export * from './latex';
|
||||||
export * from './convos';
|
export * from './convos';
|
||||||
export * from './presets';
|
export * from './presets';
|
||||||
|
export * from './textarea';
|
||||||
export * from './languages';
|
export * from './languages';
|
||||||
export * from './endpoints';
|
export * from './endpoints';
|
||||||
export { default as cn } from './cn';
|
export { default as cn } from './cn';
|
||||||
|
|
|
||||||
40
client/src/utils/textarea.ts
Normal file
40
client/src/utils/textarea.ts
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
/**
|
||||||
|
* Insert text at the cursor position in a textarea.
|
||||||
|
*/
|
||||||
|
export function insertTextAtCursor(element: HTMLTextAreaElement, textToInsert: string) {
|
||||||
|
element.focus();
|
||||||
|
|
||||||
|
// Use the browser's built-in undoable actions if possible
|
||||||
|
if (window.getSelection() && document.queryCommandSupported('insertText')) {
|
||||||
|
document.execCommand('insertText', false, textToInsert);
|
||||||
|
} else {
|
||||||
|
console.warn('insertTextAtCursor: document.execCommand is not supported');
|
||||||
|
const startPos = element.selectionStart;
|
||||||
|
const endPos = element.selectionEnd;
|
||||||
|
const beforeText = element.value.substring(0, startPos);
|
||||||
|
const afterText = element.value.substring(endPos);
|
||||||
|
element.value = beforeText + textToInsert + afterText;
|
||||||
|
element.selectionStart = element.selectionEnd = startPos + textToInsert.length;
|
||||||
|
const event = new Event('input', { bubbles: true });
|
||||||
|
element.dispatchEvent(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Necessary resize helper for edge cases where paste doesn't update the container height.
|
||||||
|
*
|
||||||
|
1) Resetting the height to 'auto' forces the component to recalculate height based on its current content
|
||||||
|
|
||||||
|
2) Forcing a reflow. Accessing offsetHeight will cause a reflow of the page,
|
||||||
|
ensuring that the reset height takes effect before resetting back to the scrollHeight.
|
||||||
|
This step is necessary because changes to the DOM do not instantly cause reflows.
|
||||||
|
|
||||||
|
3) Reseting back to scrollHeight reads and applies the ideal height for the current content dynamically
|
||||||
|
*/
|
||||||
|
export const forceResize = (textAreaRef: React.RefObject<HTMLTextAreaElement>) => {
|
||||||
|
if (textAreaRef.current) {
|
||||||
|
textAreaRef.current.style.height = 'auto';
|
||||||
|
textAreaRef.current.offsetHeight;
|
||||||
|
textAreaRef.current.style.height = `${textAreaRef.current.scrollHeight}px`;
|
||||||
|
}
|
||||||
|
};
|
||||||
Loading…
Add table
Add a link
Reference in a new issue