Skip to content

fix: clarify sidebar focus between workspace and thread #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rosday merged 1 commit into from
Jan 29, 2026
Merged

fix: clarify sidebar focus between workspace and thread #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/features/app/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ export function Sidebar({
key={entry.id}
workspace={entry}
workspaceName={renderHighlightedName(entry.name)}
isActive={entry.id === activeWorkspaceId}
isActive={entry.id === activeWorkspaceId && !activeThreadId}
isCollapsed={isCollapsed}
addMenuOpen={addMenuOpen}
addMenuWidth={ADD_MENU_WIDTH}
Expand Down
94 changes: 51 additions & 43 deletions src/features/app/components/WorkspaceGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,61 @@ export function WorkspaceGroup({
const isToggleable = Boolean(toggleId);
return (
<div className="workspace-group">
{showHeader && (
<div
className={`workspace-group-header${isToggleable ? " is-toggleable" : ""}`}
onClick={
toggleId
? () => {
onToggleCollapse(toggleId);
}
: undefined
}
onKeyDown={
toggleId
? (event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault();
<div className="workspace-group-card">
{showHeader && (
<div
className={`workspace-group-header${isToggleable ? " is-toggleable" : ""}`}
onClick={
toggleId
? () => {
onToggleCollapse(toggleId);
}
}
: undefined
}
role={isToggleable ? "button" : undefined}
aria-label={isToggleable ? `${isCollapsed ? "Expand" : "Collapse"} group` : undefined}
aria-expanded={isToggleable ? !isCollapsed : undefined}
tabIndex={isToggleable ? 0 : undefined}
: undefined
}
onKeyDown={
toggleId
? (event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault();
onToggleCollapse(toggleId);
}
}
: undefined
}
role={isToggleable ? "button" : undefined}
aria-label={
isToggleable ? `${isCollapsed ? "Expand" : "Collapse"} group` : undefined
}
aria-expanded={isToggleable ? !isCollapsed : undefined}
tabIndex={isToggleable ? 0 : undefined}
>
<div className="workspace-group-label">{name}</div>
{isToggleable && (
<button
className={`group-toggle ${isCollapsed ? "" : "expanded"}`}
onClick={(event) => {
event.stopPropagation();
if (!toggleId) {
return;
}
onToggleCollapse(toggleId);
}}
aria-label={isCollapsed ? "Expand group" : "Collapse group"}
aria-expanded={!isCollapsed}
type="button"
>
<span className="group-toggle-icon">›</span>
</button>
)}
</div>
)}
<div
className={`workspace-group-list${showHeader ? " has-header" : ""} ${
isCollapsed ? "collapsed" : ""
}`}
>
<div className="workspace-group-label">{name}</div>
{isToggleable && (
<button
className={`group-toggle ${isCollapsed ? "" : "expanded"}`}
onClick={(event) => {
event.stopPropagation();
if (!toggleId) {
return;
}
onToggleCollapse(toggleId);
}}
aria-label={isCollapsed ? "Expand group" : "Collapse group"}
aria-expanded={!isCollapsed}
type="button"
>
<span className="group-toggle-icon">›</span>
</button>
)}
<div className="workspace-group-content">{children}</div>
</div>
)}
<div className={`workspace-group-list ${isCollapsed ? "collapsed" : ""}`}>
<div className="workspace-group-content">{children}</div>
</div>
</div>
);
Expand Down
90 changes: 50 additions & 40 deletions src/styles/sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.sidebar {
--sidebar-padding: 20px;
--sidebar-content-padding: calc(var(--sidebar-padding) - 12px);
padding: 36px var(--sidebar-padding) 56px;
background: var(--surface-sidebar);
backdrop-filter: none;
Expand Down Expand Up @@ -301,8 +302,10 @@
overflow-y: auto;
overflow-x: hidden;
-webkit-app-region: no-drag;
margin-left: calc(-1 * var(--sidebar-padding));
margin-right: calc(-1 * var(--sidebar-padding));
padding-right: calc(var(--sidebar-padding) - 12px);
padding-left: var(--sidebar-content-padding);
padding-right: var(--sidebar-content-padding);
-webkit-mask-repeat: no-repeat;
mask-repeat: no-repeat;
-webkit-mask-size: 100% 100%;
Expand Down Expand Up @@ -378,7 +381,7 @@
align-items: center;
justify-content: space-between;
gap: 8px;
padding-right: 4px;
padding-right: 2px;
}

.workspace-group-header.is-toggleable {
Expand All @@ -395,14 +398,15 @@
text-transform: uppercase;
font-size: 10px;
letter-spacing: 0.08em;
color: var(--text-faint);
padding-left: 4px;
color: var(--text-muted);
padding: 6px 6px 4px;
font-weight: 600;
}

.workspace-group-list {
display: grid;
grid-template-rows: 1fr;
margin-top: 8px;
margin-top: 0;
opacity: 1;
transform: translateY(0);
transition:
Expand All @@ -412,10 +416,25 @@
margin-top 0.2s ease;
}

.workspace-group-list.has-header {
margin-top: 6px;
}

.workspace-group-card {
display: flex;
flex-direction: column;
padding: 6px;
border-radius: 12px;
background: color-mix(in srgb, var(--surface-card) 70%, transparent);
border: 1px solid var(--border-muted);
overflow: hidden;
}

.workspace-group-content {
--workspace-group-gap: 8px;
display: flex;
flex-direction: column;
gap: 10px;
gap: var(--workspace-group-gap);
overflow: hidden;
min-height: 0;
}
Expand Down Expand Up @@ -465,16 +484,20 @@
.workspace-card {
display: flex;
flex-direction: column;
gap: 6px;
gap: 2px;
padding: 6px;
border-radius: 12px;
background: color-mix(in srgb, var(--surface-card) 70%, transparent);
border: 1px solid var(--border-muted);
overflow-x: hidden;
}

.workspace-row {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 12px;
padding: 8px 4px;
border-radius: 0;
padding: 4px 4px 4px 6px;
border-radius: 6px;
border: none;
background: transparent;
color: inherit;
Expand All @@ -487,51 +510,32 @@
isolation: isolate;
}

.workspace-row::before {
content: "";
position: absolute;
inset: 0 6px 0 0;
border-radius: 10px;
background: transparent;
transition: background 0.2s ease;
z-index: -1;
}

.workspace-row.active {
background: transparent;
padding-left: 4px;
background: var(--surface-active);
color: var(--text-strong);
}

.workspace-row:hover {
background: transparent;
}

.workspace-row:hover::before {
background: var(--surface-card);
background: var(--surface-hover);
color: var(--text-strong);
}

.workspace-row.active::before {
background: linear-gradient(
90deg,
var(--border-accent) 0,
var(--border-accent) 3px,
var(--surface-card) 3px,
var(--surface-card) 100%
);
.workspace-row.active:hover {
background: var(--surface-active);
}

.workspace-row.active .workspace-name {
color: var(--text-strong);
}

.workspace-row.active .workspace-name-row {
padding-left: 6px;
padding-left: 0;
}


.workspace-name {
font-weight: 600;
font-size: 14px;
font-size: 13px;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
Expand Down Expand Up @@ -666,7 +670,7 @@
.thread-list {
display: flex;
flex-direction: column;
gap: 4px;
gap: 2px;
margin-left: 0;
}

Expand Down Expand Up @@ -718,9 +722,9 @@
display: flex;
align-items: center;
gap: 6px;
padding: 4px 10px 4px calc(6px + var(--thread-indent, 0px));
padding: 5px 2px 5px calc(10px + var(--thread-indent, 0px));
border-radius: 6px;
color: var(--text-quiet);
color: var(--text-subtle);
font-size: 12px;
cursor: pointer;
-webkit-app-region: no-drag;
Expand All @@ -731,6 +735,10 @@
.thread-status {
width: 6px;
height: 6px;
min-width: 6px;
min-height: 6px;
aspect-ratio: 1 / 1;
flex: 0 0 6px;
border-radius: 999px;
display: inline-block;
margin-left: 4px;
Expand Down Expand Up @@ -1004,6 +1012,8 @@
display: flex;
flex-direction: column;
gap: 10px;
margin-left: calc(-1 * var(--sidebar-padding) + var(--sidebar-content-padding));
margin-right: calc(-1 * var(--sidebar-padding) + var(--sidebar-content-padding));
padding: 10px 12px;
border-radius: 12px;
border: 1px solid var(--border-subtle);
Expand Down Expand Up @@ -1074,7 +1084,7 @@

.sidebar-corner-actions {
position: absolute;
left: var(--sidebar-padding);
left: var(--sidebar-content-padding);
bottom: 16px;
display: inline-flex;
align-items: center;
Expand Down