@parhelia/core 0.3.12816 → 0.3.12822

package/dist/editor/client/EditorShell.js

@@ -744,6 +744,13 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
     const modeTransitionChainRef = useRef(Promise.resolve());
     const modeChangeParticipantsRef = useRef(new Set());
     const loadSuggestedEditsRef = useRef(async () => undefined);
+    const commentsLoadRequestRef = useRef(0);
+    const commentsAppliedRequestRef = useRef(0);
+    const commentsItemKey = currentItemDescriptor
+        ? `${currentItemDescriptor.id}:${currentItemDescriptor.language}:${currentItemDescriptor.version}`
+        : undefined;
+    const commentsItemKeyRef = useRef(commentsItemKey);
+    commentsItemKeyRef.current = commentsItemKey;
     const suggestedEditsLoadRequestRef = useRef(0);
     const suggestedEditsAppliedRequestRef = useRef(0);
     const suggestedEditsItemKey = item
@@ -1292,11 +1299,11 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
     }, [currentWorkspace]);
     const sendClientInfoImmediate = useCallback(async () => {
         const itemAtSend = currentItemRef.current;
+        const pageAtSend = activePageViewContextRef.current?.page?.item;
         const clientInfoMessage = {
             type: "client-info",
             sessionId: sessionId,
-            url: window.location.href,
-            userAgent: navigator.userAgent,
+            page: pageAtSend?.descriptor ?? null,
             item: itemAtSend
                 ? {
                     ...itemAtSend.descriptor,
@@ -2051,12 +2058,21 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         catch { }
     }, [activeSessions, sessionId]);
     const loadComments = useCallback(async () => {
+        const requestId = ++commentsLoadRequestRef.current;
         if (!currentItemDescriptor)
             return;
+        const requestedItemKey = `${currentItemDescriptor.id}:${currentItemDescriptor.language}:${currentItemDescriptor.version}`;
         const reviewId = searchParams.get("reviewId");
         const result = await getComments(currentItemDescriptor.id, currentItemDescriptor.language, currentItemDescriptor.version, reviewId ?? undefined);
+        // Navigation and realtime invalidations can overlap. Ignore responses for
+        // an old item and older snapshots that arrive after a newer request.
+        if (requestedItemKey !== commentsItemKeyRef.current)
+            return;
+        if (requestId < commentsAppliedRequestRef.current)
+            return;
         if (handleErrorResult(result, ui, state))
             return;
+        commentsAppliedRequestRef.current = requestId;
         setComments((x) => {
             const loadedComments = filterRemovedComments(result.data);
             const newComments = x.filter((c) => c.isNew &&
@@ -3532,8 +3548,8 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         currentItemDescriptor,
         loadItem,
         loadItemVersions,
-        setComments,
-        setSuggestedEdits,
+        loadComments,
+        loadSuggestedEdits,
         setActiveFieldActions,
         setQuotaInfo,
         requestRefresh,