Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scripts/gallery-matrix/shift-baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@
"agent-pane.changes-from-cache#rows": 0.00051,
"agent-pane.changes-git-actions#busy": 0,
"agent-pane.changes-git-actions#commit-form": 0,
"agent-pane.changes-git-actions#include-new": 0.02985,
"agent-pane.changes-git-actions#keyboard": 0.02985,
"agent-pane.changes-git-actions#include-new": 0,
"agent-pane.changes-git-actions#keyboard": 0,
"agent-pane.changes-git-actions#push-refused": 0,
"agent-pane.changes-git-actions#toolbar": 0,
"agent-pane.changes-options-menu#closed": 0,
Expand Down Expand Up @@ -384,12 +384,12 @@
"agent-pane.composer-context#folder-short-note-fr": 0,
"agent-pane.composer-context#framework-marks": 0,
"agent-pane.composer-context#lane-checkouts": 0,
"agent-pane.composer-context#lane-checkouts-open": 0.00106,
"agent-pane.composer-context#lane-checkouts-open": 0.00536,
"agent-pane.composer-context#machine-colors": 0,
"agent-pane.composer-context#repo-worktrees": 0,
"agent-pane.composer-context#repo-worktrees-guessed": 0,
"agent-pane.composer-context#repo-worktrees-open": 0.01364,
"agent-pane.composer-context#repo-worktrees-search": 0.00447,
"agent-pane.composer-context#repo-worktrees-open": 0.00803,
"agent-pane.composer-context#repo-worktrees-search": 0.00014,
"agent-pane.composer-context#saved-environment-picked": 0,
"agent-pane.composer-context#saved-environments": 0,
"agent-pane.composer-context#ssh-chat": 0,
Expand Down
12 changes: 0 additions & 12 deletions webviews/src/agent-session/acpmux/changes/GitActions.gallery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,11 @@ export default componentEntry<Props>({
note: "All with Include new files lists the new files before Commit is offered.",
props: { formOpen: true },
play: includeNew,
checks: {
layoutShiftMax: {
value: 0.05,
reason: "Choosing All rewrites the hint line and adds Include new files to it; the buttons stay.",
},
},
},
keyboard: {
note: "Arrows move the scope radios; Escape in the message closes the form.",
props: { formOpen: true },
play: keyboard,
checks: {
layoutShiftMax: {
value: 0.05,
reason: "Choosing All rewrites the hint line and adds Include new files to it; the buttons stay.",
},
},
},
busy: {
note: "A commit in flight: the form and buttons wait.",
Expand Down
28 changes: 15 additions & 13 deletions webviews/src/agent-session/acpmux/changes/GitActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,21 +239,23 @@ function CommitForm({
{/* What the scope commits, then All's Include new files, on their own line: picking a scope changes
only this line, so Cancel and Commit never move or wrap (agent-pane.changes-git-actions). */}
<div className="acpmux-git-form-row acpmux-git-scope-line">
{/* Both hints share one cell and Include new files keeps its place while Staged is picked
(hidden, out of the tab order and the accessibility tree), so the line is as tall in
either scope and picking one moves nothing (agent-pane.changes-git-actions shift). */}
<span className="acpmux-git-scope-hint">
{t(scope === "staged" ? "git.commit.stagedHint" : "git.commit.allHint")}
<span data-visible={scope === "staged"}>{t("git.commit.stagedHint")}</span>
<span data-visible={scope === "all"}>{t("git.commit.allHint")}</span>
</span>
{scope === "all" && (
<label className="acpmux-git-include-new">
<input
type="checkbox"
aria-labelledby={`${scopeName}-new`}
checked={includeNew}
disabled={busy}
onChange={(event) => toggleNew(event.target.checked)}
/>
<span id={`${scopeName}-new`}>{t("git.commit.includeNew")}</span>
</label>
)}
<label className="acpmux-git-include-new" data-visible={scope === "all"}>
<input
type="checkbox"
aria-labelledby={`${scopeName}-new`}
checked={includeNew}
disabled={busy || scope !== "all"}
onChange={(event) => toggleNew(event.target.checked)}
/>
<span id={`${scopeName}-new`}>{t("git.commit.includeNew")}</span>
</label>
</div>
{withNew && listChanged && (
<span className="acpmux-git-form-note" role="alert">
Expand Down
5 changes: 4 additions & 1 deletion webviews/src/agent-session/acpmux/changes/git.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions webviews/src/agent-session/acpmux/composerLocation.css
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,10 @@

.acpmux-folder-popover .acpmux-location-search {
display: block;
/* The popover is a flex column with a max height: a long list must not squeeze the field, or it
grows back by 8 px when a search shortens the list and every row under it moves
(agent-pane.composer-context#repo-worktrees-search shift). */
flex: none;
box-sizing: border-box;
width: 100%;
height: var(--ui-row-height);
Expand Down