Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: pasting multiline text #1820

Merged
merged 1 commit into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@
"vite@>=4.0.0 <=4.5.3": ">=4.5.4",
"rollup@>=3.0.0 <3.29.5": ">=3.29.5",
"rollup@>=4.0.0 <4.22.4": ">=4.22.4",
"cross-spawn@>=7.0.0 <7.0.5": ">=7.0.5",
"nanoid@<3.3.8": ">=3.3.8"
}
"cross-spawn@>=7.0.0 <7.0.5": ">=7.0.5"
}
}
}
11 changes: 5 additions & 6 deletions frontend/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion frontend/src/components/LeftSidebar/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ export default function SearchChats() {
navigate(`/thread/${thread.id}`);
}}
>
{thread.name || 'Untitled Conversation'}
<div className="line-clamp-2">
{thread.name || 'Untitled Conversation'}
</div>
</CommandItem>
))}
</CommandGroup>
Expand Down
53 changes: 50 additions & 3 deletions frontend/src/components/chat/MessageComposer/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,15 @@ const Input = forwardRef<InputMethods, Props>(
commandSpan.remove();
}

return clone.textContent?.replace('\u200B', '') || '';
return (
clone.innerHTML
?.replace(/<br\s*\/?>/g, '\n') // Convert <br> to newlines
.replace(/<div>/g, '\n') // Convert <div> to newlines
.replace(/<\/div>/g, '') // Remove closing div tags
.replace(/&nbsp;/g, ' ') // Convert &nbsp; to spaces
.replace(/<[^>]*>/g, '') // Remove any other HTML tags
.replace('\u200B', '') || ''
);
};

const reset = () => {
Expand Down Expand Up @@ -209,10 +217,49 @@ const Input = forwardRef<InputMethods, Props>(
const textarea = contentEditableRef.current;
if (!textarea || !onPaste) return;

textarea.addEventListener('paste', onPaste);
const _onPaste = (event: ClipboardEvent) => {
event.preventDefault();

const text = event.clipboardData
?.getData('text/plain')
.replace(/\n/g, '<br>');
if (text) {
const selection = window.getSelection();
if (selection?.rangeCount) {
const range = selection.getRangeAt(0);
range.deleteContents();

// Insert the HTML content
const tempDiv = document.createElement('div');
tempDiv.innerHTML = text;
const fragment = document.createDocumentFragment();
while (tempDiv.firstChild) {
fragment.appendChild(tempDiv.firstChild);
}
range.insertNode(fragment);

// Move cursor to end of pasted content
range.collapse(false);
selection.removeAllRanges();
selection.addRange(range);

// Force focus back to the content editable
textarea.focus();
textarea.scrollTop = textarea.scrollHeight;
}

// Trigger input event to update state
const inputEvent = new Event('input', { bubbles: true });
textarea.dispatchEvent(inputEvent);
}

onPaste(event);
};

textarea.addEventListener('paste', _onPaste);

return () => {
textarea.removeEventListener('paste', onPaste);
textarea.removeEventListener('paste', _onPaste);
};
}, [onPaste]);

Expand Down
9 changes: 0 additions & 9 deletions frontend/src/components/chat/MessageComposer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ export default function MessageComposer({
if (event.clipboardData && event.clipboardData.items) {
const items = Array.from(event.clipboardData.items);

// Attempt to handle text data first
const textData = event.clipboardData.getData('text/plain');
if (textData) {
// Skip file handling if text data is present
return;
}

event.preventDefault();

// If no text data, check for files (e.g., images)
items.forEach((item) => {
if (item.kind === 'file') {
Expand Down
3 changes: 1 addition & 2 deletions libs/copilot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@
"vite@>=4.0.0 <=4.5.3": ">=4.5.4",
"rollup@>=3.0.0 <3.29.5": ">=3.29.5",
"cookie@<0.7.0": ">=0.7.0",
"cross-spawn@>=7.0.0 <7.0.5": ">=7.0.5",
"nanoid@<3.3.8": ">=3.3.8"
"cross-spawn@>=7.0.0 <7.0.5": ">=7.0.5"
}
}
}
11 changes: 5 additions & 6 deletions libs/copilot/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions libs/react-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
"vite@>=4.0.0 <4.5.4": ">=4.5.4",
"vite@>=4.0.0 <=4.5.3": ">=4.5.4",
"rollup@>=3.0.0 <3.29.5": ">=3.29.5",
"cross-spawn@>=7.0.0 <7.0.5": ">=7.0.5",
"nanoid@<3.3.8": ">=3.3.8"
"cross-spawn@>=7.0.0 <7.0.5": ">=7.0.5"
}
}
}
11 changes: 5 additions & 6 deletions libs/react-client/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading