ai/svelte: use derived state for isLoading (#417)

vercel · Aug 4, 2023 · 5f91427 · 5f91427
1 parent c9e8a4b
commit 5f91427
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/.changeset/new-papayas-work.md b/.changeset/new-papayas-work.md
@@ -0,0 +1,5 @@
+---
+'ai': patch
+---
+
+ai/svelte: fix isLoading return value
diff --git a/packages/core/svelte/use-chat.ts b/packages/core/svelte/use-chat.ts
@@ -1,4 +1,4 @@
-import { Readable, get, writable, Writable } from 'svelte/store'
+import { Readable, get, writable, Writable, derived } from 'svelte/store'
 import { useSWR } from 'sswr'
 import { nanoid, createChunkDecoder } from '../shared/utils'
 
@@ -386,6 +386,13 @@ export function useChat({
     input.set('')
   }
 
+  const isLoading = derived(
+    [isSWRLoading, loading],
+    ([$isSWRLoading, $loading]) => {
+      return $isSWRLoading || $loading
+    }
+  )
+
   return {
     messages,
     error,
@@ -395,6 +402,6 @@ export function useChat({
     setMessages,
     input,
     handleSubmit,
-    isLoading: isSWRLoading || loading
+    isLoading: isLoading
   }
 }
diff --git a/packages/core/svelte/use-completion.ts b/packages/core/svelte/use-completion.ts
@@ -1,5 +1,5 @@
 import { useSWR } from 'sswr'
-import { Readable, get, writable } from 'svelte/store'
+import { Readable, derived, get, writable } from 'svelte/store'
 
 import { Writable } from 'svelte/store'
 
@@ -200,6 +200,13 @@ export function useCompletion({
     return complete(inputValue)
   }
 
+  const isLoading = derived(
+    [isSWRLoading, loading],
+    ([$isSWRLoading, $loading]) => {
+      return $isSWRLoading || $loading
+    }
+  )
+
   return {
     completion,
     complete,
@@ -208,6 +215,6 @@ export function useCompletion({
     setCompletion,
     input,
     handleSubmit,
-    isLoading: isSWRLoading || loading
+    isLoading
   }
 }