@opengeni/react 1.0.1 → 1.0.2-canary.37191796234001

package/src/components/timeline-annotation-shared.ts

@@ -0,0 +1,245 @@
+import type { TimelineAnnotationSource } from "@opengeni/sdk";
+
+export const ANNOTATION_CHROME_SELECTOR =
+  "[data-og-annotation-chrome], [data-og-annotation-badge], [data-og-annotation-popover]";
+
+export function annotationHasNote(note: string): boolean {
+  return note.trim().length > 0;
+}
+
+export function annotationDisplayOrdinal(
+  annotation: { readonly id?: string; readonly ordinal?: number | undefined },
+  index: number,
+): number {
+  return typeof annotation.ordinal === "number" ? annotation.ordinal : index + 1;
+}
+
+export function sourceKindLabel(kind: TimelineAnnotationSource["kind"]): string {
+  switch (kind) {
+    case "user_message":
+      return "Your message";
+    case "assistant_message":
+      return "Assistant";
+    case "tool_output":
+      return "Tool output";
+  }
+}
+
+export function annotationSourceLabel(source: TimelineAnnotationSource): string {
+  return source.label?.trim() || sourceKindLabel(source.kind);
+}
+
+export function truncateAnnotationQuote(quote: string, maxChars = 160): string {
+  const normalized = quote.replace(/\s+/g, " ").trim();
+  if (normalized.length <= maxChars) return normalized;
+  return `${normalized.slice(0, Math.max(0, maxChars - 1)).trimEnd()}…`;
+}
+
+export function cssEscapeAttribute(value: string): string {
+  if (typeof CSS !== "undefined" && typeof CSS.escape === "function") return CSS.escape(value);
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+
+export function isAnnotationChromeNode(node: Node | null): boolean {
+  const element = node instanceof Element ? node : node?.parentElement;
+  return Boolean(element?.closest(ANNOTATION_CHROME_SELECTOR));
+}
+
+export function occurrenceOffsets(text: string, quote: string): number[] {
+  if (!quote) return [];
+  const offsets: number[] = [];
+  let cursor = 0;
+  while (cursor <= text.length - quote.length) {
+    const offset = text.indexOf(quote, cursor);
+    if (offset < 0) break;
+    offsets.push(offset);
+    cursor = offset + 1;
+  }
+  return offsets;
+}
+
+function uniqueNonEmpty(values: string[]): string[] {
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const value of values) {
+    if (!value || seen.has(value)) continue;
+    seen.add(value);
+    out.push(value);
+  }
+  return out;
+}
+
+export function matchingQuoteInSource(sourceText: string, quote: string): string | null {
+  for (const candidate of uniqueNonEmpty([quote, quote.trim()])) {
+    if (sourceText.includes(candidate)) return candidate;
+  }
+  const trimmed = quote.trim();
+  for (let length = trimmed.length; length >= 8; length--) {
+    const slice = trimmed.slice(0, length);
+    if (sourceText.includes(slice)) return slice;
+  }
+  for (let start = 1; start <= trimmed.length - 8; start++) {
+    const slice = trimmed.slice(start);
+    if (sourceText.includes(slice)) return slice;
+  }
+  return null;
+}
+
+type AnnotatableSpan = {
+  node: Text;
+  start: number;
+  length: number;
+};
+
+export function annotatableText(root: HTMLElement): { text: string; spans: AnnotatableSpan[] } {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, {
+    acceptNode(node) {
+      if (!(node instanceof Text) || node.data.length === 0) return NodeFilter.FILTER_REJECT;
+      if (isAnnotationChromeNode(node)) return NodeFilter.FILTER_REJECT;
+      return NodeFilter.FILTER_ACCEPT;
+    },
+  });
+  const spans: AnnotatableSpan[] = [];
+  let text = "";
+  let current: Node | null;
+  while ((current = walker.nextNode())) {
+    if (!(current instanceof Text)) continue;
+    spans.push({ node: current, start: text.length, length: current.data.length });
+    text += current.data;
+  }
+  return { text, spans };
+}
+
+function pointAt(
+  spans: AnnotatableSpan[],
+  offset: number,
+  stickEnd: boolean,
+): { node: Text; offset: number } | null {
+  if (spans.length === 0) return null;
+  for (let index = 0; index < spans.length; index++) {
+    const span = spans[index]!;
+    const local = offset - span.start;
+    if (local < 0) continue;
+    if (
+      local < span.length ||
+      (local === span.length && (stickEnd || index === spans.length - 1))
+    ) {
+      return { node: span.node, offset: local };
+    }
+  }
+  const last = spans[spans.length - 1]!;
+  return { node: last.node, offset: last.length };
+}
+
+export function rangeFromOffsets(
+  spans: AnnotatableSpan[],
+  startOffset: number,
+  endOffset: number,
+): Range | null {
+  const start = pointAt(spans, startOffset, false);
+  const end = pointAt(spans, endOffset, true);
+  if (!start || !end) return null;
+  const range = document.createRange();
+  range.setStart(start.node, start.offset);
+  range.setEnd(end.node, end.offset);
+  return range.collapsed ? null : range;
+}
+
+export function buildQuoteRange(
+  sourceEl: HTMLElement,
+  quote: string,
+  occurrenceIndex = 0,
+): Range | null {
+  if (!quote) return null;
+  const { text, spans } = annotatableText(sourceEl);
+  const offsets = occurrenceOffsets(text, quote);
+  if (offsets.length === 0) return null;
+  const start = offsets[Math.min(Math.max(0, occurrenceIndex), offsets.length - 1)]!;
+  return rangeFromOffsets(spans, start, start + quote.length);
+}
+
+export function quoteOccurrenceIndex(sourceEl: HTMLElement, range: Range, quote: string): number {
+  try {
+    const prefix = range.cloneRange();
+    prefix.selectNodeContents(sourceEl);
+    prefix.setEnd(range.startContainer, range.startOffset);
+    return occurrenceOffsets(prefix.toString(), quote).length;
+  } catch {
+    return 0;
+  }
+}
+
+export function clipRangeToSource(range: Range, sourceEl: HTMLElement): Range | null {
+  const startOk =
+    sourceEl.contains(range.startContainer) && !isAnnotationChromeNode(range.startContainer);
+  const endOk =
+    sourceEl.contains(range.endContainer) && !isAnnotationChromeNode(range.endContainer);
+  if (!startOk && !endOk) return null;
+  const { spans } = annotatableText(sourceEl);
+  if (spans.length === 0) return null;
+  const next = range.cloneRange();
+  const first = spans[0]!;
+  const last = spans[spans.length - 1]!;
+  if (!startOk) next.setStart(first.node, 0);
+  if (!endOk) next.setEnd(last.node, last.node.data.length);
+  return next.collapsed ? null : next;
+}
+
+export function visibleClientRect(range: Range): DOMRect | null {
+  try {
+    const bounding = range.getBoundingClientRect();
+    if (bounding.width > 0 || bounding.height > 0) return bounding;
+  } catch {
+    // jsdom ranges may omit layout geometry.
+  }
+  try {
+    const rects = range.getClientRects();
+    for (let index = 0; index < rects.length; index++) {
+      const rect = rects.item(index);
+      if (rect && (rect.width > 0 || rect.height > 0)) return rect;
+    }
+  } catch {
+    // jsdom ranges may omit client rects.
+  }
+  return null;
+}
+
+export function resolveAnnotationRevealRoot(from: Element | null | undefined): HTMLElement | null {
+  const conversation = from?.closest("[data-og-conversation]");
+  if (conversation instanceof HTMLElement) {
+    const nested = conversation.querySelector("[data-og-timeline-scroller]");
+    return nested instanceof HTMLElement ? nested : conversation;
+  }
+  const scroller = from?.closest("[data-og-timeline-scroller]");
+  return scroller instanceof HTMLElement ? scroller : null;
+}
+
+export function revealLoadedAnnotationSource(
+  source: TimelineAnnotationSource,
+  root?: ParentNode | null,
+): boolean {
+  if (typeof document === "undefined") return false;
+  // An explicit null root means the caller already scoped the search and found
+  // no owning timeline. Do not fall back to `document`, or a second mounted
+  // timeline with the same event id would steal the reveal.
+  if (root === null) return false;
+  const element = (root ?? document).querySelector(
+    `[data-og-annotation-source-key="${cssEscapeAttribute(source.eventId)}"]`,
+  );
+  if (!(element instanceof HTMLElement)) return false;
+  element.scrollIntoView({ block: "center", behavior: "smooth" });
+  element.animate?.(
+    [
+      {
+        boxShadow: "inset 0 0 0 2px color-mix(in oklch, var(--og-color-accent) 70%, transparent)",
+        backgroundColor: "color-mix(in oklch, var(--og-color-accent) 14%, transparent)",
+      },
+      {
+        boxShadow: "inset 0 0 0 2px transparent",
+        backgroundColor: "transparent",
+      },
+    ],
+    { duration: 1400, easing: "ease-out" },
+  );
+  return true;
+}

package/src/components/timeline-annotations-dialog.tsx

@@ -1,40 +1,28 @@
 import type { TimelineAnnotationSource } from "@opengeni/sdk";
+import { XIcon } from "lucide-react";
 import { useEffect, useLayoutEffect, useRef, useState, type RefObject } from "react";
 import { createPortal } from "react-dom";
-import type { TimelineAnnotationLike } from "./timeline-annotations";
+import { usePortalTokenStyle } from "../lib/use-portal-token-style";
+import {
+  AnnotationAccentRow,
+  AnnotationNoteField,
+  AnnotationNotePreview,
+  AnnotationQuoteSourceButton,
+  type TimelineAnnotationLike,
+} from "./timeline-annotation-chrome";
+import {
+  ANNOTATION_REVIEW_DIALOG_WIDTH_PX,
+  clampAnnotationDialogPlacement,
+  scrollAnnotationRowIntoList,
+} from "./timeline-annotation-layout";
+import { annotationDisplayOrdinal, cssEscapeAttribute } from "./timeline-annotation-shared";
 
-function cssEscapeAttribute(value: string): string {
-  if (typeof CSS !== "undefined" && typeof CSS.escape === "function") return CSS.escape(value);
-  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-}
-
-function revealLoadedSource(source: TimelineAnnotationSource): boolean {
-  if (typeof document === "undefined") return false;
-  const element = document.querySelector(
-    `[data-og-annotation-source-key="${cssEscapeAttribute(source.eventId)}"]`,
-  );
-  if (!(element instanceof HTMLElement)) return false;
-  element.scrollIntoView({ block: "center", behavior: "smooth" });
-  element.animate?.(
-    [
-      { outline: "2px solid color-mix(in srgb, currentColor 55%, transparent)" },
-      { outline: "2px solid transparent" },
-    ],
-    { duration: 1600, easing: "ease-out" },
-  );
-  return true;
-}
-
-function sourceLabel(annotation: TimelineAnnotationLike): string {
-  if (annotation.source.label) return annotation.source.label;
-  switch (annotation.source.kind) {
-    case "user_message":
-      return "User message";
-    case "assistant_message":
-      return "Assistant message";
-    case "tool_output":
-      return "Tool output";
-  }
+function focusableElements(root: HTMLElement): HTMLElement[] {
+  return [
+    ...root.querySelectorAll<HTMLElement>(
+      'button:not([disabled]),textarea:not([disabled]),input:not([disabled]),[href],[tabindex]:not([tabindex="-1"])',
+    ),
+  ].filter((element) => element.tabIndex >= 0 && !element.closest("[inert]"));
 }
 
 export function TimelineAnnotationsDialog({
@@ -48,6 +36,7 @@ export function TimelineAnnotationsDialog({
   triggerRef,
   countLabel,
   onDismiss,
+  onCommit,
 }: {
   annotations: readonly TimelineAnnotationLike[];
   editable: boolean;
@@ -59,33 +48,104 @@ export function TimelineAnnotationsDialog({
   triggerRef: RefObject<HTMLButtonElement | null>;
   countLabel: string;
   onDismiss: (restoreFocus: boolean) => void;
+  onCommit: () => void;
 }) {
   const [unavailableId, setUnavailableId] = useState<string | null>(null);
-  const [position, setPosition] = useState({ left: 12, top: 12, above: false });
+  const [position, setPosition] = useState({ left: 12, top: 12, maxHeight: 0 });
   const panelRef = useRef<HTMLDivElement | null>(null);
+  const headerRef = useRef<HTMLDivElement | null>(null);
+  const listRef = useRef<HTMLDivElement | null>(null);
   const noteRefs = useRef(new Map<string, HTMLTextAreaElement>());
+  const focusedAnnotationIdRef = useRef<string | null>(null);
+  const portalStyle = usePortalTokenStyle(triggerRef.current);
+  const revealNote = (id: string) => {
+    const row = listRef.current?.querySelector<HTMLElement>(
+      `[data-og-annotation-id="${cssEscapeAttribute(id)}"]`,
+    );
+    scrollAnnotationRowIntoList(listRef.current, row);
+    noteRefs.current.get(id)?.focus();
+  };
 
-  useLayoutEffect(() => {
-    if (!focusAnnotationId) return;
-    const note = noteRefs.current.get(focusAnnotationId);
-    note?.focus();
-    if (note && document.activeElement === note) onFocusConsumed?.();
-  }, [focusAnnotationId, onFocusConsumed]);
+  const commitNotes = (fromId: string) => {
+    const incomplete = annotations.filter((annotation) => {
+      const live = noteRefs.current.get(annotation.id);
+      return (live?.value ?? annotation.note).trim().length === 0;
+    });
+    if (incomplete.length === 0) {
+      onCommit();
+      return;
+    }
+    const fromIndex = annotations.findIndex((annotation) => annotation.id === fromId);
+    const next =
+      incomplete.find(
+        (item) => annotations.findIndex((annotation) => annotation.id === item.id) > fromIndex,
+      ) ?? incomplete[0]!;
+    revealNote(next.id);
+  };
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const updatePosition = () => {
       const rect = triggerRef.current?.getBoundingClientRect();
       if (!rect) return;
-      const panelWidth = Math.min(400, window.innerWidth - 24);
-      const left = Math.min(
-        Math.max(12, rect.left),
-        Math.max(12, window.innerWidth - panelWidth - 12),
+      const contentHeight =
+        (headerRef.current?.offsetHeight ?? 44) + (listRef.current?.scrollHeight ?? 200);
+      setPosition(
+        clampAnnotationDialogPlacement({
+          triggerLeft: rect.left,
+          triggerTop: rect.top,
+          triggerBottom: rect.bottom,
+          contentHeight,
+          viewportWidth: window.innerWidth,
+          viewportHeight: window.innerHeight,
+          panelWidth: ANNOTATION_REVIEW_DIALOG_WIDTH_PX,
+        }),
       );
-      const above = rect.top > Math.min(360, window.innerHeight * 0.55);
-      setPosition({ left, top: above ? rect.top - 8 : rect.bottom + 8, above });
     };
+    updatePosition();
+    window.addEventListener("resize", updatePosition);
+    window.addEventListener("scroll", updatePosition, true);
+    return () => {
+      window.removeEventListener("resize", updatePosition);
+      window.removeEventListener("scroll", updatePosition, true);
+    };
+  }, [annotations, triggerRef]);
+
+  useLayoutEffect(() => {
+    if (!focusAnnotationId) {
+      focusedAnnotationIdRef.current = null;
+      return;
+    }
+    // A consumed request must not reclaim focus or scroll on layout/callback updates.
+    if (focusedAnnotationIdRef.current === focusAnnotationId) return;
+    focusedAnnotationIdRef.current = null;
+    if (position.maxHeight <= 0) return;
+    revealNote(focusAnnotationId);
+    const note = noteRefs.current.get(focusAnnotationId);
+    if (note && document.activeElement === note) {
+      focusedAnnotationIdRef.current = focusAnnotationId;
+      onFocusConsumed?.();
+    }
+  }, [focusAnnotationId, onFocusConsumed, annotations.length, position.maxHeight]);
+
+  useEffect(() => {
     const onKeyDown = (event: KeyboardEvent) => {
-      if (event.key === "Escape") onDismiss(true);
+      if (event.key === "Escape") {
+        event.stopPropagation();
+        onDismiss(true);
+        return;
+      }
+      if (event.key !== "Tab" || !panelRef.current) return;
+      const focusable = focusableElements(panelRef.current);
+      if (focusable.length === 0) return;
+      const first = focusable[0]!;
+      const last = focusable[focusable.length - 1]!;
+      if (event.shiftKey && document.activeElement === first) {
+        event.preventDefault();
+        last.focus();
+      } else if (!event.shiftKey && document.activeElement === last) {
+        event.preventDefault();
+        first.focus();
+      }
     };
     const onPointerDown = (event: PointerEvent) => {
       if (!(event.target instanceof Node)) return;
@@ -94,9 +154,6 @@ export function TimelineAnnotationsDialog({
       }
       onDismiss(false);
     };
-    updatePosition();
-    window.addEventListener("resize", updatePosition);
-    window.addEventListener("scroll", updatePosition, true);
     document.addEventListener("keydown", onKeyDown);
     document.addEventListener("pointerdown", onPointerDown);
     if (!focusAnnotationId) {
@@ -105,8 +162,6 @@ export function TimelineAnnotationsDialog({
       }, 0);
     }
     return () => {
-      window.removeEventListener("resize", updatePosition);
-      window.removeEventListener("scroll", updatePosition, true);
       document.removeEventListener("keydown", onKeyDown);
       document.removeEventListener("pointerdown", onPointerDown);
     };
@@ -118,92 +173,94 @@ export function TimelineAnnotationsDialog({
       ref={panelRef}
       role="dialog"
       tabIndex={-1}
+      data-og-annotation-review=""
       style={{
         left: position.left,
         top: position.top,
-        transform: position.above ? "translateY(-100%)" : undefined,
+        maxHeight: position.maxHeight,
+        ...portalStyle,
       }}
-      className="og-root fixed z-[75] box-border max-h-[min(32rem,70vh)] w-[min(25rem,calc(100vw-1.5rem))] overflow-y-auto rounded-og-lg border border-og-border bg-og-surface-1 p-3 text-og-fg shadow-xl outline-hidden"
-      aria-label={editable ? "Review timeline annotations" : "Timeline annotations"}
+      className="og-root fixed z-[75] box-border flex w-[min(25rem,calc(100vw-1.5rem))] flex-col overflow-hidden rounded-og-lg border border-og-border bg-og-surface-1 text-og-fg shadow-xl outline-hidden"
+      aria-label={editable ? "Edit quoted notes" : "Quoted notes"}
     >
-      <div className="mb-2 flex items-center justify-between gap-3">
-        <div>
-          <p className="text-og-sm font-semibold">{countLabel}</p>
-          <p className="text-og-xs text-og-fg-subtle">
-            {editable ? "Add a note for each quoted source." : "Sent with this message."}
-          </p>
-        </div>
+      <div
+        ref={headerRef}
+        data-og-annotation-review-header=""
+        className="flex shrink-0 items-start justify-between gap-3 px-3 pt-3 pb-2"
+      >
+        <p className="min-w-0 pt-0.5 text-og-sm font-medium text-og-fg-muted">{countLabel}</p>
         <button
           type="button"
-          className="rounded-md border-0 bg-transparent px-2 py-1 text-og-xs text-og-fg outline-hidden hover:bg-og-surface-2 focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:min-h-[44px]"
+          className="inline-flex size-8 shrink-0 items-center justify-center rounded-md border-0 bg-transparent text-og-fg-muted outline-hidden hover:bg-og-surface-2 hover:text-og-fg focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:size-11"
+          aria-label="Close"
           onClick={() => onDismiss(true)}
         >
-          Close
+          <XIcon className="size-3.5" aria-hidden="true" />
         </button>
       </div>
-      <div className="grid gap-2.5">
-        {annotations.map((annotation, index) => (
-          <section
-            key={annotation.id}
-            className="rounded-og-md border border-og-border bg-og-surface-2/60 p-2.5"
-            aria-label={`Annotation ${index + 1}`}
-          >
-            <div className="flex items-center justify-between gap-2">
-              <button
-                type="button"
-                className="truncate rounded border-0 bg-transparent text-left text-og-xs font-medium text-og-fg-muted underline-offset-2 outline-hidden hover:text-og-fg hover:underline focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:min-h-[44px]"
-                onClick={() => {
-                  const revealed =
-                    onRevealSource?.(annotation.source) ?? revealLoadedSource(annotation.source);
-                  setUnavailableId(revealed ? null : annotation.id);
-                }}
-              >
-                {sourceLabel(annotation)} · view source
-              </button>
-              {editable && onRemove ? (
-                <button
-                  type="button"
-                  className="shrink-0 rounded border-0 bg-transparent p-1 text-og-fg-subtle outline-hidden hover:bg-og-surface-1 hover:text-og-status-failed focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:size-[44px]"
-                  aria-label={`Remove annotation ${index + 1}`}
-                  onClick={() => onRemove(annotation.id)}
-                >
-                  <span aria-hidden="true" className="text-og-md leading-none">
-                    ×
-                  </span>
-                </button>
-              ) : null}
-            </div>
-            {unavailableId === annotation.id ? (
-              <p role="status" className="mt-1 text-og-xs text-og-status-waiting">
-                Source is outside the loaded timeline window.
-              </p>
-            ) : null}
-            <blockquote className="mt-2 max-h-28 overflow-auto whitespace-pre-wrap border-l-2 border-og-border pl-2 text-og-sm leading-5 text-og-fg-muted">
-              {annotation.quote}
-            </blockquote>
-            {editable && onUpdate ? (
-              <label className="mt-2 block text-og-xs font-medium text-og-fg-muted">
-                Note
-                <textarea
-                  ref={(node) => {
-                    if (node) noteRefs.current.set(annotation.id, node);
-                    else noteRefs.current.delete(annotation.id);
-                  }}
-                  value={annotation.note}
-                  rows={2}
-                  maxLength={2048}
-                  placeholder="What should the agent do with this?"
-                  className="mt-1 w-full resize-y rounded-og-sm border border-og-border bg-og-surface-1 px-2.5 py-2 text-og-sm leading-5 text-og-fg outline-hidden placeholder:text-og-fg-subtle focus:border-og-accent focus:ring-1 focus:ring-og-accent"
-                  onInput={(event) => onUpdate(annotation.id, event.currentTarget.value)}
-                />
-              </label>
-            ) : annotation.note ? (
-              <p className="mt-2 whitespace-pre-wrap text-og-sm leading-5 text-og-fg">
-                {annotation.note}
-              </p>
-            ) : null}
-          </section>
-        ))}
+      <div
+        ref={listRef}
+        data-og-annotation-review-list=""
+        className="grid min-h-0 flex-1 gap-2.5 overflow-x-hidden overflow-y-auto overscroll-contain px-3 pb-3"
+      >
+        {annotations.map((annotation, index) => {
+          const ordinal = annotationDisplayOrdinal(annotation, index);
+          return (
+            <section
+              key={annotation.id}
+              data-og-annotation-id={annotation.id}
+              aria-label={`Annotation ${ordinal}`}
+            >
+              <AnnotationAccentRow>
+                <div className="flex items-start gap-1">
+                  <div className="min-w-0 flex-1">
+                    <p className="mb-0.5 text-og-xs font-medium tabular-nums text-og-fg-subtle">
+                      Annotation {ordinal}
+                    </p>
+                    <AnnotationQuoteSourceButton
+                      annotation={annotation}
+                      lines={2}
+                      onRevealSource={onRevealSource}
+                      onUnavailable={setUnavailableId}
+                    />
+                  </div>
+                  {editable && onRemove ? (
+                    <button
+                      type="button"
+                      className="inline-flex size-7 shrink-0 items-center justify-center rounded-md border-0 bg-transparent text-og-fg-subtle outline-hidden hover:bg-og-surface-1 hover:text-og-status-failed focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:size-11"
+                      aria-label={`Remove annotation ${ordinal}`}
+                      onClick={() => onRemove(annotation.id)}
+                    >
+                      <XIcon className="size-3.5" aria-hidden="true" />
+                    </button>
+                  ) : null}
+                </div>
+                {unavailableId === annotation.id ? (
+                  <p role="status" className="text-og-xs text-og-status-waiting">
+                    Source is outside the loaded timeline window.
+                  </p>
+                ) : null}
+                {editable && onUpdate ? (
+                  <AnnotationNoteField
+                    annotation={annotation}
+                    inputRef={(node) => {
+                      if (node) noteRefs.current.set(annotation.id, node);
+                      else noteRefs.current.delete(annotation.id);
+                    }}
+                    onUpdate={onUpdate}
+                    onCommit={() => commitNotes(annotation.id)}
+                  />
+                ) : (
+                  <AnnotationNotePreview
+                    note={annotation.note}
+                    annotationId={annotation.id}
+                    ordinal={ordinal}
+                  />
+                )}
+              </AnnotationAccentRow>
+            </section>
+          );
+        })}
       </div>
     </div>,
     document.body,