Skip to content

Commit 4dfbe07

Browse files
authored
fix(core): prevent popup dock icons from being dimmed (#481)
1 parent 95c9f2d commit 4dfbe07

4 files changed

Lines changed: 17 additions & 6 deletions

File tree

packages/core/src/client/webcomponents/components/dock/DockEntries.vue

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ import { sharedStateToRef } from '../../state/docks'
88
import DockEntry from './DockEntry.vue'
99
import DockGroupButton from './DockGroupButton.vue'
1010
11-
const props = defineProps<{
11+
const props = withDefaults(defineProps<{
1212
context: DocksContext
1313
entries: DevToolsDockEntry[]
1414
selected: DevToolsDockEntry | null
1515
isVertical: boolean
16-
}>()
16+
dimInactive?: boolean
17+
}>(), {
18+
dimInactive: true,
19+
})
1720
1821
const emit = defineEmits<{
1922
(e: 'select', entry: DevToolsDockEntry): void
@@ -62,6 +65,7 @@ function toggleDockEntry(dock: DevToolsDockEntry) {
6265
:group="dock"
6366
:is-vertical="isVertical"
6467
:selected="selected"
68+
:dim-inactive="dimInactive"
6569
@select="(e) => emit('select', e)"
6670
/>
6771
<DockEntry
@@ -70,7 +74,7 @@ function toggleDockEntry(dock: DevToolsDockEntry) {
7074
:dock
7175
:is-action="dock.type === 'action'"
7276
:is-selected="selected?.id === dock.id"
73-
:is-dimmed="selected ? (selected.id !== dock.id) : false"
77+
:is-dimmed="dimInactive && selected ? (selected.id !== dock.id) : false"
7478
:is-vertical="isVertical"
7579
:badge="dock.badge"
7680
@click="toggleDockEntry(dock)"

packages/core/src/client/webcomponents/components/dock/DockEntriesWithCategories.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ withDefaults(defineProps<{
1010
selected: DevToolsDockEntry | null
1111
isVertical: boolean
1212
rotate?: boolean
13+
dimInactive?: boolean
1314
}>(), {
1415
rotate: true,
16+
dimInactive: true,
1517
})
1618
1719
const emit = defineEmits<{
@@ -29,6 +31,7 @@ const emit = defineEmits<{
2931
:entries="entries"
3032
:is-vertical="isVertical && rotate"
3133
:selected="selected"
34+
:dim-inactive="dimInactive"
3235
@select="(e) => emit('select', e)"
3336
/>
3437
</template>

packages/core/src/client/webcomponents/components/dock/DockGroupButton.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ import { setDocksGroupPanel, useDocksGroupPanel } from '../../state/floating-too
99
import DockEntry from './DockEntry.vue'
1010
import DockGroupPopover from './DockGroupPopover.vue'
1111
12-
const props = defineProps<{
12+
const props = withDefaults(defineProps<{
1313
context: DocksContext
1414
group: DevToolsViewGroup
1515
isVertical: boolean
1616
selected: DevToolsDockEntry | null
17-
}>()
17+
dimInactive?: boolean
18+
}>(), {
19+
dimInactive: true,
20+
})
1821
1922
const emit = defineEmits<{
2023
(e: 'select', entry: DevToolsDockEntry): void
@@ -122,7 +125,7 @@ function onClick() {
122125
:dock="group"
123126
:is-vertical="isVertical"
124127
:is-selected="isActive || isPanelVisible"
125-
:is-dimmed="selected ? !isActive : false"
128+
:is-dimmed="dimInactive && selected ? !isActive : false"
126129
:badge="group.badge"
127130
@click="onClick"
128131
/>

packages/core/src/client/webcomponents/components/dock/DockStandalone.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ function switchEntry(id: string | undefined) {
6161
:groups="groupedEntries"
6262
:is-vertical="false"
6363
:selected="context.docks.selected"
64+
:dim-inactive="false"
6465
@select="(e) => switchEntry(e?.id)"
6566
>
6667
<template #separator>

0 commit comments

Comments
 (0)