Skip to content

fix(chat): keep mention searches open and align resource menus #8507

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
waleedlatif1 merged 3 commits into from
Oct 1, 2026
Merged

fix(chat): keep mention searches open and align resource menus #8507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c8c1b
fix(chat): keep mention searches open and align resource menus
waleedlatif1 Oct 1, 2026
5c0dd03
fix(chat): preserve mention selection and nested menu sizing
waleedlatif1 Oct 1, 2026
bee1381
fix(chat): reset replaced queries and bound workspace previews
waleedlatif1 Oct 1, 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
22 changes: 19 additions & 3 deletions ...ome/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ interface ResourceFolderTreeItemsProps {
*/
folderType?: MothershipResourceType
onSelect: (resource: MothershipResource) => void
subContentClassName?: string
}

/** Renders a {@link buildResourceFolderTree} result as nested dropdown submenus. */
Expand All @@ -90,6 +91,7 @@ export function ResourceFolderTreeItems({
type,
folderType,
onSelect,
subContentClassName,
}: ResourceFolderTreeItemsProps) {
const config = getResourceConfig(type)
return (
Expand All @@ -108,7 +110,7 @@ export function ResourceFolderTreeItems({
<Folder className='size-[14px]' />
<DropdownMenuItemLabel label={node.name} />
</DropdownMenuSubTrigger>
<DropdownMenuSubContent>
<DropdownMenuSubContent className={subContentClassName}>
{folderType && (
<DropdownMenuItem
onClick={() => onSelect({ type: folderType, id: node.id, title: node.name })}
Expand All @@ -122,6 +124,7 @@ export function ResourceFolderTreeItems({
type={type}
folderType={folderType}
onSelect={onSelect}
subContentClassName={subContentClassName}
/>
</DropdownMenuSubContent>
</DropdownMenuSub>
Expand Down Expand Up @@ -275,6 +278,7 @@ export function ResourceMenuSections({
type={section.type}
folderType={section.folderType}
onSelect={onSelect}
subContentClassName={subContentClassName}
/>
) : (
items.map((item) => (
Expand Down Expand Up @@ -401,6 +405,7 @@ interface WorkspaceResourceMenuContentProps {
/** Offers every folder as an attachable entry, as chat does. */
selectFolders?: boolean
onSelect: (resource: MothershipResource) => void
subContentClassName?: string
}

function WorkspaceResourceMenuContent({
Expand All @@ -410,6 +415,7 @@ function WorkspaceResourceMenuContent({
searchable = true,
selectFolders,
onSelect,
subContentClassName,
}: WorkspaceResourceMenuContentProps) {
const { groups, structureFolders, isHydrating } = useAvailableResources(workspaceId, {
enabled,
Expand All @@ -425,7 +431,12 @@ function WorkspaceResourceMenuContent({
/** Lists fill in as they load, so a trailing row keeps a loading workspace from reading as empty. */
const menu = (
<>
<ResourceMenuSections sections={sections} groups={groups} onSelect={select} />
<ResourceMenuSections
sections={sections}
groups={groups}
onSelect={select}
subContentClassName={subContentClassName}
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Comment thread
waleedlatif1 marked this conversation as resolved.
/>
{isHydrating && <DropdownMenuItem disabled>Loading resources</DropdownMenuItem>}
</>
)
Expand All @@ -449,6 +460,7 @@ interface WorkspaceResourceSubmenuProps {
* offers its folder, for pickers that can attach a whole workspace.
*/
onSelectWorkspace?: (workspace: Pick<Workspace, 'id' | 'name'>) => void
subContentClassName?: string
}

/**
Expand All @@ -461,6 +473,7 @@ export function WorkspaceResourceSubmenu({
selectFolders,
onSelect,
onSelectWorkspace,
subContentClassName,
}: WorkspaceResourceSubmenuProps) {
const [open, setOpen] = useState(false)
const icon = (
Expand All @@ -472,7 +485,9 @@ export function WorkspaceResourceSubmenu({
{icon}
<DropdownMenuItemLabel label={workspace.name} />
</DropdownMenuSubTrigger>
<DropdownMenuSubContent className='flex w-[320px] flex-col overflow-hidden'>
<DropdownMenuSubContent
className={cn('flex w-[320px] flex-col overflow-hidden', subContentClassName)}
>
{onSelectWorkspace && (
<DropdownMenuItem onClick={() => onSelectWorkspace(workspace)}>
{icon}
Expand All @@ -486,6 +501,7 @@ export function WorkspaceResourceSubmenu({
searchable={false}
selectFolders={selectFolders}
onSelect={onSelect}
subContentClassName={subContentClassName}
/>
</DropdownMenuSubContent>
</DropdownMenuSub>
Expand Down
Loading
Loading