diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index a2f5116dee..86d86a9ae4 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -324,6 +324,8 @@
message.content = data.content;
} else if (type === 'chat:message:files' || type === 'files') {
message.files = data.files;
+ } else if (type === 'chat:message:error') {
+ message.error = data.error;
} else if (type === 'chat:message:follow_ups') {
message.followUps = data.follow_ups;
diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte
index 0a7662eb70..adea345ed0 100644
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -417,6 +417,30 @@
let recording = false;
let isComposing = false;
+ // Safari has a bug where compositionend is not triggered correctly #16615
+ // when using the virtual keyboard on iOS.
+ let compositionEndedAt = -2e8;
+ const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+ function inOrNearComposition(event: Event) {
+ if (isComposing) {
+ return true;
+ }
+ // See https://www.stum.de/2016/06/24/handling-ime-events-in-javascript/.
+ // On Japanese input method editors (IMEs), the Enter key is used to confirm character
+ // selection. On Safari, when Enter is pressed, compositionend and keydown events are
+ // emitted. The keydown event triggers newline insertion, which we don't want.
+ // This method returns true if the keydown event should be ignored.
+ // We only ignore it once, as pressing Enter a second time *should* insert a newline.
+ // Furthermore, the keydown event timestamp must be close to the compositionEndedAt timestamp.
+ // This guards against the case where compositionend is triggered without the keyboard
+ // (e.g. character confirmation may be done with the mouse), and keydown is triggered
+ // afterwards- we wouldn't want to ignore the keydown event in this case.
+ if (isSafari && Math.abs(event.timeStamp - compositionEndedAt) < 500) {
+ compositionEndedAt = -2e8;
+ return true;
+ }
+ return false;
+ }
let chatInputContainerElement;
let chatInputElement;
@@ -1169,19 +1193,9 @@
return res;
}}
oncompositionstart={() => (isComposing = true)}
- oncompositionend={() => {
- const isSafari = /^((?!chrome|android).)*safari/i.test(
- navigator.userAgent
- );
-
- if (isSafari) {
- // Safari has a bug where compositionend is not triggered correctly #16615
- // when using the virtual keyboard on iOS.
- // We use a timeout to ensure that the composition is ended after a short delay.
- setTimeout(() => (isComposing = false));
- } else {
- isComposing = false;
- }
+ oncompositionend={(e) => {
+ compositionEndedAt = e.timeStamp;
+ isComposing = false;
}}
on:keydown={async (e) => {
e = e.detail.event;
@@ -1290,7 +1304,7 @@
navigator.msMaxTouchPoints > 0
)
) {
- if (isComposing) {
+ if (inOrNearComposition(e)) {
return;
}
@@ -1393,17 +1407,9 @@
command = getCommand();
}}
on:compositionstart={() => (isComposing = true)}
- on:compositionend={() => {
- const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
- if (isSafari) {
- // Safari has a bug where compositionend is not triggered correctly #16615
- // when using the virtual keyboard on iOS.
- // We use a timeout to ensure that the composition is ended after a short delay.
- setTimeout(() => (isComposing = false));
- } else {
- isComposing = false;
- }
+ oncompositionend={(e) => {
+ compositionEndedAt = e.timeStamp;
+ isComposing = false;
}}
on:keydown={async (e) => {
const isCtrlPressed = e.ctrlKey || e.metaKey; // metaKey is for Cmd key on Mac
@@ -1523,7 +1529,7 @@
navigator.msMaxTouchPoints > 0
)
) {
- if (isComposing) {
+ if (inOrNearComposition(e)) {
return;
}
diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index 8c6712ebf9..f7e7a8345d 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -49,6 +49,7 @@
export let addMessages: Function = () => {};
export let readOnly = false;
+ export let editCodeBlock = true;
export let topPadding = false;
export let bottomPadding = false;
@@ -56,7 +57,7 @@
export let onSelect = (e) => {};
- let messagesCount = 20;
+ export let messagesCount: number | null = 20;
let messagesLoading = false;
const loadMoreMessages = async () => {
@@ -76,7 +77,7 @@
let _messages = [];
let message = history.messages[history.currentId];
- while (message && _messages.length <= messagesCount) {
+ while (message && (messagesCount !== null ? _messages.length <= messagesCount : true)) {
_messages.unshift({ ...message });
message = message.parentId !== null ? history.messages[message.parentId] : null;
}
@@ -447,6 +448,7 @@
{addMessages}
{triggerScroll}
{readOnly}
+ {editCodeBlock}
{topPadding}
/>
{/each}
diff --git a/src/lib/components/chat/Messages/Citations.svelte b/src/lib/components/chat/Messages/Citations.svelte
index 99cfaf5240..fa75589abf 100644
--- a/src/lib/components/chat/Messages/Citations.svelte
+++ b/src/lib/components/chat/Messages/Citations.svelte
@@ -4,6 +4,7 @@
import Collapsible from '$lib/components/common/Collapsible.svelte';
import ChevronDown from '$lib/components/icons/ChevronDown.svelte';
import ChevronUp from '$lib/components/icons/ChevronUp.svelte';
+ import { mobile } from '$lib/stores';
const i18n = getContext('i18n');
@@ -55,9 +56,9 @@
return acc;
}
- source.document.forEach((document, index) => {
- const metadata = source.metadata?.[index];
- const distance = source.distances?.[index];
+ source?.document?.forEach((document, index) => {
+ const metadata = source?.metadata?.[index];
+ const distance = source?.distances?.[index];
// Within the same citation there could be multiple documents
const id = metadata?.source ?? source?.source?.id ?? 'N/A';
@@ -87,6 +88,7 @@
});
}
});
+
return acc;
}, []);
console.log('citations', citations);
@@ -155,7 +157,7 @@
>
- {#each citations.slice(0, 2) as citation, idx}
+ {#each citations.slice(0, $mobile ? 1 : 2) as citation, idx}