Skip to content

fix(core): inherit group category when grouping dock members #437

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
antfu merged 1 commit into from
Jul 17, 2026
+6 −5
Merged

fix(core): inherit group category when grouping dock members #437

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 packages/core/src/client/webcomponents/.generated/css.ts
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions packages/core/src/client/webcomponents/state/dock-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ export function getGroupMembers(
if (!settings)
return members
// Reuse the category grouping (sorting + visibility) then flatten back out.
const grouped = docksGroupByCategories(members, settings, options)
const group = entries.find(e => e.id === groupId)
const grouped = docksGroupByCategories(members, settings, { ...options, groupCategory: group?.category })
return grouped.flatMap(([, items]) => items)
}

Expand All @@ -85,10 +86,10 @@ export function getGroupMembers(
export function docksGroupByCategories(
entries: DevToolsDockEntry[],
settings: Immutable<DevToolsDocksUserSettings>,
options?: { includeHidden?: boolean, whenContext?: WhenContext, collapseGroups?: boolean },
options?: { includeHidden?: boolean, whenContext?: WhenContext, collapseGroups?: boolean, groupCategory?: string },
): DevToolsDockEntriesGrouped {
const { docksHidden, docksCategoriesHidden, docksCustomOrder, docksPinned } = settings
const { includeHidden = false, whenContext, collapseGroups = false } = options ?? {}
const { includeHidden = false, whenContext, collapseGroups = false, groupCategory } = options ?? {}

// When collapsing, members whose `groupId` resolves to a registered group are
// folded under that group's button; the group entry itself stays on the bar.
Expand All @@ -113,7 +114,7 @@ export function docksGroupByCategories(
if (!includeHidden && docksHidden.includes(entry.id))
continue

const category = entry.category ?? 'default'
const category = entry.category ?? groupCategory ?? 'default'
// Skip if category is hidden
if (!includeHidden && docksCategoriesHidden.includes(category))
continue
Expand Down
Loading