@melony/react 0.1.42 → 0.1.44

package/dist/index.js

@@ -69,8 +69,13 @@ var MelonyContextProviderInner = ({
         case "client:navigate": {
           const url = event.data?.url;
           if (url) {
-            window.history.pushState(null, "", url);
-            window.dispatchEvent(new PopStateEvent("popstate"));
+            const isStreaming = client.getState().isLoading;
+            if (isStreaming) {
+              window.history.replaceState(null, "", url);
+            } else {
+              window.history.pushState(null, "", url);
+              window.dispatchEvent(new PopStateEvent("popstate"));
+            }
           }
           return true;
         }
@@ -756,6 +761,7 @@ var ThreadProvider = ({
   initialThreadId: providedInitialThreadId
 }) => {
   const queryClient = useQueryClient();
+  const melonyContext = useContext(MelonyContext);
   const [activeThreadId, setActiveThreadId] = useQueryState(
     "threadId",
     parseAsString
@@ -772,17 +778,24 @@ var ThreadProvider = ({
   const {
     data: threads = [],
     isLoading,
+    isFetched: isFetchedThreads,
     error: threadsError,
     refetch: refreshThreads
   } = useQuery({
     queryKey: ["threads"],
     queryFn: () => service.getThreads(),
-    staleTime: !prevActiveThreadIdRef.current && activeThreadId ? Infinity : 0
+    staleTime: prevActiveThreadIdRef.current === null && activeThreadId !== null ? Infinity : 0
   });
+  const isNewThread = useMemo(() => {
+    if (!activeThreadId || !isFetchedThreads) return false;
+    return !threads.some((t) => t.id === activeThreadId);
+  }, [activeThreadId, threads, isFetchedThreads]);
   const { data: threadEvents = [], isLoading: isLoadingEvents } = useQuery({
     queryKey: ["threads", activeThreadId, "events"],
     queryFn: () => service.getEvents(activeThreadId),
-    enabled: !!activeThreadId
+    enabled: !!activeThreadId,
+    initialData: isNewThread ? melonyContext?.events : void 0,
+    staleTime: isNewThread ? Infinity : 0
   });
   const createMutation = useMutation({
     mutationFn: async () => {