@plannotator/ui 0.28.0 → 0.29.1

package/components/html-viewer/HtmlViewer.tsx

@@ -8,14 +8,36 @@ import {
   useState,
 } from "react";
 import { createPortal } from "react-dom";
+import { useVimDocumentFocus } from "../../hooks/useVimDocumentFocus";
+import {
+  isVimSelectionActionId,
+  type VimSelectionHudContext,
+} from "../../shortcuts";
 import type { Annotation, EditorMode, ImageAttachment, InputMethod } from "../../types";
 import { AnnotationType } from "../../types";
+import { copyTextPreservingFocus } from "../../utils/clipboard";
 import { getIdentity } from "../../utils/identity";
+import {
+  createVimHudCommand,
+  getVimHudPhase,
+  type VimHudCommand,
+} from "../../utils/vimHud";
 import { AnnotationToolbar } from "../AnnotationToolbar";
 import { AttachmentsButton } from "../AttachmentsButton";
-import { CommentPopover, type CommentAskAIHandler } from "../CommentPopover";
+import {
+  CommentPopover,
+  type CommentAskAIHandler,
+  type CommentTargetChip,
+} from "../CommentPopover";
 import { FloatingQuickLabelPicker } from "../FloatingQuickLabelPicker";
+import { VimKeyHud } from "../VimKeyHud";
 import type { ViewerHandle } from "../Viewer";
+import {
+  computeComposerYield,
+  distanceToRect,
+  type ComposerYieldState,
+} from "./composerYield";
+import { buildSyncNumbering } from "./annotationNumbering";
 import { useHtmlAnnotation } from "./useHtmlAnnotation";
 import {
   THEME_TOKENS,
@@ -41,6 +63,79 @@ function isLightTheme(): boolean {
   return document.documentElement.classList.contains("light");
 }
 
+function isBridgeReadyMessage(value: unknown): boolean {
+  return typeof value === "object"
+    && value !== null
+    && "type" in value
+    && value.type === `${PREFIX}ready`;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function parseVimSelectionHudContext(
+  value: unknown,
+): VimSelectionHudContext | null {
+  return value === "inactive"
+    || value === "block"
+    || value === "inline"
+    || value === "text"
+    || value === "visual"
+    || value === "visual-block"
+    || value === "action"
+    ? value
+    : null;
+}
+
+interface VimBridgeCommand {
+  readonly actionId: Parameters<typeof createVimHudCommand>[1];
+  readonly key: string;
+  readonly context: VimSelectionHudContext;
+}
+
+function parseVimBridgeCommand(value: unknown): VimBridgeCommand | null {
+  if (
+    !isRecord(value)
+    || value.type !== `${PREFIX}vim-command`
+    || !isVimSelectionActionId(value.actionId)
+    || typeof value.key !== "string"
+  ) {
+    return null;
+  }
+  const context = parseVimSelectionHudContext(value.context);
+  return context
+    ? { actionId: value.actionId, key: value.key, context }
+    : null;
+}
+
+function parseVimBridgeState(value: unknown): VimSelectionHudContext | null {
+  return isRecord(value) && value.type === `${PREFIX}vim-state`
+    ? parseVimSelectionHudContext(value.phase)
+    : null;
+}
+
+function parseVimBridgeHelp(value: unknown): boolean | null {
+  return isRecord(value)
+    && value.type === `${PREFIX}vim-help`
+    && typeof value.open === "boolean"
+    ? value.open
+    : null;
+}
+
+const MAX_VIM_COPY_TEXT_LENGTH = 2 * 1024 * 1024;
+
+function parseVimBridgeCopy(value: unknown): string | null {
+  return isRecord(value)
+    && value.type === `${PREFIX}vim-copy`
+    && typeof value.text === "string"
+    && value.text.length > 0
+    && value.text.length <= MAX_VIM_COPY_TEXT_LENGTH
+    ? value.text
+    : null;
+}
+
+/** Inputs for the sandboxed raw-HTML viewer and its parent-side annotation UI. */
 export interface HtmlViewerProps {
   rawHtml: string;
   annotations: Annotation[];
@@ -50,6 +145,14 @@ export interface HtmlViewerProps {
   mode: EditorMode;
   /** Input method: 'drag' = text selection, 'pinpoint' = click an element. */
   inputMethod: InputMethod;
+  /** Opt-in Vim-style keyboard selection. Default false for compatibility. */
+  vimModeEnabled?: boolean;
+  /** Replace the iframe-local compact badge with the shared live key HUD. */
+  vimHudEnabled?: boolean;
+  /** Show the parent key panel without affecting the iframe HUD reticle. */
+  vimHudKeyPanelEnabled?: boolean;
+  /** Persist a user request to hide the parent key panel. */
+  onVimHudKeyPanelChange?: (enabled: boolean) => void;
   globalAttachments?: ImageAttachment[];
   onAddGlobalAttachment?: (image: ImageAttachment) => void;
   onRemoveGlobalAttachment?: (path: string) => void;
@@ -67,8 +170,16 @@ export interface HtmlViewerProps {
   /** Toggle the diff-highlighted view on/off. */
   onToggleDiff?: () => void;
   onAskAI?: CommentAskAIHandler;
+  /** Disable every annotation mutation entry point while preserving reading and navigation. */
+  readOnly?: boolean;
+  /** Accessible iframe title. */
+  title?: string;
 }
 
+/**
+ * Render arbitrary HTML in a sandbox and adapt its validated bridge messages
+ * to the same annotation controls used by the Markdown viewer.
+ */
 export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
   (
     {
@@ -79,6 +190,10 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
       selectedAnnotationId,
       mode,
       inputMethod,
+      vimModeEnabled = false,
+      vimHudEnabled = false,
+      vimHudKeyPanelEnabled = true,
+      onVimHudKeyPanelChange,
       globalAttachments = [],
       onAddGlobalAttachment,
       onRemoveGlobalAttachment,
@@ -89,13 +204,24 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
       diffActive,
       onToggleDiff,
       onAskAI,
+      readOnly = false,
+      title = "HTML Plan Viewer",
     },
     ref,
   ) => {
     const iframeRef = useRef<HTMLIFrameElement>(null);
     const globalCommentButtonRef = useRef<HTMLButtonElement>(null);
     const [iframeHeight, setIframeHeight] = useState(600);
-    const [iframeReady, setIframeReady] = useState(false);
+    // Increment on every bridge-ready event so srcdoc navigations re-send
+    // state even though the iframe element and its WindowProxy are reused.
+    const [iframeReadyVersion, setIframeReadyVersion] = useState(0);
+    const [iframeFocused, setIframeFocused] = useState(false);
+    const [vimBridgePhase, setVimBridgePhase] =
+      useState<VimSelectionHudContext>("inactive");
+    const [vimHudCommand, setVimHudCommand] = useState<VimHudCommand | null>(null);
+    const [vimHelpOpen, setVimHelpOpen] = useState(false);
+    const vimHudSequenceRef = useRef(0);
+    const vimHudActive = !readOnly && vimModeEnabled && vimHudEnabled;
     const [globalCommentPopover, setGlobalCommentPopover] = useState<{
       anchorEl: HTMLElement;
       contextText: string;
@@ -119,45 +245,269 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
       setIframeHeight(height);
     }, []);
 
+    // Composer yield while shift-selecting (multi-target drafts): fade the
+    // composer as the pointer approaches, click-through when over it. Pointer
+    // positions arrive from parent mousemoves AND from the bridge (the iframe
+    // consumes moves over the page, so the bridge relays them).
+    const [composerYield, setComposerYield] = useState<ComposerYieldState>("none");
+    const composerYieldRef = useRef(composerYield);
+    composerYieldRef.current = composerYield;
+    const shiftHeldRef = useRef(false);
+
+    const handleYieldPointer = useCallback((clientX: number, clientY: number) => {
+      if (!shiftHeldRef.current) return;
+      const popover = document.querySelector("[data-comment-popover]");
+      if (!popover) return;
+      const rect = popover.getBoundingClientRect();
+      const next = computeComposerYield(
+        composerYieldRef.current,
+        distanceToRect(clientX, clientY, rect),
+      );
+      if (next !== composerYieldRef.current) setComposerYield(next);
+    }, []);
+
+    const handleBridgePointer = useCallback(
+      (x: number, y: number, shift: boolean) => {
+        // The bridge is the only observer of Shift while the pointer lives
+        // inside the sandbox (parent keydowns don't fire there, and window
+        // blur clears our local flag when focus enters the iframe) — so the
+        // relayed shift state arms/disarms the yield directly.
+        shiftHeldRef.current = shift;
+        if (!shift) {
+          setComposerYield("none");
+          return;
+        }
+        const iframeRect = iframeRef.current?.getBoundingClientRect();
+        if (!iframeRect) return;
+        handleYieldPointer(iframeRect.left + x, iframeRect.top + y);
+      },
+      [handleYieldPointer],
+    );
+
     const hook = useHtmlAnnotation({
       iframeRef,
+      enabled: !readOnly,
       annotations,
       onAddAnnotation,
       onSelectAnnotation,
       selectedAnnotationId,
       mode,
       onResize: handleResize,
+      onBridgePointer: handleBridgePointer,
     });
 
+    const multiSelectActive = !readOnly && !!hook.commentPopover && hook.draftTargets.length > 0;
+
+    // Track Shift while a multi-select draft composer is open; releasing it
+    // (or losing window focus) always restores the composer.
+    useEffect(() => {
+      if (!multiSelectActive) {
+        shiftHeldRef.current = false;
+        setComposerYield("none");
+        return;
+      }
+      const down = (e: KeyboardEvent) => {
+        if (e.key === "Shift") shiftHeldRef.current = true;
+      };
+      const release = () => {
+        shiftHeldRef.current = false;
+        setComposerYield("none");
+      };
+      const up = (e: KeyboardEvent) => {
+        if (e.key === "Shift") release();
+      };
+      const move = (e: MouseEvent) => {
+        // Parent-side pointer (over app chrome or the composer itself).
+        if (e.shiftKey) shiftHeldRef.current = true;
+        handleYieldPointer(e.clientX, e.clientY);
+      };
+      window.addEventListener("keydown", down);
+      window.addEventListener("keyup", up);
+      window.addEventListener("blur", release);
+      window.addEventListener("mousemove", move);
+      return () => {
+        window.removeEventListener("keydown", down);
+        window.removeEventListener("keyup", up);
+        window.removeEventListener("blur", release);
+        window.removeEventListener("mousemove", move);
+      };
+    }, [multiSelectActive, handleYieldPointer]);
+
+    // Chip data for the composer: semantic label + short excerpt per target.
+    const targetChips = useMemo<CommentTargetChip[] | undefined>(() => {
+      if (!hook.draftTargets.length) return undefined;
+      return hook.draftTargets.map((t) => ({
+        key: t.key,
+        label: t.label,
+        excerpt: t.text.replace(/\s+/g, " ").trim().slice(0, 80),
+      }));
+    }, [hook.draftTargets]);
+
     useEffect(() => {
-      function handler(e: MessageEvent) {
-        if (e.data?.type === `${PREFIX}ready`) {
-          setIframeReady(true);
+      function handler(e: MessageEvent<unknown>) {
+        if (e.source !== iframeRef.current?.contentWindow) return;
+        if (isBridgeReadyMessage(e.data)) {
+          setIframeReadyVersion((version) => version + 1);
+          setVimBridgePhase("inactive");
+          setVimHudCommand(null);
+          setVimHelpOpen(false);
+          return;
+        }
+        const vimCopy = parseVimBridgeCopy(e.data);
+        if (vimCopy !== null) {
+          const iframe = iframeRef.current;
+          if (
+            !readOnly
+            && vimModeEnabled
+            && iframe
+            && document.activeElement === iframe
+          ) {
+            copyTextPreservingFocus(vimCopy, iframe);
+          }
+          return;
+        }
+        if (!vimHudActive) return;
+        const vimHelp = parseVimBridgeHelp(e.data);
+        if (vimHelp !== null) {
+          setVimHelpOpen(vimHelp);
+          return;
+        }
+        const vimState = parseVimBridgeState(e.data);
+        if (vimState) {
+          setVimBridgePhase(vimState);
+          return;
+        }
+        const vimCommand = parseVimBridgeCommand(e.data);
+        if (vimCommand) {
+          vimHudSequenceRef.current += 1;
+          setVimHudCommand(createVimHudCommand(
+            vimHudSequenceRef.current,
+            vimCommand.actionId,
+            vimCommand.key,
+            vimCommand.context,
+          ));
         }
       }
       window.addEventListener("message", handler);
       return () => window.removeEventListener("message", handler);
+    }, [readOnly, vimHudActive, vimModeEnabled]);
+
+    useEffect(() => {
+      if (vimHudActive) return;
+      setVimBridgePhase("inactive");
+      setVimHudCommand(null);
+      setVimHelpOpen(false);
+    }, [vimHudActive]);
+
+    const handleVimHelpOpenChange = useCallback((open: boolean) => {
+      setVimHelpOpen(open);
+      iframeRef.current?.contentWindow?.postMessage(
+        { type: `${PREFIX}set-vim-help`, open },
+        "*",
+      );
     }, []);
 
+    const handleVimHudFocusLeave = useCallback(() => {
+      if (iframeRef.current === document.activeElement) return;
+      setIframeFocused(false);
+    }, []);
+
+    const focusVimDocument = useCallback((): boolean => {
+      const iframe = iframeRef.current;
+      if (readOnly || !vimModeEnabled || !iframe) return false;
+      if (document.activeElement === iframe) return false;
+      iframe.focus({ preventScroll: true });
+      if (document.activeElement !== iframe) return false;
+      iframe.contentWindow?.postMessage(
+        { type: `${PREFIX}focus-vim` },
+        "*",
+      );
+      return true;
+    }, [readOnly, vimModeEnabled]);
+
+    useVimDocumentFocus({
+      enabled: !readOnly && vimModeEnabled,
+      blocked: !!hook.toolbarState || !!hook.commentPopover || !!hook.quickLabelPicker,
+      focusDocument: focusVimDocument,
+    });
+
     useEffect(() => {
-      if (!iframeReady) return;
+      if (iframeReadyVersion === 0) return;
       if (annotations.length > 0) {
         hook.applyAnnotations(annotations);
       }
-    }, [iframeReady]); // eslint-disable-line react-hooks/exhaustive-deps
+    }, [iframeReadyVersion]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    // Placed-marker numbering is parent-authoritative and matches the
+    // numbers exportAnnotations writes into the submitted feedback: the full
+    // list INCLUDING globals is numbered by ARRAY position (the export's
+    // effective order — its sort keys tie for raw-HTML annotations), and
+    // globals then ship no entry (no page location) — see buildSyncNumbering
+    // for the contract. Renumbers on delete; the bridge's own registration
+    // order is only a pre-sync fallback.
+    useEffect(() => {
+      if (iframeReadyVersion === 0) return;
+      iframeRef.current?.contentWindow?.postMessage(
+        { type: `${PREFIX}sync-annotations`, annotations: buildSyncNumbering(annotations) },
+        "*",
+      );
+    }, [iframeReadyVersion, annotations]);
 
     // Tell the bridge the current input method (drag vs pinpoint). Re-posts on
     // ready (fresh iframe) and whenever the user switches it in the toolstrip.
     useEffect(() => {
-      if (!iframeReady) return;
+      if (iframeReadyVersion === 0) return;
       iframeRef.current?.contentWindow?.postMessage(
         { type: `${PREFIX}set-input-method`, method: inputMethod },
         "*",
       );
-    }, [iframeReady, inputMethod]);
+    }, [iframeReadyVersion, inputMethod]);
+
+    useEffect(() => {
+      if (iframeReadyVersion === 0) return;
+      const iframe = iframeRef.current;
+      iframe?.contentWindow?.postMessage(
+        {
+          type: `${PREFIX}set-vim-mode`,
+          enabled: !readOnly && vimModeEnabled,
+          hudEnabled: vimHudEnabled,
+          mode,
+        },
+        "*",
+      );
+      if (!readOnly && vimModeEnabled && iframe && iframe === document.activeElement) {
+        // The initial parent focus can land before the sandbox bridge is ready.
+        // Reassert it after configuration so raw HTML enters BLOCK immediately,
+        // matching the Markdown surface instead of waiting for the first key.
+        iframe.contentWindow?.postMessage(
+          { type: `${PREFIX}focus-vim` },
+          "*",
+        );
+      }
+    }, [iframeReadyVersion, mode, readOnly, vimHudEnabled, vimModeEnabled]);
+
+    const vimOverlayWasOpenRef = useRef(false);
+    useEffect(() => {
+      const overlayOpen = !!hook.toolbarState || !!hook.commentPopover || !!hook.quickLabelPicker;
+      const wasOpen = vimOverlayWasOpenRef.current;
+      vimOverlayWasOpenRef.current = overlayOpen;
+      if (
+        !readOnly
+        && vimModeEnabled
+        && wasOpen
+        && !overlayOpen
+        && (document.activeElement === document.body || document.activeElement === null)
+      ) {
+        iframeRef.current?.focus({ preventScroll: true });
+        iframeRef.current?.contentWindow?.postMessage(
+          { type: `${PREFIX}focus-vim` },
+          "*",
+        );
+      }
+    }, [hook.commentPopover, hook.quickLabelPicker, hook.toolbarState, readOnly, vimModeEnabled]);
 
     useEffect(() => {
-      if (!iframeReady) return;
+      if (iframeReadyVersion === 0) return;
       function sendTheme() {
         iframeRef.current?.contentWindow?.postMessage(
           {
@@ -176,7 +526,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
         attributeFilter: ["class", "style"],
       });
       return () => observer.disconnect();
-    }, [iframeReady, hostTheme]);
+    }, [iframeReadyVersion, hostTheme]);
 
     useImperativeHandle(ref, () => ({
       removeHighlight: hook.removeHighlight,
@@ -186,6 +536,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
 
     const handleGlobalCommentSubmit = useCallback(
       (text: string, images?: ImageAttachment[]) => {
+        if (readOnly) return;
         onAddAnnotation({
           id: `global-${Date.now()}`,
           blockId: "",
@@ -200,9 +551,15 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
         });
         setGlobalCommentPopover(null);
       },
-      [onAddAnnotation],
+      [onAddAnnotation, readOnly],
     );
 
+    useEffect(() => {
+      if (readOnly) setGlobalCommentPopover(null);
+    }, [readOnly]);
+
+    const hasActionButtons = !readOnly || Boolean(diffAvailable && onToggleDiff);
+
     // Document-level controls (attachments + global comment). Shared between the
     // normal layout (bar above the card) and full-viewport (floating overlay), so
     // edge-to-edge HTML keeps these affordances rather than dropping them.
@@ -220,7 +577,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
             <span>{diffActive ? "Hide changes" : "Show changes"}</span>
           </button>
         )}
-        {onAddGlobalAttachment && onRemoveGlobalAttachment && (
+        {!readOnly && onAddGlobalAttachment && onRemoveGlobalAttachment && (
           <AttachmentsButton
             images={globalAttachments}
             onAdd={onAddGlobalAttachment}
@@ -228,22 +585,23 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
             variant="toolbar"
           />
         )}
-        <button
-          ref={globalCommentButtonRef}
-          onClick={() => {
-            setGlobalCommentPopover({
-              anchorEl: globalCommentButtonRef.current!,
-              contextText: "",
-            });
-          }}
-          className="flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground bg-muted/50 hover:bg-muted rounded-md transition-colors cursor-pointer"
-          title="Add global comment"
-        >
-          <svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
-            <path strokeLinecap="round" strokeLinejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.087.16 2.185.283 3.293.369V21l4.076-4.076a1.526 1.526 0 011.037-.443 48.282 48.282 0 005.68-.494c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" />
-          </svg>
-          <span>Comment</span>
-        </button>
+        {!readOnly && (
+          <button
+            ref={globalCommentButtonRef}
+            onClick={() => {
+              const anchorEl = globalCommentButtonRef.current;
+              if (!anchorEl) return;
+              setGlobalCommentPopover({ anchorEl, contextText: "" });
+            }}
+            className="flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground bg-muted/50 hover:bg-muted rounded-md transition-colors cursor-pointer"
+            title="Add global comment"
+          >
+            <svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
+              <path strokeLinecap="round" strokeLinejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.087.16 2.185.283 3.293.369V21l4.076-4.076a1.526 1.526 0 011.037-.443 48.282 48.282 0 005.68-.494c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" />
+            </svg>
+            <span>Comment</span>
+          </button>
+        )}
       </>
     );
 
@@ -254,7 +612,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
           style={fullViewport ? undefined : { maxWidth: maxWidth ?? undefined }}
         >
           {/* Action bar — above the iframe in normal mode (outside overflow:hidden). */}
-          {!fullViewport && (
+          {!fullViewport && hasActionButtons && (
             <div data-print-hide className="flex justify-end gap-1 md:gap-2 mb-2">
               {actionButtons}
             </div>
@@ -267,7 +625,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
             {/* Full-viewport mode has no card chrome, so float the same controls
                 over the top-right of the iframe (with a backdrop so they read over
                 any HTML). The selection toolbar is portaled separately. */}
-            {fullViewport && !hideControls && (
+            {fullViewport && !hideControls && hasActionButtons && (
               <div
                 data-print-hide
                 className="absolute top-3 right-3 z-10 flex items-center gap-1 md:gap-2 rounded-lg border border-border/50 bg-background/80 px-1.5 py-1 shadow-md backdrop-blur-sm"
@@ -276,23 +634,60 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
               </div>
             )}
             <iframe
-            ref={iframeRef}
-            srcDoc={srcdoc}
-            sandbox="allow-scripts"
-            style={{
-              width: "100%",
-              height: fullViewport ? "100%" : `${iframeHeight}px`,
-              border: "none",
-              display: "block",
-              colorScheme: "auto",
-            }}
-            title="HTML Plan Viewer"
-          />
+              ref={iframeRef}
+              srcDoc={srcdoc}
+              sandbox="allow-scripts"
+              style={{
+                width: "100%",
+                height: fullViewport ? "100%" : `${iframeHeight}px`,
+                border: "none",
+                display: "block",
+                colorScheme: "auto",
+                outline: !readOnly && vimModeEnabled ? "none" : undefined,
+              }}
+              title={title}
+              onFocus={() => setIframeFocused(true)}
+              onBlur={(event) => {
+                if (
+                  event.relatedTarget instanceof Element
+                  && event.relatedTarget.closest('[data-vim-key-hud]')
+                ) {
+                  return;
+                }
+                setIframeFocused(false);
+              }}
+            />
           </article>
         </div>
 
+        {vimHudActive
+          && (vimHelpOpen || (
+            vimHudKeyPanelEnabled
+            && vimBridgePhase !== "inactive"
+          ))
+          && (iframeFocused || vimBridgePhase === "action" || vimHelpOpen)
+          && createPortal(
+            <VimKeyHud
+              command={vimHudCommand}
+              phase={getVimHudPhase(vimBridgePhase, vimHudCommand?.actionId)}
+              inputMethod={inputMethod}
+              expanded={vimHelpOpen}
+              onExpandedChange={handleVimHelpOpenChange}
+              onHide={
+                onVimHudKeyPanelChange
+                  ? () => {
+                    handleVimHelpOpenChange(false);
+                    onVimHudKeyPanelChange(false);
+                  }
+                  : undefined
+              }
+              onFocusLeave={handleVimHudFocusLeave}
+            />,
+            document.body,
+          )}
+
         {/* Toolbar portal */}
-        {hook.toolbarState &&
+        {!readOnly && hook.toolbarState &&
           createPortal(
             <AnnotationToolbar
               positionMode="center-above"
@@ -307,7 +702,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
           )}
 
         {/* Comment popover portal */}
-        {hook.commentPopover &&
+        {!readOnly && hook.commentPopover &&
           createPortal(
             <CommentPopover
               anchorEl={hook.commentPopover.anchorEl}
@@ -316,18 +711,25 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
               isGlobal={false}
               onSubmit={hook.handleCommentSubmit}
               onClose={hook.handleCommentClose}
+              skillReferences
               onAskAI={onAskAI}
               askAIContext={{
                 kind: "selection",
                 label: "Selected HTML",
                 text: hook.commentPopover.selectedText ?? hook.commentPopover.contextText,
               }}
+              targetChips={targetChips}
+              onRemoveTargetChip={targetChips ? hook.removeDraftTarget : undefined}
+              onHoverTargetChip={targetChips ? hook.flashDraftTarget : undefined}
+              refocusToken={targetChips ? hook.composerFocusToken : undefined}
+              captureStrayKeys={multiSelectActive}
+              yieldState={multiSelectActive ? composerYield : undefined}
             />,
             document.body,
           )}
 
         {/* Quick label picker portal */}
-        {hook.quickLabelPicker &&
+        {!readOnly && hook.quickLabelPicker &&
           createPortal(
             <FloatingQuickLabelPicker
               anchorEl={hook.quickLabelPicker.anchorEl}
@@ -339,7 +741,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
           )}
 
         {/* Global comment popover portal */}
-        {globalCommentPopover &&
+        {!readOnly && globalCommentPopover &&
           createPortal(
             <CommentPopover
               anchorEl={globalCommentPopover.anchorEl}
@@ -347,6 +749,7 @@ export const HtmlViewer = forwardRef<ViewerHandle, HtmlViewerProps>(
               isGlobal={true}
               onSubmit={handleGlobalCommentSubmit}
               onClose={() => setGlobalCommentPopover(null)}
+              skillReferences
               onAskAI={onAskAI}
               askAIContext={{ kind: "general", label: "Document" }}
             />,