@tanishqkancharla/diffmap 0.1.5 → 0.2.0

package/src/viewer/SourceDiffPanel.tsx

@@ -1,15 +1,13 @@
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState, type MouseEvent } from "react";
 import { CodeView, type CodeViewHandle } from "@pierre/diffs/react";
-import type {
-  CodeViewDiffItem,
-  CodeViewOptions,
-  CodeViewLineSelection,
-} from "@pierre/diffs";
+import type { CodeViewOptions, CodeViewLineSelection } from "@pierre/diffs";
 import {
   backgroundColor,
   border,
   borderColor,
+  colors,
   Button,
+  ChevronDown,
   flex,
   spacing,
   text,
@@ -21,21 +19,17 @@ import {
   type SourceAnnotation,
   type SourceReference,
 } from "../annotations.js";
+import { changedFileItem, type Rev } from "../changes.js";
 import type { SourceDefinition } from "../definitions.js";
 import { useGistPin } from "../gist/pin.ts";
 import { useGitHubPin } from "../github/pin.ts";
 import { useHostFiles } from "../host/files.ts";
-import {
-  matchingSourceDiff,
-  requestSource,
-  useSourceReference,
-} from "./sourceNavigation.js";
+import { ChangesSummary } from "./ChangesCard.tsx";
+import { useChanges } from "./changesSource.ts";
+import { RangePicker } from "./RangePicker.tsx";
+import { requestSource, useSourceReference } from "./sourceNavigation.js";
 import { pierreDiffOptions, sourceSelectionCss } from "./pierre.js";
-import {
-  sourcePanelOrigin,
-  sourcePanelPath,
-  sourcePanelPin,
-} from "./sourceHeader.ts";
+import { sourcePanelPin } from "./sourceHeader.ts";
 import { useViewerMode } from "./viewerMode.ts";
 
 export type SourceSelection = {
@@ -50,7 +44,10 @@ type DefinitionNavigation = {
 };
 
 export function SourceDiffPanel(props: {
-  items: CodeViewDiffItem[];
+  /** The changes to show; references with their own rev open that rev instead. */
+  rev: Rev;
+  /** Local viewers pick other changes with the range picker. */
+  onRevChange?: (rev: Rev) => void;
   selection: SourceSelection | undefined;
   onSelect: (selection: SourceSelection) => void;
 }) {
@@ -79,51 +76,86 @@ export function SourceDiffPanel(props: {
   const pinClass = useStyles(styles.pin);
   const links = useStyles(styles.links);
   const code = useStyles(styles.code);
+  const summary = useStyles(styles.summary);
+  const codeWrap = useStyles(styles.codeWrap);
+  const collapseIcon = useStyles(styles.collapseIcon);
   const github = useGitHubPin();
   const gist = useGistPin();
   const hostFiles = useHostFiles();
   const selection = props.selection;
-  const source = useSourceReference(selection?.reference);
-  const resolvedFile = source instanceof Error ? undefined : source;
-  const linkedDiff = useMemo(
+  const reference = selection?.reference;
+  const changes = useChanges(props.rev);
+  const items = useMemo(
     () =>
-      resolvedFile === undefined
-        ? undefined
-        : matchingSourceDiff(resolvedFile, props.items),
-    [resolvedFile, props.items],
+      changes === undefined || changes instanceof Error
+        ? []
+        : changes.files.flatMap((changed) => changedFileItem(changed) ?? []),
+    [changes],
   );
+  // A rev-less reference resolves against current files; a commit reference names its lines directly.
+  const source = useSourceReference(
+    reference?.kind === "file" && reference.rev === undefined
+      ? reference
+      : undefined,
+  );
+  const resolvedFile = source instanceof Error ? undefined : source;
+  const inChanges =
+    resolvedFile !== undefined &&
+    items.some((item) => item.id === resolvedFile.path);
   const file =
-    definition === undefined
-      ? linkedDiff === undefined
-        ? resolvedFile
-        : undefined
-      : definition;
+    definition ??
+    (resolvedFile !== undefined && changes !== undefined && !inChanges
+      ? resolvedFile
+      : undefined);
   const status =
     navigation.status !== undefined
       ? navigation.status
       : source instanceof Error
         ? source.message
-        : selection?.reference.kind === "file" &&
-            source === undefined &&
-            (mode === "local" || mode === "github" || hostFiles !== undefined)
-          ? "Opening source…"
-          : undefined;
+        : changes instanceof Error
+          ? changes.message
+          : changes === undefined
+            ? "Loading changes…"
+            : reference?.kind === "file" &&
+                reference.rev === undefined &&
+                source === undefined &&
+                (mode === "local" ||
+                  mode === "github" ||
+                  hostFiles !== undefined)
+              ? "Opening source…"
+              : items.length === 0 && file === undefined
+                ? "No changes."
+                : undefined;
   const selectedLines = useMemo<CodeViewLineSelection | null>(() => {
     if (file !== undefined)
       return { id: file.path, range: { start: file.start, end: file.end } };
-    if (linkedDiff !== undefined) return linkedDiff;
-    const ref = selection?.reference;
+    const focus =
+      resolvedFile ??
+      (reference?.kind === "file" && reference.start !== undefined
+        ? {
+            path: reference.path,
+            start: reference.start,
+            end: reference.end ?? reference.start,
+          }
+        : undefined);
     // oxlint-disable-next-line unicorn/no-null -- Pierre uses null for a controlled empty selection.
-    if (ref === undefined || ref.kind === "file") return null;
+    if (focus === undefined) return null;
     return {
-      id: ref.id,
-      range: {
-        start: ref.start,
-        end: ref.end,
-        side: ref.side === "old" ? "deletions" : "additions",
-      },
+      id: focus.path,
+      range: { start: focus.start, end: focus.end, side: "additions" },
     };
-  }, [selection, file, linkedDiff]);
+  }, [reference, file, resolvedFile]);
+  const focusedPath =
+    file?.path ?? (reference?.kind === "file" ? reference.path : undefined);
+  // Collapsed files reset when the rev or the selected reference changes, so a reference always shows its file.
+  const [collapse, setCollapse] = useState<{
+    rev: Rev;
+    selection: SourceSelection | undefined;
+    paths: ReadonlySet<string>;
+  }>({ rev: props.rev, selection, paths: new Set() });
+  if (collapse.rev !== props.rev || collapse.selection !== selection) {
+    setCollapse({ rev: props.rev, selection, paths: new Set() });
+  }
   const rangeId = selectedLines?.id;
   const rangeStart = selectedLines?.range.start;
   const rangeEnd = selectedLines?.range.end;
@@ -131,35 +163,84 @@ export function SourceDiffPanel(props: {
     selectedLines !== null && "side" in selectedLines.range
       ? selectedLines.range.side
       : undefined;
+  const shownItems = useMemo(
+    () =>
+      items.map((item) => {
+        // The referenced file shows enough unchanged context to reveal its range.
+        const changed =
+          item.id === rangeId &&
+          rangeSide === "additions" &&
+          changes !== undefined &&
+          !(changes instanceof Error)
+            ? changes.files.find((entry) => entry.path === item.id)
+            : undefined;
+        const shown =
+          changed === undefined
+            ? item
+            : (changedFileItem(changed, {
+                start: rangeStart!,
+                end: rangeEnd!,
+              }) ?? item);
+        const collapsed = collapse.paths.has(item.id);
+        // Pierre only rereads an item when its version changes.
+        return {
+          ...shown,
+          collapsed,
+          version: (shown.version ?? 0) * 2 + (collapsed ? 1 : 0),
+        };
+      }),
+    [items, changes, collapse.paths, rangeId, rangeStart, rangeEnd, rangeSide],
+  );
+  const toggleCollapsed = (path: string) => {
+    const paths = new Set(collapse.paths);
+    if (!paths.delete(path)) paths.add(path);
+    setCollapse({ ...collapse, paths });
+  };
+  // File headers live in Pierre's shadow DOM; a click inside one names its file through the prefix slot.
+  const onHeaderClick = (event: MouseEvent) => {
+    if (file !== undefined) return;
+    const fileHeader = event.nativeEvent
+      .composedPath()
+      .find(
+        (target): target is Element =>
+          target instanceof Element && target.hasAttribute("data-diffs-header"),
+      );
+    const root = fileHeader?.getRootNode();
+    if (!(root instanceof ShadowRoot)) return;
+    const path = root.host
+      .querySelector("[data-collapse-path]")
+      ?.getAttribute("data-collapse-path");
+    if (path !== null && path !== undefined) toggleCollapsed(path);
+  };
 
-  const openPath = sourcePanelPath({
-    filePath: file?.path,
-    reference: selection?.reference,
-    items: props.items,
-    linkedDiffId: linkedDiff?.id,
-  });
-  const origin = sourcePanelOrigin({
-    showingFile: file !== undefined,
-    reference: selection?.reference,
-    items: props.items,
-    linkedDiffId: linkedDiff?.id,
-  });
   const pin =
-    openPath === undefined
+    file === undefined
       ? { kind: "none" as const }
-      : sourcePanelPin({
-          origin,
-          path: openPath,
-          github,
-          gist,
-        });
+      : sourcePanelPin({ path: file.path, github, gist });
+  // Diffs keep Pierre's sticky per-file headers; a single file shows its path in the panel title.
+  const showTitle = file !== undefined;
   const options = pierreDiffOptions({
     themeType: resolvedTheme,
-    disableFileHeader: openPath !== undefined,
+    disableFileHeader: showTitle,
   });
+  const loadedChanges =
+    changes === undefined || changes instanceof Error ? undefined : changes;
+
+  // Scroll again once the changes arrive, since Pierre cannot scroll to items it does not have yet.
+  const ready = file !== undefined || loadedChanges !== undefined;
+  useEffect(() => {
+    if (!ready || focusedPath === undefined || rangeId !== undefined) return;
+    viewer.current?.scrollTo({
+      type: "item",
+      id: focusedPath,
+      align: "start",
+      behavior: "instant",
+    });
+  }, [ready, focusedPath, rangeId]);
 
   useEffect(() => {
     if (
+      !ready ||
       rangeId === undefined ||
       rangeStart === undefined ||
       rangeEnd === undefined
@@ -177,7 +258,7 @@ export function SourceDiffPanel(props: {
       align: "center",
       behavior: "instant",
     });
-  }, [rangeId, rangeStart, rangeEnd, rangeSide]);
+  }, [ready, rangeId, rangeStart, rangeEnd, rangeSide]);
 
   const onTokenClick: CodeViewOptions<undefined, undefined>["onTokenClick"] = (
     token,
@@ -234,11 +315,43 @@ export function SourceDiffPanel(props: {
 
   return (
     <aside id="source-diff-panel" aria-label="Source changes" className={panel}>
-      <div className={header} data-diffmap-kind="source-header">
-        {openPath !== undefined && (
+      <div
+        className={header}
+        data-diffmap-kind="source-header"
+        // Pierre's file headers draw their own top border, which divides them from this header.
+        data-file-headers={!showTitle && items.length > 0}
+      >
+        {!showTitle && props.onRevChange !== undefined && (
+          <div className={titleRow}>
+            <RangePicker rev={props.rev} onChange={props.onRevChange} />
+            {loadedChanges !== undefined && (
+              <ChangesSummary className={summary} changes={loadedChanges} />
+            )}
+          </div>
+        )}
+        {!showTitle &&
+          props.onRevChange === undefined &&
+          loadedChanges !== undefined && (
+            <div className={titleRow}>
+              {loadedChanges.url === undefined ? (
+                <div className={titleClass} title={loadedChanges.title}>
+                  {loadedChanges.title}
+                </div>
+              ) : (
+                <a
+                  className={titleClass}
+                  href={loadedChanges.url}
+                  title={loadedChanges.title}
+                >
+                  {loadedChanges.title}
+                </a>
+              )}
+            </div>
+          )}
+        {showTitle && (
           <div className={titleRow}>
-            <div className={titleClass} title={openPath}>
-              {openPath}
+            <div className={titleClass} title={file.path}>
+              {file.path}
             </div>
             {definition !== undefined && (
               <Button
@@ -277,73 +390,78 @@ export function SourceDiffPanel(props: {
             {pin.label}
           </a>
         )}
-        {pin.kind === "spec" && (
-          <span className={pinClass} data-diffmap-pin="spec">
-            {pin.label}
-          </span>
-        )}
-        {mode === "local" && (
-          <span>⌘-click or Ctrl-click a symbol to go to its definition.</span>
-        )}
         {status !== undefined && <span role="status">{status}</span>}
-        {selection === undefined ? (
-          <span>
-            Select a linked stack row or diagram element to open its source.
-          </span>
-        ) : (
+        {selection !== undefined &&
           selection.annotation.references.length > 1 && (
             <div className={links} aria-label="Linked changes">
-              {selection.annotation.references.map((reference, index) => (
+              {selection.annotation.references.map((option, index) => (
                 <Button
                   key={index}
                   variantColor="blue"
-                  variant={
-                    reference === selection.reference ? "primary" : "quiet"
-                  }
+                  variant={option === selection.reference ? "primary" : "quiet"}
                   onClick={() =>
                     props.onSelect({
                       annotation: selection.annotation,
-                      reference,
+                      reference: option,
                     })
                   }
                 >
-                  {referenceLabel(reference)}
+                  {referenceLabel(option)}
                 </Button>
               ))}
             </div>
-          )
-        )}
+          )}
       </div>
-      <CodeView
-        ref={viewer}
-        className={code}
-        items={
-          file === undefined
-            ? props.items
-            : [
-                {
-                  type: "file",
-                  id: file.path,
-                  file: {
-                    name: file.path,
-                    contents: file.contents,
+      {/* oxlint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions -- Pierre's file headers are the click targets; this only catches their clicks. */}
+      <div className={codeWrap} onClick={onHeaderClick}>
+        <CodeView
+          ref={viewer}
+          className={code}
+          items={
+            file === undefined
+              ? shownItems
+              : [
+                  {
+                    type: "file",
+                    id: file.path,
+                    file: {
+                      name: file.path,
+                      contents: file.contents,
+                    },
                   },
-                },
-              ]
-        }
-        selectedLines={selectedLines}
-        disableWorkerPool
-        options={{
-          ...options,
-          unsafeCSS: options.unsafeCSS + sourceSelectionCss,
-          stickyHeaders: true,
-          onTokenClick,
-        }}
-      />
+                ]
+          }
+          selectedLines={selectedLines}
+          disableWorkerPool
+          options={{
+            ...options,
+            unsafeCSS:
+              options.unsafeCSS + sourceSelectionCss + panelBackgroundCss,
+            // Files stack flush under the header, with no gaps between them.
+            layout: { paddingTop: 0, paddingBottom: 0, gap: 0 },
+            stickyHeaders: true,
+            onTokenClick,
+          }}
+          renderHeaderPrefix={(item) => (
+            <span
+              className={collapseIcon}
+              data-collapse-path={item.id}
+              data-collapsed={collapse.paths.has(item.id)}
+              aria-hidden="true"
+            >
+              <ChevronDown size="sm" />
+            </span>
+          )}
+        />
+      </div>
     </aside>
   );
 }
 
+/** Pierre paints its own white; the panel's background shows through instead. */
+const panelBackgroundCss = `:host { --diffs-light-bg: ${backgroundColor.app}; --diffs-dark-bg: ${backgroundColor.app}; }
+[data-diffs-header] { border-top: 1px solid ${borderColor.border}; cursor: pointer; }`;
+
 const styles = {
   panel: style(flex({ direction: "column" }), border(["left"], "border"), {
     gridArea: "diff",
@@ -359,10 +477,14 @@ const styles = {
   }),
   header: style(
     flex({ direction: "column" }),
-    spacing.padding({ all: 4 }),
+    // Same vertical padding as the page header; the inline padding lines the
+    // picker's icon and label up with Pierre's file headers below.
+    spacing.padding({ y: 3 }),
+    { paddingInline: "7px" },
     border(["bottom"], "border"),
     text({ size: "sm", color: "lowContrast" }),
     {
+      "&[data-file-headers='true']": { borderBottom: "none" },
       gap: "6px",
       minWidth: 0,
       maxHeight: "35%",
@@ -370,6 +492,8 @@ const styles = {
       flexShrink: 0,
     },
   ),
+  // Pierre's file headers pad 16px; this header pads 7px.
+  summary: style({ marginLeft: "auto", marginRight: "9px" }),
   titleRow: style(flex({ direction: "row", alignItems: "center" }), {
     gap: "6px",
     minWidth: 0,
@@ -392,6 +516,19 @@ const styles = {
     },
   }),
   links: style(flex({ direction: "row" }), { gap: "6px", flexWrap: "wrap" }),
+  codeWrap: style({
+    display: "flex",
+    flexDirection: "column",
+    flex: "1 1 auto",
+    minWidth: 0,
+    minHeight: 0,
+  }),
+  collapseIcon: style({
+    display: "flex",
+    color: colors.gray[11],
+    transition: "transform 150ms ease-out",
+    "&[data-collapsed='true']": { transform: "rotate(-90deg)" },
+  }),
   code: style({
     flex: "1 1 auto",
     minWidth: 0,