Skip to content

fix(cmd-k): z-index + reoder tools, triggers #1970

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
icecrasher321 merged 2 commits into from
Nov 13, 2025
Merged

fix(cmd-k): z-index + reoder tools, triggers #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa957d1
fix(cmd-k): z-index + reoder tools, triggers
icecrasher321 Nov 13, 2025
80b6f5c
fix more z-index styling
icecrasher321 Nov 13, 2025
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
40 changes: 30 additions & 10 deletions ...workspace/[workspaceId]/w/components/sidebar/components-new/search-modal/search-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,35 @@ export function SearchModal({
return items
}, [workspaces, workflows, pages, blocks, triggers, tools, docs])

// Filter items based on search query
const filteredItems = useMemo(() => {
if (!searchQuery.trim()) return allItems
const sectionOrder = useMemo<SearchItem['type'][]>(
() => ['workspace', 'workflow', 'page', 'tool', 'trigger', 'block', 'doc'],
[]
)

const query = searchQuery.toLowerCase()
return allItems.filter(
(item) =>
item.name.toLowerCase().includes(query) || item.description?.toLowerCase().includes(query)
// Filter items based on search query and enforce section ordering
const filteredItems = useMemo(() => {
const orderMap = sectionOrder.reduce<Record<SearchItem['type'], number>>(
(acc, type, index) => {
acc[type] = index
return acc
},
{} as Record<SearchItem['type'], number>
)
}, [allItems, searchQuery])

const baseItems = !searchQuery.trim()
? allItems
: allItems.filter(
(item) =>
item.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
item.description?.toLowerCase().includes(searchQuery.toLowerCase())
)

return [...baseItems].sort((a, b) => {
const aOrder = orderMap[a.type] ?? Number.MAX_SAFE_INTEGER
const bOrder = orderMap[b.type] ?? Number.MAX_SAFE_INTEGER
return aOrder - bOrder
})
}, [allItems, searchQuery, sectionOrder])

// Reset selected index when filtered items change
useEffect(() => {
Expand Down Expand Up @@ -469,7 +488,7 @@ export function SearchModal({
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogPortal>
<DialogOverlay
className='bg-white/80 dark:bg-[#1b1b1b]/90'
className='z-40 bg-white/80 dark:bg-[#1b1b1b]/90'
style={{ backdropFilter: 'blur(4px)' }}
/>
<DialogPrimitive.Content className='fixed top-[15%] left-[50%] z-50 flex w-[500px] translate-x-[-50%] flex-col gap-[12px] p-0 focus:outline-none focus-visible:outline-none'>
Expand All @@ -493,7 +512,8 @@ export function SearchModal({
{/* Floating results container */}
{filteredItems.length > 0 ? (
<div className='scrollbar-thin scrollbar-thumb-border scrollbar-track-transparent max-h-[400px] overflow-y-auto rounded-[10px] py-[10px] shadow-sm'>
{Object.entries(groupedItems).map(([type, items]) => {
{sectionOrder.map((type) => {
const items = groupedItems[type] || []
if (items.length === 0) return null

return (
Expand Down
2 changes: 1 addition & 1 deletion ...components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
<SelectTrigger className='h-8 w-[200px] justify-between text-left text-xs'>
<SelectValue placeholder='Select admin' />
</SelectTrigger>
<SelectContent align='start'>
<SelectContent align='start' className='z-50'>
<SelectGroup>
<SelectLabel className='px-3 py-1 text-[11px] text-muted-foreground uppercase'>
Workspace admins
Expand Down