Skip to content

Commit 72cb14f

Browse files
Clarify workspace picker labels
- Use distinct folder/git icons for local and worktree modes - Improve toolbar and menu affordance when a worktree is active
1 parent d85ffd5 commit 72cb14f

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

‎apps/web/src/components/BranchToolbarEnvModeSelector.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FolderIcon, GitForkIcon } from "lucide-react";
1+
import { FolderGit2Icon, FolderGitIcon, FolderIcon } from "lucide-react";
22
import { memo, useMemo } from "react";
33

44
import {
@@ -42,7 +42,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
4242
<span className="inline-flex items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:text-xs">
4343
{activeWorktreePath ? (
4444
<>
45-
<GitForkIcon className="size-3" />
45+
<FolderGitIcon className="size-3" />
4646
{resolveCurrentWorkspaceLabel(activeWorktreePath)}
4747
</>
4848
) : (
@@ -62,8 +62,10 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
6262
items={envModeItems}
6363
>
6464
<SelectTrigger variant="ghost" size="xs" className="font-medium" aria-label="Workspace">
65-
{effectiveEnvMode === "worktree" || activeWorktreePath ? (
66-
<GitForkIcon className="size-3" />
65+
{effectiveEnvMode === "worktree" ? (
66+
<FolderGit2Icon className="size-3" />
67+
) : activeWorktreePath ? (
68+
<FolderGitIcon className="size-3" />
6769
) : (
6870
<FolderIcon className="size-3" />
6971
)}
@@ -75,7 +77,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
7577
<SelectItem value="local">
7678
<span className="inline-flex items-center gap-1.5">
7779
{activeWorktreePath ? (
78-
<GitForkIcon className="size-3" />
80+
<FolderGitIcon className="size-3" />
7981
) : (
8082
<FolderIcon className="size-3" />
8183
)}
@@ -84,7 +86,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
8486
</SelectItem>
8587
<SelectItem value="worktree">
8688
<span className="inline-flex items-center gap-1.5">
87-
<GitForkIcon className="size-3" />
89+
<FolderGit2Icon className="size-3" />
8890
{resolveEnvModeLabel("worktree")}
8991
</span>
9092
</SelectItem>

0 commit comments

Comments
 (0)