@bendyline/docblocks-react 2.0.0 → 2.1.0

package/dist/{GitUI-KGF5MSNV.js → GitUI-VHOBQY43.js}

@@ -1,3 +1,6 @@
+import {
+  useMenuKeyboard
+} from "./chunk-57ZJJOC5.js";
 import {
   BADGE_GLYPHS,
   BADGE_LABELS,
@@ -8,7 +11,7 @@ import {
 } from "./chunk-5A4KEWKT.js";
 import {
   Dialog
-} from "./chunk-GSNZSCIK.js";
+} from "./chunk-FMGTHSTX.js";
 
 // src/Git/GitStatusBar.tsx
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -17,6 +20,7 @@ function GitStatusBar() {
   const git = useGitContext();
   const [menuOpen, setMenuOpen] = useState(false);
   const rootRef = useRef(null);
+  const { menuRef, triggerRef, handleMenuKeyDown, handleTriggerKeyDown, closeMenu } = useMenuKeyboard(menuOpen, setMenuOpen);
   useEffect(() => {
     if (!menuOpen) return;
     const onPointerDown = (e) => {
@@ -27,10 +31,13 @@ function GitStatusBar() {
     document.addEventListener("pointerdown", onPointerDown);
     return () => document.removeEventListener("pointerdown", onPointerDown);
   }, [menuOpen]);
-  const runItem = useCallback((action) => {
-    setMenuOpen(false);
-    action();
-  }, []);
+  const runItem = useCallback(
+    (action) => {
+      closeMenu(false);
+      action();
+    },
+    [closeMenu]
+  );
   if (!git || !git.repo || !git.status) return null;
   const { status } = git;
   const branchLabel = status.detached ? "detached HEAD" : status.branch ?? "no branch";
@@ -47,9 +54,11 @@ function GitStatusBar() {
     /* @__PURE__ */ jsxs(
       "button",
       {
+        ref: triggerRef,
         type: "button",
         className: "db-git-statusbar-chip",
         onClick: () => setMenuOpen((open) => !open),
+        onKeyDown: handleTriggerKeyDown,
         "aria-haspopup": "menu",
         "aria-expanded": menuOpen,
         "aria-label": chipLabelParts.join(", "),
@@ -64,131 +73,160 @@ function GitStatusBar() {
         ]
       }
     ),
-    menuOpen && /* @__PURE__ */ jsxs("div", { className: "db-git-menu", role: "menu", "aria-label": "Git actions", children: [
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          disabled: status.changes.length === 0 && !merging,
-          onClick: () => runItem(() => git.openDialog({ kind: "commit" })),
-          children: merging ? "Commit merge\u2026" : "Commit\u2026"
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          disabled: git.busy !== null,
-          onClick: () => runItem(() => void git.push()),
-          children: status.upstream === null && !status.unborn ? "Publish branch" : "Push"
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          disabled: git.busy !== null,
-          onClick: () => runItem(() => void git.pull()),
-          children: "Pull"
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          disabled: git.busy !== null,
-          onClick: () => runItem(() => void git.fetchRemote()),
-          children: "Fetch"
-        }
-      ),
-      /* @__PURE__ */ jsx("div", { className: "db-git-menu-divider", role: "separator" }),
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          onClick: () => runItem(() => git.openDialog({ kind: "branches" })),
-          children: "Branches\u2026"
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          onClick: () => runItem(() => git.openDialog({ kind: "history" })),
-          children: "Commit history\u2026"
-        }
-      ),
-      (git.remoteWeb || canCreatePr) && /* @__PURE__ */ jsx("div", { className: "db-git-menu-divider", role: "separator" }),
-      git.remoteWeb && /* @__PURE__ */ jsxs(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          onClick: () => runItem(() => git.openOnRemote()),
-          children: [
-            "Open on ",
-            git.remoteWeb.host
-          ]
-        }
-      ),
-      canCreatePr && /* @__PURE__ */ jsx(
-        "button",
-        {
-          type: "button",
-          role: "menuitem",
-          className: "db-git-menu-item",
-          disabled: git.busy !== null,
-          onClick: () => runItem(() => void git.createPullRequest()),
-          children: "Create pull request"
-        }
-      )
-    ] })
+    menuOpen && /* @__PURE__ */ jsxs(
+      "div",
+      {
+        ref: menuRef,
+        className: "db-git-menu",
+        role: "menu",
+        "aria-label": "Git actions",
+        onKeyDown: handleMenuKeyDown,
+        children: [
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              disabled: status.changes.length === 0 && !merging,
+              onClick: () => runItem(() => git.openDialog({ kind: "commit" })),
+              children: merging ? "Commit merge\u2026" : "Commit\u2026"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              disabled: git.busy !== null,
+              onClick: () => runItem(() => void git.push()),
+              children: status.upstream === null && !status.unborn ? "Publish branch" : "Push"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              disabled: git.busy !== null,
+              onClick: () => runItem(() => void git.pull()),
+              children: "Pull"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              disabled: git.busy !== null,
+              onClick: () => runItem(() => void git.fetchRemote()),
+              children: "Fetch"
+            }
+          ),
+          /* @__PURE__ */ jsx("div", { className: "db-git-menu-divider", role: "separator" }),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              onClick: () => runItem(() => git.openDialog({ kind: "branches" })),
+              children: "Branches\u2026"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              onClick: () => runItem(() => git.openDialog({ kind: "history" })),
+              children: "Commit history\u2026"
+            }
+          ),
+          (git.remoteWeb || canCreatePr) && /* @__PURE__ */ jsx("div", { className: "db-git-menu-divider", role: "separator" }),
+          git.remoteWeb && /* @__PURE__ */ jsxs(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              onClick: () => runItem(() => git.openOnRemote()),
+              children: [
+                "Open on ",
+                git.remoteWeb.host
+              ]
+            }
+          ),
+          canCreatePr && /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              role: "menuitem",
+              tabIndex: -1,
+              className: "db-git-menu-item",
+              disabled: git.busy !== null,
+              onClick: () => runItem(() => void git.createPullRequest()),
+              children: "Create pull request"
+            }
+          )
+        ]
+      }
+    )
   ] });
 }
 
 // src/Git/GitCommitDialog.tsx
-import { useRef as useRef2, useState as useState2 } from "react";
+import { useMemo, useRef as useRef2, useState as useState2 } from "react";
 
 // src/Git/commit-selection.ts
+var INCLUDED_BY_DEFAULT = true;
 function normalise(path) {
   return path.startsWith("/") ? path : `/${path}`;
 }
-function initSelection(changes, merging) {
+var NO_OVERRIDES = /* @__PURE__ */ new Map();
+function resolveSelection(changes, wholeIndex, overrides = NO_OVERRIDES) {
   const included = /* @__PURE__ */ new Map();
   const locked = /* @__PURE__ */ new Set();
   for (const change of changes) {
     const path = normalise(change.path);
-    included.set(path, true);
-    if (merging && change.conflicted) locked.add(path);
+    if (wholeIndex) locked.add(path);
+    included.set(path, wholeIndex ? true : overrides.get(path) ?? INCLUDED_BY_DEFAULT);
   }
   return { included, locked };
 }
-function toggleSelection(selection, path) {
+function isIncluded(selection, path) {
+  return selection.included.get(normalise(path)) ?? INCLUDED_BY_DEFAULT;
+}
+function isLocked(selection, path) {
+  return selection.locked.has(normalise(path));
+}
+function toggleOverride(overrides, selection, path) {
   const key = normalise(path);
-  if (selection.locked.has(key)) return selection;
-  const included = new Map(selection.included);
-  included.set(key, !included.get(key));
-  return { included, locked: selection.locked };
+  if (isLocked(selection, key)) return overrides;
+  const next = new Map(overrides);
+  next.set(key, !isIncluded(selection, key));
+  return next;
 }
-function setAllSelected(selection, value) {
-  const included = /* @__PURE__ */ new Map();
+function setAllOverrides(selection, value) {
+  const next = /* @__PURE__ */ new Map();
   for (const key of selection.included.keys()) {
-    included.set(key, selection.locked.has(key) ? true : value);
+    if (!selection.locked.has(key)) next.set(key, value);
   }
-  return { included, locked: selection.locked };
+  return next;
+}
+function allSelected(selection) {
+  return [...selection.included.values()].every(Boolean);
 }
 function selectedPaths(selection) {
   return [...selection.included.entries()].filter(([, on]) => on).map(([path]) => path);
@@ -199,20 +237,34 @@ function canCommit(message, selection) {
 function isMergeCommit(status) {
   return status?.operation === "merge";
 }
+function commitsWholeIndex(status) {
+  return status !== null && status.operation !== null;
+}
 
 // src/Git/GitCommitDialog.tsx
 import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var OPERATION_LABELS = {
+  merge: "merge",
+  rebase: "rebase",
+  "cherry-pick": "cherry-pick",
+  revert: "revert",
+  bisect: "bisect"
+};
 function GitCommitDialog({ onClose }) {
   const git = useGitContext();
   const status = git?.status ?? null;
   const merging = isMergeCommit(status);
+  const wholeIndex = commitsWholeIndex(status);
+  const changes = status?.changes;
   const [message, setMessage] = useState2("");
-  const [selection, setSelection] = useState2(
-    () => initSelection(status?.changes ?? [], merging)
-  );
+  const [overrides, setOverrides] = useState2(NO_OVERRIDES);
   const messageRef = useRef2(null);
+  const selection = useMemo(
+    () => resolveSelection(changes ?? [], wholeIndex, overrides),
+    [changes, wholeIndex, overrides]
+  );
   if (!git || !status) return null;
-  const allOn = [...selection.included.values()].every(Boolean);
+  const allOn = allSelected(selection);
   const commitDisabled = !canCommit(message, selection) || git.busy !== null;
   const handleCommit = async () => {
     const ok = await git.commit(message, selectedPaths(selection));
@@ -240,7 +292,14 @@ function GitCommitDialog({ onClose }) {
         )
       ] }),
       children: [
-        merging && /* @__PURE__ */ jsx2("p", { className: "db-settings-hint", children: "You\u2019re completing a merge. Committing will conclude it." }),
+        wholeIndex && /* @__PURE__ */ jsxs2("p", { className: "db-settings-hint", children: [
+          merging ? "You\u2019re completing a merge. Committing will conclude it." : `A ${OPERATION_LABELS[status.operation ?? ""] ?? "git operation"} is in progress.`,
+          " ",
+          "Git records every change below in this commit \u2014 files cannot be left out until the",
+          " ",
+          merging ? "merge" : "operation",
+          " is finished."
+        ] }),
         /* @__PURE__ */ jsx2(
           "textarea",
           {
@@ -253,19 +312,19 @@ function GitCommitDialog({ onClose }) {
             rows: 3
           }
         ),
-        /* @__PURE__ */ jsx2("div", { className: "db-git-form-row", children: /* @__PURE__ */ jsx2(
+        !wholeIndex && /* @__PURE__ */ jsx2("div", { className: "db-git-form-row", children: /* @__PURE__ */ jsx2(
           "button",
           {
             type: "button",
             className: "db-git-secondary-btn",
-            onClick: () => setSelection((s) => setAllSelected(s, !allOn)),
+            onClick: () => setOverrides(setAllOverrides(selection, !allOn)),
             children: allOn ? "Select none" : "Select all"
           }
         ) }),
         /* @__PURE__ */ jsx2("ul", { className: "db-git-file-list", children: status.changes.map((change) => {
           const kind = badgeKindFor(change);
-          const locked = selection.locked.has(change.path);
-          const checked = locked || (selection.included.get(change.path) ?? true);
+          const locked = isLocked(selection, change.path);
+          const checked = isIncluded(selection, change.path);
           return /* @__PURE__ */ jsxs2("li", { className: "db-git-file-row", children: [
             /* @__PURE__ */ jsxs2("label", { children: [
               /* @__PURE__ */ jsx2(
@@ -274,7 +333,8 @@ function GitCommitDialog({ onClose }) {
                   type: "checkbox",
                   checked,
                   disabled: locked,
-                  onChange: () => setSelection((s) => toggleSelection(s, change.path))
+                  title: locked ? `Included automatically while the ${merging ? "merge" : "operation"} is in progress` : void 0,
+                  onChange: () => setOverrides((o) => toggleOverride(o, selection, change.path))
                 }
               ),
               /* @__PURE__ */ jsx2("span", { children: change.path.replace(/^\/+/, "") })
@@ -305,11 +365,19 @@ function GitBranchesDialog({
   useEffect2(() => {
     if (!gitApi || !repositoryId) return;
     let cancelled = false;
-    void gitApi.listBranches(repositoryId).then((result) => {
-      if (cancelled) return;
-      if (result.ok) setBranches(result.value);
-      else setLoadError(result.error.message || "Could not list branches");
-    });
+    void gitApi.listBranches(repositoryId).then(
+      (result) => {
+        if (cancelled) return;
+        if (result.ok) setBranches(result.value);
+        else setLoadError(result.error.message || "Could not list branches");
+      },
+      // A rejected call (the host went away) left the dialog on
+      // "Loading branches…" forever. Fail visibly instead.
+      (error) => {
+        if (cancelled) return;
+        setLoadError(error instanceof Error ? error.message : "Could not list branches");
+      }
+    );
     return () => {
       cancelled = true;
     };
@@ -402,7 +470,7 @@ function GitBranchesDialog({
 }
 
 // src/Git/GitHistoryDialog.tsx
-import { useCallback as useCallback2, useEffect as useEffect3, useState as useState4 } from "react";
+import { useCallback as useCallback2, useEffect as useEffect3, useRef as useRef4, useState as useState4 } from "react";
 import { Fragment as Fragment2, jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var PAGE_SIZE = 50;
 function extraBody(body, subject) {
@@ -428,30 +496,39 @@ function GitHistoryDialog({ path, onClose }) {
   const [hasMore, setHasMore] = useState4(false);
   const [expandedSha, setExpandedSha] = useState4(null);
   const [details, setDetails] = useState4(/* @__PURE__ */ new Map());
+  const generationRef = useRef4(0);
   const loadPage = useCallback2(
     async (skip) => {
       if (!gitApi || !repositoryId) return;
+      const generation = generationRef.current;
+      const stale = () => generation !== generationRef.current;
       setLoading(true);
       setError(null);
       try {
         const result = await gitApi.log(repositoryId, { path, maxCount: PAGE_SIZE, skip });
+        if (stale()) return;
         if (!result.ok) {
           setError(result.error.message);
           return;
         }
         setEntries((prev) => skip === 0 ? result.value : [...prev, ...result.value]);
         setHasMore(result.value.length === PAGE_SIZE);
+      } catch (caught) {
+        if (stale()) return;
+        setError(caught instanceof Error ? caught.message : "Could not load history");
       } finally {
-        setLoading(false);
+        if (!stale()) setLoading(false);
       }
     },
     [gitApi, repositoryId, path]
   );
   useEffect3(() => {
+    generationRef.current += 1;
     setEntries([]);
     setExpandedSha(null);
     setDetails(/* @__PURE__ */ new Map());
     setHasMore(false);
+    setLoading(false);
     void loadPage(0);
   }, [loadPage]);
   const handleRowClick = (sha) => {
@@ -461,13 +538,21 @@ function GitHistoryDialog({ path, onClose }) {
     }
     setExpandedSha(sha);
     if (!gitApi || !repositoryId || details.has(sha)) return;
-    void gitApi.commitFiles(repositoryId, sha).then((result) => {
+    const generation = generationRef.current;
+    const record = (detail) => {
+      if (generation !== generationRef.current) return;
       setDetails((prev) => {
         const next = new Map(prev);
-        next.set(sha, result.ok ? result.value : { error: result.error.message });
+        next.set(sha, detail);
         return next;
       });
-    });
+    };
+    void gitApi.commitFiles(repositoryId, sha).then(
+      (result) => record(result.ok ? result.value : { error: result.error.message }),
+      (error2) => record({
+        error: error2 instanceof Error ? error2.message : "Could not load this commit"
+      })
+    );
   };
   if (!git) return null;
   const baseName = path ? path.replace(/^\/+/, "").split("/").pop() : null;
@@ -552,7 +637,7 @@ import { useEffect as useEffect5, useState as useState5 } from "react";
 import { getFileSystemProviderV2, parseWorkspacePath } from "@bendyline/docblocks/filesystem";
 
 // src/Git/GitDiffView.tsx
-import { useEffect as useEffect4, useRef as useRef4 } from "react";
+import { useEffect as useEffect4, useRef as useRef5 } from "react";
 import {
   detectLanguageFromFileName,
   useMonacoLoader
@@ -565,9 +650,9 @@ function languageFor(fileName) {
 }
 function GitDiffView({ original, modified, fileName, theme, labels }) {
   const { monaco, ready } = useMonacoLoader();
-  const hostRef = useRef4(null);
-  const editorRef = useRef4(null);
-  const modelsRef = useRef4(null);
+  const hostRef = useRef5(null);
+  const editorRef = useRef5(null);
+  const modelsRef = useRef5(null);
   const language = languageFor(fileName);
   useEffect4(() => {
     const host = hostRef.current;
@@ -711,7 +796,7 @@ function GitDiffDialog({ path, revision, onClose }) {
 }
 
 // src/Git/GitCloneDialog.tsx
-import { useEffect as useEffect6, useRef as useRef5, useState as useState6 } from "react";
+import { useEffect as useEffect6, useRef as useRef6, useState as useState6 } from "react";
 
 // src/Git/git-clone-utils.ts
 function deriveCloneFolderName(url) {
@@ -734,7 +819,7 @@ function isLikelyGitUrl(url) {
 import { maybeGetDocBlocksHost } from "@bendyline/docblocks/host";
 import { Fragment as Fragment4, jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var LEARN_MORE_URL = "https://docs.github.com/en/get-started/getting-started-with-git/caching-your-github-credentials-in-git";
-var OPERATION_LABELS = {
+var OPERATION_LABELS2 = {
   push: "push",
   pull: "pull",
   fetch: "fetch",
@@ -788,7 +873,7 @@ function GitAuthGuidanceDialog({
       children: [
         /* @__PURE__ */ jsxs7("p", { className: "db-settings-hint", children: [
           "Git could not authenticate with the remote while trying to ",
-          OPERATION_LABELS[operation],
+          OPERATION_LABELS2[operation],
           "."
         ] }),
         /* @__PURE__ */ jsx7(GitCredentialGuidance, { detail })
@@ -810,8 +895,8 @@ function GitCloneDialog({
   const [progress, setProgress] = useState6(null);
   const [error, setError] = useState6(null);
   const [authDetail, setAuthDetail] = useState6(null);
-  const handleRef = useRef5(null);
-  const urlInputRef = useRef5(null);
+  const handleRef = useRef6(null);
+  const urlInputRef = useRef6(null);
   useEffect6(
     () => () => {
       handleRef.current?.cancel();
@@ -1045,4 +1130,4 @@ function GitUI({ onOpenFile, onWorkspaceCloned }) {
 export {
   GitUI
 };
-//# sourceMappingURL=GitUI-KGF5MSNV.js.map
+//# sourceMappingURL=GitUI-VHOBQY43.js.map