Skip to content

fix(DATAGO-123246): Nav bar recent chats scroll & layout improvements #1147

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
solace-mdupls merged 4 commits into from
Mar 13, 2026
+35 −26
Merged

fix(DATAGO-123246): Nav bar recent chats scroll & layout improvements #1147

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b103eb9
feat: update CollapsibleNavigationSidebar layout and enhance scrollba…
JKaram Mar 6, 2026
96bb58c
fix: reset active item state in CollapsibleNavigationSidebar
JKaram Mar 6, 2026
0b227a9
fix: update bottom items container style in CollapsibleNavigationSidebar
JKaram Mar 6, 2026
0b49303
fix: adjust layout for empty recent chats message in RecentChatsList
JKaram Mar 12, 2026
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
48 changes: 24 additions & 24 deletions client/webui/frontend/src/lib/components/navigation/CollapsibleNavigationSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const CollapsibleNavigationSidebar: React.FC<CollapsibleNavigationSidebar
onCollapseChange?.(value);
};

const [internalActiveItem, setInternalActiveItem] = useState<string>("chats");
const [internalActiveItem, setInternalActiveItem] = useState<string>("");
const activeItem = controlledActiveItemId ?? internalActiveItem;
const setActiveItem = (value: string) => {
if (controlledActiveItemId === undefined) {
Expand Down Expand Up @@ -122,7 +122,7 @@ export const CollapsibleNavigationSidebar: React.FC<CollapsibleNavigationSidebar
}
});
} else {
setInternalActiveItem("chats");
setInternalActiveItem("");
}
}, [location.pathname, items, controlledActiveItemId, findActiveItemId]);

Expand Down Expand Up @@ -225,8 +225,8 @@ export const CollapsibleNavigationSidebar: React.FC<CollapsibleNavigationSidebar
<Tooltip>
<TooltipTrigger asChild>
<button onClick={handleNewChatClickResolved} className={navButtonStyles({ variant: "collapsed" })}>
<div className={iconWrapperStyles({ active: activeItem === "chats" })}>
<NewChatIcon className={iconStyles({ active: activeItem === "chats" })} />
<div className={iconWrapperStyles({ active: false })}>
<NewChatIcon className={iconStyles({ active: false })} />
</div>
Comment on lines -228 to 230
Copy link
Contributor Author

@JKaram JKaram Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The New Chat button should not be highlighted while on the /chat route`

</button>
</TooltipTrigger>
Expand Down Expand Up @@ -299,13 +299,13 @@ export const CollapsibleNavigationSidebar: React.FC<CollapsibleNavigationSidebar
)}
</div>

<div className="flex-1 overflow-y-auto py-3">
<div className="flex-shrink-0 py-3">
{showNewChatButton && (
<button onClick={handleNewChatClickResolved} className={navButtonStyles()}>
<div className={iconWrapperStyles({ active: activeItem === "chats", withMargin: true })}>
<NewChatIcon className={iconStyles({ active: activeItem === "chats" })} />
<div className={iconWrapperStyles({ active: false, withMargin: true })}>
<NewChatIcon className={iconStyles({ active: false })} />
</div>
<span className={navTextStyles({ active: activeItem === "chats" })}>{newChatLabel}</span>
<span className={navTextStyles({ active: false })}>{newChatLabel}</span>
</button>
)}

Expand Down Expand Up @@ -339,24 +339,24 @@ export const CollapsibleNavigationSidebar: React.FC<CollapsibleNavigationSidebar
);
})}
</div>

{showRecentChats && (
<>
<div className="my-4 border-t border-[var(--color-secondary-w70)]" />
<div className="mb-2 flex items-center justify-between pr-4 pl-6">
<span className="text-sm font-bold text-[var(--color-secondary-text-wMain)]">Recent Chats</span>
<button onClick={() => navigate("/chat", { state: { openSessionsPanel: true } })} className="cursor-pointer text-sm font-normal text-[var(--color-primary-w60)] hover:text-[var(--color-primary-text-w10)]">
View All
</button>
</div>
<div className="flex-1">
<RecentChatsList maxItems={MAX_RECENT_CHATS} />
</div>
</>
)}
</div>

<div className="mt-2 border-t border-[var(--color-secondary-w70)] pt-2">
{showRecentChats && (
<div className="flex min-h-0 flex-1 flex-col">
<div className="border-t border-[var(--color-secondary-w70)]" />
<div className="mb-2 flex items-center justify-between pt-4 pr-6 pl-6">
<span className="text-sm font-bold text-[var(--color-secondary-text-wMain)]">Recent Chats</span>
<button onClick={() => navigate("/chat", { state: { openSessionsPanel: true } })} className="cursor-pointer text-sm text-[var(--color-primary-w60)] hover:text-[var(--color-primary-text-w10)]">
View All
</button>
</div>
<div className="scrollbar-subtle min-h-[120px] flex-1 overflow-y-auto">
<RecentChatsList maxItems={MAX_RECENT_CHATS} />
</div>
</div>
)}

<div className="relative z-10 border-t border-[var(--color-secondary-w70)] bg-[var(--color-background-wMain)] pt-2">
{bottomItems.map(item => (
<button key={item.id} onClick={() => handleBottomItemClick(item)} className={navButtonStyles()} disabled={item.disabled}>
<div className={iconWrapperStyles({ withMargin: true })}>
Expand Down
2 changes: 1 addition & 1 deletion client/webui/frontend/src/lib/constants/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/**
* Maximum number of recent chats to display in the navigation sidebar
*/
export const MAX_RECENT_CHATS = 6;
export const MAX_RECENT_CHATS = 15;
9 changes: 9 additions & 0 deletions client/webui/frontend/src/lib/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,15 @@
animation: halo-pulse-dark 2s ease-in-out infinite;
}

.scrollbar-subtle {
scrollbar-width: thin;
scrollbar-color: transparent transparent;
}

.scrollbar-subtle:hover {
scrollbar-color: var(--color-secondary-w70) transparent;
}

@layer base {
* {
@apply border-border focus-visible:outline-ring focus-visible:border-0 focus-visible:ring-0 focus-visible:outline-1;
Expand Down
Loading