Skip to content

Commit 6f109ea

Browse files
alltomatosclaude
andcommitted
feat(desktop): icon + risk-highlight treatment for menus (issues #1-#5)
Apply the pattern from prompt-input-mode.tsx (leading icon per item, destructive action separated and color-highlighted) to: - Session actions menu (Rename/Share/Export/Archive/Delete), both the legacy and v2 versions (message-timeline.tsx) — closes #1 - Server context menu (Edit/Default/Delete): consolidated the shared ServerRowMenuView (used by Home and Settings > Servers) plus the two remaining standalone implementations in dialog-select-server.tsx and wsl/settings.tsx — closes #2 - Project menu on Home (home-projects-view.tsx) — closes #3 - Project menu in the legacy layout sidebar (layout.tsx) — closes #4 - Workspace menu (Rename/Reset/Delete) in sidebar-workspace.tsx — closes #5 Not released yet — accumulating on dev per the new batch-release process. Co-Authored-By: Claude Sonnet 5 <[email protected]>
1 parent 3308306 commit 6f109ea

7 files changed

Lines changed: 52 additions & 6 deletions

File tree

‎packages/app/src/components/dialog-select-server.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,15 +664,18 @@ export function ServerConnectionList(props: { controller: ReturnType<typeof useS
664664
props.controller.startEdit(i)
665665
}}
666666
>
667+
<Icon name="edit" size="small" />
667668
<DropdownMenu.ItemLabel>{language.t("dialog.server.menu.edit")}</DropdownMenu.ItemLabel>
668669
</DropdownMenu.Item>
669670
<Show when={props.controller.canDefault() && props.controller.defaultKey() !== key}>
670671
<DropdownMenu.Item onSelect={() => props.controller.setDefault(key)}>
672+
<Icon name="check" size="small" />
671673
<DropdownMenu.ItemLabel>{language.t("dialog.server.menu.default")}</DropdownMenu.ItemLabel>
672674
</DropdownMenu.Item>
673675
</Show>
674676
<Show when={props.controller.canDefault() && props.controller.defaultKey() === key}>
675677
<DropdownMenu.Item onSelect={() => props.controller.setDefault(null)}>
678+
<Icon name="close" size="small" />
676679
<DropdownMenu.ItemLabel>
677680
{language.t("dialog.server.menu.defaultRemove")}
678681
</DropdownMenu.ItemLabel>
@@ -683,6 +686,7 @@ export function ServerConnectionList(props: { controller: ReturnType<typeof useS
683686
onSelect={() => props.controller.handleRemove(ServerConnection.key(i), i)}
684687
class="text-text-on-critical-base hover:bg-surface-critical-weak"
685688
>
689+
<Icon name="trash" size="small" />
686690
<DropdownMenu.ItemLabel>{language.t("dialog.server.menu.delete")}</DropdownMenu.ItemLabel>
687691
</DropdownMenu.Item>
688692
</DropdownMenu.Content>

‎packages/app/src/components/server/server-row-menu.tsx‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
2+
import { Icon } from "@opencode-ai/ui/icon"
23
import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
34
import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
45
import { type Component, Show } from "solid-js"
@@ -76,16 +77,24 @@ export const ServerRowMenuView: Component<{
7677
if (server) props.onEdit(server)
7778
}}
7879
>
80+
<IconV2 name="edit" size="small" />
7981
{props.labels.edit}
8082
</MenuV2.Item>
8183
<Show when={props.canDefault && !props.isDefault}>
82-
<MenuV2.Item onSelect={props.onSetDefault}>{props.labels.default}</MenuV2.Item>
84+
<MenuV2.Item onSelect={props.onSetDefault}>
85+
<IconV2 name="check" size="small" />
86+
{props.labels.default}
87+
</MenuV2.Item>
8388
</Show>
8489
<Show when={props.canDefault && props.isDefault}>
85-
<MenuV2.Item onSelect={props.onRemoveDefault}>{props.labels.defaultRemove}</MenuV2.Item>
90+
<MenuV2.Item onSelect={props.onRemoveDefault}>
91+
<IconV2 name="close" size="small" />
92+
{props.labels.defaultRemove}
93+
</MenuV2.Item>
8694
</Show>
8795
<MenuV2.Separator />
88-
<MenuV2.Item disabled={builtin()} onSelect={props.onRemove}>
96+
<MenuV2.Item disabled={builtin()} class="text-v2-state-fg-danger" onSelect={props.onRemove}>
97+
<Icon name="trash" size="small" />
8998
{props.labels.delete}
9099
</MenuV2.Item>
91100
</MenuV2.Group>

‎packages/app/src/pages/home/home-projects-view.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,16 @@ function HomeProjectRow(
546546
<MenuV2.Portal>
547547
<MenuV2.Content>
548548
<MenuV2.Item onSelect={() => props.onOpenProjectNewSession(props.server, props.project.worktree)}>
549+
<IconV2 name="plus" size="small" />
549550
{props.language.t("command.session.new")}
550551
</MenuV2.Item>
551552
<MenuV2.Item onSelect={() => props.onEditProject(props.server, props.project)}>
553+
<IconV2 name="edit" size="small" />
552554
{props.language.t("dialog.project.edit.title")}
553555
</MenuV2.Item>
554556
<Show when={props.canRevealProject(props.server)}>
555557
<MenuV2.Item onSelect={() => props.onRevealProject(props.server, props.project)}>
558+
<IconV2 name="folder" size="small" />
556559
{props.language.t(
557560
fileManagerApp(platform.platform === "desktop" ? (platform.os ?? "unknown") : "unknown")
558561
.actionLabel,
@@ -563,10 +566,12 @@ function HomeProjectRow(
563566
disabled={props.unseen === 0}
564567
onSelect={() => props.onClearNotifications(props.server, props.project)}
565568
>
569+
<IconV2 name="check" size="small" />
566570
{props.language.t("sidebar.project.clearNotifications")}
567571
</MenuV2.Item>
568572
<MenuV2.Separator />
569573
<MenuV2.Item onSelect={() => props.onCloseProject(props.server, props.project.worktree)}>
574+
<IconV2 name="close" size="small" />
570575
{props.language.t("common.close")}
571576
</MenuV2.Item>
572577
</MenuV2.Content>

‎packages/app/src/pages/layout.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,6 +2064,7 @@ export default function LegacyLayout(props: ParentProps) {
20642064
showEditProjectDialog(server.current!, project)
20652065
}}
20662066
>
2067+
<IconV2 name="edit" size="small" />
20672068
<DropdownMenu.ItemLabel>{language.t("common.edit")}</DropdownMenu.ItemLabel>
20682069
</DropdownMenu.Item>
20692070
<DropdownMenu.Item
@@ -2074,6 +2075,7 @@ export default function LegacyLayout(props: ParentProps) {
20742075
toggleProjectWorkspaces(project)
20752076
}}
20762077
>
2078+
<IconV2 name="workspace" size="small" />
20772079
<DropdownMenu.ItemLabel>
20782080
{workspacesEnabled()
20792081
? language.t("sidebar.workspaces.disable")
@@ -2086,6 +2088,7 @@ export default function LegacyLayout(props: ParentProps) {
20862088
disabled={unseenCount() === 0}
20872089
onSelect={clearNotifications}
20882090
>
2091+
<IconV2 name="check" size="small" />
20892092
<DropdownMenu.ItemLabel>
20902093
{language.t("sidebar.project.clearNotifications")}
20912094
</DropdownMenu.ItemLabel>
@@ -2100,6 +2103,7 @@ export default function LegacyLayout(props: ParentProps) {
21002103
closeProject(dir)
21012104
}}
21022105
>
2106+
<IconV2 name="close" size="small" />
21032107
<DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
21042108
</DropdownMenu.Item>
21052109
</DropdownMenu.Content>

‎packages/app/src/pages/layout/sidebar-workspace.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,23 @@ const WorkspaceActions = (props: {
197197
props.setMenuOpen(false)
198198
}}
199199
>
200+
<IconV2 name="edit" size="small" />
200201
<DropdownMenu.ItemLabel>{props.language.t("common.rename")}</DropdownMenu.ItemLabel>
201202
</DropdownMenu.Item>
202203
<DropdownMenu.Item
203204
disabled={props.local() || props.busy()}
204205
onSelect={() => props.showResetWorkspaceDialog(props.root, props.directory)}
205206
>
207+
<IconV2 name="reset" size="small" />
206208
<DropdownMenu.ItemLabel>{props.language.t("common.reset")}</DropdownMenu.ItemLabel>
207209
</DropdownMenu.Item>
210+
<DropdownMenu.Separator />
208211
<DropdownMenu.Item
209212
disabled={props.local() || props.busy()}
213+
class="text-text-on-critical-base hover:bg-surface-critical-weak"
210214
onSelect={() => props.showDeleteWorkspaceDialog(props.root, props.directory)}
211215
>
216+
<Icon name="trash" size="small" />
212217
<DropdownMenu.ItemLabel>{props.language.t("common.delete")}</DropdownMenu.ItemLabel>
213218
</DropdownMenu.Item>
214219
</DropdownMenu.Content>

‎packages/app/src/pages/session/timeline/message-timeline.tsx‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,6 +1602,7 @@ export function MessageTimeline(props: {
16021602
setTitle("menuOpen", false)
16031603
}}
16041604
>
1605+
<IconV2 name="edit" size="small" />
16051606
<DropdownMenu.ItemLabel>{language.t("common.rename")}</DropdownMenu.ItemLabel>
16061607
</DropdownMenu.Item>
16071608
<Show when={shareEnabled()}>
@@ -1610,21 +1611,26 @@ export function MessageTimeline(props: {
16101611
setTitle({ pendingShare: true, menuOpen: false })
16111612
}}
16121613
>
1614+
<IconV2 name="outline-share" size="small" />
16131615
<DropdownMenu.ItemLabel>
16141616
{language.t("session.share.action.share")}
16151617
</DropdownMenu.ItemLabel>
16161618
</DropdownMenu.Item>
16171619
</Show>
16181620
<DropdownMenu.Item onSelect={() => exportSession(id)}>
1621+
<Icon name="download" size="small" />
16191622
<DropdownMenu.ItemLabel>{language.t("common.export")}</DropdownMenu.ItemLabel>
16201623
</DropdownMenu.Item>
16211624
<DropdownMenu.Item onSelect={() => void archiveSession(id)}>
1625+
<IconV2 name="archive" size="small" />
16221626
<DropdownMenu.ItemLabel>{language.t("common.archive")}</DropdownMenu.ItemLabel>
16231627
</DropdownMenu.Item>
16241628
<DropdownMenu.Separator />
16251629
<DropdownMenu.Item
1630+
class="text-text-on-critical-base hover:bg-surface-critical-weak"
16261631
onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id} />)}
16271632
>
1633+
<Icon name="trash" size="small" />
16281634
<DropdownMenu.ItemLabel>{language.t("common.delete")}</DropdownMenu.ItemLabel>
16291635
</DropdownMenu.Item>
16301636
</DropdownMenu.Content>
@@ -1655,7 +1661,7 @@ export function MessageTimeline(props: {
16551661
/>
16561662
<MenuV2.Portal>
16571663
<MenuV2.Content
1658-
style={{ width: "120px", "min-width": "120px" }}
1664+
style={{ width: "180px", "min-width": "180px" }}
16591665
onCloseAutoFocus={(event) => {
16601666
if (title.pendingRename) {
16611667
event.preventDefault()
@@ -1678,6 +1684,7 @@ export function MessageTimeline(props: {
16781684
setTitle("menuOpen", false)
16791685
}}
16801686
>
1687+
<IconV2 name="edit" size="small" />
16811688
{language.t("common.rename")}
16821689
</MenuV2.Item>
16831690
<Show when={shareEnabled()}>
@@ -1686,17 +1693,24 @@ export function MessageTimeline(props: {
16861693
setTitle({ pendingShare: true, menuOpen: false })
16871694
}}
16881695
>
1696+
<IconV2 name="outline-share" size="small" />
16891697
{language.t("session.share.action.share")}...
16901698
</MenuV2.Item>
16911699
</Show>
16921700
<MenuV2.Item onSelect={() => exportSession(id)}>
1701+
<IconV2 name="outline-square-arrow" size="small" />
16931702
{language.t("common.export")}...
16941703
</MenuV2.Item>
16951704
<MenuV2.Item onSelect={() => void archiveSession(id)}>
1705+
<IconV2 name="archive" size="small" />
16961706
{language.t("common.archive")}
16971707
</MenuV2.Item>
16981708
<MenuV2.Separator />
1699-
<MenuV2.Item onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id} />)}>
1709+
<MenuV2.Item
1710+
class="text-v2-state-fg-danger"
1711+
onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id} />)}
1712+
>
1713+
<Icon name="trash" size="small" />
17001714
{language.t("common.delete")}...
17011715
</MenuV2.Item>
17021716
</MenuV2.Content>

‎packages/app/src/wsl/settings.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
22
import { Tag } from "@opencode-ai/ui/v2/badge-v2"
33
import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
44
import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
5+
import { Icon } from "@opencode-ai/ui/icon"
56
import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
67
import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
78
import { useMutation } from "@tanstack/solid-query"
@@ -142,21 +143,25 @@ export function WslServerSettings(props: {
142143
<MenuV2.GroupLabel>{language.t("wsl.server.menu.label")}</MenuV2.GroupLabel>
143144
<Show when={wslRuntimeRetryable(item.runtime)}>
144145
<MenuV2.Item onSelect={() => api && request.mutate(() => api.startServer(key))}>
146+
<IconV2 name="reset" size="small" />
145147
{language.t("wsl.server.retryStart")}
146148
</MenuV2.Item>
147149
</Show>
148150
<Show when={props.controller.canDefault() && props.controller.defaultKey() !== key}>
149151
<MenuV2.Item onSelect={() => props.controller.setDefault(key)}>
152+
<IconV2 name="check" size="small" />
150153
{language.t("dialog.server.menu.default")}
151154
</MenuV2.Item>
152155
</Show>
153156
<Show when={props.controller.canDefault() && props.controller.defaultKey() === key}>
154157
<MenuV2.Item onSelect={() => props.controller.setDefault(null)}>
158+
<IconV2 name="close" size="small" />
155159
{language.t("dialog.server.menu.defaultRemove")}
156160
</MenuV2.Item>
157161
</Show>
158162
<MenuV2.Separator />
159-
<MenuV2.Item onSelect={() => remove(key)}>
163+
<MenuV2.Item onSelect={() => remove(key)} class="text-v2-state-fg-danger">
164+
<Icon name="trash" size="small" />
160165
{language.t("dialog.server.menu.delete")}
161166
</MenuV2.Item>
162167
</MenuV2.Group>

0 commit comments

Comments
 (0)