Skip to content
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

Jump to bottom

Colour sub-labels too #688

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Colour sub-labels too #688

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
7 changes: 5 additions & 2 deletions packages/phoenix-event-display/src/managers/ui-manager/phoenix-menu/phoenix-menu-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,11 @@ export class PhoenixMenuNode {
if (config.type === 'checkbox' && config?.['isChecked']) {
config.onChange?.(config?.['isChecked']);
} else if (config.type === 'color' && config?.['color']) {
if (config.group !== undefined || this.name === 'Labels') {
if (this.name === 'Labels' || this.parent?.name === 'Labels') {
// Exception for Labels node (and sub labels), which should always have color applied
config.onChange?.(config?.['color']);
} else if (config.group !== undefined) {
// Ignore color by options with `!config.group`, otherwise the collection color is overridden
// Exception for Labels node, which should always have color applied
config.onChange?.(config?.['color']);
}
} else if (config.type === 'slider' && config?.['value']) {
Expand Down Expand Up @@ -241,6 +243,7 @@ export class PhoenixMenuNode {
}
}

// Now handle children
for (const childState of jsonObject['children']) {
const nodeChild = this.children.filter(
(nodeChild) =>
Expand Down
Loading