@plannotator/ui 0.31.0 → 0.32.0

package/hooks/useSharing.ts

@@ -8,7 +8,7 @@
  * - Tracking whether current session is from a shared link
  */
 
-import React, { useState, useEffect, useCallback, useRef } from 'react';
+import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import { Annotation, type ImageAttachment } from '../types';
 import {
   type SharePayload,
@@ -104,6 +104,7 @@ export function useSharing(
   setRawHtml?: (h: string) => void,
   setShareHtml?: (h: string) => void,
   setRenderAs?: (m: 'markdown' | 'html') => void,
+  contentRevision = 0,
 ): UseSharingResult {
   const [isSharedSession, setIsSharedSession] = useState(false);
   const [isLoadingShared, setIsLoadingShared] = useState(true);
@@ -115,6 +116,23 @@ export function useSharing(
   const [pendingSharedAnnotations, setPendingSharedAnnotations] = useState<Annotation[] | null>(null);
   const [sharedGlobalAttachments, setSharedGlobalAttachments] = useState<ImageAttachment[] | null>(null);
   const [shareLoadError, setShareLoadError] = useState('');
+  // Identity token for in-flight share requests: a new token invalidates any
+  // response still on the wire. Content inputs only — resolveRawHtmlForShare
+  // is deliberately NOT a dependency: its identity changes when it caches the
+  // portable HTML mid-request (App memoizes it on shareHtml), and listing it
+  // would make the first short-link generation on an HTML session discard its
+  // own result. HTML refreshes invalidate through contentRevision instead.
+  const shareRequestContext = useMemo(() => ({}), [
+    markdown,
+    annotations,
+    globalAttachments,
+    shareBaseUrl,
+    pasteApiUrl,
+    rawHtml,
+    contentRevision,
+  ]);
+  const latestShareRequestContextRef = useRef(shareRequestContext);
+  latestShareRequestContextRef.current = shareRequestContext;
 
   const clearPendingSharedAnnotations = useCallback(() => {
     setPendingSharedAnnotations(null);
@@ -257,16 +275,19 @@ export function useSharing(
 
   // Generate share URL when markdown or annotations change
   const refreshShareUrl = useCallback(async () => {
+    const requestContext = shareRequestContext;
     try {
       const url = await generateShareUrl(markdown, annotations, globalAttachments, shareBaseUrl, rawHtml);
+      if (latestShareRequestContextRef.current !== requestContext) return;
       setShareUrl(url ?? '');
       setShareUrlSize(url ? formatUrlSize(url) : '');
     } catch (e) {
+      if (latestShareRequestContextRef.current !== requestContext) return;
       console.error('Failed to generate share URL:', e);
       setShareUrl('');
       setShareUrlSize('');
     }
-  }, [markdown, annotations, globalAttachments, shareBaseUrl, rawHtml]);
+  }, [markdown, annotations, globalAttachments, shareBaseUrl, rawHtml, shareRequestContext]);
 
   // Auto-refresh share URL when dependencies change
   useEffect(() => {
@@ -280,9 +301,10 @@ export function useSharing(
   useEffect(() => {
     if (isSharedSession) { isSharedRef.current = true; return; }
     if (isSharedRef.current) { isSharedRef.current = false; return; }
+    setIsGeneratingShortUrl(false);
     setShortShareUrl('');
     setShortUrlError('');
-  }, [markdown, annotations, globalAttachments, rawHtml, isSharedSession]);
+  }, [markdown, annotations, globalAttachments, rawHtml, isSharedSession, contentRevision]);
 
   /**
    * Generate a short URL via the paste service.
@@ -295,6 +317,7 @@ export function useSharing(
 
     setIsGeneratingShortUrl(true);
     setShortUrlError('');
+    const requestContext = shareRequestContext;
 
     try {
       const htmlForShare = rawHtml
@@ -308,6 +331,8 @@ export function useSharing(
         htmlForShare,
       );
 
+      if (latestShareRequestContextRef.current !== requestContext) return null;
+
       if (result) {
         setShortShareUrl(result.shortUrl);
         return result.shortUrl;
@@ -317,13 +342,14 @@ export function useSharing(
         return null;
       }
     } catch (e) {
+      if (latestShareRequestContextRef.current !== requestContext) return null;
       setShortShareUrl('');
       setShortUrlError(e instanceof Error ? e.message : 'Failed to generate short URL');
       return null;
     } finally {
-      setIsGeneratingShortUrl(false);
+      if (latestShareRequestContextRef.current === requestContext) setIsGeneratingShortUrl(false);
     }
-  }, [markdown, annotations, globalAttachments, shareBaseUrl, pasteApiUrl, rawHtml, resolveRawHtmlForShare]);
+  }, [markdown, annotations, globalAttachments, shareBaseUrl, pasteApiUrl, rawHtml, resolveRawHtmlForShare, shareRequestContext]);
 
   // Import annotations from a teammate's share URL (supports both hash-based and short /p/<id> URLs)
   const importFromShareUrl = useCallback(async (url: string): Promise<ImportResult> => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/ui",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "type": "module",
   "exports": {
     "./components/*": "./components/*.tsx",
@@ -17,6 +17,7 @@
     "./lib/*": "./lib/*.ts",
     "./hooks/*": "./hooks/*.ts",
     "./shortcuts": "./shortcuts/index.ts",
+    "./webmcp": "./webmcp/index.ts",
     "./config": "./config/index.ts",
     "./configure": "./configure.ts",
     "./theme-modes": "./components/themeModes.tsx",
@@ -32,6 +33,7 @@
     "lib",
     "shortcuts",
     "utils",
+    "webmcp",
     "assets",
     "themes",
     "sprite_package_additional",
@@ -69,7 +71,7 @@
     "@lezer/highlight": "^1.2.3",
     "@pierre/diffs": "1.3.2",
     "@plannotator/atomic-editor": "^0.8.0",
-    "@plannotator/core": "0.24.0",
+    "@plannotator/core": "0.25.0",
     "@plannotator/markdown-editor": "^0.4.0",
     "@plannotator/web-highlighter": "^0.8.1",
     "@tanstack/react-table": "^8.21.3",